From 338347feb03fcee39009948eb72131e065dc13ae Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 28 May 2008 06:25:25 +0000 Subject: [PATCH 001/508] Initial C module file and simple example added. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10501 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 15 ++++ Examples/c/simple/Makefile | 12 +++ Examples/c/simple/example.c | 18 ++++ Examples/c/simple/example.i | 6 ++ Examples/c/simple/main.c | 8 ++ Lib/c/c.swg | 0 Source/Makefile.am | 1 + Source/Modules/c.cxx | 158 ++++++++++++++++++++++++++++++++++++ Source/Modules/swigmain.cxx | 2 + 9 files changed, 220 insertions(+) create mode 100644 Examples/c/simple/Makefile create mode 100644 Examples/c/simple/example.c create mode 100644 Examples/c/simple/example.i create mode 100644 Examples/c/simple/main.c create mode 100644 Lib/c/c.swg create mode 100644 Source/Modules/c.cxx diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 0bf9f6767..9eaea2447 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1090,3 +1090,18 @@ r_clean: rm -f *.@OBJEXT@ *@SO@ NAMESPACE rm -f $(RRSRC) runme.Rout .RData +################################################################## +##### C ###### +################################################################## + +# ---------------------------------------------------------------- +# Build a C dynamically loadable module +# ---------------------------------------------------------------- + +c: $(SRCS) + $(SWIG) -c $(SWIGOPT) $(INTERFACE) + $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) + $(CC) $(EXEC) -L. -l$(LIBPREFIX)_$(TARGET) + + diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile new file mode 100644 index 000000000..345c473dd --- /dev/null +++ b/Examples/c/simple/Makefile @@ -0,0 +1,12 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SRCS = example.c +TARGET = example +INTERFACE = example.i +EXEC = main.c + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' EXEC='$(EXEC)' c + + diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c new file mode 100644 index 000000000..5c20344cf --- /dev/null +++ b/Examples/c/simple/example.c @@ -0,0 +1,18 @@ +/* File : example.c */ + +/* A global variable */ +/* double Foo = 3.0; */ + +/* Compute the greatest common divisor of positive integers */ +int gcd(int x, int y) { + int g; + g = y; + while (x > 0) { + g = x; + x = y % x; + y = g; + } + return g; +} + + diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i new file mode 100644 index 000000000..3193ec653 --- /dev/null +++ b/Examples/c/simple/example.i @@ -0,0 +1,6 @@ +/* File : example.i */ +%module example + +%inline %{ +extern int gcd(int x, int y); +%} diff --git a/Examples/c/simple/main.c b/Examples/c/simple/main.c new file mode 100644 index 000000000..11f0b2f73 --- /dev/null +++ b/Examples/c/simple/main.c @@ -0,0 +1,8 @@ +#include + +int main(int argc, char **argv) { + int a = 35; + int b = 15; + printf("GCD(%d, %d)=%d", a, b, gcd(a, b)); +} + diff --git a/Lib/c/c.swg b/Lib/c/c.swg new file mode 100644 index 000000000..e69de29bb diff --git a/Source/Makefile.am b/Source/Makefile.am index a72671305..c44f22931 100644 --- a/Source/Makefile.am +++ b/Source/Makefile.am @@ -42,6 +42,7 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/chicken.cxx \ Modules/clisp.cxx \ Modules/contract.cxx \ + Modules/c.cxx \ Modules/csharp.cxx \ Modules/directors.cxx \ Modules/emit.cxx \ diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx new file mode 100644 index 000000000..eb0064111 --- /dev/null +++ b/Source/Modules/c.cxx @@ -0,0 +1,158 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * c.cxx + * + * C language module for SWIG. + * ----------------------------------------------------------------------------- */ + +char cvsroot_c_cxx[] = "$Id: c.cxx 10452 2008-05-15 21:16:48Z wsfulton $"; + +#include "swigmod.h" + +class C:public Language { + static const char *usage; + + File *f_runtime; + File *f_runtime_h; + File *f_header; + File *f_wrappers; + File *f_init; + +public: + + /* ----------------------------------------------------------------------------- + * C() + * ----------------------------------------------------------------------------- */ + + C() { + } + + /* ------------------------------------------------------------ + * main() + * ------------------------------------------------------------ */ + + virtual void main(int argc, char *argv[]) { + + SWIG_library_directory("c"); + + // Add a symbol to the parser for conditional compilation + Preprocessor_define("SWIGC 1", 0); + + // Add typemap definitions + SWIG_typemap_lang("c"); + SWIG_config_file("c.swg"); + + // Look for certain command line options + for (int i = 1; i < argc; i++) { + if (argv[i]) { + if (strcmp(argv[i], "-help") == 0) { + Printf(stdout, "%s\n", usage); + } + } + } + } + + /* --------------------------------------------------------------------- + * top() + * --------------------------------------------------------------------- */ + + virtual int top(Node *n) { + Printf(stdout, "top called\n"); + + String *module = Getattr(n, "name"); + String *outfile = Getattr(n, "outfile"); + + /* initialize I/O */ + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { + FileErrorDisplay(outfile); + SWIG_exit(EXIT_FAILURE); + } + f_init = NewString(""); + f_header = NewString(""); + f_wrappers = NewString(""); + + Swig_register_filebyname("header", f_header); + Swig_register_filebyname("wrappers", f_wrappers); + Swig_register_filebyname("runtime", f_runtime); + Swig_register_filebyname("init", f_init); + + /* emit code for children */ + Language::top(n); + + /* write all to file */ + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); + + /* cleanup */ + Delete(f_header); + Delete(f_wrappers); + Delete(f_init); + Close(f_runtime); + Delete(f_runtime); + + return SWIG_OK; + } + + virtual int functionWrapper(Node *n) { + Printf(stdout, "creating function wrapper\n"); + String *name = Getattr(n, "sym:name"); + String *type = Getattr(n, "type"); + ParmList *parms = Getattr(n, "parms"); + String *wrapname = Getattr(n, "wrap:name"); + + Wrapper *wrapper = NewWrapper(); + String *wname = Swig_name_wrapper(name); + + Setattr(n, "wrap:name", wname); + + String *parse_args = NewString(""); + Parm *parm; + for (parm = parms; parm; ) { + Append(parse_args, Getattr(parm, "type")); + Append(parse_args, " "); + Append(parse_args, Getattr(parm, "lname")); + parm = nextSibling(parm); + if (parm) { + Append(parse_args, ", "); + } + } + + Printv(wrapper->def, type, " ", wname, "(", parse_args, ") {", NIL); + Printv(wrapper->code, Getattr(n, "type"), " result;\n", NIL); + Printv(wrapper->code, Getattr(n, "wrap:action"), "\n", NIL); + Printv(wrapper->code, "return result;\n}\n", NIL); + + Wrapper_print(wrapper, f_wrappers); + + Delete(wname); + DelWrapper(wrapper); + + return SWIG_OK; + } + +}; /* class C */ + +/* ----------------------------------------------------------------------------- + * swig_c() - Instantiate module + * ----------------------------------------------------------------------------- */ + +static Language *new_swig_c() { + return new C(); +} + +extern "C" Language *swig_c(void) { + return new_swig_c(); +} + +/* ----------------------------------------------------------------------------- + * Static member variables + * ----------------------------------------------------------------------------- */ + +const char *C::usage = (char *) "\ +C Options (available with -c)\n\ +\n"; + diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx index 3b60f2259..b727b9c67 100644 --- a/Source/Modules/swigmain.cxx +++ b/Source/Modules/swigmain.cxx @@ -47,6 +47,7 @@ extern "C" { Language *swig_cffi(void); Language *swig_uffi(void); Language *swig_r(void); + Language *swig_c(void); } struct swig_module { @@ -61,6 +62,7 @@ struct swig_module { static swig_module modules[] = { {"-allegrocl", swig_allegrocl, "ALLEGROCL"}, + {"-c", swig_c, "C"}, {"-chicken", swig_chicken, "CHICKEN"}, {"-clisp", swig_clisp, "CLISP"}, {"-cffi", swig_cffi, "CFFI"}, From a36f790271119e00d31bdefade67c289252c6a14 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Fri, 30 May 2008 16:17:24 +0000 Subject: [PATCH 002/508] Experimenting with global function wrapping, generating C proxy file, 'prepend' feature. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10512 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 2 +- Examples/c/simple/example.i | 7 +- Source/Modules/c.cxx | 378 +++++++++++++++++++++--------------- 3 files changed, 226 insertions(+), 161 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 9eaea2447..efe5f99c7 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1102,6 +1102,6 @@ c: $(SRCS) $(SWIG) -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) - $(CC) $(EXEC) -L. -l$(LIBPREFIX)_$(TARGET) + $(CC) $(EXEC) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i index 3193ec653..287b55336 100644 --- a/Examples/c/simple/example.i +++ b/Examples/c/simple/example.i @@ -1,6 +1,9 @@ /* File : example.i */ %module example -%inline %{ +%feature("prepend") { + printf("Testing...\n"); +} + extern int gcd(int x, int y); -%} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index eb0064111..ff8d981e0 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1,158 +1,220 @@ -/* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * c.cxx - * - * C language module for SWIG. - * ----------------------------------------------------------------------------- */ - -char cvsroot_c_cxx[] = "$Id: c.cxx 10452 2008-05-15 21:16:48Z wsfulton $"; - -#include "swigmod.h" - -class C:public Language { - static const char *usage; - - File *f_runtime; - File *f_runtime_h; - File *f_header; - File *f_wrappers; - File *f_init; - -public: - - /* ----------------------------------------------------------------------------- - * C() - * ----------------------------------------------------------------------------- */ - - C() { - } - - /* ------------------------------------------------------------ - * main() - * ------------------------------------------------------------ */ - - virtual void main(int argc, char *argv[]) { - - SWIG_library_directory("c"); - - // Add a symbol to the parser for conditional compilation - Preprocessor_define("SWIGC 1", 0); - - // Add typemap definitions - SWIG_typemap_lang("c"); - SWIG_config_file("c.swg"); - - // Look for certain command line options - for (int i = 1; i < argc; i++) { - if (argv[i]) { - if (strcmp(argv[i], "-help") == 0) { - Printf(stdout, "%s\n", usage); - } - } - } - } - - /* --------------------------------------------------------------------- - * top() - * --------------------------------------------------------------------- */ - - virtual int top(Node *n) { - Printf(stdout, "top called\n"); - - String *module = Getattr(n, "name"); - String *outfile = Getattr(n, "outfile"); - - /* initialize I/O */ - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { - FileErrorDisplay(outfile); - SWIG_exit(EXIT_FAILURE); - } - f_init = NewString(""); - f_header = NewString(""); - f_wrappers = NewString(""); - - Swig_register_filebyname("header", f_header); - Swig_register_filebyname("wrappers", f_wrappers); - Swig_register_filebyname("runtime", f_runtime); - Swig_register_filebyname("init", f_init); - - /* emit code for children */ - Language::top(n); - - /* write all to file */ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); - - /* cleanup */ - Delete(f_header); - Delete(f_wrappers); - Delete(f_init); - Close(f_runtime); - Delete(f_runtime); - - return SWIG_OK; - } - - virtual int functionWrapper(Node *n) { - Printf(stdout, "creating function wrapper\n"); - String *name = Getattr(n, "sym:name"); - String *type = Getattr(n, "type"); - ParmList *parms = Getattr(n, "parms"); - String *wrapname = Getattr(n, "wrap:name"); - - Wrapper *wrapper = NewWrapper(); - String *wname = Swig_name_wrapper(name); - - Setattr(n, "wrap:name", wname); - - String *parse_args = NewString(""); - Parm *parm; - for (parm = parms; parm; ) { - Append(parse_args, Getattr(parm, "type")); - Append(parse_args, " "); - Append(parse_args, Getattr(parm, "lname")); - parm = nextSibling(parm); - if (parm) { - Append(parse_args, ", "); - } - } - - Printv(wrapper->def, type, " ", wname, "(", parse_args, ") {", NIL); - Printv(wrapper->code, Getattr(n, "type"), " result;\n", NIL); - Printv(wrapper->code, Getattr(n, "wrap:action"), "\n", NIL); - Printv(wrapper->code, "return result;\n}\n", NIL); - - Wrapper_print(wrapper, f_wrappers); - - Delete(wname); - DelWrapper(wrapper); - - return SWIG_OK; - } - -}; /* class C */ - -/* ----------------------------------------------------------------------------- - * swig_c() - Instantiate module - * ----------------------------------------------------------------------------- */ - -static Language *new_swig_c() { - return new C(); -} - -extern "C" Language *swig_c(void) { - return new_swig_c(); -} - -/* ----------------------------------------------------------------------------- - * Static member variables - * ----------------------------------------------------------------------------- */ - -const char *C::usage = (char *) "\ -C Options (available with -c)\n\ -\n"; - +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * c.cxx + * + * C language module for SWIG. + * ----------------------------------------------------------------------------- */ + +char cvsroot_c_cxx[] = "$Id$"; + +#include "swigmod.h" + +class C:public Language { + static const char *usage; + + File *f_runtime; + File *f_header; + File *f_wrappers; + File *f_init; + File *f_shadow_c; + + String *f_shadow; + + bool shadow_flag; + +public: + + /* ----------------------------------------------------------------------------- + * C() + * ----------------------------------------------------------------------------- */ + + C() : shadow_flag(true) { + } + + /* ------------------------------------------------------------ + * main() + * ------------------------------------------------------------ */ + + virtual void main(int argc, char *argv[]) { + + SWIG_library_directory("c"); + + // Add a symbol to the parser for conditional compilation + Preprocessor_define("SWIGC 1", 0); + + // Add typemap definitions + SWIG_typemap_lang("c"); + SWIG_config_file("c.swg"); + + // Look for certain command line options + for (int i = 1; i < argc; i++) { + if (argv[i]) { + if (strcmp(argv[i], "-help") == 0) { + Printf(stdout, "%s\n", usage); + } else if ((strcmp(argv[i], "-shadow") == 0) || (strcmp(argv[i], "-proxy") == 0)) { + shadow_flag = true; + } else if (strcmp(argv[i], "-noproxy") == 0) { + shadow_flag = false; + } + } + } + } + + /* --------------------------------------------------------------------- + * top() + * --------------------------------------------------------------------- */ + + virtual int top(Node *n) { + String *module = Getattr(n, "name"); + String *outfile = Getattr(n, "outfile"); + + /* initialize I/O */ + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { + FileErrorDisplay(outfile); + SWIG_exit(EXIT_FAILURE); + } + f_init = NewString(""); + f_header = NewString(""); + f_wrappers = NewString(""); + + /* generate shadow file if enabled */ + if (shadow_flag) { + f_shadow = NewString(""); + + /* create shadow file with appropriate name */ + String *shadow_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); + if ((f_shadow_c = NewFile(shadow_filename, "w")) == 0) { + FileErrorDisplay(shadow_filename); + SWIG_exit(EXIT_FAILURE); + } + + Swig_register_filebyname("shadow", f_shadow); + + Printf(f_shadow, "/* This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f_shadow, " * Version %s\n", Swig_package_version()); + Printf(f_shadow, " * \n"); + Printf(f_shadow, " * Don't modify this file, modify the SWIG interface instead.\n"); + Printf(f_shadow, " */\n\n"); + } + + Swig_register_filebyname("header", f_header); + Swig_register_filebyname("wrappers", f_wrappers); + Swig_register_filebyname("runtime", f_runtime); + Swig_register_filebyname("init", f_init); + + /* emit code for children */ + Language::top(n); + + /* finalize generating shadow file */ + if (shadow_flag) { + Printv(f_shadow_c, f_shadow, "\n", NIL); + Close(f_shadow_c); + Delete(f_shadow); + } + + /* write all to file */ + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); + + /* cleanup */ + Delete(f_header); + Delete(f_wrappers); + Delete(f_init); + Close(f_runtime); + Delete(f_runtime); + + return SWIG_OK; + } + + virtual int functionWrapper(Node *n) { + String *name = Getattr(n, "sym:name"); + SwigType *type = Getattr(n, "type"); + ParmList *parms = Getattr(n, "parms"); + + /* create new wrapper name */ + Wrapper *wrapper = NewWrapper(); + String *wname = Swig_name_wrapper(name); + Setattr(n, "wrap:name", wname); + + /* create wrapper function prototype */ + Printv(wrapper->def, type, " ", wname, "(", NIL); + + /* prepare parameter list */ + Parm *p, *np; + for (p = parms; p; ) { + np = nextSibling(p); + Printv(wrapper->def, Getattr(p, "type"), " ", Getattr(p, "lname"), np ? ", " : "", NIL); + p = np; + } + Printv(wrapper->def, ") {", NIL); + + /* declare wrapper function local variables */ + emit_return_variable(n, type, wrapper); + + /* emit action code */ + String *action = emit_action(n); + Append(wrapper->code, action); + Append(wrapper->code, "return result;\n}\n"); + + Wrapper_print(wrapper, f_wrappers); + + /* take care of shadow function */ + if (shadow_flag) { + String *proto = ParmList_str(parms); + String *arg_names = NewString(""); + Printv(f_shadow, type, " ", name, "(", proto, ") {\n", NIL); + + Parm *p, *np; + for (p = parms; p; ) { + np = nextSibling(p); + Printv(arg_names, Getattr(p, "name"), np ? ", " : "", NIL); + p = np; + } + + /* handle 'prepend' feature */ + String *prepend_str = Getattr(n, "feature:prepend"); + if (prepend_str) { + char *t = Char(prepend_str); + if (*t == '{') { + Delitem(prepend_str, 0); + Delitem(prepend_str, DOH_END); + } + Printv(f_shadow, prepend_str, "\n", NIL); + } + + Printv(f_shadow, " return ", wname, "(", arg_names, ");\n", NIL); + Printv(f_shadow, "}\n", NIL); + } + + Delete(wname); + DelWrapper(wrapper); + + return SWIG_OK; + } + +}; /* class C */ + +/* ----------------------------------------------------------------------------- + * swig_c() - Instantiate module + * ----------------------------------------------------------------------------- */ + +static Language *new_swig_c() { + return new C(); +} + +extern "C" Language *swig_c(void) { + return new_swig_c(); +} + +/* ----------------------------------------------------------------------------- + * Static member variables + * ----------------------------------------------------------------------------- */ + +const char *C::usage = (char *) "\ +C Options (available with -c)\n\ +\n"; + From d828791f565b91d765f4f5bfb112b32d1c512f70 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 7 Jun 2008 20:30:42 +0000 Subject: [PATCH 003/508] Some changes to generated proxy .c and .h file. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10522 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/simple/example.c | 2 +- Examples/c/simple/example.i | 7 ++- Examples/c/simple/main.c | 6 ++- Source/Modules/c.cxx | 101 +++++++++++++++++++++++++++++------- 4 files changed, 92 insertions(+), 24 deletions(-) diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c index 5c20344cf..5ae9a6e38 100644 --- a/Examples/c/simple/example.c +++ b/Examples/c/simple/example.c @@ -1,7 +1,7 @@ /* File : example.c */ /* A global variable */ -/* double Foo = 3.0; */ +double Foo = 3.0; /* Compute the greatest common divisor of positive integers */ int gcd(int x, int y) { diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i index 287b55336..a8a658944 100644 --- a/Examples/c/simple/example.i +++ b/Examples/c/simple/example.i @@ -1,9 +1,8 @@ /* File : example.i */ %module example -%feature("prepend") { - printf("Testing...\n"); -} - +%inline %{ +extern double Foo; extern int gcd(int x, int y); +%} diff --git a/Examples/c/simple/main.c b/Examples/c/simple/main.c index 11f0b2f73..a44f19287 100644 --- a/Examples/c/simple/main.c +++ b/Examples/c/simple/main.c @@ -1,8 +1,12 @@ #include +#include "example_proxy.h" + int main(int argc, char **argv) { int a = 35; int b = 15; - printf("GCD(%d, %d)=%d", a, b, gcd(a, b)); + printf("Foo is %f\n", Foo); + printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); + return 0; } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index ff8d981e0..0b47d20aa 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -19,8 +19,10 @@ class C:public Language { File *f_wrappers; File *f_init; File *f_shadow_c; + File *f_shadow_h; - String *f_shadow; + String *f_shadow_code; + String *f_shadow_header; bool shadow_flag; @@ -62,6 +64,27 @@ public: } } + void emitBanner(File *f) { + Printf(f, "/* This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f, " * Version %s\n", Swig_package_version()); + Printf(f, " * \n"); + Printf(f, " * Don't modify this file, modify the SWIG interface instead.\n"); + Printf(f, " */\n\n"); + } + + void emitMingwLinkFix(File *f) { + Printf(f, "#ifndef __GNUC__\n"); + Printf(f, "# define __DLL_IMPORT __declspec(dllimport)\n"); + Printf(f, "#else\n"); + Printf(f, "# define __DLL_IMPORT __attribute__((dllimport)) extern\n"); + Printf(f, "#endif\n\n"); + Printf(f, "#if defined (BUILD_ddd_DLL) || !defined (__WIN32__)\n"); + Printf(f, "# define DLL_IMPORT extern\n"); + Printf(f, "#else\n"); + Printf(f, "# define DLL_IMPORT __DLL_IMPORT\n"); + Printf(f, "#endif\n\n"); + } + /* --------------------------------------------------------------------- * top() * --------------------------------------------------------------------- */ @@ -80,24 +103,31 @@ public: f_header = NewString(""); f_wrappers = NewString(""); - /* generate shadow file if enabled */ + /* generate shadow files if enabled */ if (shadow_flag) { - f_shadow = NewString(""); + f_shadow_code = NewString(""); + f_shadow_header = NewString(""); /* create shadow file with appropriate name */ - String *shadow_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); - if ((f_shadow_c = NewFile(shadow_filename, "w")) == 0) { - FileErrorDisplay(shadow_filename); + String *shadow_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); + if ((f_shadow_c = NewFile(shadow_code_filename, "w")) == 0) { + FileErrorDisplay(shadow_code_filename); SWIG_exit(EXIT_FAILURE); } - Swig_register_filebyname("shadow", f_shadow); + String *shadow_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module)); + if ((f_shadow_h = NewFile(shadow_header_filename, "w")) == 0) { + FileErrorDisplay(shadow_header_filename); + SWIG_exit(EXIT_FAILURE); + } - Printf(f_shadow, "/* This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f_shadow, " * Version %s\n", Swig_package_version()); - Printf(f_shadow, " * \n"); - Printf(f_shadow, " * Don't modify this file, modify the SWIG interface instead.\n"); - Printf(f_shadow, " */\n\n"); + Swig_register_filebyname("shadow_code", f_shadow_code); + Swig_register_filebyname("shadow_header", f_shadow_header); + + emitBanner(f_shadow_code); + emitBanner(f_shadow_header); + emitMingwLinkFix(f_shadow_header); + Printf(f_shadow_code, "#include \"%s\"\n\n", shadow_header_filename); } Swig_register_filebyname("header", f_header); @@ -110,9 +140,12 @@ public: /* finalize generating shadow file */ if (shadow_flag) { - Printv(f_shadow_c, f_shadow, "\n", NIL); + Printv(f_shadow_c, f_shadow_code, "\n", NIL); + Printv(f_shadow_h, f_shadow_header, "\n", NIL); Close(f_shadow_c); - Delete(f_shadow); + Close(f_shadow_h); + Delete(f_shadow_code); + Delete(f_shadow_header); } /* write all to file */ @@ -130,6 +163,19 @@ public: return SWIG_OK; } + virtual int globalvariableHandler(Node *n) { + if (shadow_flag) { + Printv(f_shadow_header, "DLL_IMPORT ", Getattr(n, "type"), " ", Getattr(n, "name"), NIL); + String *defval = NewString(""); + defval = Getattr(n, "value"); + if (defval) { + Printv(f_shadow_header, " = ", defval, NIL); + } + Printf(f_shadow_header, ";\n"); + } + return SWIG_OK; + } + virtual int functionWrapper(Node *n) { String *name = Getattr(n, "sym:name"); SwigType *type = Getattr(n, "type"); @@ -148,6 +194,7 @@ public: for (p = parms; p; ) { np = nextSibling(p); Printv(wrapper->def, Getattr(p, "type"), " ", Getattr(p, "lname"), np ? ", " : "", NIL); + Printf(stdout, "%s\n", Getattr(p, "tmap:argout")); p = np; } Printv(wrapper->def, ") {", NIL); @@ -166,7 +213,6 @@ public: if (shadow_flag) { String *proto = ParmList_str(parms); String *arg_names = NewString(""); - Printv(f_shadow, type, " ", name, "(", proto, ") {\n", NIL); Parm *p, *np; for (p = parms; p; ) { @@ -175,6 +221,9 @@ public: p = np; } + Printv(f_shadow_code, "extern ", type, " _wrap_", name, "(", proto, ");\n", NIL); + Printv(f_shadow_code, type, " ", name, "(", proto, ") {\n", NIL); + /* handle 'prepend' feature */ String *prepend_str = Getattr(n, "feature:prepend"); if (prepend_str) { @@ -183,11 +232,27 @@ public: Delitem(prepend_str, 0); Delitem(prepend_str, DOH_END); } - Printv(f_shadow, prepend_str, "\n", NIL); + Printv(f_shadow_code, prepend_str, "\n", NIL); } - Printv(f_shadow, " return ", wname, "(", arg_names, ");\n", NIL); - Printv(f_shadow, "}\n", NIL); + /* call to the wrapper function */ + Printv(f_shadow_code, " return ", wname, "(", arg_names, ");\n", NIL); + + /* handle 'append' feature */ + String *append_str = Getattr(n, "feature:append"); + if (append_str) { + char *t = Char(append_str); + if (*t == '{') { + Delitem(append_str, 0); + Delitem(append_str, DOH_END); + } + Printv(f_shadow_code, append_str, "\n", NIL); + } + + Printv(f_shadow_code, "}\n", NIL); + + /* add function declaration to the proxy header file */ + Printv(f_shadow_header, type, " ", name, "(", proto, ");\n"); } Delete(wname); From a5b8db8296d40b9dab91b6b9695806a5a0ee8d39 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 16 Jun 2008 15:27:36 +0000 Subject: [PATCH 004/508] Global variable and function handling from C to C. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10526 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 7 ++- Examples/c/simple/Makefile | 6 +- Examples/c/simple/example.c | 8 +++ Examples/c/simple/example.i | 4 ++ Examples/c/simple/main.c | 3 + Source/Modules/c.cxx | 119 ++++++++++++++++++++++++------------ 6 files changed, 106 insertions(+), 41 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index efe5f99c7..65a1ccf01 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1102,6 +1102,11 @@ c: $(SRCS) $(SWIG) -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) - $(CC) $(EXEC) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) + $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) +c_cpp: $(SRCS) + $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) + $(CC) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBSi) $(CPP_DLLIBS) + $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index 345c473dd..594a5e598 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -3,10 +3,12 @@ SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i -EXEC = main.c +MAIN = main.c all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' EXEC='$(EXEC)' c + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c +clean: + rm *.o diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c index 5ae9a6e38..6bd36a3d6 100644 --- a/Examples/c/simple/example.c +++ b/Examples/c/simple/example.c @@ -3,6 +3,14 @@ /* A global variable */ double Foo = 3.0; +double *Foo_ptr = &Foo; +char *my_str = "hello, world!"; +char *array_of_strs[] = { "one", "two" }; + +char *get_str(int i) { + return array_of_strs[i]; +} + /* Compute the greatest common divisor of positive integers */ int gcd(int x, int y) { int g; diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i index a8a658944..afe2b1b1f 100644 --- a/Examples/c/simple/example.i +++ b/Examples/c/simple/example.i @@ -3,6 +3,10 @@ %inline %{ extern double Foo; +extern double *Foo_ptr; +extern char *my_str; +extern char **array_of_strs; +extern char *get_str(int i); extern int gcd(int x, int y); %} diff --git a/Examples/c/simple/main.c b/Examples/c/simple/main.c index a44f19287..c425964b5 100644 --- a/Examples/c/simple/main.c +++ b/Examples/c/simple/main.c @@ -6,6 +6,9 @@ int main(int argc, char **argv) { int a = 35; int b = 15; printf("Foo is %f\n", Foo); + printf("Foo by ptr is \%f (%d)\n", *Foo_ptr, (int) Foo_ptr); + printf("my_str is: %s\n", my_str); + printf("array_of_strs contains %s and %s\n", get_str(0), get_str(1)); printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); return 0; } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 0b47d20aa..b24fb65c9 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -21,7 +21,8 @@ class C:public Language { File *f_shadow_c; File *f_shadow_h; - String *f_shadow_code; + String *f_shadow_code_init; + String *f_shadow_code_body; String *f_shadow_header; bool shadow_flag; @@ -72,16 +73,36 @@ public: Printf(f, " */\n\n"); } - void emitMingwLinkFix(File *f) { - Printf(f, "#ifndef __GNUC__\n"); - Printf(f, "# define __DLL_IMPORT __declspec(dllimport)\n"); - Printf(f, "#else\n"); - Printf(f, "# define __DLL_IMPORT __attribute__((dllimport)) extern\n"); + void emitSwigExport(File *f) { + Printf(f, "#ifndef SWIGEXPORT\n"); + Printf(f, "# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)\n"); + Printf(f, "# if defined(STATIC_LINKED)\n"); + Printf(f, "# define SWIGEXPORT\n"); + Printf(f, "# else\n"); + Printf(f, "# define SWIGEXPORT __declspec(dllexport)\n"); + Printf(f, "# endif\n"); + Printf(f, "# else\n"); + Printf(f, "# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)\n"); + Printf(f, "# define SWIGEXPORT __attribute__ ((visibility(\"default\")))\n"); + Printf(f, "# else\n"); + Printf(f, "# define SWIGEXPORT\n"); + Printf(f, "# endif\n"); + Printf(f, "# endif\n"); Printf(f, "#endif\n\n"); - Printf(f, "#if defined (BUILD_ddd_DLL) || !defined (__WIN32__)\n"); - Printf(f, "# define DLL_IMPORT extern\n"); - Printf(f, "#else\n"); - Printf(f, "# define DLL_IMPORT __DLL_IMPORT\n"); + } + + void emitSwigImport(File *f) { + Printf(f, "#ifndef SWIGIMPORT\n"); + Printf(f, "# ifndef __GNUC__\n"); + Printf(f, "# define __DLL_IMPORT __declspec(dllimport)\n"); + Printf(f, "# else\n"); + Printf(f, "# define __DLL_IMPORT __attribute__((dllimport)) extern\n"); + Printf(f, "# endif\n"); + Printf(f, "# if !defined (__WIN32__)\n"); + Printf(f, "# define SWIGIMPORT extern\n"); + Printf(f, "# else\n"); + Printf(f, "# define SWIGIMPORT __DLL_IMPORT\n"); + Printf(f, "# endif\n"); Printf(f, "#endif\n\n"); } @@ -105,7 +126,8 @@ public: /* generate shadow files if enabled */ if (shadow_flag) { - f_shadow_code = NewString(""); + f_shadow_code_init = NewString(""); + f_shadow_code_body = NewString(""); f_shadow_header = NewString(""); /* create shadow file with appropriate name */ @@ -121,13 +143,14 @@ public: SWIG_exit(EXIT_FAILURE); } - Swig_register_filebyname("shadow_code", f_shadow_code); + Swig_register_filebyname("shadow_code_init", f_shadow_code_init); + Swig_register_filebyname("shadow_code_body", f_shadow_code_body); Swig_register_filebyname("shadow_header", f_shadow_header); - emitBanner(f_shadow_code); + emitBanner(f_shadow_code_init); emitBanner(f_shadow_header); - emitMingwLinkFix(f_shadow_header); - Printf(f_shadow_code, "#include \"%s\"\n\n", shadow_header_filename); + emitSwigImport(f_shadow_header); + Printf(f_shadow_code_init, "#include \"%s\"\n\n", shadow_header_filename); } Swig_register_filebyname("header", f_header); @@ -135,16 +158,25 @@ public: Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); + Printf(f_wrappers, "#ifdef __cplusplus\n"); + Printf(f_wrappers, "extern \"C\" {\n"); + Printf(f_wrappers, "#endif\n\n"); + /* emit code for children */ Language::top(n); + Printf(f_wrappers, "#ifdef __cplusplus\n"); + Printf(f_wrappers, "}\n"); + Printf(f_wrappers, "#endif\n"); + /* finalize generating shadow file */ if (shadow_flag) { - Printv(f_shadow_c, f_shadow_code, "\n", NIL); + Printv(f_shadow_c, f_shadow_code_init, "\n", NIL); + Printv(f_shadow_c, f_shadow_code_body, "\n", NIL); Printv(f_shadow_h, f_shadow_header, "\n", NIL); Close(f_shadow_c); Close(f_shadow_h); - Delete(f_shadow_code); + Delete(f_shadow_code_init); Delete(f_shadow_header); } @@ -163,44 +195,55 @@ public: return SWIG_OK; } + /* ----------------------------------------------------------------------- + * globalvariableHandler() + * ------------------------------------------------------------------------ */ + virtual int globalvariableHandler(Node *n) { + SwigType *type = Getattr(n, "type"); + String *type_str = SwigType_str(type, 0); + Printv(f_wrappers, "SWIGEXPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); if (shadow_flag) { - Printv(f_shadow_header, "DLL_IMPORT ", Getattr(n, "type"), " ", Getattr(n, "name"), NIL); - String *defval = NewString(""); - defval = Getattr(n, "value"); - if (defval) { - Printv(f_shadow_header, " = ", defval, NIL); - } - Printf(f_shadow_header, ";\n"); + Printv(f_shadow_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); } return SWIG_OK; } + /* ---------------------------------------------------------------------- + * functionWrapper() + * ---------------------------------------------------------------------- */ + virtual int functionWrapper(Node *n) { String *name = Getattr(n, "sym:name"); - SwigType *type = Getattr(n, "type"); + SwigType *return_type = Getattr(n, "type"); + String *return_type_str = SwigType_str(return_type, 0); ParmList *parms = Getattr(n, "parms"); - /* create new wrapper name */ + /* create new function wrapper object */ Wrapper *wrapper = NewWrapper(); + + /* create new wrapper name */ String *wname = Swig_name_wrapper(name); Setattr(n, "wrap:name", wname); /* create wrapper function prototype */ - Printv(wrapper->def, type, " ", wname, "(", NIL); + Printv(wrapper->def, "SWIGEXPORT ", return_type_str, " ", wname, "(", NIL); + + /* attach the standard typemaps */ + emit_attach_parmmaps(parms, wrapper); /* prepare parameter list */ Parm *p, *np; for (p = parms; p; ) { np = nextSibling(p); - Printv(wrapper->def, Getattr(p, "type"), " ", Getattr(p, "lname"), np ? ", " : "", NIL); - Printf(stdout, "%s\n", Getattr(p, "tmap:argout")); + SwigType *type = Getattr(p, "type"); + Printv(wrapper->def, SwigType_str(type, 0), " ", Getattr(p, "lname"), np ? ", " : "", NIL); p = np; } Printv(wrapper->def, ") {", NIL); /* declare wrapper function local variables */ - emit_return_variable(n, type, wrapper); + emit_return_variable(n, return_type, wrapper); /* emit action code */ String *action = emit_action(n); @@ -221,8 +264,8 @@ public: p = np; } - Printv(f_shadow_code, "extern ", type, " _wrap_", name, "(", proto, ");\n", NIL); - Printv(f_shadow_code, type, " ", name, "(", proto, ") {\n", NIL); + Printv(f_shadow_code_init, "extern ", return_type_str, " _wrap_", name, "(", proto, ");\n", NIL); + Printv(f_shadow_code_body, return_type_str, " ", name, "(", proto, ") {\n", NIL); /* handle 'prepend' feature */ String *prepend_str = Getattr(n, "feature:prepend"); @@ -232,11 +275,11 @@ public: Delitem(prepend_str, 0); Delitem(prepend_str, DOH_END); } - Printv(f_shadow_code, prepend_str, "\n", NIL); + Printv(f_shadow_code_body, prepend_str, "\n", NIL); } /* call to the wrapper function */ - Printv(f_shadow_code, " return ", wname, "(", arg_names, ");\n", NIL); + Printv(f_shadow_code_body, " return ", wname, "(", arg_names, ");\n", NIL); /* handle 'append' feature */ String *append_str = Getattr(n, "feature:append"); @@ -245,14 +288,14 @@ public: if (*t == '{') { Delitem(append_str, 0); Delitem(append_str, DOH_END); - } - Printv(f_shadow_code, append_str, "\n", NIL); + } + Printv(f_shadow_code_body, append_str, "\n", NIL); } - Printv(f_shadow_code, "}\n", NIL); + Printv(f_shadow_code_body, "}\n", NIL); /* add function declaration to the proxy header file */ - Printv(f_shadow_header, type, " ", name, "(", proto, ");\n"); + Printv(f_shadow_header, return_type_str, " ", name, "(", proto, ");\n"); } Delete(wname); From e06b48e3f6dd9f175720c8b66e7cf687c0d36c7c Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Fri, 20 Jun 2008 16:34:35 +0000 Subject: [PATCH 005/508] Basic constructor and destructor wrapper. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10532 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 2 +- Examples/c/class/Makefile | 14 ++++ Examples/c/class/example.cxx | 28 +++++++ Examples/c/class/example.h | 39 +++++++++ Examples/c/class/example.i | 10 +++ Examples/c/class/main.c | 12 +++ Source/Modules/c.cxx | 154 ++++++++++++++++++++++++++++++----- 7 files changed, 238 insertions(+), 21 deletions(-) create mode 100644 Examples/c/class/Makefile create mode 100644 Examples/c/class/example.cxx create mode 100644 Examples/c/class/example.h create mode 100644 Examples/c/class/example.i create mode 100644 Examples/c/class/main.c diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 65a1ccf01..e33abbe80 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1107,6 +1107,6 @@ c: $(SRCS) c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBSi) $(CPP_DLLIBS) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile new file mode 100644 index 000000000..261038599 --- /dev/null +++ b/Examples/c/class/Makefile @@ -0,0 +1,14 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +MAIN = main.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp + +clean: + rm *.o + diff --git a/Examples/c/class/example.cxx b/Examples/c/class/example.cxx new file mode 100644 index 000000000..b1d7ebe95 --- /dev/null +++ b/Examples/c/class/example.cxx @@ -0,0 +1,28 @@ +/* File : example.cxx */ + +#include "example.h" +#define M_PI 3.14159265358979323846 + +/* Move the shape to a new location */ +void Shape::move(double dx, double dy) { + x += dx; + y += dy; +} + +int Shape::nshapes = 0; + +double Circle::area(void) { + return M_PI*radius*radius; +} + +double Circle::perimeter(void) { + return 2*M_PI*radius; +} + +double Square::area(void) { + return width*width; +} + +double Square::perimeter(void) { + return 4*width; +} diff --git a/Examples/c/class/example.h b/Examples/c/class/example.h new file mode 100644 index 000000000..1d4606f86 --- /dev/null +++ b/Examples/c/class/example.h @@ -0,0 +1,39 @@ +/* File : example.h */ + +class Shape { +public: + Shape() { + nshapes++; + } + virtual ~Shape() { + nshapes--; + }; + double x, y; + void move(double dx, double dy); + virtual double area(void) = 0; + virtual double perimeter(void) = 0; + static int nshapes; +}; + +class Circle : public Shape { +private: + double radius; +public: + Circle(double r) : radius(r) { }; + virtual double area(void); + virtual double perimeter(void); +}; + +class Square : public Shape { +private: + double width; +public: + Square(double w) : width(w) { }; + virtual double area(void); + virtual double perimeter(void); +}; + + + + + diff --git a/Examples/c/class/example.i b/Examples/c/class/example.i new file mode 100644 index 000000000..9a0ad50c5 --- /dev/null +++ b/Examples/c/class/example.i @@ -0,0 +1,10 @@ +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +/* Let's just grab the original header file here */ +%include "example.h" + diff --git a/Examples/c/class/main.c b/Examples/c/class/main.c new file mode 100644 index 000000000..9ec6d12da --- /dev/null +++ b/Examples/c/class/main.c @@ -0,0 +1,12 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char **argv) { + struct CircleObj* pc = new_Circle(10.0); + + // ... + + delete_Circle(pc); +} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index b24fb65c9..65190d9fc 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -25,6 +25,8 @@ class C:public Language { String *f_shadow_code_body; String *f_shadow_header; + String *empty_string; + bool shadow_flag; public: @@ -33,7 +35,9 @@ public: * C() * ----------------------------------------------------------------------------- */ - C() : shadow_flag(true) { + C() : + empty_string(NewString("")), + shadow_flag(true) { } /* ------------------------------------------------------------ @@ -65,14 +69,6 @@ public: } } - void emitBanner(File *f) { - Printf(f, "/* This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f, " * Version %s\n", Swig_package_version()); - Printf(f, " * \n"); - Printf(f, " * Don't modify this file, modify the SWIG interface instead.\n"); - Printf(f, " */\n\n"); - } - void emitSwigExport(File *f) { Printf(f, "#ifndef SWIGEXPORT\n"); Printf(f, "# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)\n"); @@ -124,6 +120,11 @@ public: f_header = NewString(""); f_wrappers = NewString(""); + Swig_banner(f_runtime); + + // FIXME + Printf(f_header, "#include \"malloc.h\"\n\n"); + /* generate shadow files if enabled */ if (shadow_flag) { f_shadow_code_init = NewString(""); @@ -147,8 +148,8 @@ public: Swig_register_filebyname("shadow_code_body", f_shadow_code_body); Swig_register_filebyname("shadow_header", f_shadow_header); - emitBanner(f_shadow_code_init); - emitBanner(f_shadow_header); + Swig_banner(f_shadow_code_init); + Swig_banner(f_shadow_header); emitSwigImport(f_shadow_header); Printf(f_shadow_code_init, "#include \"%s\"\n\n", shadow_header_filename); } @@ -217,6 +218,7 @@ public: String *name = Getattr(n, "sym:name"); SwigType *return_type = Getattr(n, "type"); String *return_type_str = SwigType_str(return_type, 0); + String *arg_names = NewString(""); ParmList *parms = Getattr(n, "parms"); /* create new function wrapper object */ @@ -238,6 +240,7 @@ public: np = nextSibling(p); SwigType *type = Getattr(p, "type"); Printv(wrapper->def, SwigType_str(type, 0), " ", Getattr(p, "lname"), np ? ", " : "", NIL); + Printv(arg_names, Getattr(p, "name"), np ? ", " : "", NIL); p = np; } Printv(wrapper->def, ") {", NIL); @@ -248,21 +251,15 @@ public: /* emit action code */ String *action = emit_action(n); Append(wrapper->code, action); - Append(wrapper->code, "return result;\n}\n"); + if (return_type && Strcmp(return_type, "void") != 0) + Append(wrapper->code, "return result;\n"); + Append(wrapper->code, "}\n"); Wrapper_print(wrapper, f_wrappers); /* take care of shadow function */ if (shadow_flag) { String *proto = ParmList_str(parms); - String *arg_names = NewString(""); - - Parm *p, *np; - for (p = parms; p; ) { - np = nextSibling(p); - Printv(arg_names, Getattr(p, "name"), np ? ", " : "", NIL); - p = np; - } Printv(f_shadow_code_init, "extern ", return_type_str, " _wrap_", name, "(", proto, ");\n", NIL); Printv(f_shadow_code_body, return_type_str, " ", name, "(", proto, ") {\n", NIL); @@ -298,12 +295,129 @@ public: Printv(f_shadow_header, return_type_str, " ", name, "(", proto, ");\n"); } + Delete(arg_names); Delete(wname); DelWrapper(wrapper); return SWIG_OK; } + /* --------------------------------------------------------------------- + * classDeclaration() + * --------------------------------------------------------------------- */ + + virtual int classHandler(Node* n) { + String* name = Getattr(n, "name"); + String* sobj_name = NewString(""); + Printv(sobj_name, "struct ", name, "Obj", NIL); + Printv(f_header, sobj_name, "{\n void* obj;\n};\n\n", NIL); + + if (shadow_flag) { + Printv(f_shadow_header, sobj_name, ";\n\n", NIL); + } + + Delete(sobj_name); + return Language::classHandler(n); + } + + /* --------------------------------------------------------------------- + * memberfunctionHandler() + * --------------------------------------------------------------------- */ + + virtual int memberfunctionHandler(Node* n) { + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * variableHandler() + * --------------------------------------------------------------------- */ + + virtual int variableHandler(Node* n) { + if (Cmp(Getattr(n, "ismember"), "1") != 0) + return globalvariableHandler(n); + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * constructorHandler() + * --------------------------------------------------------------------- */ + + virtual int constructorHandler(Node* n) { + String* sobj_name = NewString(""); + String* ctype = NewString(""); + String* code = NewString(""); + String* new_name = NewString(""); + String* arg_lnames = NewString(""); + ParmList* parms; + Parm* p, *np; + + parms = Getattr(n, "parms"); + int i = 1; + for (p = parms; p; ) { + np = nextSibling(p); + String* name = NewString(""); + Printf(name, "arg%d", i++); + Setattr(p, "lname", name); + Delete(name); + Printv(arg_lnames, name, np ? ", " : "", NIL); + p = np; + } + + Printv(sobj_name, "struct ", Getattr(n, "name"), "Obj", NIL); + ctype = Copy(sobj_name); + SwigType_add_pointer(ctype); + Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); + Printv(code, "result->obj = (void*) new ", Getattr(n, "name"), "(", arg_lnames, ");\n", NIL); + Setattr(n, "wrap:action", code); + Setattr(n, "type", ctype); + Printv(new_name, "new_", Getattr(n, "sym:name"), NIL); + Setattr(n, "sym:name", new_name); + + functionWrapper(n); + + Delete(arg_lnames); + Delete(new_name); + Delete(code); + Delete(ctype); + Delete(sobj_name); + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * destructorHandler() + * --------------------------------------------------------------------- */ + + virtual int destructorHandler(Node* n) { + String* sobj_name = NewString(""); + String* ctype = NewString(""); + String* code = NewString(""); + String* new_name = NewString(""); + Parm* p; + + Printv(sobj_name, "struct ", Getattr(n, "sym:name"), "Obj", NIL); + ctype = Copy(sobj_name); + SwigType_add_pointer(ctype); + + p = NewParm(ctype, "self"); + Setattr(p, "lname", "arg1"); + Setattr(n, "parms", p); + + Setattr(n, "type", "void"); + Printv(code, "delete ((", sobj_name, "*) arg1->obj);\nfree(arg1);\n", NIL); + Setattr(n, "wrap:action", code); + Printv(new_name, "delete_", Getattr(n, "sym:name"), NIL); + Setattr(n, "sym:name", new_name); + + functionWrapper(n); + + Delete(p); + Delete(new_name); + Delete(code); + Delete(ctype); + Delete(sobj_name); + return SWIG_OK; + } + }; /* class C */ /* ----------------------------------------------------------------------------- From 2620bb218ce89c56a9b39959d59ecf9c5293592b Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 21 Jun 2008 14:51:02 +0000 Subject: [PATCH 006/508] Member variable and function wrappers. The simple 'class' test passed. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10538 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 2 +- Examples/c/class/example.cxx | 3 +- Examples/c/class/example.h | 2 + Examples/c/class/main.c | 11 +- Examples/c/simple/main.c | 2 +- Source/Modules/c.cxx | 287 ++++++++++++++++++++++++++++------- 6 files changed, 249 insertions(+), 58 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index e33abbe80..df289688b 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1106,7 +1106,7 @@ c: $(SRCS) c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) - $(CC) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) + $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) diff --git a/Examples/c/class/example.cxx b/Examples/c/class/example.cxx index b1d7ebe95..d469a1894 100644 --- a/Examples/c/class/example.cxx +++ b/Examples/c/class/example.cxx @@ -12,7 +12,8 @@ void Shape::move(double dx, double dy) { int Shape::nshapes = 0; double Circle::area(void) { - return M_PI*radius*radius; + double xxx = M_PI*radius*radius; + return xxx; } double Circle::perimeter(void) { diff --git a/Examples/c/class/example.h b/Examples/c/class/example.h index 1d4606f86..c400eb272 100644 --- a/Examples/c/class/example.h +++ b/Examples/c/class/example.h @@ -1,5 +1,7 @@ /* File : example.h */ +#include + class Shape { public: Shape() { diff --git a/Examples/c/class/main.c b/Examples/c/class/main.c index 9ec6d12da..0b16cf7b8 100644 --- a/Examples/c/class/main.c +++ b/Examples/c/class/main.c @@ -3,10 +3,17 @@ #include "example_proxy.h" int main(int argc, char **argv) { - struct CircleObj* pc = new_Circle(10.0); + Circle* pc = new_Circle(10.0); + Square* ps = new_Square(10.0); - // ... + printf("Circle perim.=%f, area=%f\n", Circle_perimeter(pc), Circle_area(pc)); + printf("Square perim.=%f, area=%f\n", Square_perimeter(ps), Square_area(ps)); + + printf("Circle pos.=(%f, %f)\n", Shape_get_x(pc), Shape_get_y(pc)); + Shape_move(pc, 5.0, -5.0); + printf("After move pos.=(%f, %f)\n", Shape_get_x(pc), Shape_get_y(pc)); + delete_Square(ps); delete_Circle(pc); } diff --git a/Examples/c/simple/main.c b/Examples/c/simple/main.c index c425964b5..4be6f9e8b 100644 --- a/Examples/c/simple/main.c +++ b/Examples/c/simple/main.c @@ -6,7 +6,7 @@ int main(int argc, char **argv) { int a = 35; int b = 15; printf("Foo is %f\n", Foo); - printf("Foo by ptr is \%f (%d)\n", *Foo_ptr, (int) Foo_ptr); + printf("Foo by ptr is \%f\n", *Foo_ptr); printf("my_str is: %s\n", my_str); printf("array_of_strs contains %s and %s\n", get_str(0), get_str(1)); printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 65190d9fc..eb5eb960e 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -48,14 +48,14 @@ public: SWIG_library_directory("c"); - // Add a symbol to the parser for conditional compilation + // add a symbol to the parser for conditional compilation Preprocessor_define("SWIGC 1", 0); - // Add typemap definitions + // add typemap definitions SWIG_typemap_lang("c"); SWIG_config_file("c.swg"); - // Look for certain command line options + // look for certain command line options for (int i = 1; i < argc; i++) { if (argv[i]) { if (strcmp(argv[i], "-help") == 0) { @@ -110,7 +110,7 @@ public: String *module = Getattr(n, "name"); String *outfile = Getattr(n, "outfile"); - /* initialize I/O */ + // initialize I/O f_runtime = NewFile(outfile, "w"); if (!f_runtime) { FileErrorDisplay(outfile); @@ -123,15 +123,15 @@ public: Swig_banner(f_runtime); // FIXME - Printf(f_header, "#include \"malloc.h\"\n\n"); + Printf(f_header, "#include \n\n"); - /* generate shadow files if enabled */ + // generate shadow files if enabled if (shadow_flag) { f_shadow_code_init = NewString(""); f_shadow_code_body = NewString(""); f_shadow_header = NewString(""); - /* create shadow file with appropriate name */ + // create shadow files with appropriate name String *shadow_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); if ((f_shadow_c = NewFile(shadow_code_filename, "w")) == 0) { FileErrorDisplay(shadow_code_filename); @@ -163,14 +163,14 @@ public: Printf(f_wrappers, "extern \"C\" {\n"); Printf(f_wrappers, "#endif\n\n"); - /* emit code for children */ + // emit code for children Language::top(n); Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "}\n"); Printf(f_wrappers, "#endif\n"); - /* finalize generating shadow file */ + // finalize generating shadow file if (shadow_flag) { Printv(f_shadow_c, f_shadow_code_init, "\n", NIL); Printv(f_shadow_c, f_shadow_code_body, "\n", NIL); @@ -181,12 +181,12 @@ public: Delete(f_shadow_header); } - /* write all to file */ + // write all to the file Dump(f_header, f_runtime); Dump(f_wrappers, f_runtime); Wrapper_pretty_print(f_init, f_runtime); - /* cleanup */ + // cleanup Delete(f_header); Delete(f_wrappers); Delete(f_init); @@ -196,6 +196,25 @@ public: return SWIG_OK; } + /* ----------------------------------------------------------------------- + * add_parm_names() + * ------------------------------------------------------------------------ */ + + void add_parm_lnames(ParmList* parms, String* arg_list) { + Parm* p, * np; + int i = 1; + for (p = parms; p; ) { + np = nextSibling(p); + String* name = NewString(""); + Printf(name, "arg%d", i++); + if (arg_list) + Printv(arg_list, name, np ? ", " : "", NIL); + Setattr(p, "lname", name); + Delete(name); + p = np; + } + } + /* ----------------------------------------------------------------------- * globalvariableHandler() * ------------------------------------------------------------------------ */ @@ -219,36 +238,38 @@ public: SwigType *return_type = Getattr(n, "type"); String *return_type_str = SwigType_str(return_type, 0); String *arg_names = NewString(""); + String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); - /* create new function wrapper object */ + // create new function wrapper object Wrapper *wrapper = NewWrapper(); - /* create new wrapper name */ + // create new wrapper name String *wname = Swig_name_wrapper(name); Setattr(n, "wrap:name", wname); - /* create wrapper function prototype */ + // create wrapper function prototype Printv(wrapper->def, "SWIGEXPORT ", return_type_str, " ", wname, "(", NIL); - /* attach the standard typemaps */ + // attach the standard typemaps emit_attach_parmmaps(parms, wrapper); - /* prepare parameter list */ + // prepare parameter list Parm *p, *np; for (p = parms; p; ) { np = nextSibling(p); SwigType *type = Getattr(p, "type"); Printv(wrapper->def, SwigType_str(type, 0), " ", Getattr(p, "lname"), np ? ", " : "", NIL); Printv(arg_names, Getattr(p, "name"), np ? ", " : "", NIL); + Printv(arg_lnames, Getattr(p, "lname"), np ? ", " : "", NIL); p = np; } Printv(wrapper->def, ") {", NIL); - /* declare wrapper function local variables */ + // declare wrapper function local variables emit_return_variable(n, return_type, wrapper); - /* emit action code */ + // emit action code String *action = emit_action(n); Append(wrapper->code, action); if (return_type && Strcmp(return_type, "void") != 0) @@ -257,14 +278,32 @@ public: Append(wrapper->code, "}\n"); Wrapper_print(wrapper, f_wrappers); - /* take care of shadow function */ + // take care of shadow function if (shadow_flag) { - String *proto = ParmList_str(parms); + // use shadow-type for parameter if supplied + String* proto; + String* stype = Getattr(parms, "stype"); + if (stype) { + Swig_save("temp", parms, "type", NIL); + Setattr(parms, "type", stype); + proto = ParmList_str(parms); + Swig_restore(parms); + } + else { + proto = ParmList_str(parms); + } + // use shadow-type for return type if supplied + SwigType* shadow_type = Getattr(n, "stype"); + if (shadow_type) { + return_type_str = SwigType_str(shadow_type, 0); + } + + // emit proxy functions prototypes Printv(f_shadow_code_init, "extern ", return_type_str, " _wrap_", name, "(", proto, ");\n", NIL); Printv(f_shadow_code_body, return_type_str, " ", name, "(", proto, ") {\n", NIL); - /* handle 'prepend' feature */ + // handle 'prepend' feature String *prepend_str = Getattr(n, "feature:prepend"); if (prepend_str) { char *t = Char(prepend_str); @@ -275,10 +314,10 @@ public: Printv(f_shadow_code_body, prepend_str, "\n", NIL); } - /* call to the wrapper function */ + // call to the wrapper function Printv(f_shadow_code_body, " return ", wname, "(", arg_names, ");\n", NIL); - /* handle 'append' feature */ + // handle 'append' feature String *append_str = Getattr(n, "feature:append"); if (append_str) { char *t = Char(append_str); @@ -291,10 +330,12 @@ public: Printv(f_shadow_code_body, "}\n", NIL); - /* add function declaration to the proxy header file */ + // add function declaration to the proxy header file Printv(f_shadow_header, return_type_str, " ", name, "(", proto, ");\n"); } + // cleanup + Delete(arg_lnames); Delete(arg_names); Delete(wname); DelWrapper(wrapper); @@ -309,11 +350,14 @@ public: virtual int classHandler(Node* n) { String* name = Getattr(n, "name"); String* sobj_name = NewString(""); + + // emit "class"-struct definition Printv(sobj_name, "struct ", name, "Obj", NIL); Printv(f_header, sobj_name, "{\n void* obj;\n};\n\n", NIL); + // declare it in the proxy header if (shadow_flag) { - Printv(f_shadow_header, sobj_name, ";\n\n", NIL); + Printv(f_shadow_header, "\ntypedef ", sobj_name, " ", name, ";\n\n", NIL); } Delete(sobj_name); @@ -321,20 +365,147 @@ public: } /* --------------------------------------------------------------------- - * memberfunctionHandler() + * staticmemberfunctionHandler() * --------------------------------------------------------------------- */ - virtual int memberfunctionHandler(Node* n) { + virtual int staticmemberfunctionHandler(Node* n) { return SWIG_OK; } /* --------------------------------------------------------------------- - * variableHandler() + * memberfunctionHandler() * --------------------------------------------------------------------- */ - virtual int variableHandler(Node* n) { - if (Cmp(Getattr(n, "ismember"), "1") != 0) - return globalvariableHandler(n); + virtual int memberfunctionHandler(Node* n) { + String* name = Getattr(n, "sym:name"); + String* classname = Getattr(parentNode(n), "sym:name"); + String* sobj_name = NewString(""); + String* ctype = NewString(""); + String* stype = NewString(""); + String* new_name = NewString(""); + String* code = NewString(""); + String* arg_lnames = NewString(""); + + ParmList* parms = Getattr(n, "parms"); + + // create first argument + Printv(sobj_name, "struct ", classname, "Obj", NIL); + ctype = Copy(sobj_name); + SwigType_add_pointer(ctype); + Parm* p = NewParm(ctype, "self"); + stype = Copy(classname); + SwigType_add_pointer(stype); + Setattr(p, "stype", stype); + if (parms) + set_nextSibling(p, parms); + Setattr(n, "parms", p); + + // prepare argument names + parms = Getattr(n, "parms"); + add_parm_lnames(parms, arg_lnames); + + // omit first argument in method call + String* arg_call_lnames = Strstr(arg_lnames, "arg2"); + if (!arg_call_lnames) + arg_call_lnames = empty_string; + + // generate action code + Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "result = " : "", NIL); + Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); + Setattr(n, "wrap:action", code); + + // modify method name + Printv(new_name, classname, "_", name, NIL); + Setattr(n, "sym:name", new_name); + + functionWrapper(n); + + Delete(arg_lnames); + Delete(code); + Delete(new_name); + Delete(stype); + Delete(ctype); + Delete(sobj_name); + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * staticmembervariableHandler() + * --------------------------------------------------------------------- */ + + virtual int staticmembervariableHandler(Node* n) { + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * membervariableHandler() + * + * TODO: generate additional setters and getters to handle inheritance + * properly, i.e. pair of functions for each type in hierarchy + * + * --------------------------------------------------------------------- */ + + virtual int membervariableHandler(Node* n) { + String* name = Getattr(n, "sym:name"); + String* classname = Getattr(parentNode(n), "sym:name"); + String* sobj_name = NewString(""); + String* ctype = NewString(""); + String* stype = NewString(""); + String* new_name = NewString(""); + String* code = NewString(""); + + // create first argument + Printv(sobj_name, "struct ", classname, "Obj", NIL); + ctype = Copy(sobj_name); + SwigType_add_pointer(ctype); + Parm* p = NewParm(ctype, "self"); + stype = Copy(classname); + SwigType_add_pointer(stype); + Setattr(p, "stype", stype); + Setattr(p, "lname", "arg1"); + + // create second argument + Parm* t = NewParm(Getattr(n, "type"), "value"); + Setattr(t, "lname", "arg2"); + + /* create 'get' function */ + + Setattr(n, "parms", p); + + // generate action code + Printv(code, "result = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); + Setattr(n, "wrap:action", code); + + // modify method name + Printv(new_name, classname, "_get_", name, NIL); + Setattr(n, "sym:name", new_name); + + functionWrapper(n); + + /* create 'set' function */ + + set_nextSibling(p, t); + Setattr(n, "parms", p); + Setattr(n, "type", "void"); + + // generate action code + Delete(code); + code = NewString(""); + Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); + Setattr(n, "wrap:action", code); + + // modify method name + Delete(new_name); + new_name = NewString(""); + Printv(new_name, classname, "_set_", name, NIL); + Setattr(n, "sym:name", new_name); + + functionWrapper(n); + + Delete(code); + Delete(new_name); + Delete(ctype); + Delete(sobj_name); return SWIG_OK; } @@ -343,33 +514,33 @@ public: * --------------------------------------------------------------------- */ virtual int constructorHandler(Node* n) { + String* name = Getattr(n, "name"); String* sobj_name = NewString(""); String* ctype = NewString(""); + String* stype = NewString(""); String* code = NewString(""); String* new_name = NewString(""); String* arg_lnames = NewString(""); - ParmList* parms; - Parm* p, *np; + ParmList* parms = Getattr(n, "parms"); - parms = Getattr(n, "parms"); - int i = 1; - for (p = parms; p; ) { - np = nextSibling(p); - String* name = NewString(""); - Printf(name, "arg%d", i++); - Setattr(p, "lname", name); - Delete(name); - Printv(arg_lnames, name, np ? ", " : "", NIL); - p = np; - } + // prepare argument names + add_parm_lnames(parms, arg_lnames); - Printv(sobj_name, "struct ", Getattr(n, "name"), "Obj", NIL); + // set the function return type to the pointer to struct + Printv(sobj_name, "struct ", name, "Obj", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); - Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); - Printv(code, "result->obj = (void*) new ", Getattr(n, "name"), "(", arg_lnames, ");\n", NIL); - Setattr(n, "wrap:action", code); Setattr(n, "type", ctype); + stype = Copy(name); + SwigType_add_pointer(stype); + Setattr(n, "stype", stype); + + // generate action code + Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); + Printv(code, "result->obj = (void*) new ", name, "(", arg_lnames, ");\n", NIL); + Setattr(n, "wrap:action", code); + + // modify the constructor name Printv(new_name, "new_", Getattr(n, "sym:name"), NIL); Setattr(n, "sym:name", new_name); @@ -378,6 +549,7 @@ public: Delete(arg_lnames); Delete(new_name); Delete(code); + Delete(stype); Delete(ctype); Delete(sobj_name); return SWIG_OK; @@ -388,24 +560,32 @@ public: * --------------------------------------------------------------------- */ virtual int destructorHandler(Node* n) { + String* name = Getattr(n, "sym:name"); String* sobj_name = NewString(""); String* ctype = NewString(""); + String* stype = NewString(""); String* code = NewString(""); String* new_name = NewString(""); Parm* p; - Printv(sobj_name, "struct ", Getattr(n, "sym:name"), "Obj", NIL); + // create first argument + Printv(sobj_name, "struct ", name, "Obj", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); - p = NewParm(ctype, "self"); Setattr(p, "lname", "arg1"); + stype = Copy(name); + SwigType_add_pointer(stype); + Setattr(p, "stype", stype); Setattr(n, "parms", p); - Setattr(n, "type", "void"); - Printv(code, "delete ((", sobj_name, "*) arg1->obj);\nfree(arg1);\n", NIL); + + // create action code + Printv(code, "delete (", name, "*) ((", sobj_name, "*) arg1->obj);\nfree(arg1);\n", NIL); Setattr(n, "wrap:action", code); - Printv(new_name, "delete_", Getattr(n, "sym:name"), NIL); + + // modify the destructor name + Printv(new_name, "delete_", name, NIL); Setattr(n, "sym:name", new_name); functionWrapper(n); @@ -413,6 +593,7 @@ public: Delete(p); Delete(new_name); Delete(code); + Delete(stype); Delete(ctype); Delete(sobj_name); return SWIG_OK; From cdd920a6cae5c11ac10fe2ea364258345d07395c Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 28 Jun 2008 00:06:33 +0000 Subject: [PATCH 007/508] Fix to linking problem for Linux in examples. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10600 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 13 ++++++++----- Examples/c/class/Makefile | 2 +- Examples/c/class/test.sh | 6 ++++++ Examples/c/simple/Makefile | 2 +- Examples/c/simple/main.c | 2 +- Examples/c/simple/test.sh | 6 ++++++ Source/Modules/c.cxx | 26 +++++++++++++------------- Tools/config/config.guess | 32 ++++++++++++++++++++++++-------- Tools/config/config.sub | 16 +++++++++++----- 9 files changed, 71 insertions(+), 34 deletions(-) create mode 100755 Examples/c/class/test.sh create mode 100755 Examples/c/simple/test.sh diff --git a/Examples/Makefile.in b/Examples/Makefile.in index df289688b..b6a457b4d 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1098,15 +1098,18 @@ r_clean: # Build a C dynamically loadable module # ---------------------------------------------------------------- +CLIBPREFIX = lib + c: $(SRCS) $(SWIG) -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) - $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) + $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(TARGET) + LD_LIBRARY_PATH=`pwd`:LD_LIBRARY_PATH; export LD_LIBRARY_PATH c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(SO) - $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(LIBPREFIX)_$(TARGET) - + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) + $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(TARGET) + LD_LIBRARY_PATH=`pwd`:LD_LIBRARY_PATH; export LD_LIBRARY_PATH diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 261038599..0dbbb5c18 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -10,5 +10,5 @@ all:: TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp clean: - rm *.o + rm -f *.o *.out *.so *.a diff --git a/Examples/c/class/test.sh b/Examples/c/class/test.sh new file mode 100755 index 000000000..3b3fc7224 --- /dev/null +++ b/Examples/c/class/test.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH +./a.out + diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index 594a5e598..2b0f5e47a 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -10,5 +10,5 @@ all:: TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c clean: - rm *.o + rm -f *.o *.so *.out *.a *~ diff --git a/Examples/c/simple/main.c b/Examples/c/simple/main.c index 4be6f9e8b..a35887e5f 100644 --- a/Examples/c/simple/main.c +++ b/Examples/c/simple/main.c @@ -8,8 +8,8 @@ int main(int argc, char **argv) { printf("Foo is %f\n", Foo); printf("Foo by ptr is \%f\n", *Foo_ptr); printf("my_str is: %s\n", my_str); - printf("array_of_strs contains %s and %s\n", get_str(0), get_str(1)); printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); + printf("array_of_strs contains %s and %s\n", get_str(0), get_str(1)); return 0; } diff --git a/Examples/c/simple/test.sh b/Examples/c/simple/test.sh new file mode 100755 index 000000000..3b3fc7224 --- /dev/null +++ b/Examples/c/simple/test.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH +./a.out + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index eb5eb960e..020954bb1 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -69,19 +69,15 @@ public: } } - void emitSwigExport(File *f) { - Printf(f, "#ifndef SWIGEXPORT\n"); + void emitSwigProtectSymbols(File *f) { + Printf(f, "#ifndef SWIGPROTECT\n"); Printf(f, "# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)\n"); - Printf(f, "# if defined(STATIC_LINKED)\n"); - Printf(f, "# define SWIGEXPORT\n"); - Printf(f, "# else\n"); - Printf(f, "# define SWIGEXPORT __declspec(dllexport)\n"); - Printf(f, "# endif\n"); + Printf(f, "# define SWIGPROTECT //\n"); Printf(f, "# else\n"); Printf(f, "# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)\n"); - Printf(f, "# define SWIGEXPORT __attribute__ ((visibility(\"default\")))\n"); + Printf(f, "# define SWIGPROTECT __attribute__ ((visibility(\"protected\")))\n"); Printf(f, "# else\n"); - Printf(f, "# define SWIGEXPORT\n"); + Printf(f, "# define SWIGPROTECT //\n"); Printf(f, "# endif\n"); Printf(f, "# endif\n"); Printf(f, "#endif\n\n"); @@ -121,6 +117,7 @@ public: f_wrappers = NewString(""); Swig_banner(f_runtime); + emitSwigProtectSymbols(f_header); // FIXME Printf(f_header, "#include \n\n"); @@ -238,7 +235,6 @@ public: SwigType *return_type = Getattr(n, "type"); String *return_type_str = SwigType_str(return_type, 0); String *arg_names = NewString(""); - String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); // create new function wrapper object @@ -261,7 +257,6 @@ public: SwigType *type = Getattr(p, "type"); Printv(wrapper->def, SwigType_str(type, 0), " ", Getattr(p, "lname"), np ? ", " : "", NIL); Printv(arg_names, Getattr(p, "name"), np ? ", " : "", NIL); - Printv(arg_lnames, Getattr(p, "lname"), np ? ", " : "", NIL); p = np; } Printv(wrapper->def, ") {", NIL); @@ -300,7 +295,7 @@ public: } // emit proxy functions prototypes - Printv(f_shadow_code_init, "extern ", return_type_str, " _wrap_", name, "(", proto, ");\n", NIL); + Printv(f_shadow_code_init, "extern ", return_type_str, " ", wname, "(", proto, ");\n", NIL); Printv(f_shadow_code_body, return_type_str, " ", name, "(", proto, ") {\n", NIL); // handle 'prepend' feature @@ -334,8 +329,13 @@ public: Printv(f_shadow_header, return_type_str, " ", name, "(", proto, ");\n"); } + // add visibility hint for the compiler + String* vis_hint = NewString(""); + Printv(vis_hint, "SWIGPROTECT ", return_type_str, " ", name, "(", ParmList_str(parms), ");\n", NIL); + Printv(f_init, vis_hint, NIL); + Delete(vis_hint); + // cleanup - Delete(arg_lnames); Delete(arg_names); Delete(wname); DelWrapper(wrapper); diff --git a/Tools/config/config.guess b/Tools/config/config.guess index 396482d6c..0f0fe712a 100755 --- a/Tools/config/config.guess +++ b/Tools/config/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -780,7 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,6 +954,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/Tools/config/config.sub b/Tools/config/config.sub index fab0aa355..5defff65a 100755 --- a/Tools/config/config.sub +++ b/Tools/config/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ case $basic_machine in | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ case $basic_machine in | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,6 +925,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1219,7 +1222,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1417,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; From f84342a3014554d5b39469691ae4e1992b8838f8 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 28 Jun 2008 16:22:07 +0000 Subject: [PATCH 008/508] Modified parameter handling using typemaps. 'Reference' example. Visibility hint now applies only to the global functions. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10603 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 2 - Examples/c/class/Makefile | 2 +- Examples/c/reference/Makefile | 14 ++++ Examples/c/reference/example.cxx | 19 +++++ Examples/c/reference/example.h | 16 ++++ Examples/c/reference/example.i | 8 ++ Examples/c/reference/main.c | 12 +++ Examples/c/simple/Makefile | 4 +- Examples/c/simple/example.c | 2 - Examples/python/class/example.i | 4 + Lib/c/c.swg | 22 ++++++ Source/Include/swigwarn.h | 4 + Source/Modules/c.cxx | 132 ++++++++++++++++++++++++------- 13 files changed, 205 insertions(+), 36 deletions(-) create mode 100644 Examples/c/reference/Makefile create mode 100644 Examples/c/reference/example.cxx create mode 100644 Examples/c/reference/example.h create mode 100644 Examples/c/reference/example.i create mode 100644 Examples/c/reference/main.c diff --git a/Examples/Makefile.in b/Examples/Makefile.in index b6a457b4d..3edb75f8d 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1105,11 +1105,9 @@ c: $(SRCS) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(TARGET) - LD_LIBRARY_PATH=`pwd`:LD_LIBRARY_PATH; export LD_LIBRARY_PATH c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(TARGET) - LD_LIBRARY_PATH=`pwd`:LD_LIBRARY_PATH; export LD_LIBRARY_PATH diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 0dbbb5c18..c19797921 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -10,5 +10,5 @@ all:: TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp clean: - rm -f *.o *.out *.so *.a + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ diff --git a/Examples/c/reference/Makefile b/Examples/c/reference/Makefile new file mode 100644 index 000000000..499888730 --- /dev/null +++ b/Examples/c/reference/Makefile @@ -0,0 +1,14 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +MAIN = main.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/reference/example.cxx b/Examples/c/reference/example.cxx new file mode 100644 index 000000000..7dfb9054d --- /dev/null +++ b/Examples/c/reference/example.cxx @@ -0,0 +1,19 @@ +#include + +#include "example.h" + +void foo_by_val(Bar foo) { + foo.set(123); + printf("inside foo_by_val: %d\n", foo.get()); +} + +void foo_by_ref(Bar& foo) { + foo.set(123); + printf("inside foo_by_ref: %d\n", foo.get()); +} + +void foo_by_ptr(Bar* foo) { + foo->set(123); + printf("inside foo_by_ptr: %d\n", foo->get()); +} + diff --git a/Examples/c/reference/example.h b/Examples/c/reference/example.h new file mode 100644 index 000000000..bef5a765e --- /dev/null +++ b/Examples/c/reference/example.h @@ -0,0 +1,16 @@ +#include + +class Bar { +private: + int x; +public: + Bar() : x(0) {} + ~Bar() {} + void set(int x) { this->x = x; } + int get() { return x; } +}; + +/*void foo_by_val(Bar bar); +void foo_by_ref(Bar& bar);*/ +void foo_by_ptr(Bar* bar); + diff --git a/Examples/c/reference/example.i b/Examples/c/reference/example.i new file mode 100644 index 000000000..aed792dce --- /dev/null +++ b/Examples/c/reference/example.i @@ -0,0 +1,8 @@ +%module example + +%{ +#include "example.h" +%} + +%include "example.h" + diff --git a/Examples/c/reference/main.c b/Examples/c/reference/main.c new file mode 100644 index 000000000..ae1cab34e --- /dev/null +++ b/Examples/c/reference/main.c @@ -0,0 +1,12 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char** argv) { + Bar * bar = new_Bar(); + foo_by_ptr(bar); + + delete_Bar(bar); + return 0; +} + diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index 2b0f5e47a..03eaf3d28 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt SRCS = example.c TARGET = example INTERFACE = example.i @@ -10,5 +10,5 @@ all:: TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c clean: - rm -f *.o *.so *.out *.a *~ + rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c index 6bd36a3d6..56be8799e 100644 --- a/Examples/c/simple/example.c +++ b/Examples/c/simple/example.c @@ -22,5 +22,3 @@ int gcd(int x, int y) { } return g; } - - diff --git a/Examples/python/class/example.i b/Examples/python/class/example.i index 75700b305..0bf3285ca 100644 --- a/Examples/python/class/example.i +++ b/Examples/python/class/example.i @@ -5,6 +5,10 @@ #include "example.h" %} +%typemap(in) double { + /* hello */ +} + /* Let's just grab the original header file here */ %include "example.h" diff --git a/Lib/c/c.swg b/Lib/c/c.swg index e69de29bb..aa9fcc279 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -0,0 +1,22 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * c.swg + * ----------------------------------------------------------------------------- */ + +%typemap(ctype) short "short" +%typemap(ctype) int "int" +%typemap(ctype) long "long" +%typemap(ctype) char "char" +%typemap(ctype) float "float" +%typemap(ctype) double "double" +%typemap(ctype) bool "_Bool" +%typemap(ctype) SWIGTYPE "struct $*1_typeObj *" + +%typemap(in) short, int, long, char, float, double, bool "$1 = $input;" + +%typemap(in) SWIGTYPE { + $1 = ($1_type) $input->obj; +} + diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index 174e8b001..72e394c98 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -252,6 +252,10 @@ /* please leave 870-889 free for Php */ +#define WARN_C_TYPEMAP_CTYPE_UNDEF 890 + +/* please leave 890-909 free for C */ + /* Feel free to claim any number in this space that's not currently being used. Just make sure you add an entry here */ diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 020954bb1..89fe955a3 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -72,12 +72,12 @@ public: void emitSwigProtectSymbols(File *f) { Printf(f, "#ifndef SWIGPROTECT\n"); Printf(f, "# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)\n"); - Printf(f, "# define SWIGPROTECT //\n"); + Printf(f, "# define SWIGPROTECT(x)\n"); Printf(f, "# else\n"); Printf(f, "# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)\n"); - Printf(f, "# define SWIGPROTECT __attribute__ ((visibility(\"protected\")))\n"); + Printf(f, "# define SWIGPROTECT(x) __attribute__ ((visibility(\"protected\"))) x\n"); Printf(f, "# else\n"); - Printf(f, "# define SWIGPROTECT //\n"); + Printf(f, "# define SWIGPROTECT(x)\n"); Printf(f, "# endif\n"); Printf(f, "# endif\n"); Printf(f, "#endif\n\n"); @@ -226,6 +226,26 @@ public: return SWIG_OK; } + /* ----------------------------------------------------------------------- + * globalfunctionHandler() + * ------------------------------------------------------------------------ */ + + virtual int globalfunctionHandler(Node *n ) { + String* vis_hint = NewString(""); + String* return_type_str = SwigType_str(Getattr(n, "type"), 0); + String* name = Getattr(n, "sym:name"); + ParmList* parms = Getattr(n, "parms"); + + Language::globalfunctionHandler(n); + + // add visibility hint for the compiler (do not override this symbol) + Printv(vis_hint, "SWIGPROTECT(", return_type_str, " ", name, "(", ParmList_str(parms), ");)\n\n", NIL); + Printv(f_wrappers, vis_hint, NIL); + + Delete(vis_hint); + return SWIG_OK; + } + /* ---------------------------------------------------------------------- * functionWrapper() * ---------------------------------------------------------------------- */ @@ -236,6 +256,8 @@ public: String *return_type_str = SwigType_str(return_type, 0); String *arg_names = NewString(""); ParmList *parms = Getattr(n, "parms"); + Parm *p; + String* tm; // create new function wrapper object Wrapper *wrapper = NewWrapper(); @@ -250,16 +272,66 @@ public: // attach the standard typemaps emit_attach_parmmaps(parms, wrapper); - // prepare parameter list - Parm *p, *np; + // attach 'ctype' typemaps + Swig_typemap_attach_parms("ctype", parms, wrapper); + + Setattr(n, "wrap:parms", parms); + + // emit variables for holding parameters + emit_parameter_variables(parms, wrapper); + + // prepare function definition + int gencomma = 0; for (p = parms; p; ) { - np = nextSibling(p); - SwigType *type = Getattr(p, "type"); - Printv(wrapper->def, SwigType_str(type, 0), " ", Getattr(p, "lname"), np ? ", " : "", NIL); - Printv(arg_names, Getattr(p, "name"), np ? ", " : "", NIL); - p = np; + + while (checkAttribute(p, "tmap:in:numinputs", "0")) { + p = Getattr(p, "tmap:in:next"); + } + + SwigType* type = Getattr(p, "type"); + String* lname = Getattr(p, "lname"); + String* c_parm_type = NewString(""); + String* arg_name = NewString(""); + + Printf(arg_name, "c%s", lname); + + if ((tm = Getattr(p, "tmap:ctype"))) { + if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { + Printv(c_parm_type, SwigType_str(type, 0), NIL); + } + else { + Printv(c_parm_type, tm, NIL); + } + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + } + + Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); + Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); + gencomma = 1; + + if ((tm = Getattr(p, "tmap:in"))) { + if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { + // FIXME + Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); + } + else { + Replaceall(tm, "$input", arg_name); + Setattr(p, "emit:input", arg_name); + Printf(wrapper->code, "%s\n", tm); + } + p = Getattr(p, "tmap:in:next"); + } + else { + Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); + p = nextSibling(p); + } + Delete(arg_name); + Delete(c_parm_type); } - Printv(wrapper->def, ") {", NIL); + + Printf(wrapper->def, ") {"); // declare wrapper function local variables emit_return_variable(n, return_type, wrapper); @@ -277,19 +349,24 @@ public: if (shadow_flag) { // use shadow-type for parameter if supplied String* proto; - String* stype = Getattr(parms, "stype"); - if (stype) { - Swig_save("temp", parms, "type", NIL); - Setattr(parms, "type", stype); - proto = ParmList_str(parms); - Swig_restore(parms); + if (parms) { + String* stype = Getattr(parms, "c:stype"); + if (stype) { + Swig_save("temp", parms, "type", NIL); + Setattr(parms, "type", stype); + proto = ParmList_str(parms); + Swig_restore(parms); + } + else { + proto = ParmList_str(parms); + } } else { - proto = ParmList_str(parms); + proto = empty_string; } // use shadow-type for return type if supplied - SwigType* shadow_type = Getattr(n, "stype"); + SwigType* shadow_type = Getattr(n, "c:stype"); if (shadow_type) { return_type_str = SwigType_str(shadow_type, 0); } @@ -329,12 +406,6 @@ public: Printv(f_shadow_header, return_type_str, " ", name, "(", proto, ");\n"); } - // add visibility hint for the compiler - String* vis_hint = NewString(""); - Printv(vis_hint, "SWIGPROTECT ", return_type_str, " ", name, "(", ParmList_str(parms), ");\n", NIL); - Printv(f_init, vis_hint, NIL); - Delete(vis_hint); - // cleanup Delete(arg_names); Delete(wname); @@ -395,7 +466,8 @@ public: Parm* p = NewParm(ctype, "self"); stype = Copy(classname); SwigType_add_pointer(stype); - Setattr(p, "stype", stype); + Setattr(p, "c:stype", stype); + Setattr(p, "c:immutable", "1"); if (parms) set_nextSibling(p, parms); Setattr(n, "parms", p); @@ -461,7 +533,8 @@ public: Parm* p = NewParm(ctype, "self"); stype = Copy(classname); SwigType_add_pointer(stype); - Setattr(p, "stype", stype); + Setattr(p, "c:stype", stype); + Setattr(p, "c:immutable", "1"); Setattr(p, "lname", "arg1"); // create second argument @@ -533,7 +606,7 @@ public: Setattr(n, "type", ctype); stype = Copy(name); SwigType_add_pointer(stype); - Setattr(n, "stype", stype); + Setattr(n, "c:stype", stype); // generate action code Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); @@ -576,7 +649,8 @@ public: Setattr(p, "lname", "arg1"); stype = Copy(name); SwigType_add_pointer(stype); - Setattr(p, "stype", stype); + Setattr(p, "c:stype", stype); + Setattr(p, "c:immutable", "1"); Setattr(n, "parms", p); Setattr(n, "type", "void"); From f03e17b405a37e5dacc432923a7af54f7ccff427 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 28 Jun 2008 20:48:40 +0000 Subject: [PATCH 009/508] Support for parameter passing by value, pointer and reference. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10604 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/reference/example.h | 4 ++-- Examples/c/reference/main.c | 11 ++++++++++- Lib/c/c.swg | 12 +++++++++++- Source/Modules/c.cxx | 31 ++++++++++++++++++++++--------- 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/Examples/c/reference/example.h b/Examples/c/reference/example.h index bef5a765e..470382986 100644 --- a/Examples/c/reference/example.h +++ b/Examples/c/reference/example.h @@ -10,7 +10,7 @@ public: int get() { return x; } }; -/*void foo_by_val(Bar bar); -void foo_by_ref(Bar& bar);*/ +void foo_by_val(Bar bar); +void foo_by_ref(Bar& bar); void foo_by_ptr(Bar* bar); diff --git a/Examples/c/reference/main.c b/Examples/c/reference/main.c index ae1cab34e..5d3345290 100644 --- a/Examples/c/reference/main.c +++ b/Examples/c/reference/main.c @@ -2,10 +2,19 @@ #include "example_proxy.h" +void test(Bar * bar) { + printf("value of x is %d\n", Bar_get(bar)); +} + int main(int argc, char** argv) { Bar * bar = new_Bar(); + test(bar); + foo_by_val(bar); + test(bar); foo_by_ptr(bar); - + test(bar); + foo_by_ref(bar); + test(bar); delete_Bar(bar); return 0; } diff --git a/Lib/c/c.swg b/Lib/c/c.swg index aa9fcc279..043d4de42 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -12,11 +12,21 @@ %typemap(ctype) float "float" %typemap(ctype) double "double" %typemap(ctype) bool "_Bool" -%typemap(ctype) SWIGTYPE "struct $*1_typeObj *" +%typemap(ctype) SWIGTYPE "struct $1_typeObj *" +%typemap(ctype) SWIGTYPE * "struct $*1_typeObj *" +%typemap(ctype) SWIGTYPE & "struct $*1_ltypeObj *" %typemap(in) short, int, long, char, float, double, bool "$1 = $input;" %typemap(in) SWIGTYPE { + $1 = * ($1_type *) ($input->obj); +} + +%typemap(in) SWIGTYPE * { $1 = ($1_type) $input->obj; } +%typemap(in) SWIGTYPE & { + $1 = ($*1_ltype *) $input->obj; +} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 89fe955a3..df12d1d3c 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -258,6 +258,7 @@ public: ParmList *parms = Getattr(n, "parms"); Parm *p; String* tm; + String* proto = NewString(""); // create new function wrapper object Wrapper *wrapper = NewWrapper(); @@ -291,24 +292,33 @@ public: SwigType* type = Getattr(p, "type"); String* lname = Getattr(p, "lname"); String* c_parm_type = NewString(""); + String* shadow_parm_type = NewString(""); String* arg_name = NewString(""); Printf(arg_name, "c%s", lname); - if ((tm = Getattr(p, "tmap:ctype"))) { - if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { - Printv(c_parm_type, SwigType_str(type, 0), NIL); - } - else { - Printv(c_parm_type, tm, NIL); - } + if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { + Printv(c_parm_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Getattr(p, "tmap:ctype"))) { + Printv(c_parm_type, tm, NIL); } else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); } + // use shadow-type for parameter if supplied + String* stype = Getattr(p, "c:stype"); + if (stype) { + Printv(shadow_parm_type, SwigType_str(stype, 0), NIL); + } + else { + Printv(shadow_parm_type, c_parm_type, NIL); + } + Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); + Printv(proto, gencomma ? ", " : "", shadow_parm_type, " ", Getattr(p, "name"), NIL); gencomma = 1; if ((tm = Getattr(p, "tmap:in"))) { @@ -328,6 +338,7 @@ public: p = nextSibling(p); } Delete(arg_name); + Delete(shadow_parm_type); Delete(c_parm_type); } @@ -347,8 +358,8 @@ public: // take care of shadow function if (shadow_flag) { - // use shadow-type for parameter if supplied - String* proto; + + /* if (parms) { String* stype = Getattr(parms, "c:stype"); if (stype) { @@ -364,6 +375,7 @@ public: else { proto = empty_string; } + */ // use shadow-type for return type if supplied SwigType* shadow_type = Getattr(n, "c:stype"); @@ -407,6 +419,7 @@ public: } // cleanup + Delete(proto); Delete(arg_names); Delete(wname); DelWrapper(wrapper); From e058e1f42ff1395c5d357b5e4bea94804428dd78 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 28 Jun 2008 23:26:18 +0000 Subject: [PATCH 010/508] Merged revisions 10498-10499,10503-10504,10506,10508,10511,10515-10516,10518-10519,10527,10530-10531,10536-10537,10539-10552,10558-10568,10574-10580,10582,10584,10588-10589,10594 via svnmerge from https://swig.svn.sourceforge.net/svnroot/swig/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r10498 | talby | 2008-05-26 22:09:56 +0200 (Pn, 26 maj 2008) | 2 lines run test cases in the Perl set by the --with-perl5 configure option. ........ r10499 | talby | 2008-05-26 23:04:06 +0200 (Pn, 26 maj 2008) | 3 lines The perl5 minherit runtime test will work better if the classes are actually built under SWIGPERL. ........ r10503 | wsfulton | 2008-05-28 11:44:37 +0200 (Åšr, 28 maj 2008) | 1 line Fix variable wrappers when using -proxy. Patch from Jan Jezabek ........ r10504 | bhy | 2008-05-28 19:27:48 +0200 (Åšr, 28 maj 2008) | 2 lines Fixed SF #1971977: typo in pycontainer.swg (related to -extranative option) ........ r10506 | wsfulton | 2008-05-29 02:45:28 +0200 (Cz, 29 maj 2008) | 1 line Fix variable wrappers when using -noproxy ........ r10508 | bhy | 2008-05-30 15:53:33 +0200 (Pt, 30 maj 2008) | 1 line Fixed SF #1976978, apply the macros for primitive types to std::wstring ........ r10511 | olly | 2008-05-30 18:11:27 +0200 (Pt, 30 maj 2008) | 4 lines Fix typo in handling of /*@SWIG[...]*/ comments in the scanner. This just meant we were only actually looking for /*@SWI at the start of the comment, so was pretty harmless in practice. ........ r10515 | wsfulton | 2008-06-02 22:10:40 +0200 (Pn, 02 cze 2008) | 1 line Fix samename testcase for c# and java ........ r10516 | wsfulton | 2008-06-02 22:15:39 +0200 (Pn, 02 cze 2008) | 1 line Fix enums when using -noproxy ........ r10518 | bhy | 2008-06-07 13:20:07 +0200 (So, 07 cze 2008) | 4 lines Added a test case for keyword renaming. Now it works for Python in SWIG's -c++ mode, but in C mode it doesn't work! (you can try with make keyword_rename.ctest) ........ r10519 | bhy | 2008-06-07 15:40:51 +0200 (So, 07 cze 2008) | 1 line fixed keyword_rename.ctest tese case, caused by a mistake in Swig/naming.c ........ r10527 | mgossage | 2008-06-17 04:57:15 +0200 (Wt, 17 cze 2008) | 1 line [lua] bugfix 1938142 (bool& and bool* support) ........ r10530 | wsfulton | 2008-06-19 22:02:13 +0200 (Cz, 19 cze 2008) | 1 line Add R keyword support. Rename keywords for successful compilation of Java and C# code. More consistent keyword warnings across the different languages. ........ r10531 | wsfulton | 2008-06-19 23:15:48 +0200 (Cz, 19 cze 2008) | 1 line add complete list of R reserved words ........ r10536 | wsfulton | 2008-06-21 13:35:33 +0200 (So, 21 cze 2008) | 1 line better terminology for static types ........ r10537 | wsfulton | 2008-06-21 13:42:48 +0200 (So, 21 cze 2008) | 1 line remove raise as keyword test- it conflicts with _raise in LIBCMT on windows ........ r10539 | wsfulton | 2008-06-21 17:21:29 +0200 (So, 21 cze 2008) | 1 line Lua example warning removal fixes for vc++ ........ r10540 | wsfulton | 2008-06-21 17:23:02 +0200 (So, 21 cze 2008) | 1 line Remove some vc++ /W4 warnings ........ r10541 | wsfulton | 2008-06-21 18:04:55 +0200 (So, 21 cze 2008) | 1 line minor vc++ /W4 warning fixes ........ r10542 | wsfulton | 2008-06-21 21:07:51 +0200 (So, 21 cze 2008) | 1 line 'byte' is already used in Ruby on windows, so use another keyword ........ r10543 | wsfulton | 2008-06-21 22:45:32 +0200 (So, 21 cze 2008) | 1 line Fix crashing in the Ruby reject method in the STL wrappers ........ r10544 | wsfulton | 2008-06-21 22:48:28 +0200 (So, 21 cze 2008) | 1 line Fix crashing in the Ruby reject method in the STL wrappers ........ r10545 | wsfulton | 2008-06-21 22:49:10 +0200 (So, 21 cze 2008) | 1 line remove unnecessary variable int the char **STRING_ARRAY out typemap ........ r10546 | wsfulton | 2008-06-21 23:07:49 +0200 (So, 21 cze 2008) | 1 line Fix Ruby C++ example dependencies in dsp files ........ r10547 | wsfulton | 2008-06-22 00:25:36 +0200 (N, 22 cze 2008) | 1 line Fix unused parameter warnings in python when using gcc's -W -Wall options ........ r10548 | wsfulton | 2008-06-22 00:26:35 +0200 (N, 22 cze 2008) | 1 line Fix virtual destructor ........ r10549 | wsfulton | 2008-06-22 01:25:20 +0200 (N, 22 cze 2008) | 1 line various warning fixes ........ r10550 | wsfulton | 2008-06-22 02:09:11 +0200 (N, 22 cze 2008) | 1 line Another fix for the JVM hanging on exit problem when using directors ........ r10551 | wsfulton | 2008-06-22 02:09:51 +0200 (N, 22 cze 2008) | 1 line documentation sections update ........ r10552 | wsfulton | 2008-06-22 02:18:10 +0200 (N, 22 cze 2008) | 1 line more docs on defining macros for the thread hanging problem ........ r10558 | wsfulton | 2008-06-22 23:30:20 +0200 (N, 22 cze 2008) | 1 line fix unused parms in last commit for C code ........ r10559 | wsfulton | 2008-06-23 00:12:43 +0200 (Pn, 23 cze 2008) | 1 line Suppress unused methods warning for VC++ ........ r10560 | wsfulton | 2008-06-23 22:26:07 +0200 (Pn, 23 cze 2008) | 1 line fix partialcheck-test-suite and parallel make for r, chicken, tcl and php ........ r10561 | wsfulton | 2008-06-23 22:39:41 +0200 (Pn, 23 cze 2008) | 1 line correct message display when running the partialcheck-test-suite make target ........ r10562 | wsfulton | 2008-06-23 23:14:53 +0200 (Pn, 23 cze 2008) | 1 line fix typo ........ r10563 | olly | 2008-06-23 23:23:54 +0200 (Pn, 23 cze 2008) | 3 lines Fix bad use of Python API (untested, since I can't even compile this code on x86-64!) ........ r10564 | olly | 2008-06-24 00:58:03 +0200 (Wt, 24 cze 2008) | 3 lines [PHP] Fix segfault when wrapping a non-class function marked with %newobject (testcase char_strings). ........ r10565 | olly | 2008-06-24 02:27:34 +0200 (Wt, 24 cze 2008) | 3 lines [PHP] Fix assertion failure when handling %typemap(in,numinputs=0) (testcase ignore_parameter). ........ r10566 | olly | 2008-06-24 02:33:08 +0200 (Wt, 24 cze 2008) | 2 lines [PHP] Fix typemap_namespace.i to not try to copy a non-existent typemap. ........ r10567 | olly | 2008-06-24 02:41:07 +0200 (Wt, 24 cze 2008) | 3 lines Clean up dead and unused code in SwigToPhpType(), and rename to GetShadowReturnType(). ........ r10568 | olly | 2008-06-24 02:42:29 +0200 (Wt, 24 cze 2008) | 2 lines Fix cosmetic typo in string constant. ........ r10574 | wsfulton | 2008-06-24 22:10:28 +0200 (Wt, 24 cze 2008) | 1 line zap last entry ........ r10575 | wsfulton | 2008-06-24 22:11:46 +0200 (Wt, 24 cze 2008) | 1 line variable name changes to remove php keywords ........ r10576 | wsfulton | 2008-06-24 22:12:08 +0200 (Wt, 24 cze 2008) | 1 line variable name hiding fix ........ r10577 | wsfulton | 2008-06-24 22:12:43 +0200 (Wt, 24 cze 2008) | 1 line More info about numobjects added ........ r10578 | wsfulton | 2008-06-24 22:13:41 +0200 (Wt, 24 cze 2008) | 1 line update for 1.3.36 release ........ r10579 | wsfulton | 2008-06-24 23:48:46 +0200 (Wt, 24 cze 2008) | 1 line remove deprecated -c commandline option (runtime library generation) ........ r10580 | wsfulton | 2008-06-24 23:53:12 +0200 (Wt, 24 cze 2008) | 1 line correct comment about deprecated option ........ r10582 | wsfulton | 2008-06-25 01:00:27 +0200 (Åšr, 25 cze 2008) | 1 line use rsync and ssh to upload releases to SourceForge as ftp no longer works ........ r10584 | wsfulton | 2008-06-25 01:24:48 +0200 (Åšr, 25 cze 2008) | 1 line correction for 1.3.36 ........ r10588 | wsfulton | 2008-06-25 02:16:04 +0200 (Åšr, 25 cze 2008) | 1 line section update ........ r10589 | wsfulton | 2008-06-25 02:16:40 +0200 (Åšr, 25 cze 2008) | 1 line bump version to 1.3.37 ........ r10594 | wsfulton | 2008-06-26 20:33:06 +0200 (Cz, 26 cze 2008) | 1 line correct typo in first entry about %fragment ........ git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10606 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 10 +- CHANGES | 159 +++++++++++++++++- CHANGES.current | 103 ------------ Doc/Manual/Contents.html | 3 +- Doc/Manual/Java.html | 21 +++ Doc/Manual/SWIGPlus.html | 5 +- Doc/Manual/Sections.html | 2 +- Doc/Manual/Typemaps.html | 15 +- Doc/Manual/Warnings.html | 2 +- Examples/Makefile.in | 17 +- Examples/guile/multimap/example.i | 4 +- Examples/guile/multivalue/example.i | 6 + Examples/lua/arrays/example.c | 2 +- Examples/lua/embed2/embed2.c | 13 +- Examples/lua/embed3/embed3.cpp | 14 +- Examples/lua/owner/example.cxx | 4 +- Examples/perl5/import/base.h | 2 +- Examples/perl5/multiple_inheritance/example.h | 23 ++- Examples/ruby/class/example.dsp | 4 +- Examples/ruby/free_function/example.cxx | 2 +- Examples/ruby/free_function/example.dsp | 4 +- Examples/ruby/import/bar.dsp | 4 +- Examples/ruby/import/base.dsp | 4 +- Examples/ruby/import/foo.dsp | 4 +- Examples/ruby/import/spam.dsp | 4 +- Examples/ruby/mark_function/example.dsp | 4 +- Examples/tcl/import/base.h | 2 +- Examples/test-suite/apply_signed_char.i | 2 + Examples/test-suite/bools.i | 2 + Examples/test-suite/char_strings.i | 2 +- Examples/test-suite/chicken/Makefile.in | 12 +- Examples/test-suite/common.mk | 2 + Examples/test-suite/constant_pointers.i | 6 + Examples/test-suite/cpp_basic.i | 2 + Examples/test-suite/csharp/Makefile.in | 4 +- .../test-suite/csharp/char_strings_runme.cs | 2 +- Examples/test-suite/enum_thorough.i | 2 + Examples/test-suite/fvirtual.i | 4 +- Examples/test-suite/guilescm/Makefile.in | 8 +- Examples/test-suite/java/Makefile.in | 4 +- .../test-suite/java/char_strings_runme.java | 2 +- Examples/test-suite/java_typemaps_proxy.i | 2 + Examples/test-suite/keyword_rename.i | 32 ++++ Examples/test-suite/li_std_string.i | 2 +- Examples/test-suite/lua/li_typemaps_runme.lua | 40 +++++ Examples/test-suite/minherit.i | 2 +- Examples/test-suite/octave/fvirtual_runme.m | 2 +- .../test-suite/octave/li_std_string_runme.m | 2 +- .../test-suite/perl5/li_std_string_runme.pl | 4 +- Examples/test-suite/perl5/run-perl-test.pl | 2 +- Examples/test-suite/php4/Makefile.in | 6 +- Examples/test-suite/python/fvirtual_runme.py | 2 +- .../test-suite/python/keyword_rename_runme.py | 4 + .../test-suite/python/li_std_string_runme.py | 2 +- Examples/test-suite/r/Makefile.in | 4 +- .../test-suite/ruby/li_std_string_runme.rb | 2 +- Examples/test-suite/samename.i | 13 +- Examples/test-suite/template_int_const.i | 8 +- Examples/test-suite/template_typedef_rec.i | 6 +- Examples/test-suite/typemap_namespace.i | 2 +- Lib/chicken/chickenkw.swg | 2 +- Lib/csharp/csharphead.swg | 4 +- Lib/csharp/csharpkw.swg | 2 +- Lib/java/director.swg | 10 +- Lib/java/javakw.swg | 2 +- Lib/java/various.i | 2 +- Lib/lua/luatypemaps.swg | 4 +- Lib/lua/typemaps.i | 21 +++ Lib/ocaml/ocamlkw.swg | 2 +- Lib/perl5/perlkw.swg | 4 +- Lib/php4/php4kw.swg | 10 +- Lib/pike/pikekw.swg | 2 +- Lib/python/pycontainer.swg | 4 +- Lib/python/pyiterators.swg | 6 +- Lib/python/pythonkw.swg | 4 +- Lib/r/r.swg | 2 + Lib/r/rkw.swg | 32 ++++ Lib/ruby/rubycontainer.swg | 6 +- Lib/ruby/rubykw.swg | 2 +- Lib/swiglabels.swg | 6 + Lib/typemaps/primtypes.swg | 1 + README | 9 +- Source/CParse/cscanner.c | 2 +- Source/CParse/parser.y | 29 ++-- Source/CParse/templ.c | 4 +- Source/DOH/hash.c | 31 ++-- Source/Modules/allegrocl.cxx | 32 ++-- Source/Modules/chicken.cxx | 13 +- Source/Modules/csharp.cxx | 41 +++-- Source/Modules/guile.cxx | 2 +- Source/Modules/java.cxx | 35 ++-- Source/Modules/lang.cxx | 61 +++---- Source/Modules/lua.cxx | 4 - Source/Modules/main.cxx | 10 +- Source/Modules/modula3.cxx | 4 +- Source/Modules/php4.cxx | 93 +++++----- Source/Modules/python.cxx | 1 - Source/Modules/r.cxx | 17 +- Source/Modules/ruby.cxx | 10 +- Source/Preprocessor/cpp.c | 5 +- Source/Swig/cwrap.c | 3 +- Source/Swig/include.c | 3 +- Source/Swig/misc.c | 23 ++- Source/Swig/naming.c | 6 +- Source/Swig/scanner.c | 4 +- Source/Swig/typeobj.c | 3 +- Source/Swig/typesys.c | 15 +- TODO | 2 +- Tools/WAD/Python/type.c | 2 +- Tools/mkrelease.py | 8 +- configure.in | 15 +- 111 files changed, 759 insertions(+), 484 deletions(-) create mode 100644 Examples/test-suite/keyword_rename.i create mode 100644 Examples/test-suite/lua/li_typemaps_runme.lua create mode 100644 Examples/test-suite/python/keyword_rename_runme.py create mode 100644 Lib/r/rkw.swg diff --git a/ANNOUNCE b/ANNOUNCE index 0fb688344..7c0e95e3f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,10 +1,10 @@ -*** ANNOUNCE: SWIG 1.3.35 (7 April 2008) *** +*** ANNOUNCE: SWIG 1.3.36 (24 June 2008) *** http://www.swig.org -We're pleased to announce SWIG-1.3.35, the latest installment in the -SWIG development effort. SWIG-1.3.35 includes a number of bug fixes +We're pleased to announce SWIG-1.3.36, the latest installment in the +SWIG development effort. SWIG-1.3.36 includes a number of bug fixes and large number of enhancements throughout. What is SWIG? @@ -24,11 +24,11 @@ Availability: ------------- The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-1.3.35.tar.gz + http://prdownloads.sourceforge.net/swig/swig-1.3.36.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-1.3.35.zip + http://prdownloads.sourceforge.net/swig/swigwin-1.3.36.zip Release numbers --------------- diff --git a/CHANGES b/CHANGES index fc3018a1d..782849c6f 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,162 @@ SWIG (Simplified Wrapper and Interface Generator) See CHANGES.current for current version. +Version 1.3.36 (24 June 2008) +============================= + +06/24/2008: wsfulton + Remove deprecated -c commandline option (runtime library generation). + +06/24/2008: olly + [PHP] Fix assertion failure when handling %typemap(in,numinputs=0) + (testcase ignore_parameter). + +06/24/2008: olly + [PHP] Fix segfault when wrapping a non-class function marked with + %newobject (testcase char_strings). + +06/22/2008: wsfulton + [Java] Add a way to use AttachCurrentThreadAsDaemon instead of AttachCurrentThread + in director code. Define the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro, see + Lib/java/director.swg. + +06/21/2008: wsfulton + [Ruby] Fix crashing in the STL wrappers (reject! and delete_if methods) + +06/19/2008: wsfulton + [Java, C#] C# and Java keywords will be renamed instead of just issuing a warning + and then generating uncompileable code. Warning 314 gives the new name when a + keyword is found. + +06/19/2008: wsfulton + [R] Keyword handling added. R Keywords will be renamed as necessary. + Warning 314 gives the new name when a keyword is found. + +06/17/2008: mgossage + [Lua] Added missing support for bool& and bool*. Added runtest for li_typemaps testcase. + (Bug #1938142) + +06/07/2008: bhy + Added test case keyword_rename, then made the keyword renaming works properly + by fixing Swig_name_make() for a incomplete condition checking. + +06/02/2008: wsfulton + [Java, C#] Fix enum wrappers when using -noproxy. + +05/30/2008: bhy + Added std::wstring into Lib/typemaps/primtypes.swg, since it is also a primitive + type in SWIG - fixed SF #1976978. + +05/29/2008: wsfulton + [Java, C#] Fix variable wrappers when using -noproxy. + +05/29/2008: bhy + [Python] Fixed a typo of %#ifdef in Lib/python/pycontainer.swg, which is related + to -extranative SWIG option - SF #1971977. + +05/20/2008: wsfulton + New partialcheck makefile targets for partial testing of the test-suite. These + just invoke SWIG, ie no compilation and no runtime testing. It can be faster + when developing by just doing a directory diff of the files SWIG generates + against those from a previous run. Example usage from the top level directory: + + make partialcheck-test-suite + make partialcheck-java-test-suite + + This change also encompasses more flexibility in running the test-suite, eg + it is possible to prefix the command line which runs any target language test + with a tool. See the RUNTOOL, COMPILETOOL and SWIGTOOL targets in the common.mk + file and makefiles in the test-suite directory. For example it is possible to + run the runtime tests through valgrind using: + + make check RUNTOOL="valgrind --leak-check=full" + + or invoke SWIG under valgrind using: + + make check SWIGTOOL="valgrind --tool=memcheck" + +05/19/2008: drjoe + [R] Fixed define that was breaking pre-2.7. Checked in + patch from Soren Sonnenburg that creates strings in + version independent way + +05/15/2008: wsfulton + [Java] Fix variable name clash in directors - SF #1963316 reported by Tristan. + +05/14/2008: wsfulton + Add an optimisation for functions that return objects by value, reducing + the number of copies of the object that are made. Implemented using an + optional attribute in the "out" typemap called "optimal". Details in + Typemaps.html. + +05/11/2008: olly + [PHP] Check for %feature("notabstract") when generating PHP5 class + wrapper. + +05/11/2008: wsfulton + Fix SF #1943608 - $self substitution in %contract, patch submitted by + Toon Verstraelen. + +05/09/2008: olly + [PHP] Fix char * typemaps to work when applied to signed char * and + unsigned char * (uncovered by testcase apply_strings). + +05/09/2008: wsfulton + Fix wrapping of char * member variables when using allprotected mode. + Bug reported by Warren Wang. + +05/09/2008: olly + [PHP] Fix bad PHP code generated when wrapping an enum in a + namespace (uncovered by testcase arrays_scope). + +05/09/2008: olly + [PHP] SWIG now runs the PHP testsuite using PHP5, not PHP4. PHP4 + is essentially obsolete now, so we care much more about solid PHP5 + support. + +05/07/2008: wsfulton + STL fixes when using %import rather than %include and the Solaris Workshop + compiler and the Roguewave STL. + +05/07/2008: wsfulton + Fix wrapping of overloaded protected methods when using allprotected mode. + Bug reported by Warren Wang. + +05/03/2008: wsfulton + Commit patch #1956607 to add -MT support from Richard Boulton. + This patch mirrors the gcc -MT option which allows one to change the default + Makefile target being generated when generating makefiles with the -M family + of options. For example: + + $ swig -java -MM -MT overiddenname -c++ example.i + overiddenname: \ + example.i \ + example.h + +04/30/2008: mgossage + [Lua] Removed generation of _wrap_delete_XXXXX (wrappered destructor) + which was unused and causing warning with g++ -Wall. + Removed other unused warning in typemaps.i and other places. + Added Examples/lua/embed3, and run tests a few test cases. + +04/24/2008: olly + [Python] Fix generated code for IBM's C++ compiler on AIX (patch + from Goeran Uddeborg in SF#1928048). + +04/24/2008: olly + Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to + avoid a clash with BSIZE defined by headers on AIX with Perl + (reported in SF#1928048). + +04/20/2008: wsfulton + Add the ability to wrap all protected members when using directors. + Previously only the virtual methods were available to the target language. + Now all protected members, (static and non-static variables, non-virtual methods + and static methods) are wrapped when using the allprotected mode. The allprotected + mode is turned on in the module declaration: + + %module(directors="1", allprotected="1") modulename + Version 1.3.35 (7 April 2008) ============================= @@ -12123,7 +12279,8 @@ Version 1.3.14 (August 12, 2002) with helper functions even if they aren't used. To fix this, a new fragment directive is available. For example: - %fragment("type_helper","header") %{ + (corrected typo in line below - 06/26/2008) + %fragment("type_header","header") %{ void some_helper_function() { ... } diff --git a/CHANGES.current b/CHANGES.current index 27e9925d2..ef3fcca54 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -1,106 +1,3 @@ Version 1.3.36 (in progress) ============================= -05/20/2008: wsfulton - New partialcheck makefile targets for partial testing of the test-suite. These - just invoke SWIG, ie no compilation and no runtime testing. It can be faster - when developing by just doing a directory diff of the files SWIG generates - against those from a previous run. Example usage from the top level directory: - - make partialcheck-test-suite - make partialcheck-java-test-suite - - This change also encompasses more flexibility in running the test-suite, eg - it is possible to prefix the command line which runs any target language test - with a tool. See the RUNTOOL, COMPILETOOL and SWIGTOOL targets in the common.mk - file and makefiles in the test-suite directory. For example it is possible to - run the runtime tests through valgrind using: - - make check RUNTOOL="valgrind --leak-check=full" - - or invoke SWIG under valgrind using: - - make check SWIGTOOL="valgrind --tool=memcheck" - -05/19/2008: drjoe - [R] Fixed define that was breaking pre-2.7. Checked in - patch from Soren Sonnenburg that creates strings in - version independent way - -05/15/2008: wsfulton - [Java] Fix variable name clash in directors - SF #1963316 reported by Tristan. - -05/14/2008: wsfulton - Add an optimisation for functions that return objects by value, reducing - the number of copies of the object that are made. Implemented using an - optional attribute in the "out" typemap called "optimal". Details in - Typemaps.html. - -05/11/2008: olly - [PHP] Check for %feature("notabstract") when generating PHP5 class - wrapper. - -05/11/2008: wsfulton - Fix SF #1943608 - $self substitution in %contract, patch submitted by - Toon Verstraelen. - -05/09/2008: olly - [PHP] Fix char * typemaps to work when applied to signed char * and - unsigned char * (uncovered by testcase apply_strings). - -05/09/2008: wsfulton - Fix wrapping of char * member variables when using allprotected mode. - Bug reported by Warren Wang. - -05/09/2008: olly - [PHP] Fix bad PHP code generated when wrapping an enum in a - namespace (uncovered by testcase arrays_scope). - -05/09/2008: olly - [PHP] SWIG now runs the PHP testsuite using PHP5, not PHP4. PHP4 - is essentially obsolete now, so we care much more about solid PHP5 - support. - -05/07/2008: wsfulton - STL fixes when using %import rather than %include and the Solaris Workshop - compiler and the Roguewave STL. - -05/07/2008: wsfulton - Fix wrapping of overloaded protected methods when using allprotected mode. - Bug reported by Warren Wang. - -05/03/2008: wsfulton - Commit patch #1956607 to add -MT support from Richard Boulton. - This patch mirrors the gcc -MT option which allows one to change the default - Makefile target being generated when generating makefiles with the -M family - of options. For example: - - $ swig -java -MM -MT overiddenname -c++ example.i - overiddenname: \ - example.i \ - example.h - -04/30/2008: mgossage - [Lua] Removed generation of _wrap_delete_XXXXX (wrappered destructor) - which was unused and causing warning with g++ -Wall. - Removed other unused warning in typemaps.i and other places. - Added Examples/lua/embed3, and run tests a few test cases. - -04/24/2008: olly - [Python] Fix generated code for IBM's C++ compiler on AIX (patch - from Goeran Uddeborg in SF#1928048). - -04/24/2008: olly - Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to - avoid a clash with BSIZE defined by headers on AIX with Perl - (reported in SF#1928048). - -04/20/2008: wsfulton - Add the ability to wrap all protected members when using directors. - Previously only the virtual methods were available to the target language. - Now all protected members, (static and non-static variables, non-virtual methods - and static methods) are wrapped when using the allprotected mode. The allprotected - mode is turned on in the module declaration: - - %module(directors="1", allprotected="1") modulename - diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index 5c7a18eaf..c3197b9dc 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -380,7 +380,7 @@
  • Typemaps for multiple languages
  • Optimal code generation when returning by value -
  • Multi-argument typemaps +
  • Multi-argument typemaps
  • The run-time type checker
  • Accessing protected members
  • Common customization features diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 88963caf5..164fc21e7 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -85,6 +85,7 @@
  • Director classes
  • Overhead and code bloat
  • Simple directors example +
  • Director threading issues
  • Accessing protected members
  • Common customization features @@ -3450,6 +3451,26 @@ DirectorDerived::upcall_method() invoked. +

    20.5.5 Director threading issues

    + + +

    +Depending on your operating system and version of Java and how you are using threads, you might find the JVM hangs on exit. +There are a couple of solutions to try out. The preferred solution requires jdk-1.4 and later and uses AttachCurrentThreadAsDaemon instead of AttachCurrentThread whenever a call into the JVM is required. This can be enabled by defining the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro when compiling the C++ wrapper code. For older JVMs define SWIG_JAVA_NO_DETACH_CURRENT_THREAD instead, to avoid the DetachCurrentThread call but this will result in a memory leak instead. For further details inspect the source code in the java/director.swg library file. +

    + +

    +Macros can be defined on the commandline when compiling your C++ code, or alternatively added to the C++ wrapper file as shown below: +

    + +
    +
    +%insert("runtime") %{
+#define SWIG_JAVA_NO_DETACH_CURRENT_THREAD
+%}
+
    +
    +

    20.6 Accessing protected members

    diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html index faf0b254c..ef7487ff8 100644 --- a/Doc/Manual/SWIGPlus.html +++ b/Doc/Manual/SWIGPlus.html @@ -1153,8 +1153,9 @@ public:

    -This is great for reducing the size of the wrappers, but the caveat is it does not work for the strongly typed languages -which don't have optional arguments in the language, such as C# and Java. +This is great for reducing the size of the wrappers, but the caveat is it does not work for the statically typed languages, +such as C# and Java, +which don't have optional arguments in the language, Another restriction of this feature is that it cannot handle default arguments that are not public. The following example illustrates this:

    diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html index b7b4798e7..5406f44ea 100644 --- a/Doc/Manual/Sections.html +++ b/Doc/Manual/Sections.html @@ -6,7 +6,7 @@

    SWIG-1.3 Development Documentation

    -Last update : SWIG-1.3.36 (in progress) +Last update : SWIG-1.3.37 (in progress)

    Sections

    diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html index e07f9f87e..8f3035dc8 100644 --- a/Doc/Manual/Typemaps.html +++ b/Doc/Manual/Typemaps.html @@ -65,7 +65,7 @@
  • Typemaps for multiple languages
  • Optimal code generation when returning by value -
  • Multi-argument typemaps +
  • Multi-argument typemaps
  • The run-time type checker
    • Implementation @@ -702,7 +702,7 @@ variables (parms). The purpose of these variables will be explained shortly.

      code specifies the code used in the typemap. -Usually this is C/C++ code, but in the strongly typed target languages, such as Java and C#, this can contain target language code for certain typemaps. +Usually this is C/C++ code, but in the statically typed target languages, such as Java and C#, this can contain target language code for certain typemaps. It can take any one of the following forms:

      @@ -1933,7 +1933,7 @@ to implement customized conversions.

      In addition, the "in" typemap allows the number of converted arguments to be -specified. For example: +specified. The numinputs attributes facilitates this. For example:

      @@ -1946,7 +1946,12 @@ specified. For example:

      -At this time, only zero or one arguments may be converted. +At this time, only zero or one arguments may be converted. +When numinputs is set to 0, the argument is effectively ignored and cannot be supplied from the target language. +The argument is still required when making the C/C++ call and the above typemap +shows the value used is instead obtained from a locally declared variable called temp. +Usually numinputs is not specified, whereupon the default value is 1, that is, there is a one to one mapping of the number of arguments when used from the target language to the C/C++ call. +Multi-argument typemaps provide a similar concept where the number of arguments mapped from the target language to C/C++ can be changed for more tha multiple adjacent C/C++ arguments.

      @@ -2811,7 +2816,7 @@ optimal attribute usage in the out typemap at example.i:7. However, it doesn't always get it right, for example when $1 is within some commented out code.

      -

      10.9 Multi-argument typemaps

      +

      10.9 Multi-argument typemaps

      diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html index 39d5d3f01..0b3cb37e9 100644 --- a/Doc/Manual/Warnings.html +++ b/Doc/Manual/Warnings.html @@ -373,7 +373,7 @@ example.i(4): Syntax error in input.

    • 117. Deprecated %new directive.
    • 118. Deprecated %typemap(except).
    • 119. Deprecated %typemap(ignore). -
    • 120. Deprecated command line option (-c). +
    • 120. Deprecated command line option (-runtime, -noruntime).
    • 121. Deprecated %name directive.
    diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 3edb75f8d..8b9928306 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -40,8 +40,9 @@ LIBCRYPT = @LIBCRYPT@ SYSLIBS = $(LIBM) $(LIBC) $(LIBCRYPT) LIBPREFIX = -# RUNTOOL is for use as with runtime tools, eg set it to valgrind +# RUNTOOL is for use with runtime tools, eg set it to valgrind RUNTOOL = +# COMPILETOOL is a way to run the compiler under another tool, or more commonly just to stop the compiler executing COMPILETOOL= # X11 options @@ -94,8 +95,6 @@ TK_OPTS = -ltk -ltcl @LIBS@ # Extra Tcl specific dynamic linking options TCL_DLNK = @TCLDYNAMICLINKING@ -TCL_LDSHARED = @TCL_LDSHARED@ -TCL_CXXSHARED = @TCL_CXXSHARED@ TCL_SO = @TCL_SO@ # ----------------------------------------------------------- @@ -135,7 +134,7 @@ wish_cpp: $(SRCS) tcl: $(SRCS) $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) - $(TCL_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------- # Build a Tcl7.5 dynamic loadable module for C++ @@ -144,7 +143,7 @@ tcl: $(SRCS) tcl_cpp: $(SRCS) $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) - $(TCL_CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------------- # Cleaning the Tcl examples @@ -880,11 +879,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) chicken: $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) - $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) + $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) chicken_cpp: $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) - $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) + $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) chicken_externalhdr: $(SWIG) -chicken -external-runtime $(TARGET) @@ -1078,11 +1077,11 @@ RRSRC = $(INTERFACE:.i=.R) r: $(SRCS) $(SWIG) -r $(SWIGOPT) $(INTERFACE) - +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) + +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) r_cpp: $(CXXSRCS) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE) - +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) + +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) r_clean: rm -f *_wrap* *~ .~* diff --git a/Examples/guile/multimap/example.i b/Examples/guile/multimap/example.i index a1cc0bb67..7337d1e9e 100644 --- a/Examples/guile/multimap/example.i +++ b/Examples/guile/multimap/example.i @@ -20,7 +20,7 @@ extern int gcd(int x, int y); SCM *v; if (!(SCM_NIMP($input) && SCM_VECTORP($input))) { SWIG_exception(SWIG_ValueError, "Expecting a vector"); - return; + return 0; } $1 = SCM_LENGTH($input); if ($1 == 0) { @@ -32,7 +32,7 @@ extern int gcd(int x, int y); if (!(SCM_NIMP(v[i]) && SCM_STRINGP(v[i]))) { free($2); SWIG_exception(SWIG_ValueError, "Vector items must be strings"); - return; + return 0; } $2[i] = SCM_CHARS(v[i]); } diff --git a/Examples/guile/multivalue/example.i b/Examples/guile/multivalue/example.i index abc2a6fbc..135389487 100644 --- a/Examples/guile/multivalue/example.i +++ b/Examples/guile/multivalue/example.i @@ -2,6 +2,12 @@ %module example; +%{ +void divide_l(int a, int b, int *quotient_p, int *remainder_p); +void divide_v(int a, int b, int *quotient_p, int *remainder_p); +void divide_mv(int a, int b, int *quotient_p, int *remainder_p); +%} + /* Multiple values as lists. By default, if more than one value is to be returned, a list of the values is created and returned; to switch back to this behavior, use: */ diff --git a/Examples/lua/arrays/example.c b/Examples/lua/arrays/example.c index 40ed12c79..56c7b19d9 100644 --- a/Examples/lua/arrays/example.c +++ b/Examples/lua/arrays/example.c @@ -16,7 +16,7 @@ void sort_int(int* arr, int len) // ditto doubles int compare_double(const void * a, const void * b) { - return ( *(double*)a - *(double*)b ); + return (int)( *(double*)a - *(double*)b ); } void sort_double(double* arr, int len) diff --git a/Examples/lua/embed2/embed2.c b/Examples/lua/embed2/embed2.c index 07b7a44d2..dac527eb4 100644 --- a/Examples/lua/embed2/embed2.c +++ b/Examples/lua/embed2/embed2.c @@ -11,6 +11,17 @@ We will be using the luaL_dostring()/lua_dostring() function to call into lua */ +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) +# define _SCL_SECURE_NO_DEPRECATE +#endif + + #include #include @@ -108,7 +119,7 @@ int call_va (lua_State *L,const char *func, const char *sig, ...) { endwhile: /* do the call */ - nres = strlen(sig); /* number of expected results */ + nres = (int)strlen(sig); /* number of expected results */ if (lua_pcall(L, narg, nres, 0) != 0) /* do the call */ { printf("error running function `%s': %s\n",func, lua_tostring(L, -1)); diff --git a/Examples/lua/embed3/embed3.cpp b/Examples/lua/embed3/embed3.cpp index e42401cda..c2424f9af 100644 --- a/Examples/lua/embed3/embed3.cpp +++ b/Examples/lua/embed3/embed3.cpp @@ -5,6 +5,17 @@ passing C++ objects to this function. */ +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) +# define _SCL_SECURE_NO_DEPRECATE +#endif + + #include #include #include @@ -70,9 +81,6 @@ int call_onEvent(lua_State *L, Event e) { int main(int argc, char* argv[]) { - int ok; - int res; - char str[80]; printf("[C++] Welcome to the simple embedded Lua example v3\n"); printf("[C++] We are in C++\n"); printf("[C++] opening a Lua state & loading the libraries\n"); diff --git a/Examples/lua/owner/example.cxx b/Examples/lua/owner/example.cxx index 6e4091327..d6caeef15 100644 --- a/Examples/lua/owner/example.cxx +++ b/Examples/lua/owner/example.cxx @@ -54,14 +54,14 @@ void ShapeOwner::add(Shape* ptr) // this method takes ownership of the object Shape* ShapeOwner::get(int idx) // this pointer is still owned by the class (assessor) { - if (idx<0 || idx>=shapes.size()) + if (idx < 0 || idx >= static_cast(shapes.size())) return NULL; return shapes[idx]; } Shape* ShapeOwner::remove(int idx) // this method returns memory which must be deleted { - if (idx<0 || idx>=shapes.size()) + if (idx < 0 || idx >= static_cast(shapes.size())) return NULL; Shape* ptr=shapes[idx]; shapes.erase(shapes.begin()+idx); diff --git a/Examples/perl5/import/base.h b/Examples/perl5/import/base.h index be3cdef7d..5a266f68c 100644 --- a/Examples/perl5/import/base.h +++ b/Examples/perl5/import/base.h @@ -3,7 +3,7 @@ class Base { public: Base() { }; - ~Base() { }; + virtual ~Base() { }; virtual void A() { printf("I'm Base::A\n"); } diff --git a/Examples/perl5/multiple_inheritance/example.h b/Examples/perl5/multiple_inheritance/example.h index ce7dfe6a7..a8f544898 100644 --- a/Examples/perl5/multiple_inheritance/example.h +++ b/Examples/perl5/multiple_inheritance/example.h @@ -7,26 +7,25 @@ using namespace std; class Bar { public: - virtual void bar () - { - cout << "bar" << endl; - } + virtual void bar () { + cout << "bar" << endl; + } + virtual ~Bar() {} }; class Foo { public: - virtual void foo () - { - cout << "foo" << endl; - } + virtual void foo () { + cout << "foo" << endl; + } + virtual ~Foo() {} }; class Foo_Bar : public Foo, public Bar { public: - virtual void fooBar () - { - cout << "foobar" << endl; - } + virtual void fooBar () { + cout << "foobar" << endl; + } }; diff --git a/Examples/ruby/class/example.dsp b/Examples/ruby/class/example.dsp index 49c480575..9a26322ec 100644 --- a/Examples/ruby/class/example.dsp +++ b/Examples/ruby/class/example.dsp @@ -123,7 +123,7 @@ SOURCE=.\example.i InputPath=.\example.i InputName=example -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -138,7 +138,7 @@ InputName=example InputPath=.\example.i InputName=example -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/free_function/example.cxx b/Examples/ruby/free_function/example.cxx index 9e0d24b1a..402a947e9 100644 --- a/Examples/ruby/free_function/example.cxx +++ b/Examples/ruby/free_function/example.cxx @@ -23,7 +23,7 @@ Zoo::~Zoo() IterType iter = this->animals.begin(); IterType end = this->animals.end(); - for(iter; iter != end; ++iter) + for(; iter != end; ++iter) { Animal* animal = *iter; delete animal; diff --git a/Examples/ruby/free_function/example.dsp b/Examples/ruby/free_function/example.dsp index 49c480575..9a26322ec 100644 --- a/Examples/ruby/free_function/example.dsp +++ b/Examples/ruby/free_function/example.dsp @@ -123,7 +123,7 @@ SOURCE=.\example.i InputPath=.\example.i InputName=example -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -138,7 +138,7 @@ InputName=example InputPath=.\example.i InputName=example -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp index e897f8d5c..dd09ca021 100644 --- a/Examples/ruby/import/bar.dsp +++ b/Examples/ruby/import/bar.dsp @@ -115,7 +115,7 @@ SOURCE=.\bar.i InputPath=.\bar.i InputName=bar -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=bar InputPath=.\bar.i InputName=bar -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp index 45d2fe2ea..2bd4fa243 100644 --- a/Examples/ruby/import/base.dsp +++ b/Examples/ruby/import/base.dsp @@ -115,7 +115,7 @@ SOURCE=.\base.i InputPath=.\base.i InputName=base -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=base InputPath=.\base.i InputName=base -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp index 2dfba9d60..2a764bbd7 100644 --- a/Examples/ruby/import/foo.dsp +++ b/Examples/ruby/import/foo.dsp @@ -115,7 +115,7 @@ SOURCE=.\foo.i InputPath=.\foo.i InputName=foo -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=foo InputPath=.\foo.i InputName=foo -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp index 0530b7303..d2d7158bb 100644 --- a/Examples/ruby/import/spam.dsp +++ b/Examples/ruby/import/spam.dsp @@ -115,7 +115,7 @@ SOURCE=.\spam.i InputPath=.\spam.i InputName=spam -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=spam InputPath=.\spam.i InputName=spam -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/mark_function/example.dsp b/Examples/ruby/mark_function/example.dsp index 49c480575..9a26322ec 100644 --- a/Examples/ruby/mark_function/example.dsp +++ b/Examples/ruby/mark_function/example.dsp @@ -123,7 +123,7 @@ SOURCE=.\example.i InputPath=.\example.i InputName=example -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -138,7 +138,7 @@ InputName=example InputPath=.\example.i InputName=example -"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/tcl/import/base.h b/Examples/tcl/import/base.h index be3cdef7d..5a266f68c 100644 --- a/Examples/tcl/import/base.h +++ b/Examples/tcl/import/base.h @@ -3,7 +3,7 @@ class Base { public: Base() { }; - ~Base() { }; + virtual ~Base() { }; virtual void A() { printf("I'm Base::A\n"); } diff --git a/Examples/test-suite/apply_signed_char.i b/Examples/test-suite/apply_signed_char.i index ff1f1d83f..c0fa00cfe 100644 --- a/Examples/test-suite/apply_signed_char.i +++ b/Examples/test-suite/apply_signed_char.i @@ -31,5 +31,7 @@ const char memberconstchar; virtual ~DirectorTest() {} + private: + DirectorTest& operator=(const DirectorTest &); }; %} diff --git a/Examples/test-suite/bools.i b/Examples/test-suite/bools.i index 40e8989bd..7b94fcf88 100644 --- a/Examples/test-suite/bools.i +++ b/Examples/test-suite/bools.i @@ -57,6 +57,8 @@ struct BoolStructure { m_rbool(m_bool2), m_const_pbool(m_pbool), m_const_rbool(m_rbool) {} +private: + BoolStructure& operator=(const BoolStructure &); }; %} diff --git a/Examples/test-suite/char_strings.i b/Examples/test-suite/char_strings.i index a91afaded..b06eba773 100644 --- a/Examples/test-suite/char_strings.i +++ b/Examples/test-suite/char_strings.i @@ -10,7 +10,7 @@ below. %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK_MSG) global_const_char; // Setting a const char * variable may leak memory. %{ -#define OTHERLAND_MSG "Little message from the the safe world." +#define OTHERLAND_MSG "Little message from the safe world." #define CPLUSPLUS_MSG "A message from the deep dark world of C++, where anything is possible." static char *global_str = NULL; const int UINT_DIGITS = 10; // max unsigned int is 4294967295 diff --git a/Examples/test-suite/chicken/Makefile.in b/Examples/test-suite/chicken/Makefile.in index 0ac37d16a..ef6d7056c 100644 --- a/Examples/test-suite/chicken/Makefile.in +++ b/Examples/test-suite/chicken/Makefile.in @@ -40,7 +40,7 @@ SWIGOPT += -nounit $(setup) +$(swig_and_compile_c) $(run_testcase) - +if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \ + if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \ $(MAKE) $*.cproxy; ) \ fi; @@ -54,7 +54,7 @@ SWIGOPT += -nounit %.externaltest: $(setup) - $(swig_and_compile_external) + +$(swig_and_compile_external) $(run_testcase) # Runs the testcase. A testcase is only run if @@ -69,21 +69,21 @@ run_testcase = \ %.cppproxy: SWIGOPT += -proxy %.cppproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.cppproxy: - echo "Checking testcase $* (with run test) under chicken with -proxy" - $(swig_and_compile_cpp) + echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" + +$(swig_and_compile_cpp) $(run_testcase) %.cproxy: SWIGOPT += -proxy %.cproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.cproxy: - echo "Checking testcase $* (with run test) under chicken with -proxy" + echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_c) $(run_testcase) %.multiproxy: SWIGOPT += -proxy -noclosuses %.multiproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.multiproxy: - echo "Checking testcase $* (with run test) under chicken with -proxy" + echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_multi_cpp) $(run_testcase) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 3607a4253..0a3a0858a 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -202,6 +202,7 @@ CPP_TEST_CASES += \ inherit_target_language \ inherit_void_arg \ inline_initializer \ + keyword_rename \ kind \ langobj \ li_attribute \ @@ -422,6 +423,7 @@ C_TEST_CASES += \ immutable \ inctest \ integers \ + keyword_rename \ lextype \ li_carrays \ li_cdata \ diff --git a/Examples/test-suite/constant_pointers.i b/Examples/test-suite/constant_pointers.i index 367baf49c..5bd2fd533 100644 --- a/Examples/test-suite/constant_pointers.i +++ b/Examples/test-suite/constant_pointers.i @@ -46,6 +46,8 @@ public: int* array_member1[ARRAY_SIZE]; ParametersTest* array_member2[ARRAY_SIZE]; MemberVariablesTest() : member3(NULL), member4(NULL) {} +private: + MemberVariablesTest& operator=(const MemberVariablesTest&); }; void foo(const int *const i) {} @@ -69,6 +71,8 @@ public: void ret6(int*& a) {} int*& ret7() {return GlobalIntPtr;} ReturnValuesTest() : int3(NULL) {} +private: + ReturnValuesTest& operator=(const ReturnValuesTest&); }; const int* globalRet1() {return &GlobalInt;} @@ -100,6 +104,8 @@ int* const globalRet2() {return &GlobalInt;} A* ap; const A* cap; Acptr acptr; + private: + B& operator=(const B&); }; const B* bar(const B* b) { diff --git a/Examples/test-suite/cpp_basic.i b/Examples/test-suite/cpp_basic.i index becf84708..a247dd268 100644 --- a/Examples/test-suite/cpp_basic.i +++ b/Examples/test-suite/cpp_basic.i @@ -55,6 +55,8 @@ class Bar { Foo *testFoo(int a, Foo *f) { return new Foo(2 * a + (f ? f->num : 0) + fval.num); } +private: + Bar& operator=(const Bar&); }; %} diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in index 44a1b3675..5fd576ed8 100644 --- a/Examples/test-suite/csharp/Makefile.in +++ b/Examples/test-suite/csharp/Makefile.in @@ -51,9 +51,9 @@ intermediary_classname.customtest: # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ fi; \ if [ ! -d $* ]; then \ mkdir $*; \ diff --git a/Examples/test-suite/csharp/char_strings_runme.cs b/Examples/test-suite/csharp/char_strings_runme.cs index a1e878016..a8907fb16 100644 --- a/Examples/test-suite/csharp/char_strings_runme.cs +++ b/Examples/test-suite/csharp/char_strings_runme.cs @@ -5,7 +5,7 @@ using char_stringsNamespace; public class char_strings_runme { private static string CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; - private static string OTHERLAND_MSG = "Little message from the the safe world."; + private static string OTHERLAND_MSG = "Little message from the safe world."; public static void Main() { diff --git a/Examples/test-suite/enum_thorough.i b/Examples/test-suite/enum_thorough.i index 4aa0613f2..31e3e2105 100644 --- a/Examples/test-suite/enum_thorough.i +++ b/Examples/test-suite/enum_thorough.i @@ -81,6 +81,8 @@ struct SpeedClass { const colour myColour2; speedtd1 mySpeedtd1; SpeedClass() : myColour2(red), mySpeedtd1(slow) { } +private: + SpeedClass& operator=(const SpeedClass&); }; int speedTest0(int s) { return s; } diff --git a/Examples/test-suite/fvirtual.i b/Examples/test-suite/fvirtual.i index 074202bee..af189ed1f 100644 --- a/Examples/test-suite/fvirtual.i +++ b/Examples/test-suite/fvirtual.i @@ -10,11 +10,11 @@ virtual ~Node() {} }; - class Switch : public Node { + class NodeSwitch : public Node { public : virtual int addChild( Node *child ) { return 2; } // This was hidden with -fvirtual virtual int addChild( Node *child, bool value ) { return 3; } - virtual ~Switch() {} + virtual ~NodeSwitch() {} }; %} diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilescm/Makefile.in index 285426ee8..04de236db 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilescm/Makefile.in @@ -21,9 +21,9 @@ run_testcase = \ setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ fi; swig_and_compile_multi_cpp = \ @@ -43,9 +43,9 @@ swig_and_compile_multi_cpp = \ # Same as setup and run_testcase, but without the SCRIPTPREFIX (so the runme comes from the guilescm directory) local_setup = \ if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ fi; local_run_testcase = \ diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 53816f6d0..ace8dee86 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -57,9 +57,9 @@ SWIGOPT += -package $* # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ fi; \ if [ ! -d $* ]; then \ mkdir $*; \ diff --git a/Examples/test-suite/java/char_strings_runme.java b/Examples/test-suite/java/char_strings_runme.java index 2e62080f5..2c71d3ea7 100644 --- a/Examples/test-suite/java/char_strings_runme.java +++ b/Examples/test-suite/java/char_strings_runme.java @@ -12,7 +12,7 @@ public class char_strings_runme { } private static String CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; - private static String OTHERLAND_MSG = "Little message from the the safe world."; + private static String OTHERLAND_MSG = "Little message from the safe world."; public static void main(String argv[]) { diff --git a/Examples/test-suite/java_typemaps_proxy.i b/Examples/test-suite/java_typemaps_proxy.i index 5a1e61bb2..e315a36b5 100644 --- a/Examples/test-suite/java_typemaps_proxy.i +++ b/Examples/test-suite/java_typemaps_proxy.i @@ -119,6 +119,8 @@ public: void const_member_method(const ConstWithout *p) const {} const ConstWithout * const_var; const ConstWithout * const var_const; +private: + ConstWithout& operator=(const ConstWithout &); }; const ConstWithout * global_constwithout = 0; void global_method_constwithout(const ConstWithout *p) {} diff --git a/Examples/test-suite/keyword_rename.i b/Examples/test-suite/keyword_rename.i new file mode 100644 index 000000000..da9328868 --- /dev/null +++ b/Examples/test-suite/keyword_rename.i @@ -0,0 +1,32 @@ +/* + * Test reserved keyword renaming + */ + +%module keyword_rename + +#pragma SWIG nowarn=SWIGWARN_PARSE_KEYWORD + +%inline %{ + +#define KW(x, y) int x (int y) { return y; } + +/* Python keywords */ +KW(in, except) +KW(except, in) +KW(pass, in) + +/* Perl keywords */ +KW(tie, die) +KW(use, next) + +/* Java keywords */ +KW(implements, native) +KW(synchronized, final) + +/* C# Keywords */ +KW(string, out) +struct sealed {int i;}; + +%} + + diff --git a/Examples/test-suite/li_std_string.i b/Examples/test-suite/li_std_string.i index 8c2f1b857..2d0b7503d 100644 --- a/Examples/test-suite/li_std_string.i +++ b/Examples/test-suite/li_std_string.i @@ -129,7 +129,7 @@ public: %} %inline %{ - std::string empty() { + std::string stdstring_empty() { return std::string(); } diff --git a/Examples/test-suite/lua/li_typemaps_runme.lua b/Examples/test-suite/lua/li_typemaps_runme.lua new file mode 100644 index 000000000..77aeb54e4 --- /dev/null +++ b/Examples/test-suite/lua/li_typemaps_runme.lua @@ -0,0 +1,40 @@ +require("import") -- the import fn +import("li_typemaps") -- import code + +-- catch "undefined" global variables +setmetatable(getfenv(),{__index=function (t,i) error("undefined global variable `"..i.."'",2) end}) + +-- Check double INPUT typemaps +assert(li_typemaps.in_double(22.22) == 22.22) +assert(li_typemaps.inr_double(22.22) == 22.22) + +-- Check double OUTPUT typemaps +assert(li_typemaps.out_double(22.22) == 22.22) +assert(li_typemaps.outr_double(22.22) == 22.22) + +-- Check double INOUT typemaps +assert(li_typemaps.inout_double(22.22) == 22.22) +assert(li_typemaps.inoutr_double(22.22) == 22.22) + +-- check long long +assert(li_typemaps.in_ulonglong(20)==20) +assert(li_typemaps.inr_ulonglong(20)==20) +assert(li_typemaps.out_ulonglong(20)==20) +assert(li_typemaps.outr_ulonglong(20)==20) +assert(li_typemaps.inout_ulonglong(20)==20) +assert(li_typemaps.inoutr_ulonglong(20)==20) + +-- check bools +assert(li_typemaps.in_bool(true)==true) +assert(li_typemaps.inr_bool(false)==false) +assert(li_typemaps.out_bool(true)==true) +assert(li_typemaps.outr_bool(false)==false) +assert(li_typemaps.inout_bool(true)==true) +assert(li_typemaps.inoutr_bool(false)==false) + +-- the others +a,b=li_typemaps.inoutr_int2(1,2) +assert(a==1 and b==2) + +f,i=li_typemaps.out_foo(10) +assert(f.a==10 and i==20) diff --git a/Examples/test-suite/minherit.i b/Examples/test-suite/minherit.i index aba299387..24092b6c6 100644 --- a/Examples/test-suite/minherit.i +++ b/Examples/test-suite/minherit.i @@ -6,7 +6,7 @@ %module(ruby_minherit="1") minherit -#if defined(SWIGPYTHON) || defined(SWIGRUBY) || defined(SWIGOCAML) || defined(SWIGOCTAVE) +#if defined(SWIGPYTHON) || defined(SWIGRUBY) || defined(SWIGOCAML) || defined(SWIGOCTAVE) || defined(SWIGPERL) %inline %{ diff --git a/Examples/test-suite/octave/fvirtual_runme.m b/Examples/test-suite/octave/fvirtual_runme.m index 06c6e7ccb..e755a559a 100644 --- a/Examples/test-suite/octave/fvirtual_runme.m +++ b/Examples/test-suite/octave/fvirtual_runme.m @@ -1,6 +1,6 @@ fvirtual -sw = Switch(); +sw = NodeSwitch(); n = Node(); i = sw.addChild(n); diff --git a/Examples/test-suite/octave/li_std_string_runme.m b/Examples/test-suite/octave/li_std_string_runme.m index 1c24ac344..fa0e260e0 100644 --- a/Examples/test-suite/octave/li_std_string_runme.m +++ b/Examples/test-suite/octave/li_std_string_runme.m @@ -148,7 +148,7 @@ if (s != "hellohello") endif -if (li_std_string.empty() != "") +if (li_std_string.stdstring_empty() != "") error endif diff --git a/Examples/test-suite/perl5/li_std_string_runme.pl b/Examples/test-suite/perl5/li_std_string_runme.pl index 0ee11bdc7..9ec7dd08c 100644 --- a/Examples/test-suite/perl5/li_std_string_runme.pl +++ b/Examples/test-suite/perl5/li_std_string_runme.pl @@ -98,7 +98,7 @@ SKIP: { is($gen1->testl("9234567890121111113"), "9234567890121111114", "ulonglong big number"); -is(li_std_string::empty(), "", "empty"); +is(li_std_string::stdstring_empty(), "", "stdstring_empty"); is(li_std_string::c_empty(), "", "c_empty"); @@ -110,4 +110,4 @@ is(li_std_string::get_null(li_std_string::c_null()), undef, "c_empty"); is(li_std_string::get_null(li_std_string::c_empty()), "non-null", "c_empty"); -is(li_std_string::get_null(li_std_string::empty()), "non-null", "c_empty"); +is(li_std_string::get_null(li_std_string::stdstring_empty()), "non-null", "stdstring_empty"); diff --git a/Examples/test-suite/perl5/run-perl-test.pl b/Examples/test-suite/perl5/run-perl-test.pl index f0e1b0288..106bf002b 100755 --- a/Examples/test-suite/perl5/run-perl-test.pl +++ b/Examples/test-suite/perl5/run-perl-test.pl @@ -7,7 +7,7 @@ use strict; my $command = shift @ARGV; -my $output = `perl $command 2>&1`; +my $output = `$^X $command 2>&1`; die "SWIG Perl test failed: \n\n$output\n" if $?; diff --git a/Examples/test-suite/php4/Makefile.in b/Examples/test-suite/php4/Makefile.in index dbd239964..2e14ef9a2 100644 --- a/Examples/test-suite/php4/Makefile.in +++ b/Examples/test-suite/php4/Makefile.in @@ -42,17 +42,17 @@ missingtests: missingcpptests missingctests %.cpptest: $(setup) +$(swig_and_compile_cpp) - $(run_testcase) + +$(run_testcase) %.ctest: $(setup) +$(swig_and_compile_c) - $(run_testcase) + +$(run_testcase) %.multicpptest: $(setup) +$(swig_and_compile_multi_cpp) - $(run_testcase) + +$(run_testcase) # Runs the testcase. A testcase is only run if # a file is found which has _runme.php4 appended after the testcase name. diff --git a/Examples/test-suite/python/fvirtual_runme.py b/Examples/test-suite/python/fvirtual_runme.py index e06ab5b4f..ada3313de 100644 --- a/Examples/test-suite/python/fvirtual_runme.py +++ b/Examples/test-suite/python/fvirtual_runme.py @@ -1,6 +1,6 @@ from fvirtual import * -sw = Switch() +sw = NodeSwitch() n = Node() i = sw.addChild(n); diff --git a/Examples/test-suite/python/keyword_rename_runme.py b/Examples/test-suite/python/keyword_rename_runme.py new file mode 100644 index 000000000..5646ce7d6 --- /dev/null +++ b/Examples/test-suite/python/keyword_rename_runme.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import keyword_rename +keyword_rename._in(1) +keyword_rename._except(1) diff --git a/Examples/test-suite/python/li_std_string_runme.py b/Examples/test-suite/python/li_std_string_runme.py index ed79718d2..c0dae1e25 100644 --- a/Examples/test-suite/python/li_std_string_runme.py +++ b/Examples/test-suite/python/li_std_string_runme.py @@ -121,7 +121,7 @@ if s != "hellohello": raise RuntimeError -if li_std_string.empty() != "": +if li_std_string.stdstring_empty() != "": raise RuntimeError diff --git a/Examples/test-suite/r/Makefile.in b/Examples/test-suite/r/Makefile.in index 0a1b3567e..70dd62ec5 100644 --- a/Examples/test-suite/r/Makefile.in +++ b/Examples/test-suite/r/Makefile.in @@ -42,7 +42,7 @@ run_testcase = \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \ $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ;) \ else \ - ($(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \ + ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \ fi; run_multitestcase = \ @@ -51,7 +51,7 @@ run_multitestcase = \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \ $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ;) \ else \ - ($(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \ + ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \ fi; \ done # Clean diff --git a/Examples/test-suite/ruby/li_std_string_runme.rb b/Examples/test-suite/ruby/li_std_string_runme.rb index f572573bc..dc85b5dab 100644 --- a/Examples/test-suite/ruby/li_std_string_runme.rb +++ b/Examples/test-suite/ruby/li_std_string_runme.rb @@ -124,7 +124,7 @@ if (s != "hellohello") end -if (empty() != "") +if (stdstring_empty() != "") raise RuntimeError end diff --git a/Examples/test-suite/samename.i b/Examples/test-suite/samename.i index 1e9645e70..819cb4abd 100644 --- a/Examples/test-suite/samename.i +++ b/Examples/test-suite/samename.i @@ -1,6 +1,15 @@ %module samename -%inline { +#if !(defined(SWIGCSHARP) || defined(SWIGJAVA)) +class samename { + public: + void do_something() { + // ... + } +}; +#endif + +%{ class samename { public: @@ -9,5 +18,5 @@ class samename { } }; -} +%} diff --git a/Examples/test-suite/template_int_const.i b/Examples/test-suite/template_int_const.i index 37b1cf998..e69a53c4f 100644 --- a/Examples/test-suite/template_int_const.i +++ b/Examples/test-suite/template_int_const.i @@ -10,7 +10,7 @@ static const Polarization polarization = UnaryPolarization; }; template - struct Interface + struct Interface_ { }; @@ -26,16 +26,16 @@ }; %} -%template(Interface_UP) Interface; +%template(Interface_UP) Interface_; %template(Module_1) Module<1>; %inline %{ struct ExtInterface1 : - Interface // works + Interface_ // works { }; struct ExtInterface2 : - Interface // doesn't work + Interface_ // doesn't work { }; struct ExtModule1 : diff --git a/Examples/test-suite/template_typedef_rec.i b/Examples/test-suite/template_typedef_rec.i index 83fe2104a..abdf11382 100644 --- a/Examples/test-suite/template_typedef_rec.i +++ b/Examples/test-suite/template_typedef_rec.i @@ -16,7 +16,7 @@ public: template -class ArrayIterator +class ArrayIterator_ { public: typedef test_Array::intT intT; @@ -38,8 +38,8 @@ class ArrayPrimitiveT public: typedef T ValueT; typedef T valueT; - typedef ArrayIterator Iterator; - typedef ArrayIterator ConstIterator; + typedef ArrayIterator_ Iterator; + typedef ArrayIterator_ ConstIterator; typedef ArrayReverseIterator ReverseIterator; typedef ArrayReverseIterator ConstReverseIterator; }; diff --git a/Examples/test-suite/typemap_namespace.i b/Examples/test-suite/typemap_namespace.i index d30a4ddb1..5375c43b6 100644 --- a/Examples/test-suite/typemap_namespace.i +++ b/Examples/test-suite/typemap_namespace.i @@ -27,7 +27,7 @@ namespace Foo { %typemap(javaout) Str1 * = char *; #endif %typemap(in) Str1 * = char *; -#if !(defined(SWIGCSHARP) || defined(SWIGLUA)) +#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP)) %typemap(freearg) Str1 * = char *; #endif %typemap(typecheck) Str1 * = char *; diff --git a/Lib/chicken/chickenkw.swg b/Lib/chicken/chickenkw.swg index f01faf14f..d2c26c74c 100644 --- a/Lib/chicken/chickenkw.swg +++ b/Lib/chicken/chickenkw.swg @@ -3,7 +3,7 @@ /* Warnings for certain CHICKEN keywords. From Section 7.1.1 of Revised^5 Report on the Algorithmic Language Scheme */ -#define CHICKENKW(x) %namewarn("314:" #x " is a R^5RS syntatic keyword") #x +#define CHICKENKW(x) %namewarn("314: '" #x "' is a R^5RS syntatic keyword") #x CHICKENKW(else); CHICKENKW(=>); diff --git a/Lib/csharp/csharphead.swg b/Lib/csharp/csharphead.swg index 7938dee04..ffff70372 100644 --- a/Lib/csharp/csharphead.swg +++ b/Lib/csharp/csharphead.swg @@ -73,7 +73,7 @@ static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = { static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) { SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback; - if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) { + if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) { callback = SWIG_csharp_exceptions[code].callback; } callback(msg); @@ -81,7 +81,7 @@ static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) { SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback; - if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) { + if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) { callback = SWIG_csharp_exceptions_argument[code].callback; } callback(msg, param_name); diff --git a/Lib/csharp/csharpkw.swg b/Lib/csharp/csharpkw.swg index c96042d2d..9a6d979f1 100644 --- a/Lib/csharp/csharpkw.swg +++ b/Lib/csharp/csharpkw.swg @@ -2,7 +2,7 @@ #define CSHARP_CSHARPKW_SWG_ /* Warnings for C# keywords */ -#define CSHARPKW(x) %namewarn("314:" #x " is a csharp keyword") #x +#define CSHARPKW(x) %keywordwarn("'" `x` "' is a C# keyword, renaming to '_" `x` "'",rename="_%s") `x` /* from diff --git a/Lib/java/director.swg b/Lib/java/director.swg index bade80c9d..fa588671d 100644 --- a/Lib/java/director.swg +++ b/Lib/java/director.swg @@ -117,12 +117,18 @@ namespace Swig { JNIEnv *jenv_; public: JNIEnvWrapper(const Director *director) : director_(director), jenv_(0) { +#if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON) + // Attach a daemon thread to the JVM. Useful when the JVM should not wait for + // the thread to exit upon shutdown. Only for jdk-1.4 and later. + director_->swig_jvm_->AttachCurrentThreadAsDaemon((void **) &jenv_, NULL); +#else director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL); +#endif } ~JNIEnvWrapper() { -// Some JVMs, eg JDK 1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call. -// However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak. #if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD) + // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call. + // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak. director_->swig_jvm_->DetachCurrentThread(); #endif } diff --git a/Lib/java/javakw.swg b/Lib/java/javakw.swg index 9dcd97062..99cd54770 100644 --- a/Lib/java/javakw.swg +++ b/Lib/java/javakw.swg @@ -2,7 +2,7 @@ #define JAVA_JAVAKW_SWG_ /* Warnings for Java keywords */ -#define JAVAKW(x) %namewarn("314:" #x " is a java keyword") #x +#define JAVAKW(x) %keywordwarn("'" `x` "' is a java keyword, renaming to '_"`x`"'",rename="_%s") `x` /* from diff --git a/Lib/java/various.i b/Lib/java/various.i index c53f08aa2..733b8fa79 100644 --- a/Lib/java/various.i +++ b/Lib/java/various.i @@ -60,7 +60,7 @@ #endif } -%typemap(out) char **STRING_ARRAY (char *s) { +%typemap(out) char **STRING_ARRAY { int i; int len=0; jstring temp_string; diff --git a/Lib/lua/luatypemaps.swg b/Lib/lua/luatypemaps.swg index 462d6a055..0941c9da1 100644 --- a/Lib/lua/luatypemaps.swg +++ b/Lib/lua/luatypemaps.swg @@ -73,7 +73,7 @@ %{$1 = (lua_toboolean(L, $input)!=0);%} %typemap(out) bool -%{ lua_pushboolean(L,(int)($1==true)); SWIG_arg++;%} +%{ lua_pushboolean(L,(int)($1!=0)); SWIG_arg++;%} // for const bool&, SWIG treats this as a const bool* so we must dereference it %typemap(in,checkfn="lua_isboolean") const bool& (bool temp) @@ -81,7 +81,7 @@ $1=&temp;%} %typemap(out) const bool& -%{ lua_pushboolean(L,(int)(*$1==true)); SWIG_arg++;%} +%{ lua_pushboolean(L,(int)((*$1)!=0)); SWIG_arg++;%} // strings (char* and char[]) %typemap(in,checkfn="lua_isstring") const char*, char* diff --git a/Lib/lua/typemaps.i b/Lib/lua/typemaps.i index e0adcf192..fa0c0d0e5 100644 --- a/Lib/lua/typemaps.i +++ b/Lib/lua/typemaps.i @@ -80,6 +80,22 @@ SWIG_NUMBER_TYPEMAP(long long); SWIG_NUMBER_TYPEMAP(unsigned long long); SWIG_NU // note we dont do char, as a char* is probably a string not a ptr to a single char +// similar for booleans +%typemap(in,checkfn="lua_isboolean") bool *INPUT(bool temp), bool &INPUT(bool temp) +%{ temp = (lua_toboolean(L,$input)!=0); + $1 = &temp; %} + +%typemap(in, numinputs=0) bool *OUTPUT (bool temp),bool &OUTPUT (bool temp) +%{ $1 = &temp; %} + +%typemap(argout) bool *OUTPUT,bool &OUTPUT +%{ lua_pushboolean(L, (int)((*$1)!=0)); SWIG_arg++;%} + +%typemap(in) bool *INOUT = bool *INPUT; +%typemap(argout) bool *INOUT = bool *OUTPUT; +%typemap(in) bool &INOUT = bool &INPUT; +%typemap(argout) bool &INOUT = bool &OUTPUT; + /* ----------------------------------------------------------------------------- * Basic Array typemaps * ----------------------------------------------------------------------------- */ @@ -320,6 +336,11 @@ for array handling %typemap(freearg) (TYPE *INOUT,int)=(TYPE *INPUT,int); // TODO out variable arrays (is there a standard form for such things?) + +// referencing so that (int *INPUT,int) and (int INPUT[],int) are the same +%typemap(in) (TYPE INPUT[],int)=(TYPE *INPUT,int); +%typemap(freearg) (TYPE INPUT[],int)=(TYPE *INPUT,int); + %enddef // the following line of code diff --git a/Lib/ocaml/ocamlkw.swg b/Lib/ocaml/ocamlkw.swg index ba06f238e..9b9096e2b 100644 --- a/Lib/ocaml/ocamlkw.swg +++ b/Lib/ocaml/ocamlkw.swg @@ -2,7 +2,7 @@ #define OCAML_OCAMLKW_SWG_ /* Warnings for Ocaml keywords */ -#define OCAMLKW(x) %namewarn("314:" #x " is a ocaml keyword and it will properly renamed") #x +#define OCAMLKW(x) %namewarn("314: '" #x "' is a ocaml keyword and it will properly renamed") #x /* from diff --git a/Lib/perl5/perlkw.swg b/Lib/perl5/perlkw.swg index 71a229c66..00648e0bf 100644 --- a/Lib/perl5/perlkw.swg +++ b/Lib/perl5/perlkw.swg @@ -1,6 +1,6 @@ /* Warnings for Perl keywords */ -#define PERLKW(x) %keywordwarn(`x` " is a perl keyword") `x` -#define PERLBN(x) %builtinwarn(`x` " conflicts with a built-in name in perl") "::" `x` +#define PERLKW(x) %keywordwarn("'" `x` "' is a perl keyword") `x` +#define PERLBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in perl") "::" `x` /* diff --git a/Lib/php4/php4kw.swg b/Lib/php4/php4kw.swg index 0d28994c5..a6b519445 100644 --- a/Lib/php4/php4kw.swg +++ b/Lib/php4/php4kw.swg @@ -8,15 +8,15 @@ * when used as class methods. * ----------------------------------------------------------------------------- */ -#define PHPKW(x) %keywordwarn(`x` " is a php keyword, renamed as c_"`x`,sourcefmt="%(lower)s", rename="c_%s",fullname=1) `x` +#define PHPKW(x) %keywordwarn("'" `x` "' is a php keyword, renamed as 'c_" `x` "'",sourcefmt="%(lower)s", rename="c_%s",fullname=1) `x` %define PHPCN(x) -%keywordwarn(`x` " is a php reserved class name, class renamed as c_"`x`,%$isclass,rename="c_%s") `x`; -%keywordwarn(`x` " is a php reserved class name, constructor renamed as c_"`x`,%$isconstructor,rename="c_%s") `x`; +%keywordwarn("'" `x` "' is a php reserved class name, class renamed as 'c_" `x` "'",%$isclass,rename="c_%s") `x`; +%keywordwarn("'" `x` "' is a php reserved class name, constructor renamed as 'c_" `x` "'",%$isconstructor,rename="c_%s") `x`; %enddef -#define PHPBN1(x) %builtinwarn(`x` " conflicts with a built-in name in php",sourcefmt="%(lower)s",fullname=1) `x` -#define PHPBN2(x) %builtinwarn(`x` " conflicts with a built-in name in php") "::" `x` +#define PHPBN1(x) %builtinwarn("'" `x` "' conflicts with a built-in name in php",sourcefmt="%(lower)s",fullname=1) `x` +#define PHPBN2(x) %builtinwarn("'" `x` "' conflicts with a built-in name in php") "::" `x` /* diff --git a/Lib/pike/pikekw.swg b/Lib/pike/pikekw.swg index 85fd091a8..844b1f189 100644 --- a/Lib/pike/pikekw.swg +++ b/Lib/pike/pikekw.swg @@ -2,7 +2,7 @@ #define PIKE_PIKEKW_SWG_ /* Warnings for Pike keywords */ -#define PIKEKW(x) %namewarn("314:" #x " is a pike keyword") #x +#define PIKEKW(x) %namewarn("314: '" #x "' is a pike keyword") #x /* from diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index 8f1db7ce1..ed0eb7f0b 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -738,12 +738,12 @@ namespace swig { typedef typename sequence::const_iterator const_iterator; static PyObject *from(const sequence& seq) { -#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS +%#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS swig_type_info *desc = swig::type_info(); if (desc && desc->clientdata) { return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN); } -#endif +%#endif size_type size = seq.size(); if (size <= (size_type)INT_MAX) { PyObject *obj = PyTuple_New((int)size); diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg index e2dfbc3f5..38f1791a9 100644 --- a/Lib/python/pyiterators.swg +++ b/Lib/python/pyiterators.swg @@ -38,18 +38,18 @@ namespace swig { virtual PySwigIterator *incr(size_t n = 1) = 0; // Backward iterator method, very common in C++, but not required in Python - virtual PySwigIterator *decr(size_t n = 1) + virtual PySwigIterator *decr(size_t /*n*/ = 1) { throw stop_iteration(); } // Random access iterator methods, but not required in Python - virtual ptrdiff_t distance(const PySwigIterator &x) const + virtual ptrdiff_t distance(const PySwigIterator &/*x*/) const { throw std::invalid_argument("operation not supported"); } - virtual bool equal (const PySwigIterator &x) const + virtual bool equal (const PySwigIterator &/*x*/) const { throw std::invalid_argument("operation not supported"); } diff --git a/Lib/python/pythonkw.swg b/Lib/python/pythonkw.swg index f57d34ce4..2ee233516 100644 --- a/Lib/python/pythonkw.swg +++ b/Lib/python/pythonkw.swg @@ -2,8 +2,8 @@ Warnings for Python keywords, built-in names and bad names. */ -#define PYTHONKW(x) %keywordwarn(`x` " is a python keyword, symbol will be renamed as '_" `x`"'", rename="_%s") `x` -#define PYTHONBN(x) %builtinwarn(`x` " conflicts with a built-in name in python") "::"`x` +#define PYTHONKW(x) %keywordwarn("'" `x` "' is a python keyword, renaming to '_" `x` "'", rename="_%s") `x` +#define PYTHONBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in python") "::"`x` /* diff --git a/Lib/r/r.swg b/Lib/r/r.swg index 3095529a0..0ab7e11a0 100644 --- a/Lib/r/r.swg +++ b/Lib/r/r.swg @@ -12,6 +12,8 @@ SWIGEXPORT void SWIG_init(void) { %} +%include + #define %Rruntime %insert("s") #define SWIG_Object SEXP diff --git a/Lib/r/rkw.swg b/Lib/r/rkw.swg new file mode 100644 index 000000000..2c181faa0 --- /dev/null +++ b/Lib/r/rkw.swg @@ -0,0 +1,32 @@ +/* + Warnings for R keywords, built-in names and bad names. +*/ + +#define RKW(x) %keywordwarn("'" `x` "' is a R keyword, renaming to '_" `x`"'", rename="_%s") `x` + +/* + Warnings for R reserved words taken from + http://cran.r-project.org/doc/manuals/R-lang.html#Reserved-words +*/ + +RKW(if); +RKW(else); +RKW(repeat); +RKW(while); +RKW(function); +RKW(for); +RKW(in); +RKW(next); +RKW(break); +RKW(TRUE); +RKW(FALSE); +RKW(NULL); +RKW(Inf); +RKW(NaN); +RKW(NA); +RKW(NA_integer_); +RKW(NA_real_); +RKW(NA_complex_); +RKW(NA_character_); + +#undef RKW diff --git a/Lib/ruby/rubycontainer.swg b/Lib/ruby/rubycontainer.swg index e3cae5778..919695ec2 100644 --- a/Lib/ruby/rubycontainer.swg +++ b/Lib/ruby/rubycontainer.swg @@ -691,10 +691,12 @@ namespace swig for ( ; i != e; ) { VALUE r = swig::from< Sequence::value_type >(*i); - if ( RTEST( rb_yield(r) ) ) + if ( RTEST( rb_yield(r) ) ) { $self->erase(i++); - else + e = self->end(); + } else { ++i; + } } return self; diff --git a/Lib/ruby/rubykw.swg b/Lib/ruby/rubykw.swg index fec47baff..194687b95 100644 --- a/Lib/ruby/rubykw.swg +++ b/Lib/ruby/rubykw.swg @@ -2,7 +2,7 @@ #define RUBY_RUBYKW_SWG_ /* Warnings for Ruby keywords */ -#define RUBYKW(x) %keywordwarn("'" `x` "' is a ruby keyword, and it will renamed as 'C_"`x`"'",rename="C_%s",fullname=1) `x` +#define RUBYKW(x) %keywordwarn("'" `x` "' is a ruby keyword, renaming to 'C_" `x` "'",rename="C_%s",fullname=1) `x` /* diff --git a/Lib/swiglabels.swg b/Lib/swiglabels.swg index 09de6c969..b943afb47 100644 --- a/Lib/swiglabels.swg +++ b/Lib/swiglabels.swg @@ -40,6 +40,12 @@ # endif #endif +#ifndef SWIG_MSC_UNSUPPRESS_4505 +# if defined(_MSC_VER) +# pragma warning(disable : 4505) /* unreferenced local function has been removed */ +# endif +#endif + #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) diff --git a/Lib/typemaps/primtypes.swg b/Lib/typemaps/primtypes.swg index c59aa1d1e..42728e5fe 100644 --- a/Lib/typemaps/primtypes.swg +++ b/Lib/typemaps/primtypes.swg @@ -283,6 +283,7 @@ _apply_macro(Macro, ptrdiff_t , Arg2); _apply_macro(Macro, std::size_t, Arg2); _apply_macro(Macro, std::ptrdiff_t, Arg2); _apply_macro(Macro, std::string, Arg2); +_apply_macro(Macro, std::wstring, Arg2); _apply_macro(Macro, std::complex, Arg2); _apply_macro(Macro, std::complex, Arg2); %enddef diff --git a/README b/README index 61550e558..2898130b0 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 1.3.35 (7 April 2008) +Version: 1.3.36 (24 June 2008) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, @@ -91,6 +91,13 @@ A SWIG FAQ and other hints can be found on the SWIG Wiki: What's New? =========== +SWIG-1.3.36 summary: +- Enhancement to directors to wrap all protected members +- Optimisation feature for objects returned by value +- A few bugs fixes in the PHP, Java, Ruby, R, C#, Python, Lua and + Perl modules +- Other minor generic bug fixes + SWIG-1.3.35 summary: - Octave language module added - Bug fixes in Python, Lua, Java, C#, Perl modules diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index 2a0d341b5..032c71f7e 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -423,7 +423,7 @@ int yylook(void) { { String *cmt = Scanner_text(scan); char *loc = Char(cmt); - if ((strncmp(loc,"/*@SWIG@",6) == 0) && (loc[Len(cmt)-3] == '@')) { + if ((strncmp(loc,"/*@SWIG",7) == 0) && (loc[Len(cmt)-3] == '@')) { scanner_locator(cmt); } } diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 4fe8b47ed..58e0c0c41 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -331,7 +331,9 @@ static void add_symbols(Node *n) { Delete(prefix); } - if (0 && !Getattr(n,"parentNode") && class_level) set_parentNode(n,class_decl[class_level - 1]); + /* + if (!Getattr(n,"parentNode") && class_level) set_parentNode(n,class_decl[class_level - 1]); + */ Setattr(n,"ismember","1"); } } @@ -4109,10 +4111,11 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end { /* Check for template names. If the class is a template and the constructor is missing the template part, we add it */ - if (Classprefix && (c = strchr(Char(Classprefix),'<'))) { - if (!Strchr($3,'<')) { - $3 = NewStringf("%s%s",$3,c); - } + if (Classprefix) { + c = strchr(Char(Classprefix),'<'); + if (c && !Strchr($3,'<')) { + $3 = NewStringf("%s%s",$3,c); + } } Setattr($$,"storage","virtual"); name = NewStringf("%s",$3); @@ -4428,12 +4431,8 @@ parms : rawparms { ; rawparms : parm ptail { - if (1) { - set_nextSibling($1,$2); - $$ = $1; - } else { - $$ = $2; - } + set_nextSibling($1,$2); + $$ = $1; } | empty { $$ = 0; } ; @@ -4486,12 +4485,8 @@ valparms : rawvalparms { ; rawvalparms : valparm valptail { - if (1) { - set_nextSibling($1,$2); - $$ = $1; - } else { - $$ = $2; - } + set_nextSibling($1,$2); + $$ = $1; } | empty { $$ = 0; } ; diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index a1f0c8e08..8142125a7 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -281,13 +281,13 @@ int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab Delete(ptargs); } - if (0) { + /* Parm *p = tparms; while (p) { Printf(stdout, "tparm: '%s' '%s' '%s'\n", Getattr(p, "name"), Getattr(p, "type"), Getattr(p, "value")); p = nextSibling(p); } - } + */ /* Printf(stdout,"targs = '%s'\n", templateargs); Printf(stdout,"rname = '%s'\n", rname); diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index ccb94314a..62aef10f2 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -112,12 +112,11 @@ static void DelHash(DOH *ho) { int i; for (i = 0; i < h->hashsize; i++) { - if ((n = h->hashtable[i])) { - while (n) { - next = n->next; - DelNode(n); - n = next; - } + n = h->hashtable[i]; + while (n) { + next = n->next; + DelNode(n); + n = next; } } DohFree(h->hashtable); @@ -138,12 +137,11 @@ static void Hash_clear(DOH *ho) { int i; for (i = 0; i < h->hashsize; i++) { - if ((n = h->hashtable[i])) { - while (n) { - next = n->next; - DelNode(n); - n = next; - } + n = h->hashtable[i]; + while (n) { + next = n->next; + DelNode(n); + n = next; } h->hashtable[i] = 0; } @@ -454,11 +452,10 @@ static DOH *CopyHash(DOH *ho) { nho = DohObjMalloc(&DohHashType, nh); for (i = 0; i < h->hashsize; i++) { - if ((n = h->hashtable[i])) { - while (n) { - Hash_setattr(nho, n->key, n->object); - n = n->next; - } + n = h->hashtable[i]; + while (n) { + Hash_setattr(nho, n->key, n->object); + n = n->next; } } return nho; diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 561997276..a968e506c 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -2271,7 +2271,7 @@ int ALLEGROCL::emit_dispatch_defun(Node *n) { return SWIG_OK; } -int ALLEGROCL::emit_defun(Node *n, File *f_cl) { +int ALLEGROCL::emit_defun(Node *n, File *fcl) { #ifdef ALLEGROCL_WRAP_DEBUG Printf(stderr, "emit_defun: ENTER... "); #endif @@ -2307,27 +2307,27 @@ int ALLEGROCL::emit_defun(Node *n, File *f_cl) { if (Generate_Wrapper) { String *extra_parms = id_converter_arguments(n)->noname_str(); if (Getattr(n, "sym:overloaded")) - Printf(f_cl, "(swig-defmethod (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); + Printf(fcl, "(swig-defmethod (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); else - Printf(f_cl, "(swig-defun (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); + Printf(fcl, "(swig-defun (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); Delete(extra_parms); } // Just C else { - Printf(f_cl, "(swig-defun (\"%s\" \"%s\")\n", funcname, Generate_Wrapper ? mangled_name : funcname); + Printf(fcl, "(swig-defun (\"%s\" \"%s\")\n", funcname, Generate_Wrapper ? mangled_name : funcname); } ////////////////////////////////////// // Lisp foreign call parameter list // ////////////////////////////////////// - Printf(f_cl, " ("); + Printf(fcl, " ("); /* Special cases */ if (ParmList_len(pl) == 0) { - Printf(f_cl, ":void"); + Printf(fcl, ":void"); /* } else if (any_varargs(pl)) { - Printf(f_cl, "#| varargs |#"); + Printf(fcl, "#| varargs |#"); varargs=1; */ } else { String *largs = NewString(""); @@ -2337,7 +2337,7 @@ int ALLEGROCL::emit_defun(Node *n, File *f_cl) { SwigType *argtype = Swig_cparse_type(Getattr(p, "tmap:ctype")); if (!first) { - Printf(f_cl, "\n "); + Printf(fcl, "\n "); } if (SwigType_isvarargs(argtype)) { @@ -2393,7 +2393,7 @@ int ALLEGROCL::emit_defun(Node *n, File *f_cl) { // if this parameter has been removed from the C/++ wrapper // it shouldn't be in the lisp wrapper either. if (!checkAttribute(p, "tmap:in:numinputs", "0")) { - Printf(f_cl, "(%s %s %s %s %s)", + Printf(fcl, "(%s %s %s %s %s)", // parms in the ff wrapper, but not in the lisp wrapper. (checkAttribute(p, "tmap:lin:numinputs", "0") ? ":p-" : ":p+"), argname, dispatchtype, ffitype, lisptype); @@ -2479,12 +2479,12 @@ int ALLEGROCL::emit_defun(Node *n, File *f_cl) { Replaceall(wrap->code, "$ldestructor", ldestructor); Delete(ldestructor); - Printf(f_cl, ")\n"); /* finish arg list */ + Printf(fcl, ")\n"); /* finish arg list */ ///////////////////////////////////////////////////// // Lisp foreign call return type and optimizations // ///////////////////////////////////////////////////// - Printf(f_cl, " (:returning (%s %s)", compose_foreign_type(result_type), get_lisp_type(Getattr(n, "type"), "result")); + Printf(fcl, " (:returning (%s %s)", compose_foreign_type(result_type), get_lisp_type(Getattr(n, "type"), "result")); for (Iterator option = First(n); option.item; option = Next(option)) { if (Strncmp("feature:ffargs:", option.key, 15)) @@ -2494,12 +2494,12 @@ int ALLEGROCL::emit_defun(Node *n, File *f_cl) { Replaceall(option_name, "_", "-"); // TODO: varargs vs call-direct ? - Printf(f_cl, "\n %s %s", option_name, option_val); + Printf(fcl, "\n %s %s", option_name, option_val); Delete(option_name); } - Printf(f_cl, ")\n %s)\n\n", wrap->code); + Printf(fcl, ")\n %s)\n\n", wrap->code); // Wrapper_print(wrap, stderr); Delete(result_type); @@ -2935,11 +2935,9 @@ int ALLEGROCL::classHandler(Node *n) { #endif if (Generate_Wrapper) - return cppClassHandler(n); + return cppClassHandler(n); else - return cClassHandler(n); - - return SWIG_OK; + return cClassHandler(n); } int ALLEGROCL::cClassHandler(Node *n) { diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index a76e09945..2298d2939 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -329,7 +329,6 @@ int CHICKEN::functionWrapper(Node *n) { Parm *p; int i; String *wname; - String *source; Wrapper *f; String *mangle = NewString(""); String *get_pointers; @@ -398,8 +397,6 @@ int CHICKEN::functionWrapper(Node *n) { SwigType *pt = Getattr(p, "type"); String *ln = Getattr(p, "lname"); - source = NewStringf("scm%d", i + 1); - Printf(f->def, ", C_word scm%d", i + 1); Printf(declfunc, ",C_word"); @@ -407,6 +404,7 @@ int CHICKEN::functionWrapper(Node *n) { if ((tm = Getattr(p, "tmap:in"))) { String *parse = Getattr(p, "tmap:in:parse"); if (!parse) { + String *source = NewStringf("scm%d", i + 1); Replaceall(tm, "$source", source); Replaceall(tm, "$target", ln); Replaceall(tm, "$input", source); @@ -445,20 +443,15 @@ int CHICKEN::functionWrapper(Node *n) { } } } - - } else { + Delete(source); } - p = Getattr(p, "tmap:in:next"); continue; } else { Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0)); break; } - - Delete(source); - p = nextSibling(p); } /* finish argument marshalling */ @@ -1510,7 +1503,7 @@ int CHICKEN::validIdentifier(String *s) { /* ------------------------------------------------------------ * closNameMapping() * Maps the identifier from C++ to the CLOS based on command - * line paramaters and such. + * line parameters and such. * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index df4677e26..7ea10170a 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -1073,7 +1073,9 @@ public: global_variable_flag = false; generate_property_declaration_flag = false; - Printf(module_class_code, "\n }\n\n"); + if (proxy_flag) { + Printf(module_class_code, "\n }\n\n"); + } return ret; } @@ -1924,7 +1926,7 @@ public: Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(t, 0)); } - if (proxy_flag && wrapping_member_flag && !enum_constant_flag) { + if (wrapping_member_flag && !enum_constant_flag) { // Properties setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(Swig_name_member(proxy_class_name, variable_name))) == 0); if (setter_flag) @@ -2107,7 +2109,7 @@ public: Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csout typemap defined for %s\n", SwigType_str(t, 0)); } - if (proxy_flag && wrapping_member_flag && !enum_constant_flag) { + if (wrapping_member_flag && !enum_constant_flag) { // Properties if (generate_property_declaration_flag) { // Ensure the declaration is generated just once should the property contain both a set and get // Get the C# variable type - obtained differently depending on whether a setter is required. @@ -2541,6 +2543,7 @@ public: num_arguments = emit_num_arguments(l); num_required = emit_num_required(l); + bool global_or_member_variable = global_variable_flag || (wrapping_member_flag && !enum_constant_flag); int gencomma = 0; /* Output each parameter */ @@ -2567,7 +2570,7 @@ public: if (gencomma) Printf(imcall, ", "); - String *arg = makeParameterName(n, p, i, setter_flag); + String *arg = makeParameterName(n, p, i, global_or_member_variable); // Use typemaps to transform type used in C# wrapper function (in proxy class) to type used in PInvoke function (in intermediary class) if ((tm = Getattr(p, "tmap:csin"))) { @@ -2755,7 +2758,7 @@ public: value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); } else { // Get the enumvalue from a PINVOKE call - if (!getCurrentClass() || !cparse_cplusplus) { + if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) { // Strange hack to change the name Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ constantWrapper(n); @@ -2877,7 +2880,7 @@ public: * n - Node * p - parameter node * arg_num - parameter argument number - * setter - set this flag when wrapping member variables + * setter - set this flag when wrapping variables * Return: * arg - a unique parameter name * ----------------------------------------------------------------------------- */ @@ -2886,20 +2889,22 @@ public: String *arg = 0; String *pn = Getattr(p, "name"); - if (setter) { + + // Use C parameter name unless it is a duplicate or an empty parameter name + int count = 0; + ParmList *plist = Getattr(n, "parms"); + while (plist) { + if ((Cmp(pn, Getattr(plist, "name")) == 0)) + count++; + plist = nextSibling(plist); + } + String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; + arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); + + if (setter && Cmp(arg, "self") != 0) { // Note that in C# properties, the input variable name is always called 'value' + Delete(arg); arg = NewString("value"); - } else { - // Use C parameter name unless it is a duplicate or an empty parameter name - int count = 0; - ParmList *plist = Getattr(n, "parms"); - while (plist) { - if ((Cmp(pn, Getattr(plist, "name")) == 0)) - count++; - plist = nextSibling(plist); - } - String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; - arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); } return arg; diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 2390e8ad6..f5f080034 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -1649,7 +1649,7 @@ public: /* ------------------------------------------------------------ * goopsNameMapping() * Maps the identifier from C++ to the GOOPS based * on command - * line paramaters and such. + * line parameters and such. * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 5660b4885..b92fccdfb 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1932,7 +1932,7 @@ public: Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(t, 0)); } - if (proxy_flag && wrapping_member_flag && !enum_constant_flag) { + if (wrapping_member_flag && !enum_constant_flag) { // For wrapping member variables (Javabean setter) setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(Swig_name_member(proxy_class_name, variable_name))) == 0); } @@ -2463,6 +2463,7 @@ public: num_arguments = emit_num_arguments(l); num_required = emit_num_required(l); + bool global_or_member_variable = global_variable_flag || (wrapping_member_flag && !enum_constant_flag); int gencomma = 0; /* Output each parameter */ @@ -2487,7 +2488,7 @@ public: if (gencomma) Printf(imcall, ", "); - String *arg = makeParameterName(n, p, i, setter_flag); + String *arg = makeParameterName(n, p, i, global_or_member_variable); // Use typemaps to transform type used in Java wrapper function (in proxy class) to type used in JNI function (in intermediary class) if ((tm = Getattr(p, "tmap:javain"))) { @@ -2632,7 +2633,7 @@ public: value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); } else { // Get the enumvalue from a JNI call - if (!getCurrentClass() || !cparse_cplusplus) { + if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) { // Strange hack to change the name Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ constantWrapper(n); @@ -2759,7 +2760,7 @@ public: * n - Node * p - parameter node * arg_num - parameter argument number - * setter - set this flag when wrapping member variables + * setter - set this flag when wrapping variables * Return: * arg - a unique parameter name * ----------------------------------------------------------------------------- */ @@ -2768,21 +2769,23 @@ public: String *arg = 0; String *pn = Getattr(p, "name"); - if (setter) { + + // Use C parameter name unless it is a duplicate or an empty parameter name + int count = 0; + ParmList *plist = Getattr(n, "parms"); + while (plist) { + if ((Cmp(pn, Getattr(plist, "name")) == 0)) + count++; + plist = nextSibling(plist); + } + String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; + arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); + + if (setter && Cmp(arg, "self") != 0) { // Note that for setters the parameter name is always set but sometimes includes C++ // scope resolution, so we need to strip off the scope resolution to make a valid name. + Delete(arg); arg = NewString("value"); //Swig_scopename_last(pn); - } else { - // Use C parameter name unless it is a duplicate or an empty parameter name - int count = 0; - ParmList *plist = Getattr(n, "parms"); - while (plist) { - if ((Cmp(pn, Getattr(plist, "name")) == 0)) - count++; - plist = nextSibling(plist); - } - String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; - arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); } return arg; diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 4a7bf8813..6718903d0 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1097,38 +1097,33 @@ int Language::globalfunctionHandler(Node *n) { String *name = Getattr(n, "name"); String *symname = Getattr(n, "sym:name"); SwigType *type = Getattr(n, "type"); - String *storage = Getattr(n, "storage"); ParmList *parms = Getattr(n, "parms"); - if (0 && (Cmp(storage, "static") == 0)) { - Swig_restore(n); - return SWIG_NOWRAP; /* Can't wrap static functions */ - } else { - /* Check for callback mode */ - String *cb = GetFlagAttr(n, "feature:callback"); - if (cb) { - String *cbname = Getattr(n, "feature:callback:name"); - if (!cbname) { - cbname = NewStringf(cb, symname); - Setattr(n, "feature:callback:name", cbname); - } - - callbackfunctionHandler(n); - if (Cmp(cbname, symname) == 0) { - Delete(cbname); - Swig_restore(n); - return SWIG_NOWRAP; - } - Delete(cbname); + /* Check for callback mode */ + String *cb = GetFlagAttr(n, "feature:callback"); + if (cb) { + String *cbname = Getattr(n, "feature:callback:name"); + if (!cbname) { + cbname = NewStringf(cb, symname); + Setattr(n, "feature:callback:name", cbname); } - Setattr(n, "parms", nonvoid_parms(parms)); - String *call = Swig_cfunction_call(name, parms); - String *cres = Swig_cresult(type, "result", call); - Setattr(n, "wrap:action", cres); - Delete(cres); - Delete(call); - functionWrapper(n); + + callbackfunctionHandler(n); + if (Cmp(cbname, symname) == 0) { + Delete(cbname); + Swig_restore(n); + return SWIG_NOWRAP; + } + Delete(cbname); } + Setattr(n, "parms", nonvoid_parms(parms)); + String *call = Swig_cfunction_call(name, parms); + String *cres = Swig_cresult(type, "result", call); + Setattr(n, "wrap:action", cres); + Delete(cres); + Delete(call); + functionWrapper(n); + Swig_restore(n); return SWIG_OK; } @@ -1376,9 +1371,6 @@ int Language::variableHandler(Node *n) { * ---------------------------------------------------------------------- */ int Language::globalvariableHandler(Node *n) { - String *storage = Getattr(n, "storage"); - if (0 && (Cmp(storage, "static") == 0)) - return SWIG_NOWRAP; variableWrapper(n); return SWIG_OK; } @@ -2108,8 +2100,8 @@ int Language::classDirector(Node *n) { String *using_protected_members_code = NewString(""); for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) { Node *nodeType = Getattr(ni, "nodeType"); - bool cdecl = (Cmp(nodeType, "cdecl") == 0); - if (cdecl && !GetFlag(ni, "feature:ignore")) { + bool cdeclaration = (Cmp(nodeType, "cdecl") == 0); + if (cdeclaration && !GetFlag(ni, "feature:ignore")) { if (is_non_virtual_protected_access(ni)) { Node *overloaded = Getattr(ni, "sym:overloaded"); // emit the using base::member statement (but only once if the method is overloaded) @@ -3391,7 +3383,8 @@ int Language::is_assignable(Node *n) { SwigType *ftd = SwigType_typedef_resolve_all(type); SwigType *td = SwigType_strip_qualifiers(ftd); if (SwigType_type(td) == T_USER) { - if ((cn = Swig_symbol_clookup(td, 0))) { + cn = Swig_symbol_clookup(td, 0); + if (cn) { if ((Strcmp(nodeType(cn), "class") == 0)) { if (Getattr(cn, "allocate:noassign")) { SetFlag(n, "feature:immutable"); diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index f46c9e809..6113da960 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -490,8 +490,6 @@ public: Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0)); break; } - - p = nextSibling(p); } // add all argcheck code @@ -1101,7 +1099,6 @@ public: virtual int staticmemberfunctionHandler(Node *n) { current = STATIC_FUNC; return Language::staticmemberfunctionHandler(n); - current = NO_CPP; } /* ------------------------------------------------------------ @@ -1123,7 +1120,6 @@ public: // REPORT("staticmembervariableHandler",n); current = STATIC_VAR; return Language::staticmembervariableHandler(n); - current = NO_CPP; } /* --------------------------------------------------------------------- diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index 3453f5de2..901ee812e 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -33,7 +33,7 @@ int GenerateDefault = 1; // Generate default constructors int Verbose = 0; int AddExtern = 0; int NoExcept = 0; -int SwigRuntime = 0; // 0 = no option, 1 = -c or -runtime, 2 = -noruntime +int SwigRuntime = 0; // 0 = no option, 1 = -runtime, 2 = -noruntime /* Suppress warning messages for private inheritance, preprocessor evaluation etc... WARN_PP_EVALUATION 202 @@ -491,13 +491,13 @@ void SWIG_getoptions(int argc, char *argv[]) { Wrapper_compact_print_mode_set(1); Wrapper_virtual_elimination_mode_set(1); Swig_mark_arg(i); - } else if (strcmp(argv[i], "-runtime") == 0) { + } else if (strcmp(argv[i], "-runtime") == 0) { // Used to also accept -c. removed in swig-1.3.36 Swig_mark_arg(i); - Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-c, -runtime, -noruntime command line options are deprecated.\n"); + Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n"); SwigRuntime = 1; - } else if ((strcmp(argv[i], "-c") == 0) || (strcmp(argv[i], "-noruntime") == 0)) { + } else if (strcmp(argv[i], "-noruntime") == 0) { Swig_mark_arg(i); - Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-c, -runtime, -noruntime command line options are deprecated.\n"); + Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n"); SwigRuntime = 2; } else if (strcmp(argv[i], "-external-runtime") == 0) { external_runtime = 1; diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index 99d28e167..6cb24d39a 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -472,9 +472,9 @@ MODULA3(): cap = true; } else { if (cap) { - m3sym[i] = toupper(c); + m3sym[i] = (char)toupper(c); } else { - m3sym[i] = tolower(c); + m3sym[i] = (char)tolower(c); } cap = false; } diff --git a/Source/Modules/php4.cxx b/Source/Modules/php4.cxx index cfe948e3f..42d71e79a 100644 --- a/Source/Modules/php4.cxx +++ b/Source/Modules/php4.cxx @@ -150,45 +150,44 @@ void SwigPHP_emit_resource_registrations() { ki = First(zend_types); if (ki.key) Printf(s_oinit, "\n/* Register resource destructors for pointer types */\n"); - while (ki.key) - if (1 /* is pointer type */ ) { - DOH *key = ki.key; - Node *class_node = ki.item; - String *human_name = key; + while (ki.key) { + DOH *key = ki.key; + Node *class_node = ki.item; + String *human_name = key; - // Write out destructor function header - Printf(s_wrappers, "/* NEW Destructor style */\nstatic ZEND_RSRC_DTOR_FUNC(_wrap_destroy%s) {\n", key); + // Write out destructor function header + Printf(s_wrappers, "/* NEW Destructor style */\nstatic ZEND_RSRC_DTOR_FUNC(_wrap_destroy%s) {\n", key); - // write out body - if ((class_node != NOTCLASS)) { - String *destructor = Getattr(class_node, "destructor"); - human_name = Getattr(class_node, "sym:name"); - if (!human_name) - human_name = Getattr(class_node, "name"); - // Do we have a known destructor for this type? - if (destructor) { - Printf(s_wrappers, " %s(rsrc, SWIGTYPE%s->name TSRMLS_CC);\n", destructor, key); - } else { - Printf(s_wrappers, " /* No destructor for class %s */\n", human_name); - } + // write out body + if ((class_node != NOTCLASS)) { + String *destructor = Getattr(class_node, "destructor"); + human_name = Getattr(class_node, "sym:name"); + if (!human_name) + human_name = Getattr(class_node, "name"); + // Do we have a known destructor for this type? + if (destructor) { + Printf(s_wrappers, " %s(rsrc, SWIGTYPE%s->name TSRMLS_CC);\n", destructor, key); } else { - Printf(s_wrappers, " /* No destructor for simple type %s */\n", key); + Printf(s_wrappers, " /* No destructor for class %s */\n", human_name); } - - // close function - Printf(s_wrappers, "}\n"); - - // declare le_swig_ to store php registration - Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name); - - // register with php - Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex" "(_wrap_destroy%s,NULL,(char *)(SWIGTYPE%s->name),module_number);\n", key, key, key); - - // store php type in class struct - Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key); - - ki = Next(ki); + } else { + Printf(s_wrappers, " /* No destructor for simple type %s */\n", key); } + + // close function + Printf(s_wrappers, "}\n"); + + // declare le_swig_ to store php registration + Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name); + + // register with php + Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex" "(_wrap_destroy%s,NULL,(char *)(SWIGTYPE%s->name),module_number);\n", key, key, key); + + // store php type in class struct + Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key); + + ki = Next(ki); + } } class PHP:public Language { @@ -1195,7 +1194,7 @@ public: if (native_constructor == NATIVE_CONSTRUCTOR) { Printf(f->code, "add_property_zval(this_ptr,\"" SWIG_PTR "\",_cPtr);\n"); } else { - String *shadowrettype = SwigToPhpType(n, true); + String *shadowrettype = GetShadowReturnType(n); Printf(f->code, "object_init_ex(return_value,ptr_ce_swig_%s);\n", shadowrettype); Delete(shadowrettype); Printf(f->code, "add_property_zval(return_value,\"" SWIG_PTR "\",_cPtr);\n"); @@ -1440,6 +1439,10 @@ public: if (wrapperType == memberfn) p = nextSibling(p); while (p) { + if (GetInt(p, "tmap:in:numinputs") == 0) { + p = nextSibling(p); + continue; + } assert(0 <= argno && argno < max_num_of_arguments); String *&pname = arg_names[argno]; const char *pname_cstr = GetChar(p, "name"); @@ -1750,7 +1753,8 @@ public: } Printf(output, "\n"); - if (wrapperType == memberfn || newobject) { + // If it's a member function or a class constructor... + if (wrapperType == memberfn || (newobject && current_class)) { Printf(output, "\tfunction %s(%s) {\n", methodname, args); // We don't need this code if the wrapped class has a copy ctor // since the flat function new_CLASSNAME will handle it for us. @@ -2555,20 +2559,9 @@ public: return SWIG_OK; } - - String * SwigToPhpType(Node *n, int shadow_flag) { - String *ptype = 0; + String * GetShadowReturnType(Node *n) { SwigType *t = Getattr(n, "type"); - if (shadow_flag) { - ptype = PhpTypeFromTypemap((char *) "pstype", n, (char *) ""); - } - if (!ptype) { - ptype = PhpTypeFromTypemap((char *) "ptype", n, (char *) ""); - } - - if (ptype) return ptype; - /* Map type here */ switch (SwigType_type(t)) { case T_CHAR: @@ -2589,7 +2582,7 @@ public: case T_POINTER: case T_REFERENCE: case T_USER: - if (shadow_flag && is_shadow(t)) { + if (is_shadow(t)) { return NewString(Char(is_shadow(t))); } break; @@ -2597,7 +2590,7 @@ public: /* TODO */ break; default: - Printf(stderr, "SwigToPhpType: unhandled data type: %s\n", SwigType_str(t, 0)); + Printf(stderr, "GetShadowReturnType: unhandled data type: %s\n", SwigType_str(t, 0)); break; } diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index bfdec0d76..f0e335c37 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1773,7 +1773,6 @@ public: Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0)); break; } - p = nextSibling(p); } /* finish argument marshalling */ diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 989136a9d..49d3ecc89 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -57,11 +57,13 @@ static String * getRTypeName(SwigType *t, int *outCount = NULL) { Insert(tmp, 0, retName); return tmp; + /* if(count) return(b); Delete(b); return(NewString("")); + */ } #if 0 @@ -104,7 +106,7 @@ static String * getRType(Node *n) { Now handles arrays, i.e. struct A[2] ****************/ -static String *getRClassName(String *retType, int addRef = 1, int upRef=0) { +static String *getRClassName(String *retType, int /*addRef*/ = 1, int upRef=0) { String *tmp = NewString(""); SwigType *resolved = SwigType_typedef_resolve_all(retType); char *retName = Char(SwigType_manglestr(resolved)); @@ -115,6 +117,7 @@ static String *getRClassName(String *retType, int addRef = 1, int upRef=0) { } return tmp; +/* #if 1 List *l = SwigType_split(retType); int n = Len(l); @@ -160,6 +163,7 @@ static String *getRClassName(String *retType, int addRef = 1, int upRef=0) { #endif return tmp; +*/ } /********************* @@ -1841,6 +1845,9 @@ int R::functionWrapper(Node *n) { String *name = Getattr(p,"name"); String *lname = Getattr(p,"lname"); + // R keyword renaming + if (name && Swig_name_warning(p, 0, name, 0)) + name = 0; /* If we have a :: in the parameter name because we are accessing a static member of a class, say, then we need to remove that prefix. */ @@ -2027,14 +2034,18 @@ int R::functionWrapper(Node *n) { Replaceall(tm,"$owner", "R_SWIG_EXTERNAL"); } - if(0 && addCopyParam) { +#if 0 + if(addCopyParam) { Printf(f->code, "if(LOGICAL(s_swig_copy)[0]) {\n"); Printf(f->code, "/* Deal with returning a reference. */\nr_ans = R_NilValue;\n"); Printf(f->code, "}\n else {\n"); } +#endif Printf(f->code, "%s\n", tm); - if(0 && addCopyParam) +#if 0 + if(addCopyParam) Printf(f->code, "}\n"); /* end of if(s_swig_copy) ... else { ... } */ +#endif } else { Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index a57571bb8..ad448d34e 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -448,7 +448,7 @@ private: parent_name = Copy( Getattr(mod, "name") ); if ( parent_name ) { - (Char(parent_name))[0] = toupper((Char(parent_name))[0]); + (Char(parent_name))[0] = (char)toupper((Char(parent_name))[0]); } } if ( parent_name ) @@ -1194,7 +1194,7 @@ public: while (m.item) { if (Len(m.item) > 0) { String *cap = NewString(m.item); - (Char(cap))[0] = toupper((Char(cap))[0]); + (Char(cap))[0] = (char)toupper((Char(cap))[0]); if (last != 0) { Append(module, "::"); } @@ -1206,7 +1206,7 @@ public: if (feature == 0) { feature = Copy(last); } - (Char(last))[0] = toupper((Char(last))[0]); + (Char(last))[0] = (char)toupper((Char(last))[0]); modvar = NewStringf("m%s", last); Delete(modules); } @@ -2219,7 +2219,7 @@ public: return name; if (islower(name[0])) { - name[0] = toupper(name[0]); + name[0] = (char)toupper(name[0]); Swig_warning(WARN_RUBY_WRONG_NAME, input_file, line_number, "Wrong %s name (corrected to `%s')\n", reason, name); return name; } @@ -2545,7 +2545,7 @@ public: String *name = Copy(symname); char *cname = Char(name); if (cname) - cname[0] = toupper(cname[0]); + cname[0] = (char)toupper(cname[0]); Printv(director_prot_ctor_code, "if ( $comparison ) { /* subclassed */\n", " $director_new \n", diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 560d12998..c04f95f00 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -36,6 +36,7 @@ static int error_as_warning = 0; /* Understand the cpp #error directive as a spe /* Test a character to see if it valid in an identifier (after the first letter) */ #define isidchar(c) ((isalnum(c)) || (c == '_') || (c == '$')) +DOH *Preprocessor_replace(DOH *); /* Skip whitespace */ static void skip_whitespace(String *s, String *out) { @@ -698,7 +699,6 @@ static String *get_options(String *str) { static String *expand_macro(String *name, List *args) { String *ns; DOH *symbols, *macro, *margs, *mvalue, *temp, *tempa, *e; - DOH *Preprocessor_replace(DOH *); int i, l; int isvarargs = 0; @@ -935,7 +935,6 @@ static String *expand_macro(String *name, List *args) { List *evaluate_args(List *x) { Iterator i; - String *Preprocessor_replace(String *); List *nl = NewList(); for (i = First(x); i.item; i = Next(i)) { @@ -1795,7 +1794,7 @@ String *Preprocessor_parse(String *s) { for (i = 0; i < 6;) { c = Getc(s); Putc(c, value); - statement[i++] = c; + statement[i++] = (char)c; if (strncmp(statement, ed, i) && strncmp(statement, df, i)) break; } diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 2fc444290..18920ecc2 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -513,7 +513,8 @@ String *Swig_cppconstructor_base_call(String_or_char *name, ParmList *parms, int pname = Swig_cparm_name(p, i); i++; } else { - if ((pname = Getattr(p, "value"))) + pname = Getattr(p, "value"); + if (pname) pname = Copy(pname); else pname = Copy(Getattr(p, "name")); diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 25ea0683f..3f47be15b 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -352,7 +352,8 @@ char *Swig_file_filename(const String_or_char *filename) { char *c; strcpy(tmp, Char(filename)); - if ((c = strrchr(tmp, *delim))) + c = strrchr(tmp, *delim); + if (c) return c + 1; else return tmp; diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 04691b595..d29250517 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -614,7 +614,8 @@ void Swig_scopename_split(String *s, String **rprefix, String **rlast) { *rlast = Copy(s); } - if ((co = strstr(cc, "operator "))) { + co = strstr(cc, "operator "); + if (co) { if (co == cc) { *rprefix = 0; *rlast = Copy(s); @@ -664,7 +665,9 @@ String *Swig_scopename_prefix(String *s) { char *co = 0; if (!strstr(c, "::")) return 0; - if ((co = strstr(cc, "operator "))) { + co = strstr(cc, "operator "); + + if (co) { if (co == cc) { return 0; } else { @@ -715,7 +718,8 @@ String *Swig_scopename_last(String *s) { if (!strstr(c, "::")) return NewString(s); - if ((co = strstr(cc, "operator "))) { + co = strstr(cc, "operator "); + if (co) { return NewString(co); } @@ -756,7 +760,9 @@ String *Swig_scopename_first(String *s) { char *co = 0; if (!strstr(c, "::")) return 0; - if ((co = strstr(c, "operator "))) { + + co = strstr(c, "operator "); + if (co) { if (co == c) { return 0; } @@ -804,7 +810,9 @@ String *Swig_scopename_suffix(String *s) { char *co = 0; if (!strstr(c, "::")) return 0; - if ((co = strstr(c, "operator "))) { + + co = strstr(c, "operator "); + if (co) { if (co == c) return 0; } @@ -842,8 +850,9 @@ String *Swig_scopename_suffix(String *s) { int Swig_scopename_check(String *s) { char *c = Char(s); - char *co = 0; - if ((co = strstr(c, "operator "))) { + char *co = strstr(c, "operator "); + + if (co) { if (co == c) return 0; } diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 519e5b59e..f34a24612 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -482,7 +482,8 @@ DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType Delete(t_name); } /* A template-based class lookup */ - if (0 && !rn && SwigType_istemplate(prefix)) { + /* + if (!rn && SwigType_istemplate(prefix)) { String *t_prefix = SwigType_templateprefix(prefix); if (Strcmp(t_prefix, prefix) != 0) { String *t_name = SwigType_templateprefix(name); @@ -491,6 +492,7 @@ DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType } Delete(t_prefix); } + */ } /* A wildcard-based class lookup */ if (!rn) { @@ -1477,7 +1479,7 @@ String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType } - if (rename_hash || rename_list) { + if (rename_hash || rename_list || namewarn_hash || namewarn_list) { Hash *rn = Swig_name_object_get(Swig_name_rename_hash(), prefix, name, decl); if (!rn || !Swig_name_match_nameobj(rn, n)) { rn = Swig_name_nameobj_lget(Swig_name_rename_list(), n, prefix, name, decl); diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index e8b1b5f46..06e78db37 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -200,7 +200,7 @@ static char nextchar(Scanner * s) { if ((nc == '\n') && (!s->freeze_line)) s->line++; Putc(nc,s->text); - return nc; + return (char)nc; } /* ----------------------------------------------------------------------------- @@ -349,7 +349,7 @@ static void get_escape(Scanner *s) { } else { char tmp[3]; tmp[0] = '\\'; - tmp[1] = c; + tmp[1] = (char)c; tmp[2] = 0; Delitem(s->text, DOH_END); Append(s->text, tmp); diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index f234839fe..18d1b2304 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -937,7 +937,8 @@ String *SwigType_templateargs(const SwigType *t) { int SwigType_istemplate(const SwigType *t) { char *ct = Char(t); - if ((ct = strstr(ct, "<(")) && (strstr(ct + 2, ")>"))) + ct = strstr(ct, "<("); + if (ct && (strstr(ct + 2, ")>"))) return 1; return 0; } diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index fdf37ece1..ae6ab3dc8 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -108,6 +108,8 @@ static Hash *typedef_resolve_cache = 0; static Hash *typedef_all_cache = 0; static Hash *typedef_qualified_cache = 0; +static Typetab *SwigType_find_scope(Typetab *s, String *nameprefix); + /* common attribute keys, to avoid calling find_key all the times */ /* @@ -162,7 +164,6 @@ void SwigType_typesystem_init() { * ----------------------------------------------------------------------------- */ int SwigType_typedef(SwigType *type, String_or_char *name) { - Typetab *SwigType_find_scope(Typetab *, String *s); if (Getattr(current_typetab, name)) return -1; /* Already defined */ if (Strcmp(type, name) == 0) { /* Can't typedef a name to itself */ @@ -409,7 +410,7 @@ void SwigType_print_scope(Typetab *t) { } } -Typetab *SwigType_find_scope(Typetab *s, String *nameprefix) { +static Typetab *SwigType_find_scope(Typetab *s, String *nameprefix) { Typetab *ss; String *nnameprefix = 0; static int check_parent = 1; @@ -1311,7 +1312,8 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) { SwigType *ftd = SwigType_typedef_resolve_all(t); td = SwigType_strip_qualifiers(ftd); Delete(ftd); - if ((n = Swig_symbol_clookup(td, 0))) { + n = Swig_symbol_clookup(td, 0); + if (n) { if (GetFlag(n, "feature:valuewrapper")) { use_wrapper = 1; } else { @@ -1334,7 +1336,8 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) { Delete(ftd); if (SwigType_type(td) == T_USER) { use_wrapper = 1; - if ((n = Swig_symbol_clookup(td, 0))) { + n = Swig_symbol_clookup(td, 0); + if (n) { if ((Checkattr(n, "nodeType", "class") && !Getattr(n, "allocate:noassign") && (Getattr(n, "allocate:default_constructor"))) @@ -1795,13 +1798,15 @@ void SwigType_inherit_equiv(File *out) { String *lprefix = SwigType_lstr(prefix, 0); Hash *subhash = Getattr(sub, bk.key); String *convcode = Getattr(subhash, "convcode"); - Printf(out, "static void *%s(void *x, int *newmemory) {", convname); if (convcode) { + char *newmemoryused = Strstr(convcode, "newmemory"); /* see if newmemory parameter is used in order to avoid unused parameter warnings */ String *fn = Copy(convcode); Replaceall(fn, "$from", "x"); + Printf(out, "static void *%s(void *x, int *%s) {", convname, newmemoryused ? "newmemory" : "SWIGUNUSEDPARM(newmemory)"); Printf(out, "%s", fn); } else { String *cast = Getattr(subhash, "cast"); + Printf(out, "static void *%s(void *x, int *SWIGUNUSEDPARM(newmemory)) {", convname); Printf(out, "\n return (void *)((%s) ", lkey); if (cast) Printf(out, "%s", cast); diff --git a/TODO b/TODO index d764d1d20..103185d23 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ SWIG TO-DO -Release: SWIG-1.3.35 +Release: SWIG-1.3.36 ----------------------------------------------------------------------------- diff --git a/Tools/WAD/Python/type.c b/Tools/WAD/Python/type.c index 5236c1c64..7d8248e0b 100644 --- a/Tools/WAD/Python/type.c +++ b/Tools/WAD/Python/type.c @@ -62,7 +62,7 @@ new_wadobject(WadFrame *f, int count) { /* release a wad object */ static void wadobject_dealloc(wadobject *self) { - PyMem_DEL(self); + PyObject_Del(self); } static char message[65536]; diff --git a/Tools/mkrelease.py b/Tools/mkrelease.py index 574720dab..d7927f8e6 100755 --- a/Tools/mkrelease.py +++ b/Tools/mkrelease.py @@ -21,8 +21,8 @@ except: print "where version should be 1.3.x and username is your SF username" sys.exit(1) -print "Looking for wput" -os.system("which wput") and failed("wput not installed/found. Please install.") +print "Looking for rsync" +os.system("which rsync") and failed("rsync not installed/found. Please install.") print "Making source tarball" os.system("python ./mkdist.py " + version) and failed("") @@ -31,8 +31,8 @@ print "Build Windows package" os.system("./mkwindows.sh " + version) and failed("") print "Uploading to Sourceforge" -os.system("wput --verbose --binary swig-" + version + ".tar.gz ftp://anonymous:" + username + "@users.sourceforge.net@upload.sourceforge.net/incoming/") and failed("") -os.system("wput --verbose --binary swigwin-" + version + ".zip ftp://anonymous:" + username + "@users.sourceforge.net@upload.sourceforge.net/incoming/") and failed("") +os.system("rsync --archive --verbose -P --times -e ssh swig-" + version + ".tar.gz " + username + "@frs.sourceforge.net:uploads/") and failed("") +os.system("rsync --archive --verbose -P --times -e ssh swigwin-" + version + ".zip " + username + "@frs.sourceforge.net:uploads/") and failed("") os.system("svn copy -m \"rel-" + version + "\" https://swig.svn.sourceforge.net/svnroot/swig/trunk https://swig.svn.sourceforge.net/svnroot/swig/tags/rel-" + version + "/") diff --git a/configure.in b/configure.in index 82d83a4f0..13c3c6bc9 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[1.3.36],[http://www.swig.org]) +AC_INIT([swig],[1.3.37],[http://www.swig.org]) AC_PREREQ(2.58) AC_CONFIG_SRCDIR([Source/Swig/swig.h]) AC_CONFIG_AUX_DIR([Tools/config]) @@ -254,18 +254,6 @@ case $host in *) MZSCHEME_SO=.so;; esac -AC_SUBST(TCL_LDSHARED) -case $host in - *-*-darwin*) TCL_LDSHARED="gcc -dynamiclib -flat_namespace -undefined suppress";; - *) TCL_LDSHARED=$LDSHARED;; -esac - -AC_SUBST(TCL_CXXSHARED) -case $host in - *-*-darwin*) TCL_CXXSHARED="g++ -dynamiclib -flat_namespace -undefined suppress";; - *) TCL_CXXSHARED=$TRYLINKINGWITHCXX;; -esac - AC_SUBST(LUA_SO) case $host in *-*-darwin*) LUA_SO=.so;; @@ -545,6 +533,7 @@ fi # Cygwin (Windows) needs the library for dynamic linking case $host in *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; +*-*-darwin*) TCLDYNAMICLINKING="-dynamiclib -flat_namespace -undefined suppress";; *)TCLDYNAMICLINKING="";; esac fi From ea050358447a1514f0a9cc1b0095b8024b66afb2 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sun, 29 Jun 2008 15:09:31 +0000 Subject: [PATCH 011/508] Namespaces support. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10611 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/Makefile | 2 +- Examples/c/class/example.cxx | 1 + Examples/c/class/example.h | 4 - Examples/c/class/{main.c => test.c} | 0 Examples/c/class/testns.c | 20 +++++ Examples/c/reference/Makefile | 2 +- Examples/c/reference/{main.c => test.c} | 0 Examples/c/simple/Makefile | 2 +- Examples/c/simple/{main.c => test.c} | 1 + Source/Modules/c.cxx | 111 ++++++++++++++---------- 10 files changed, 88 insertions(+), 55 deletions(-) rename Examples/c/class/{main.c => test.c} (100%) create mode 100644 Examples/c/class/testns.c rename Examples/c/reference/{main.c => test.c} (100%) rename Examples/c/simple/{main.c => test.c} (87%) diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index c19797921..f04179d46 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -3,7 +3,7 @@ SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt CXXSRCS = example.cxx TARGET = example INTERFACE = example.i -MAIN = main.c +MAIN = test.c all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ diff --git a/Examples/c/class/example.cxx b/Examples/c/class/example.cxx index d469a1894..5c17cecb1 100644 --- a/Examples/c/class/example.cxx +++ b/Examples/c/class/example.cxx @@ -27,3 +27,4 @@ double Square::area(void) { double Square::perimeter(void) { return 4*width; } + diff --git a/Examples/c/class/example.h b/Examples/c/class/example.h index c400eb272..80506a29e 100644 --- a/Examples/c/class/example.h +++ b/Examples/c/class/example.h @@ -35,7 +35,3 @@ public: virtual double perimeter(void); }; - - - - diff --git a/Examples/c/class/main.c b/Examples/c/class/test.c similarity index 100% rename from Examples/c/class/main.c rename to Examples/c/class/test.c diff --git a/Examples/c/class/testns.c b/Examples/c/class/testns.c new file mode 100644 index 000000000..623e331ca --- /dev/null +++ b/Examples/c/class/testns.c @@ -0,0 +1,20 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char **argv) { + geom_Circle* pc = new_geom_Circle(10.0); + geom_Square* ps = new_geom_Square(10.0); + + printf("Circle perim.=%f, area=%f\n", geom_Circle_perimeter(pc), geom_Circle_area(pc)); + printf("Square perim.=%f, area=%f\n", geom_Square_perimeter(ps), geom_Square_area(ps)); + + printf("Circle pos.=(%f, %f)\n", geom_Shape_get_x(pc), geom_Shape_get_y(pc)); + geom_Shape_move(pc, 5.0, -5.0); + printf("After move pos.=(%f, %f)\n", geom_Shape_get_x(pc), geom_Shape_get_y(pc)); + + delete_geom_Square(ps); + delete_geom_Circle(pc); +} + + diff --git a/Examples/c/reference/Makefile b/Examples/c/reference/Makefile index 499888730..dd4271acd 100644 --- a/Examples/c/reference/Makefile +++ b/Examples/c/reference/Makefile @@ -3,7 +3,7 @@ SWIG = $(TOP)/../preinst-swig -debug-module 4 CXXSRCS = example.cxx TARGET = example INTERFACE = example.i -MAIN = main.c +MAIN = test.c all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ diff --git a/Examples/c/reference/main.c b/Examples/c/reference/test.c similarity index 100% rename from Examples/c/reference/main.c rename to Examples/c/reference/test.c diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index 03eaf3d28..ccf2e819f 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -3,7 +3,7 @@ SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt SRCS = example.c TARGET = example INTERFACE = example.i -MAIN = main.c +MAIN = test.c all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ diff --git a/Examples/c/simple/main.c b/Examples/c/simple/test.c similarity index 87% rename from Examples/c/simple/main.c rename to Examples/c/simple/test.c index a35887e5f..20a155a45 100644 --- a/Examples/c/simple/main.c +++ b/Examples/c/simple/test.c @@ -10,6 +10,7 @@ int main(int argc, char **argv) { printf("my_str is: %s\n", my_str); printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); printf("array_of_strs contains %s and %s\n", get_str(0), get_str(1)); + printf("const Val = %d\n", Val); return 0; } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index df12d1d3c..d88294176 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -358,25 +358,6 @@ public: // take care of shadow function if (shadow_flag) { - - /* - if (parms) { - String* stype = Getattr(parms, "c:stype"); - if (stype) { - Swig_save("temp", parms, "type", NIL); - Setattr(parms, "type", stype); - proto = ParmList_str(parms); - Swig_restore(parms); - } - else { - proto = ParmList_str(parms); - } - } - else { - proto = empty_string; - } - */ - // use shadow-type for return type if supplied SwigType* shadow_type = Getattr(n, "c:stype"); if (shadow_type) { @@ -432,12 +413,13 @@ public: * --------------------------------------------------------------------- */ virtual int classHandler(Node* n) { - String* name = Getattr(n, "name"); + String* name = Copy(Getattr(n, "name")); String* sobj_name = NewString(""); + Replaceall(name, "::", "_"); // emit "class"-struct definition Printv(sobj_name, "struct ", name, "Obj", NIL); - Printv(f_header, sobj_name, "{\n void* obj;\n};\n\n", NIL); + Printv(f_header, sobj_name, " {\n void* obj;\n};\n\n", NIL); // declare it in the proxy header if (shadow_flag) { @@ -445,6 +427,7 @@ public: } Delete(sobj_name); + Delete(name); return Language::classHandler(n); } @@ -461,23 +444,25 @@ public: * --------------------------------------------------------------------- */ virtual int memberfunctionHandler(Node* n) { - String* name = Getattr(n, "sym:name"); - String* classname = Getattr(parentNode(n), "sym:name"); + String* name = Copy(Getattr(n, "name")); + String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); String* sobj_name = NewString(""); String* ctype = NewString(""); String* stype = NewString(""); String* new_name = NewString(""); String* code = NewString(""); String* arg_lnames = NewString(""); - ParmList* parms = Getattr(n, "parms"); + Replaceall(newclassname, "::", "_"); + // create first argument - Printv(sobj_name, "struct ", classname, "Obj", NIL); + Printv(sobj_name, "struct ", newclassname, "Obj", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Parm* p = NewParm(ctype, "self"); - stype = Copy(classname); + stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); Setattr(p, "c:immutable", "1"); @@ -500,7 +485,7 @@ public: Setattr(n, "wrap:action", code); // modify method name - Printv(new_name, classname, "_", name, NIL); + Printv(new_name, newclassname, "_", name, NIL); Setattr(n, "sym:name", new_name); functionWrapper(n); @@ -511,6 +496,8 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); + Delete(newclassname); + Delete(name); return SWIG_OK; } @@ -532,19 +519,21 @@ public: virtual int membervariableHandler(Node* n) { String* name = Getattr(n, "sym:name"); - String* classname = Getattr(parentNode(n), "sym:name"); + String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); String* sobj_name = NewString(""); String* ctype = NewString(""); String* stype = NewString(""); String* new_name = NewString(""); String* code = NewString(""); + Replaceall(newclassname, "::", "_"); // create first argument - Printv(sobj_name, "struct ", classname, "Obj", NIL); + Printv(sobj_name, "struct ", newclassname, "Obj", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Parm* p = NewParm(ctype, "self"); - stype = Copy(classname); + stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); Setattr(p, "c:immutable", "1"); @@ -563,7 +552,7 @@ public: Setattr(n, "wrap:action", code); // modify method name - Printv(new_name, classname, "_get_", name, NIL); + Printv(new_name, newclassname, "_get_", name, NIL); Setattr(n, "sym:name", new_name); functionWrapper(n); @@ -583,7 +572,7 @@ public: // modify method name Delete(new_name); new_name = NewString(""); - Printv(new_name, classname, "_set_", name, NIL); + Printv(new_name, newclassname, "_set_", name, NIL); Setattr(n, "sym:name", new_name); functionWrapper(n); @@ -592,6 +581,7 @@ public: Delete(new_name); Delete(ctype); Delete(sobj_name); + Delete(newclassname); return SWIG_OK; } @@ -600,15 +590,18 @@ public: * --------------------------------------------------------------------- */ virtual int constructorHandler(Node* n) { - String* name = Getattr(n, "name"); + String* name = Copy(Getattr(n, "name")); + String* classname = Getattr(parentNode(n), "name"); String* sobj_name = NewString(""); String* ctype = NewString(""); - String* stype = NewString(""); + String* stype; String* code = NewString(""); - String* new_name = NewString(""); + String* constr_name = NewString(""); String* arg_lnames = NewString(""); ParmList* parms = Getattr(n, "parms"); + Replaceall(name, "::", "_"); + // prepare argument names add_parm_lnames(parms, arg_lnames); @@ -623,21 +616,22 @@ public: // generate action code Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); - Printv(code, "result->obj = (void*) new ", name, "(", arg_lnames, ");\n", NIL); + Printv(code, "result->obj = (void*) new ", classname, "(", arg_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); // modify the constructor name - Printv(new_name, "new_", Getattr(n, "sym:name"), NIL); - Setattr(n, "sym:name", new_name); + Printv(constr_name, "new_", name, NIL); + Setattr(n, "sym:name", constr_name); functionWrapper(n); Delete(arg_lnames); - Delete(new_name); + Delete(constr_name); Delete(code); Delete(stype); Delete(ctype); Delete(sobj_name); + Delete(name); return SWIG_OK; } @@ -646,21 +640,25 @@ public: * --------------------------------------------------------------------- */ virtual int destructorHandler(Node* n) { - String* name = Getattr(n, "sym:name"); + String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); String* sobj_name = NewString(""); String* ctype = NewString(""); - String* stype = NewString(""); + String* stype; String* code = NewString(""); - String* new_name = NewString(""); + String* destr_name = NewString(""); Parm* p; + Replaceall(newclassname, "::", "_"); + Replaceall(newclassname, "~", ""); + // create first argument - Printv(sobj_name, "struct ", name, "Obj", NIL); + Printv(sobj_name, "struct ", newclassname, "Obj", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); p = NewParm(ctype, "self"); Setattr(p, "lname", "arg1"); - stype = Copy(name); + stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); Setattr(p, "c:immutable", "1"); @@ -668,21 +666,38 @@ public: Setattr(n, "type", "void"); // create action code - Printv(code, "delete (", name, "*) ((", sobj_name, "*) arg1->obj);\nfree(arg1);\n", NIL); + Printv(code, "delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); Setattr(n, "wrap:action", code); // modify the destructor name - Printv(new_name, "delete_", name, NIL); - Setattr(n, "sym:name", new_name); + Printv(destr_name, "delete_", newclassname, NIL); + Setattr(n, "sym:name", destr_name); functionWrapper(n); Delete(p); - Delete(new_name); + Delete(destr_name); Delete(code); Delete(stype); Delete(ctype); Delete(sobj_name); + Delete(newclassname); + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * enumDeclaration() + * --------------------------------------------------------------------- */ + + virtual int enumDeclaration(Node *n) { + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * enumvalueDeclaration() + * --------------------------------------------------------------------- */ + + virtual int enumvalueDeclaration(Node *n) { return SWIG_OK; } From f74439e21524a2c4fc09f0ff31da5b8ecef52785 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Tue, 1 Jul 2008 10:30:40 +0000 Subject: [PATCH 012/508] Better handling of return values. Some bugfixes. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10618 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/example.cxx | 6 +- Examples/c/class/example.h | 6 +- Examples/c/class/test.c | 38 +++++++++---- Examples/c/reference/Makefile | 2 +- Examples/c/reference/example.cxx | 18 +++--- Examples/c/reference/test.c | 2 +- Examples/c/return/Makefile | 14 +++++ Examples/c/return/example.cxx | 10 ++++ Examples/c/return/example.h | 16 ++++++ Examples/c/return/example.i | 8 +++ Examples/c/return/test.c | 10 ++++ Examples/c/simple/example.c | 2 +- Examples/c/simple/example.i | 2 +- Examples/c/simple/test.c | 3 +- Lib/c/c.swg | 31 ++++++++-- Source/Modules/c.cxx | 98 +++++++++++++++++++++++++------- 16 files changed, 208 insertions(+), 58 deletions(-) create mode 100644 Examples/c/return/Makefile create mode 100644 Examples/c/return/example.cxx create mode 100644 Examples/c/return/example.h create mode 100644 Examples/c/return/example.i create mode 100644 Examples/c/return/test.c diff --git a/Examples/c/class/example.cxx b/Examples/c/class/example.cxx index 5c17cecb1..016d030bc 100644 --- a/Examples/c/class/example.cxx +++ b/Examples/c/class/example.cxx @@ -1,4 +1,4 @@ -/* File : example.cxx */ +/* File : example.c */ #include "example.h" #define M_PI 3.14159265358979323846 @@ -12,8 +12,7 @@ void Shape::move(double dx, double dy) { int Shape::nshapes = 0; double Circle::area(void) { - double xxx = M_PI*radius*radius; - return xxx; + return M_PI*radius*radius; } double Circle::perimeter(void) { @@ -27,4 +26,3 @@ double Square::area(void) { double Square::perimeter(void) { return 4*width; } - diff --git a/Examples/c/class/example.h b/Examples/c/class/example.h index 80506a29e..1d4606f86 100644 --- a/Examples/c/class/example.h +++ b/Examples/c/class/example.h @@ -1,7 +1,5 @@ /* File : example.h */ -#include - class Shape { public: Shape() { @@ -35,3 +33,7 @@ public: virtual double perimeter(void); }; + + + + diff --git a/Examples/c/class/test.c b/Examples/c/class/test.c index 0b16cf7b8..ccf54eb61 100644 --- a/Examples/c/class/test.c +++ b/Examples/c/class/test.c @@ -3,17 +3,35 @@ #include "example_proxy.h" int main(int argc, char **argv) { - Circle* pc = new_Circle(10.0); - Square* ps = new_Square(10.0); + printf("Creating some objects:\n"); + Circle* c = new_Circle(10); + printf(" Created circle\n"); + Square* s = new_Square(10); + printf(" Created square\n"); - printf("Circle perim.=%f, area=%f\n", Circle_perimeter(pc), Circle_area(pc)); - printf("Square perim.=%f, area=%f\n", Square_perimeter(ps), Square_area(ps)); + printf("\nA total of %d shapes were created\n", 0); - printf("Circle pos.=(%f, %f)\n", Shape_get_x(pc), Shape_get_y(pc)); - Shape_move(pc, 5.0, -5.0); - printf("After move pos.=(%f, %f)\n", Shape_get_x(pc), Shape_get_y(pc)); - - delete_Square(ps); - delete_Circle(pc); + printf("\nHere are some properties of the shapes:\n"); + Shape shapes[] = {c, s}; + int i; + /* + * TODO: support for virtual functions + for (i = 0; i < 2; i++) { + printf(" area = %f\n", Shape_area(shapes[i])); + printf(" perimeter = %f\n", Shape_perimeter(shapes[i])); + } + */ + + // call methods directly by now + printf("Circle perim.=%f, area=%f\n", Circle_perimeter(c), Circle_area(c)); + printf("Square perim.=%f, area=%f\n", Square_perimeter(s), Square_area(s)); + + printf("\nGuess I'll clean up now\n"); + + delete_Square(s); + delete_Circle(c); + + printf("%d shapes remain\n", 0); + printf("Goodbye\n"); } diff --git a/Examples/c/reference/Makefile b/Examples/c/reference/Makefile index dd4271acd..f04179d46 100644 --- a/Examples/c/reference/Makefile +++ b/Examples/c/reference/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/c/reference/example.cxx b/Examples/c/reference/example.cxx index 7dfb9054d..e4dd74cf7 100644 --- a/Examples/c/reference/example.cxx +++ b/Examples/c/reference/example.cxx @@ -2,18 +2,18 @@ #include "example.h" -void foo_by_val(Bar foo) { - foo.set(123); - printf("inside foo_by_val: %d\n", foo.get()); +void foo_by_val(Bar bar) { + bar.set(123); + printf("inside foo_by_val: %d\n", bar.get()); } -void foo_by_ref(Bar& foo) { - foo.set(123); - printf("inside foo_by_ref: %d\n", foo.get()); +void foo_by_ref(Bar& bar) { + bar.set(123); + printf("inside foo_by_ref: %d\n", bar.get()); } -void foo_by_ptr(Bar* foo) { - foo->set(123); - printf("inside foo_by_ptr: %d\n", foo->get()); +void foo_by_ptr(Bar* bar) { + bar->set(123); + printf("inside foo_by_ptr: %d\n", bar->get()); } diff --git a/Examples/c/reference/test.c b/Examples/c/reference/test.c index 5d3345290..a85718d67 100644 --- a/Examples/c/reference/test.c +++ b/Examples/c/reference/test.c @@ -7,7 +7,7 @@ void test(Bar * bar) { } int main(int argc, char** argv) { - Bar * bar = new_Bar(); + Bar* bar = new_Bar(); test(bar); foo_by_val(bar); test(bar); diff --git a/Examples/c/return/Makefile b/Examples/c/return/Makefile new file mode 100644 index 000000000..f04179d46 --- /dev/null +++ b/Examples/c/return/Makefile @@ -0,0 +1,14 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +MAIN = test.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/return/example.cxx b/Examples/c/return/example.cxx new file mode 100644 index 000000000..092d4a3fb --- /dev/null +++ b/Examples/c/return/example.cxx @@ -0,0 +1,10 @@ +#include "example.h" + +Bar foo_ret_val() { + return Bar(); +} + +Bar* foo_ret_ptr(Bar* bar) { + return bar; +} + diff --git a/Examples/c/return/example.h b/Examples/c/return/example.h new file mode 100644 index 000000000..bebba4bcb --- /dev/null +++ b/Examples/c/return/example.h @@ -0,0 +1,16 @@ +#include + +class Bar { +private: + int x; +public: + Bar() : x(0) {} + ~Bar() {} + void set(int x) { this->x = x; } + int get() { return x; } +}; + +Bar foo_ret_val(); +//Bar& foo_ret_ref(Bar* bar); +Bar* foo_ret_ptr(Bar* bar); + diff --git a/Examples/c/return/example.i b/Examples/c/return/example.i new file mode 100644 index 000000000..aed792dce --- /dev/null +++ b/Examples/c/return/example.i @@ -0,0 +1,8 @@ +%module example + +%{ +#include "example.h" +%} + +%include "example.h" + diff --git a/Examples/c/return/test.c b/Examples/c/return/test.c new file mode 100644 index 000000000..ee3ed6287 --- /dev/null +++ b/Examples/c/return/test.c @@ -0,0 +1,10 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char** argv) { + Bar b = foo_ret_val(); + //Bar * bp = foo_ret_ptr(NULL); + printf("x = %d\n", Bar_get(&b)); +} + diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c index 56be8799e..8b5b96841 100644 --- a/Examples/c/simple/example.c +++ b/Examples/c/simple/example.c @@ -7,7 +7,7 @@ double *Foo_ptr = &Foo; char *my_str = "hello, world!"; char *array_of_strs[] = { "one", "two" }; -char *get_str(int i) { +char *get_str(int i, void* ptr, float ff) { return array_of_strs[i]; } diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i index afe2b1b1f..371c9a11c 100644 --- a/Examples/c/simple/example.i +++ b/Examples/c/simple/example.i @@ -6,7 +6,7 @@ extern double Foo; extern double *Foo_ptr; extern char *my_str; extern char **array_of_strs; -extern char *get_str(int i); +extern char *get_str(int i, void* ptr, float ff); extern int gcd(int x, int y); %} diff --git a/Examples/c/simple/test.c b/Examples/c/simple/test.c index 20a155a45..4ab88e852 100644 --- a/Examples/c/simple/test.c +++ b/Examples/c/simple/test.c @@ -9,8 +9,7 @@ int main(int argc, char **argv) { printf("Foo by ptr is \%f\n", *Foo_ptr); printf("my_str is: %s\n", my_str); printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); - printf("array_of_strs contains %s and %s\n", get_str(0), get_str(1)); - printf("const Val = %d\n", Val); + printf("array_of_strs contains %s and %s\n", get_str(0, 0, 0), get_str(1, 0, 0)); return 0; } diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 043d4de42..5766a329e 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -5,18 +5,21 @@ * c.swg * ----------------------------------------------------------------------------- */ -%typemap(ctype) short "short" -%typemap(ctype) int "int" -%typemap(ctype) long "long" -%typemap(ctype) char "char" -%typemap(ctype) float "float" -%typemap(ctype) double "double" +%typemap(ctype) void, short, int, long, char, float, double "$1_type" +%typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" %typemap(ctype) bool "_Bool" %typemap(ctype) SWIGTYPE "struct $1_typeObj *" %typemap(ctype) SWIGTYPE * "struct $*1_typeObj *" %typemap(ctype) SWIGTYPE & "struct $*1_ltypeObj *" +%typemap(couttype) void, short, int, long, char, float, double "$1_type" +%typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" +%typemap(couttype) bool "_Bool" +%typemap(couttype) SWIGTYPE "struct $1_typeObj" +%typemap(couttype) SWIGTYPE * "struct $*1_typeObj *" + %typemap(in) short, int, long, char, float, double, bool "$1 = $input;" +%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = $input;" %typemap(in) SWIGTYPE { $1 = * ($1_type *) ($input->obj); @@ -30,3 +33,19 @@ $1 = ($*1_ltype *) $input->obj; } +%typemap(out) short, int, long, char, float, double, bool "$result = $1;" +%typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" +%typemap(out) void "" + +%typemap(out) SWIGTYPE { + $result.obj = (void*) &$1; +} + +%typemap(out) SWIGTYPE * { + $result->obj = (void*) $1; +} + +%typemap(out) SWIGTYPE & { + // return by reference +} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d88294176..aaff68bcc 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -231,18 +231,29 @@ public: * ------------------------------------------------------------------------ */ virtual int globalfunctionHandler(Node *n ) { + String* action = NewString(""); String* vis_hint = NewString(""); String* return_type_str = SwigType_str(Getattr(n, "type"), 0); String* name = Getattr(n, "sym:name"); ParmList* parms = Getattr(n, "parms"); + String* arg_list = NewString(""); - Language::globalfunctionHandler(n); + if (SwigType_type(Getattr(n, "type")) != T_VOID) { + Printv(action, "$cppresult = (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); + } + Printv(action, Swig_cfunction_call(Getattr(n, "name"), parms), ";", NIL); + Setattr(n, "wrap:action", action); + + //Language::globalfunctionHandler(n); + functionWrapper(n); // add visibility hint for the compiler (do not override this symbol) Printv(vis_hint, "SWIGPROTECT(", return_type_str, " ", name, "(", ParmList_str(parms), ");)\n\n", NIL); - Printv(f_wrappers, vis_hint, NIL); + Printv(f_header, vis_hint, NIL); + Delete(arg_list); Delete(vis_hint); + Delete(action); return SWIG_OK; } @@ -252,13 +263,14 @@ public: virtual int functionWrapper(Node *n) { String *name = Getattr(n, "sym:name"); - SwigType *return_type = Getattr(n, "type"); - String *return_type_str = SwigType_str(return_type, 0); + SwigType *type = Getattr(n, "type"); + SwigType *return_type = NewString(""); String *arg_names = NewString(""); ParmList *parms = Getattr(n, "parms"); Parm *p; String* tm; String* proto = NewString(""); + bool is_void_return; // create new function wrapper object Wrapper *wrapper = NewWrapper(); @@ -267,20 +279,42 @@ public: String *wname = Swig_name_wrapper(name); Setattr(n, "wrap:name", wname); - // create wrapper function prototype - Printv(wrapper->def, "SWIGEXPORT ", return_type_str, " ", wname, "(", NIL); - // attach the standard typemaps emit_attach_parmmaps(parms, wrapper); + Setattr(n, "wrap:parms", parms); + + // set the return type + if (Cmp(Getattr(n, "c:immutable"), "1") == 0) { + Printv(return_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { + Printf(stdout, "FW = %s TM = %s\n", Getattr(n, "name"), tm); + String *ctypeout = Getattr(n, "tmap:ctype:out"); // the type in the ctype typemap's out attribute overrides the type in the typemap + if (ctypeout) + tm = ctypeout; + Printf(return_type, "%s", tm); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + } // attach 'ctype' typemaps Swig_typemap_attach_parms("ctype", parms, wrapper); - Setattr(n, "wrap:parms", parms); - // emit variables for holding parameters emit_parameter_variables(parms, wrapper); + // is the function void? + is_void_return = (Strcmp(return_type, "void") == 0); + + // add variable for holding result of original function + if (!is_void_return && (Cmp(Getattr(n, "c:immutable"), "1") != 0)) { + Wrapper_add_localv(wrapper, "cppresult", SwigType_str(type, 0), "cppresult", NIL); + } + + // create wrapper function prototype + Printv(wrapper->def, "SWIGEXPORT ", return_type, " ", wname, "(", NIL); + // prepare function definition int gencomma = 0; for (p = parms; p; ) { @@ -297,6 +331,7 @@ public: Printf(arg_name, "c%s", lname); + // set the appropriate type for parameter if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { Printv(c_parm_type, SwigType_str(type, 0), NIL); } @@ -316,14 +351,17 @@ public: Printv(shadow_parm_type, c_parm_type, NIL); } + Replaceall(c_parm_type, "::", "_"); + Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); Printv(proto, gencomma ? ", " : "", shadow_parm_type, " ", Getattr(p, "name"), NIL); gencomma = 1; + // apply typemaps for input parameter if ((tm = Getattr(p, "tmap:in"))) { if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { - // FIXME + // FIXME: should work as typemaps for basic types Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); } else { @@ -344,13 +382,30 @@ public: Printf(wrapper->def, ") {"); - // declare wrapper function local variables + // emit variable for holding function return value emit_return_variable(n, return_type, wrapper); // emit action code String *action = emit_action(n); - Append(wrapper->code, action); - if (return_type && Strcmp(return_type, "void") != 0) + Replaceall(action, "$cppresult", "cppresult"); + + // emit output typemap if needed + if (!is_void_return && (Cmp(Getattr(n, "c:immutable"), "1") != 0)) { + if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { + Replaceall(tm, "$result", "result"); + Printf(wrapper->code, "%s", tm); + if (Len(tm)) + Printf(wrapper->code, "\n"); + } + else { + Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name")); + } + } + else { + Append(wrapper->code, action); + } + + if (!is_void_return) Append(wrapper->code, "return result;\n"); Append(wrapper->code, "}\n"); @@ -361,12 +416,12 @@ public: // use shadow-type for return type if supplied SwigType* shadow_type = Getattr(n, "c:stype"); if (shadow_type) { - return_type_str = SwigType_str(shadow_type, 0); + return_type = SwigType_str(shadow_type, 0); } // emit proxy functions prototypes - Printv(f_shadow_code_init, "extern ", return_type_str, " ", wname, "(", proto, ");\n", NIL); - Printv(f_shadow_code_body, return_type_str, " ", name, "(", proto, ") {\n", NIL); + Printv(f_shadow_code_init, "extern ", return_type, " ", wname, "(", proto, ");\n", NIL); + Printv(f_shadow_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); // handle 'prepend' feature String *prepend_str = Getattr(n, "feature:prepend"); @@ -396,15 +451,15 @@ public: Printv(f_shadow_code_body, "}\n", NIL); // add function declaration to the proxy header file - Printv(f_shadow_header, return_type_str, " ", name, "(", proto, ");\n"); + Printv(f_shadow_header, return_type, " ", name, "(", proto, ");\n"); } // cleanup Delete(proto); Delete(arg_names); Delete(wname); + Delete(return_type); DelWrapper(wrapper); - return SWIG_OK; } @@ -423,7 +478,7 @@ public: // declare it in the proxy header if (shadow_flag) { - Printv(f_shadow_header, "\ntypedef ", sobj_name, " ", name, ";\n\n", NIL); + Printv(f_shadow_header, "\ntypedef ", sobj_name, " {\n void* obj;\n} ", name, ";\n\n", NIL); } Delete(sobj_name); @@ -480,7 +535,7 @@ public: arg_call_lnames = empty_string; // generate action code - Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "result = " : "", NIL); + Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); @@ -548,7 +603,7 @@ public: Setattr(n, "parms", p); // generate action code - Printv(code, "result = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); + Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); Setattr(n, "wrap:action", code); // modify method name @@ -610,6 +665,7 @@ public: ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); + Setattr(n, "c:immutable", "1"); stype = Copy(name); SwigType_add_pointer(stype); Setattr(n, "c:stype", stype); From 9c07e2a9e5194ed96af1b70a29891b2984d50103 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Tue, 1 Jul 2008 15:27:54 +0000 Subject: [PATCH 013/508] Variable inheritance support: sets/gets for each class derived from a base class. Modified 'class' example. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10619 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/test.c | 21 +++++++----- Source/Modules/c.cxx | 72 +++++++++++++++++++++++++---------------- 2 files changed, 58 insertions(+), 35 deletions(-) diff --git a/Examples/c/class/test.c b/Examples/c/class/test.c index ccf54eb61..2b525c933 100644 --- a/Examples/c/class/test.c +++ b/Examples/c/class/test.c @@ -11,20 +11,25 @@ int main(int argc, char **argv) { printf("\nA total of %d shapes were created\n", 0); + Circle_set_x(c, 20); + Circle_set_y(c, 30); + + Shape* shape = (Shape*) s; + Shape_set_x(shape, -10); + Shape_set_y(shape, 5); + + printf("\nHere is their current positions:\n"); + printf(" Circle = (%f %f)\n", Circle_get_x(c), Circle_get_y(c)); + printf(" Square = (%f %f)\n", Square_get_x(s), Square_get_y(s)); + printf("\nHere are some properties of the shapes:\n"); - Shape shapes[] = {c, s}; + Shape* shapes[] = {(Shape*) c, (Shape*) s}; int i; - /* - * TODO: support for virtual functions for (i = 0; i < 2; i++) { + printf(" %s\n", i ? "Square" : "Circle"); printf(" area = %f\n", Shape_area(shapes[i])); printf(" perimeter = %f\n", Shape_perimeter(shapes[i])); } - */ - - // call methods directly by now - printf("Circle perim.=%f, area=%f\n", Circle_perimeter(c), Circle_area(c)); - printf("Square perim.=%f, area=%f\n", Square_perimeter(s), Square_area(s)); printf("\nGuess I'll clean up now\n"); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index aaff68bcc..c393b5ddc 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -193,25 +193,6 @@ public: return SWIG_OK; } - /* ----------------------------------------------------------------------- - * add_parm_names() - * ------------------------------------------------------------------------ */ - - void add_parm_lnames(ParmList* parms, String* arg_list) { - Parm* p, * np; - int i = 1; - for (p = parms; p; ) { - np = nextSibling(p); - String* name = NewString(""); - Printf(name, "arg%d", i++); - if (arg_list) - Printv(arg_list, name, np ? ", " : "", NIL); - Setattr(p, "lname", name); - Delete(name); - p = np; - } - } - /* ----------------------------------------------------------------------- * globalvariableHandler() * ------------------------------------------------------------------------ */ @@ -244,7 +225,6 @@ public: Printv(action, Swig_cfunction_call(Getattr(n, "name"), parms), ";", NIL); Setattr(n, "wrap:action", action); - //Language::globalfunctionHandler(n); functionWrapper(n); // add visibility hint for the compiler (do not override this symbol) @@ -288,7 +268,6 @@ public: Printv(return_type, SwigType_str(type, 0), NIL); } else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { - Printf(stdout, "FW = %s TM = %s\n", Getattr(n, "name"), tm); String *ctypeout = Getattr(n, "tmap:ctype:out"); // the type in the ctype typemap's out attribute overrides the type in the typemap if (ctypeout) tm = ctypeout; @@ -305,7 +284,7 @@ public: emit_parameter_variables(parms, wrapper); // is the function void? - is_void_return = (Strcmp(return_type, "void") == 0); + is_void_return = (SwigType_type(Getattr(n, "type")) == T_VOID); // add variable for holding result of original function if (!is_void_return && (Cmp(Getattr(n, "c:immutable"), "1") != 0)) { @@ -444,7 +423,7 @@ public: if (*t == '{') { Delitem(append_str, 0); Delitem(append_str, DOH_END); - } + } Printv(f_shadow_code_body, append_str, "\n", NIL); } @@ -463,6 +442,23 @@ public: return SWIG_OK; } + /* --------------------------------------------------------------------- + * copy_node() + * --------------------------------------------------------------------- */ + + Node* copy_node(Node *node) { + Node* new_node = NewHash(); + Setattr(new_node, "name", Copy(Getattr(node, "name"))); + Setattr(new_node, "ismember", Copy(Getattr(node, "ismember"))); + Setattr(new_node, "view", Copy(Getattr(node, "view"))); + Setattr(new_node, "kind", Copy(Getattr(node, "kind"))); + Setattr(new_node, "access", Copy(Getattr(node, "access"))); + Setattr(new_node, "parms", Copy(Getattr(node, "parms"))); + Setattr(new_node, "type", Copy(Getattr(node, "type"))); + Setattr(new_node, "decl", Copy(Getattr(node, "decl"))); + return new_node; + } + /* --------------------------------------------------------------------- * classDeclaration() * --------------------------------------------------------------------- */ @@ -470,8 +466,28 @@ public: virtual int classHandler(Node* n) { String* name = Copy(Getattr(n, "name")); String* sobj_name = NewString(""); + List* baselist = Getattr(n, "bases"); Replaceall(name, "::", "_"); + // inheritance support: attach all members from base classes to this class + if (baselist) { + Iterator i; + for (i = First(baselist); i.item; i = Next(i)) { + // look for member variables (TODO: support for other constructs) + Node* node; + for (node = firstChild(i.item); node; node = nextSibling(node)) { + if ((Cmp(Getattr(node, "kind"), "variable") == 0) + && (Cmp(Getattr(node, "access"), "private") != 0) + && (Cmp(Getattr(node, "storage"), "static") != 0)) { + Node* new_node = copy_node(node); + Setattr(new_node, "sym:name", Getattr(new_node, "name")); + set_nodeType(new_node, "cdecl"); + appendChild(n, new_node); + } + } + } + } + // emit "class"-struct definition Printv(sobj_name, "struct ", name, "Obj", NIL); Printv(f_header, sobj_name, " {\n void* obj;\n};\n\n", NIL); @@ -527,12 +543,14 @@ public: // prepare argument names parms = Getattr(n, "parms"); - add_parm_lnames(parms, arg_lnames); + Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // omit first argument in method call String* arg_call_lnames = Strstr(arg_lnames, "arg2"); if (!arg_call_lnames) arg_call_lnames = empty_string; + else + Delitem(arg_lnames, DOH_END); // generate action code Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); @@ -619,7 +637,7 @@ public: Setattr(n, "type", "void"); // generate action code - Delete(code); + code = NewString(""); Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); Setattr(n, "wrap:action", code); @@ -658,7 +676,7 @@ public: Replaceall(name, "::", "_"); // prepare argument names - add_parm_lnames(parms, arg_lnames); + Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // set the function return type to the pointer to struct Printv(sobj_name, "struct ", name, "Obj", NIL); @@ -672,7 +690,7 @@ public: // generate action code Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); - Printv(code, "result->obj = (void*) new ", classname, "(", arg_lnames, ");\n", NIL); + Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); Setattr(n, "wrap:action", code); // modify the constructor name From 0b3d9dad0d97adf4406e9a97c0dca838c04e9940 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Tue, 1 Jul 2008 23:32:34 +0000 Subject: [PATCH 014/508] Static member variable handler. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10623 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/test.c | 4 ++-- Source/Modules/c.cxx | 42 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Examples/c/class/test.c b/Examples/c/class/test.c index 2b525c933..8842f21dc 100644 --- a/Examples/c/class/test.c +++ b/Examples/c/class/test.c @@ -9,7 +9,7 @@ int main(int argc, char **argv) { Square* s = new_Square(10); printf(" Created square\n"); - printf("\nA total of %d shapes were created\n", 0); + printf("\nA total of %d shapes were created\n", Shape_get_nshapes()); Circle_set_x(c, 20); Circle_set_y(c, 30); @@ -36,7 +36,7 @@ int main(int argc, char **argv) { delete_Square(s); delete_Circle(c); - printf("%d shapes remain\n", 0); + printf("%d shapes remain\n", Shape_get_nshapes()); printf("Goodbye\n"); } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index c393b5ddc..5dac2385d 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -579,15 +579,48 @@ public: * --------------------------------------------------------------------- */ virtual int staticmembervariableHandler(Node* n) { + String* name = Getattr(n, "sym:name"); + String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); + String* new_name = NewString(""); + String* code = NewString(""); + Replaceall(newclassname, "::", "_"); + + // create code for 'get' function + Printv(code, "$cppresult = ", classname, "::", name, ";\n", NIL); + Setattr(n, "wrap:action", code); + + // modify the method name + Printv(new_name, newclassname, "_get_", name, NIL); + Setattr(n, "sym:name", new_name); + + functionWrapper(n); + + // create parameter for 'set' function + Parm* p = NewParm(Getattr(n, "type"), "value"); + Setattr(p, "lname", "arg1"); + Setattr(n, "parms", p); + + // create code for 'set' function + code = NewString(""); + Printv(code, classname, "::", name, " = arg1;\n", NIL); + Setattr(n, "wrap:action", code); + + // modify the method name + new_name = NewString(""); + Printv(new_name, newclassname, "_set_", name, NIL); + Setattr(n, "sym:name", new_name); + + Setattr(n, "type", "void"); + functionWrapper(n); + + Delete(code); + Delete(new_name); return SWIG_OK; } /* --------------------------------------------------------------------- * membervariableHandler() - * - * TODO: generate additional setters and getters to handle inheritance - * properly, i.e. pair of functions for each type in hierarchy - * * --------------------------------------------------------------------- */ virtual int membervariableHandler(Node* n) { @@ -643,7 +676,6 @@ public: Setattr(n, "wrap:action", code); // modify method name - Delete(new_name); new_name = NewString(""); Printv(new_name, newclassname, "_set_", name, NIL); Setattr(n, "sym:name", new_name); From 6355de87ef045c56956bc8aa880e8c4481189a8f Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 2 Jul 2008 23:29:30 +0000 Subject: [PATCH 015/508] Simple runtime type checking (optional). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10632 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 153 +++++++++++++++++++++++++++++++------------ 1 file changed, 110 insertions(+), 43 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 5dac2385d..72a1c8f11 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -28,6 +28,7 @@ class C:public Language { String *empty_string; bool shadow_flag; + bool runtime_flag; public: @@ -37,7 +38,8 @@ public: C() : empty_string(NewString("")), - shadow_flag(true) { + shadow_flag(true), + runtime_flag(true) { } /* ------------------------------------------------------------ @@ -64,6 +66,8 @@ public: shadow_flag = true; } else if (strcmp(argv[i], "-noproxy") == 0) { shadow_flag = false; + } else if (strcmp(argv[i], "-noruntime") == 0) { + runtime_flag = false; } } } @@ -119,8 +123,24 @@ public: Swig_banner(f_runtime); emitSwigProtectSymbols(f_header); - // FIXME - Printf(f_header, "#include \n\n"); + Printf(f_header, "#include \n"); + if (runtime_flag) { + Printf(f_header, "#include \n"); + Printf(f_header, "#include \n"); + Printf(f_header, "#include \n\n"); + Printf(f_header, "static jmp_buf __rt_env;\n"); + Printf(f_header, "static int __rt_init = 0;\n\n"); + Printf(f_header, "void __runtime_init() {\n"); + Printf(f_header, " if (!__rt_init) {\n"); + Printf(f_header, " __rt_init = 1;\n"); + Printf(f_header, " if (setjmp(__rt_env)) {\n"); + Printf(f_header, " fprintf(stderr, \"An error occured. Exitting...\\n\");\n"); + Printf(f_header, " exit(1);\n"); + Printf(f_header, " }\n"); + Printf(f_header, " }\n"); + Printf(f_header, "}\n\n"); + } + // generate shadow files if enabled if (shadow_flag) { @@ -442,6 +462,25 @@ public: return SWIG_OK; } + /* --------------------------------------------------------------------- + * emit_runtime_typecheck() + * --------------------------------------------------------------------- */ + + String* emit_runtime_typecheck(String* classname, String* funcname) { + String* code = NewString(""); + Printf(code, "{\nint i = 0, type_ok = 0;\n"); + Printf(code, "if (arg1 == NULL) {\n"); + Printv(code, " fprintf(stderr, \"error: NULL object-struct passed to ", funcname, "\\n\");\n"); + Printf(code, " longjmp(__rt_env, 0);\n}\n"); + Printf(code, "while(arg1->typenames[i]) {\n"); + Printv(code, " if (strcmp(arg1->typenames[i++], \"", classname, "\") == 0) {\n", NIL); + Printf(code, " type_ok = 1;\nbreak;\n}\n}\n"); + Printf(code, "if (!type_ok) {\n"); + Printv(code, " fprintf(stderr, \"error: object-struct passed to ", funcname, " is not of class ", classname, "\\n\");\n", NIL); + Printf(code, " longjmp(__rt_env, 0);\n}\n}\n"); + return code; + } + /* --------------------------------------------------------------------- * copy_node() * --------------------------------------------------------------------- */ @@ -490,7 +529,13 @@ public: // emit "class"-struct definition Printv(sobj_name, "struct ", name, "Obj", NIL); - Printv(f_header, sobj_name, " {\n void* obj;\n};\n\n", NIL); + Printv(f_header, sobj_name, " {\n void* obj;\n", NIL); + if (runtime_flag) { + Printf(f_header, " const char* typenames[%d];\n};\n\n", Len(baselist) + 2); + Printv(f_header, "const char* __typename_", name, " = \"", name, "\";\n\n", NIL); + } + else + Printf(f_header, "};\n\n"); // declare it in the proxy header if (shadow_flag) { @@ -552,15 +597,17 @@ public: else Delitem(arg_lnames, DOH_END); - // generate action code - Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); - Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); - Setattr(n, "wrap:action", code); - // modify method name Printv(new_name, newclassname, "_", name, NIL); Setattr(n, "sym:name", new_name); + // generate action code + if (runtime_flag) + Append(code, emit_runtime_typecheck(newclassname, new_name)); + Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); + Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); + Setattr(n, "wrap:action", code); + functionWrapper(n); Delete(arg_lnames); @@ -586,14 +633,14 @@ public: String* code = NewString(""); Replaceall(newclassname, "::", "_"); - // create code for 'get' function - Printv(code, "$cppresult = ", classname, "::", name, ";\n", NIL); - Setattr(n, "wrap:action", code); - // modify the method name Printv(new_name, newclassname, "_get_", name, NIL); Setattr(n, "sym:name", new_name); + // create code for 'get' function + Printv(code, "$cppresult = ", classname, "::", name, ";\n", NIL); + Setattr(n, "wrap:action", code); + functionWrapper(n); // create parameter for 'set' function @@ -601,15 +648,15 @@ public: Setattr(p, "lname", "arg1"); Setattr(n, "parms", p); - // create code for 'set' function - code = NewString(""); - Printv(code, classname, "::", name, " = arg1;\n", NIL); - Setattr(n, "wrap:action", code); - // modify the method name new_name = NewString(""); Printv(new_name, newclassname, "_set_", name, NIL); Setattr(n, "sym:name", new_name); + + // create code for 'set' function + code = NewString(""); + Printv(code, classname, "::", name, " = arg1;\n", NIL); + Setattr(n, "wrap:action", code); Setattr(n, "type", "void"); functionWrapper(n); @@ -653,14 +700,16 @@ public: Setattr(n, "parms", p); - // generate action code - Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); - Setattr(n, "wrap:action", code); - // modify method name Printv(new_name, newclassname, "_get_", name, NIL); Setattr(n, "sym:name", new_name); + // generate action code + if (runtime_flag) + Append(code, emit_runtime_typecheck(newclassname, new_name)); + Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); + Setattr(n, "wrap:action", code); + functionWrapper(n); /* create 'set' function */ @@ -669,17 +718,18 @@ public: Setattr(n, "parms", p); Setattr(n, "type", "void"); - // generate action code - - code = NewString(""); - Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); - Setattr(n, "wrap:action", code); - // modify method name new_name = NewString(""); Printv(new_name, newclassname, "_set_", name, NIL); Setattr(n, "sym:name", new_name); + // generate action code + code = NewString(""); + if (runtime_flag) + Append(code, emit_runtime_typecheck(newclassname, new_name)); + Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); + Setattr(n, "wrap:action", code); + functionWrapper(n); Delete(code); @@ -695,40 +745,53 @@ public: * --------------------------------------------------------------------- */ virtual int constructorHandler(Node* n) { - String* name = Copy(Getattr(n, "name")); String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); String* sobj_name = NewString(""); - String* ctype = NewString(""); + String* ctype; String* stype; String* code = NewString(""); String* constr_name = NewString(""); String* arg_lnames = NewString(""); ParmList* parms = Getattr(n, "parms"); - Replaceall(name, "::", "_"); + Replaceall(newclassname, "::", "_"); // prepare argument names Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // set the function return type to the pointer to struct - Printv(sobj_name, "struct ", name, "Obj", NIL); + Printv(sobj_name, "struct ", newclassname, "Obj", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); Setattr(n, "c:immutable", "1"); - stype = Copy(name); + stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(n, "c:stype", stype); + // modify the constructor name + Printv(constr_name, "new_", newclassname, NIL); + Setattr(n, "sym:name", constr_name); + // generate action code Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); + if (runtime_flag) { + List* baselist = Getattr(parentNode(n), "bases"); + Printv(code, "result->typenames[0] = __typename_", newclassname, ";\n", NIL); + int i = 1; + if (baselist) { + Iterator it; + for (it = First(baselist); it.item; it = Next(it)) { + Printf(code, "result->typenames[%d] = __typename_%s;\n", i++, Getattr(it.item, "name")); + } + } + Printf(code, "result->typenames[%d] = 0;\n", i); + Printf(code, "__runtime_init();\n"); + } Setattr(n, "wrap:action", code); - // modify the constructor name - Printv(constr_name, "new_", name, NIL); - Setattr(n, "sym:name", constr_name); - functionWrapper(n); Delete(arg_lnames); @@ -737,7 +800,7 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); - Delete(name); + Delete(newclassname); return SWIG_OK; } @@ -749,7 +812,7 @@ public: String* classname = Getattr(parentNode(n), "name"); String* newclassname = Copy(classname); String* sobj_name = NewString(""); - String* ctype = NewString(""); + String* ctype; String* stype; String* code = NewString(""); String* destr_name = NewString(""); @@ -771,13 +834,15 @@ public: Setattr(n, "parms", p); Setattr(n, "type", "void"); - // create action code - Printv(code, "delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); - Setattr(n, "wrap:action", code); - // modify the destructor name Printv(destr_name, "delete_", newclassname, NIL); Setattr(n, "sym:name", destr_name); + + // create action code + if (runtime_flag) + Append(code, emit_runtime_typecheck(newclassname, destr_name)); + Printv(code, "delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); + Setattr(n, "wrap:action", code); functionWrapper(n); @@ -827,5 +892,7 @@ extern "C" Language *swig_c(void) { const char *C::usage = (char *) "\ C Options (available with -c)\n\ + -noproxy - do not generate proxy interface\n\ + -noruntime - disable runtime error checking\n\ \n"; From b2d56dee8e62f069543a2760c9f955ef0cef07b5 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Thu, 3 Jul 2008 14:55:03 +0000 Subject: [PATCH 016/508] Some fixes to linking problems. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10642 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 2 ++ Lib/c/clabels.swg | 38 ++++++++++++++++++++++++++++++++++++++ Source/Modules/c.cxx | 20 +++----------------- 3 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 Lib/c/clabels.swg diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 5766a329e..3ebe859d0 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -5,6 +5,8 @@ * c.swg * ----------------------------------------------------------------------------- */ +%insert("runtime") "clabels.swg" + %typemap(ctype) void, short, int, long, char, float, double "$1_type" %typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" %typemap(ctype) bool "_Bool" diff --git a/Lib/c/clabels.swg b/Lib/c/clabels.swg new file mode 100644 index 000000000..cdf3a6c26 --- /dev/null +++ b/Lib/c/clabels.swg @@ -0,0 +1,38 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * clabels.swg + * + * Definitions of some C specific preprocessor symbols. + * ----------------------------------------------------------------------------- */ + +// this is used instead of default SWIGEXPORT symbol +#ifndef SWIGEXPORTC +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORTC +# else +# define SWIGEXPORTC +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORTC __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORTC +# endif +# endif +#endif + +#ifndef SWIGPROTECT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGPROTECT(x) +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGPROTECT(x) __attribute__ ((visibility("protected"))) x +# else +# define SWIGPROTECT(x) +# endif +# endif +#endif + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 72a1c8f11..7de794f95 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -73,20 +73,6 @@ public: } } - void emitSwigProtectSymbols(File *f) { - Printf(f, "#ifndef SWIGPROTECT\n"); - Printf(f, "# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)\n"); - Printf(f, "# define SWIGPROTECT(x)\n"); - Printf(f, "# else\n"); - Printf(f, "# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)\n"); - Printf(f, "# define SWIGPROTECT(x) __attribute__ ((visibility(\"protected\"))) x\n"); - Printf(f, "# else\n"); - Printf(f, "# define SWIGPROTECT(x)\n"); - Printf(f, "# endif\n"); - Printf(f, "# endif\n"); - Printf(f, "#endif\n\n"); - } - void emitSwigImport(File *f) { Printf(f, "#ifndef SWIGIMPORT\n"); Printf(f, "# ifndef __GNUC__\n"); @@ -121,11 +107,11 @@ public: f_wrappers = NewString(""); Swig_banner(f_runtime); - emitSwigProtectSymbols(f_header); Printf(f_header, "#include \n"); if (runtime_flag) { Printf(f_header, "#include \n"); + Printf(f_header, "#include \n"); Printf(f_header, "#include \n"); Printf(f_header, "#include \n\n"); Printf(f_header, "static jmp_buf __rt_env;\n"); @@ -220,7 +206,7 @@ public: virtual int globalvariableHandler(Node *n) { SwigType *type = Getattr(n, "type"); String *type_str = SwigType_str(type, 0); - Printv(f_wrappers, "SWIGEXPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); + //Printv(f_wrappers, "SWIGEXPORTC ", type_str, " ", Getattr(n, "name"), ";\n", NIL); if (shadow_flag) { Printv(f_shadow_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); } @@ -312,7 +298,7 @@ public: } // create wrapper function prototype - Printv(wrapper->def, "SWIGEXPORT ", return_type, " ", wname, "(", NIL); + Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); // prepare function definition int gencomma = 0; From 97ffcf1da7984d09625035e2aefb2fca133d64ba Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Thu, 3 Jul 2008 23:26:10 +0000 Subject: [PATCH 017/508] static member function, copy constructor, some minor fixes git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10646 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/Makefile | 2 +- Lib/c/c.swg | 1 + Lib/c/clabels.swg | 12 +-- Lib/c/cproxy.swg | 19 +++++ Source/Modules/c.cxx | 150 ++++++++++++++++++++++++++++---------- 5 files changed, 134 insertions(+), 50 deletions(-) create mode 100644 Lib/c/cproxy.swg diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index f04179d46..387238386 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 3ebe859d0..f4d6c761f 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -6,6 +6,7 @@ * ----------------------------------------------------------------------------- */ %insert("runtime") "clabels.swg" +%insert("shadow_header") "cproxy.swg" %typemap(ctype) void, short, int, long, char, float, double "$1_type" %typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" diff --git a/Lib/c/clabels.swg b/Lib/c/clabels.swg index cdf3a6c26..3164eea5d 100644 --- a/Lib/c/clabels.swg +++ b/Lib/c/clabels.swg @@ -1,20 +1,14 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * clabels.swg * - * Definitions of some C specific preprocessor symbols. + * Definitions of C specific preprocessor symbols. * ----------------------------------------------------------------------------- */ // this is used instead of default SWIGEXPORT symbol + #ifndef SWIGEXPORTC # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(STATIC_LINKED) -# define SWIGEXPORTC -# else -# define SWIGEXPORTC -# endif +# define SWIGEXPORTC # else # if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) # define SWIGEXPORTC __attribute__ ((visibility("default"))) diff --git a/Lib/c/cproxy.swg b/Lib/c/cproxy.swg new file mode 100644 index 000000000..09584937e --- /dev/null +++ b/Lib/c/cproxy.swg @@ -0,0 +1,19 @@ +/* ----------------------------------------------------------------------------- + * cproxy.swg + * + * Definitions of C specific preprocessor symbols for proxies. + * ----------------------------------------------------------------------------- */ + +#ifndef SWIGIMPORT +# ifndef __GNUC__ +# define __DLL_IMPORT __declspec(dllimport) +# else +# define __DLL_IMPORT __attribute__((dllimport)) extern +# endif +# if !defined (__WIN32__) +# define SWIGIMPORT extern +# else +# define SWIGIMPORT __DLL_IMPORT +# endif +#endif + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 7de794f95..14ddf5ba7 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -73,21 +73,6 @@ public: } } - void emitSwigImport(File *f) { - Printf(f, "#ifndef SWIGIMPORT\n"); - Printf(f, "# ifndef __GNUC__\n"); - Printf(f, "# define __DLL_IMPORT __declspec(dllimport)\n"); - Printf(f, "# else\n"); - Printf(f, "# define __DLL_IMPORT __attribute__((dllimport)) extern\n"); - Printf(f, "# endif\n"); - Printf(f, "# if !defined (__WIN32__)\n"); - Printf(f, "# define SWIGIMPORT extern\n"); - Printf(f, "# else\n"); - Printf(f, "# define SWIGIMPORT __DLL_IMPORT\n"); - Printf(f, "# endif\n"); - Printf(f, "#endif\n\n"); - } - /* --------------------------------------------------------------------- * top() * --------------------------------------------------------------------- */ @@ -153,7 +138,6 @@ public: Swig_banner(f_shadow_code_init); Swig_banner(f_shadow_header); - emitSwigImport(f_shadow_header); Printf(f_shadow_code_init, "#include \"%s\"\n\n", shadow_header_filename); } @@ -452,8 +436,7 @@ public: * emit_runtime_typecheck() * --------------------------------------------------------------------- */ - String* emit_runtime_typecheck(String* classname, String* funcname) { - String* code = NewString(""); + void emit_runtime_typecheck(String* classname, String* funcname, String* code) { Printf(code, "{\nint i = 0, type_ok = 0;\n"); Printf(code, "if (arg1 == NULL) {\n"); Printv(code, " fprintf(stderr, \"error: NULL object-struct passed to ", funcname, "\\n\");\n"); @@ -464,7 +447,6 @@ public: Printf(code, "if (!type_ok) {\n"); Printv(code, " fprintf(stderr, \"error: object-struct passed to ", funcname, " is not of class ", classname, "\\n\");\n", NIL); Printf(code, " longjmp(__rt_env, 0);\n}\n}\n"); - return code; } /* --------------------------------------------------------------------- @@ -485,7 +467,7 @@ public: } /* --------------------------------------------------------------------- - * classDeclaration() + * classHandler() * --------------------------------------------------------------------- */ virtual int classHandler(Node* n) { @@ -538,6 +520,36 @@ public: * --------------------------------------------------------------------- */ virtual int staticmemberfunctionHandler(Node* n) { + String* name = Getattr(n, "name"); + String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); + String* new_name = NewString(""); + String* code = NewString(""); + String* arg_lnames = NewString(""); + ParmList* parms = Getattr(n, "parms"); + + Replaceall(newclassname, "::", "_"); + + // prepare function call + Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); + Delitem(arg_lnames, 0); + Delitem(arg_lnames, DOH_END); + + // modify method name + Printv(new_name, newclassname, "_", name, NIL); + Setattr(n, "sym:name", new_name); + + // generate action code + Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); + Printv(code, classname, "::", name, "(", arg_lnames, ");\n", NIL); + Setattr(n, "wrap:action", code); + + functionWrapper(n); + + Delete(arg_lnames); + Delete(code); + Delete(new_name); + Delete(newclassname); return SWIG_OK; } @@ -546,7 +558,7 @@ public: * --------------------------------------------------------------------- */ virtual int memberfunctionHandler(Node* n) { - String* name = Copy(Getattr(n, "name")); + String* name = Getattr(n, "name"); String* classname = Getattr(parentNode(n), "name"); String* newclassname = Copy(classname); String* sobj_name = NewString(""); @@ -572,7 +584,7 @@ public: set_nextSibling(p, parms); Setattr(n, "parms", p); - // prepare argument names + // prepare function call parms = Getattr(n, "parms"); Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); @@ -589,7 +601,7 @@ public: // generate action code if (runtime_flag) - Append(code, emit_runtime_typecheck(newclassname, new_name)); + emit_runtime_typecheck(newclassname, new_name, code); Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); @@ -603,7 +615,6 @@ public: Delete(ctype); Delete(sobj_name); Delete(newclassname); - Delete(name); return SWIG_OK; } @@ -692,7 +703,7 @@ public: // generate action code if (runtime_flag) - Append(code, emit_runtime_typecheck(newclassname, new_name)); + emit_runtime_typecheck(newclassname, new_name, code); Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); Setattr(n, "wrap:action", code); @@ -712,7 +723,7 @@ public: // generate action code code = NewString(""); if (runtime_flag) - Append(code, emit_runtime_typecheck(newclassname, new_name)); + emit_runtime_typecheck(newclassname, new_name, code); Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); Setattr(n, "wrap:action", code); @@ -726,6 +737,25 @@ public: return SWIG_OK; } + /* --------------------------------------------------------------------- + * emit_runtime_make_object() + * --------------------------------------------------------------------- */ + + void emit_runtime_make_object(Node* n, String* classname, String* code) { + // store the name of each class in the hierarchy + List* baselist = Getattr(parentNode(n), "bases"); + Printv(code, "result->typenames[0] = __typename_", classname, ";\n", NIL); + int i = 1; + if (baselist) { + Iterator it; + for (it = First(baselist); it.item; it = Next(it)) { + Printf(code, "result->typenames[%d] = __typename_%s;\n", i++, Getattr(it.item, "name")); + } + } + Printf(code, "result->typenames[%d] = 0;\n", i); + Printf(code, "__runtime_init();\n"); + } + /* --------------------------------------------------------------------- * constructorHandler() * --------------------------------------------------------------------- */ @@ -763,19 +793,9 @@ public: // generate action code Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); - if (runtime_flag) { - List* baselist = Getattr(parentNode(n), "bases"); - Printv(code, "result->typenames[0] = __typename_", newclassname, ";\n", NIL); - int i = 1; - if (baselist) { - Iterator it; - for (it = First(baselist); it.item; it = Next(it)) { - Printf(code, "result->typenames[%d] = __typename_%s;\n", i++, Getattr(it.item, "name")); - } - } - Printf(code, "result->typenames[%d] = 0;\n", i); - Printf(code, "__runtime_init();\n"); - } + if (runtime_flag) + emit_runtime_make_object(n, newclassname, code); + Setattr(n, "wrap:action", code); functionWrapper(n); @@ -790,6 +810,56 @@ public: return SWIG_OK; } + /* --------------------------------------------------------------------- + * copyconstructorHandler() + * --------------------------------------------------------------------- */ + + virtual int copyconstructorHandler(Node *n) { + String* classname = Getattr(parentNode(n), "name"); + String* newclassname = Copy(classname); + String* sobj_name = NewString(""); + String* ctype; + String* stype; + String* code = NewString(""); + String* constr_name = NewString(""); + ParmList* parms = Getattr(n, "parms"); + + Replaceall(newclassname, "::", "_"); + Setattr(parms, "lname", "arg1"); + + // set the function return type to the pointer to struct + Printv(sobj_name, "struct ", newclassname, "Obj", NIL); + ctype = Copy(sobj_name); + SwigType_add_pointer(ctype); + Setattr(n, "type", ctype); + Setattr(n, "c:immutable", "1"); + stype = Copy(newclassname); + SwigType_add_pointer(stype); + Setattr(n, "c:stype", stype); + + // modify the constructor name + Printv(constr_name, "copy_", newclassname, NIL); + Setattr(n, "sym:name", constr_name); + + // generate action code + Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); + Printv(code, "result->obj = (void*) new ", classname, "((", classname, " const &)*arg1);\n", NIL); + if (runtime_flag) + emit_runtime_make_object(n, newclassname, code); + + Setattr(n, "wrap:action", code); + + functionWrapper(n); + + Delete(constr_name); + Delete(code); + Delete(stype); + Delete(ctype); + Delete(sobj_name); + Delete(newclassname); + return SWIG_OK; + } + /* --------------------------------------------------------------------- * destructorHandler() * --------------------------------------------------------------------- */ @@ -826,7 +896,7 @@ public: // create action code if (runtime_flag) - Append(code, emit_runtime_typecheck(newclassname, destr_name)); + emit_runtime_typecheck(newclassname, destr_name, code); Printv(code, "delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); Setattr(n, "wrap:action", code); From 125f362852154af79d8a429cf8f240884d7ac13d Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 5 Jul 2008 21:29:07 +0000 Subject: [PATCH 018/508] Trying to work out the best solution for special cases of argument passing (arrays of objects, etc.). Some hacks in Swig_typemap_search() to distinguish between built-in types and objects, but this is experimental by now. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10652 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/arguments/Makefile | 14 +++ Examples/c/arguments/example.cxx | 2 + Examples/c/arguments/example.h | 32 +++++ Examples/c/arguments/example.i | 8 ++ Examples/c/arguments/test.c | 26 +++++ Lib/c/c.swg | 58 ++++++--- Source/Modules/c.cxx | 194 ++++++++++++++++++------------- Source/Swig/stype.c | 14 +++ Source/Swig/swig.h | 2 + Source/Swig/typemap.c | 37 +++++- 10 files changed, 289 insertions(+), 98 deletions(-) create mode 100644 Examples/c/arguments/Makefile create mode 100644 Examples/c/arguments/example.cxx create mode 100644 Examples/c/arguments/example.h create mode 100644 Examples/c/arguments/example.i create mode 100644 Examples/c/arguments/test.c diff --git a/Examples/c/arguments/Makefile b/Examples/c/arguments/Makefile new file mode 100644 index 000000000..f04179d46 --- /dev/null +++ b/Examples/c/arguments/Makefile @@ -0,0 +1,14 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +MAIN = test.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/arguments/example.cxx b/Examples/c/arguments/example.cxx new file mode 100644 index 000000000..e64adbdba --- /dev/null +++ b/Examples/c/arguments/example.cxx @@ -0,0 +1,2 @@ +#include "example.h" + diff --git a/Examples/c/arguments/example.h b/Examples/c/arguments/example.h new file mode 100644 index 000000000..45ecee45b --- /dev/null +++ b/Examples/c/arguments/example.h @@ -0,0 +1,32 @@ +#include + +class A { +public: + int i; + A(int i) : i(i) {} +}; + +class MyClass { +public: + void foo(A a, A* aa, A* aaa[5]) { + printf("a.i = %d\n", a.i); + printf("aa->i = %d\n", aa->i); + int i = 0; + while (aaa[i]) { + printf("aaa[%d]->i = %d\n", i, aaa[i]->i); + i++; + } + } + + void bar(int x, int* px, int* xs[5]) { + printf("x = %d\n", x); + printf("*px = %d\n", *px); + int i = 0; + while (xs[i]) { + printf("*xs[%d] = %d\n", i, *xs[i]); + i++; + } + } + +}; + diff --git a/Examples/c/arguments/example.i b/Examples/c/arguments/example.i new file mode 100644 index 000000000..aed792dce --- /dev/null +++ b/Examples/c/arguments/example.i @@ -0,0 +1,8 @@ +%module example + +%{ +#include "example.h" +%} + +%include "example.h" + diff --git a/Examples/c/arguments/test.c b/Examples/c/arguments/test.c new file mode 100644 index 000000000..c2b7c2461 --- /dev/null +++ b/Examples/c/arguments/test.c @@ -0,0 +1,26 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char** argv) { + + MyClass* mc = new_MyClass(); + A* a = new_A(123), *b = new_A(234), *as[5]; + int i, j = 321, *js[5]; + + for (i = 0; i < 4; ++i) { + as[i] = new_A(20 + i); + js[i] = (int*) malloc(sizeof(int)); + *js[i] = 10 + i; + } + + as[i] = 0; + js[i] = 0; + + MyClass_bar(mc, j, &j, js); + MyClass_foo(mc, *a, b, as); + + delete_A(a); + delete_MyClass(mc); +} + diff --git a/Lib/c/c.swg b/Lib/c/c.swg index f4d6c761f..5b51f4bb1 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -8,34 +8,58 @@ %insert("runtime") "clabels.swg" %insert("shadow_header") "cproxy.swg" +// typemaps for function parameters + %typemap(ctype) void, short, int, long, char, float, double "$1_type" %typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" -%typemap(ctype) bool "_Bool" -%typemap(ctype) SWIGTYPE "struct $1_typeObj *" -%typemap(ctype) SWIGTYPE * "struct $*1_typeObj *" -%typemap(ctype) SWIGTYPE & "struct $*1_ltypeObj *" +%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_basetype" +%typemap(ctype) bool "_Bool" +%typemap(ctype) SWIGTYPE "$1_type" +%typemap(ctype) SWIGTYPE * "$1_type" +%typemap(ctype) SWIGTYPE & "$1_type" +%typemap(ctype) SWIGTYPE * [ANY] "$1_basetype*" +%typemap(ctype) SWIGCLASSTYPE "struct Obj$1_type" +%typemap(ctype) SWIGCLASSTYPE * "struct Obj$1_type" +%typemap(ctype) SWIGCLASSTYPE & "struct Obj$1_type" +%typemap(ctype) SWIGCLASSTYPE * [ANY] "struct Obj$1_basetype*" -%typemap(couttype) void, short, int, long, char, float, double "$1_type" -%typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" -%typemap(couttype) bool "_Bool" -%typemap(couttype) SWIGTYPE "struct $1_typeObj" -%typemap(couttype) SWIGTYPE * "struct $*1_typeObj *" - -%typemap(in) short, int, long, char, float, double, bool "$1 = $input;" -%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = $input;" - -%typemap(in) SWIGTYPE { - $1 = * ($1_type *) ($input->obj); +%typemap(in) short, int, long, char, float, double, bool "$1 = ($1_basetype) $input;" +%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = ($1_basetype*) $input;" +%typemap(in) SWIGTYPE "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE * "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE & "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE * [ANY] "$1 = ($1_basetype*) $input;" +%typemap(in) SWIGCLASSTYPE { + $1 = * ($1_type *) ($input.obj); } -%typemap(in) SWIGTYPE * { +%typemap(in) SWIGCLASSTYPE * { $1 = ($1_type) $input->obj; } -%typemap(in) SWIGTYPE & { +%typemap(in) SWIGCLASSTYPE * [ANY] { + $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); + int i; + for (i = 0; i < $1_dim0; ++i) + if ($input[i]) + $1[i] = ($1_basetype) $input[i]->obj; + else + $1[i] = ($1_basetype) 0; +} + +%typemap(in) SWIGCLASSTYPE & { $1 = ($*1_ltype *) $input->obj; } +// typemaps for return values + +%typemap(couttype) void, short, int, long, char, float, double "$1_type" +%typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" +%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" +%typemap(couttype) bool "_Bool" +%typemap(couttype) SWIGTYPE "struct Obj$1_type" +%typemap(couttype) SWIGTYPE * "struct Obj$*1_type *" + %typemap(out) short, int, long, char, float, double, bool "$result = $1;" %typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" %typemap(out) void "" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 14ddf5ba7..fab231622 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -57,6 +57,8 @@ public: SWIG_typemap_lang("c"); SWIG_config_file("c.swg"); + Swig_typemap_class_distinguish(true); + // look for certain command line options for (int i = 1; i < argc; i++) { if (argv[i]) { @@ -190,6 +192,7 @@ public: virtual int globalvariableHandler(Node *n) { SwigType *type = Getattr(n, "type"); String *type_str = SwigType_str(type, 0); + // FIXME //Printv(f_wrappers, "SWIGEXPORTC ", type_str, " ", Getattr(n, "name"), ";\n", NIL); if (shadow_flag) { Printv(f_shadow_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); @@ -254,7 +257,7 @@ public: Setattr(n, "wrap:parms", parms); // set the return type - if (Cmp(Getattr(n, "c:immutable"), "1") == 0) { + if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { Printv(return_type, SwigType_str(type, 0), NIL); } else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { @@ -277,7 +280,9 @@ public: is_void_return = (SwigType_type(Getattr(n, "type")) == T_VOID); // add variable for holding result of original function - if (!is_void_return && (Cmp(Getattr(n, "c:immutable"), "1") != 0)) { + if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { + if (SwigType_isconst(type)) + SwigType_del_qualifier(type); Wrapper_add_localv(wrapper, "cppresult", SwigType_str(type, 0), "cppresult", NIL); } @@ -301,7 +306,7 @@ public: Printf(arg_name, "c%s", lname); // set the appropriate type for parameter - if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { + if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { Printv(c_parm_type, SwigType_str(type, 0), NIL); } else if ((tm = Getattr(p, "tmap:ctype"))) { @@ -329,7 +334,7 @@ public: // apply typemaps for input parameter if ((tm = Getattr(p, "tmap:in"))) { - if (Cmp(Getattr(p, "c:immutable"), "1") == 0) { + if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { // FIXME: should work as typemaps for basic types Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); } @@ -359,7 +364,7 @@ public: Replaceall(action, "$cppresult", "cppresult"); // emit output typemap if needed - if (!is_void_return && (Cmp(Getattr(n, "c:immutable"), "1") != 0)) { + if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { Replaceall(tm, "$result", "result"); Printf(wrapper->code, "%s", tm); @@ -472,7 +477,7 @@ public: virtual int classHandler(Node* n) { String* name = Copy(Getattr(n, "name")); - String* sobj_name = NewString(""); + String* sobj = NewString(""); List* baselist = Getattr(n, "bases"); Replaceall(name, "::", "_"); @@ -496,21 +501,21 @@ public: } // emit "class"-struct definition - Printv(sobj_name, "struct ", name, "Obj", NIL); - Printv(f_header, sobj_name, " {\n void* obj;\n", NIL); - if (runtime_flag) { - Printf(f_header, " const char* typenames[%d];\n};\n\n", Len(baselist) + 2); - Printv(f_header, "const char* __typename_", name, " = \"", name, "\";\n\n", NIL); - } + Printv(sobj, "struct Obj", name, " {\n void* obj;\n", NIL); + if (runtime_flag) + Printf(sobj, " const char* typenames[%d];\n}", Len(baselist) + 2); else - Printf(f_header, "};\n\n"); + Printf(sobj, "};\n\n"); + + Printv(f_header, sobj, ";\n\n", NIL); + Printv(f_header, "const char* __typename_", name, " = \"", name, "\";\n\n", NIL); // declare it in the proxy header if (shadow_flag) { - Printv(f_shadow_header, "\ntypedef ", sobj_name, " {\n void* obj;\n} ", name, ";\n\n", NIL); + Printv(f_shadow_header, "typedef ", sobj, " ", name, ";\n\n", NIL); } - Delete(sobj_name); + Delete(sobj); Delete(name); return Language::classHandler(n); } @@ -572,14 +577,14 @@ public: Replaceall(newclassname, "::", "_"); // create first argument - Printv(sobj_name, "struct ", newclassname, "Obj", NIL); + Printv(sobj_name, "struct Obj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Parm* p = NewParm(ctype, "self"); stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); - Setattr(p, "c:immutable", "1"); + Setattr(p, "c:objstruct", "1"); if (parms) set_nextSibling(p, parms); Setattr(n, "parms", p); @@ -618,48 +623,100 @@ public: return SWIG_OK; } + /* -------------------------------------------------------------------- + * wrap_get_variable() + * --------------------------------------------------------------------- */ + + void wrap_get_variable(Node* n, String* classname, String* newclassname, String* name, String* code) { + // modify method name + String* new_name = NewString(""); + Printv(new_name, newclassname, "_get_", name, NIL); + Setattr(n, "sym:name", new_name); + + // generate action code + String* action = NewString(""); + ParmList* parms = Getattr(n, "parms"); + if (parms) + if (runtime_flag && Getattr(parms, "c:objstruct")) + emit_runtime_typecheck(newclassname, new_name, action); + if (!code) { + code = NewString(""); + Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); + } + Append(action, code); + + Setattr(n, "wrap:action", action); + + functionWrapper(n); + + Delete(code); // we are deallocating it, regardless of where it was created + Delete(action); + Delete(new_name); + } + + /* -------------------------------------------------------------------- + * wrap_set_variable() + * --------------------------------------------------------------------- */ + + void wrap_set_variable(Node* n, String* classname, String* newclassname, String* name, String* code) { + // modify method name + String* new_name = NewString(""); + Printv(new_name, newclassname, "_set_", name, NIL); + Setattr(n, "sym:name", new_name); + + // generate action code + String* action = NewString(""); + ParmList* parms = Getattr(n, "parms"); + if (parms) + if (runtime_flag && Getattr(parms, "c:objstruct")) + emit_runtime_typecheck(newclassname, new_name, action); + if (!code) { + code = NewString(""); + Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); + } + Append(action, code); + Setattr(n, "wrap:action", action); + + functionWrapper(n); + + Delete(code); // see wrap_get_variable() + Delete(action); + Delete(new_name); + } + /* --------------------------------------------------------------------- * staticmembervariableHandler() * --------------------------------------------------------------------- */ virtual int staticmembervariableHandler(Node* n) { String* name = Getattr(n, "sym:name"); + SwigType* type = Copy(Getattr(n, "type")); String* classname = Getattr(parentNode(n), "name"); String* newclassname = Copy(classname); String* new_name = NewString(""); String* code = NewString(""); Replaceall(newclassname, "::", "_"); - // modify the method name - Printv(new_name, newclassname, "_get_", name, NIL); - Setattr(n, "sym:name", new_name); - // create code for 'get' function Printv(code, "$cppresult = ", classname, "::", name, ";\n", NIL); - Setattr(n, "wrap:action", code); - - functionWrapper(n); + wrap_get_variable(n, classname, newclassname, name, code); // create parameter for 'set' function Parm* p = NewParm(Getattr(n, "type"), "value"); Setattr(p, "lname", "arg1"); Setattr(n, "parms", p); - - // modify the method name - new_name = NewString(""); - Printv(new_name, newclassname, "_set_", name, NIL); - Setattr(n, "sym:name", new_name); - - // create code for 'set' function - code = NewString(""); - Printv(code, classname, "::", name, " = arg1;\n", NIL); - Setattr(n, "wrap:action", code); + + if (!SwigType_isconst(type)) { + // create code for 'set' function + code = NewString(""); + Printv(code, classname, "::", name, " = arg1;\n", NIL); + wrap_set_variable(n, classname, newclassname, name, code); + } Setattr(n, "type", "void"); - functionWrapper(n); - Delete(code); Delete(new_name); + Delete(type); return SWIG_OK; } @@ -669,71 +726,48 @@ public: virtual int membervariableHandler(Node* n) { String* name = Getattr(n, "sym:name"); + SwigType* type = Copy(Getattr(n, "type")); String* classname = Getattr(parentNode(n), "name"); String* newclassname = Copy(classname); String* sobj_name = NewString(""); String* ctype = NewString(""); - String* stype = NewString(""); + String* stype; String* new_name = NewString(""); - String* code = NewString(""); Replaceall(newclassname, "::", "_"); // create first argument - Printv(sobj_name, "struct ", newclassname, "Obj", NIL); + Printv(sobj_name, "struct Obj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Parm* p = NewParm(ctype, "self"); stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); - Setattr(p, "c:immutable", "1"); + Setattr(p, "c:objstruct", "1"); Setattr(p, "lname", "arg1"); // create second argument Parm* t = NewParm(Getattr(n, "type"), "value"); Setattr(t, "lname", "arg2"); - /* create 'get' function */ - + // create 'get' function Setattr(n, "parms", p); + wrap_get_variable(n, classname, newclassname, name, 0); - // modify method name - Printv(new_name, newclassname, "_get_", name, NIL); - Setattr(n, "sym:name", new_name); + if (!SwigType_isconst(type)) { + // create 'set' function + set_nextSibling(p, t); + Setattr(n, "parms", p); + Setattr(n, "type", "void"); + wrap_set_variable(n, classname, newclassname, name, 0); + } - // generate action code - if (runtime_flag) - emit_runtime_typecheck(newclassname, new_name, code); - Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); - Setattr(n, "wrap:action", code); - - functionWrapper(n); - - /* create 'set' function */ - - set_nextSibling(p, t); - Setattr(n, "parms", p); - Setattr(n, "type", "void"); - - // modify method name - new_name = NewString(""); - Printv(new_name, newclassname, "_set_", name, NIL); - Setattr(n, "sym:name", new_name); - - // generate action code - code = NewString(""); - if (runtime_flag) - emit_runtime_typecheck(newclassname, new_name, code); - Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); - Setattr(n, "wrap:action", code); - - functionWrapper(n); - - Delete(code); Delete(new_name); + Delete(stype); Delete(ctype); Delete(sobj_name); Delete(newclassname); + Delete(type); return SWIG_OK; } @@ -777,11 +811,11 @@ public: Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // set the function return type to the pointer to struct - Printv(sobj_name, "struct ", newclassname, "Obj", NIL); + Printv(sobj_name, "struct Obj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); - Setattr(n, "c:immutable", "1"); + Setattr(n, "c:objstruct", "1"); stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(n, "c:stype", stype); @@ -828,11 +862,11 @@ public: Setattr(parms, "lname", "arg1"); // set the function return type to the pointer to struct - Printv(sobj_name, "struct ", newclassname, "Obj", NIL); + Printv(sobj_name, "struct Obj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); - Setattr(n, "c:immutable", "1"); + Setattr(n, "c:objstruct", "1"); stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(n, "c:stype", stype); @@ -878,7 +912,7 @@ public: Replaceall(newclassname, "~", ""); // create first argument - Printv(sobj_name, "struct ", newclassname, "Obj", NIL); + Printv(sobj_name, "struct Obj", newclassname, " ", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); p = NewParm(ctype, "self"); @@ -886,7 +920,7 @@ public: stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); - Setattr(p, "c:immutable", "1"); + Setattr(p, "c:objstruct", "1"); Setattr(n, "parms", p); Setattr(n, "type", "void"); diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index 5ffd28eec..bd006d07c 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -270,6 +270,20 @@ int SwigType_issimple(SwigType *t) { return 1; } +int SwigType_isbuiltin(SwigType *t) { + const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", 0 }; + int i = 0; + char *c = Char(t); + if (!t) + return 0; + while (builtins[i]) { + if (strcmp(c, builtins[i]) == 0) + return 1; + i++; + } + return 0; +} + /* ----------------------------------------------------------------------------- * SwigType_default() * diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 451de86c4..4e9cb7b97 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -151,6 +151,7 @@ extern "C" { extern int SwigType_isvarargs(const SwigType *t); extern int SwigType_istemplate(const SwigType *t); extern int SwigType_isenum(SwigType *t); + extern int SwigType_isbuiltin(SwigType *t); extern int SwigType_check_decl(SwigType *t, const String_or_char *decl); extern SwigType *SwigType_strip_qualifiers(SwigType *t); extern SwigType *SwigType_functionpointer_decompose(SwigType *t); @@ -376,6 +377,7 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern Hash *Swig_typemap_pop_scope(void); extern void Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f); + extern void Swig_typemap_class_distinguish(int b); /* --- Code fragment support --- */ diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 6cbeb67ea..e372a7eb2 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -47,6 +47,7 @@ static void replace_embedded_typemap(String *s); static Hash *typemaps[MAX_SCOPE]; static int tm_scope = 0; +static int class_distinguish = 0; static Hash *get_typemap(int tm_scope, SwigType *type) { Hash *tm = 0; @@ -60,7 +61,6 @@ static Hash *get_typemap(int tm_scope, SwigType *type) { } tm = Getattr(typemaps[tm_scope], type); - if (dtype) { if (!tm) { String *t_name = SwigType_templateprefix(type); @@ -583,6 +583,10 @@ static SwigType *strip_arrays(SwigType *type) { return t; } +void Swig_typemap_class_distinguish(int b) { + class_distinguish = b; +} + /* ----------------------------------------------------------------------------- * Swig_typemap_search() * @@ -601,6 +605,21 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String const String *cname = 0; SwigType *unstripped = 0; String *tmop = tmop_name(op); + SwigType *base = 0; + int isbuiltin = 0; + + /* + * HACK: + * try to distinguish between built-in types (int, char, etc.) and defined classes + * this allows C module to use different typemaps for classes + */ + + if (class_distinguish) { + base = SwigType_base(type); + isbuiltin = SwigType_isbuiltin(base); + if (!isbuiltin) + Replaceall(type, base, "SWIGCLASSTYPE"); + } if ((name) && Len(name)) cname = name; @@ -686,7 +705,16 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String /* Hmmm. Well, no match seems to be found at all. See if there is some kind of default mapping */ primitive = SwigType_default(type); + while (primitive) { + + if (class_distinguish) { + if (!isbuiltin) { + Replaceall(primitive, "SWIGTYPE", "SWIGCLASSTYPE"); + /*Printf(stdout, "Swig_typemap_search: new type is %s\n", primitive);*/ + } + } + tm = get_typemap(ts, primitive); if (tm && cname) { tm1 = Getattr(tm, cname); @@ -702,6 +730,8 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String goto ret_result; } { + if (class_distinguish) + Replaceall(primitive, "SWIGCLASSTYPE", "SWIGTYPE"); SwigType *nprim = SwigType_default(primitive); Delete(primitive); primitive = nprim; @@ -716,6 +746,10 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String result = backup; ret_result: + if (class_distinguish) { + Replaceall(type, "SWIGCLASSTYPE", base); + Replaceall(primitive, "SWIGCLASSTYPE", base); + } if (noarrays) Delete(noarrays); if (primitive) @@ -727,6 +761,7 @@ ret_result: } if (type != ctype) Delete(ctype); + return result; } From f585c69d0292edb70a40a447dacd02bea28e554a Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sun, 6 Jul 2008 18:33:09 +0000 Subject: [PATCH 019/508] Some support for overloading, simplified wrapping of pure C functions, some improvements in argument passing typemaps. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10653 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/arguments/example.h | 22 +- Examples/c/arguments/test.c | 13 +- Lib/c/c.swg | 10 +- Source/Modules/c.cxx | 484 +++++++++++++++++++++------------ 4 files changed, 346 insertions(+), 183 deletions(-) diff --git a/Examples/c/arguments/example.h b/Examples/c/arguments/example.h index 45ecee45b..c2ddde9db 100644 --- a/Examples/c/arguments/example.h +++ b/Examples/c/arguments/example.h @@ -4,6 +4,13 @@ class A { public: int i; A(int i) : i(i) {} + void foo() { + } +}; + +class B : public A { +public: + B(int i) : A(i) {} }; class MyClass { @@ -18,7 +25,7 @@ public: } } - void bar(int x, int* px, int* xs[5]) { + void bar(int x, int* px, int** xs) { printf("x = %d\n", x); printf("*px = %d\n", *px); int i = 0; @@ -28,5 +35,18 @@ public: } } + void foo_1(A& a, A& b) { + printf("a.i = %d\n", a.i); + printf("b.i = %d\n", b.i); + a.i++; + b.i++; + } + + void foo_2(int& x, double& d) { + printf("x = %d d = %f\n", x, d); + x++; + d++; + } + }; diff --git a/Examples/c/arguments/test.c b/Examples/c/arguments/test.c index c2b7c2461..05b6d1632 100644 --- a/Examples/c/arguments/test.c +++ b/Examples/c/arguments/test.c @@ -3,10 +3,10 @@ #include "example_proxy.h" int main(int argc, char** argv) { - MyClass* mc = new_MyClass(); A* a = new_A(123), *b = new_A(234), *as[5]; int i, j = 321, *js[5]; + double d = 55.0; for (i = 0; i < 4; ++i) { as[i] = new_A(20 + i); @@ -18,9 +18,18 @@ int main(int argc, char** argv) { js[i] = 0; MyClass_bar(mc, j, &j, js); - MyClass_foo(mc, *a, b, as); + MyClass_foo(mc, a, b, as); + MyClass_foo_1(mc, a, b); + MyClass_foo_1(mc, a, b); + + MyClass_foo_2(mc, &j, &d); + MyClass_foo_2(mc, &j, &d); delete_A(a); + delete_A(b); delete_MyClass(mc); + + for (i = 0; i < 4; ++i) + delete_A(as[i]); } diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 5b51f4bb1..0ec5f603d 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -12,25 +12,27 @@ %typemap(ctype) void, short, int, long, char, float, double "$1_type" %typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" +%typemap(ctype) short&, int&, long&, char&, float&, double& "$1_basetype *" %typemap(ctype) const short, const int, const long, const char, const float, const double "$1_basetype" %typemap(ctype) bool "_Bool" %typemap(ctype) SWIGTYPE "$1_type" %typemap(ctype) SWIGTYPE * "$1_type" %typemap(ctype) SWIGTYPE & "$1_type" %typemap(ctype) SWIGTYPE * [ANY] "$1_basetype*" -%typemap(ctype) SWIGCLASSTYPE "struct Obj$1_type" +%typemap(ctype) SWIGCLASSTYPE "struct Obj$1_type *" %typemap(ctype) SWIGCLASSTYPE * "struct Obj$1_type" -%typemap(ctype) SWIGCLASSTYPE & "struct Obj$1_type" +%typemap(ctype) SWIGCLASSTYPE & "struct Obj$*1_ltype *" %typemap(ctype) SWIGCLASSTYPE * [ANY] "struct Obj$1_basetype*" %typemap(in) short, int, long, char, float, double, bool "$1 = ($1_basetype) $input;" -%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = ($1_basetype*) $input;" +%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = ($1_basetype *) $input;" +%typemap(in) short&, int&, long&, char&, float&, double&, bool& "$1 = ($1_basetype *) $input;" %typemap(in) SWIGTYPE "$1 = ($1_type) $input;" %typemap(in) SWIGTYPE * "$1 = ($1_type) $input;" %typemap(in) SWIGTYPE & "$1 = ($1_type) $input;" %typemap(in) SWIGTYPE * [ANY] "$1 = ($1_basetype*) $input;" %typemap(in) SWIGCLASSTYPE { - $1 = * ($1_type *) ($input.obj); + $1 = * ($1_type *) ($input->obj); } %typemap(in) SWIGCLASSTYPE * { diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index fab231622..ee53b5036 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -73,6 +73,11 @@ public: } } } + + if (!CPlusPlus) + runtime_flag = false; + + allow_overloading(); } /* --------------------------------------------------------------------- @@ -114,7 +119,6 @@ public: Printf(f_header, "}\n\n"); } - // generate shadow files if enabled if (shadow_flag) { f_shadow_code_init = NewString(""); @@ -192,8 +196,8 @@ public: virtual int globalvariableHandler(Node *n) { SwigType *type = Getattr(n, "type"); String *type_str = SwigType_str(type, 0); - // FIXME - //Printv(f_wrappers, "SWIGEXPORTC ", type_str, " ", Getattr(n, "name"), ";\n", NIL); + //if (!CPlusPlus) + // Printv(f_wrappers, "SWIGEXPORTC ", type_str, " ", Getattr(n, "name"), ";\n", NIL); if (shadow_flag) { Printv(f_shadow_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); } @@ -230,6 +234,54 @@ public: return SWIG_OK; } + /* ---------------------------------------------------------------------- + * prepend_feature() + * ---------------------------------------------------------------------- */ + + String* prepend_feature(Node *n) { + String *prepend_str = Getattr(n, "feature:prepend"); + if (prepend_str) { + char *t = Char(prepend_str); + if (*t == '{') { + Delitem(prepend_str, 0); + Delitem(prepend_str, DOH_END); + } + } + return (prepend_str ? prepend_str : empty_string); + } + + /* ---------------------------------------------------------------------- + * append_feature() + * ---------------------------------------------------------------------- */ + + String* append_feature(Node *n) { + String *append_str = Getattr(n, "feature:append"); + if (append_str) { + char *t = Char(append_str); + if (*t == '{') { + Delitem(append_str, 0); + Delitem(append_str, DOH_END); + } + } + return (append_str ? append_str : empty_string); + } + + /* ---------------------------------------------------------------------- + * getTypeSymbol() + * + * incomplete for now... + * ---------------------------------------------------------------------- */ + + const char* getTypeSymbol(String* type) { + char* c = Char(type); + if (strcmp(c, "int") == 0) + return "i"; + if (strcmp(c, "double") == 0) + return "d"; + + return "UNKNOWN"; + } + /* ---------------------------------------------------------------------- * functionWrapper() * ---------------------------------------------------------------------- */ @@ -238,153 +290,199 @@ public: String *name = Getattr(n, "sym:name"); SwigType *type = Getattr(n, "type"); SwigType *return_type = NewString(""); + String *wname; String *arg_names = NewString(""); ParmList *parms = Getattr(n, "parms"); Parm *p; - String* tm; - String* proto = NewString(""); - bool is_void_return; + String *tm; + String *proto = NewString(""); + String *over_suffix = NewString(""); + int gencomma; + bool is_void_return = (SwigType_type(Getattr(n, "type")) == T_VOID); // create new function wrapper object Wrapper *wrapper = NewWrapper(); - // create new wrapper name - String *wname = Swig_name_wrapper(name); - Setattr(n, "wrap:name", wname); + if (!CPlusPlus) { + // this is C function, we don't apply typemaps to it + + // create new wrapper name + wname = Swig_name_wrapper(name); + Setattr(n, "wrap:name", wname); - // attach the standard typemaps - emit_attach_parmmaps(parms, wrapper); - Setattr(n, "wrap:parms", parms); + // create function call + arg_names = Swig_cfunction_call(empty_string, parms); + if (arg_names) { + Delitem(arg_names, 0); + Delitem(arg_names, DOH_END); + } + return_type = SwigType_str(Getattr(n, "type"), 0); - // set the return type - if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { - Printv(return_type, SwigType_str(type, 0), NIL); + // emit wrapper prototype and code + gencomma = 0; + for (p = parms; p; p = nextSibling(p)) { + Printv(proto, gencomma ? ", " : "", SwigType_str(Getattr(p, "type"), 0), " ", Getattr(p, "lname"), NIL); + gencomma = 1; + } + Printv(wrapper->def, return_type, " ", wname, "(", proto, ") {\n", NIL); + Append(wrapper->code, prepend_feature(n)); + if (!is_void_return) { + Printv(wrapper->code, return_type, " result;\n", NIL); + Printf(wrapper->code, "result = "); + } + Printv(wrapper->code, name, "(", arg_names, ");\n", NIL); + Append(wrapper->code, append_feature(n)); + if (!is_void_return) + Printf(wrapper->code, "return result;\n"); + Printf(wrapper->code, "}"); } - else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { - String *ctypeout = Getattr(n, "tmap:ctype:out"); // the type in the ctype typemap's out attribute overrides the type in the typemap - if (ctypeout) - tm = ctypeout; - Printf(return_type, "%s", tm); - } else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); - } - - // attach 'ctype' typemaps - Swig_typemap_attach_parms("ctype", parms, wrapper); - - // emit variables for holding parameters - emit_parameter_variables(parms, wrapper); - - // is the function void? - is_void_return = (SwigType_type(Getattr(n, "type")) == T_VOID); - - // add variable for holding result of original function - if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - if (SwigType_isconst(type)) - SwigType_del_qualifier(type); - Wrapper_add_localv(wrapper, "cppresult", SwigType_str(type, 0), "cppresult", NIL); - } - - // create wrapper function prototype - Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); - - // prepare function definition - int gencomma = 0; - for (p = parms; p; ) { - - while (checkAttribute(p, "tmap:in:numinputs", "0")) { - p = Getattr(p, "tmap:in:next"); + // mangle name if functions is overloaded + if (Getattr(n, "sym:overloaded")) { + if (!Getattr(n, "copy_constructor")) { + if (parms) + Append(over_suffix, "_"); + for (p = parms; p; p = nextSibling(p)) { + Append(over_suffix, getTypeSymbol(Getattr(p, "type"))); + } + Append(name, over_suffix); + } } - SwigType* type = Getattr(p, "type"); - String* lname = Getattr(p, "lname"); - String* c_parm_type = NewString(""); - String* shadow_parm_type = NewString(""); - String* arg_name = NewString(""); + // create new wrapper name + wname = Swig_name_wrapper(name); + Setattr(n, "wrap:name", wname); + + // attach the standard typemaps + emit_attach_parmmaps(parms, wrapper); + Setattr(n, "wrap:parms", parms); - Printf(arg_name, "c%s", lname); - - // set the appropriate type for parameter - if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { - Printv(c_parm_type, SwigType_str(type, 0), NIL); - } - else if ((tm = Getattr(p, "tmap:ctype"))) { - Printv(c_parm_type, tm, NIL); + // set the return type + if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { + Printv(return_type, SwigType_str(type, 0), NIL); } + else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { + String *ctypeout = Getattr(n, "tmap:ctype:out"); // the type in the ctype typemap's out attribute overrides the type in the typemap + if (ctypeout) + tm = ctypeout; + Printf(return_type, "%s", tm); + } else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); } - // use shadow-type for parameter if supplied - String* stype = Getattr(p, "c:stype"); - if (stype) { - Printv(shadow_parm_type, SwigType_str(stype, 0), NIL); - } - else { - Printv(shadow_parm_type, c_parm_type, NIL); + // attach 'ctype' typemaps + Swig_typemap_attach_parms("ctype", parms, wrapper); + + // emit variables for holding parameters + emit_parameter_variables(parms, wrapper); + + // add variable for holding result of original function + if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { + if (SwigType_isconst(type)) + SwigType_del_qualifier(type); + Wrapper_add_localv(wrapper, "cppresult", SwigType_str(type, 0), "cppresult", NIL); } - Replaceall(c_parm_type, "::", "_"); + // create wrapper function prototype + Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); - Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); - Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); - Printv(proto, gencomma ? ", " : "", shadow_parm_type, " ", Getattr(p, "name"), NIL); - gencomma = 1; - - // apply typemaps for input parameter - if ((tm = Getattr(p, "tmap:in"))) { + // prepare function definition + gencomma = 0; + for (p = parms; p; ) { + + while (checkAttribute(p, "tmap:in:numinputs", "0")) { + p = Getattr(p, "tmap:in:next"); + } + + SwigType* type = Getattr(p, "type"); + String* lname = Getattr(p, "lname"); + String* c_parm_type = NewString(""); + String* shadow_parm_type = NewString(""); + String* arg_name = NewString(""); + + Printf(arg_name, "c%s", lname); + + // set the appropriate type for parameter if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { - // FIXME: should work as typemaps for basic types - Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); + Printv(c_parm_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Getattr(p, "tmap:ctype"))) { + Printv(c_parm_type, tm, NIL); } else { - Replaceall(tm, "$input", arg_name); - Setattr(p, "emit:input", arg_name); - Printf(wrapper->code, "%s\n", tm); + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + } + + // use shadow-type for parameter if supplied + String* stype = Getattr(p, "c:stype"); + if (stype) { + Printv(shadow_parm_type, SwigType_str(stype, 0), NIL); + } + else { + Printv(shadow_parm_type, c_parm_type, NIL); + } + + Replaceall(c_parm_type, "::", "_"); + + Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); + Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); + Printv(proto, gencomma ? ", " : "", shadow_parm_type, " ", Getattr(p, "name"), NIL); + gencomma = 1; + + // apply typemaps for input parameter + if ((tm = Getattr(p, "tmap:in"))) { + if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { + // FIXME: should work as typemaps for basic types + Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); + } + else { + Replaceall(tm, "$input", arg_name); + Setattr(p, "emit:input", arg_name); + Printf(wrapper->code, "%s\n", tm); + } + p = Getattr(p, "tmap:in:next"); + } + else { + Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); + p = nextSibling(p); + } + Delete(arg_name); + Delete(shadow_parm_type); + Delete(c_parm_type); + } + + Printf(wrapper->def, ") {"); + + // emit variable for holding function return value + emit_return_variable(n, return_type, wrapper); + + // emit action code + String *action = emit_action(n); + Replaceall(action, "$cppresult", "cppresult"); + + // emit output typemap if needed + if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { + if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { + Replaceall(tm, "$result", "result"); + Printf(wrapper->code, "%s", tm); + if (Len(tm)) + Printf(wrapper->code, "\n"); + } + else { + Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name")); } - p = Getattr(p, "tmap:in:next"); } else { - Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); - p = nextSibling(p); + Append(wrapper->code, action); } - Delete(arg_name); - Delete(shadow_parm_type); - Delete(c_parm_type); + + if (!is_void_return) + Append(wrapper->code, "return result;\n"); + + Append(wrapper->code, "}\n"); } - Printf(wrapper->def, ") {"); - - // emit variable for holding function return value - emit_return_variable(n, return_type, wrapper); - - // emit action code - String *action = emit_action(n); - Replaceall(action, "$cppresult", "cppresult"); - - // emit output typemap if needed - if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { - Replaceall(tm, "$result", "result"); - Printf(wrapper->code, "%s", tm); - if (Len(tm)) - Printf(wrapper->code, "\n"); - } - else { - Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name")); - } - } - else { - Append(wrapper->code, action); - } - - if (!is_void_return) - Append(wrapper->code, "return result;\n"); - - Append(wrapper->code, "}\n"); - Wrapper_print(wrapper, f_wrappers); - // take care of shadow function if (shadow_flag) { // use shadow-type for return type if supplied @@ -397,38 +495,17 @@ public: Printv(f_shadow_code_init, "extern ", return_type, " ", wname, "(", proto, ");\n", NIL); Printv(f_shadow_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); - // handle 'prepend' feature - String *prepend_str = Getattr(n, "feature:prepend"); - if (prepend_str) { - char *t = Char(prepend_str); - if (*t == '{') { - Delitem(prepend_str, 0); - Delitem(prepend_str, DOH_END); - } - Printv(f_shadow_code_body, prepend_str, "\n", NIL); - } - // call to the wrapper function - Printv(f_shadow_code_body, " return ", wname, "(", arg_names, ");\n", NIL); - - // handle 'append' feature - String *append_str = Getattr(n, "feature:append"); - if (append_str) { - char *t = Char(append_str); - if (*t == '{') { - Delitem(append_str, 0); - Delitem(append_str, DOH_END); - } - Printv(f_shadow_code_body, append_str, "\n", NIL); - } - - Printv(f_shadow_code_body, "}\n", NIL); + Printv(f_shadow_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); // add function declaration to the proxy header file Printv(f_shadow_header, return_type, " ", name, "(", proto, ");\n"); } + Wrapper_print(wrapper, f_wrappers); + // cleanup + Delete(over_suffix); Delete(proto); Delete(arg_names); Delete(wname); @@ -471,6 +548,21 @@ public: return new_node; } + /* --------------------------------------------------------------------- + * copy_node() + * + * tests if given name already exists in one of child nodes of n + * --------------------------------------------------------------------- */ + + bool is_in(String* name, Node* n) { + Hash* h; + for (h = firstChild(n); h; h = nextSibling(h)) { + if (Cmp(name, Getattr(h, "name")) == 0) + return true; + } + return false; + } + /* --------------------------------------------------------------------- * classHandler() * --------------------------------------------------------------------- */ @@ -481,43 +573,76 @@ public: List* baselist = Getattr(n, "bases"); Replaceall(name, "::", "_"); - // inheritance support: attach all members from base classes to this class - if (baselist) { - Iterator i; - for (i = First(baselist); i.item; i = Next(i)) { - // look for member variables (TODO: support for other constructs) - Node* node; - for (node = firstChild(i.item); node; node = nextSibling(node)) { - if ((Cmp(Getattr(node, "kind"), "variable") == 0) - && (Cmp(Getattr(node, "access"), "private") != 0) - && (Cmp(Getattr(node, "storage"), "static") != 0)) { - Node* new_node = copy_node(node); - Setattr(new_node, "sym:name", Getattr(new_node, "name")); - set_nodeType(new_node, "cdecl"); - appendChild(n, new_node); + if (CPlusPlus) { + // inheritance support: attach all members from base classes to this class + if (baselist) { + Iterator i; + for (i = First(baselist); i.item; i = Next(i)) { + // look for member variables and functions + Node* node; + for (node = firstChild(i.item); node; node = nextSibling(node)) { + if ((Cmp(Getattr(node, "kind"), "variable") == 0) + || (Cmp(Getattr(node, "kind"), "function") == 0)) { + if ((Cmp(Getattr(node, "access"), "public") == 0) + && (Cmp(Getattr(node, "storage"), "static") != 0)) { + if (!is_in(Getattr(node, "name"), n)) { + Node* new_node = copy_node(node); + Setattr(new_node, "sym:name", Getattr(new_node, "name")); + set_nodeType(new_node, "cdecl"); + // make sure there are no copyied object-structs params + ParmList* all_parms = Getattr(new_node, "parms"), * parms; + if (Getattr(all_parms, "c:objstruct")) { + parms = Copy(nextSibling(all_parms)); + Delete(all_parms); + Setattr(new_node, "parms", parms); + } + appendChild(n, new_node); + } + } + } } } } + + // emit "class"-struct definition + Printv(sobj, "struct Obj", name, " {\n void* obj;\n", NIL); + if (runtime_flag) + Printf(sobj, " const char* typenames[%d];\n}", Len(baselist) + 2); + else + Printf(sobj, "};\n\n"); + + Printv(f_header, sobj, ";\n\n", NIL); + Printv(f_header, "const char* __typename_", name, " = \"", name, "\";\n\n", NIL); + + // declare it in the proxy header + if (shadow_flag) + Printv(f_shadow_header, "typedef ", sobj, " ", name, ";\n\n", NIL); + + Delete(sobj); + Delete(name); + return Language::classHandler(n); } + else if (Cmp(Getattr(n, "kind"), "struct") == 0) { + // this is C struct, just declare it in proxy + if (shadow_flag) { + Printv(f_shadow_header, "struct ", name, " {\n", NIL); + Node* node; + for (node = firstChild(n); node; node = nextSibling(node)) { + String* kind = Getattr(node, "kind"); + if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) { + String* type = NewString(""); + Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL); + Printv(f_shadow_header, " ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL); + Delete(type); + } + } + Append(f_shadow_header, "};\n\n"); + } - // emit "class"-struct definition - Printv(sobj, "struct Obj", name, " {\n void* obj;\n", NIL); - if (runtime_flag) - Printf(sobj, " const char* typenames[%d];\n}", Len(baselist) + 2); - else - Printf(sobj, "};\n\n"); - - Printv(f_header, sobj, ";\n\n", NIL); - Printv(f_header, "const char* __typename_", name, " = \"", name, "\";\n\n", NIL); - - // declare it in the proxy header - if (shadow_flag) { - Printv(f_shadow_header, "typedef ", sobj, " ", name, ";\n\n", NIL); + Delete(sobj); + Delete(name); } - - Delete(sobj); - Delete(name); - return Language::classHandler(n); + return SWIG_OK; } /* --------------------------------------------------------------------- @@ -594,7 +719,9 @@ public: Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // omit first argument in method call - String* arg_call_lnames = Strstr(arg_lnames, "arg2"); + String* arg_call_lnames = Strstr(arg_lnames, "*arg2"); + if (!arg_call_lnames) + arg_call_lnames = Strstr(arg_lnames, "arg2"); if (!arg_call_lnames) arg_call_lnames = empty_string; else @@ -795,6 +922,9 @@ public: * --------------------------------------------------------------------- */ virtual int constructorHandler(Node* n) { + if (Getattr(n, "copy_constructor")) + return copyconstructorHandler(n); + String* classname = Getattr(parentNode(n), "name"); String* newclassname = Copy(classname); String* sobj_name = NewString(""); @@ -822,6 +952,7 @@ public: // modify the constructor name Printv(constr_name, "new_", newclassname, NIL); + Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); // generate action code @@ -873,6 +1004,7 @@ public: // modify the constructor name Printv(constr_name, "copy_", newclassname, NIL); + Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); // generate action code From a13c5976b549fa841c1ee39937a58b9837a2b317 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 9 Jul 2008 20:02:20 +0000 Subject: [PATCH 020/508] Fixed naming convention issues (internal Swig variables, shadow -> proxy, test.c -> runme.c, etc.), modified Makefiles, bugfixes ("name" -> "sym:name"). Started C test-suite. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10655 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 6 +- Examples/c/arguments/Makefile | 34 +- Examples/c/arguments/example.cxx | 4 +- Examples/c/arguments/example.h | 104 +++---- Examples/c/arguments/example.i | 16 +- Examples/c/arguments/runme.c | 36 +++ Examples/c/check.list | 4 + Examples/c/class/Makefile | 34 +- Examples/c/class/example.cxx | 56 ++-- Examples/c/class/example.h | 78 ++--- Examples/c/class/example.i | 20 +- Examples/c/class/runme.c | 43 +++ Examples/c/reference/Makefile | 34 +- Examples/c/reference/example.cxx | 38 +-- Examples/c/reference/example.h | 32 +- Examples/c/reference/example.i | 16 +- Examples/c/reference/runme.c | 21 ++ Examples/c/return/Makefile | 34 +- Examples/c/return/example.cxx | 20 +- Examples/c/return/example.h | 32 +- Examples/c/return/example.i | 16 +- Examples/c/return/runme.c | 11 + Examples/c/simple/Makefile | 34 +- Examples/c/simple/example.c | 48 +-- Examples/c/simple/example.i | 24 +- Examples/c/simple/runme.c | 15 + Examples/test-suite/c/Makefile.in | 62 ++++ Examples/test-suite/c/c_arguments_runme.c | 17 + Examples/test-suite/c_arguments.i | 20 ++ Lib/c/c.swg | 165 +++++----- Lib/c/clabels.swg | 64 ++-- Lib/c/cproxy.swg | 38 +-- Makefile.in | 23 +- Source/Modules/c.cxx | 358 +++++++++++----------- configure.in | 7 + 35 files changed, 925 insertions(+), 639 deletions(-) create mode 100644 Examples/c/arguments/runme.c create mode 100644 Examples/c/check.list create mode 100644 Examples/c/class/runme.c create mode 100644 Examples/c/reference/runme.c create mode 100644 Examples/c/return/runme.c create mode 100644 Examples/c/simple/runme.c create mode 100644 Examples/test-suite/c/Makefile.in create mode 100644 Examples/test-suite/c/c_arguments_runme.c create mode 100644 Examples/test-suite/c_arguments.i diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 8b9928306..24e022b20 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1103,10 +1103,12 @@ c: $(SRCS) $(SWIG) -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) - $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(TARGET) c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) - $(CC) $(MAIN) $(TARGET)_proxy.c -L. -l$(TARGET) + +c_compile: $(RUNME) $(PROXY) + $(CC) $(RUNME) $(PROXY) -L. -l$(TARGET) -o $(RUNME:.c=) + diff --git a/Examples/c/arguments/Makefile b/Examples/c/arguments/Makefile index f04179d46..7d9c1a9f7 100644 --- a/Examples/c/arguments/Makefile +++ b/Examples/c/arguments/Makefile @@ -1,14 +1,20 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -MAIN = test.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp + +run: + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + env LD_LIBRARY_PATH=. ./runme + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/arguments/example.cxx b/Examples/c/arguments/example.cxx index e64adbdba..8f7539719 100644 --- a/Examples/c/arguments/example.cxx +++ b/Examples/c/arguments/example.cxx @@ -1,2 +1,2 @@ -#include "example.h" - +#include "example.h" + diff --git a/Examples/c/arguments/example.h b/Examples/c/arguments/example.h index c2ddde9db..dfd8465b9 100644 --- a/Examples/c/arguments/example.h +++ b/Examples/c/arguments/example.h @@ -1,52 +1,52 @@ -#include - -class A { -public: - int i; - A(int i) : i(i) {} - void foo() { - } -}; - -class B : public A { -public: - B(int i) : A(i) {} -}; - -class MyClass { -public: - void foo(A a, A* aa, A* aaa[5]) { - printf("a.i = %d\n", a.i); - printf("aa->i = %d\n", aa->i); - int i = 0; - while (aaa[i]) { - printf("aaa[%d]->i = %d\n", i, aaa[i]->i); - i++; - } - } - - void bar(int x, int* px, int** xs) { - printf("x = %d\n", x); - printf("*px = %d\n", *px); - int i = 0; - while (xs[i]) { - printf("*xs[%d] = %d\n", i, *xs[i]); - i++; - } - } - - void foo_1(A& a, A& b) { - printf("a.i = %d\n", a.i); - printf("b.i = %d\n", b.i); - a.i++; - b.i++; - } - - void foo_2(int& x, double& d) { - printf("x = %d d = %f\n", x, d); - x++; - d++; - } - -}; - +#include + +class A { +public: + int i; + A(int i) : i(i) {} + void foo() { + } +}; + +class B : public A { +public: + B(int i) : A(i) {} +}; + +class MyClass { +public: + void foo(A a, A* aa, A* aaa[5]) { + printf("a.i = %d\n", a.i); + printf("aa->i = %d\n", aa->i); + int i = 0; + while (aaa[i]) { + printf("aaa[%d]->i = %d\n", i, aaa[i]->i); + i++; + } + } + + void bar(int x, int* px, int** xs) { + printf("x = %d\n", x); + printf("*px = %d\n", *px); + int i = 0; + while (xs[i]) { + printf("*xs[%d] = %d\n", i, *xs[i]); + i++; + } + } + + void foo_1(A& a, A& b) { + printf("a.i = %d\n", a.i); + printf("b.i = %d\n", b.i); + a.i++; + b.i++; + } + + void foo_2(int& x, double& d) { + printf("x = %d d = %f\n", x, d); + x++; + d++; + } + +}; + diff --git a/Examples/c/arguments/example.i b/Examples/c/arguments/example.i index aed792dce..e4bd75238 100644 --- a/Examples/c/arguments/example.i +++ b/Examples/c/arguments/example.i @@ -1,8 +1,8 @@ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" - +%module example + +%{ +#include "example.h" +%} + +%include "example.h" + diff --git a/Examples/c/arguments/runme.c b/Examples/c/arguments/runme.c new file mode 100644 index 000000000..bceaad4b6 --- /dev/null +++ b/Examples/c/arguments/runme.c @@ -0,0 +1,36 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char** argv) { + MyClass* mc = new_MyClass(); + A* a = new_A(123), *b = new_A(234), *as[5]; + int i, j = 321, *js[5]; + double d = 55.0; + + for (i = 0; i < 4; ++i) { + as[i] = new_A(20 + i); + js[i] = (int*) malloc(sizeof(int)); + *js[i] = 10 + i; + } + + as[i] = 0; + js[i] = 0; + + MyClass_bar(mc, j, &j, js); + MyClass_foo(mc, a, b, as); + MyClass_foo_1(mc, a, b); + MyClass_foo_1(mc, a, b); + + MyClass_foo_2(mc, &j, &d); + MyClass_foo_2(mc, &j, &d); + + delete_A(a); + delete_A(b); + delete_MyClass(mc); + for (i = 0; i < 4; ++i) + delete_A(as[i]); + + return 0; +} + diff --git a/Examples/c/check.list b/Examples/c/check.list new file mode 100644 index 000000000..b49c7a984 --- /dev/null +++ b/Examples/c/check.list @@ -0,0 +1,4 @@ +# see top-level Makefile.in +class +reference +simple diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 387238386..7fcbff095 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -1,14 +1,20 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -MAIN = test.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp + +run: + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + env LD_LIBRARY_PATH=. ./runme + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/class/example.cxx b/Examples/c/class/example.cxx index 016d030bc..1e8e203dd 100644 --- a/Examples/c/class/example.cxx +++ b/Examples/c/class/example.cxx @@ -1,28 +1,28 @@ -/* File : example.c */ - -#include "example.h" -#define M_PI 3.14159265358979323846 - -/* Move the shape to a new location */ -void Shape::move(double dx, double dy) { - x += dx; - y += dy; -} - -int Shape::nshapes = 0; - -double Circle::area(void) { - return M_PI*radius*radius; -} - -double Circle::perimeter(void) { - return 2*M_PI*radius; -} - -double Square::area(void) { - return width*width; -} - -double Square::perimeter(void) { - return 4*width; -} +/* File : example.c */ + +#include "example.h" +#define M_PI 3.14159265358979323846 + +/* Move the shape to a new location */ +void Shape::move(double dx, double dy) { + x += dx; + y += dy; +} + +int Shape::nshapes = 0; + +double Circle::area(void) { + return M_PI*radius*radius; +} + +double Circle::perimeter(void) { + return 2*M_PI*radius; +} + +double Square::area(void) { + return width*width; +} + +double Square::perimeter(void) { + return 4*width; +} diff --git a/Examples/c/class/example.h b/Examples/c/class/example.h index 1d4606f86..46d901361 100644 --- a/Examples/c/class/example.h +++ b/Examples/c/class/example.h @@ -1,39 +1,39 @@ -/* File : example.h */ - -class Shape { -public: - Shape() { - nshapes++; - } - virtual ~Shape() { - nshapes--; - }; - double x, y; - void move(double dx, double dy); - virtual double area(void) = 0; - virtual double perimeter(void) = 0; - static int nshapes; -}; - -class Circle : public Shape { -private: - double radius; -public: - Circle(double r) : radius(r) { }; - virtual double area(void); - virtual double perimeter(void); -}; - -class Square : public Shape { -private: - double width; -public: - Square(double w) : width(w) { }; - virtual double area(void); - virtual double perimeter(void); -}; - - - - - +/* File : example.h */ + +class Shape { +public: + Shape() { + nshapes++; + } + virtual ~Shape() { + nshapes--; + }; + double x, y; + void move(double dx, double dy); + virtual double area(void) = 0; + virtual double perimeter(void) = 0; + static int nshapes; +}; + +class Circle : public Shape { +private: + double radius; +public: + Circle(double r) : radius(r) { }; + virtual double area(void); + virtual double perimeter(void); +}; + +class Square : public Shape { +private: + double width; +public: + Square(double w) : width(w) { }; + virtual double area(void); + virtual double perimeter(void); +}; + + + + + diff --git a/Examples/c/class/example.i b/Examples/c/class/example.i index 9a0ad50c5..75700b305 100644 --- a/Examples/c/class/example.i +++ b/Examples/c/class/example.i @@ -1,10 +1,10 @@ -/* File : example.i */ -%module example - -%{ -#include "example.h" -%} - -/* Let's just grab the original header file here */ -%include "example.h" - +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +/* Let's just grab the original header file here */ +%include "example.h" + diff --git a/Examples/c/class/runme.c b/Examples/c/class/runme.c new file mode 100644 index 000000000..bae2078ec --- /dev/null +++ b/Examples/c/class/runme.c @@ -0,0 +1,43 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char **argv) { + printf("Creating some objects:\n"); + Circle* c = new_Circle(10); + printf(" Created circle\n"); + Square* s = new_Square(10); + printf(" Created square\n"); + + printf("\nA total of %d shapes were created\n", Shape_nshapes_get()); + + Circle_x_set(c, 20); + Circle_y_set(c, 30); + + Shape* shape = (Shape*) s; + Shape_x_set(shape, -10); + Shape_y_set(shape, 5); + + printf("\nHere is their current positions:\n"); + printf(" Circle = (%f %f)\n", Circle_x_get(c), Circle_y_get(c)); + printf(" Square = (%f %f)\n", Square_x_get(s), Square_y_get(s)); + + printf("\nHere are some properties of the shapes:\n"); + Shape* shapes[] = {(Shape*) c, (Shape*) s}; + int i; + for (i = 0; i < 2; i++) { + printf(" %s\n", i ? "Square" : "Circle"); + printf(" area = %f\n", Shape_area(shapes[i])); + printf(" perimeter = %f\n", Shape_perimeter(shapes[i])); + } + + printf("\nGuess I'll clean up now\n"); + + delete_Square(s); + delete_Circle(c); + + printf("%d shapes remain\n", Shape_nshapes_get()); + printf("Goodbye\n"); + return 0; +} + diff --git a/Examples/c/reference/Makefile b/Examples/c/reference/Makefile index f04179d46..7d9c1a9f7 100644 --- a/Examples/c/reference/Makefile +++ b/Examples/c/reference/Makefile @@ -1,14 +1,20 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -MAIN = test.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp + +run: + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + env LD_LIBRARY_PATH=. ./runme + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/reference/example.cxx b/Examples/c/reference/example.cxx index e4dd74cf7..a6fffcf8c 100644 --- a/Examples/c/reference/example.cxx +++ b/Examples/c/reference/example.cxx @@ -1,19 +1,19 @@ -#include - -#include "example.h" - -void foo_by_val(Bar bar) { - bar.set(123); - printf("inside foo_by_val: %d\n", bar.get()); -} - -void foo_by_ref(Bar& bar) { - bar.set(123); - printf("inside foo_by_ref: %d\n", bar.get()); -} - -void foo_by_ptr(Bar* bar) { - bar->set(123); - printf("inside foo_by_ptr: %d\n", bar->get()); -} - +#include + +#include "example.h" + +void foo_by_val(Bar bar) { + bar.set(123); + printf("inside foo_by_val: %d\n", bar.get()); +} + +void foo_by_ref(Bar& bar) { + bar.set(123); + printf("inside foo_by_ref: %d\n", bar.get()); +} + +void foo_by_ptr(Bar* bar) { + bar->set(123); + printf("inside foo_by_ptr: %d\n", bar->get()); +} + diff --git a/Examples/c/reference/example.h b/Examples/c/reference/example.h index 470382986..989d26a18 100644 --- a/Examples/c/reference/example.h +++ b/Examples/c/reference/example.h @@ -1,16 +1,16 @@ -#include - -class Bar { -private: - int x; -public: - Bar() : x(0) {} - ~Bar() {} - void set(int x) { this->x = x; } - int get() { return x; } -}; - -void foo_by_val(Bar bar); -void foo_by_ref(Bar& bar); -void foo_by_ptr(Bar* bar); - +#include + +class Bar { +private: + int x; +public: + Bar() : x(0) {} + ~Bar() {} + void set(int x) { this->x = x; } + int get() { return x; } +}; + +void foo_by_val(Bar bar); +void foo_by_ref(Bar& bar); +void foo_by_ptr(Bar* bar); + diff --git a/Examples/c/reference/example.i b/Examples/c/reference/example.i index aed792dce..e4bd75238 100644 --- a/Examples/c/reference/example.i +++ b/Examples/c/reference/example.i @@ -1,8 +1,8 @@ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" - +%module example + +%{ +#include "example.h" +%} + +%include "example.h" + diff --git a/Examples/c/reference/runme.c b/Examples/c/reference/runme.c new file mode 100644 index 000000000..a85718d67 --- /dev/null +++ b/Examples/c/reference/runme.c @@ -0,0 +1,21 @@ +#include + +#include "example_proxy.h" + +void test(Bar * bar) { + printf("value of x is %d\n", Bar_get(bar)); +} + +int main(int argc, char** argv) { + Bar* bar = new_Bar(); + test(bar); + foo_by_val(bar); + test(bar); + foo_by_ptr(bar); + test(bar); + foo_by_ref(bar); + test(bar); + delete_Bar(bar); + return 0; +} + diff --git a/Examples/c/return/Makefile b/Examples/c/return/Makefile index f04179d46..7d9c1a9f7 100644 --- a/Examples/c/return/Makefile +++ b/Examples/c/return/Makefile @@ -1,14 +1,20 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -MAIN = test.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c_cpp - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp + +run: + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + env LD_LIBRARY_PATH=. ./runme + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + diff --git a/Examples/c/return/example.cxx b/Examples/c/return/example.cxx index 092d4a3fb..35d3dc5ba 100644 --- a/Examples/c/return/example.cxx +++ b/Examples/c/return/example.cxx @@ -1,10 +1,10 @@ -#include "example.h" - -Bar foo_ret_val() { - return Bar(); -} - -Bar* foo_ret_ptr(Bar* bar) { - return bar; -} - +#include "example.h" + +Bar foo_ret_val() { + return Bar(); +} + +Bar* foo_ret_ptr(Bar* bar) { + return bar; +} + diff --git a/Examples/c/return/example.h b/Examples/c/return/example.h index bebba4bcb..784e4c31f 100644 --- a/Examples/c/return/example.h +++ b/Examples/c/return/example.h @@ -1,16 +1,16 @@ -#include - -class Bar { -private: - int x; -public: - Bar() : x(0) {} - ~Bar() {} - void set(int x) { this->x = x; } - int get() { return x; } -}; - -Bar foo_ret_val(); -//Bar& foo_ret_ref(Bar* bar); -Bar* foo_ret_ptr(Bar* bar); - +#include + +class Bar { +private: + int x; +public: + Bar() : x(0) {} + ~Bar() {} + void set(int x) { this->x = x; } + int get() { return x; } +}; + +Bar foo_ret_val(); +//Bar& foo_ret_ref(Bar* bar); +Bar* foo_ret_ptr(Bar* bar); + diff --git a/Examples/c/return/example.i b/Examples/c/return/example.i index aed792dce..e4bd75238 100644 --- a/Examples/c/return/example.i +++ b/Examples/c/return/example.i @@ -1,8 +1,8 @@ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" - +%module example + +%{ +#include "example.h" +%} + +%include "example.h" + diff --git a/Examples/c/return/runme.c b/Examples/c/return/runme.c new file mode 100644 index 000000000..bceb720d9 --- /dev/null +++ b/Examples/c/return/runme.c @@ -0,0 +1,11 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char** argv) { + Bar b = foo_ret_val(); + //Bar * bp = foo_ret_ptr(NULL); + printf("x = %d\n", Bar_get(&b)); + return 0; +} + diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index ccf2e819f..63d4a8507 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -1,14 +1,20 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -SRCS = example.c -TARGET = example -INTERFACE = example.i -MAIN = test.c - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MAIN='$(MAIN)' c - -clean: - rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ - +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +SRCS = example.c +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c + +run: + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + env LD_LIBRARY_PATH=. ./runme + +clean: + rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ + diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c index 8b5b96841..a5800f0db 100644 --- a/Examples/c/simple/example.c +++ b/Examples/c/simple/example.c @@ -1,24 +1,24 @@ -/* File : example.c */ - -/* A global variable */ -double Foo = 3.0; - -double *Foo_ptr = &Foo; -char *my_str = "hello, world!"; -char *array_of_strs[] = { "one", "two" }; - -char *get_str(int i, void* ptr, float ff) { - return array_of_strs[i]; -} - -/* Compute the greatest common divisor of positive integers */ -int gcd(int x, int y) { - int g; - g = y; - while (x > 0) { - g = x; - x = y % x; - y = g; - } - return g; -} +/* File : example.c */ + +/* A global variable */ +double Foo = 3.0; + +double *Foo_ptr = &Foo; +char *my_str = "hello, world!"; +char *array_of_strs[] = { "one", "two" }; + +char *get_str(int i, void* ptr, float ff) { + return array_of_strs[i]; +} + +/* Compute the greatest common divisor of positive integers */ +int gcd(int x, int y) { + int g; + g = y; + while (x > 0) { + g = x; + x = y % x; + y = g; + } + return g; +} diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i index 371c9a11c..6c372add0 100644 --- a/Examples/c/simple/example.i +++ b/Examples/c/simple/example.i @@ -1,12 +1,12 @@ -/* File : example.i */ -%module example - -%inline %{ -extern double Foo; -extern double *Foo_ptr; -extern char *my_str; -extern char **array_of_strs; -extern char *get_str(int i, void* ptr, float ff); -extern int gcd(int x, int y); -%} - +/* File : example.i */ +%module example + +%inline %{ +extern double Foo; +extern double *Foo_ptr; +extern char *my_str; +extern char **array_of_strs; +extern char *get_str(int i, void* ptr, float ff); +extern int gcd(int x, int y); +%} + diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c new file mode 100644 index 000000000..6e48cf57a --- /dev/null +++ b/Examples/c/simple/runme.c @@ -0,0 +1,15 @@ +#include + +#include "example_proxy.h" + +int main(int argc, char **argv) { + int a = 35; + int b = 15; + printf("Foo is %f\n", Foo); + printf("Foo by ptr is \%f\n", *Foo_ptr); + printf("my_str is: %s\n", my_str); + printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); + printf("array_of_strs contains %s and %s\n", get_str(0, 0, 0), get_str(1, 0, 0)); + return 0; +} + diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in new file mode 100644 index 000000000..163c4f7d7 --- /dev/null +++ b/Examples/test-suite/c/Makefile.in @@ -0,0 +1,62 @@ +####################################################################### +# Makefile for C test-suite +####################################################################### + +LANGUAGE = c +C = gcc +CXX = g++ +SCRIPTSUFFIX = _runme.c +srcdir = @srcdir@ +top_srcdir = @top_srcdir@/.. +top_builddir = @top_builddir@/.. + +C_TEST_CASES = + +CPP_TEST_CASES = \ + c_arguments + +include $(srcdir)/../common.mk + +# Rules for the different types of tests +%.cpptest: + $(setup) + +(cd $* && $(swig_and_compile_cpp)) + $(run_testcase) + +%.ctest: + $(setup) + +(cd $* && $(swig_and_compile_c)) + $(run_testcase) + +%.multicpptest: + $(setup) + +(cd $* && $(swig_and_compile_multi_cpp)) + $(run_testcase) + +# Makes a directory for the testcase if it does not exist +setup = \ + if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ + else \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ + fi; \ + if [ ! -d $* ]; then \ + mkdir $*; \ + fi; + +# Compiles C files then runs the testcase. A testcase is only run if +# a file is found which has _runme.c appended after the testcase name. +run_testcase = \ + if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\ + cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c $*_proxy.c -L. -l$* -o $*_runme && \ + env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \ + fi; + +# Clean: remove testcase directories +%.clean: + @if [ -d $* ]; then \ + rm -rf $*; \ + fi; + +clean: + @rm -f *_wrap.* *_proxy.* *~ *.exe *.dll *.so *.out *runme diff --git a/Examples/test-suite/c/c_arguments_runme.c b/Examples/test-suite/c/c_arguments_runme.c new file mode 100644 index 000000000..1fbbe7b20 --- /dev/null +++ b/Examples/test-suite/c/c_arguments_runme.c @@ -0,0 +1,17 @@ +#include + +#include "c_arguments/c_arguments_proxy.h" + +int main(int argc, char **argv) { + A* a = new_A(); + if (A_foo(a, 0) != 1) + fprintf(stderr, "call to A_foo() failed\n"); + delete_A(a); + + int ***array = (int ***) 0; + + foo_1(array); + + return 0; +} + diff --git a/Examples/test-suite/c_arguments.i b/Examples/test-suite/c_arguments.i new file mode 100644 index 000000000..5d143f112 --- /dev/null +++ b/Examples/test-suite/c_arguments.i @@ -0,0 +1,20 @@ +%module c_arguments + +%inline %{ + +class A { + public: + A() {} + int foo(int i) { + return i+1; + } +}; + +void foo(A a, A &ra, A *pa, char c, char *str, char **pstr, char ***ppstri) { +} + +void foo_1(int ***a) { + +} + +%} diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 0ec5f603d..61193638d 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -1,80 +1,85 @@ -/* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * c.swg - * ----------------------------------------------------------------------------- */ - -%insert("runtime") "clabels.swg" -%insert("shadow_header") "cproxy.swg" - -// typemaps for function parameters - -%typemap(ctype) void, short, int, long, char, float, double "$1_type" -%typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" -%typemap(ctype) short&, int&, long&, char&, float&, double& "$1_basetype *" -%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_basetype" -%typemap(ctype) bool "_Bool" -%typemap(ctype) SWIGTYPE "$1_type" -%typemap(ctype) SWIGTYPE * "$1_type" -%typemap(ctype) SWIGTYPE & "$1_type" -%typemap(ctype) SWIGTYPE * [ANY] "$1_basetype*" -%typemap(ctype) SWIGCLASSTYPE "struct Obj$1_type *" -%typemap(ctype) SWIGCLASSTYPE * "struct Obj$1_type" -%typemap(ctype) SWIGCLASSTYPE & "struct Obj$*1_ltype *" -%typemap(ctype) SWIGCLASSTYPE * [ANY] "struct Obj$1_basetype*" - -%typemap(in) short, int, long, char, float, double, bool "$1 = ($1_basetype) $input;" -%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = ($1_basetype *) $input;" -%typemap(in) short&, int&, long&, char&, float&, double&, bool& "$1 = ($1_basetype *) $input;" -%typemap(in) SWIGTYPE "$1 = ($1_type) $input;" -%typemap(in) SWIGTYPE * "$1 = ($1_type) $input;" -%typemap(in) SWIGTYPE & "$1 = ($1_type) $input;" -%typemap(in) SWIGTYPE * [ANY] "$1 = ($1_basetype*) $input;" -%typemap(in) SWIGCLASSTYPE { - $1 = * ($1_type *) ($input->obj); -} - -%typemap(in) SWIGCLASSTYPE * { - $1 = ($1_type) $input->obj; -} - -%typemap(in) SWIGCLASSTYPE * [ANY] { - $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); - int i; - for (i = 0; i < $1_dim0; ++i) - if ($input[i]) - $1[i] = ($1_basetype) $input[i]->obj; - else - $1[i] = ($1_basetype) 0; -} - -%typemap(in) SWIGCLASSTYPE & { - $1 = ($*1_ltype *) $input->obj; -} - -// typemaps for return values - -%typemap(couttype) void, short, int, long, char, float, double "$1_type" -%typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" -%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" -%typemap(couttype) bool "_Bool" -%typemap(couttype) SWIGTYPE "struct Obj$1_type" -%typemap(couttype) SWIGTYPE * "struct Obj$*1_type *" - -%typemap(out) short, int, long, char, float, double, bool "$result = $1;" -%typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" -%typemap(out) void "" - -%typemap(out) SWIGTYPE { - $result.obj = (void*) &$1; -} - -%typemap(out) SWIGTYPE * { - $result->obj = (void*) $1; -} - -%typemap(out) SWIGTYPE & { - // return by reference -} - +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * c.swg + * ----------------------------------------------------------------------------- */ + +%insert("runtime") "clabels.swg" +%insert("proxy_header") "cproxy.swg" + +// typemaps for function parameters + +%typemap(ctype) void, short, int, long, char, float, double "$1_type" +%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_type" +%typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" +%typemap(ctype) unsigned short*, unsigned int*, unsigned long*, unsigned char* "$1_type" +%typemap(ctype) short&, int&, long&, char&, float&, double& "$1_basetype *" +%typemap(ctype) unsigned short&, unsigned int&, unsigned long&, unsigned char& "$1_basetype *" +%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_basetype" +%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_basetype" +%typemap(ctype) bool "_Bool" +%typemap(ctype) SWIGTYPE "$1_type" +%typemap(ctype) SWIGTYPE * "$1_type" +%typemap(ctype) SWIGTYPE & "$1_type" +%typemap(ctype) SWIGTYPE * [ANY] "$1_basetype*" +%typemap(ctype) SWIGCLASSTYPE "struct SwigObj$1_type *" +%typemap(ctype) SWIGCLASSTYPE * "struct SwigObj$1_type" +%typemap(ctype) SWIGCLASSTYPE & "struct SwigObj$*1_ltype *" +%typemap(ctype) SWIGCLASSTYPE * [ANY] "struct SwigObj$1_basetype *" + +%typemap(in) short, int, long, char, float, double, bool "$1 = ($1_basetype) $input;" +%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = ($1_basetype *) $input;" +%typemap(in) short&, int&, long&, char&, float&, double&, bool& "$1 = ($1_basetype *) $input;" + +%typemap(in) SWIGTYPE "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE * "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE & "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE * [ANY] "$1 = ($1_basetype*) $input;" +%typemap(in) SWIGCLASSTYPE { + $1 = * ($1_type *) ($input->obj); +} + +%typemap(in) SWIGCLASSTYPE * { + $1 = ($1_type) $input->obj; +} + +%typemap(in) SWIGCLASSTYPE * [ANY] { + $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); + int i; + for (i = 0; i < $1_dim0; ++i) + if ($input[i]) + $1[i] = ($1_basetype) $input[i]->obj; + else + $1[i] = ($1_basetype) 0; +} + +%typemap(in) SWIGCLASSTYPE & { + $1 = ($*1_ltype *) $input->obj; +} + +// typemaps for return values + +%typemap(couttype) void, short, int, long, char, float, double "$1_type" +%typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" +%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" +%typemap(couttype) bool "_Bool" +%typemap(couttype) SWIGTYPE "struct SwigObj$1_type" +%typemap(couttype) SWIGTYPE * "struct SwigObj$*1_type *" + +%typemap(out) short, int, long, char, float, double, bool "$result = $1;" +%typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" +%typemap(out) void "" + +%typemap(out) SWIGTYPE { + $result.obj = (void*) &$1; +} + +%typemap(out) SWIGTYPE * { + $result->obj = (void*) $1; +} + +%typemap(out) SWIGTYPE & { + // return by reference +} + diff --git a/Lib/c/clabels.swg b/Lib/c/clabels.swg index 3164eea5d..cae432a52 100644 --- a/Lib/c/clabels.swg +++ b/Lib/c/clabels.swg @@ -1,32 +1,32 @@ -/* ----------------------------------------------------------------------------- - * clabels.swg - * - * Definitions of C specific preprocessor symbols. - * ----------------------------------------------------------------------------- */ - -// this is used instead of default SWIGEXPORT symbol - -#ifndef SWIGEXPORTC -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# define SWIGEXPORTC -# else -# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) -# define SWIGEXPORTC __attribute__ ((visibility("default"))) -# else -# define SWIGEXPORTC -# endif -# endif -#endif - -#ifndef SWIGPROTECT -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# define SWIGPROTECT(x) -# else -# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) -# define SWIGPROTECT(x) __attribute__ ((visibility("protected"))) x -# else -# define SWIGPROTECT(x) -# endif -# endif -#endif - +/* ----------------------------------------------------------------------------- + * clabels.swg + * + * Definitions of C specific preprocessor symbols. + * ----------------------------------------------------------------------------- */ + +// this is used instead of default SWIGEXPORT symbol + +#ifndef SWIGEXPORTC +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGEXPORTC +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORTC __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORTC +# endif +# endif +#endif + +#ifndef SWIGPROTECT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGPROTECT(x) +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGPROTECT(x) __attribute__ ((visibility("protected"))) x +# else +# define SWIGPROTECT(x) +# endif +# endif +#endif + diff --git a/Lib/c/cproxy.swg b/Lib/c/cproxy.swg index 09584937e..1806e3865 100644 --- a/Lib/c/cproxy.swg +++ b/Lib/c/cproxy.swg @@ -1,19 +1,19 @@ -/* ----------------------------------------------------------------------------- - * cproxy.swg - * - * Definitions of C specific preprocessor symbols for proxies. - * ----------------------------------------------------------------------------- */ - -#ifndef SWIGIMPORT -# ifndef __GNUC__ -# define __DLL_IMPORT __declspec(dllimport) -# else -# define __DLL_IMPORT __attribute__((dllimport)) extern -# endif -# if !defined (__WIN32__) -# define SWIGIMPORT extern -# else -# define SWIGIMPORT __DLL_IMPORT -# endif -#endif - +/* ----------------------------------------------------------------------------- + * cproxy.swg + * + * Definitions of C specific preprocessor symbols for proxies. + * ----------------------------------------------------------------------------- */ + +#ifndef SWIGIMPORT +# ifndef __GNUC__ +# define __DLL_IMPORT __declspec(dllimport) +# else +# define __DLL_IMPORT __attribute__((dllimport)) extern +# endif +# if !defined (__WIN32__) +# define SWIGIMPORT extern +# else +# define SWIGIMPORT __DLL_IMPORT +# endif +#endif + diff --git a/Makefile.in b/Makefile.in index ebfc03656..dd3867f0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,6 +57,7 @@ skip-clisp = test -n "@SKIP_CLISP@" skip-cffi = test -n "@SKIP_CFFI@" skip-uffi = test -n "@SKIP_UFFI@" skip-r = test -n "@SKIP_R@" +skip-c = test -n "@SKIP_C@" # Additional dependencies for some tests skip-gcj = test -n "@SKIP_GCJ@" @@ -91,6 +92,7 @@ check-aliveness: @$(skip-modula3) || ./$(TARGET) -modula3 -help @$(skip-lua) || ./$(TARGET) -lua -help @$(skip-r) || ./$(TARGET) -r -help + @$(skip-c) || ./$(TARGET) -c -help # Checks examples for compilation (does not run them) check-examples: \ @@ -113,7 +115,8 @@ check-examples: \ check-clisp-examples \ check-uffi-examples \ check-cffi-examples \ - check-r-examples + check-r-examples \ + check-c-examples tcl_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/tcl/check.list) perl5_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/perl5/check.list) @@ -135,6 +138,7 @@ clisp_examples := uffi_examples := cffi_examples := r_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/r/check.list) +c_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/c/check.list) # all examples check-%-examples : @@ -181,7 +185,8 @@ check-gifplot: \ check-chicken-gifplot \ # check-lua-gifplot \ # check-csharp-gifplot \ -# check-modula3-gifplot +# check-modula3-gifplot \ +# check-c-gifplot check-%-gifplot: gifplot-library @if test -z "$(skip-$*)"; then \ @@ -228,7 +233,8 @@ check-test-suite: \ check-uffi-test-suite \ check-cffi-test-suite \ check-chicken-test-suite \ - check-r-test-suite + check-r-test-suite \ + check-c-test-suite check-%-test-suite: @if test -z "$(skip-$*)"; then \ @@ -279,7 +285,8 @@ all-test-suite: \ all-uffi-test-suite \ all-cffi-test-suite \ all-chicken-test-suite \ - all-r-test-suite + all-r-test-suite \ + all-c-test-suite all-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=all @@ -306,7 +313,8 @@ broken-test-suite: \ broken-uffi-test-suite \ broken-cffi-test-suite \ broken-chicken-test-suite \ - broken-r-test-suite + broken-r-test-suite \ + broken-c-test-suite broken-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=broken @@ -391,7 +399,8 @@ noskip-test-suite: \ noskip-uffi-test-suite \ noskip-cffi-test-suite \ noskip-chicken-test-suite \ - noskip-r-test-suite + noskip-r-test-suite \ + noskip-c-test-suite noskip-%-test-suite: dir="Examples/test-suite/$*"; \ @@ -440,7 +449,7 @@ install-main: @$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@ lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php4 ocaml octave \ - pike chicken csharp modula3 allegrocl clisp lua cffi uffi r + pike chicken csharp modula3 allegrocl clisp lua cffi uffi r c lib-modules = std diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index ee53b5036..5c8762b95 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -18,16 +18,16 @@ class C:public Language { File *f_header; File *f_wrappers; File *f_init; - File *f_shadow_c; - File *f_shadow_h; + File *f_proxy_c; + File *f_proxy_h; - String *f_shadow_code_init; - String *f_shadow_code_body; - String *f_shadow_header; + String *f_proxy_code_init; + String *f_proxy_code_body; + String *f_proxy_header; String *empty_string; - bool shadow_flag; + bool proxy_flag; bool runtime_flag; public: @@ -38,7 +38,7 @@ public: C() : empty_string(NewString("")), - shadow_flag(true), + proxy_flag(true), runtime_flag(true) { } @@ -64,12 +64,15 @@ public: if (argv[i]) { if (strcmp(argv[i], "-help") == 0) { Printf(stdout, "%s\n", usage); - } else if ((strcmp(argv[i], "-shadow") == 0) || (strcmp(argv[i], "-proxy") == 0)) { - shadow_flag = true; + } else if ((strcmp(argv[i], "-proxy") == 0) || (strcmp(argv[i], "-proxy") == 0)) { + proxy_flag = true; + Swig_mark_arg(i); } else if (strcmp(argv[i], "-noproxy") == 0) { - shadow_flag = false; + proxy_flag = false; + Swig_mark_arg(i); } else if (strcmp(argv[i], "-noruntime") == 0) { runtime_flag = false; + Swig_mark_arg(i); } } } @@ -106,12 +109,12 @@ public: Printf(f_header, "#include \n"); Printf(f_header, "#include \n"); Printf(f_header, "#include \n\n"); - Printf(f_header, "static jmp_buf __rt_env;\n"); - Printf(f_header, "static int __rt_init = 0;\n\n"); - Printf(f_header, "void __runtime_init() {\n"); - Printf(f_header, " if (!__rt_init) {\n"); - Printf(f_header, " __rt_init = 1;\n"); - Printf(f_header, " if (setjmp(__rt_env)) {\n"); + Printf(f_header, "static jmp_buf Swig_rt_env;\n"); + Printf(f_header, "static int Swig_rt_init = 0;\n\n"); + Printf(f_header, "void Swig_runtime_init() {\n"); + Printf(f_header, " if (!Swig_rt_init) {\n"); + Printf(f_header, " Swig_rt_init = 1;\n"); + Printf(f_header, " if (setjmp(Swig_rt_env)) {\n"); Printf(f_header, " fprintf(stderr, \"An error occured. Exitting...\\n\");\n"); Printf(f_header, " exit(1);\n"); Printf(f_header, " }\n"); @@ -119,32 +122,32 @@ public: Printf(f_header, "}\n\n"); } - // generate shadow files if enabled - if (shadow_flag) { - f_shadow_code_init = NewString(""); - f_shadow_code_body = NewString(""); - f_shadow_header = NewString(""); + // generate proxy files if enabled + if (proxy_flag) { + f_proxy_code_init = NewString(""); + f_proxy_code_body = NewString(""); + f_proxy_header = NewString(""); - // create shadow files with appropriate name - String *shadow_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); - if ((f_shadow_c = NewFile(shadow_code_filename, "w")) == 0) { - FileErrorDisplay(shadow_code_filename); + // create proxy files with appropriate name + String *proxy_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); + if ((f_proxy_c = NewFile(proxy_code_filename, "w")) == 0) { + FileErrorDisplay(proxy_code_filename); SWIG_exit(EXIT_FAILURE); } - String *shadow_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module)); - if ((f_shadow_h = NewFile(shadow_header_filename, "w")) == 0) { - FileErrorDisplay(shadow_header_filename); + String *proxy_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module)); + if ((f_proxy_h = NewFile(proxy_header_filename, "w")) == 0) { + FileErrorDisplay(proxy_header_filename); SWIG_exit(EXIT_FAILURE); } - Swig_register_filebyname("shadow_code_init", f_shadow_code_init); - Swig_register_filebyname("shadow_code_body", f_shadow_code_body); - Swig_register_filebyname("shadow_header", f_shadow_header); + Swig_register_filebyname("proxy_code_init", f_proxy_code_init); + Swig_register_filebyname("proxy_code_body", f_proxy_code_body); + Swig_register_filebyname("proxy_header", f_proxy_header); - Swig_banner(f_shadow_code_init); - Swig_banner(f_shadow_header); - Printf(f_shadow_code_init, "#include \"%s\"\n\n", shadow_header_filename); + Swig_banner(f_proxy_code_init); + Swig_banner(f_proxy_header); + Printf(f_proxy_code_init, "#include \"%s\"\n\n", proxy_header_filename); } Swig_register_filebyname("header", f_header); @@ -163,15 +166,15 @@ public: Printf(f_wrappers, "}\n"); Printf(f_wrappers, "#endif\n"); - // finalize generating shadow file - if (shadow_flag) { - Printv(f_shadow_c, f_shadow_code_init, "\n", NIL); - Printv(f_shadow_c, f_shadow_code_body, "\n", NIL); - Printv(f_shadow_h, f_shadow_header, "\n", NIL); - Close(f_shadow_c); - Close(f_shadow_h); - Delete(f_shadow_code_init); - Delete(f_shadow_header); + // finalize generating proxy file + if (proxy_flag) { + Printv(f_proxy_c, f_proxy_code_init, "\n", NIL); + Printv(f_proxy_c, f_proxy_code_body, "\n", NIL); + Printv(f_proxy_h, f_proxy_header, "\n", NIL); + Close(f_proxy_c); + Close(f_proxy_h); + Delete(f_proxy_code_init); + Delete(f_proxy_header); } // write all to the file @@ -198,8 +201,8 @@ public: String *type_str = SwigType_str(type, 0); //if (!CPlusPlus) // Printv(f_wrappers, "SWIGEXPORTC ", type_str, " ", Getattr(n, "name"), ";\n", NIL); - if (shadow_flag) { - Printv(f_shadow_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); + if (proxy_flag) { + Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); } return SWIG_OK; } @@ -209,12 +212,12 @@ public: * ------------------------------------------------------------------------ */ virtual int globalfunctionHandler(Node *n ) { - String* action = NewString(""); - String* vis_hint = NewString(""); - String* return_type_str = SwigType_str(Getattr(n, "type"), 0); - String* name = Getattr(n, "sym:name"); - ParmList* parms = Getattr(n, "parms"); - String* arg_list = NewString(""); + String *action = NewString(""); + String *vis_hint = NewString(""); + String *return_type_str = SwigType_str(Getattr(n, "type"), 0); + String *name = Getattr(n, "sym:name"); + ParmList *parms = Getattr(n, "parms"); + String *arg_list = NewString(""); if (SwigType_type(Getattr(n, "type")) != T_VOID) { Printv(action, "$cppresult = (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); @@ -272,8 +275,8 @@ public: * incomplete for now... * ---------------------------------------------------------------------- */ - const char* getTypeSymbol(String* type) { - char* c = Char(type); + const char *getTypeSymbol(String *type) { + char *c = Char(type); if (strcmp(c, "int") == 0) return "i"; if (strcmp(c, "double") == 0) @@ -398,7 +401,7 @@ public: SwigType* type = Getattr(p, "type"); String* lname = Getattr(p, "lname"); String* c_parm_type = NewString(""); - String* shadow_parm_type = NewString(""); + String* proxy_parm_type = NewString(""); String* arg_name = NewString(""); Printf(arg_name, "c%s", lname); @@ -414,20 +417,20 @@ public: Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); } - // use shadow-type for parameter if supplied + // use proxy-type for parameter if supplied String* stype = Getattr(p, "c:stype"); if (stype) { - Printv(shadow_parm_type, SwigType_str(stype, 0), NIL); + Printv(proxy_parm_type, SwigType_str(stype, 0), NIL); } else { - Printv(shadow_parm_type, c_parm_type, NIL); + Printv(proxy_parm_type, c_parm_type, NIL); } Replaceall(c_parm_type, "::", "_"); Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); - Printv(proto, gencomma ? ", " : "", shadow_parm_type, " ", Getattr(p, "name"), NIL); + Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", Getattr(p, "name"), NIL); gencomma = 1; // apply typemaps for input parameter @@ -448,7 +451,7 @@ public: p = nextSibling(p); } Delete(arg_name); - Delete(shadow_parm_type); + Delete(proxy_parm_type); Delete(c_parm_type); } @@ -483,23 +486,23 @@ public: Append(wrapper->code, "}\n"); } - // take care of shadow function - if (shadow_flag) { - // use shadow-type for return type if supplied - SwigType* shadow_type = Getattr(n, "c:stype"); - if (shadow_type) { - return_type = SwigType_str(shadow_type, 0); + // take care of proxy function + if (proxy_flag) { + // use proxy-type for return type if supplied + SwigType *proxy_type = Getattr(n, "c:stype"); + if (proxy_type) { + return_type = SwigType_str(proxy_type, 0); } // emit proxy functions prototypes - Printv(f_shadow_code_init, "extern ", return_type, " ", wname, "(", proto, ");\n", NIL); - Printv(f_shadow_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); + Printv(f_proxy_code_init, "extern ", return_type, " ", wname, "(", proto, ");\n", NIL); + Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); // call to the wrapper function - Printv(f_shadow_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); + Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); // add function declaration to the proxy header file - Printv(f_shadow_header, return_type, " ", name, "(", proto, ");\n"); + Printv(f_proxy_header, return_type, " ", name, "(", proto, ");\n"); } Wrapper_print(wrapper, f_wrappers); @@ -518,25 +521,25 @@ public: * emit_runtime_typecheck() * --------------------------------------------------------------------- */ - void emit_runtime_typecheck(String* classname, String* funcname, String* code) { + void emit_runtime_typecheck(String *classname, String *funcname, String *code) { Printf(code, "{\nint i = 0, type_ok = 0;\n"); Printf(code, "if (arg1 == NULL) {\n"); Printv(code, " fprintf(stderr, \"error: NULL object-struct passed to ", funcname, "\\n\");\n"); - Printf(code, " longjmp(__rt_env, 0);\n}\n"); + Printf(code, " longjmp(Swig_rt_env, 0);\n}\n"); Printf(code, "while(arg1->typenames[i]) {\n"); Printv(code, " if (strcmp(arg1->typenames[i++], \"", classname, "\") == 0) {\n", NIL); Printf(code, " type_ok = 1;\nbreak;\n}\n}\n"); Printf(code, "if (!type_ok) {\n"); Printv(code, " fprintf(stderr, \"error: object-struct passed to ", funcname, " is not of class ", classname, "\\n\");\n", NIL); - Printf(code, " longjmp(__rt_env, 0);\n}\n}\n"); + Printf(code, " longjmp(Swig_rt_env, 0);\n}\n}\n"); } /* --------------------------------------------------------------------- * copy_node() * --------------------------------------------------------------------- */ - Node* copy_node(Node *node) { - Node* new_node = NewHash(); + Node *copy_node(Node *node) { + Node *new_node = NewHash(); Setattr(new_node, "name", Copy(Getattr(node, "name"))); Setattr(new_node, "ismember", Copy(Getattr(node, "ismember"))); Setattr(new_node, "view", Copy(Getattr(node, "view"))); @@ -549,13 +552,13 @@ public: } /* --------------------------------------------------------------------- - * copy_node() + * is_in() * * tests if given name already exists in one of child nodes of n * --------------------------------------------------------------------- */ - bool is_in(String* name, Node* n) { - Hash* h; + bool is_in(String *name, Node *n) { + Hash *h; for (h = firstChild(n); h; h = nextSibling(h)) { if (Cmp(name, Getattr(h, "name")) == 0) return true; @@ -567,10 +570,10 @@ public: * classHandler() * --------------------------------------------------------------------- */ - virtual int classHandler(Node* n) { - String* name = Copy(Getattr(n, "name")); - String* sobj = NewString(""); - List* baselist = Getattr(n, "bases"); + virtual int classHandler(Node *n) { + String *name = Copy(Getattr(n, "name")); + String *sobj = NewString(""); + List *baselist = Getattr(n, "bases"); Replaceall(name, "::", "_"); if (CPlusPlus) { @@ -579,7 +582,7 @@ public: Iterator i; for (i = First(baselist); i.item; i = Next(i)) { // look for member variables and functions - Node* node; + Node *node; for (node = firstChild(i.item); node; node = nextSibling(node)) { if ((Cmp(Getattr(node, "kind"), "variable") == 0) || (Cmp(Getattr(node, "kind"), "function") == 0)) { @@ -605,18 +608,18 @@ public: } // emit "class"-struct definition - Printv(sobj, "struct Obj", name, " {\n void* obj;\n", NIL); + Printv(sobj, "struct SwigObj", name, " {\n void* obj;\n", NIL); if (runtime_flag) Printf(sobj, " const char* typenames[%d];\n}", Len(baselist) + 2); else Printf(sobj, "};\n\n"); Printv(f_header, sobj, ";\n\n", NIL); - Printv(f_header, "const char* __typename_", name, " = \"", name, "\";\n\n", NIL); + Printv(f_header, "const char* Swig_typename_", name, " = \"", name, "\";\n\n", NIL); // declare it in the proxy header - if (shadow_flag) - Printv(f_shadow_header, "typedef ", sobj, " ", name, ";\n\n", NIL); + if (proxy_flag) + Printv(f_proxy_header, "typedef ", sobj, " ", name, ";\n\n", NIL); Delete(sobj); Delete(name); @@ -624,19 +627,19 @@ public: } else if (Cmp(Getattr(n, "kind"), "struct") == 0) { // this is C struct, just declare it in proxy - if (shadow_flag) { - Printv(f_shadow_header, "struct ", name, " {\n", NIL); + if (proxy_flag) { + Printv(f_proxy_header, "struct ", name, " {\n", NIL); Node* node; for (node = firstChild(n); node; node = nextSibling(node)) { String* kind = Getattr(node, "kind"); if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) { String* type = NewString(""); Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL); - Printv(f_shadow_header, " ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL); + Printv(f_proxy_header, " ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL); Delete(type); } } - Append(f_shadow_header, "};\n\n"); + Append(f_proxy_header, "};\n\n"); } Delete(sobj); @@ -649,14 +652,14 @@ public: * staticmemberfunctionHandler() * --------------------------------------------------------------------- */ - virtual int staticmemberfunctionHandler(Node* n) { - String* name = Getattr(n, "name"); - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* new_name = NewString(""); - String* code = NewString(""); - String* arg_lnames = NewString(""); - ParmList* parms = Getattr(n, "parms"); + virtual int staticmemberfunctionHandler(Node *n) { + String *name = Getattr(n, "name"); + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *new_name = NewString(""); + String *code = NewString(""); + String *arg_lnames = NewString(""); + ParmList *parms = Getattr(n, "parms"); Replaceall(newclassname, "::", "_"); @@ -687,25 +690,25 @@ public: * memberfunctionHandler() * --------------------------------------------------------------------- */ - virtual int memberfunctionHandler(Node* n) { - String* name = Getattr(n, "name"); - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* sobj_name = NewString(""); - String* ctype = NewString(""); - String* stype = NewString(""); - String* new_name = NewString(""); - String* code = NewString(""); - String* arg_lnames = NewString(""); - ParmList* parms = Getattr(n, "parms"); + virtual int memberfunctionHandler(Node *n) { + String *name = Getattr(n, "name"); + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *sobj_name = NewString(""); + String *ctype = NewString(""); + String *stype = NewString(""); + String *new_name = NewString(""); + String *code = NewString(""); + String *arg_lnames = NewString(""); + ParmList *parms = Getattr(n, "parms"); Replaceall(newclassname, "::", "_"); // create first argument - Printv(sobj_name, "struct Obj", newclassname, NIL); + Printv(sobj_name, "struct SwigObj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); - Parm* p = NewParm(ctype, "self"); + Parm *p = NewParm(ctype, "self"); stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); @@ -719,7 +722,7 @@ public: Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // omit first argument in method call - String* arg_call_lnames = Strstr(arg_lnames, "*arg2"); + String *arg_call_lnames = Strstr(arg_lnames, "*arg2"); if (!arg_call_lnames) arg_call_lnames = Strstr(arg_lnames, "arg2"); if (!arg_call_lnames) @@ -754,15 +757,15 @@ public: * wrap_get_variable() * --------------------------------------------------------------------- */ - void wrap_get_variable(Node* n, String* classname, String* newclassname, String* name, String* code) { + void wrap_get_variable(Node *n, String *classname, String *newclassname, String *name, String *code) { // modify method name - String* new_name = NewString(""); - Printv(new_name, newclassname, "_get_", name, NIL); + String *new_name = NewString(""); + Printv(new_name, newclassname, "_", Swig_name_get(name), NIL); Setattr(n, "sym:name", new_name); // generate action code - String* action = NewString(""); - ParmList* parms = Getattr(n, "parms"); + String *action = NewString(""); + ParmList *parms = Getattr(n, "parms"); if (parms) if (runtime_flag && Getattr(parms, "c:objstruct")) emit_runtime_typecheck(newclassname, new_name, action); @@ -785,15 +788,15 @@ public: * wrap_set_variable() * --------------------------------------------------------------------- */ - void wrap_set_variable(Node* n, String* classname, String* newclassname, String* name, String* code) { + void wrap_set_variable(Node *n, String *classname, String *newclassname, String *name, String *code) { // modify method name - String* new_name = NewString(""); - Printv(new_name, newclassname, "_set_", name, NIL); + String *new_name = NewString(""); + Printv(new_name, newclassname, "_", Swig_name_set(name), NIL); Setattr(n, "sym:name", new_name); // generate action code - String* action = NewString(""); - ParmList* parms = Getattr(n, "parms"); + String *action = NewString(""); + ParmList *parms = Getattr(n, "parms"); if (parms) if (runtime_flag && Getattr(parms, "c:objstruct")) emit_runtime_typecheck(newclassname, new_name, action); @@ -803,6 +806,7 @@ public: } Append(action, code); Setattr(n, "wrap:action", action); + Setattr(n, "type", "void"); functionWrapper(n); @@ -815,13 +819,13 @@ public: * staticmembervariableHandler() * --------------------------------------------------------------------- */ - virtual int staticmembervariableHandler(Node* n) { - String* name = Getattr(n, "sym:name"); - SwigType* type = Copy(Getattr(n, "type")); - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* new_name = NewString(""); - String* code = NewString(""); + virtual int staticmembervariableHandler(Node *n) { + String *name = Getattr(n, "sym:name"); + SwigType *type = Copy(Getattr(n, "type")); + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *new_name = NewString(""); + String *code = NewString(""); Replaceall(newclassname, "::", "_"); // create code for 'get' function @@ -829,7 +833,7 @@ public: wrap_get_variable(n, classname, newclassname, name, code); // create parameter for 'set' function - Parm* p = NewParm(Getattr(n, "type"), "value"); + Parm *p = NewParm(Getattr(n, "type"), "value"); Setattr(p, "lname", "arg1"); Setattr(n, "parms", p); @@ -851,22 +855,22 @@ public: * membervariableHandler() * --------------------------------------------------------------------- */ - virtual int membervariableHandler(Node* n) { - String* name = Getattr(n, "sym:name"); - SwigType* type = Copy(Getattr(n, "type")); - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* sobj_name = NewString(""); - String* ctype = NewString(""); - String* stype; - String* new_name = NewString(""); + virtual int membervariableHandler(Node *n) { + String *name = Getattr(n, "sym:name"); + SwigType *type = Copy(Getattr(n, "type")); + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *sobj_name = NewString(""); + String *ctype = NewString(""); + String *stype; + String *new_name = NewString(""); Replaceall(newclassname, "::", "_"); // create first argument - Printv(sobj_name, "struct Obj", newclassname, NIL); + Printv(sobj_name, "struct SwigObj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); - Parm* p = NewParm(ctype, "self"); + Parm *p = NewParm(ctype, "self"); stype = Copy(newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); @@ -874,7 +878,7 @@ public: Setattr(p, "lname", "arg1"); // create second argument - Parm* t = NewParm(Getattr(n, "type"), "value"); + Parm *t = NewParm(Getattr(n, "type"), "value"); Setattr(t, "lname", "arg2"); // create 'get' function @@ -902,38 +906,38 @@ public: * emit_runtime_make_object() * --------------------------------------------------------------------- */ - void emit_runtime_make_object(Node* n, String* classname, String* code) { + void emit_runtime_make_object(Node *n, String *classname, String *code) { // store the name of each class in the hierarchy - List* baselist = Getattr(parentNode(n), "bases"); - Printv(code, "result->typenames[0] = __typename_", classname, ";\n", NIL); + List *baselist = Getattr(parentNode(n), "bases"); + Printv(code, "result->typenames[0] = Swig_typename_", classname, ";\n", NIL); int i = 1; if (baselist) { Iterator it; for (it = First(baselist); it.item; it = Next(it)) { - Printf(code, "result->typenames[%d] = __typename_%s;\n", i++, Getattr(it.item, "name")); + Printf(code, "result->typenames[%d] = Swig_typename_%s;\n", i++, Getattr(it.item, "name")); } } Printf(code, "result->typenames[%d] = 0;\n", i); - Printf(code, "__runtime_init();\n"); + Printf(code, "Swig_runtime_init();\n"); } /* --------------------------------------------------------------------- * constructorHandler() * --------------------------------------------------------------------- */ - virtual int constructorHandler(Node* n) { + virtual int constructorHandler(Node *n) { if (Getattr(n, "copy_constructor")) return copyconstructorHandler(n); - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* sobj_name = NewString(""); - String* ctype; - String* stype; - String* code = NewString(""); - String* constr_name = NewString(""); - String* arg_lnames = NewString(""); - ParmList* parms = Getattr(n, "parms"); + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *sobj_name = NewString(""); + String *ctype; + String *stype; + String *code = NewString(""); + String *constr_name = NewString(""); + String *arg_lnames = NewString(""); + ParmList *parms = Getattr(n, "parms"); Replaceall(newclassname, "::", "_"); @@ -941,7 +945,7 @@ public: Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // set the function return type to the pointer to struct - Printv(sobj_name, "struct Obj", newclassname, NIL); + Printv(sobj_name, "struct SwigObj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); @@ -980,20 +984,20 @@ public: * --------------------------------------------------------------------- */ virtual int copyconstructorHandler(Node *n) { - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* sobj_name = NewString(""); - String* ctype; - String* stype; - String* code = NewString(""); - String* constr_name = NewString(""); - ParmList* parms = Getattr(n, "parms"); + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *sobj_name = NewString(""); + String *ctype; + String *stype; + String *code = NewString(""); + String *constr_name = NewString(""); + ParmList *parms = Getattr(n, "parms"); Replaceall(newclassname, "::", "_"); Setattr(parms, "lname", "arg1"); // set the function return type to the pointer to struct - Printv(sobj_name, "struct Obj", newclassname, NIL); + Printv(sobj_name, "struct SwigObj", newclassname, NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); @@ -1030,21 +1034,21 @@ public: * destructorHandler() * --------------------------------------------------------------------- */ - virtual int destructorHandler(Node* n) { - String* classname = Getattr(parentNode(n), "name"); - String* newclassname = Copy(classname); - String* sobj_name = NewString(""); - String* ctype; - String* stype; - String* code = NewString(""); - String* destr_name = NewString(""); - Parm* p; + virtual int destructorHandler(Node *n) { + String *classname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Copy(classname); + String *sobj_name = NewString(""); + String *ctype; + String *stype; + String *code = NewString(""); + String *destr_name = NewString(""); + Parm *p; Replaceall(newclassname, "::", "_"); Replaceall(newclassname, "~", ""); // create first argument - Printv(sobj_name, "struct Obj", newclassname, " ", NIL); + Printv(sobj_name, "struct SwigObj", newclassname, " ", NIL); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); p = NewParm(ctype, "self"); diff --git a/configure.in b/configure.in index 13c3c6bc9..039d504bd 100644 --- a/configure.in +++ b/configure.in @@ -1959,6 +1959,12 @@ SKIP_UFFI= #fi AC_SUBST(SKIP_UFFI) +SKIP_C= +if test -x "$(CC)" || test -z "$(CXX)" ; then + SKIP_C="1" +fi +AC_SUBST(SKIP_C) + #---------------------------------------------------------------- # Additional language dependencies #---------------------------------------------------------------- @@ -2039,6 +2045,7 @@ AC_CONFIG_FILES([ \ Examples/test-suite/cffi/Makefile \ Examples/test-suite/uffi/Makefile \ Examples/test-suite/r/Makefile \ + Examples/test-suite/c/Makefile \ Lib/ocaml/swigp4.ml ]) AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig]) From b7340dd4d60097565a5ac0e6592d8932c10589c0 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Fri, 11 Jul 2008 09:34:10 +0000 Subject: [PATCH 021/508] configure fix git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10657 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/arguments/Makefile | 1 + Examples/c/arguments/test.c | 35 ----------------------------- Examples/c/class/Makefile | 1 + Examples/c/class/test.c | 42 ----------------------------------- Examples/c/class/test.sh | 6 ----- Examples/c/class/testns.c | 20 ----------------- Examples/c/reference/Makefile | 1 + Examples/c/reference/test.c | 21 ------------------ Examples/c/return/Makefile | 1 + Examples/c/return/test.c | 10 --------- Examples/c/simple/Makefile | 1 + Examples/c/simple/test.c | 15 ------------- Examples/c/simple/test.sh | 6 ----- configure.in | 8 +++---- 14 files changed, 9 insertions(+), 159 deletions(-) delete mode 100644 Examples/c/arguments/test.c delete mode 100644 Examples/c/class/test.c delete mode 100755 Examples/c/class/test.sh delete mode 100644 Examples/c/class/testns.c delete mode 100644 Examples/c/reference/test.c delete mode 100644 Examples/c/return/test.c delete mode 100644 Examples/c/simple/test.c delete mode 100755 Examples/c/simple/test.sh diff --git a/Examples/c/arguments/Makefile b/Examples/c/arguments/Makefile index 7d9c1a9f7..bcc2a8a6f 100644 --- a/Examples/c/arguments/Makefile +++ b/Examples/c/arguments/Makefile @@ -18,3 +18,4 @@ run: clean: rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ +check: all diff --git a/Examples/c/arguments/test.c b/Examples/c/arguments/test.c deleted file mode 100644 index 05b6d1632..000000000 --- a/Examples/c/arguments/test.c +++ /dev/null @@ -1,35 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char** argv) { - MyClass* mc = new_MyClass(); - A* a = new_A(123), *b = new_A(234), *as[5]; - int i, j = 321, *js[5]; - double d = 55.0; - - for (i = 0; i < 4; ++i) { - as[i] = new_A(20 + i); - js[i] = (int*) malloc(sizeof(int)); - *js[i] = 10 + i; - } - - as[i] = 0; - js[i] = 0; - - MyClass_bar(mc, j, &j, js); - MyClass_foo(mc, a, b, as); - MyClass_foo_1(mc, a, b); - MyClass_foo_1(mc, a, b); - - MyClass_foo_2(mc, &j, &d); - MyClass_foo_2(mc, &j, &d); - - delete_A(a); - delete_A(b); - delete_MyClass(mc); - - for (i = 0; i < 4; ++i) - delete_A(as[i]); -} - diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 7fcbff095..4bb2cf880 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -18,3 +18,4 @@ run: clean: rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ +check: all diff --git a/Examples/c/class/test.c b/Examples/c/class/test.c deleted file mode 100644 index 8842f21dc..000000000 --- a/Examples/c/class/test.c +++ /dev/null @@ -1,42 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char **argv) { - printf("Creating some objects:\n"); - Circle* c = new_Circle(10); - printf(" Created circle\n"); - Square* s = new_Square(10); - printf(" Created square\n"); - - printf("\nA total of %d shapes were created\n", Shape_get_nshapes()); - - Circle_set_x(c, 20); - Circle_set_y(c, 30); - - Shape* shape = (Shape*) s; - Shape_set_x(shape, -10); - Shape_set_y(shape, 5); - - printf("\nHere is their current positions:\n"); - printf(" Circle = (%f %f)\n", Circle_get_x(c), Circle_get_y(c)); - printf(" Square = (%f %f)\n", Square_get_x(s), Square_get_y(s)); - - printf("\nHere are some properties of the shapes:\n"); - Shape* shapes[] = {(Shape*) c, (Shape*) s}; - int i; - for (i = 0; i < 2; i++) { - printf(" %s\n", i ? "Square" : "Circle"); - printf(" area = %f\n", Shape_area(shapes[i])); - printf(" perimeter = %f\n", Shape_perimeter(shapes[i])); - } - - printf("\nGuess I'll clean up now\n"); - - delete_Square(s); - delete_Circle(c); - - printf("%d shapes remain\n", Shape_get_nshapes()); - printf("Goodbye\n"); -} - diff --git a/Examples/c/class/test.sh b/Examples/c/class/test.sh deleted file mode 100755 index 3b3fc7224..000000000 --- a/Examples/c/class/test.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -./a.out - diff --git a/Examples/c/class/testns.c b/Examples/c/class/testns.c deleted file mode 100644 index 623e331ca..000000000 --- a/Examples/c/class/testns.c +++ /dev/null @@ -1,20 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char **argv) { - geom_Circle* pc = new_geom_Circle(10.0); - geom_Square* ps = new_geom_Square(10.0); - - printf("Circle perim.=%f, area=%f\n", geom_Circle_perimeter(pc), geom_Circle_area(pc)); - printf("Square perim.=%f, area=%f\n", geom_Square_perimeter(ps), geom_Square_area(ps)); - - printf("Circle pos.=(%f, %f)\n", geom_Shape_get_x(pc), geom_Shape_get_y(pc)); - geom_Shape_move(pc, 5.0, -5.0); - printf("After move pos.=(%f, %f)\n", geom_Shape_get_x(pc), geom_Shape_get_y(pc)); - - delete_geom_Square(ps); - delete_geom_Circle(pc); -} - - diff --git a/Examples/c/reference/Makefile b/Examples/c/reference/Makefile index 7d9c1a9f7..bcc2a8a6f 100644 --- a/Examples/c/reference/Makefile +++ b/Examples/c/reference/Makefile @@ -18,3 +18,4 @@ run: clean: rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ +check: all diff --git a/Examples/c/reference/test.c b/Examples/c/reference/test.c deleted file mode 100644 index a85718d67..000000000 --- a/Examples/c/reference/test.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -#include "example_proxy.h" - -void test(Bar * bar) { - printf("value of x is %d\n", Bar_get(bar)); -} - -int main(int argc, char** argv) { - Bar* bar = new_Bar(); - test(bar); - foo_by_val(bar); - test(bar); - foo_by_ptr(bar); - test(bar); - foo_by_ref(bar); - test(bar); - delete_Bar(bar); - return 0; -} - diff --git a/Examples/c/return/Makefile b/Examples/c/return/Makefile index 7d9c1a9f7..bcc2a8a6f 100644 --- a/Examples/c/return/Makefile +++ b/Examples/c/return/Makefile @@ -18,3 +18,4 @@ run: clean: rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ +check: all diff --git a/Examples/c/return/test.c b/Examples/c/return/test.c deleted file mode 100644 index ee3ed6287..000000000 --- a/Examples/c/return/test.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char** argv) { - Bar b = foo_ret_val(); - //Bar * bp = foo_ret_ptr(NULL); - printf("x = %d\n", Bar_get(&b)); -} - diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index 63d4a8507..f204623e7 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -18,3 +18,4 @@ run: clean: rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ +check: all diff --git a/Examples/c/simple/test.c b/Examples/c/simple/test.c deleted file mode 100644 index 4ab88e852..000000000 --- a/Examples/c/simple/test.c +++ /dev/null @@ -1,15 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char **argv) { - int a = 35; - int b = 15; - printf("Foo is %f\n", Foo); - printf("Foo by ptr is \%f\n", *Foo_ptr); - printf("my_str is: %s\n", my_str); - printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); - printf("array_of_strs contains %s and %s\n", get_str(0, 0, 0), get_str(1, 0, 0)); - return 0; -} - diff --git a/Examples/c/simple/test.sh b/Examples/c/simple/test.sh deleted file mode 100755 index 3b3fc7224..000000000 --- a/Examples/c/simple/test.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -./a.out - diff --git a/configure.in b/configure.in index 039d504bd..0059c96fd 100644 --- a/configure.in +++ b/configure.in @@ -1959,10 +1959,10 @@ SKIP_UFFI= #fi AC_SUBST(SKIP_UFFI) -SKIP_C= -if test -x "$(CC)" || test -z "$(CXX)" ; then - SKIP_C="1" -fi +SKIP_C="" +#if test -x "$(CC)" || test -z "$(CXX)" ; then +# SKIP_C="1" +#fi AC_SUBST(SKIP_C) #---------------------------------------------------------------- From 542c21b6feae929b3510f7edb3a5bbf4526006be Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Fri, 11 Jul 2008 16:12:14 +0000 Subject: [PATCH 022/508] Few C typemaps fixes (still using experimental approach). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10658 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/return/example.cxx | 5 +- Examples/c/return/example.h | 2 +- Examples/c/return/runme.c | 10 ++-- Examples/test-suite/c/c_arguments_runme.c | 19 ++++---- Examples/test-suite/c_arguments.i | 15 +++--- Lib/c/c.swg | 57 ++++++++++++++++------- Source/Modules/c.cxx | 17 +++++-- 7 files changed, 84 insertions(+), 41 deletions(-) diff --git a/Examples/c/return/example.cxx b/Examples/c/return/example.cxx index 35d3dc5ba..a6913a8a1 100644 --- a/Examples/c/return/example.cxx +++ b/Examples/c/return/example.cxx @@ -4,7 +4,10 @@ Bar foo_ret_val() { return Bar(); } -Bar* foo_ret_ptr(Bar* bar) { +Bar *foo_ret_ptr(Bar *bar) { return bar; } +Bar &foo_ret_ref(Bar &bar) { + return bar; +} diff --git a/Examples/c/return/example.h b/Examples/c/return/example.h index 784e4c31f..76c9cfd37 100644 --- a/Examples/c/return/example.h +++ b/Examples/c/return/example.h @@ -11,6 +11,6 @@ public: }; Bar foo_ret_val(); -//Bar& foo_ret_ref(Bar* bar); +Bar& foo_ret_ref(Bar& bar); Bar* foo_ret_ptr(Bar* bar); diff --git a/Examples/c/return/runme.c b/Examples/c/return/runme.c index bceb720d9..9ea04525f 100644 --- a/Examples/c/return/runme.c +++ b/Examples/c/return/runme.c @@ -3,9 +3,13 @@ #include "example_proxy.h" int main(int argc, char** argv) { - Bar b = foo_ret_val(); - //Bar * bp = foo_ret_ptr(NULL); - printf("x = %d\n", Bar_get(&b)); + Bar *b = foo_ret_val(); + printf("x = %d\n", Bar_get(b)); + Bar *bp = foo_ret_ptr(NULL); + Bar *br = foo_ret_ref(new_Bar()); + + delete_Bar(b); + delete_Bar(br); return 0; } diff --git a/Examples/test-suite/c/c_arguments_runme.c b/Examples/test-suite/c/c_arguments_runme.c index 1fbbe7b20..37863738d 100644 --- a/Examples/test-suite/c/c_arguments_runme.c +++ b/Examples/test-suite/c/c_arguments_runme.c @@ -3,15 +3,18 @@ #include "c_arguments/c_arguments_proxy.h" int main(int argc, char **argv) { - A* a = new_A(); - if (A_foo(a, 0) != 1) - fprintf(stderr, "call to A_foo() failed\n"); + A *a = new_A(); + + A *a1, *a2, *a3; + + a1 = foo_1(a); + a2 = foo_2(a); + a3 = foo_3(a); + delete_A(a); - - int ***array = (int ***) 0; - - foo_1(array); - + delete_A(a1); + delete_A(a2); + delete_A(a3); return 0; } diff --git a/Examples/test-suite/c_arguments.i b/Examples/test-suite/c_arguments.i index 5d143f112..083fa494f 100644 --- a/Examples/test-suite/c_arguments.i +++ b/Examples/test-suite/c_arguments.i @@ -4,17 +4,20 @@ class A { public: - A() {} - int foo(int i) { - return i+1; - } + A() : i(0) {} + int i; }; -void foo(A a, A &ra, A *pa, char c, char *str, char **pstr, char ***ppstri) { +A foo_1(A *a) { + return *a; } -void foo_1(int ***a) { +A * foo_2(A *a) { + return a; +} +A & foo_3(A *a) { + return *a; } %} diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 61193638d..6a4d98bb7 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -25,7 +25,7 @@ %typemap(ctype) SWIGTYPE * [ANY] "$1_basetype*" %typemap(ctype) SWIGCLASSTYPE "struct SwigObj$1_type *" %typemap(ctype) SWIGCLASSTYPE * "struct SwigObj$1_type" -%typemap(ctype) SWIGCLASSTYPE & "struct SwigObj$*1_ltype *" +%typemap(ctype) SWIGCLASSTYPE & "struct SwigObj$1_basetype *" %typemap(ctype) SWIGCLASSTYPE * [ANY] "struct SwigObj$1_basetype *" %typemap(in) short, int, long, char, float, double, bool "$1 = ($1_basetype) $input;" @@ -41,21 +41,31 @@ } %typemap(in) SWIGCLASSTYPE * { - $1 = ($1_type) $input->obj; + if ($input) + $1 = ($1_type) $input->obj; + else + $1 = ($1_type) 0; } %typemap(in) SWIGCLASSTYPE * [ANY] { - $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); - int i; - for (i = 0; i < $1_dim0; ++i) - if ($input[i]) - $1[i] = ($1_basetype) $input[i]->obj; - else - $1[i] = ($1_basetype) 0; + if ($input) { + $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); + int i; + for (i = 0; i < $1_dim0; ++i) + if ($input[i]) + $1[i] = ($1_basetype) $input[i]->obj; + else + $1[i] = ($1_basetype) 0; + } + else + $1 = ($1_basetype*) 0; } %typemap(in) SWIGCLASSTYPE & { - $1 = ($*1_ltype *) $input->obj; + if ($input) + $1 = ($1_basetype *) $input->obj; + else + $1 = ($1_basetype *) 0; } // typemaps for return values @@ -64,22 +74,35 @@ %typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" %typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" %typemap(couttype) bool "_Bool" -%typemap(couttype) SWIGTYPE "struct SwigObj$1_type" -%typemap(couttype) SWIGTYPE * "struct SwigObj$*1_type *" +%typemap(couttype) SWIGCLASSTYPE "struct SwigObj$1_type *" +%typemap(couttype) SWIGCLASSTYPE * "struct SwigObj$1_type" +%typemap(couttype) SWIGCLASSTYPE & "struct SwigObj$1_basetype *" %typemap(out) short, int, long, char, float, double, bool "$result = $1;" %typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" %typemap(out) void "" -%typemap(out) SWIGTYPE { - $result.obj = (void*) &$1; +%typemap(out) SWIGCLASSTYPE { + $result = (struct SwigObj$1_type *) malloc(sizeof(struct SwigObj$1_type)); + $result->obj = (void*) &$1; + #if SWIG_C_RUNTIME + $result->typenames[0] = 0; // FIXME + #endif } -%typemap(out) SWIGTYPE * { +%typemap(out) SWIGCLASSTYPE * { + $result = (struct SwigObj$1_type) malloc(sizeof(struct SwigObj$*1_type)); $result->obj = (void*) $1; + #if SWIG_C_RUNTIME + $result->typenames[0] = 0; // FIXME + #endif } -%typemap(out) SWIGTYPE & { - // return by reference +%typemap(out) SWIGCLASSTYPE & { + $result = (struct SwigObj$1_basetype *) malloc(sizeof(struct SwigObj$1_basetype)); + $result->obj = (void*) $1; + #if SWIG_C_RUNTIME + $result->typenames[0] = 0; // FIXME + #endif } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 5c8762b95..2f8617a82 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -39,7 +39,7 @@ public: C() : empty_string(NewString("")), proxy_flag(true), - runtime_flag(true) { + runtime_flag(false) { } /* ------------------------------------------------------------ @@ -52,6 +52,8 @@ public: // add a symbol to the parser for conditional compilation Preprocessor_define("SWIGC 1", 0); + if (runtime_flag) + Preprocessor_define("SWIG_C_RUNTIME 1", 0); // add typemap definitions SWIG_typemap_lang("c"); @@ -103,10 +105,10 @@ public: Swig_banner(f_runtime); - Printf(f_header, "#include \n"); + Printf(f_header, "#include \n"); if (runtime_flag) { Printf(f_header, "#include \n"); - Printf(f_header, "#include \n"); + //Printf(f_header, "#include \n"); Printf(f_header, "#include \n"); Printf(f_header, "#include \n\n"); Printf(f_header, "static jmp_buf Swig_rt_env;\n"); @@ -384,7 +386,8 @@ public: if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if (SwigType_isconst(type)) SwigType_del_qualifier(type); - Wrapper_add_localv(wrapper, "cppresult", SwigType_str(type, 0), "cppresult", NIL); + SwigType *return_var_type = SwigType_isreference(type) ? SwigType_add_pointer(SwigType_base(type)) : type; + Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); } // create wrapper function prototype @@ -464,6 +467,10 @@ public: String *action = emit_action(n); Replaceall(action, "$cppresult", "cppresult"); + // return-by-reference hack + if (SwigType_isreference(type)) + Replaceall(action, "&)", "*)&"); + // emit output typemap if needed if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { @@ -612,7 +619,7 @@ public: if (runtime_flag) Printf(sobj, " const char* typenames[%d];\n}", Len(baselist) + 2); else - Printf(sobj, "};\n\n"); + Printf(sobj, "}"); Printv(f_header, sobj, ";\n\n", NIL); Printv(f_header, "const char* Swig_typename_", name, " = \"", name, "\";\n\n", NIL); From 03d275e42f8470fccf9784b1657f9ae63163dd3d Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 14 Jul 2008 19:38:10 +0000 Subject: [PATCH 023/508] Initial C++ exceptions support (still work in progress). Some typemap fixes. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10661 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/return/runme.c | 9 +- Lib/c/c.swg | 227 ++++++++++++++++++++++++++++++++------ Source/Modules/c.cxx | 138 +++++++++++------------ 3 files changed, 261 insertions(+), 113 deletions(-) diff --git a/Examples/c/return/runme.c b/Examples/c/return/runme.c index 9ea04525f..84a9e807e 100644 --- a/Examples/c/return/runme.c +++ b/Examples/c/return/runme.c @@ -5,11 +5,14 @@ int main(int argc, char** argv) { Bar *b = foo_ret_val(); printf("x = %d\n", Bar_get(b)); - Bar *bp = foo_ret_ptr(NULL); - Bar *br = foo_ret_ref(new_Bar()); + + Bar *c = new_Bar(); + Bar *bp = foo_ret_ptr(c); + //Bar *br = foo_ret_ref(c); delete_Bar(b); - delete_Bar(br); + delete_Bar(bp); + delete_Bar(c); return 0; } diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 6a4d98bb7..f87419016 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -8,46 +8,57 @@ %insert("runtime") "clabels.swg" %insert("proxy_header") "cproxy.swg" +%insert("runtime") %{ +#include +#include +#include +#include +%} + // typemaps for function parameters %typemap(ctype) void, short, int, long, char, float, double "$1_type" %typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_type" -%typemap(ctype) void*, short*, int*, long*, char*, float*, double* "$1_type" -%typemap(ctype) unsigned short*, unsigned int*, unsigned long*, unsigned char* "$1_type" -%typemap(ctype) short&, int&, long&, char&, float&, double& "$1_basetype *" -%typemap(ctype) unsigned short&, unsigned int&, unsigned long&, unsigned char& "$1_basetype *" -%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_basetype" -%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_basetype" +%typemap(ctype) void *, short *, int *, long *, char *, float *, double * "$1_type" +%typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_type" +%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_type" +%typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1_type" +%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_basetype *" +%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_basetype *" +%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" +%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" +%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" %typemap(ctype) bool "_Bool" -%typemap(ctype) SWIGTYPE "$1_type" -%typemap(ctype) SWIGTYPE * "$1_type" -%typemap(ctype) SWIGTYPE & "$1_type" -%typemap(ctype) SWIGTYPE * [ANY] "$1_basetype*" -%typemap(ctype) SWIGCLASSTYPE "struct SwigObj$1_type *" -%typemap(ctype) SWIGCLASSTYPE * "struct SwigObj$1_type" -%typemap(ctype) SWIGCLASSTYPE & "struct SwigObj$1_basetype *" -%typemap(ctype) SWIGCLASSTYPE * [ANY] "struct SwigObj$1_basetype *" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype*) $input;" +%typemap(ctype) SWIGTYPE "struct SwigObj$1_type *" +%typemap(ctype) SWIGTYPE * "struct SwigObj$1_type" +%typemap(ctype) SWIGTYPE & "struct SwigObj$1_basetype*" +%typemap(ctype) SWIGTYPE * [ANY] "struct SwigObj$1_basetype*" -%typemap(in) short, int, long, char, float, double, bool "$1 = ($1_basetype) $input;" -%typemap(in) void*, short*, int*, long*, char*, float*, double*, bool* "$1 = ($1_basetype *) $input;" -%typemap(in) short&, int&, long&, char&, float&, double&, bool& "$1 = ($1_basetype *) $input;" +%typemap(in) short, int, long, char, float, double, bool "$1 = ($1_type) $input;" +%typemap(in) void *, short *, int *, long *, char *, float *, double *, bool * "$1 = ($1_type) $input;" +%typemap(in) void **, short **, int **, long **, char **, float **, double **, bool * "$1 = ($1_type) $input;" +%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1 = ($1_type) $input;" +%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1 = ($1_type) $input;" +%typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1 = ($1_basetype *) $input;" +%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned char * "$1 = ($1_type) $input;" +%typemap(in) unsigned short, unsigned int, unsigned long, unsigned char "$1 = ($1_type) $input;" +%typemap(in) short &, int &, long &, char &, float &, double &, bool & "$1 = ($1_basetype *) $input;" +%typemap(in) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1 = ($1_basetype const *) $input;" +%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_basetype *) $input;" +%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype const *) $input;" -%typemap(in) SWIGTYPE "$1 = ($1_type) $input;" -%typemap(in) SWIGTYPE * "$1 = ($1_type) $input;" -%typemap(in) SWIGTYPE & "$1 = ($1_type) $input;" -%typemap(in) SWIGTYPE * [ANY] "$1 = ($1_basetype*) $input;" -%typemap(in) SWIGCLASSTYPE { + +%typemap(in) SWIGTYPE { $1 = * ($1_type *) ($input->obj); } -%typemap(in) SWIGCLASSTYPE * { +%typemap(in) SWIGTYPE * { if ($input) $1 = ($1_type) $input->obj; - else - $1 = ($1_type) 0; } -%typemap(in) SWIGCLASSTYPE * [ANY] { +%typemap(in) SWIGTYPE * [ANY] { if ($input) { $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); int i; @@ -61,7 +72,7 @@ $1 = ($1_basetype*) 0; } -%typemap(in) SWIGCLASSTYPE & { +%typemap(in) SWIGTYPE & { if ($input) $1 = ($1_basetype *) $input->obj; else @@ -71,18 +82,31 @@ // typemaps for return values %typemap(couttype) void, short, int, long, char, float, double "$1_type" -%typemap(couttype) void*, short*, int*, long*, char*, float*, double* "$1_type" +%typemap(couttype) void *, short *, int *, long *, char *, float *, double* "$1_type" %typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" +%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" +%typemap(couttype) short &, int &, long &, char &, float &, double & "$1_basetype *" +%typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" %typemap(couttype) bool "_Bool" -%typemap(couttype) SWIGCLASSTYPE "struct SwigObj$1_type *" -%typemap(couttype) SWIGCLASSTYPE * "struct SwigObj$1_type" -%typemap(couttype) SWIGCLASSTYPE & "struct SwigObj$1_basetype *" +%typemap(couttype) SWIGTYPE "struct SwigObj$1_type *" +%typemap(couttype) SWIGTYPE * "struct SwigObj$1_type" +%typemap(couttype) SWIGTYPE & "struct SwigObj$1_basetype *" %typemap(out) short, int, long, char, float, double, bool "$result = $1;" %typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" +%typemap(out) const short, const int, const long, const char, const float, const double "$result = $1;" +%typemap(out) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$result = $1;" +%typemap(out) unsigned short, unsigned int, unsigned long, unsigned char "$result = $1;" +%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$result = $1;" +%typemap(out) short &, int &, long &, char &, float &, double & "$result = $1;" +%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$result = $1;" +%typemap(out) const short &, const int &, const long &, const char &, const float &, const double & "$result = $1;" +%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$result = $1;" %typemap(out) void "" -%typemap(out) SWIGCLASSTYPE { +// allocate new "object-struct" by default + +%typemap(out) SWIGTYPE { $result = (struct SwigObj$1_type *) malloc(sizeof(struct SwigObj$1_type)); $result->obj = (void*) &$1; #if SWIG_C_RUNTIME @@ -90,7 +114,7 @@ #endif } -%typemap(out) SWIGCLASSTYPE * { +%typemap(out) SWIGTYPE * { $result = (struct SwigObj$1_type) malloc(sizeof(struct SwigObj$*1_type)); $result->obj = (void*) $1; #if SWIG_C_RUNTIME @@ -98,7 +122,7 @@ #endif } -%typemap(out) SWIGCLASSTYPE & { +%typemap(out) SWIGTYPE & { $result = (struct SwigObj$1_basetype *) malloc(sizeof(struct SwigObj$1_basetype)); $result->obj = (void*) $1; #if SWIG_C_RUNTIME @@ -106,3 +130,138 @@ #endif } +// exception handling + +%typemap(throws) SWIGTYPE { + (void)_e; + SWIG_CThrowException(3, "C++ $1_type exception thrown"); +} + +%insert("runtime") %{ + +#define SWIG_MAX_HANDLERS 256 +#define SWIG_MAX_RT_STACK 256 + +SWIGEXPORTC int SWIG_exception_code; +SWIGEXPORTC jmp_buf SWIG_rt_env; +SWIGEXPORTC int SWIG_rt_init = 0; +SWIGINTERN struct { + int reg; + int code; + void (*fun)(); +} SWIG_Handlers[SWIG_MAX_HANDLERS]; +SWIGINTERN int SWIG_next_handler = 0; +SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; +SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; + +SWIGINTERN void SWIG_rt_stack_push() { + // TODO: check for stack overflow + memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env)); + SWIG_rt_stack_ptr++; +} + +SWIGINTERN void SWIG_rt_stack_pop() { + if (SWIG_rt_stack_ptr == SWIG_rt_stack_base) + return; + SWIG_rt_stack_ptr--; + memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); +} + +#ifdef __cplusplus +extern "C" { +#endif + +SWIGEXPORTC void SWIG_rt_try() { + SWIG_rt_stack_push(); +} + +SWIGEXPORTC int SWIG_rt_catch(int code) { + int result = (SWIG_exception_code == code); + if (result) + SWIG_rt_stack_pop(); + return result; +} + +SWIGEXPORTC void SWIG_rt_throw(int code) { + longjmp(SWIG_rt_env, code); +} + +SWIGEXPORTC void SWIG_rt_endtry() { + SWIG_rt_stack_pop(); + longjmp(SWIG_rt_env, SWIG_exception_code); +} + +SWIGEXPORTC void SWIG_Register_Handler(int code, void (*fun)()) { + if (SWIG_next_handler < SWIG_MAX_HANDLERS) { + int i = SWIG_next_handler++; + SWIG_Handlers[i].reg = 1; + SWIG_Handlers[i].code = code; + SWIG_Handlers[i].fun = fun; + } +} + +SWIGEXPORTC void SWIG_Unregister_Handler(int code) { + int i; + for (i = 0; i < SWIG_next_handler; ++i) { + if (SWIG_Handlers[i].code == code) + SWIG_Handlers[i].reg = 0; + } +} + +#ifdef __cplusplus +} +#endif + +SWIGINTERN void SWIG_Runtime_init() { + int i, code; + if (!SWIG_rt_init) { + SWIG_rt_init = 1; + for (i = 0; i < SWIG_MAX_HANDLERS; ++i) + SWIG_Handlers[i].reg = 0; + SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); + if (code = setjmp(SWIG_rt_env)) { + for (i = 0; i < SWIG_next_handler; ++i) { + if (SWIG_Handlers[i].reg) + if (SWIG_Handlers[i].code == code) + SWIG_Handlers[i].fun(); + } + fprintf(stderr, "Unhandled exception. Exitting...\n"); + exit(code); + } + } +} + +SWIGINTERN void SWIG_CThrowException(int code, char *msg) { + if (SWIG_rt_init) + longjmp(SWIG_rt_env, code); + else { + fprintf(stderr, "%s\n", msg); + exit(code); + } +} + +%} + +%insert("proxy_header") %{ +#include + +void SWIG_Register_Handler(int code, void (*fun)()); +void SWIG_Unregister_Handler(int code); +int SWIG_exception_try(); +void SWIG_exception_throw(); + +SWIGIMPORT jmp_buf SWIG_rt_env; +SWIGIMPORT int SWIG_exception_code; +SWIGIMPORT void SWIG_rt_try(); +SWIGIMPORT int SWIG_rt_catch(); +SWIGIMPORT void SWIG_rt_throw(int val); +SWIGIMPORT int SWIG_rt_endtry(); + +#define SWIG_try \ + SWIG_rt_try(); \ + if ((SWIG_exception_code = setjmp(SWIG_rt_env)) == 0) +#define SWIG_catch(val) else if (SWIG_rt_catch(val)) +#define SWIG_throw(val) SWIG_rt_throw(val); +#define SWIG_endtry else SWIG_rt_endtry(); +%} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 2f8617a82..924988584 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -29,6 +29,7 @@ class C:public Language { bool proxy_flag; bool runtime_flag; + bool typecheck_flag; public: @@ -39,7 +40,8 @@ public: C() : empty_string(NewString("")), proxy_flag(true), - runtime_flag(false) { + runtime_flag(true), + typecheck_flag(false) { } /* ------------------------------------------------------------ @@ -59,7 +61,7 @@ public: SWIG_typemap_lang("c"); SWIG_config_file("c.swg"); - Swig_typemap_class_distinguish(true); + Swig_typemap_class_distinguish(false); // look for certain command line options for (int i = 1; i < argc; i++) { @@ -105,25 +107,6 @@ public: Swig_banner(f_runtime); - Printf(f_header, "#include \n"); - if (runtime_flag) { - Printf(f_header, "#include \n"); - //Printf(f_header, "#include \n"); - Printf(f_header, "#include \n"); - Printf(f_header, "#include \n\n"); - Printf(f_header, "static jmp_buf Swig_rt_env;\n"); - Printf(f_header, "static int Swig_rt_init = 0;\n\n"); - Printf(f_header, "void Swig_runtime_init() {\n"); - Printf(f_header, " if (!Swig_rt_init) {\n"); - Printf(f_header, " Swig_rt_init = 1;\n"); - Printf(f_header, " if (setjmp(Swig_rt_env)) {\n"); - Printf(f_header, " fprintf(stderr, \"An error occured. Exitting...\\n\");\n"); - Printf(f_header, " exit(1);\n"); - Printf(f_header, " }\n"); - Printf(f_header, " }\n"); - Printf(f_header, "}\n\n"); - } - // generate proxy files if enabled if (proxy_flag) { f_proxy_code_init = NewString(""); @@ -150,6 +133,7 @@ public: Swig_banner(f_proxy_code_init); Swig_banner(f_proxy_header); Printf(f_proxy_code_init, "#include \"%s\"\n\n", proxy_header_filename); + Printf(f_proxy_header, "#ifndef _%s_proxy_H_\n#define _%s_proxy_H_\n\n", Char(module), Char(module)); } Swig_register_filebyname("header", f_header); @@ -172,7 +156,7 @@ public: if (proxy_flag) { Printv(f_proxy_c, f_proxy_code_init, "\n", NIL); Printv(f_proxy_c, f_proxy_code_body, "\n", NIL); - Printv(f_proxy_h, f_proxy_header, "\n", NIL); + Printv(f_proxy_h, f_proxy_header, "\n#endif /* _", Char(module), "_proxy_H_ */\n", NIL); Close(f_proxy_c); Close(f_proxy_h); Delete(f_proxy_code_init); @@ -222,7 +206,7 @@ public: String *arg_list = NewString(""); if (SwigType_type(Getattr(n, "type")) != T_VOID) { - Printv(action, "$cppresult = (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); + Printv(action, "$cppresult = $mod (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); } Printv(action, Swig_cfunction_call(Getattr(n, "name"), parms), ";", NIL); Setattr(n, "wrap:action", action); @@ -342,7 +326,7 @@ public: Printf(wrapper->code, "}"); } else { - // mangle name if functions is overloaded + // mangle name if function is overloaded if (Getattr(n, "sym:overloaded")) { if (!Getattr(n, "copy_constructor")) { if (parms) @@ -373,7 +357,7 @@ public: Printf(return_type, "%s", tm); } else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); } // attach 'ctype' typemaps @@ -467,9 +451,20 @@ public: String *action = emit_action(n); Replaceall(action, "$cppresult", "cppresult"); - // return-by-reference hack - if (SwigType_isreference(type)) - Replaceall(action, "&)", "*)&"); + // handle return-by-reference + if (SwigType_isreference(type)) { + String *ref_cast = NewString(""); + if (SwigType_isconst(SwigType_del_reference(type))) { + Printf(ref_cast, "const_cast<%s*>(&", SwigType_str(SwigType_base(type), 0)); + Replaceall(action, ";", ");"); + } + else + Printf(ref_cast, "&"); + Replaceall(action, "$mod", ref_cast); + Delete(ref_cast); + } + else + Replaceall(action, "$mod", ""); // emit output typemap if needed if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { @@ -502,7 +497,7 @@ public: } // emit proxy functions prototypes - Printv(f_proxy_code_init, "extern ", return_type, " ", wname, "(", proto, ");\n", NIL); + Printv(f_proxy_code_init, return_type, " ", wname, "(", proto, ");\n", NIL); Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); // call to the wrapper function @@ -578,10 +573,15 @@ public: * --------------------------------------------------------------------- */ virtual int classHandler(Node *n) { - String *name = Copy(Getattr(n, "name")); + String *name = NewString(""); String *sobj = NewString(""); List *baselist = Getattr(n, "bases"); - Replaceall(name, "::", "_"); + + String *prefix = Swig_scopename_prefix(Getattr(n, "classtype")); + if (prefix) + Printf(name, "%s_", Swig_name_mangle(prefix)); + Append(name, Getattr(n, "sym:name")); + Setattr(n, "sym:name", name); if (CPlusPlus) { // inheritance support: attach all members from base classes to this class @@ -598,6 +598,7 @@ public: if (!is_in(Getattr(node, "name"), n)) { Node* new_node = copy_node(node); Setattr(new_node, "sym:name", Getattr(new_node, "name")); + Setattr(new_node, "sym:symtab", Getattr(n, "symtab")); set_nodeType(new_node, "cdecl"); // make sure there are no copyied object-structs params ParmList* all_parms = Getattr(new_node, "parms"), * parms; @@ -661,15 +662,13 @@ public: virtual int staticmemberfunctionHandler(Node *n) { String *name = Getattr(n, "name"); - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "typename"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *new_name = NewString(""); String *code = NewString(""); String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); - Replaceall(newclassname, "::", "_"); - // prepare function call Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); Delitem(arg_lnames, 0); @@ -680,7 +679,7 @@ public: Setattr(n, "sym:name", new_name); // generate action code - Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); + Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); Printv(code, classname, "::", name, "(", arg_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); @@ -689,7 +688,6 @@ public: Delete(arg_lnames); Delete(code); Delete(new_name); - Delete(newclassname); return SWIG_OK; } @@ -699,8 +697,8 @@ public: virtual int memberfunctionHandler(Node *n) { String *name = Getattr(n, "name"); - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "classtype"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); String *ctype = NewString(""); String *stype = NewString(""); @@ -709,8 +707,6 @@ public: String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); - Replaceall(newclassname, "::", "_"); - // create first argument Printv(sobj_name, "struct SwigObj", newclassname, NIL); ctype = Copy(sobj_name); @@ -742,9 +738,9 @@ public: Setattr(n, "sym:name", new_name); // generate action code - if (runtime_flag) + if (typecheck_flag) emit_runtime_typecheck(newclassname, new_name, code); - Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = " : "", NIL); + Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); @@ -756,7 +752,6 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); - Delete(newclassname); return SWIG_OK; } @@ -774,11 +769,11 @@ public: String *action = NewString(""); ParmList *parms = Getattr(n, "parms"); if (parms) - if (runtime_flag && Getattr(parms, "c:objstruct")) + if (typecheck_flag && Getattr(parms, "c:objstruct")) emit_runtime_typecheck(newclassname, new_name, action); if (!code) { code = NewString(""); - Printv(code, "$cppresult = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); + Printv(code, "$cppresult = $mod ((", classname, "*) arg1->obj)->", name, ";\n", NIL); } Append(action, code); @@ -805,7 +800,7 @@ public: String *action = NewString(""); ParmList *parms = Getattr(n, "parms"); if (parms) - if (runtime_flag && Getattr(parms, "c:objstruct")) + if (typecheck_flag && Getattr(parms, "c:objstruct")) emit_runtime_typecheck(newclassname, new_name, action); if (!code) { code = NewString(""); @@ -829,14 +824,13 @@ public: virtual int staticmembervariableHandler(Node *n) { String *name = Getattr(n, "sym:name"); SwigType *type = Copy(Getattr(n, "type")); - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "classtype"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *new_name = NewString(""); String *code = NewString(""); - Replaceall(newclassname, "::", "_"); // create code for 'get' function - Printv(code, "$cppresult = ", classname, "::", name, ";\n", NIL); + Printv(code, "$cppresult = $mod ", classname, "::", name, ";\n", NIL); wrap_get_variable(n, classname, newclassname, name, code); // create parameter for 'set' function @@ -865,13 +859,12 @@ public: virtual int membervariableHandler(Node *n) { String *name = Getattr(n, "sym:name"); SwigType *type = Copy(Getattr(n, "type")); - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "classtype"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); String *ctype = NewString(""); String *stype; String *new_name = NewString(""); - Replaceall(newclassname, "::", "_"); // create first argument Printv(sobj_name, "struct SwigObj", newclassname, NIL); @@ -904,7 +897,6 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); - Delete(newclassname); Delete(type); return SWIG_OK; } @@ -925,7 +917,7 @@ public: } } Printf(code, "result->typenames[%d] = 0;\n", i); - Printf(code, "Swig_runtime_init();\n"); + Printf(code, "SWIG_Runtime_init();\n"); } /* --------------------------------------------------------------------- @@ -936,8 +928,8 @@ public: if (Getattr(n, "copy_constructor")) return copyconstructorHandler(n); - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "classtype"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -946,8 +938,6 @@ public: String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); - Replaceall(newclassname, "::", "_"); - // prepare argument names Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); @@ -962,7 +952,7 @@ public: Setattr(n, "c:stype", stype); // modify the constructor name - Printv(constr_name, "new_", newclassname, NIL); + constr_name = Swig_name_construct(newclassname); Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); @@ -982,7 +972,6 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); - Delete(newclassname); return SWIG_OK; } @@ -991,8 +980,8 @@ public: * --------------------------------------------------------------------- */ virtual int copyconstructorHandler(Node *n) { - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "classtype"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -1000,7 +989,6 @@ public: String *constr_name = NewString(""); ParmList *parms = Getattr(n, "parms"); - Replaceall(newclassname, "::", "_"); Setattr(parms, "lname", "arg1"); // set the function return type to the pointer to struct @@ -1014,7 +1002,7 @@ public: Setattr(n, "c:stype", stype); // modify the constructor name - Printv(constr_name, "copy_", newclassname, NIL); + constr_name = Swig_name_construct(newclassname); Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); @@ -1033,7 +1021,6 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); - Delete(newclassname); return SWIG_OK; } @@ -1042,8 +1029,8 @@ public: * --------------------------------------------------------------------- */ virtual int destructorHandler(Node *n) { - String *classname = Getattr(parentNode(n), "sym:name"); - String *newclassname = Copy(classname); + String *classname = Getattr(parentNode(n), "classtype"); + String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -1051,9 +1038,6 @@ public: String *destr_name = NewString(""); Parm *p; - Replaceall(newclassname, "::", "_"); - Replaceall(newclassname, "~", ""); - // create first argument Printv(sobj_name, "struct SwigObj", newclassname, " ", NIL); ctype = Copy(sobj_name); @@ -1068,13 +1052,16 @@ public: Setattr(n, "type", "void"); // modify the destructor name - Printv(destr_name, "delete_", newclassname, NIL); + destr_name = Swig_name_destroy(newclassname); Setattr(n, "sym:name", destr_name); // create action code - if (runtime_flag) + if (typecheck_flag) emit_runtime_typecheck(newclassname, destr_name, code); - Printv(code, "delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); + + Printv(code, "if (arg1)\n if (arg1->obj) {\n", NIL); + Printv(code, " delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); + Printv(code, " arg1 = (", sobj_name, "*)0;\n}\n", NIL); Setattr(n, "wrap:action", code); functionWrapper(n); @@ -1085,7 +1072,6 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); - Delete(newclassname); return SWIG_OK; } From 88facfd39079c6f0df5718c3f4426e551295fa3c Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Thu, 17 Jul 2008 00:52:11 +0000 Subject: [PATCH 024/508] Exceptions support for C. exception_order test shows how to use type information to achieve correct catching order. Examples cleanup. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10671 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/arguments/Makefile | 21 -- Examples/c/arguments/example.cxx | 2 - Examples/c/arguments/example.h | 52 ----- Examples/c/arguments/example.i | 8 - Examples/c/arguments/runme.c | 36 ---- Examples/c/check.list | 1 - Examples/c/class/runme.c | 3 +- Examples/c/reference/Makefile | 21 -- Examples/c/reference/example.cxx | 19 -- Examples/c/reference/example.h | 16 -- Examples/c/reference/example.i | 8 - Examples/c/reference/runme.c | 21 -- Examples/c/return/Makefile | 21 -- Examples/c/return/example.cxx | 13 -- Examples/c/return/example.h | 16 -- Examples/c/return/example.i | 8 - Examples/c/return/runme.c | 18 -- Examples/c/simple/example.c | 12 +- Examples/c/simple/example.i | 7 +- Examples/c/simple/runme.c | 6 +- Examples/test-suite/c/c_arguments_runme.c | 20 -- Examples/test-suite/c/exception_order_runme.c | 65 ++++++ Examples/test-suite/c_arguments.i | 23 --- Examples/test-suite/exception_order.i | 15 +- Lib/c/c.swg | 185 +++++++++++------- Lib/exception.i | 15 ++ Source/Modules/c.cxx | 20 +- 27 files changed, 223 insertions(+), 429 deletions(-) delete mode 100644 Examples/c/arguments/Makefile delete mode 100644 Examples/c/arguments/example.cxx delete mode 100644 Examples/c/arguments/example.h delete mode 100644 Examples/c/arguments/example.i delete mode 100644 Examples/c/arguments/runme.c delete mode 100644 Examples/c/reference/Makefile delete mode 100644 Examples/c/reference/example.cxx delete mode 100644 Examples/c/reference/example.h delete mode 100644 Examples/c/reference/example.i delete mode 100644 Examples/c/reference/runme.c delete mode 100644 Examples/c/return/Makefile delete mode 100644 Examples/c/return/example.cxx delete mode 100644 Examples/c/return/example.h delete mode 100644 Examples/c/return/example.i delete mode 100644 Examples/c/return/runme.c delete mode 100644 Examples/test-suite/c/c_arguments_runme.c create mode 100644 Examples/test-suite/c/exception_order_runme.c delete mode 100644 Examples/test-suite/c_arguments.i diff --git a/Examples/c/arguments/Makefile b/Examples/c/arguments/Makefile deleted file mode 100644 index bcc2a8a6f..000000000 --- a/Examples/c/arguments/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -RUNME = runme.c -PROXY = example_proxy.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp - -run: - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' c_compile - env LD_LIBRARY_PATH=. ./runme - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - -check: all diff --git a/Examples/c/arguments/example.cxx b/Examples/c/arguments/example.cxx deleted file mode 100644 index 8f7539719..000000000 --- a/Examples/c/arguments/example.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "example.h" - diff --git a/Examples/c/arguments/example.h b/Examples/c/arguments/example.h deleted file mode 100644 index dfd8465b9..000000000 --- a/Examples/c/arguments/example.h +++ /dev/null @@ -1,52 +0,0 @@ -#include - -class A { -public: - int i; - A(int i) : i(i) {} - void foo() { - } -}; - -class B : public A { -public: - B(int i) : A(i) {} -}; - -class MyClass { -public: - void foo(A a, A* aa, A* aaa[5]) { - printf("a.i = %d\n", a.i); - printf("aa->i = %d\n", aa->i); - int i = 0; - while (aaa[i]) { - printf("aaa[%d]->i = %d\n", i, aaa[i]->i); - i++; - } - } - - void bar(int x, int* px, int** xs) { - printf("x = %d\n", x); - printf("*px = %d\n", *px); - int i = 0; - while (xs[i]) { - printf("*xs[%d] = %d\n", i, *xs[i]); - i++; - } - } - - void foo_1(A& a, A& b) { - printf("a.i = %d\n", a.i); - printf("b.i = %d\n", b.i); - a.i++; - b.i++; - } - - void foo_2(int& x, double& d) { - printf("x = %d d = %f\n", x, d); - x++; - d++; - } - -}; - diff --git a/Examples/c/arguments/example.i b/Examples/c/arguments/example.i deleted file mode 100644 index e4bd75238..000000000 --- a/Examples/c/arguments/example.i +++ /dev/null @@ -1,8 +0,0 @@ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" - diff --git a/Examples/c/arguments/runme.c b/Examples/c/arguments/runme.c deleted file mode 100644 index bceaad4b6..000000000 --- a/Examples/c/arguments/runme.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char** argv) { - MyClass* mc = new_MyClass(); - A* a = new_A(123), *b = new_A(234), *as[5]; - int i, j = 321, *js[5]; - double d = 55.0; - - for (i = 0; i < 4; ++i) { - as[i] = new_A(20 + i); - js[i] = (int*) malloc(sizeof(int)); - *js[i] = 10 + i; - } - - as[i] = 0; - js[i] = 0; - - MyClass_bar(mc, j, &j, js); - MyClass_foo(mc, a, b, as); - MyClass_foo_1(mc, a, b); - MyClass_foo_1(mc, a, b); - - MyClass_foo_2(mc, &j, &d); - MyClass_foo_2(mc, &j, &d); - - delete_A(a); - delete_A(b); - delete_MyClass(mc); - for (i = 0; i < 4; ++i) - delete_A(as[i]); - - return 0; -} - diff --git a/Examples/c/check.list b/Examples/c/check.list index b49c7a984..69d56a4f6 100644 --- a/Examples/c/check.list +++ b/Examples/c/check.list @@ -1,4 +1,3 @@ # see top-level Makefile.in class -reference simple diff --git a/Examples/c/class/runme.c b/Examples/c/class/runme.c index bae2078ec..ddb1cd725 100644 --- a/Examples/c/class/runme.c +++ b/Examples/c/class/runme.c @@ -38,6 +38,7 @@ int main(int argc, char **argv) { printf("%d shapes remain\n", Shape_nshapes_get()); printf("Goodbye\n"); - return 0; + + SWIG_exit(0); } diff --git a/Examples/c/reference/Makefile b/Examples/c/reference/Makefile deleted file mode 100644 index bcc2a8a6f..000000000 --- a/Examples/c/reference/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -RUNME = runme.c -PROXY = example_proxy.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp - -run: - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' c_compile - env LD_LIBRARY_PATH=. ./runme - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - -check: all diff --git a/Examples/c/reference/example.cxx b/Examples/c/reference/example.cxx deleted file mode 100644 index a6fffcf8c..000000000 --- a/Examples/c/reference/example.cxx +++ /dev/null @@ -1,19 +0,0 @@ -#include - -#include "example.h" - -void foo_by_val(Bar bar) { - bar.set(123); - printf("inside foo_by_val: %d\n", bar.get()); -} - -void foo_by_ref(Bar& bar) { - bar.set(123); - printf("inside foo_by_ref: %d\n", bar.get()); -} - -void foo_by_ptr(Bar* bar) { - bar->set(123); - printf("inside foo_by_ptr: %d\n", bar->get()); -} - diff --git a/Examples/c/reference/example.h b/Examples/c/reference/example.h deleted file mode 100644 index 989d26a18..000000000 --- a/Examples/c/reference/example.h +++ /dev/null @@ -1,16 +0,0 @@ -#include - -class Bar { -private: - int x; -public: - Bar() : x(0) {} - ~Bar() {} - void set(int x) { this->x = x; } - int get() { return x; } -}; - -void foo_by_val(Bar bar); -void foo_by_ref(Bar& bar); -void foo_by_ptr(Bar* bar); - diff --git a/Examples/c/reference/example.i b/Examples/c/reference/example.i deleted file mode 100644 index e4bd75238..000000000 --- a/Examples/c/reference/example.i +++ /dev/null @@ -1,8 +0,0 @@ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" - diff --git a/Examples/c/reference/runme.c b/Examples/c/reference/runme.c deleted file mode 100644 index a85718d67..000000000 --- a/Examples/c/reference/runme.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -#include "example_proxy.h" - -void test(Bar * bar) { - printf("value of x is %d\n", Bar_get(bar)); -} - -int main(int argc, char** argv) { - Bar* bar = new_Bar(); - test(bar); - foo_by_val(bar); - test(bar); - foo_by_ptr(bar); - test(bar); - foo_by_ref(bar); - test(bar); - delete_Bar(bar); - return 0; -} - diff --git a/Examples/c/return/Makefile b/Examples/c/return/Makefile deleted file mode 100644 index bcc2a8a6f..000000000 --- a/Examples/c/return/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -RUNME = runme.c -PROXY = example_proxy.c - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp - -run: - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' c_compile - env LD_LIBRARY_PATH=. ./runme - -clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ - -check: all diff --git a/Examples/c/return/example.cxx b/Examples/c/return/example.cxx deleted file mode 100644 index a6913a8a1..000000000 --- a/Examples/c/return/example.cxx +++ /dev/null @@ -1,13 +0,0 @@ -#include "example.h" - -Bar foo_ret_val() { - return Bar(); -} - -Bar *foo_ret_ptr(Bar *bar) { - return bar; -} - -Bar &foo_ret_ref(Bar &bar) { - return bar; -} diff --git a/Examples/c/return/example.h b/Examples/c/return/example.h deleted file mode 100644 index 76c9cfd37..000000000 --- a/Examples/c/return/example.h +++ /dev/null @@ -1,16 +0,0 @@ -#include - -class Bar { -private: - int x; -public: - Bar() : x(0) {} - ~Bar() {} - void set(int x) { this->x = x; } - int get() { return x; } -}; - -Bar foo_ret_val(); -Bar& foo_ret_ref(Bar& bar); -Bar* foo_ret_ptr(Bar* bar); - diff --git a/Examples/c/return/example.i b/Examples/c/return/example.i deleted file mode 100644 index e4bd75238..000000000 --- a/Examples/c/return/example.i +++ /dev/null @@ -1,8 +0,0 @@ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" - diff --git a/Examples/c/return/runme.c b/Examples/c/return/runme.c deleted file mode 100644 index 84a9e807e..000000000 --- a/Examples/c/return/runme.c +++ /dev/null @@ -1,18 +0,0 @@ -#include - -#include "example_proxy.h" - -int main(int argc, char** argv) { - Bar *b = foo_ret_val(); - printf("x = %d\n", Bar_get(b)); - - Bar *c = new_Bar(); - Bar *bp = foo_ret_ptr(c); - //Bar *br = foo_ret_ref(c); - - delete_Bar(b); - delete_Bar(bp); - delete_Bar(c); - return 0; -} - diff --git a/Examples/c/simple/example.c b/Examples/c/simple/example.c index a5800f0db..1c2af789c 100644 --- a/Examples/c/simple/example.c +++ b/Examples/c/simple/example.c @@ -1,15 +1,7 @@ /* File : example.c */ /* A global variable */ -double Foo = 3.0; - -double *Foo_ptr = &Foo; -char *my_str = "hello, world!"; -char *array_of_strs[] = { "one", "two" }; - -char *get_str(int i, void* ptr, float ff) { - return array_of_strs[i]; -} +double Foo = 3.0; /* Compute the greatest common divisor of positive integers */ int gcd(int x, int y) { @@ -22,3 +14,5 @@ int gcd(int x, int y) { } return g; } + + diff --git a/Examples/c/simple/example.i b/Examples/c/simple/example.i index 6c372add0..24093b9bf 100644 --- a/Examples/c/simple/example.i +++ b/Examples/c/simple/example.i @@ -2,11 +2,6 @@ %module example %inline %{ +extern int gcd(int x, int y); extern double Foo; -extern double *Foo_ptr; -extern char *my_str; -extern char **array_of_strs; -extern char *get_str(int i, void* ptr, float ff); -extern int gcd(int x, int y); %} - diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c index 6e48cf57a..4c4bf4571 100644 --- a/Examples/c/simple/runme.c +++ b/Examples/c/simple/runme.c @@ -6,10 +6,6 @@ int main(int argc, char **argv) { int a = 35; int b = 15; printf("Foo is %f\n", Foo); - printf("Foo by ptr is \%f\n", *Foo_ptr); - printf("my_str is: %s\n", my_str); - printf("GCD(%d, %d)=%d\n", a, b, gcd(a, b)); - printf("array_of_strs contains %s and %s\n", get_str(0, 0, 0), get_str(1, 0, 0)); - return 0; + SWIG_exit(0); } diff --git a/Examples/test-suite/c/c_arguments_runme.c b/Examples/test-suite/c/c_arguments_runme.c deleted file mode 100644 index 37863738d..000000000 --- a/Examples/test-suite/c/c_arguments_runme.c +++ /dev/null @@ -1,20 +0,0 @@ -#include - -#include "c_arguments/c_arguments_proxy.h" - -int main(int argc, char **argv) { - A *a = new_A(); - - A *a1, *a2, *a3; - - a1 = foo_1(a); - a2 = foo_2(a); - a3 = foo_3(a); - - delete_A(a); - delete_A(a1); - delete_A(a2); - delete_A(a3); - return 0; -} - diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c new file mode 100644 index 000000000..0db538661 --- /dev/null +++ b/Examples/test-suite/c/exception_order_runme.c @@ -0,0 +1,65 @@ +#include + +#include "exception_order/exception_order_proxy.h" + +int main() { + A* a = new_A(); + + SWIG_try { + A_foo(a); + } + SWIG_catch(E1) { + + } + SWIG_catch(SWIG_AnyException) { + fprintf(stderr, "foo: bad exception order\n"); + } + SWIG_endtry; + + SWIG_try { + A_bar(a); + } + SWIG_catch(E2) { + + } + SWIG_catch(SWIG_AnyException) { + fprintf(stderr, "bar: bad exception order\n"); + } + SWIG_endtry; + + SWIG_try { + A_foobar(a); + } + SWIG_catch(SWIG_AnyException) { + if (strcmp(SWIG_exception.msg, "postcatch unknown") != 0) { + fprintf(stderr, "bad exception order\n"); + SWIG_throw_msg(SWIG_exception.klass, SWIG_exception.msg); + } + } + SWIG_endtry; + + SWIG_try { + A_barfoo(a, 1); + } + SWIG_catch(E1) { + + } + SWIG_catch(SWIG_AnyException) { + fprintf(stderr, "barfoo(1): bad exception order\n"); + } + SWIG_endtry; + + SWIG_try { + A_barfoo(a, 2); + } + SWIG_catch(E2) { + + } + SWIG_catch(SWIG_AnyException) { + fprintf(stderr, "barfoo(2): bad exception order\n"); + } + SWIG_endtry; + + SWIG_exit(0); +} + diff --git a/Examples/test-suite/c_arguments.i b/Examples/test-suite/c_arguments.i deleted file mode 100644 index 083fa494f..000000000 --- a/Examples/test-suite/c_arguments.i +++ /dev/null @@ -1,23 +0,0 @@ -%module c_arguments - -%inline %{ - -class A { - public: - A() : i(0) {} - int i; -}; - -A foo_1(A *a) { - return *a; -} - -A * foo_2(A *a) { - return a; -} - -A & foo_3(A *a) { - return *a; -} - -%} diff --git a/Examples/test-suite/exception_order.i b/Examples/test-suite/exception_order.i index 45a87e0c5..3abe46338 100644 --- a/Examples/test-suite/exception_order.i +++ b/Examples/test-suite/exception_order.i @@ -33,8 +33,21 @@ } #endif -%catches(E1,E2*,ET,ET,...) A::barfoo(int i); +/* + * Additional typemaps needed to handle exception order in C. + */ +#if defined(SWIGC) +%typemap(throws) SWIGTYPE { + SwigObj$1_basetype *_c_ex = _wrap_new_$1_basetype(); + SWIG_CThrowException(_c_ex, "C++ $1_type exception thrown"); +} +%typemap(throws) ET, ET { + SWIG_CThrowException(NULL, "C++ $1_type exception thrown"); +} +#endif + +%catches(E1,E2*,ET,ET,...) A::barfoo(int i); %allowexception efoovar; %allowexception A::efoovar; diff --git a/Lib/c/c.swg b/Lib/c/c.swg index f87419016..71c270feb 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -13,23 +13,27 @@ #include #include #include + +typedef struct { + void *obj; + const char **typenames; +} SwigObj; %} // typemaps for function parameters -%typemap(ctype) void, short, int, long, char, float, double "$1_type" +%typemap(ctype) void, short, int, long, char, float, double, bool "$1_type" %typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_type" -%typemap(ctype) void *, short *, int *, long *, char *, float *, double * "$1_type" -%typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_type" +%typemap(ctype) void *, short *, int *, long *, char *, float *, double *, bool * "$1_type" +%typemap(ctype) void **, short **, int **, long **, char **, float **, double **, bool ** "$1_type" %typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_type" %typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_basetype *" +%typemap(ctype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" %typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_basetype *" -%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" +%typemap(ctype) const short, const int, const long, const char, const float, const double, const bool "$1_type" %typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" -%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" -%typemap(ctype) bool "_Bool" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype*) $input;" +%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1_type" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1 = ($1_basetype*) $input;" %typemap(ctype) SWIGTYPE "struct SwigObj$1_type *" %typemap(ctype) SWIGTYPE * "struct SwigObj$1_type" %typemap(ctype) SWIGTYPE & "struct SwigObj$1_basetype*" @@ -81,13 +85,12 @@ // typemaps for return values -%typemap(couttype) void, short, int, long, char, float, double "$1_type" -%typemap(couttype) void *, short *, int *, long *, char *, float *, double* "$1_type" -%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" -%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" -%typemap(couttype) short &, int &, long &, char &, float &, double & "$1_basetype *" -%typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" -%typemap(couttype) bool "_Bool" +%typemap(couttype) void, short, int, long, char, float, double, bool "$1_type" +%typemap(couttype) void *, short *, int *, long *, char *, float *, double*, bool* "$1_type" +%typemap(couttype) const short, const int, const long, const char, const float, const double, const bool "$1_basetype" +%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1_type" +%typemap(couttype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" +%typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1_basetype const *" %typemap(couttype) SWIGTYPE "struct SwigObj$1_type *" %typemap(couttype) SWIGTYPE * "struct SwigObj$1_type" %typemap(couttype) SWIGTYPE & "struct SwigObj$1_basetype *" @@ -132,25 +135,33 @@ // exception handling +%typemap(throws) int, long, short, unsigned int, unsigned long, unsigned short { + char error_msg[256]; + sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); + SWIG_CThrowException(0, error_msg); +} + +%typemap(throws) char *, const char * { + SWIG_CThrowException(0, $1); +} + +// this should match only non-built-in and non-template objects %typemap(throws) SWIGTYPE { - (void)_e; - SWIG_CThrowException(3, "C++ $1_type exception thrown"); + SWIG_CThrowException(0, "C++ $1_type exception thrown"); } %insert("runtime") %{ -#define SWIG_MAX_HANDLERS 256 #define SWIG_MAX_RT_STACK 256 -SWIGEXPORTC int SWIG_exception_code; +SWIGEXPORTC struct { + int code; + char *msg; + SwigObj *klass; +} SWIG_exception; + SWIGEXPORTC jmp_buf SWIG_rt_env; SWIGEXPORTC int SWIG_rt_init = 0; -SWIGINTERN struct { - int reg; - int code; - void (*fun)(); -} SWIG_Handlers[SWIG_MAX_HANDLERS]; -SWIGINTERN int SWIG_next_handler = 0; SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; @@ -167,6 +178,13 @@ SWIGINTERN void SWIG_rt_stack_pop() { memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); } +SWIGINTERN void SWIG_cleanup() { + if (SWIG_rt_stack_base) + free(SWIG_rt_stack_base); + if (SWIG_exception.msg) + free(SWIG_exception.msg); +} + #ifdef __cplusplus extern "C" { #endif @@ -175,93 +193,112 @@ SWIGEXPORTC void SWIG_rt_try() { SWIG_rt_stack_push(); } -SWIGEXPORTC int SWIG_rt_catch(int code) { - int result = (SWIG_exception_code == code); +SWIGEXPORTC int SWIG_rt_catch(const char *type) { + int result = 0; + if (!type || (strcmp("SWIG_AnyException", type) == 0)) { + result = 1; + } + else if (SWIG_exception.klass) { + int i = 0; + while (SWIG_exception.klass->typenames[i]) { + if (strcmp(SWIG_exception.klass->typenames[i++], type) == 0) { + result = 1; + break; + } + } + } if (result) SWIG_rt_stack_pop(); return result; } -SWIGEXPORTC void SWIG_rt_throw(int code) { - longjmp(SWIG_rt_env, code); +SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { + if (SWIG_exception.msg) { + free(SWIG_exception.msg); + SWIG_exception.msg = (char *) 0; + } + if (msg) { + SWIG_exception.msg = (char *) malloc(strlen(msg)); + strcpy(SWIG_exception.msg, msg); + } + SWIG_exception.klass = klass; + longjmp(SWIG_rt_env, 1); } SWIGEXPORTC void SWIG_rt_endtry() { + if (SWIG_exception.msg) + free(SWIG_exception.msg); SWIG_rt_stack_pop(); - longjmp(SWIG_rt_env, SWIG_exception_code); + longjmp(SWIG_rt_env, SWIG_exception.code); } -SWIGEXPORTC void SWIG_Register_Handler(int code, void (*fun)()) { - if (SWIG_next_handler < SWIG_MAX_HANDLERS) { - int i = SWIG_next_handler++; - SWIG_Handlers[i].reg = 1; - SWIG_Handlers[i].code = code; - SWIG_Handlers[i].fun = fun; - } -} - -SWIGEXPORTC void SWIG_Unregister_Handler(int code) { - int i; - for (i = 0; i < SWIG_next_handler; ++i) { - if (SWIG_Handlers[i].code == code) - SWIG_Handlers[i].reg = 0; - } +SWIGEXPORTC int SWIG_exit(int code) { + SWIG_cleanup(); + exit(code); } #ifdef __cplusplus } #endif +SWIGINTERN void SWIG_terminate() { + fprintf(stderr, "Unhandled exception: %s\n%s (error code: %d)\nExitting...\n", + SWIG_exception.klass->typenames[0], + SWIG_exception.msg, + SWIG_exception.code); + SWIG_exit(SWIG_exception.code); +} + SWIGINTERN void SWIG_Runtime_init() { int i, code; if (!SWIG_rt_init) { SWIG_rt_init = 1; - for (i = 0; i < SWIG_MAX_HANDLERS; ++i) - SWIG_Handlers[i].reg = 0; SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); - if (code = setjmp(SWIG_rt_env)) { - for (i = 0; i < SWIG_next_handler; ++i) { - if (SWIG_Handlers[i].reg) - if (SWIG_Handlers[i].code == code) - SWIG_Handlers[i].fun(); - } - fprintf(stderr, "Unhandled exception. Exitting...\n"); - exit(code); - } + if (SWIG_exception.code = setjmp(SWIG_rt_env)) + SWIG_terminate(); } } -SWIGINTERN void SWIG_CThrowException(int code, char *msg) { +SWIGINTERN void SWIG_CThrowException(void *klass, const char *msg) { if (SWIG_rt_init) - longjmp(SWIG_rt_env, code); - else { - fprintf(stderr, "%s\n", msg); - exit(code); - } + SWIG_rt_throw((SwigObj *) klass, msg); + else + SWIG_terminate(); } - %} %insert("proxy_header") %{ +// special value indicating any type of exception like 'catch(...)' +#define SWIG_AnyException "SWIG_AnyException" + +#include #include -void SWIG_Register_Handler(int code, void (*fun)()); -void SWIG_Unregister_Handler(int code); -int SWIG_exception_try(); -void SWIG_exception_throw(); - SWIGIMPORT jmp_buf SWIG_rt_env; -SWIGIMPORT int SWIG_exception_code; + +typedef struct { + void *obj; + const char **typenames; +} SwigObj; + +SWIGIMPORT struct { + int code; + char *msg; + SwigObj *klass; +} SWIG_exception; + SWIGIMPORT void SWIG_rt_try(); -SWIGIMPORT int SWIG_rt_catch(); -SWIGIMPORT void SWIG_rt_throw(int val); +SWIGIMPORT int SWIG_rt_catch(const char *type); +SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg); SWIGIMPORT int SWIG_rt_endtry(); +SWIGIMPORT int SWIG_exit(int code); #define SWIG_try \ SWIG_rt_try(); \ - if ((SWIG_exception_code = setjmp(SWIG_rt_env)) == 0) -#define SWIG_catch(val) else if (SWIG_rt_catch(val)) -#define SWIG_throw(val) SWIG_rt_throw(val); + if ((SWIG_exception.code = setjmp(SWIG_rt_env)) == 0) +#define SWIG_catch(type) else if (SWIG_rt_catch(#type)) +#define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); +#define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); #define SWIG_endtry else SWIG_rt_endtry(); %} diff --git a/Lib/exception.i b/Lib/exception.i index e30ac1a5d..e89e22e5a 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -212,6 +212,21 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) { #endif // SWIGLUA +#ifdef SWIGC + +%inline %{ +struct SWIG_CException { + SWIG_CException(int code) { + SWIG_exception.code = code; + } +}; +%} + +#define SWIG_exception(code, msg)\ + SWIG_CThrowException(_wrap_new_SWIG_CException(code), msg); + +#endif // SWIGC + #ifdef __cplusplus /* You can use the SWIG_CATCH_STDEXCEPT macro with the %exception diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 924988584..322ee98b3 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -61,6 +61,7 @@ public: SWIG_typemap_lang("c"); SWIG_config_file("c.swg"); + // FIXME Swig_typemap_class_distinguish(false); // look for certain command line options @@ -185,8 +186,6 @@ public: virtual int globalvariableHandler(Node *n) { SwigType *type = Getattr(n, "type"); String *type_str = SwigType_str(type, 0); - //if (!CPlusPlus) - // Printv(f_wrappers, "SWIGEXPORTC ", type_str, " ", Getattr(n, "name"), ";\n", NIL); if (proxy_flag) { Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); } @@ -256,12 +255,12 @@ public: } /* ---------------------------------------------------------------------- - * getTypeSymbol() + * getMangledType() * * incomplete for now... * ---------------------------------------------------------------------- */ - const char *getTypeSymbol(String *type) { + const char *getMangledType(String *type) { char *c = Char(type); if (strcmp(c, "int") == 0) return "i"; @@ -332,7 +331,7 @@ public: if (parms) Append(over_suffix, "_"); for (p = parms; p; p = nextSibling(p)) { - Append(over_suffix, getTypeSymbol(Getattr(p, "type"))); + Append(over_suffix, getMangledType(Getattr(p, "type"))); } Append(name, over_suffix); } @@ -618,7 +617,8 @@ public: // emit "class"-struct definition Printv(sobj, "struct SwigObj", name, " {\n void* obj;\n", NIL); if (runtime_flag) - Printf(sobj, " const char* typenames[%d];\n}", Len(baselist) + 2); + //Printf(sobj, " const char *typenames[%d];\n}", Len(baselist) + 2); + Printf(sobj, " const char **typenames;\n}"); else Printf(sobj, "}"); @@ -627,7 +627,7 @@ public: // declare it in the proxy header if (proxy_flag) - Printv(f_proxy_header, "typedef ", sobj, " ", name, ";\n\n", NIL); + Printv(f_proxy_header, "#define ", name, " SwigObj\n\n", NIL); Delete(sobj); Delete(name); @@ -908,6 +908,7 @@ public: void emit_runtime_make_object(Node *n, String *classname, String *code) { // store the name of each class in the hierarchy List *baselist = Getattr(parentNode(n), "bases"); + Printf(code, "result->typenames = (const char **) malloc(%d*sizeof(const char*));\n", Len(baselist) + 2); Printv(code, "result->typenames[0] = Swig_typename_", classname, ";\n", NIL); int i = 1; if (baselist) { @@ -1059,8 +1060,9 @@ public: if (typecheck_flag) emit_runtime_typecheck(newclassname, destr_name, code); - Printv(code, "if (arg1)\n if (arg1->obj) {\n", NIL); - Printv(code, " delete (", classname, "*) (arg1->obj);\nfree(arg1);\n", NIL); + Printv(code, "if (arg1) if (arg1->obj) {\n", NIL); + Printv(code, " delete (", classname, "*) (arg1->obj);\n", NIL); + Printv(code, " free(arg1->typenames);\n free(arg1);\n", NIL); Printv(code, " arg1 = (", sobj_name, "*)0;\n}\n", NIL); Setattr(n, "wrap:action", code); From e90a0692c7a08a702d7d4e1b96d915f84177c0af Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Thu, 17 Jul 2008 09:53:05 +0000 Subject: [PATCH 025/508] Replaced SwigObjXXX with one type SwigObj. Added typemaps for bool. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10674 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/simple/runme.c | 10 +++-- Examples/test-suite/exception_order.i | 2 +- Lib/c/c.swg | 60 ++++++++++++++++----------- Source/Modules/c.cxx | 13 +++--- 4 files changed, 51 insertions(+), 34 deletions(-) diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c index 4c4bf4571..1c9891713 100644 --- a/Examples/c/simple/runme.c +++ b/Examples/c/simple/runme.c @@ -3,9 +3,13 @@ #include "example_proxy.h" int main(int argc, char **argv) { - int a = 35; - int b = 15; - printf("Foo is %f\n", Foo); + int a = 42; + int b = 105; + int g = gcd(a, b); + printf("The gcd of %d and %d is %d\n", a, b, g); + printf("Foo = %f\n", Foo); + Foo = 3.1415926; + printf("Foo = %f\n", Foo); SWIG_exit(0); } diff --git a/Examples/test-suite/exception_order.i b/Examples/test-suite/exception_order.i index 3abe46338..73f121984 100644 --- a/Examples/test-suite/exception_order.i +++ b/Examples/test-suite/exception_order.i @@ -38,7 +38,7 @@ */ #if defined(SWIGC) %typemap(throws) SWIGTYPE { - SwigObj$1_basetype *_c_ex = _wrap_new_$1_basetype(); + SwigObj *_c_ex = _wrap_new_$1_basetype(); SWIG_CThrowException(_c_ex, "C++ $1_type exception thrown"); } diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 71c270feb..709ac0a49 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -22,22 +22,27 @@ typedef struct { // typemaps for function parameters -%typemap(ctype) void, short, int, long, char, float, double, bool "$1_type" +%typemap(ctype) void, short, int, long, char, float, double "$1_type" %typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_type" -%typemap(ctype) void *, short *, int *, long *, char *, float *, double *, bool * "$1_type" -%typemap(ctype) void **, short **, int **, long **, char **, float **, double **, bool ** "$1_type" +%typemap(ctype) void *, short *, int *, long *, char *, float *, double * "$1_type" +%typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_type" %typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_type" %typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" +%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_basetype *" %typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_basetype *" -%typemap(ctype) const short, const int, const long, const char, const float, const double, const bool "$1_type" +%typemap(ctype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype *" +%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" %typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" %typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1_type" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1 = ($1_basetype*) $input;" -%typemap(ctype) SWIGTYPE "struct SwigObj$1_type *" -%typemap(ctype) SWIGTYPE * "struct SwigObj$1_type" -%typemap(ctype) SWIGTYPE & "struct SwigObj$1_basetype*" -%typemap(ctype) SWIGTYPE * [ANY] "struct SwigObj$1_basetype*" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1_basetype **" +%typemap(ctype) SWIGTYPE "SwigObj *" +%typemap(ctype) SWIGTYPE * "SwigObj *" +%typemap(ctype) SWIGTYPE & "SwigObj *" +%typemap(ctype) SWIGTYPE * [ANY] "SwigObj *" + +%fragment("stdbool_inc", "proxy_header") {#include } +%typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" +%typemap(ctype, fragment="stdbool_inc") bool &, const bool & "$1_basetype *" %typemap(in) short, int, long, char, float, double, bool "$1 = ($1_type) $input;" %typemap(in) void *, short *, int *, long *, char *, float *, double *, bool * "$1 = ($1_type) $input;" @@ -52,6 +57,8 @@ typedef struct { %typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_basetype *) $input;" %typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype const *) $input;" +%typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1 = ($1_type) $input;" +%typemap(in, fragment="stdbool_inc") bool &, const bool & "$1 = ($1_basetype *) $input;" %typemap(in) SWIGTYPE { $1 = * ($1_type *) ($input->obj); @@ -85,18 +92,21 @@ typedef struct { // typemaps for return values -%typemap(couttype) void, short, int, long, char, float, double, bool "$1_type" -%typemap(couttype) void *, short *, int *, long *, char *, float *, double*, bool* "$1_type" -%typemap(couttype) const short, const int, const long, const char, const float, const double, const bool "$1_basetype" -%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1_type" +%typemap(couttype) void, short, int, long, char, float, double "$1_type" +%typemap(couttype) void *, short *, int *, long *, char *, float *, double* "$1_type" +%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" +%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" %typemap(couttype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" -%typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1_basetype const *" -%typemap(couttype) SWIGTYPE "struct SwigObj$1_type *" -%typemap(couttype) SWIGTYPE * "struct SwigObj$1_type" -%typemap(couttype) SWIGTYPE & "struct SwigObj$1_basetype *" +%typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" +%typemap(couttype) SWIGTYPE "SwigObj *" +%typemap(couttype) SWIGTYPE * "SwigObj *" +%typemap(couttype) SWIGTYPE & "SwigObj *" -%typemap(out) short, int, long, char, float, double, bool "$result = $1;" -%typemap(out) void*, short*, int*, long*, char*, float*, double*, bool* "$result = $1;" +%typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_type" +%typemap(couttype, fragment="stdbool_inc") bool &, const bool & "$1_basetype *" + +%typemap(out) short, int, long, char, float, double "$result = $1;" +%typemap(out) void*, short*, int*, long*, char*, float*, double* "$result = $1;" %typemap(out) const short, const int, const long, const char, const float, const double "$result = $1;" %typemap(out) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$result = $1;" %typemap(out) unsigned short, unsigned int, unsigned long, unsigned char "$result = $1;" @@ -107,10 +117,13 @@ typedef struct { %typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$result = $1;" %typemap(out) void "" +%typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = $1;" +%typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" + // allocate new "object-struct" by default %typemap(out) SWIGTYPE { - $result = (struct SwigObj$1_type *) malloc(sizeof(struct SwigObj$1_type)); + $result = (SwigObj *) malloc(sizeof(SwigObj)); $result->obj = (void*) &$1; #if SWIG_C_RUNTIME $result->typenames[0] = 0; // FIXME @@ -118,7 +131,7 @@ typedef struct { } %typemap(out) SWIGTYPE * { - $result = (struct SwigObj$1_type) malloc(sizeof(struct SwigObj$*1_type)); + $result = (SwigObj *) malloc(sizeof(SwigObj)); $result->obj = (void*) $1; #if SWIG_C_RUNTIME $result->typenames[0] = 0; // FIXME @@ -126,7 +139,7 @@ typedef struct { } %typemap(out) SWIGTYPE & { - $result = (struct SwigObj$1_basetype *) malloc(sizeof(struct SwigObj$1_basetype)); + $result = (SwigObj *) malloc(sizeof(SwigObj)); $result->obj = (void*) $1; #if SWIG_C_RUNTIME $result->typenames[0] = 0; // FIXME @@ -271,7 +284,6 @@ SWIGINTERN void SWIG_CThrowException(void *klass, const char *msg) { // special value indicating any type of exception like 'catch(...)' #define SWIG_AnyException "SWIG_AnyException" -#include #include SWIGIMPORT jmp_buf SWIG_rt_env; diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 322ee98b3..5f694ab24 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -627,7 +627,8 @@ public: // declare it in the proxy header if (proxy_flag) - Printv(f_proxy_header, "#define ", name, " SwigObj\n\n", NIL); + //Printv(f_proxy_header, "#define ", name, " SwigObj\n\n", NIL); + Printv(f_proxy_header, "typedef SwigObj ", name, ";\n\n", NIL); Delete(sobj); Delete(name); @@ -708,7 +709,7 @@ public: ParmList *parms = Getattr(n, "parms"); // create first argument - Printv(sobj_name, "struct SwigObj", newclassname, NIL); + Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Parm *p = NewParm(ctype, "self"); @@ -867,7 +868,7 @@ public: String *new_name = NewString(""); // create first argument - Printv(sobj_name, "struct SwigObj", newclassname, NIL); + Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Parm *p = NewParm(ctype, "self"); @@ -943,7 +944,7 @@ public: Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); // set the function return type to the pointer to struct - Printv(sobj_name, "struct SwigObj", newclassname, NIL); + Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); @@ -993,7 +994,7 @@ public: Setattr(parms, "lname", "arg1"); // set the function return type to the pointer to struct - Printv(sobj_name, "struct SwigObj", newclassname, NIL); + Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); Setattr(n, "type", ctype); @@ -1040,7 +1041,7 @@ public: Parm *p; // create first argument - Printv(sobj_name, "struct SwigObj", newclassname, " ", NIL); + Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); p = NewParm(ctype, "self"); From 9c5ef7558cdc9ce11243c38ba90be623a55a9718 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 21 Jul 2008 10:55:05 +0000 Subject: [PATCH 026/508] Support for enums and typedefs. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10691 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 5 +- Lib/c/c.swg | 12 +- Source/Modules/c.cxx | 207 +++++++++++++++++++++++++----- configure.in | 8 +- 4 files changed, 190 insertions(+), 42 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 163c4f7d7..bef483450 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,7 +13,10 @@ top_builddir = @top_builddir@/.. C_TEST_CASES = CPP_TEST_CASES = \ - c_arguments + exception_order \ + exception_partial_info \ + enums \ + enum_plus \ include $(srcdir)/../common.mk diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 709ac0a49..6312ac21b 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -39,6 +39,7 @@ typedef struct { %typemap(ctype) SWIGTYPE * "SwigObj *" %typemap(ctype) SWIGTYPE & "SwigObj *" %typemap(ctype) SWIGTYPE * [ANY] "SwigObj *" +%typemap(ctype) enum SWIGTYPE "$1_type" %fragment("stdbool_inc", "proxy_header") {#include } %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -60,6 +61,8 @@ typedef struct { %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1 = ($1_type) $input;" %typemap(in, fragment="stdbool_inc") bool &, const bool & "$1 = ($1_basetype *) $input;" +%typemap(in) enum SWIGTYPE "$1 = ($1_type) $input;" + %typemap(in) SWIGTYPE { $1 = * ($1_type *) ($input->obj); } @@ -98,9 +101,10 @@ typedef struct { %typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" %typemap(couttype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" %typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" -%typemap(couttype) SWIGTYPE "SwigObj *" -%typemap(couttype) SWIGTYPE * "SwigObj *" -%typemap(couttype) SWIGTYPE & "SwigObj *" +%typemap(couttype) SWIGTYPE "SwigObj *" +%typemap(couttype) SWIGTYPE * "SwigObj *" +%typemap(couttype) SWIGTYPE & "SwigObj *" +%typemap(couttype) enum SWIGTYPE "$1_type" %typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_type" %typemap(couttype, fragment="stdbool_inc") bool &, const bool & "$1_basetype *" @@ -120,6 +124,8 @@ typedef struct { %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" +%typemap(out) enum SWIGTYPE "$result = ($1_type) $1;" + // allocate new "object-struct" by default %typemap(out) SWIGTYPE { diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 5f694ab24..cc9efd174 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -9,6 +9,7 @@ char cvsroot_c_cxx[] = "$Id$"; +#include #include "swigmod.h" class C:public Language { @@ -26,6 +27,8 @@ class C:public Language { String *f_proxy_header; String *empty_string; + String *int_string; + String *enum_values; bool proxy_flag; bool runtime_flag; @@ -39,6 +42,8 @@ public: C() : empty_string(NewString("")), + int_string(NewString("int")), + enum_values(0), proxy_flag(true), runtime_flag(true), typecheck_flag(false) { @@ -187,7 +192,7 @@ public: SwigType *type = Getattr(n, "type"); String *type_str = SwigType_str(type, 0); if (proxy_flag) { - Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n", NIL); + Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n\n", NIL); } return SWIG_OK; } @@ -270,6 +275,35 @@ public: return "UNKNOWN"; } + /* ---------------------------------------------------------------------- + * make_enum_type() + * + * given C++ enum type this function returns its C representation + * ---------------------------------------------------------------------- */ + + String *make_enum_type(Node *n, SwigType *enumtype) { + Symtab *symtab = Getattr(n, "sym:symtab"); + String *unnamed = Getattr(n, "unnamed"); + String *newtype = 0; + String *query = 0; + + if (!unnamed) + query = Swig_scopename_last(SwigType_str(enumtype, 0)); + else { + Replaceall(unnamed, "$unnamed", "enum"); + Replaceall(unnamed, "$", ""); + query = unnamed; + } + + Node *node = Swig_symbol_clookup(query, symtab); + if (node) + newtype = NewStringf("enum %s", Getattr(node, "name")); + else + newtype = Copy(enumtype); + + return newtype; + } + /* ---------------------------------------------------------------------- * functionWrapper() * ---------------------------------------------------------------------- */ @@ -286,7 +320,7 @@ public: String *proto = NewString(""); String *over_suffix = NewString(""); int gencomma; - bool is_void_return = (SwigType_type(Getattr(n, "type")) == T_VOID); + bool is_void_return = (SwigType_type(type) == T_VOID); // create new function wrapper object Wrapper *wrapper = NewWrapper(); @@ -304,7 +338,7 @@ public: Delitem(arg_names, 0); Delitem(arg_names, DOH_END); } - return_type = SwigType_str(Getattr(n, "type"), 0); + return_type = SwigType_str(type, 0); // emit wrapper prototype and code gencomma = 0; @@ -341,16 +375,16 @@ public: wname = Swig_name_wrapper(name); Setattr(n, "wrap:name", wname); - // attach the standard typemaps - emit_attach_parmmaps(parms, wrapper); - Setattr(n, "wrap:parms", parms); - // set the return type if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { Printv(return_type, SwigType_str(type, 0), NIL); } + else if (SwigType_isenum(type)) { + type = return_type = make_enum_type(n, type); + Setattr(n, "type", return_type); + } else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { - String *ctypeout = Getattr(n, "tmap:ctype:out"); // the type in the ctype typemap's out attribute overrides the type in the typemap + String *ctypeout = Getattr(n, "tmap:couttype:out"); if (ctypeout) tm = ctypeout; Printf(return_type, "%s", tm); @@ -359,23 +393,27 @@ public: Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); } - // attach 'ctype' typemaps - Swig_typemap_attach_parms("ctype", parms, wrapper); - - // emit variables for holding parameters - emit_parameter_variables(parms, wrapper); - // add variable for holding result of original function if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if (SwigType_isconst(type)) SwigType_del_qualifier(type); SwigType *return_var_type = SwigType_isreference(type) ? SwigType_add_pointer(SwigType_base(type)) : type; - Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); + if (SwigType_isenum(type)) + Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); + else + Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); } // create wrapper function prototype Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); + // attach the standard typemaps + emit_attach_parmmaps(parms, wrapper); + Setattr(n, "wrap:parms", parms); + + // attach 'ctype' typemaps + Swig_typemap_attach_parms("ctype", parms, wrapper); + // prepare function definition gencomma = 0; for (p = parms; p; ) { @@ -392,9 +430,20 @@ public: Printf(arg_name, "c%s", lname); + bool dont_apply_tmap = false; + // set the appropriate type for parameter if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { Printv(c_parm_type, SwigType_str(type, 0), NIL); + dont_apply_tmap = true; + } + else if (SwigType_isenum(type)) { + c_parm_type = make_enum_type(n, type); + if (Getattr(n, "unnamed")) { + type = int_string; + Setattr(p, "type", type); + dont_apply_tmap = true; + } } else if ((tm = Getattr(p, "tmap:ctype"))) { Printv(c_parm_type, tm, NIL); @@ -412,8 +461,6 @@ public: Printv(proxy_parm_type, c_parm_type, NIL); } - Replaceall(c_parm_type, "::", "_"); - Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", Getattr(p, "name"), NIL); @@ -421,8 +468,7 @@ public: // apply typemaps for input parameter if ((tm = Getattr(p, "tmap:in"))) { - if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { - // FIXME: should work as typemaps for basic types + if (dont_apply_tmap) { Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); } else { @@ -443,6 +489,9 @@ public: Printf(wrapper->def, ") {"); + // emit variables for holding parameters + emit_parameter_variables(parms, wrapper); + // emit variable for holding function return value emit_return_variable(n, return_type, wrapper); @@ -462,6 +511,8 @@ public: Replaceall(action, "$mod", ref_cast); Delete(ref_cast); } + else if (SwigType_isenum(type)) + Replaceall(action, "$mod", "(int)"); else Replaceall(action, "$mod", ""); @@ -525,13 +576,13 @@ public: void emit_runtime_typecheck(String *classname, String *funcname, String *code) { Printf(code, "{\nint i = 0, type_ok = 0;\n"); Printf(code, "if (arg1 == NULL) {\n"); - Printv(code, " fprintf(stderr, \"error: NULL object-struct passed to ", funcname, "\\n\");\n"); + Printv(code, " fprintf(stdout, \"error: NULL object-struct passed to ", funcname, "\\n\");\n"); Printf(code, " longjmp(Swig_rt_env, 0);\n}\n"); Printf(code, "while(arg1->typenames[i]) {\n"); Printv(code, " if (strcmp(arg1->typenames[i++], \"", classname, "\") == 0) {\n", NIL); Printf(code, " type_ok = 1;\nbreak;\n}\n}\n"); Printf(code, "if (!type_ok) {\n"); - Printv(code, " fprintf(stderr, \"error: object-struct passed to ", funcname, " is not of class ", classname, "\\n\");\n", NIL); + Printv(code, " fprintf(stdout, \"error: object-struct passed to ", funcname, " is not of class ", classname, "\\n\");\n", NIL); Printf(code, " longjmp(Swig_rt_env, 0);\n}\n}\n"); } @@ -614,20 +665,10 @@ public: } } - // emit "class"-struct definition - Printv(sobj, "struct SwigObj", name, " {\n void* obj;\n", NIL); - if (runtime_flag) - //Printf(sobj, " const char *typenames[%d];\n}", Len(baselist) + 2); - Printf(sobj, " const char **typenames;\n}"); - else - Printf(sobj, "}"); - - Printv(f_header, sobj, ";\n\n", NIL); Printv(f_header, "const char* Swig_typename_", name, " = \"", name, "\";\n\n", NIL); - // declare it in the proxy header + // declare type for specific class in the proxy header if (proxy_flag) - //Printv(f_proxy_header, "#define ", name, " SwigObj\n\n", NIL); Printv(f_proxy_header, "typedef SwigObj ", name, ";\n\n", NIL); Delete(sobj); @@ -809,7 +850,6 @@ public: } Append(action, code); Setattr(n, "wrap:action", action); - Setattr(n, "type", "void"); functionWrapper(n); @@ -842,6 +882,8 @@ public: if (!SwigType_isconst(type)) { // create code for 'set' function code = NewString(""); + if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) + Printf(code, "* (int *) &"); Printv(code, classname, "::", name, " = arg1;\n", NIL); wrap_set_variable(n, classname, newclassname, name, code); } @@ -890,8 +932,13 @@ public: // create 'set' function set_nextSibling(p, t); Setattr(n, "parms", p); + String *code = 0; + if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) { + code = NewString(""); + Printv(code, "* (int *) &((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); + } Setattr(n, "type", "void"); - wrap_set_variable(n, classname, newclassname, name, 0); + wrap_set_variable(n, classname, newclassname, name, code); } Delete(new_name); @@ -1080,9 +1127,59 @@ public: /* --------------------------------------------------------------------- * enumDeclaration() + * + * for enums declared inside class we create global enum declaration + * and change enum parameter and return value names * --------------------------------------------------------------------- */ virtual int enumDeclaration(Node *n) { + String *newclassname = Getattr(parentNode(n), "sym:name"); + String *name = Getattr(n, "sym:name"); + String *code = NewString(""); + String *tdname = Getattr(n, "tdname"); + String *newname = newclassname ? NewStringf("%s_", newclassname) : Copy(name); + Symtab *symtab = Getattr(n, "sym:symtab"); + + if (tdname) + Printf(code, "typedef "); + + Printf(code, "enum "); + + if (Delattr(n, "unnamed")) { + // unnamed enum declaration: create new symbol + Replaceall(name, "$unnamed", "enum"); + Delitem(name, DOH_END); + + Node *entry = NewHash(); + set_nodeType(entry, "enum"); + Setattr(entry, "name", name); + Setattr(entry, "sym:name", name); + Setattr(entry, "sym:symtab", symtab); + Swig_symbol_add(name, entry); + } + + if (newclassname) { + if (symtab) { + Node *node = Swig_symbol_clookup(name, symtab); + if (node) { + Append(newname, name); + Setattr(node, "name", newname); + } + } + } + Printv(code, newname ? newname : "", " {\n$enumvalues\n} ", tdname ? tdname : "", ";\n\n", NIL); + emit_children(n); + if (enum_values) { + Replaceall(code, "$enumvalues", enum_values); + Append(f_proxy_header, code); + if (newclassname) + Append(f_header, code); + Delete(enum_values); + enum_values = 0; + } + + Delete(newname); + Delete(code); return SWIG_OK; } @@ -1091,6 +1188,48 @@ public: * --------------------------------------------------------------------- */ virtual int enumvalueDeclaration(Node *n) { + String *name = Getattr(n, "sym:name"); + String *enumvalue = Getattr(n, "enumvalue"); + String *init = 0; + if (enumvalue) { + char *value_repr = Char(enumvalue); + if (value_repr) + if (!isdigit(*value_repr) && *value_repr != '+') { + init = NewStringf(" = '%c'", *value_repr); + } + else + init = NewStringf(" = %s", enumvalue); + } + + String *newclassname = Getattr(parentNode(parentNode(n)), "sym:name"); + String *newname = NewStringf("%s_%s", newclassname, name); + int gencomma = 1; + if (!enum_values) { + enum_values = NewString(""); + gencomma = 0; + } + Printv(enum_values, gencomma ? ",\n " : " ", newclassname ? newname : name, enumvalue ? init : "", NIL); + Delete(newname); + if (init) + Delete(init); + return SWIG_OK; + } + + /* --------------------------------------------------------------------- + * typedefHandler() + * --------------------------------------------------------------------- */ + + virtual int typedefHandler(Node *n) { + String *name = Getattr(n, "sym:name"); + String *type = Getattr(n, "type"); + char *c = Char(SwigType_str(type, 0)); + if (strncmp(c, "enum", 4) != 0) { + if (name && type) { + String *code = NewStringf("typedef %s %s;\n\n", type, name); + Append(f_proxy_header, code); + Delete(code); + } + } return SWIG_OK; } diff --git a/configure.in b/configure.in index 0059c96fd..b1d302264 100644 --- a/configure.in +++ b/configure.in @@ -1959,10 +1959,10 @@ SKIP_UFFI= #fi AC_SUBST(SKIP_UFFI) -SKIP_C="" -#if test -x "$(CC)" || test -z "$(CXX)" ; then -# SKIP_C="1" -#fi +SKIP_C= +if test -x "$CC" || test -z "$CXX" ; then + SKIP_C="1" +fi AC_SUBST(SKIP_C) #---------------------------------------------------------------- From 6fd77fa6098533adef485e0cb14e798a922b44b0 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 21 Jul 2008 15:52:30 +0000 Subject: [PATCH 027/508] Renaming and type mangling fixes. Reverted to normal typemaps searching. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10694 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 8 ++-- Source/Modules/c.cxx | 85 ++++++++++++++++++++++++++++++++----------- Source/Swig/swig.h | 1 - Source/Swig/typemap.c | 37 +------------------ 4 files changed, 70 insertions(+), 61 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 6312ac21b..f17d3d7df 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -47,16 +47,18 @@ typedef struct { %typemap(in) short, int, long, char, float, double, bool "$1 = ($1_type) $input;" %typemap(in) void *, short *, int *, long *, char *, float *, double *, bool * "$1 = ($1_type) $input;" -%typemap(in) void **, short **, int **, long **, char **, float **, double **, bool * "$1 = ($1_type) $input;" +%typemap(in) void **, short **, int **, long **, char **, float **, double **, bool * "$1 = ($1_basetype **) $input;" %typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1 = ($1_type) $input;" %typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1 = ($1_type) $input;" %typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1 = ($1_basetype *) $input;" %typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned char * "$1 = ($1_type) $input;" %typemap(in) unsigned short, unsigned int, unsigned long, unsigned char "$1 = ($1_type) $input;" %typemap(in) short &, int &, long &, char &, float &, double &, bool & "$1 = ($1_basetype *) $input;" -%typemap(in) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1 = ($1_basetype const *) $input;" +%typemap(in) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1 = ($1_basetype *) $input;" %typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_basetype *) $input;" -%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype const *) $input;" +%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype *) $input;" + +%typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1 = ($1_type) $input;" %typemap(in, fragment="stdbool_inc") bool &, const bool & "$1 = ($1_basetype *) $input;" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index cc9efd174..704713fd5 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -66,9 +66,6 @@ public: SWIG_typemap_lang("c"); SWIG_config_file("c.swg"); - // FIXME - Swig_typemap_class_distinguish(false); - // look for certain command line options for (int i = 1; i < argc; i++) { if (argv[i]) { @@ -261,18 +258,61 @@ public: /* ---------------------------------------------------------------------- * getMangledType() - * - * incomplete for now... * ---------------------------------------------------------------------- */ - const char *getMangledType(String *type) { - char *c = Char(type); - if (strcmp(c, "int") == 0) - return "i"; - if (strcmp(c, "double") == 0) - return "d"; + String *getMangledType(SwigType *type_arg) { + static String *result = 0; + SwigType *prefix = 0; + if (result) + Delete(result); + result = NewString(""); - return "UNKNOWN"; + /*Printf(stderr, "MANGLING TYPE: %s\n", type_arg);*/ + + SwigType *type = Copy(type_arg); + + if (SwigType_ismemberpointer(type)) { + SwigType_del_memberpointer(type); + SwigType_add_pointer(type); + } + + if (SwigType_ispointer(type)) { + SwigType_del_pointer(type); + if (SwigType_isfunction(type)) { + Printf(result, "f"); + goto ready; + } + Delete(type); + type = Copy(type_arg); + } + + prefix = SwigType_prefix(type); + Replaceall(prefix, ".", ""); + Replaceall(prefix, "const", "c"); + Replaceall(prefix, "volatile", "v"); + Replaceall(prefix, "a(", "a"); + Replaceall(prefix, "m(", "m"); + Replaceall(prefix, "q(", ""); + Replaceall(prefix, ")", ""); + Replaceall(prefix, " ", ""); + Printf(result, "%s", prefix); + + type = SwigType_base(type); + if (SwigType_isbuiltin(type)) + Printf(result, "%c", *Char(SwigType_base(type))); + else if (SwigType_isenum(type)) + Printf(result, "e%s", Swig_scopename_last(type)); + else + Printf(result, "%s", Char(SwigType_base(type))); + +ready: + /*Printf(stderr, " RESULT: %s\n", result);*/ + + if (prefix) + Delete(prefix); + if (type) + Delete(type); + return result; } /* ---------------------------------------------------------------------- @@ -362,10 +402,11 @@ public: // mangle name if function is overloaded if (Getattr(n, "sym:overloaded")) { if (!Getattr(n, "copy_constructor")) { - if (parms) - Append(over_suffix, "_"); for (p = parms; p; p = nextSibling(p)) { - Append(over_suffix, getMangledType(Getattr(p, "type"))); + if (Getattr(p, "c:objstruct")) + continue; + String *mangled = getMangledType(Getattr(p, "type")); + Printv(over_suffix, "_", mangled, NIL); } Append(name, over_suffix); } @@ -703,7 +744,7 @@ public: * --------------------------------------------------------------------- */ virtual int staticmemberfunctionHandler(Node *n) { - String *name = Getattr(n, "name"); + String *name = Copy(Getattr(n, "sym:name")); String *classname = Getattr(parentNode(n), "typename"); String *newclassname = Getattr(parentNode(n), "sym:name"); String *new_name = NewString(""); @@ -717,12 +758,12 @@ public: Delitem(arg_lnames, DOH_END); // modify method name - Printv(new_name, newclassname, "_", name, NIL); + new_name = Swig_name_member(newclassname, name); Setattr(n, "sym:name", new_name); // generate action code Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); - Printv(code, classname, "::", name, "(", arg_lnames, ");\n", NIL); + Printv(code, classname, "::", Getattr(n, "name"), "(", arg_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); functionWrapper(n); @@ -730,6 +771,7 @@ public: Delete(arg_lnames); Delete(code); Delete(new_name); + Delete(name); return SWIG_OK; } @@ -738,7 +780,7 @@ public: * --------------------------------------------------------------------- */ virtual int memberfunctionHandler(Node *n) { - String *name = Getattr(n, "name"); + String *name = Copy(Getattr(n, "sym:name")); String *classname = Getattr(parentNode(n), "classtype"); String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); @@ -776,14 +818,14 @@ public: Delitem(arg_lnames, DOH_END); // modify method name - Printv(new_name, newclassname, "_", name, NIL); + new_name = Swig_name_member(newclassname, name); Setattr(n, "sym:name", new_name); // generate action code if (typecheck_flag) emit_runtime_typecheck(newclassname, new_name, code); Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); - Printv(code, "((", classname, "*) arg1->obj)->", name, "(", arg_call_lnames, ");\n", NIL); + Printv(code, "((", classname, "*) arg1->obj)->", Getattr(n, "name"), "(", arg_call_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); functionWrapper(n); @@ -794,6 +836,7 @@ public: Delete(stype); Delete(ctype); Delete(sobj_name); + Delete(name); return SWIG_OK; } diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 4e9cb7b97..20bd95e6a 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -377,7 +377,6 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern Hash *Swig_typemap_pop_scope(void); extern void Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f); - extern void Swig_typemap_class_distinguish(int b); /* --- Code fragment support --- */ diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index e372a7eb2..6cbeb67ea 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -47,7 +47,6 @@ static void replace_embedded_typemap(String *s); static Hash *typemaps[MAX_SCOPE]; static int tm_scope = 0; -static int class_distinguish = 0; static Hash *get_typemap(int tm_scope, SwigType *type) { Hash *tm = 0; @@ -61,6 +60,7 @@ static Hash *get_typemap(int tm_scope, SwigType *type) { } tm = Getattr(typemaps[tm_scope], type); + if (dtype) { if (!tm) { String *t_name = SwigType_templateprefix(type); @@ -583,10 +583,6 @@ static SwigType *strip_arrays(SwigType *type) { return t; } -void Swig_typemap_class_distinguish(int b) { - class_distinguish = b; -} - /* ----------------------------------------------------------------------------- * Swig_typemap_search() * @@ -605,21 +601,6 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String const String *cname = 0; SwigType *unstripped = 0; String *tmop = tmop_name(op); - SwigType *base = 0; - int isbuiltin = 0; - - /* - * HACK: - * try to distinguish between built-in types (int, char, etc.) and defined classes - * this allows C module to use different typemaps for classes - */ - - if (class_distinguish) { - base = SwigType_base(type); - isbuiltin = SwigType_isbuiltin(base); - if (!isbuiltin) - Replaceall(type, base, "SWIGCLASSTYPE"); - } if ((name) && Len(name)) cname = name; @@ -705,16 +686,7 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String /* Hmmm. Well, no match seems to be found at all. See if there is some kind of default mapping */ primitive = SwigType_default(type); - while (primitive) { - - if (class_distinguish) { - if (!isbuiltin) { - Replaceall(primitive, "SWIGTYPE", "SWIGCLASSTYPE"); - /*Printf(stdout, "Swig_typemap_search: new type is %s\n", primitive);*/ - } - } - tm = get_typemap(ts, primitive); if (tm && cname) { tm1 = Getattr(tm, cname); @@ -730,8 +702,6 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String goto ret_result; } { - if (class_distinguish) - Replaceall(primitive, "SWIGCLASSTYPE", "SWIGTYPE"); SwigType *nprim = SwigType_default(primitive); Delete(primitive); primitive = nprim; @@ -746,10 +716,6 @@ Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String result = backup; ret_result: - if (class_distinguish) { - Replaceall(type, "SWIGCLASSTYPE", base); - Replaceall(primitive, "SWIGCLASSTYPE", base); - } if (noarrays) Delete(noarrays); if (primitive) @@ -761,7 +727,6 @@ ret_result: } if (type != ctype) Delete(ctype); - return result; } From 96a52c763cce2978001b78c8fbd57c984e840841 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 21 Jul 2008 18:22:43 +0000 Subject: [PATCH 028/508] Now constructors use SWIG_create_object() function, which fills type information for SwigObj struct. 'out' typemaps for objects and 'throws' typemaps also use this. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10696 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/exception_order.i | 15 +------ Lib/c/c.swg | 39 +++++++++-------- Source/Modules/c.cxx | 62 ++++++++++++++++++++------- 3 files changed, 68 insertions(+), 48 deletions(-) diff --git a/Examples/test-suite/exception_order.i b/Examples/test-suite/exception_order.i index 73f121984..45a87e0c5 100644 --- a/Examples/test-suite/exception_order.i +++ b/Examples/test-suite/exception_order.i @@ -33,22 +33,9 @@ } #endif -/* - * Additional typemaps needed to handle exception order in C. - */ -#if defined(SWIGC) -%typemap(throws) SWIGTYPE { - SwigObj *_c_ex = _wrap_new_$1_basetype(); - SWIG_CThrowException(_c_ex, "C++ $1_type exception thrown"); -} - -%typemap(throws) ET, ET { - SWIG_CThrowException(NULL, "C++ $1_type exception thrown"); -} -#endif - %catches(E1,E2*,ET,ET,...) A::barfoo(int i); + %allowexception efoovar; %allowexception A::efoovar; diff --git a/Lib/c/c.swg b/Lib/c/c.swg index f17d3d7df..397d81e95 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -18,6 +18,11 @@ typedef struct { void *obj; const char **typenames; } SwigObj; + +SWIGINTERN SwigObj *SWIG_registry_base = 0; +SWIGINTERN SwigObj *SWIG_registry = 0; + +#define SWIG_STR(x) #x %} // typemaps for function parameters @@ -131,27 +136,14 @@ typedef struct { // allocate new "object-struct" by default %typemap(out) SWIGTYPE { - $result = (SwigObj *) malloc(sizeof(SwigObj)); + $result = SWIG_create_object(SWIG_STR($1_type)); $result->obj = (void*) &$1; - #if SWIG_C_RUNTIME - $result->typenames[0] = 0; // FIXME - #endif } -%typemap(out) SWIGTYPE * { - $result = (SwigObj *) malloc(sizeof(SwigObj)); - $result->obj = (void*) $1; - #if SWIG_C_RUNTIME - $result->typenames[0] = 0; // FIXME - #endif -} -%typemap(out) SWIGTYPE & { - $result = (SwigObj *) malloc(sizeof(SwigObj)); +%typemap(out) SWIGTYPE *, SWIGTYPE & { + $result = SWIG_create_object(SWIG_STR($1_basetype)); $result->obj = (void*) $1; - #if SWIG_C_RUNTIME - $result->typenames[0] = 0; // FIXME - #endif } // exception handling @@ -166,13 +158,22 @@ typedef struct { SWIG_CThrowException(0, $1); } -// this should match only non-built-in and non-template objects +// this should match only non-built-in objects %typemap(throws) SWIGTYPE { - SWIG_CThrowException(0, "C++ $1_type exception thrown"); + SwigObj *c_ex; + c_ex = SWIG_create_object(SWIG_STR($1_basetype)); + c_ex->obj = (void*) &$1; + SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); +} + +%typemap(throws) SWIGTYPE *, SWIGTYPE & { + SwigObj *c_ex; + c_ex = SWIG_create_object(SWIG_STR($1_basetype)); + c_ex->obj = (void*) $1; + SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); } %insert("runtime") %{ - #define SWIG_MAX_RT_STACK 256 SWIGEXPORTC struct { diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 704713fd5..1bca14137 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -29,6 +29,7 @@ class C:public Language { String *empty_string; String *int_string; String *enum_values; + String *create_object; bool proxy_flag; bool runtime_flag; @@ -44,6 +45,7 @@ public: empty_string(NewString("")), int_string(NewString("int")), enum_values(0), + create_object(0), proxy_flag(true), runtime_flag(true), typecheck_flag(false) { @@ -90,6 +92,30 @@ public: allow_overloading(); } + /* --------------------------------------------------------------------- + * start_create_object() + * --------------------------------------------------------------------- */ + + void start_create_object() { + String *s = create_object = NewString(""); + Printf(s, "\nSWIGINTERN SwigObj *SWIG_create_object(const char *classname) {\n"); + Printf(s, "SWIG_Runtime_init();\n"); + Printf(s, "SwigObj *result;\n"); + Printf(s, "result = (SwigObj *) malloc(sizeof(SwigObj));\n"); + Printf(s, "result->obj = 0;\n"); + } + + /* --------------------------------------------------------------------- + * finish_create_object() + * --------------------------------------------------------------------- */ + + String *finish_create_object() { + String *s = create_object; + Printf(s, "return result;\n"); + Printf(s, "}\n\n"); + return create_object; + } + /* --------------------------------------------------------------------- * top() * --------------------------------------------------------------------- */ @@ -147,10 +173,14 @@ public: Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "extern \"C\" {\n"); Printf(f_wrappers, "#endif\n\n"); + + start_create_object(); // emit code for children Language::top(n); + Append(f_header, finish_create_object()); + Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "}\n"); Printf(f_wrappers, "#endif\n"); @@ -167,7 +197,7 @@ public: } // write all to the file - Dump(f_header, f_runtime); + Wrapper_pretty_print(f_header, f_runtime); Dump(f_wrappers, f_runtime); Wrapper_pretty_print(f_init, f_runtime); @@ -710,7 +740,7 @@ ready: // declare type for specific class in the proxy header if (proxy_flag) - Printv(f_proxy_header, "typedef SwigObj ", name, ";\n\n", NIL); + Printv(f_proxy_header, "\ntypedef SwigObj ", name, ";\n\n", NIL); Delete(sobj); Delete(name); @@ -993,23 +1023,27 @@ ready: } /* --------------------------------------------------------------------- - * emit_runtime_make_object() + * add_to_create_object() * --------------------------------------------------------------------- */ - void emit_runtime_make_object(Node *n, String *classname, String *code) { + void add_to_create_object(Node *n, String *classname, String *newclassname) { + String *s = create_object; + + Printv(s, "if (strcmp(classname, \"", classname, "\") == 0) {\n", NIL); + // store the name of each class in the hierarchy List *baselist = Getattr(parentNode(n), "bases"); - Printf(code, "result->typenames = (const char **) malloc(%d*sizeof(const char*));\n", Len(baselist) + 2); - Printv(code, "result->typenames[0] = Swig_typename_", classname, ";\n", NIL); + Printf(s, "result->typenames = (const char **) malloc(%d*sizeof(const char*));\n", Len(baselist) + 2); + Printv(s, "result->typenames[0] = Swig_typename_", newclassname, ";\n", NIL); int i = 1; if (baselist) { Iterator it; for (it = First(baselist); it.item; it = Next(it)) { - Printf(code, "result->typenames[%d] = Swig_typename_%s;\n", i++, Getattr(it.item, "name")); + Printf(s, "result->typenames[%d] = Swig_typename_%s;\n", i++, Getattr(it.item, "sym:name")); } } - Printf(code, "result->typenames[%d] = 0;\n", i); - Printf(code, "SWIG_Runtime_init();\n"); + Printf(s, "result->typenames[%d] = 0;\n", i); + Printf(s, "}\n"); } /* --------------------------------------------------------------------- @@ -1049,10 +1083,9 @@ ready: Setattr(n, "sym:name", constr_name); // generate action code - Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); + add_to_create_object(n, classname, newclassname); + Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); - if (runtime_flag) - emit_runtime_make_object(n, newclassname, code); Setattr(n, "wrap:action", code); @@ -1099,10 +1132,9 @@ ready: Setattr(n, "sym:name", constr_name); // generate action code - Printv(code, "result = (", sobj_name, "*) malloc(sizeof(", sobj_name, "));\n", NIL); + add_to_create_object(n, classname, newclassname); + Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); Printv(code, "result->obj = (void*) new ", classname, "((", classname, " const &)*arg1);\n", NIL); - if (runtime_flag) - emit_runtime_make_object(n, newclassname, code); Setattr(n, "wrap:action", code); From 7e23a5a55e4be3b8aca825deef0f76f90ce86c5b Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 26 Jul 2008 14:18:37 +0000 Subject: [PATCH 029/508] Removing some memory leak problems when handling exceptions. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10713 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/check.list | 1 + Examples/c/class/Makefile | 10 ++- Examples/c/exception/Makefile | 29 +++++++ Examples/c/exception/example.cxx | 0 Examples/c/exception/example.h | 52 ++++++++++++ Examples/c/exception/example.i | 10 +++ Examples/c/exception/runme.c | 55 +++++++++++++ Examples/c/simple/Makefile | 10 ++- Lib/c/c.swg | 132 ++++++++++++++++++++++++------- Source/Modules/c.cxx | 76 +++++++++++++++--- 10 files changed, 336 insertions(+), 39 deletions(-) create mode 100644 Examples/c/exception/Makefile create mode 100644 Examples/c/exception/example.cxx create mode 100644 Examples/c/exception/example.h create mode 100644 Examples/c/exception/example.i create mode 100644 Examples/c/exception/runme.c diff --git a/Examples/c/check.list b/Examples/c/check.list index 69d56a4f6..91eaa8179 100644 --- a/Examples/c/check.list +++ b/Examples/c/check.list @@ -1,3 +1,4 @@ # see top-level Makefile.in class simple +exception diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 4bb2cf880..062903927 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -5,6 +5,7 @@ TARGET = example INTERFACE = example.i RUNME = runme.c PROXY = example_proxy.c +MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ @@ -15,7 +16,14 @@ run: TARGET='$(TARGET)' c_compile env LD_LIBRARY_PATH=. ./runme +memchk: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXXFLAGS='-g' c_cpp + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' CFLAGS='-g' c_compile + env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme + clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ runme check: all diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile new file mode 100644 index 000000000..062903927 --- /dev/null +++ b/Examples/c/exception/Makefile @@ -0,0 +1,29 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c +MEMTOOL = valgrind --leak-check=full + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp + +run: + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + env LD_LIBRARY_PATH=. ./runme + +memchk: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXXFLAGS='-g' c_cpp + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' CFLAGS='-g' c_compile + env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme + +clean: + rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ runme + +check: all diff --git a/Examples/c/exception/example.cxx b/Examples/c/exception/example.cxx new file mode 100644 index 000000000..e69de29bb diff --git a/Examples/c/exception/example.h b/Examples/c/exception/example.h new file mode 100644 index 000000000..e5ebdc2a5 --- /dev/null +++ b/Examples/c/exception/example.h @@ -0,0 +1,52 @@ +/* File : example.h */ + +#ifndef SWIG +struct A { +}; +#endif + +class Exc { +public: + Exc(int c, const char *m) { + code = c; + strncpy(msg,m,256); + } + int code; + char msg[256]; +}; + +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + +class Test { +public: + int simple() throw(int&) { + throw(37); + return 1; + } + int message() throw(const char *) { + throw("I died."); + return 1; + } + int hosed() throw(Exc) { + throw(Exc(42,"Hosed")); + return 1; + } + int unknown() throw(A*) { + static A a; + throw &a; + return 1; + } + int multi(int x) throw(int, const char *, Exc) { + if (x == 1) throw(37); + if (x == 2) throw("Bleah!"); + if (x == 3) throw(Exc(42,"No-go-diggy-die")); + return 1; + } +}; + +#if defined(_MSC_VER) + #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + diff --git a/Examples/c/exception/example.i b/Examples/c/exception/example.i new file mode 100644 index 000000000..75700b305 --- /dev/null +++ b/Examples/c/exception/example.i @@ -0,0 +1,10 @@ +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +/* Let's just grab the original header file here */ +%include "example.h" + diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c new file mode 100644 index 000000000..619f9b00e --- /dev/null +++ b/Examples/c/exception/runme.c @@ -0,0 +1,55 @@ +#include + +#include "example_proxy.h" + +int main() { + Test *t = new_Test(); + + SWIG_try { + Test_unknown(t); + } + SWIG_catch(SWIG_AnyException) { + printf("incomplete type: %s\n", SWIG_exception.msg); + } + SWIG_endtry; + + SWIG_try { + Test_simple(t); + } + SWIG_catch(SWIG_AnyException) { + printf("%s\n", SWIG_exception.msg); + } + SWIG_endtry; + + SWIG_try { + Test_message(t); + } + SWIG_catch(SWIG_AnyException) { + printf("%s\n", SWIG_exception.msg); + } + SWIG_endtry; + + SWIG_try { + Test_hosed(t); + } + SWIG_catch(Exc) { + printf("%d %s\n", Exc_code_get(SWIG_exception.klass), Exc_msg_get(SWIG_exception.klass)); + } + + int i; + for (i = 0; i < 4; ++i) { + SWIG_try { + Test_multi(t, i); + } + SWIG_catch(Exc) { + printf("%d %s\n", Exc_code_get(SWIG_exception.klass), Exc_msg_get(SWIG_exception.klass)); + } + SWIG_catch(SWIG_AnyException) { + printf("%s\n", SWIG_exception.msg); + } + SWIG_endtry; + } + + SWIG_exit(0); +} + diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index f204623e7..f324f9b1a 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -5,6 +5,7 @@ TARGET = example INTERFACE = example.i RUNME = runme.c PROXY = example_proxy.c +MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ @@ -15,7 +16,14 @@ run: TARGET='$(TARGET)' c_compile env LD_LIBRARY_PATH=. ./runme +memchk: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CFLAGS='-g' c + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' CFLAGS='-g' c_compile + env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme + clean: - rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ + rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ runme check: all diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 397d81e95..d03d55584 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -18,11 +18,6 @@ typedef struct { void *obj; const char **typenames; } SwigObj; - -SWIGINTERN SwigObj *SWIG_registry_base = 0; -SWIGINTERN SwigObj *SWIG_registry = 0; - -#define SWIG_STR(x) #x %} // typemaps for function parameters @@ -39,6 +34,7 @@ SWIGINTERN SwigObj *SWIG_registry = 0; %typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" %typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" %typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1_type" +%typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$1_basetype *" %typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1_basetype **" %typemap(ctype) SWIGTYPE "SwigObj *" %typemap(ctype) SWIGTYPE * "SwigObj *" @@ -62,7 +58,7 @@ SWIGINTERN SwigObj *SWIG_registry = 0; %typemap(in) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1 = ($1_basetype *) $input;" %typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_basetype *) $input;" %typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype *) $input;" - +%typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$1 = ($1_basetype *) $input;" %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1 = ($1_type) $input;" @@ -108,6 +104,7 @@ SWIGINTERN SwigObj *SWIG_registry = 0; %typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" %typemap(couttype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" %typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" +%typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$1_basetype *" %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "SwigObj *" %typemap(couttype) SWIGTYPE & "SwigObj *" @@ -126,6 +123,7 @@ SWIGINTERN SwigObj *SWIG_registry = 0; %typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$result = $1;" %typemap(out) const short &, const int &, const long &, const char &, const float &, const double & "$result = $1;" %typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$result = $1;" +%typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$result = $1;" %typemap(out) void "" %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = $1;" @@ -148,17 +146,19 @@ SWIGINTERN SwigObj *SWIG_registry = 0; // exception handling -%typemap(throws) int, long, short, unsigned int, unsigned long, unsigned short { +%typemap(throws) BASIC_INT_TYPES { char error_msg[256]; sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); SWIG_CThrowException(0, error_msg); } +%apply BASIC_INT_TYPES { int, long, short, unsigned int, unsigned long, unsigned short, int &, long &, short &, unsigned int &, unsigned long &, unsigned short & }; + %typemap(throws) char *, const char * { SWIG_CThrowException(0, $1); } -// this should match only non-built-in objects +// this should match only SwigObj objects %typemap(throws) SWIGTYPE { SwigObj *c_ex; c_ex = SWIG_create_object(SWIG_STR($1_basetype)); @@ -166,7 +166,7 @@ SWIGINTERN SwigObj *SWIG_registry = 0; SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); } -%typemap(throws) SWIGTYPE *, SWIGTYPE & { +%typemap(throws) SWIGTYPE * { SwigObj *c_ex; c_ex = SWIG_create_object(SWIG_STR($1_basetype)); c_ex->obj = (void*) $1; @@ -174,16 +174,27 @@ SWIGINTERN SwigObj *SWIG_registry = 0; } %insert("runtime") %{ +#define SWIG_STR(x) #x #define SWIG_MAX_RT_STACK 256 +#define SWIG_REGISTRY_INIT 256 -SWIGEXPORTC struct { +SWIGINTERN SwigObj **SWIG_registry_base = 0; +SWIGINTERN SwigObj **SWIG_registry = 0; +SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT; + +SWIGINTERN SwigObj *SWIG_create_object(const char *classname); +SWIGINTERN void SWIG_destroy_object(SwigObj *object); + +SWIGEXPORTC struct SWIG_exception_struct { int code; char *msg; SwigObj *klass; -} SWIG_exception; + int handled; +} SWIG_exception = { 0, 0, 0, 0 }; SWIGEXPORTC jmp_buf SWIG_rt_env; SWIGEXPORTC int SWIG_rt_init = 0; +SWIGINTERN jmp_buf SWIG_cpp_back_env; SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; @@ -200,11 +211,56 @@ SWIGINTERN void SWIG_rt_stack_pop() { memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); } +SWIGINTERN void SWIG_add_registry_entry(SwigObj *entry) { + if (SWIG_registry_base == 0) { + SWIG_registry_base = SWIG_registry = (SwigObj **) malloc(SWIG_registry_size * sizeof(SwigObj *)); + memset(SWIG_registry_base, 0, SWIG_registry_size * sizeof(SwigObj *)); + } + *SWIG_registry = entry; + SWIG_registry++; + if ((SWIG_registry - SWIG_registry_base) == SWIG_registry_size) { + SWIG_registry = SWIG_registry_base; + SWIG_registry_size += SWIG_REGISTRY_INIT; + int new_size = SWIG_registry_size * sizeof(SwigObj *); + SWIG_registry_base = (SwigObj **) malloc(new_size); + memset(SWIG_registry_base, 0, new_size); + memcpy(SWIG_registry_base, SWIG_registry, (SWIG_registry_size - SWIG_REGISTRY_INIT) * sizeof(SwigObj *)); + free(SWIG_registry); + SWIG_registry = SWIG_registry_base + (SWIG_registry_size - SWIG_REGISTRY_INIT); + } +} + +SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) { + int i; + for (i = 0; i < SWIG_registry_size; ++i) { + if (*(SWIG_registry_base + i) == entry) { + *(SWIG_registry_base + i) = 0; + break; + } + } +} + SWIGINTERN void SWIG_cleanup() { if (SWIG_rt_stack_base) free(SWIG_rt_stack_base); if (SWIG_exception.msg) free(SWIG_exception.msg); + if (SWIG_exception.klass) { + if (SWIG_exception.klass->typenames) + free(SWIG_exception.klass->typenames); + free(SWIG_exception.klass); + } + int i; + if (SWIG_registry_base) { + for (i = 0; i < SWIG_registry_size; ++i) { + if (*(SWIG_registry_base + i)) { + SWIG_destroy_object(*(SWIG_registry_base + i)); + *(SWIG_registry_base + i) = 0; + } + } + } + free(SWIG_registry_base); + SWIG_registry_base = 0; } #ifdef __cplusplus @@ -229,8 +285,10 @@ SWIGEXPORTC int SWIG_rt_catch(const char *type) { } } } - if (result) + if (result) { SWIG_rt_stack_pop(); + SWIG_exception.handled = 1; + } return result; } @@ -240,20 +298,35 @@ SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { SWIG_exception.msg = (char *) 0; } if (msg) { - SWIG_exception.msg = (char *) malloc(strlen(msg)); + SWIG_exception.msg = (char *) malloc(strlen(msg) + 1); strcpy(SWIG_exception.msg, msg); } SWIG_exception.klass = klass; + SWIG_exception.handled = 0; longjmp(SWIG_rt_env, 1); } -SWIGEXPORTC void SWIG_rt_endtry() { - if (SWIG_exception.msg) +SWIGEXPORTC void SWIG_rt_unhandled() { + if (SWIG_exception.msg) { free(SWIG_exception.msg); + SWIG_exception.msg = 0; + } SWIG_rt_stack_pop(); longjmp(SWIG_rt_env, SWIG_exception.code); } +SWIGEXPORTC void SWIG_rt_endtry() { + if (SWIG_exception.handled) { + if (setjmp(SWIG_rt_env) == 0) { + SWIG_rt_stack_push(); + longjmp(SWIG_cpp_back_env, 1); + } + } + else { + SWIG_rt_stack_pop(); // pop the SWIG_try context + } +} + SWIGEXPORTC int SWIG_exit(int code) { SWIG_cleanup(); exit(code); @@ -264,10 +337,9 @@ SWIGEXPORTC int SWIG_exit(int code) { #endif SWIGINTERN void SWIG_terminate() { - fprintf(stderr, "Unhandled exception: %s\n%s (error code: %d)\nExitting...\n", + fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", SWIG_exception.klass->typenames[0], - SWIG_exception.msg, - SWIG_exception.code); + SWIG_exception.msg ? SWIG_exception.msg : ""); SWIG_exit(SWIG_exception.code); } @@ -276,17 +348,22 @@ SWIGINTERN void SWIG_Runtime_init() { if (!SWIG_rt_init) { SWIG_rt_init = 1; SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); - if (SWIG_exception.code = setjmp(SWIG_rt_env)) + if (SWIG_exception.code = setjmp(SWIG_rt_env)) { + // deallocate C++ exception + if (setjmp(SWIG_rt_env) == 0) { + SWIG_rt_stack_push(); + SWIG_exception.handled = 1; + longjmp(SWIG_cpp_back_env, 1); + } SWIG_terminate(); + } } } -SWIGINTERN void SWIG_CThrowException(void *klass, const char *msg) { - if (SWIG_rt_init) +#define SWIG_CThrowException(klass, msg) \ + if (setjmp(SWIG_cpp_back_env) == 0) \ SWIG_rt_throw((SwigObj *) klass, msg); - else - SWIG_terminate(); -} + %} %insert("proxy_header") %{ @@ -302,7 +379,7 @@ typedef struct { const char **typenames; } SwigObj; -SWIGIMPORT struct { +SWIGIMPORT struct SWIG_exception_struct { int code; char *msg; SwigObj *klass; @@ -311,7 +388,8 @@ SWIGIMPORT struct { SWIGIMPORT void SWIG_rt_try(); SWIGIMPORT int SWIG_rt_catch(const char *type); SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg); -SWIGIMPORT int SWIG_rt_endtry(); +SWIGIMPORT int SWIG_rt_unhandled(); +SWIGIMPORT void SWIG_rt_endtry(); SWIGIMPORT int SWIG_exit(int code); #define SWIG_try \ @@ -320,6 +398,6 @@ SWIGIMPORT int SWIG_exit(int code); #define SWIG_catch(type) else if (SWIG_rt_catch(#type)) #define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); #define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); -#define SWIG_endtry else SWIG_rt_endtry(); +#define SWIG_endtry else SWIG_rt_unhandled(); SWIG_rt_endtry(); %} diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 1bca14137..74d6b5315 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -30,6 +30,7 @@ class C:public Language { String *int_string; String *enum_values; String *create_object; + String *destroy_object; bool proxy_flag; bool runtime_flag; @@ -46,6 +47,7 @@ public: int_string(NewString("int")), enum_values(0), create_object(0), + destroy_object(0), proxy_flag(true), runtime_flag(true), typecheck_flag(false) { @@ -111,11 +113,35 @@ public: String *finish_create_object() { String *s = create_object; + //Printf(s, "SWIG_add_registry_entry(result);\n"); Printf(s, "return result;\n"); Printf(s, "}\n\n"); return create_object; } + /* --------------------------------------------------------------------- + * start_destroy_object() + * --------------------------------------------------------------------- */ + + void start_destroy_object() { + String *s = destroy_object = NewString(""); + Printf(s, "\nSWIGINTERN void SWIG_destroy_object(SwigObj *object) {\n"); + Printf(s, "if (object)\nif (object->typenames) {\n"); + } + + /* --------------------------------------------------------------------- + * finish_destroy_object() + * --------------------------------------------------------------------- */ + + String *finish_destroy_object() { + String *s = destroy_object; + Printf(s, "free(object->typenames);\n"); + Printf(s, "free(object);\n"); + Printf(s, "object = (SwigObj *) 0;\n"); + Printf(s, "}\n}\n"); + return destroy_object; + } + /* --------------------------------------------------------------------- * top() * --------------------------------------------------------------------- */ @@ -175,11 +201,13 @@ public: Printf(f_wrappers, "#endif\n\n"); start_create_object(); + start_destroy_object(); // emit code for children Language::top(n); Append(f_header, finish_create_object()); + Append(f_header, finish_destroy_object()); Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "}\n"); @@ -468,7 +496,9 @@ ready: if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if (SwigType_isconst(type)) SwigType_del_qualifier(type); - SwigType *return_var_type = SwigType_isreference(type) ? SwigType_add_pointer(SwigType_base(type)) : type; + SwigType *return_var_type; + return_var_type = SwigType_isreference(type) ? SwigType_add_pointer(SwigType_base(type)) : type; + return_var_type = SwigType_isarray(type) ? SwigType_add_pointer(SwigType_base(type)) : type; if (SwigType_isenum(type)) Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); else @@ -568,6 +598,9 @@ ready: // emit action code String *action = emit_action(n); + if (Getattr(n, "throws")) { + Printf(action, "if (SWIG_exception.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); + } Replaceall(action, "$cppresult", "cppresult"); // handle return-by-reference @@ -954,9 +987,19 @@ ready: if (!SwigType_isconst(type)) { // create code for 'set' function - code = NewString(""); - if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) - Printf(code, "* (int *) &"); + if (SwigType_isarray(Getattr(n, "type"))) { + code = NewString(""); + Printf(code, "if (arg2) {\n"); + Printf(code, "int i;\n"); + Printv(code, "for (i = 0; i < ", SwigType_array_getdim(Getattr(n, "type"), 0), "; ++i) {\n", NIL); + Printv(code, classname, "::", name, "[i] = arg2[i];\n", NIL); + Printf(code, "}\n}\n"); + } + else if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) { + code = NewString("* (int *) &"); + } + else + code = NewString(""); Printv(code, classname, "::", name, " = arg1;\n", NIL); wrap_set_variable(n, classname, newclassname, name, code); } @@ -1006,7 +1049,15 @@ ready: set_nextSibling(p, t); Setattr(n, "parms", p); String *code = 0; - if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) { + if (SwigType_isarray(Getattr(n, "type"))) { + code = NewString(""); + Printf(code, "if (arg2) {\n"); + Printf(code, "int i;\n"); + Printv(code, "for (i = 0; i < ", SwigType_array_getdim(Getattr(n, "type"), 0), "; ++i) {\n", NIL); + Printv(code, "((", classname, "*) arg1->obj)->", name, "[i] = arg2[i];\n", NIL); + Printf(code, "}\n}\n"); + } + else if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) { code = NewString(""); Printv(code, "* (int *) &((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); } @@ -1044,6 +1095,12 @@ ready: } Printf(s, "result->typenames[%d] = 0;\n", i); Printf(s, "}\n"); + + s = destroy_object; + + Printv(s, "if (strcmp(object->typenames[0], \"", classname, "\") == 0) {\n", NIL); + Printv(s, "if (object->obj)\ndelete (", classname, " *) (object->obj);\n", NIL); + Printf(s, "}\n"); } /* --------------------------------------------------------------------- @@ -1087,6 +1144,8 @@ ready: Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); + Printf(code, "SWIG_add_registry_entry(result);\n"); + Setattr(n, "wrap:action", code); functionWrapper(n); @@ -1153,7 +1212,6 @@ ready: * --------------------------------------------------------------------- */ virtual int destructorHandler(Node *n) { - String *classname = Getattr(parentNode(n), "classtype"); String *newclassname = Getattr(parentNode(n), "sym:name"); String *sobj_name = NewString(""); String *ctype; @@ -1183,10 +1241,8 @@ ready: if (typecheck_flag) emit_runtime_typecheck(newclassname, destr_name, code); - Printv(code, "if (arg1) if (arg1->obj) {\n", NIL); - Printv(code, " delete (", classname, "*) (arg1->obj);\n", NIL); - Printv(code, " free(arg1->typenames);\n free(arg1);\n", NIL); - Printv(code, " arg1 = (", sobj_name, "*)0;\n}\n", NIL); + Printf(code, "SWIG_remove_registry_entry(arg1);\n"); + Printf(code, "SWIG_destroy_object(arg1);\n"); Setattr(n, "wrap:action", code); functionWrapper(n); From 95045e73c6fee11ef2fec247050f1e3a0e8df88b Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sun, 27 Jul 2008 15:20:56 +0000 Subject: [PATCH 030/508] Handling constants. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10716 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 74d6b5315..12f4ca7a1 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -244,11 +244,12 @@ public: * ------------------------------------------------------------------------ */ virtual int globalvariableHandler(Node *n) { + if (!proxy_flag) + return SWIG_OK; + String *name = Getattr(n, "name"); SwigType *type = Getattr(n, "type"); String *type_str = SwigType_str(type, 0); - if (proxy_flag) { - Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", Getattr(n, "name"), ";\n\n", NIL); - } + Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL); return SWIG_OK; } @@ -598,7 +599,7 @@ ready: // emit action code String *action = emit_action(n); - if (Getattr(n, "throws")) { + if (Getattr(n, "throws") || Getattr(n, "feature:except")) { Printf(action, "if (SWIG_exception.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); } Replaceall(action, "$cppresult", "cppresult"); @@ -1264,6 +1265,8 @@ ready: * --------------------------------------------------------------------- */ virtual int enumDeclaration(Node *n) { + if (!proxy_flag) + return SWIG_OK; String *newclassname = Getattr(parentNode(n), "sym:name"); String *name = Getattr(n, "sym:name"); String *code = NewString(""); @@ -1351,6 +1354,8 @@ ready: * --------------------------------------------------------------------- */ virtual int typedefHandler(Node *n) { + if (!proxy_flag) + return SWIG_OK; String *name = Getattr(n, "sym:name"); String *type = Getattr(n, "type"); char *c = Char(SwigType_str(type, 0)); @@ -1364,6 +1369,19 @@ ready: return SWIG_OK; } + /* --------------------------------------------------------------------- + * constantWrapper() + * --------------------------------------------------------------------- */ + + virtual int constantWrapper(Node *n) { + if (!proxy_flag) + return SWIG_OK; + String *name = Getattr(n, "sym:name"); + String *value = Getattr(n, "value"); + Printv(f_proxy_header, "#define ", name, " ", value, "\n", NIL); + return SWIG_OK; + } + }; /* class C */ /* ----------------------------------------------------------------------------- From da73b796ea680b8bcff78496dd62096a40b4d8b2 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sun, 27 Jul 2008 22:50:08 +0000 Subject: [PATCH 031/508] %extend feature git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10717 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 87 ++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 51 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 12f4ca7a1..87bcc1246 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -113,7 +113,6 @@ public: String *finish_create_object() { String *s = create_object; - //Printf(s, "SWIG_add_registry_entry(result);\n"); Printf(s, "return result;\n"); Printf(s, "}\n\n"); return create_object; @@ -674,23 +673,6 @@ ready: return SWIG_OK; } - /* --------------------------------------------------------------------- - * emit_runtime_typecheck() - * --------------------------------------------------------------------- */ - - void emit_runtime_typecheck(String *classname, String *funcname, String *code) { - Printf(code, "{\nint i = 0, type_ok = 0;\n"); - Printf(code, "if (arg1 == NULL) {\n"); - Printv(code, " fprintf(stdout, \"error: NULL object-struct passed to ", funcname, "\\n\");\n"); - Printf(code, " longjmp(Swig_rt_env, 0);\n}\n"); - Printf(code, "while(arg1->typenames[i]) {\n"); - Printv(code, " if (strcmp(arg1->typenames[i++], \"", classname, "\") == 0) {\n", NIL); - Printf(code, " type_ok = 1;\nbreak;\n}\n}\n"); - Printf(code, "if (!type_ok) {\n"); - Printv(code, " fprintf(stdout, \"error: object-struct passed to ", funcname, " is not of class ", classname, "\\n\");\n", NIL); - Printf(code, " longjmp(Swig_rt_env, 0);\n}\n}\n"); - } - /* --------------------------------------------------------------------- * copy_node() * --------------------------------------------------------------------- */ @@ -808,9 +790,10 @@ ready: * --------------------------------------------------------------------- */ virtual int staticmemberfunctionHandler(Node *n) { + Node *klass = Swig_methodclass(n); String *name = Copy(Getattr(n, "sym:name")); - String *classname = Getattr(parentNode(n), "typename"); - String *newclassname = Getattr(parentNode(n), "sym:name"); + String *classname = Getattr(klass, "typename"); + String *newclassname = Getattr(klass, "sym:name"); String *new_name = NewString(""); String *code = NewString(""); String *arg_lnames = NewString(""); @@ -844,17 +827,19 @@ ready: * --------------------------------------------------------------------- */ virtual int memberfunctionHandler(Node *n) { + Node *klass = Swig_methodclass(n); String *name = Copy(Getattr(n, "sym:name")); - String *classname = Getattr(parentNode(n), "classtype"); - String *newclassname = Getattr(parentNode(n), "sym:name"); + String *classname = Getattr(klass, "classtype"); + String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype = NewString(""); String *stype = NewString(""); String *new_name = NewString(""); String *code = NewString(""); String *arg_lnames = NewString(""); + String *ext_name = 0; ParmList *parms = Getattr(n, "parms"); - + // create first argument Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); @@ -885,11 +870,19 @@ ready: new_name = Swig_name_member(newclassname, name); Setattr(n, "sym:name", new_name); + bool isextension = (Cmp(Getattr(n, "isextension"), "1") == 0) || (Cmp(Getattr(n, "feature:extend"), "1") == 0); + if (isextension) { + ext_name = NewStringf("%s_ext", new_name); + String *object_cast = NewStringf("((%s*) self->obj)", classname); + Swig_add_extension_code(n, ext_name, parms, Getattr(n, "type"), Getattr(n, "code"), CPlusPlus, object_cast); + } + // generate action code - if (typecheck_flag) - emit_runtime_typecheck(newclassname, new_name, code); Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); - Printv(code, "((", classname, "*) arg1->obj)->", Getattr(n, "name"), "(", arg_call_lnames, ");\n", NIL); + if (isextension) + Printv(code, ext_name, "(arg1", Len(arg_call_lnames) ? ", " : "", arg_call_lnames, ");\n", NIL); + else + Printv(code, "((", classname, "*) arg1->obj)->", Getattr(n, "name"), "(", arg_call_lnames, ");\n", NIL); Setattr(n, "wrap:action", code); functionWrapper(n); @@ -916,10 +909,6 @@ ready: // generate action code String *action = NewString(""); - ParmList *parms = Getattr(n, "parms"); - if (parms) - if (typecheck_flag && Getattr(parms, "c:objstruct")) - emit_runtime_typecheck(newclassname, new_name, action); if (!code) { code = NewString(""); Printv(code, "$cppresult = $mod ((", classname, "*) arg1->obj)->", name, ";\n", NIL); @@ -947,10 +936,6 @@ ready: // generate action code String *action = NewString(""); - ParmList *parms = Getattr(n, "parms"); - if (parms) - if (typecheck_flag && Getattr(parms, "c:objstruct")) - emit_runtime_typecheck(newclassname, new_name, action); if (!code) { code = NewString(""); Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); @@ -970,10 +955,11 @@ ready: * --------------------------------------------------------------------- */ virtual int staticmembervariableHandler(Node *n) { + Node *klass = Swig_methodclass(n); String *name = Getattr(n, "sym:name"); SwigType *type = Copy(Getattr(n, "type")); - String *classname = Getattr(parentNode(n), "classtype"); - String *newclassname = Getattr(parentNode(n), "sym:name"); + String *classname = Getattr(klass, "classtype"); + String *newclassname = Getattr(klass, "sym:name"); String *new_name = NewString(""); String *code = NewString(""); @@ -1017,10 +1003,11 @@ ready: * --------------------------------------------------------------------- */ virtual int membervariableHandler(Node *n) { + Node *klass = Swig_methodclass(n); String *name = Getattr(n, "sym:name"); SwigType *type = Copy(Getattr(n, "type")); - String *classname = Getattr(parentNode(n), "classtype"); - String *newclassname = Getattr(parentNode(n), "sym:name"); + String *classname = Getattr(klass, "classtype"); + String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype = NewString(""); String *stype; @@ -1084,7 +1071,7 @@ ready: Printv(s, "if (strcmp(classname, \"", classname, "\") == 0) {\n", NIL); // store the name of each class in the hierarchy - List *baselist = Getattr(parentNode(n), "bases"); + List *baselist = Getattr(Swig_methodclass(n), "bases"); Printf(s, "result->typenames = (const char **) malloc(%d*sizeof(const char*));\n", Len(baselist) + 2); Printv(s, "result->typenames[0] = Swig_typename_", newclassname, ";\n", NIL); int i = 1; @@ -1112,8 +1099,9 @@ ready: if (Getattr(n, "copy_constructor")) return copyconstructorHandler(n); - String *classname = Getattr(parentNode(n), "classtype"); - String *newclassname = Getattr(parentNode(n), "sym:name"); + Node *klass = Swig_methodclass(n); + String *classname = Getattr(klass, "classtype"); + String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -1144,7 +1132,6 @@ ready: add_to_create_object(n, classname, newclassname); Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); - Printf(code, "SWIG_add_registry_entry(result);\n"); Setattr(n, "wrap:action", code); @@ -1165,8 +1152,9 @@ ready: * --------------------------------------------------------------------- */ virtual int copyconstructorHandler(Node *n) { - String *classname = Getattr(parentNode(n), "classtype"); - String *newclassname = Getattr(parentNode(n), "sym:name"); + Node *klass = Swig_methodclass(n); + String *classname = Getattr(klass, "classtype"); + String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -1213,7 +1201,7 @@ ready: * --------------------------------------------------------------------- */ virtual int destructorHandler(Node *n) { - String *newclassname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Getattr(Swig_methodclass(n), "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -1239,9 +1227,6 @@ ready: Setattr(n, "sym:name", destr_name); // create action code - if (typecheck_flag) - emit_runtime_typecheck(newclassname, destr_name, code); - Printf(code, "SWIG_remove_registry_entry(arg1);\n"); Printf(code, "SWIG_destroy_object(arg1);\n"); Setattr(n, "wrap:action", code); @@ -1267,7 +1252,7 @@ ready: virtual int enumDeclaration(Node *n) { if (!proxy_flag) return SWIG_OK; - String *newclassname = Getattr(parentNode(n), "sym:name"); + String *newclassname = Getattr(Swig_methodclass(n), "sym:name"); String *name = Getattr(n, "sym:name"); String *code = NewString(""); String *tdname = Getattr(n, "tdname"); @@ -1328,14 +1313,14 @@ ready: if (enumvalue) { char *value_repr = Char(enumvalue); if (value_repr) - if (!isdigit(*value_repr) && *value_repr != '+') { + if (!isdigit(*value_repr) && *value_repr != '+' && *value_repr != '-') { init = NewStringf(" = '%c'", *value_repr); } else init = NewStringf(" = %s", enumvalue); } - String *newclassname = Getattr(parentNode(parentNode(n)), "sym:name"); + String *newclassname = Getattr(Swig_methodclass(parentNode(n)), "sym:name"); String *newname = NewStringf("%s_%s", newclassname, name); int gencomma = 1; if (!enum_values) { From d4f62fda47028b77fb158fd49e0aa83447d57ee5 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 28 Jul 2008 21:03:21 +0000 Subject: [PATCH 032/508] Refactored member variable and function handlers. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10718 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 221 ++++++++----------------------------------- 1 file changed, 42 insertions(+), 179 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 87bcc1246..e6f3a5a7a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -265,7 +265,7 @@ public: String *arg_list = NewString(""); if (SwigType_type(Getattr(n, "type")) != T_VOID) { - Printv(action, "$cppresult = $mod (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); + Printv(action, "result = (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); } Printv(action, Swig_cfunction_call(Getattr(n, "name"), parms), ";", NIL); Setattr(n, "wrap:action", action); @@ -457,6 +457,19 @@ ready: Printf(wrapper->code, "}"); } else { + // C++ function wrapper + + if ((Cmp(Getattr(n, "storage"), "static") != 0) && + (Cmp(Getattr(n, "ismember"), "1") == 0) && + (Cmp(nodeType(n), "constructor") != 0)) { + Setattr(parms, "c:objstruct", "1"); + if (!Getattr(parms, "lname")) + Setattr(parms, "lname", "arg1"); + SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); + SwigType_add_pointer(stype); + Setattr(parms, "c:stype", stype); + } + // mangle name if function is overloaded if (Getattr(n, "sym:overloaded")) { if (!Getattr(n, "copy_constructor")) { @@ -505,6 +518,17 @@ ready: Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); } + // make sure lnames are set + int index = 1; + for (p = parms; p; p = nextSibling(p)) { + String *lname = Getattr(p, "lname"); + if (!lname) { + lname = NewStringf("arg%d", index); + Setattr(p, "lname", lname); + } + index++; + } + // create wrapper function prototype Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); @@ -523,22 +547,17 @@ ready: p = Getattr(p, "tmap:in:next"); } - SwigType* type = Getattr(p, "type"); - String* lname = Getattr(p, "lname"); - String* c_parm_type = NewString(""); - String* proxy_parm_type = NewString(""); - String* arg_name = NewString(""); + SwigType *type = Getattr(p, "type"); + String *lname = Getattr(p, "lname"); + String *c_parm_type = NewString(""); + String *proxy_parm_type = NewString(""); + String *arg_name = NewString(""); Printf(arg_name, "c%s", lname); - bool dont_apply_tmap = false; // set the appropriate type for parameter - if (Cmp(Getattr(p, "c:objstruct"), "1") == 0) { - Printv(c_parm_type, SwigType_str(type, 0), NIL); - dont_apply_tmap = true; - } - else if (SwigType_isenum(type)) { + if (SwigType_isenum(type)) { c_parm_type = make_enum_type(n, type); if (Getattr(n, "unnamed")) { type = int_string; @@ -598,11 +617,12 @@ ready: // emit action code String *action = emit_action(n); - if (Getattr(n, "throws") || Getattr(n, "feature:except")) { + if (Getattr(n, "throws") || (Cmp(Getattr(n, "feature:except"), "0") != 0)) { Printf(action, "if (SWIG_exception.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); } - Replaceall(action, "$cppresult", "cppresult"); - + if (Cmp(nodeType(n), "constructor") != 0) + Replace(action, "result =", "cppresult = $mod", DOH_REPLACE_FIRST); + // handle return-by-reference if (SwigType_isreference(type)) { String *ref_cast = NewString(""); @@ -737,13 +757,6 @@ ready: Setattr(new_node, "sym:name", Getattr(new_node, "name")); Setattr(new_node, "sym:symtab", Getattr(n, "symtab")); set_nodeType(new_node, "cdecl"); - // make sure there are no copyied object-structs params - ParmList* all_parms = Getattr(new_node, "parms"), * parms; - if (Getattr(all_parms, "c:objstruct")) { - parms = Copy(nextSibling(all_parms)); - Delete(all_parms); - Setattr(new_node, "parms", parms); - } appendChild(n, new_node); } } @@ -790,36 +803,7 @@ ready: * --------------------------------------------------------------------- */ virtual int staticmemberfunctionHandler(Node *n) { - Node *klass = Swig_methodclass(n); - String *name = Copy(Getattr(n, "sym:name")); - String *classname = Getattr(klass, "typename"); - String *newclassname = Getattr(klass, "sym:name"); - String *new_name = NewString(""); - String *code = NewString(""); - String *arg_lnames = NewString(""); - ParmList *parms = Getattr(n, "parms"); - - // prepare function call - Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); - Delitem(arg_lnames, 0); - Delitem(arg_lnames, DOH_END); - - // modify method name - new_name = Swig_name_member(newclassname, name); - Setattr(n, "sym:name", new_name); - - // generate action code - Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); - Printv(code, classname, "::", Getattr(n, "name"), "(", arg_lnames, ");\n", NIL); - Setattr(n, "wrap:action", code); - - functionWrapper(n); - - Delete(arg_lnames); - Delete(code); - Delete(new_name); - Delete(name); - return SWIG_OK; + return Language::staticmemberfunctionHandler(n); } /* --------------------------------------------------------------------- @@ -827,74 +811,7 @@ ready: * --------------------------------------------------------------------- */ virtual int memberfunctionHandler(Node *n) { - Node *klass = Swig_methodclass(n); - String *name = Copy(Getattr(n, "sym:name")); - String *classname = Getattr(klass, "classtype"); - String *newclassname = Getattr(klass, "sym:name"); - String *sobj_name = NewString(""); - String *ctype = NewString(""); - String *stype = NewString(""); - String *new_name = NewString(""); - String *code = NewString(""); - String *arg_lnames = NewString(""); - String *ext_name = 0; - ParmList *parms = Getattr(n, "parms"); - - // create first argument - Printf(sobj_name, "SwigObj"); - ctype = Copy(sobj_name); - SwigType_add_pointer(ctype); - Parm *p = NewParm(ctype, "self"); - stype = Copy(newclassname); - SwigType_add_pointer(stype); - Setattr(p, "c:stype", stype); - Setattr(p, "c:objstruct", "1"); - if (parms) - set_nextSibling(p, parms); - Setattr(n, "parms", p); - - // prepare function call - parms = Getattr(n, "parms"); - Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); - - // omit first argument in method call - String *arg_call_lnames = Strstr(arg_lnames, "*arg2"); - if (!arg_call_lnames) - arg_call_lnames = Strstr(arg_lnames, "arg2"); - if (!arg_call_lnames) - arg_call_lnames = empty_string; - else - Delitem(arg_lnames, DOH_END); - - // modify method name - new_name = Swig_name_member(newclassname, name); - Setattr(n, "sym:name", new_name); - - bool isextension = (Cmp(Getattr(n, "isextension"), "1") == 0) || (Cmp(Getattr(n, "feature:extend"), "1") == 0); - if (isextension) { - ext_name = NewStringf("%s_ext", new_name); - String *object_cast = NewStringf("((%s*) self->obj)", classname); - Swig_add_extension_code(n, ext_name, parms, Getattr(n, "type"), Getattr(n, "code"), CPlusPlus, object_cast); - } - - // generate action code - Printv(code, (Strcmp(Getattr(n, "type"), "void") != 0) ? "$cppresult = $mod " : "", NIL); - if (isextension) - Printv(code, ext_name, "(arg1", Len(arg_call_lnames) ? ", " : "", arg_call_lnames, ");\n", NIL); - else - Printv(code, "((", classname, "*) arg1->obj)->", Getattr(n, "name"), "(", arg_call_lnames, ");\n", NIL); - Setattr(n, "wrap:action", code); - - functionWrapper(n); - - Delete(arg_lnames); - Delete(code); - Delete(new_name); - Delete(stype); - Delete(ctype); - Delete(sobj_name); - Delete(name); - return SWIG_OK; + return Language::memberfunctionHandler(n); } /* -------------------------------------------------------------------- @@ -911,7 +828,7 @@ ready: String *action = NewString(""); if (!code) { code = NewString(""); - Printv(code, "$cppresult = $mod ((", classname, "*) arg1->obj)->", name, ";\n", NIL); + Printv(code, "result = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); } Append(action, code); @@ -964,7 +881,7 @@ ready: String *code = NewString(""); // create code for 'get' function - Printv(code, "$cppresult = $mod ", classname, "::", name, ";\n", NIL); + Printv(code, "result = ", classname, "::", name, ";\n", NIL); wrap_get_variable(n, classname, newclassname, name, code); // create parameter for 'set' function @@ -1003,62 +920,7 @@ ready: * --------------------------------------------------------------------- */ virtual int membervariableHandler(Node *n) { - Node *klass = Swig_methodclass(n); - String *name = Getattr(n, "sym:name"); - SwigType *type = Copy(Getattr(n, "type")); - String *classname = Getattr(klass, "classtype"); - String *newclassname = Getattr(klass, "sym:name"); - String *sobj_name = NewString(""); - String *ctype = NewString(""); - String *stype; - String *new_name = NewString(""); - - // create first argument - Printf(sobj_name, "SwigObj"); - ctype = Copy(sobj_name); - SwigType_add_pointer(ctype); - Parm *p = NewParm(ctype, "self"); - stype = Copy(newclassname); - SwigType_add_pointer(stype); - Setattr(p, "c:stype", stype); - Setattr(p, "c:objstruct", "1"); - Setattr(p, "lname", "arg1"); - - // create second argument - Parm *t = NewParm(Getattr(n, "type"), "value"); - Setattr(t, "lname", "arg2"); - - // create 'get' function - Setattr(n, "parms", p); - wrap_get_variable(n, classname, newclassname, name, 0); - - if (!SwigType_isconst(type)) { - // create 'set' function - set_nextSibling(p, t); - Setattr(n, "parms", p); - String *code = 0; - if (SwigType_isarray(Getattr(n, "type"))) { - code = NewString(""); - Printf(code, "if (arg2) {\n"); - Printf(code, "int i;\n"); - Printv(code, "for (i = 0; i < ", SwigType_array_getdim(Getattr(n, "type"), 0), "; ++i) {\n", NIL); - Printv(code, "((", classname, "*) arg1->obj)->", name, "[i] = arg2[i];\n", NIL); - Printf(code, "}\n}\n"); - } - else if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) { - code = NewString(""); - Printv(code, "* (int *) &((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); - } - Setattr(n, "type", "void"); - wrap_set_variable(n, classname, newclassname, name, code); - } - - Delete(new_name); - Delete(stype); - Delete(ctype); - Delete(sobj_name); - Delete(type); - return SWIG_OK; + return Language::membervariableHandler(n); } /* --------------------------------------------------------------------- @@ -1110,6 +972,7 @@ ready: String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); + // prepare argument names Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); @@ -1227,7 +1090,7 @@ ready: Setattr(n, "sym:name", destr_name); // create action code - Printf(code, "SWIG_remove_registry_entry(arg1);\n"); + Printf(code, "SWIG_remove_registry_entry(carg1);\n"); Printf(code, "SWIG_destroy_object(arg1);\n"); Setattr(n, "wrap:action", code); From dcec3c3fb0f19c75c487befe8cedde1fb8cd67ea Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 30 Jul 2008 22:09:02 +0000 Subject: [PATCH 033/508] Added std_string support. Renamed SWIG_exception to SWIG_exc to avoid name collision with macro in Lib/exception.i. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10720 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/exception/runme.c | 14 ++-- Examples/test-suite/c/exception_order_runme.c | 4 +- Lib/c/c.swg | 68 +++++++++---------- Lib/c/std_string.i | 50 ++++++++++++++ Lib/exception.i | 6 +- Source/Modules/c.cxx | 48 +++++++++++-- 6 files changed, 140 insertions(+), 50 deletions(-) create mode 100644 Lib/c/std_string.i diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c index 619f9b00e..7bef0a250 100644 --- a/Examples/c/exception/runme.c +++ b/Examples/c/exception/runme.c @@ -9,7 +9,7 @@ int main() { Test_unknown(t); } SWIG_catch(SWIG_AnyException) { - printf("incomplete type: %s\n", SWIG_exception.msg); + printf("incomplete type: %s\n", SWIG_exc.msg); } SWIG_endtry; @@ -17,7 +17,7 @@ int main() { Test_simple(t); } SWIG_catch(SWIG_AnyException) { - printf("%s\n", SWIG_exception.msg); + printf("%s\n", SWIG_exc.msg); } SWIG_endtry; @@ -25,7 +25,7 @@ int main() { Test_message(t); } SWIG_catch(SWIG_AnyException) { - printf("%s\n", SWIG_exception.msg); + printf("%s\n", SWIG_exc.msg); } SWIG_endtry; @@ -33,7 +33,8 @@ int main() { Test_hosed(t); } SWIG_catch(Exc) { - printf("%d %s\n", Exc_code_get(SWIG_exception.klass), Exc_msg_get(SWIG_exception.klass)); + printf("%d %s\n", Exc_code_get(SWIG_exc.klass), + Exc_msg_get(SWIG_exc.klass)); } int i; @@ -42,10 +43,11 @@ int main() { Test_multi(t, i); } SWIG_catch(Exc) { - printf("%d %s\n", Exc_code_get(SWIG_exception.klass), Exc_msg_get(SWIG_exception.klass)); + printf("%d %s\n", Exc_code_get(SWIG_exc.klass), + Exc_msg_get(SWIG_exc.klass)); } SWIG_catch(SWIG_AnyException) { - printf("%s\n", SWIG_exception.msg); + printf("%s\n", SWIG_exc.msg); } SWIG_endtry; } diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c index 0db538661..a409db13e 100644 --- a/Examples/test-suite/c/exception_order_runme.c +++ b/Examples/test-suite/c/exception_order_runme.c @@ -31,9 +31,9 @@ int main() { A_foobar(a); } SWIG_catch(SWIG_AnyException) { - if (strcmp(SWIG_exception.msg, "postcatch unknown") != 0) { + if (strcmp(SWIG_exc.msg, "postcatch unknown") != 0) { fprintf(stderr, "bad exception order\n"); - SWIG_throw_msg(SWIG_exception.klass, SWIG_exception.msg); + SWIG_throw_msg(SWIG_exc.klass, SWIG_exc.msg); } } SWIG_endtry; diff --git a/Lib/c/c.swg b/Lib/c/c.swg index d03d55584..9c9152d70 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -72,12 +72,12 @@ typedef struct { %typemap(in) SWIGTYPE * { if ($input) - $1 = ($1_type) $input->obj; + $1 = ($1_ltype) $input->obj; } %typemap(in) SWIGTYPE * [ANY] { if ($input) { - $1 = ($1_basetype*) malloc($1_dim0 * sizeof($1_basetype)); + $1 = ($1_basetype *) malloc($1_dim0 * sizeof($1_basetype)); int i; for (i = 0; i < $1_dim0; ++i) if ($input[i]) @@ -185,12 +185,12 @@ SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT; SWIGINTERN SwigObj *SWIG_create_object(const char *classname); SWIGINTERN void SWIG_destroy_object(SwigObj *object); -SWIGEXPORTC struct SWIG_exception_struct { +SWIGEXPORTC struct SWIG_exc_struct { int code; char *msg; SwigObj *klass; int handled; -} SWIG_exception = { 0, 0, 0, 0 }; +} SWIG_exc = { 0, 0, 0, 0 }; SWIGEXPORTC jmp_buf SWIG_rt_env; SWIGEXPORTC int SWIG_rt_init = 0; @@ -243,12 +243,12 @@ SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) { SWIGINTERN void SWIG_cleanup() { if (SWIG_rt_stack_base) free(SWIG_rt_stack_base); - if (SWIG_exception.msg) - free(SWIG_exception.msg); - if (SWIG_exception.klass) { - if (SWIG_exception.klass->typenames) - free(SWIG_exception.klass->typenames); - free(SWIG_exception.klass); + if (SWIG_exc.msg) + free(SWIG_exc.msg); + if (SWIG_exc.klass) { + if (SWIG_exc.klass->typenames) + free(SWIG_exc.klass->typenames); + free(SWIG_exc.klass); } int i; if (SWIG_registry_base) { @@ -276,10 +276,10 @@ SWIGEXPORTC int SWIG_rt_catch(const char *type) { if (!type || (strcmp("SWIG_AnyException", type) == 0)) { result = 1; } - else if (SWIG_exception.klass) { + else if (SWIG_exc.klass) { int i = 0; - while (SWIG_exception.klass->typenames[i]) { - if (strcmp(SWIG_exception.klass->typenames[i++], type) == 0) { + while (SWIG_exc.klass->typenames[i]) { + if (strcmp(SWIG_exc.klass->typenames[i++], type) == 0) { result = 1; break; } @@ -287,36 +287,36 @@ SWIGEXPORTC int SWIG_rt_catch(const char *type) { } if (result) { SWIG_rt_stack_pop(); - SWIG_exception.handled = 1; + SWIG_exc.handled = 1; } return result; } SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { - if (SWIG_exception.msg) { - free(SWIG_exception.msg); - SWIG_exception.msg = (char *) 0; + if (SWIG_exc.msg) { + free(SWIG_exc.msg); + SWIG_exc.msg = (char *) 0; } if (msg) { - SWIG_exception.msg = (char *) malloc(strlen(msg) + 1); - strcpy(SWIG_exception.msg, msg); + SWIG_exc.msg = (char *) malloc(strlen(msg) + 1); + strcpy(SWIG_exc.msg, msg); } - SWIG_exception.klass = klass; - SWIG_exception.handled = 0; + SWIG_exc.klass = klass; + SWIG_exc.handled = 0; longjmp(SWIG_rt_env, 1); } SWIGEXPORTC void SWIG_rt_unhandled() { - if (SWIG_exception.msg) { - free(SWIG_exception.msg); - SWIG_exception.msg = 0; + if (SWIG_exc.msg) { + free(SWIG_exc.msg); + SWIG_exc.msg = 0; } SWIG_rt_stack_pop(); - longjmp(SWIG_rt_env, SWIG_exception.code); + longjmp(SWIG_rt_env, SWIG_exc.code); } SWIGEXPORTC void SWIG_rt_endtry() { - if (SWIG_exception.handled) { + if (SWIG_exc.handled) { if (setjmp(SWIG_rt_env) == 0) { SWIG_rt_stack_push(); longjmp(SWIG_cpp_back_env, 1); @@ -338,9 +338,9 @@ SWIGEXPORTC int SWIG_exit(int code) { SWIGINTERN void SWIG_terminate() { fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", - SWIG_exception.klass->typenames[0], - SWIG_exception.msg ? SWIG_exception.msg : ""); - SWIG_exit(SWIG_exception.code); + SWIG_exc.klass->typenames[0], + SWIG_exc.msg ? SWIG_exc.msg : ""); + SWIG_exit(SWIG_exc.code); } SWIGINTERN void SWIG_Runtime_init() { @@ -348,11 +348,11 @@ SWIGINTERN void SWIG_Runtime_init() { if (!SWIG_rt_init) { SWIG_rt_init = 1; SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); - if (SWIG_exception.code = setjmp(SWIG_rt_env)) { + if (SWIG_exc.code = setjmp(SWIG_rt_env)) { // deallocate C++ exception if (setjmp(SWIG_rt_env) == 0) { SWIG_rt_stack_push(); - SWIG_exception.handled = 1; + SWIG_exc.handled = 1; longjmp(SWIG_cpp_back_env, 1); } SWIG_terminate(); @@ -379,11 +379,11 @@ typedef struct { const char **typenames; } SwigObj; -SWIGIMPORT struct SWIG_exception_struct { +SWIGIMPORT struct SWIG_exc_struct { int code; char *msg; SwigObj *klass; -} SWIG_exception; +} SWIG_exc; SWIGIMPORT void SWIG_rt_try(); SWIGIMPORT int SWIG_rt_catch(const char *type); @@ -394,7 +394,7 @@ SWIGIMPORT int SWIG_exit(int code); #define SWIG_try \ SWIG_rt_try(); \ - if ((SWIG_exception.code = setjmp(SWIG_rt_env)) == 0) + if ((SWIG_exc.code = setjmp(SWIG_rt_env)) == 0) #define SWIG_catch(type) else if (SWIG_rt_catch(#type)) #define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); #define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i new file mode 100644 index 000000000..9269c6e40 --- /dev/null +++ b/Lib/c/std_string.i @@ -0,0 +1,50 @@ +%{ +#include +%} + +namespace std { + +// use "const string &" typemaps for wrapping member strings +%naturalvar string; + +class string; + +%typemap(ctype) string "char *" +%typemap(ctype) const string & "char *" +%typemap(couttype) string "char *" +%typemap(couttype) const string & "char *" + +%typemap(in) string { + if ($input) { + $1.assign($input); + } + else { + $1.resize(0); + } +} + +%typemap(in) const string & { + if ($input) { + $1 = new std::string($input); + } + else { + $1 = new std::string(); + $1->resize(0); + } +} + +%typemap(freearg) const string & { + if ($1) + delete $1; +} + +%typemap(out) string, const string & { + const char *str = cppresult.c_str(); + size_t len = strlen(str); + $result = (char *) malloc(len + 1); + memcpy($result, str, len); + $result[len] = '\0'; +} + +} + diff --git a/Lib/exception.i b/Lib/exception.i index e89e22e5a..18b08994f 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -217,13 +217,15 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) { %inline %{ struct SWIG_CException { SWIG_CException(int code) { - SWIG_exception.code = code; + SWIG_exc.code = code; } }; %} #define SWIG_exception(code, msg)\ - SWIG_CThrowException(_wrap_new_SWIG_CException(code), msg); + SwigObj *_ex = SWIG_create_object("SWIG_CException"); \ + _ex->obj = (void *) new SWIG_CException(code); \ + SWIG_CThrowException(_ex, msg); #endif // SWIGC diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e6f3a5a7a..a971f6f8a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -510,12 +510,19 @@ ready: if (SwigType_isconst(type)) SwigType_del_qualifier(type); SwigType *return_var_type; - return_var_type = SwigType_isreference(type) ? SwigType_add_pointer(SwigType_base(type)) : type; - return_var_type = SwigType_isarray(type) ? SwigType_add_pointer(SwigType_base(type)) : type; + if (SwigType_isenum(type)) Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); - else + else { + if (SwigType_isreference(type)) + return_var_type = SwigType_base(type); + else if (SwigType_isarray(type)) + return_var_type = SwigType_add_pointer(SwigType_base(type)); + else + return_var_type = type; + Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); + } } // make sure lnames are set @@ -618,7 +625,7 @@ ready: // emit action code String *action = emit_action(n); if (Getattr(n, "throws") || (Cmp(Getattr(n, "feature:except"), "0") != 0)) { - Printf(action, "if (SWIG_exception.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); + Printf(action, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); } if (Cmp(nodeType(n), "constructor") != 0) Replace(action, "result =", "cppresult = $mod", DOH_REPLACE_FIRST); @@ -627,8 +634,8 @@ ready: if (SwigType_isreference(type)) { String *ref_cast = NewString(""); if (SwigType_isconst(SwigType_del_reference(type))) { - Printf(ref_cast, "const_cast<%s*>(&", SwigType_str(SwigType_base(type), 0)); - Replaceall(action, ";", ");"); + //Printf(ref_cast, "(%s*)", SwigType_str(SwigType_base(type), 0)); + Printf(ref_cast, "*"); } else Printf(ref_cast, "&"); @@ -656,6 +663,35 @@ ready: Append(wrapper->code, action); } + // insert constraint checking + for (p = parms; p; ) { + if ((tm = Getattr(p, "tmap:check"))) { + Replaceall(tm, "$target", Getattr(p, "lname")); + Printv(wrapper->code, tm, "\n", NIL); + p = Getattr(p, "tmap:check:next"); + } + else { + p = nextSibling(p); + } + } + + // insert cleanup code + for (p = parms; p; ) { + if ((tm = Getattr(p, "tmap:freearg"))) { + if (tm && (Len(tm) != 0)) { + String *input = NewStringf("c%s", Getattr(p, "lname")); + Replaceall(tm, "$source", Getattr(p, "lname")); + Replaceall(tm, "$input", input); + Delete(input); + Printv(wrapper->code, tm, "\n", NIL); + } + p = Getattr(p, "tmap:freearg:next"); + } + else { + p = nextSibling(p); + } + } + if (!is_void_return) Append(wrapper->code, "return result;\n"); From 948c474a0d2fb29cecf714429961476468303096 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 2 Aug 2008 16:38:27 +0000 Subject: [PATCH 034/508] Modified examples' Makefiles to generate executables. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10729 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/Makefile | 4 ++-- Examples/c/exception/Makefile | 4 ++-- Examples/c/simple/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 062903927..97066462a 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -10,10 +10,10 @@ MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp - -run: $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ TARGET='$(TARGET)' c_compile + +run: env LD_LIBRARY_PATH=. ./runme memchk: diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile index 062903927..97066462a 100644 --- a/Examples/c/exception/Makefile +++ b/Examples/c/exception/Makefile @@ -10,10 +10,10 @@ MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp - -run: $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ TARGET='$(TARGET)' c_compile + +run: env LD_LIBRARY_PATH=. ./runme memchk: diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index f324f9b1a..aaaf32b49 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -10,10 +10,10 @@ MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c - -run: $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ TARGET='$(TARGET)' c_compile + +run: env LD_LIBRARY_PATH=. ./runme memchk: From 83d60a1d367b721b308329074600a46d4026c16b Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Fri, 8 Aug 2008 21:22:07 +0000 Subject: [PATCH 035/508] Improved converting return values (avoiding using assignment and default constructors). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10746 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 57 ++++++++++++++++++++++++++++++-------------- Source/Swig/stype.c | 2 +- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index a971f6f8a..256fa330d 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -34,7 +34,6 @@ class C:public Language { bool proxy_flag; bool runtime_flag; - bool typecheck_flag; public: @@ -49,8 +48,7 @@ public: create_object(0), destroy_object(0), proxy_flag(true), - runtime_flag(true), - typecheck_flag(false) { + runtime_flag(true) { } /* ------------------------------------------------------------ @@ -325,8 +323,6 @@ public: Delete(result); result = NewString(""); - /*Printf(stderr, "MANGLING TYPE: %s\n", type_arg);*/ - SwigType *type = Copy(type_arg); if (SwigType_ismemberpointer(type)) { @@ -364,8 +360,6 @@ public: Printf(result, "%s", Char(SwigType_base(type))); ready: - /*Printf(stderr, " RESULT: %s\n", result);*/ - if (prefix) Delete(prefix); if (type) @@ -459,6 +453,7 @@ ready: else { // C++ function wrapper + // mark the first parameter as object-struct if ((Cmp(Getattr(n, "storage"), "static") != 0) && (Cmp(Getattr(n, "ismember"), "1") == 0) && (Cmp(nodeType(n), "constructor") != 0)) { @@ -506,22 +501,39 @@ ready: } // add variable for holding result of original function + bool return_object = false; if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if (SwigType_isconst(type)) SwigType_del_qualifier(type); SwigType *return_var_type; - if (SwigType_isenum(type)) + SwigType *tdtype = SwigType_typedef_resolve(type); + if (tdtype) + type = tdtype; + + if (SwigType_isenum(type)) { Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); - else { - if (SwigType_isreference(type)) - return_var_type = SwigType_base(type); - else if (SwigType_isarray(type)) + } + else if (SwigType_isbuiltin(SwigType_base(type))) { + // type is built-in (int, char, double, etc.) + if (SwigType_isreference(type) || SwigType_isarray(type)) return_var_type = SwigType_add_pointer(SwigType_base(type)); else return_var_type = type; + + Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); + } + else { + // type is class + if (SwigType_ispointer(type)) + return_var_type = type; + else if (SwigType_isreference(type) || SwigType_isarray(type)) + return_var_type = SwigType_add_pointer(SwigType_base(type)); + else + return_var_type = SwigType_add_pointer(type); Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); + return_object = true; } } @@ -624,8 +636,10 @@ ready: // emit action code String *action = emit_action(n); - if (Getattr(n, "throws") || (Cmp(Getattr(n, "feature:except"), "0") != 0)) { - Printf(action, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); + String *except = Getattr(n, "feature:except"); + if (Getattr(n, "throws") || except) { + if (!except || (Cmp(except, "0") != 0)) + Printf(action, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); } if (Cmp(nodeType(n), "constructor") != 0) Replace(action, "result =", "cppresult = $mod", DOH_REPLACE_FIRST); @@ -637,13 +651,14 @@ ready: //Printf(ref_cast, "(%s*)", SwigType_str(SwigType_base(type), 0)); Printf(ref_cast, "*"); } - else - Printf(ref_cast, "&"); Replaceall(action, "$mod", ref_cast); Delete(ref_cast); } else if (SwigType_isenum(type)) Replaceall(action, "$mod", "(int)"); + else if (return_object && Getattr(n, "c:retval")) { + Replaceall(action, "$mod", "&"); + } else Replaceall(action, "$mod", ""); @@ -847,6 +862,9 @@ ready: * --------------------------------------------------------------------- */ virtual int memberfunctionHandler(Node *n) { + SwigType *type = Getattr(n, "type"); + if (!SwigType_ispointer(type) && !SwigType_ispointer(SwigType_typedef_resolve(type))) + Setattr(n, "c:retval", "1"); return Language::memberfunctionHandler(n); } @@ -1151,13 +1169,15 @@ ready: virtual int enumDeclaration(Node *n) { if (!proxy_flag) return SWIG_OK; + if (Cmp(Getattr(n, "access"), "public") != 0) + return SWIG_OK; String *newclassname = Getattr(Swig_methodclass(n), "sym:name"); String *name = Getattr(n, "sym:name"); String *code = NewString(""); String *tdname = Getattr(n, "tdname"); String *newname = newclassname ? NewStringf("%s_", newclassname) : Copy(name); Symtab *symtab = Getattr(n, "sym:symtab"); - + if (tdname) Printf(code, "typedef "); @@ -1175,7 +1195,6 @@ ready: Setattr(entry, "sym:symtab", symtab); Swig_symbol_add(name, entry); } - if (newclassname) { if (symtab) { Node *node = Swig_symbol_clookup(name, symtab); @@ -1207,6 +1226,8 @@ ready: virtual int enumvalueDeclaration(Node *n) { String *name = Getattr(n, "sym:name"); + if (Cmp(Getattr(n, "access"), "public") != 0) + return SWIG_OK; String *enumvalue = Getattr(n, "enumvalue"); String *init = 0; if (enumvalue) { diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index bd006d07c..b6960f4d6 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -271,7 +271,7 @@ int SwigType_issimple(SwigType *t) { } int SwigType_isbuiltin(SwigType *t) { - const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", 0 }; + const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; int i = 0; char *c = Char(t); if (!t) From ea556b565d6361c099eef4d6bc59abf4df3b915d Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 9 Aug 2008 20:14:41 +0000 Subject: [PATCH 036/508] Some function return cases fixed. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10748 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 43 ++++++++++--------- Lib/c/std_string.i | 4 +- Source/Modules/c.cxx | 99 +++++++++++++++++++++++++++++--------------- 3 files changed, 91 insertions(+), 55 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 9c9152d70..84c129485 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -28,14 +28,14 @@ typedef struct { %typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_type" %typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_type" %typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_basetype *" +%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_basetype *" %typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_basetype *" -%typemap(ctype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype *" -%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" +%typemap(ctype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" +%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" %typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" -%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1_type" -%typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$1_basetype *" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1_basetype **" +%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" +%typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype **" %typemap(ctype) SWIGTYPE "SwigObj *" %typemap(ctype) SWIGTYPE * "SwigObj *" %typemap(ctype) SWIGTYPE & "SwigObj *" @@ -44,25 +44,27 @@ typedef struct { %fragment("stdbool_inc", "proxy_header") {#include } %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" -%typemap(ctype, fragment="stdbool_inc") bool &, const bool & "$1_basetype *" +%typemap(ctype, fragment="stdbool_inc") bool & "$1_basetype *" +%typemap(ctype, fragment="stdbool_inc") const bool & "$1_basetype const *" -%typemap(in) short, int, long, char, float, double, bool "$1 = ($1_type) $input;" -%typemap(in) void *, short *, int *, long *, char *, float *, double *, bool * "$1 = ($1_type) $input;" -%typemap(in) void **, short **, int **, long **, char **, float **, double **, bool * "$1 = ($1_basetype **) $input;" +%typemap(in) short, int, long, char, float, double "$1 = ($1_type) $input;" +%typemap(in) void *, short *, int *, long *, char *, float *, double * "$1 = ($1_type) $input;" +%typemap(in) void **, short **, int **, long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" %typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1 = ($1_type) $input;" %typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1 = ($1_type) $input;" -%typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double *, const bool * "$1 = ($1_basetype *) $input;" +%typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1 = ($1_basetype *) $input;" %typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned char * "$1 = ($1_type) $input;" %typemap(in) unsigned short, unsigned int, unsigned long, unsigned char "$1 = ($1_type) $input;" %typemap(in) short &, int &, long &, char &, float &, double &, bool & "$1 = ($1_basetype *) $input;" -%typemap(in) const short &, const int &, const long &, const char &, const float &, const double &, const bool & "$1 = ($1_basetype *) $input;" +%typemap(in) const short &, const int &, const long &, const char &, const float &, const double & "$1 = ($1_basetype *) $input;" %typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_basetype *) $input;" %typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype *) $input;" -%typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$1 = ($1_basetype *) $input;" -%typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY], bool * [ANY] "$1 = ($1_basetype *) $input;" +%typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1 = ($1_basetype *) $input;" +%typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" -%typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1 = ($1_type) $input;" -%typemap(in, fragment="stdbool_inc") bool &, const bool & "$1 = ($1_basetype *) $input;" +%typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_type) $input;" +%typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" +%typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" %typemap(in) enum SWIGTYPE "$1 = ($1_type) $input;" @@ -102,16 +104,17 @@ typedef struct { %typemap(couttype) void *, short *, int *, long *, char *, float *, double* "$1_type" %typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" %typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" -%typemap(couttype) short &, int &, long &, char &, float &, double &, bool & "$1_basetype *" +%typemap(couttype) short &, int &, long &, char &, float &, double & "$1_basetype *" %typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" -%typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$1_basetype *" +%typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "SwigObj *" %typemap(couttype) SWIGTYPE & "SwigObj *" %typemap(couttype) enum SWIGTYPE "$1_type" %typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_type" -%typemap(couttype, fragment="stdbool_inc") bool &, const bool & "$1_basetype *" +%typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*" +%typemap(couttype, fragment="stdbool_inc") const bool & "$1_basetype const *" %typemap(out) short, int, long, char, float, double "$result = $1;" %typemap(out) void*, short*, int*, long*, char*, float*, double* "$result = $1;" @@ -123,7 +126,7 @@ typedef struct { %typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$result = $1;" %typemap(out) const short &, const int &, const long &, const char &, const float &, const double & "$result = $1;" %typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$result = $1;" -%typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], bool [ANY] "$result = $1;" +%typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$result = $1;" %typemap(out) void "" %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = $1;" diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index 9269c6e40..a1ef885d6 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -38,8 +38,8 @@ class string; delete $1; } -%typemap(out) string, const string & { - const char *str = cppresult.c_str(); +%typemap(out) string, const string &, string * { + const char *str = cppresult->c_str(); size_t len = strlen(str); $result = (char *) malloc(len + 1); memcpy($result, str, len); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 256fa330d..ed3b0bf00 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -254,7 +254,7 @@ public: * globalfunctionHandler() * ------------------------------------------------------------------------ */ - virtual int globalfunctionHandler(Node *n ) { + virtual int globalfunctionHandler(Node *n) { String *action = NewString(""); String *vis_hint = NewString(""); String *return_type_str = SwigType_str(Getattr(n, "type"), 0); @@ -390,9 +390,7 @@ ready: Node *node = Swig_symbol_clookup(query, symtab); if (node) newtype = NewStringf("enum %s", Getattr(node, "name")); - else - newtype = Copy(enumtype); - + return newtype; } @@ -411,6 +409,7 @@ ready: String *tm; String *proto = NewString(""); String *over_suffix = NewString(""); + SwigType *return_var_type = empty_string; int gencomma; bool is_void_return = (SwigType_type(type) == T_VOID); @@ -503,10 +502,6 @@ ready: // add variable for holding result of original function bool return_object = false; if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - if (SwigType_isconst(type)) - SwigType_del_qualifier(type); - SwigType *return_var_type; - SwigType *tdtype = SwigType_typedef_resolve(type); if (tdtype) type = tdtype; @@ -515,11 +510,29 @@ ready: Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); } else if (SwigType_isbuiltin(SwigType_base(type))) { + if (SwigType_isconst(type)) + SwigType_del_qualifier(type); + // type is built-in (int, char, double, etc.) - if (SwigType_isreference(type) || SwigType_isarray(type)) - return_var_type = SwigType_add_pointer(SwigType_base(type)); - else + if (SwigType_isreference(type)) { + if (SwigType_isconst(SwigType_del_reference(type))) { + return_var_type = SwigType_base(type); + SwigType_add_qualifier(return_var_type, "const"); + SwigType_add_pointer(return_var_type); + } + else { + return_var_type = SwigType_base(type); + SwigType_add_pointer(return_var_type); + } + SwigType_add_reference(type); + } + else if (SwigType_isarray(type)) { + return_var_type = SwigType_base(type); + SwigType_add_pointer(return_var_type); + } + else { return_var_type = type; + } Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); } @@ -527,10 +540,14 @@ ready: // type is class if (SwigType_ispointer(type)) return_var_type = type; - else if (SwigType_isreference(type) || SwigType_isarray(type)) - return_var_type = SwigType_add_pointer(SwigType_base(type)); - else - return_var_type = SwigType_add_pointer(type); + else if (SwigType_isreference(type) || SwigType_isarray(type)) { + return_var_type = SwigType_base(type); + SwigType_add_pointer(return_var_type); + } + else { + return_var_type = type; + SwigType_add_pointer(return_var_type); + } Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); return_object = true; @@ -643,24 +660,24 @@ ready: } if (Cmp(nodeType(n), "constructor") != 0) Replace(action, "result =", "cppresult = $mod", DOH_REPLACE_FIRST); - - // handle return-by-reference - if (SwigType_isreference(type)) { - String *ref_cast = NewString(""); - if (SwigType_isconst(SwigType_del_reference(type))) { - //Printf(ref_cast, "(%s*)", SwigType_str(SwigType_base(type), 0)); - Printf(ref_cast, "*"); - } - Replaceall(action, "$mod", ref_cast); - Delete(ref_cast); - } + + // handle special cases of cpp return result + + String *mod = NewString("$mod"); + if (SwigType_isreference(type)) + Replaceall(mod, "$mod", ""); else if (SwigType_isenum(type)) - Replaceall(action, "$mod", "(int)"); - else if (return_object && Getattr(n, "c:retval")) { - Replaceall(action, "$mod", "&"); + Replaceall(mod, "$mod", "(int)"); + else if (return_object && Getattr(n, "c:retval")) + Replaceall(mod, "$mod", "&"); + else { + Delete(mod); + mod = empty_string; } - else - Replaceall(action, "$mod", ""); + + Printf(stderr, "\n%s, %s, mod = %s\n", name, type, mod); + + Replaceall(action, "$mod", mod); // emit output typemap if needed if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { @@ -854,6 +871,15 @@ ready: * --------------------------------------------------------------------- */ virtual int staticmemberfunctionHandler(Node *n) { + SwigType *type = Getattr(n, "type"); + SwigType *tdtype; + tdtype = SwigType_typedef_resolve(type); + if (tdtype) + type = tdtype; + if (type) { + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) + Setattr(n, "c:retval", "1"); + } return Language::staticmemberfunctionHandler(n); } @@ -863,8 +889,14 @@ ready: virtual int memberfunctionHandler(Node *n) { SwigType *type = Getattr(n, "type"); - if (!SwigType_ispointer(type) && !SwigType_ispointer(SwigType_typedef_resolve(type))) - Setattr(n, "c:retval", "1"); + SwigType *tdtype; + tdtype = SwigType_typedef_resolve(type); + if (tdtype) + type = tdtype; + if (type) { + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) + Setattr(n, "c:retval", "1"); + } return Language::memberfunctionHandler(n); } @@ -923,6 +955,7 @@ ready: /* --------------------------------------------------------------------- * staticmembervariableHandler() + * TODO: refactor * --------------------------------------------------------------------- */ virtual int staticmembervariableHandler(Node *n) { From 8438e30b0259d41fcd3eb3a1abbaa47a6f21e06a Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Thu, 14 Aug 2008 09:50:13 +0000 Subject: [PATCH 037/508] Fixed global function handler. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10760 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index ed3b0bf00..e28c1ca6a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -255,18 +255,18 @@ public: * ------------------------------------------------------------------------ */ virtual int globalfunctionHandler(Node *n) { - String *action = NewString(""); + SwigType *type = Getattr(n, "type"); String *vis_hint = NewString(""); String *return_type_str = SwigType_str(Getattr(n, "type"), 0); String *name = Getattr(n, "sym:name"); ParmList *parms = Getattr(n, "parms"); String *arg_list = NewString(""); + String *call = empty_string; + String *cres = empty_string; - if (SwigType_type(Getattr(n, "type")) != T_VOID) { - Printv(action, "result = (", SwigType_str(Getattr(n, "type"), 0), ") ", NIL); - } - Printv(action, Swig_cfunction_call(Getattr(n, "name"), parms), ";", NIL); - Setattr(n, "wrap:action", action); + call = Swig_cfunction_call(Getattr(n, "name"), parms); + cres = Swig_cresult(type, "result", call); + Setattr(n, "wrap:action", cres); functionWrapper(n); @@ -274,9 +274,10 @@ public: Printv(vis_hint, "SWIGPROTECT(", return_type_str, " ", name, "(", ParmList_str(parms), ");)\n\n", NIL); Printv(f_header, vis_hint, NIL); + Delete(cres); + Delete(call); Delete(arg_list); Delete(vis_hint); - Delete(action); return SWIG_OK; } @@ -313,10 +314,10 @@ public: } /* ---------------------------------------------------------------------- - * getMangledType() + * get_mangled_type() * ---------------------------------------------------------------------- */ - String *getMangledType(SwigType *type_arg) { + String *get_mangled_type(SwigType *type_arg) { static String *result = 0; SwigType *prefix = 0; if (result) @@ -470,7 +471,7 @@ ready: for (p = parms; p; p = nextSibling(p)) { if (Getattr(p, "c:objstruct")) continue; - String *mangled = getMangledType(Getattr(p, "type")); + String *mangled = get_mangled_type(Getattr(p, "type")); Printv(over_suffix, "_", mangled, NIL); } Append(name, over_suffix); @@ -675,8 +676,6 @@ ready: mod = empty_string; } - Printf(stderr, "\n%s, %s, mod = %s\n", name, type, mod); - Replaceall(action, "$mod", mod); // emit output typemap if needed @@ -1239,6 +1238,7 @@ ready: } Printv(code, newname ? newname : "", " {\n$enumvalues\n} ", tdname ? tdname : "", ";\n\n", NIL); emit_children(n); + if (enum_values) { Replaceall(code, "$enumvalues", enum_values); Append(f_proxy_header, code); @@ -1297,6 +1297,10 @@ ready: String *name = Getattr(n, "sym:name"); String *type = Getattr(n, "type"); char *c = Char(SwigType_str(type, 0)); + + if (!name) + name = Getattr(n, "name"); + if (strncmp(c, "enum", 4) != 0) { if (name && type) { String *code = NewStringf("typedef %s %s;\n\n", type, name); From 54860c95954fc59671aad2bd21ed72e20f7305fc Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sun, 17 Aug 2008 13:42:19 +0000 Subject: [PATCH 038/508] 1. Fixed the bug in enums. Now 'enums' test is compiling OK. 2. -noexcept flag disables generating exception-related code (like array of type names in SwigObj, object registry, etc.). This can be used when we are sure we won't handle exceptions on the C side, and this will generate much less code. 3. Modified typemaps for object arrays. Multidimensional ones still needs some fixing. 4. Added 'enums' and 'cast_operator' runtime tests. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10771 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/exception/runme.c | 4 + Examples/test-suite/c/cast_operator_runme.c | 12 + Examples/test-suite/c/enums_runme.c | 11 + Lib/c/c.swg | 322 +++++--------------- Lib/c/cexcept.swg | 260 ++++++++++++++++ Source/Modules/c.cxx | 191 ++++++++---- 6 files changed, 505 insertions(+), 295 deletions(-) create mode 100644 Examples/test-suite/c/cast_operator_runme.c create mode 100644 Examples/test-suite/c/enums_runme.c create mode 100644 Lib/c/cexcept.swg diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c index 7bef0a250..853f64246 100644 --- a/Examples/c/exception/runme.c +++ b/Examples/c/exception/runme.c @@ -1,3 +1,7 @@ +/* + * NOTE: this won't run with -noexcept flag + */ + #include #include "example_proxy.h" diff --git a/Examples/test-suite/c/cast_operator_runme.c b/Examples/test-suite/c/cast_operator_runme.c new file mode 100644 index 000000000..8b84ee60b --- /dev/null +++ b/Examples/test-suite/c/cast_operator_runme.c @@ -0,0 +1,12 @@ +#include + +#include "cast_operator/cast_operator_proxy.h" + +int main() { + A *a = new_A(); + if (strcmp(A_tochar(a), "hi")) + fprintf(stderr, "cast failed\n"); + delete_A(a); + SWIG_exit(0); +} + diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c new file mode 100644 index 000000000..374e55b06 --- /dev/null +++ b/Examples/test-suite/c/enums_runme.c @@ -0,0 +1,11 @@ +#include + +#include "enums/enums_proxy.h" + +int main() { + bar2(1); + bar3(1); + bar1(1); + SWIG_exit(0); +} + diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 84c129485..a5b3826d7 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -14,10 +14,7 @@ #include #include -typedef struct { - void *obj; - const char **typenames; -} SwigObj; +#define SWIG_STR(x) #x %} // typemaps for function parameters @@ -36,10 +33,12 @@ typedef struct { %typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" %typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" %typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype **" +%typemap(ctype) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_basetype **" %typemap(ctype) SWIGTYPE "SwigObj *" %typemap(ctype) SWIGTYPE * "SwigObj *" %typemap(ctype) SWIGTYPE & "SwigObj *" -%typemap(ctype) SWIGTYPE * [ANY] "SwigObj *" +%typemap(ctype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" +%typemap(ctype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" %typemap(ctype) enum SWIGTYPE "$1_type" %fragment("stdbool_inc", "proxy_header") {#include } @@ -77,18 +76,40 @@ typedef struct { $1 = ($1_ltype) $input->obj; } -%typemap(in) SWIGTYPE * [ANY] { +%typemap(in) SWIGTYPE * [ANY], SWIGTYPE ** { if ($input) { - $1 = ($1_basetype *) malloc($1_dim0 * sizeof($1_basetype)); - int i; - for (i = 0; i < $1_dim0; ++i) + $1 = ($1_ltype) malloc($1_dim0 * sizeof($1_basetype)); + size_t i = 0; + for ( ; i < $1_dim0; ++i) if ($input[i]) - $1[i] = ($1_basetype) $input[i]->obj; + $1[i] = ($*1_ltype) $input[i]->obj; else - $1[i] = ($1_basetype) 0; + $1[i] = ($*1_ltype) 0; } else - $1 = ($1_basetype*) 0; + $1 = ($1_ltype) 0; +} + +%typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY], SWIGTYPE **, SWIGTYPE *** { + if (arg2) + free(arg2); +} + +%typemap(in) SWIGTYPE * [ANY][ANY], SWIGTYPE *** { + if ($input) { + $1 = ($1_ltype) malloc($1_dim0 * $1_dim1 * sizeof($1_basetype)); + size_t i = 0, j = 0; + for ( ; i < $1_dim0; ++i) { + for ( ; j < $1_dim1; ++j) { + if ($input[i][j]) + $1[i][j] = * ($*1_ltype) $input[i][j]->obj; + else + $1[i][j] = * ($*1_ltype) 0; + } + } + } + else + $1 = ($1_ltype) 0; } %typemap(in) SWIGTYPE & { @@ -110,6 +131,8 @@ typedef struct { %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "SwigObj *" %typemap(couttype) SWIGTYPE & "SwigObj *" +%typemap(couttype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" +%typemap(couttype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" %typemap(couttype) enum SWIGTYPE "$1_type" %typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_type" @@ -134,273 +157,84 @@ typedef struct { %typemap(out) enum SWIGTYPE "$result = ($1_type) $1;" -// allocate new "object-struct" by default - %typemap(out) SWIGTYPE { $result = SWIG_create_object(SWIG_STR($1_type)); $result->obj = (void*) &$1; } - %typemap(out) SWIGTYPE *, SWIGTYPE & { $result = SWIG_create_object(SWIG_STR($1_basetype)); $result->obj = (void*) $1; } -// exception handling - -%typemap(throws) BASIC_INT_TYPES { - char error_msg[256]; - sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); - SWIG_CThrowException(0, error_msg); -} - -%apply BASIC_INT_TYPES { int, long, short, unsigned int, unsigned long, unsigned short, int &, long &, short &, unsigned int &, unsigned long &, unsigned short & }; - -%typemap(throws) char *, const char * { - SWIG_CThrowException(0, $1); -} - -// this should match only SwigObj objects -%typemap(throws) SWIGTYPE { - SwigObj *c_ex; - c_ex = SWIG_create_object(SWIG_STR($1_basetype)); - c_ex->obj = (void*) &$1; - SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); -} - -%typemap(throws) SWIGTYPE * { - SwigObj *c_ex; - c_ex = SWIG_create_object(SWIG_STR($1_basetype)); - c_ex->obj = (void*) $1; - SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); -} - -%insert("runtime") %{ -#define SWIG_STR(x) #x -#define SWIG_MAX_RT_STACK 256 -#define SWIG_REGISTRY_INIT 256 - -SWIGINTERN SwigObj **SWIG_registry_base = 0; -SWIGINTERN SwigObj **SWIG_registry = 0; -SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT; - -SWIGINTERN SwigObj *SWIG_create_object(const char *classname); -SWIGINTERN void SWIG_destroy_object(SwigObj *object); - -SWIGEXPORTC struct SWIG_exc_struct { - int code; - char *msg; - SwigObj *klass; - int handled; -} SWIG_exc = { 0, 0, 0, 0 }; - -SWIGEXPORTC jmp_buf SWIG_rt_env; -SWIGEXPORTC int SWIG_rt_init = 0; -SWIGINTERN jmp_buf SWIG_cpp_back_env; -SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; -SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; - -SWIGINTERN void SWIG_rt_stack_push() { - // TODO: check for stack overflow - memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env)); - SWIG_rt_stack_ptr++; -} - -SWIGINTERN void SWIG_rt_stack_pop() { - if (SWIG_rt_stack_ptr == SWIG_rt_stack_base) - return; - SWIG_rt_stack_ptr--; - memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); -} - -SWIGINTERN void SWIG_add_registry_entry(SwigObj *entry) { - if (SWIG_registry_base == 0) { - SWIG_registry_base = SWIG_registry = (SwigObj **) malloc(SWIG_registry_size * sizeof(SwigObj *)); - memset(SWIG_registry_base, 0, SWIG_registry_size * sizeof(SwigObj *)); - } - *SWIG_registry = entry; - SWIG_registry++; - if ((SWIG_registry - SWIG_registry_base) == SWIG_registry_size) { - SWIG_registry = SWIG_registry_base; - SWIG_registry_size += SWIG_REGISTRY_INIT; - int new_size = SWIG_registry_size * sizeof(SwigObj *); - SWIG_registry_base = (SwigObj **) malloc(new_size); - memset(SWIG_registry_base, 0, new_size); - memcpy(SWIG_registry_base, SWIG_registry, (SWIG_registry_size - SWIG_REGISTRY_INIT) * sizeof(SwigObj *)); - free(SWIG_registry); - SWIG_registry = SWIG_registry_base + (SWIG_registry_size - SWIG_REGISTRY_INIT); +%typemap(out) SWIGTYPE * [ANY], SWIGTYPE ** { + if ($1) { + $result = (SwigObj**) malloc($1_dim0 * sizeof(SwigObj*)); + size_t i = 0; + for ( ; i < $1_dim0; ++i) + if ($1[i]) { + $result[i] = SWIG_create_object(SWIG_STR($1_ltype)); + $result[i]->obj = (void*) $1[i]; + } + else + $result[i] = (SwigObj*) 0; } + else + $result = (SwigObj**) 0; } -SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) { - int i; - for (i = 0; i < SWIG_registry_size; ++i) { - if (*(SWIG_registry_base + i) == entry) { - *(SWIG_registry_base + i) = 0; - break; - } - } -} - -SWIGINTERN void SWIG_cleanup() { - if (SWIG_rt_stack_base) - free(SWIG_rt_stack_base); - if (SWIG_exc.msg) - free(SWIG_exc.msg); - if (SWIG_exc.klass) { - if (SWIG_exc.klass->typenames) - free(SWIG_exc.klass->typenames); - free(SWIG_exc.klass); - } - int i; - if (SWIG_registry_base) { - for (i = 0; i < SWIG_registry_size; ++i) { - if (*(SWIG_registry_base + i)) { - SWIG_destroy_object(*(SWIG_registry_base + i)); - *(SWIG_registry_base + i) = 0; +%typemap(out) SWIGTYPE * [ANY][ANY], SWIGTYPE *** { + if ($1) { + $result = (SwigObj***) malloc($1_dim0 * $1_dim1 * sizeof(SwigObj*)); + size_t i = 0, j = 0; + for ( ; i < $1_dim0; ++i) { + for ( ; j < $1_dim1; ++j) { + if ($1[i][j]) { + $result[i][j] = SWIG_create_object(SWIG_STR($1_ltype)); + $result[i][j]->obj = (void*) $1[i][j]; + } + else + $result[i][j] = (SwigObj*) 0; } } } - free(SWIG_registry_base); - SWIG_registry_base = 0; + else + $result = (SwigObj***) 0; } +#ifdef SWIG_C_EXCEPT +%insert("runtime") %{ +typedef struct { + void *obj; + const char **typenames; +} SwigObj; +%} +%include "cexcept.swg" +#else +%insert("runtime") %{ +typedef struct { + void *obj; +} SwigObj; + #ifdef __cplusplus extern "C" { #endif -SWIGEXPORTC void SWIG_rt_try() { - SWIG_rt_stack_push(); -} - -SWIGEXPORTC int SWIG_rt_catch(const char *type) { - int result = 0; - if (!type || (strcmp("SWIG_AnyException", type) == 0)) { - result = 1; - } - else if (SWIG_exc.klass) { - int i = 0; - while (SWIG_exc.klass->typenames[i]) { - if (strcmp(SWIG_exc.klass->typenames[i++], type) == 0) { - result = 1; - break; - } - } - } - if (result) { - SWIG_rt_stack_pop(); - SWIG_exc.handled = 1; - } - return result; -} - -SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { - if (SWIG_exc.msg) { - free(SWIG_exc.msg); - SWIG_exc.msg = (char *) 0; - } - if (msg) { - SWIG_exc.msg = (char *) malloc(strlen(msg) + 1); - strcpy(SWIG_exc.msg, msg); - } - SWIG_exc.klass = klass; - SWIG_exc.handled = 0; - longjmp(SWIG_rt_env, 1); -} - -SWIGEXPORTC void SWIG_rt_unhandled() { - if (SWIG_exc.msg) { - free(SWIG_exc.msg); - SWIG_exc.msg = 0; - } - SWIG_rt_stack_pop(); - longjmp(SWIG_rt_env, SWIG_exc.code); -} - -SWIGEXPORTC void SWIG_rt_endtry() { - if (SWIG_exc.handled) { - if (setjmp(SWIG_rt_env) == 0) { - SWIG_rt_stack_push(); - longjmp(SWIG_cpp_back_env, 1); - } - } - else { - SWIG_rt_stack_pop(); // pop the SWIG_try context - } -} - SWIGEXPORTC int SWIG_exit(int code) { - SWIG_cleanup(); exit(code); } #ifdef __cplusplus } #endif - -SWIGINTERN void SWIG_terminate() { - fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", - SWIG_exc.klass->typenames[0], - SWIG_exc.msg ? SWIG_exc.msg : ""); - SWIG_exit(SWIG_exc.code); -} - -SWIGINTERN void SWIG_Runtime_init() { - int i, code; - if (!SWIG_rt_init) { - SWIG_rt_init = 1; - SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); - if (SWIG_exc.code = setjmp(SWIG_rt_env)) { - // deallocate C++ exception - if (setjmp(SWIG_rt_env) == 0) { - SWIG_rt_stack_push(); - SWIG_exc.handled = 1; - longjmp(SWIG_cpp_back_env, 1); - } - SWIG_terminate(); - } - } -} - -#define SWIG_CThrowException(klass, msg) \ - if (setjmp(SWIG_cpp_back_env) == 0) \ - SWIG_rt_throw((SwigObj *) klass, msg); - %} %insert("proxy_header") %{ -// special value indicating any type of exception like 'catch(...)' -#define SWIG_AnyException "SWIG_AnyException" - -#include - -SWIGIMPORT jmp_buf SWIG_rt_env; - typedef struct { void *obj; const char **typenames; } SwigObj; - -SWIGIMPORT struct SWIG_exc_struct { - int code; - char *msg; - SwigObj *klass; -} SWIG_exc; - -SWIGIMPORT void SWIG_rt_try(); -SWIGIMPORT int SWIG_rt_catch(const char *type); -SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg); -SWIGIMPORT int SWIG_rt_unhandled(); -SWIGIMPORT void SWIG_rt_endtry(); -SWIGIMPORT int SWIG_exit(int code); - -#define SWIG_try \ - SWIG_rt_try(); \ - if ((SWIG_exc.code = setjmp(SWIG_rt_env)) == 0) -#define SWIG_catch(type) else if (SWIG_rt_catch(#type)) -#define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); -#define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); -#define SWIG_endtry else SWIG_rt_unhandled(); SWIG_rt_endtry(); %} +#endif + diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg new file mode 100644 index 000000000..37077f21e --- /dev/null +++ b/Lib/c/cexcept.swg @@ -0,0 +1,260 @@ +/* ----------------------------------------------------------------------------- + * clabels.swg + * + * Exception handling code and typemaps for C module. + * ----------------------------------------------------------------------------- */ + +%typemap(throws) BASIC_INT_TYPES { + char error_msg[256]; + sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); + SWIG_CThrowException(0, error_msg); +} + +%apply BASIC_INT_TYPES { int, long, short, unsigned int, unsigned long, unsigned short, int &, long &, short &, unsigned int &, unsigned long &, unsigned short & }; + +%typemap(throws) char *, const char * { + SWIG_CThrowException(0, $1); +} + +// this should match only SwigObj objects +%typemap(throws) SWIGTYPE { + SwigObj *c_ex; + c_ex = SWIG_create_object(SWIG_STR($1_basetype)); + c_ex->obj = (void*) &$1; + SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); +} + +%typemap(throws) SWIGTYPE * { + SwigObj *c_ex; + c_ex = SWIG_create_object(SWIG_STR($1_basetype)); + c_ex->obj = (void*) $1; + SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); +} + +%insert("runtime") %{ +#define SWIG_MAX_RT_STACK 256 +#define SWIG_REGISTRY_INIT 256 + +SWIGINTERN SwigObj **SWIG_registry_base = 0; +SWIGINTERN SwigObj **SWIG_registry = 0; +SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT; + +SWIGINTERN SwigObj *SWIG_create_object(const char *classname); +SWIGINTERN void SWIG_destroy_object(SwigObj *object); + +SWIGEXPORTC struct SWIG_exc_struct { + int code; + char *msg; + SwigObj *klass; + int handled; +} SWIG_exc = { 0, 0, 0, 0 }; + +SWIGEXPORTC jmp_buf SWIG_rt_env; +SWIGEXPORTC int SWIG_rt_init = 0; +SWIGINTERN jmp_buf SWIG_cpp_back_env; +SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; +SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; + +SWIGINTERN void SWIG_rt_stack_push() { + // TODO: check for stack overflow + memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env)); + SWIG_rt_stack_ptr++; +} + +SWIGINTERN void SWIG_rt_stack_pop() { + if (SWIG_rt_stack_ptr == SWIG_rt_stack_base) + return; + SWIG_rt_stack_ptr--; + memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); +} + +SWIGINTERN void SWIG_add_registry_entry(SwigObj *entry) { + if (SWIG_registry_base == 0) { + SWIG_registry_base = SWIG_registry = (SwigObj **) malloc(SWIG_registry_size * sizeof(SwigObj *)); + memset(SWIG_registry_base, 0, SWIG_registry_size * sizeof(SwigObj *)); + } + *SWIG_registry = entry; + SWIG_registry++; + if ((SWIG_registry - SWIG_registry_base) == SWIG_registry_size) { + SWIG_registry = SWIG_registry_base; + SWIG_registry_size += SWIG_REGISTRY_INIT; + int new_size = SWIG_registry_size * sizeof(SwigObj *); + SWIG_registry_base = (SwigObj **) malloc(new_size); + memset(SWIG_registry_base, 0, new_size); + memcpy(SWIG_registry_base, SWIG_registry, (SWIG_registry_size - SWIG_REGISTRY_INIT) * sizeof(SwigObj *)); + free(SWIG_registry); + SWIG_registry = SWIG_registry_base + (SWIG_registry_size - SWIG_REGISTRY_INIT); + } +} + +SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) { + int i; + for (i = 0; i < SWIG_registry_size; ++i) { + if (*(SWIG_registry_base + i) == entry) { + *(SWIG_registry_base + i) = 0; + break; + } + } +} + +SWIGINTERN void SWIG_cleanup() { + if (SWIG_rt_stack_base) + free(SWIG_rt_stack_base); + if (SWIG_exc.msg) + free(SWIG_exc.msg); + if (SWIG_exc.klass) { + if (SWIG_exc.klass->typenames) + free(SWIG_exc.klass->typenames); + free(SWIG_exc.klass); + } + int i; + if (SWIG_registry_base) { + for (i = 0; i < SWIG_registry_size; ++i) { + if (*(SWIG_registry_base + i)) { + SWIG_destroy_object(*(SWIG_registry_base + i)); + *(SWIG_registry_base + i) = 0; + } + } + } + free(SWIG_registry_base); + SWIG_registry_base = 0; +} + +#ifdef __cplusplus +extern "C" { +#endif + +SWIGEXPORTC void SWIG_rt_try() { + SWIG_rt_stack_push(); +} + +SWIGEXPORTC int SWIG_rt_catch(const char *type) { + int result = 0; + if (!type || (strcmp("SWIG_AnyException", type) == 0)) { + result = 1; + } + else if (SWIG_exc.klass) { + int i = 0; + while (SWIG_exc.klass->typenames[i]) { + if (strcmp(SWIG_exc.klass->typenames[i++], type) == 0) { + result = 1; + break; + } + } + } + if (result) { + SWIG_rt_stack_pop(); + SWIG_exc.handled = 1; + } + return result; +} + +SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { + if (SWIG_exc.msg) { + free(SWIG_exc.msg); + SWIG_exc.msg = (char *) 0; + } + if (msg) { + SWIG_exc.msg = (char *) malloc(strlen(msg) + 1); + strcpy(SWIG_exc.msg, msg); + } + SWIG_exc.klass = klass; + SWIG_exc.handled = 0; + longjmp(SWIG_rt_env, 1); +} + +SWIGEXPORTC void SWIG_rt_unhandled() { + if (SWIG_exc.msg) { + free(SWIG_exc.msg); + SWIG_exc.msg = 0; + } + SWIG_rt_stack_pop(); + longjmp(SWIG_rt_env, SWIG_exc.code); +} + +SWIGEXPORTC void SWIG_rt_endtry() { + if (SWIG_exc.handled) { + if (setjmp(SWIG_rt_env) == 0) { + SWIG_rt_stack_push(); + longjmp(SWIG_cpp_back_env, 1); + } + } + else { + SWIG_rt_stack_pop(); // pop the SWIG_try context + } +} + +SWIGEXPORTC int SWIG_exit(int code) { + SWIG_cleanup(); + exit(code); +} + +#ifdef __cplusplus +} +#endif + +SWIGINTERN void SWIG_terminate() { + fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", + SWIG_exc.klass->typenames[0], + SWIG_exc.msg ? SWIG_exc.msg : ""); + SWIG_exit(SWIG_exc.code); +} + +SWIGINTERN void SWIG_runtime_init() { + int i, code; + if (!SWIG_rt_init) { + SWIG_rt_init = 1; + SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); + if (SWIG_exc.code = setjmp(SWIG_rt_env)) { + // deallocate C++ exception + if (setjmp(SWIG_rt_env) == 0) { + SWIG_rt_stack_push(); + SWIG_exc.handled = 1; + longjmp(SWIG_cpp_back_env, 1); + } + SWIG_terminate(); + } + } +} + +#define SWIG_CThrowException(klass, msg) \ + if (setjmp(SWIG_cpp_back_env) == 0) \ + SWIG_rt_throw((SwigObj *) klass, msg); +%} + +%insert("proxy_header") %{ +// special value indicating any type of exception like 'catch(...)' +#define SWIG_AnyException "SWIG_AnyException" + +#include + +SWIGIMPORT jmp_buf SWIG_rt_env; + +typedef struct { + void *obj; + const char **typenames; +} SwigObj; + +SWIGIMPORT struct SWIG_exc_struct { + int code; + char *msg; + SwigObj *klass; +} SWIG_exc; + +SWIGIMPORT void SWIG_rt_try(); +SWIGIMPORT int SWIG_rt_catch(const char *type); +SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg); +SWIGIMPORT int SWIG_rt_unhandled(); +SWIGIMPORT void SWIG_rt_endtry(); +SWIGIMPORT int SWIG_exit(int code); + +#define SWIG_try \ + SWIG_rt_try(); \ + if ((SWIG_exc.code = setjmp(SWIG_rt_env)) == 0) +#define SWIG_catch(type) else if (SWIG_rt_catch(#type)) +#define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); +#define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); +#define SWIG_endtry else SWIG_rt_unhandled(); SWIG_rt_endtry(); + +%} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e28c1ca6a..3755d1446 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -32,8 +32,10 @@ class C:public Language { String *create_object; String *destroy_object; + int enum_id; + bool proxy_flag; - bool runtime_flag; + bool except_flag; public: @@ -47,8 +49,9 @@ public: enum_values(0), create_object(0), destroy_object(0), + enum_id(1), proxy_flag(true), - runtime_flag(true) { + except_flag(true) { } /* ------------------------------------------------------------ @@ -57,17 +60,6 @@ public: virtual void main(int argc, char *argv[]) { - SWIG_library_directory("c"); - - // add a symbol to the parser for conditional compilation - Preprocessor_define("SWIGC 1", 0); - if (runtime_flag) - Preprocessor_define("SWIG_C_RUNTIME 1", 0); - - // add typemap definitions - SWIG_typemap_lang("c"); - SWIG_config_file("c.swg"); - // look for certain command line options for (int i = 1; i < argc; i++) { if (argv[i]) { @@ -79,15 +71,24 @@ public: } else if (strcmp(argv[i], "-noproxy") == 0) { proxy_flag = false; Swig_mark_arg(i); - } else if (strcmp(argv[i], "-noruntime") == 0) { - runtime_flag = false; + } else if (strcmp(argv[i], "-noexcept") == 0) { + except_flag = false; Swig_mark_arg(i); } } } - if (!CPlusPlus) - runtime_flag = false; + // add a symbol to the parser for conditional compilation + Preprocessor_define("SWIGC 1", 0); + Preprocessor_define("SWIG_C_RUNTME 1", 0); + if (except_flag) + Preprocessor_define("SWIG_C_EXCEPT 1", 0); + + SWIG_library_directory("c"); + + // add typemap definitions + SWIG_typemap_lang("c"); + SWIG_config_file("c.swg"); allow_overloading(); } @@ -98,8 +99,9 @@ public: void start_create_object() { String *s = create_object = NewString(""); - Printf(s, "\nSWIGINTERN SwigObj *SWIG_create_object(const char *classname) {\n"); - Printf(s, "SWIG_Runtime_init();\n"); + Printv(s, "\nSWIGINTERN SwigObj *SWIG_create_object(", except_flag ? "const char *classname" : "", ") {\n", NIL); + if (except_flag) + Printf(s, "SWIG_runtime_init();\n"); Printf(s, "SwigObj *result;\n"); Printf(s, "result = (SwigObj *) malloc(sizeof(SwigObj));\n"); Printf(s, "result->obj = 0;\n"); @@ -123,7 +125,9 @@ public: void start_destroy_object() { String *s = destroy_object = NewString(""); Printf(s, "\nSWIGINTERN void SWIG_destroy_object(SwigObj *object) {\n"); - Printf(s, "if (object)\nif (object->typenames) {\n"); + Printf(s, "if (object) {\n"); + if (except_flag) + Printf(s, "if (object->typenames) {\n"); } /* --------------------------------------------------------------------- @@ -132,9 +136,12 @@ public: String *finish_destroy_object() { String *s = destroy_object; - Printf(s, "free(object->typenames);\n"); + if (except_flag) + Printf(s, "free(object->typenames);\n"); Printf(s, "free(object);\n"); Printf(s, "object = (SwigObj *) 0;\n"); + if (except_flag) + Printf(s, "}\n"); Printf(s, "}\n}\n"); return destroy_object; } @@ -198,13 +205,15 @@ public: Printf(f_wrappers, "#endif\n\n"); start_create_object(); - start_destroy_object(); + if (except_flag) + start_destroy_object(); // emit code for children Language::top(n); Append(f_header, finish_create_object()); - Append(f_header, finish_destroy_object()); + if (except_flag) + Append(f_header, finish_destroy_object()); Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "}\n"); @@ -245,6 +254,8 @@ public: return SWIG_OK; String *name = Getattr(n, "name"); SwigType *type = Getattr(n, "type"); + if (SwigType_isenum(type)) + type = make_enum_type(n, type); String *type_str = SwigType_str(type, 0); Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL); return SWIG_OK; @@ -391,6 +402,8 @@ ready: Node *node = Swig_symbol_clookup(query, symtab); if (node) newtype = NewStringf("enum %s", Getattr(node, "name")); + else + newtype = SwigType_str(enumtype, 0); return newtype; } @@ -511,10 +524,10 @@ ready: Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); } else if (SwigType_isbuiltin(SwigType_base(type))) { + // type is built-in (int, char, double, etc.) if (SwigType_isconst(type)) SwigType_del_qualifier(type); - // type is built-in (int, char, double, etc.) if (SwigType_isreference(type)) { if (SwigType_isconst(SwigType_del_reference(type))) { return_var_type = SwigType_base(type); @@ -529,7 +542,12 @@ ready: } else if (SwigType_isarray(type)) { return_var_type = SwigType_base(type); - SwigType_add_pointer(return_var_type); + SwigType *atype = Copy(type); + do { + SwigType_del_array(atype); + SwigType_add_pointer(return_var_type); + } while (SwigType_isarray(atype)); + Delete(atype); } else { return_var_type = type; @@ -541,10 +559,21 @@ ready: // type is class if (SwigType_ispointer(type)) return_var_type = type; - else if (SwigType_isreference(type) || SwigType_isarray(type)) { + else if (SwigType_isreference(type)) { return_var_type = SwigType_base(type); SwigType_add_pointer(return_var_type); } + else if (SwigType_isarray(type)) { + return_var_type = SwigType_base(type); + SwigType *atype = Copy(type); + do { + SwigType_del_array(atype); + SwigType_add_pointer(return_var_type); + } while (SwigType_isarray(atype)); + Delete(atype); + if (Cmp(Getattr(n, "c:retval"), "1")) + SwigType_add_pointer(return_var_type); + } else { return_var_type = type; SwigType_add_pointer(return_var_type); @@ -639,6 +668,7 @@ ready: Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); p = nextSibling(p); } + Delete(arg_name); Delete(proxy_parm_type); Delete(c_parm_type); @@ -669,7 +699,7 @@ ready: Replaceall(mod, "$mod", ""); else if (SwigType_isenum(type)) Replaceall(mod, "$mod", "(int)"); - else if (return_object && Getattr(n, "c:retval")) + else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type)) Replaceall(mod, "$mod", "&"); else { Delete(mod); @@ -832,7 +862,8 @@ ready: } } - Printv(f_header, "const char* Swig_typename_", name, " = \"", name, "\";\n\n", NIL); + if (except_flag) + Printv(f_header, "const char* Swig_typename_", name, " = \"", name, "\";\n\n", NIL); // declare type for specific class in the proxy header if (proxy_flag) @@ -1006,6 +1037,26 @@ ready: * --------------------------------------------------------------------- */ virtual int membervariableHandler(Node *n) { + SwigType *type = Copy(Getattr(n, "type")); + SwigType *tdtype; + tdtype = SwigType_typedef_resolve(type); + if (tdtype) + type = tdtype; + + int array_count = 0; + while (SwigType_isarray(type)) { + SwigType_del_array(type); + array_count++; + } + if (type) { + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) + Setattr(n, "c:retval", "1"); + } + while (array_count) { + SwigType_add_pointer(type); + array_count--; + } + Delete(type); return Language::membervariableHandler(n); } @@ -1078,10 +1129,16 @@ ready: Setattr(n, "sym:name", constr_name); // generate action code - add_to_create_object(n, classname, newclassname); - Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); + if (except_flag) { + add_to_create_object(n, classname, newclassname); + Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); + Printf(code, "SWIG_add_registry_entry(result);\n"); + } + else { + Printf(code, "result = SWIG_create_object();\n"); + } + Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); - Printf(code, "SWIG_add_registry_entry(result);\n"); Setattr(n, "wrap:action", code); @@ -1129,10 +1186,17 @@ ready: Setattr(n, "sym:name", constr_name); // generate action code - add_to_create_object(n, classname, newclassname); - Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); - Printv(code, "result->obj = (void*) new ", classname, "((", classname, " const &)*arg1);\n", NIL); - + if (except_flag) { + add_to_create_object(n, classname, newclassname); + Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); + Printf(code, "SWIG_add_registry_entry(result);\n"); + } + else { + Printf(code, "result = SWIG_create_object();\n"); + } + + Printv(code, "result->obj = (void*) new ", classname, "((", classname, " const &)*arg1);\n", NIL); + Setattr(n, "wrap:action", code); functionWrapper(n); @@ -1150,7 +1214,9 @@ ready: * --------------------------------------------------------------------- */ virtual int destructorHandler(Node *n) { - String *newclassname = Getattr(Swig_methodclass(n), "sym:name"); + Node *klass = Swig_methodclass(n); + String *classname = Getattr(klass, "classtype"); + String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype; String *stype; @@ -1176,8 +1242,14 @@ ready: Setattr(n, "sym:name", destr_name); // create action code - Printf(code, "SWIG_remove_registry_entry(carg1);\n"); - Printf(code, "SWIG_destroy_object(arg1);\n"); + if (except_flag) { + Printf(code, "SWIG_remove_registry_entry(carg1);\n"); + Printf(code, "SWIG_destroy_object(arg1);\n"); + } + else { + Printv(code, "if (carg1->obj)\ndelete (", classname, " *) (carg1->obj);\n", NIL); + } + Setattr(n, "wrap:action", code); functionWrapper(n); @@ -1201,20 +1273,32 @@ ready: virtual int enumDeclaration(Node *n) { if (!proxy_flag) return SWIG_OK; - if (Cmp(Getattr(n, "access"), "public") != 0) - return SWIG_OK; String *newclassname = Getattr(Swig_methodclass(n), "sym:name"); String *name = Getattr(n, "sym:name"); String *code = NewString(""); String *tdname = Getattr(n, "tdname"); - String *newname = newclassname ? NewStringf("%s_", newclassname) : Copy(name); - Symtab *symtab = Getattr(n, "sym:symtab"); - if (tdname) + if (tdname) { Printf(code, "typedef "); + name = Getattr(n, "name"); + String *td_def_name = NewStringf("enum %s", name); + SwigType_typedef(td_def_name, name); + Delete(td_def_name); + SwigType_istypedef(name); + } + + Symtab *symtab = Getattr(n, "sym:symtab"); + String *newname = newclassname ? NewStringf("%s_", newclassname) : Copy(name); Printf(code, "enum "); + if (!name) { + String *anonymous_name = NewStringf("enum%d ", enum_id++); + Setattr(n, "sym:name", anonymous_name); + Setattr(n, "unnamed", "1"); + name = Getattr(n, "sym:name"); + Delete(anonymous_name); + } if (Delattr(n, "unnamed")) { // unnamed enum declaration: create new symbol Replaceall(name, "$unnamed", "enum"); @@ -1226,15 +1310,21 @@ ready: Setattr(entry, "sym:name", name); Setattr(entry, "sym:symtab", symtab); Swig_symbol_add(name, entry); - } + } if (newclassname) { if (symtab) { Node *node = Swig_symbol_clookup(name, symtab); - if (node) { + if (node) Append(newname, name); - Setattr(node, "name", newname); - } } + else + Append(newname, "enum"); + + Setattr(n, "name", newname); + } + else { + Delete(newname); + newname = name; } Printv(code, newname ? newname : "", " {\n$enumvalues\n} ", tdname ? tdname : "", ";\n\n", NIL); emit_children(n); @@ -1259,8 +1349,6 @@ ready: virtual int enumvalueDeclaration(Node *n) { String *name = Getattr(n, "sym:name"); - if (Cmp(Getattr(n, "access"), "public") != 0) - return SWIG_OK; String *enumvalue = Getattr(n, "enumvalue"); String *init = 0; if (enumvalue) { @@ -1303,9 +1391,10 @@ ready: if (strncmp(c, "enum", 4) != 0) { if (name && type) { - String *code = NewStringf("typedef %s %s;\n\n", type, name); + String *code = NewStringf("typedef %s %s;\n\n", name, type); Append(f_proxy_header, code); Delete(code); + SwigType_typedef(type, name); } } return SWIG_OK; @@ -1345,6 +1434,6 @@ extern "C" Language *swig_c(void) { const char *C::usage = (char *) "\ C Options (available with -c)\n\ -noproxy - do not generate proxy interface\n\ - -noruntime - disable runtime error checking\n\ + -noexcept - do not generate exception handling code\n\ \n"; From 5b005671540316a61659876854a4d5a046033e8a Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Tue, 19 Aug 2008 07:43:48 +0000 Subject: [PATCH 039/508] Beginning of module documentation. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10795 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 193 ++++++++++++++++++++++++++++++++++++++++++++ Doc/Manual/chapters | 1 + 2 files changed, 194 insertions(+) create mode 100644 Doc/Manual/C.html diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html new file mode 100644 index 000000000..f489c02c1 --- /dev/null +++ b/Doc/Manual/C.html @@ -0,0 +1,193 @@ + + + +SWIG and C + + + +

    36 SWIG and C

    + +
    + +
    + + + + +

    +This chapter describes SWIG's support for creating ANSI C wrappers. This module has a special purpose and thus is different from most other modules. +

    + +

    +NOTE: this module is still under development. +

    + + +

    36.1 Overview

    + + +

    +SWIG is normally used to generate scripting language interface to C or C++ libraries. In the process, it performs analysis of library header files, generates intermediary C code, from which a set of language specific functions is constructed, which can be then accessed in the scripting language code. Having the C code needed to generate wrapper functions for specific language module, we are only one step away from being able to generate pure ANSI C interface to the input C or C++ library. Then we can think of C as just any other target language supported by SWIG. +

    + +

    +With wrapper interface generated by SWIG, it is easy to use functionality of C++ libraries inside application code written in C. The module may also be useful to generate custom API for a library, to suit particular needs, e.g. to supply the function calls with error checking or to implement "design by contract" approach. +

    + +

    +Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions becomes global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it. +

    + +

    36.2 Preliminaries

    + + +

    36.2.1 Running SWIG

    + + +

    +Consider following simple example. Suppose we have an interface file like: +

    + +
    +
    +/* File: example.i */
+%module test
+%{
+#include "stuff.h"
+%}
+int fact(int n);
+
    +
    + +

    +To build a C module, run SWIG using the -c option :

    + +
    +%swig -c example.i
+
    + +

    +If building C++, add the -c++ option: +

    + +
    +$ swig -c++ -c example.i
+
    + +

    +This will generate example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_proxy.h and example_proxy.c files. The name of the file is derived from the name of the input file. To change this, you can use the -o option. +

    + +

    +The wrap file contains the wrapper functions, which perform the main functionality of SWIG: they translate input arguments from C to C++, make call to original functions and all the neccessery actions, and translate C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions. +

    + +

    36.2.2 Command line options

    + + +

    +The following table list the additional commandline options available for the C module. They can also be seen by using: +

    + +
    +swig -c -help 
+
    + + + + + + + + + + + + + + + + +
    C specific options
    -noproxydo not generate proxy files (i.e. filename_proxy.h and filename_proxy.c)
    -noexceptgenerate wrappers with no support of exception handling; see Exceptions chapter for more details
    + +

    36.2.3 Compiling dynamic module

    + + +The next step is to build dynamically loadable module, which we can link to our application. This can be done easily, for example using gcc compiler (Linux, MINGW, etc.): + +
    +$ swig -c example.i
+$ gcc -c example_wrap.c  
+$ gcc -shared example_wrap.o -o libexample.so
+
    + +

    +Or, for C++ input: +

    + +
    +$ swig -c++ -c example.i
+$ g++ -c example_wrap.c  
+$ g++ -shared example_wrap.o -o libexample.so
+
    + +

    +Now the shared library module is ready to use. Note that the name of generated module is important: is should be prefixed with lib, and have the specific extension, like .dll for Windows or .so for Unix systems. +

    + +

    36.2.4 Using generated module

    + + +

    +The simplest way to use generated shared module is to link it to the application code on the compiling stage. We have to compile the proxy file as well. The process is usually similar to the shown below: +

    + +
    +$ gcc runme.c example_proxy.c -L. -lexample -o runme
+
    + +

    +This will compile application code (runme.c), along with proxy and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH for other directories. +

    + +

    36.3 Basic C wrapping

    + + +

    36.3.1 Functions

    + + +

    36.3.2 Variables

    + + +

    36.4 Basic C++ wrapping

    + + +

    36.4.1 Classes

    + + +

    36.5 Exception handling

    + + + + + + diff --git a/Doc/Manual/chapters b/Doc/Manual/chapters index 55a0aec13..840709d89 100644 --- a/Doc/Manual/chapters +++ b/Doc/Manual/chapters @@ -14,6 +14,7 @@ Varargs.html Warnings.html Modules.html Allegrocl.html +C.html CSharp.html Chicken.html Guile.html From 40fd778b2338e5c5033cfc1cf3745c98516449ab Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sun, 24 Aug 2008 12:39:30 +0000 Subject: [PATCH 040/508] 1. char_strings runtime test 2. next chapters of HTML doc 3. minor bugfixes git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10796 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 193 +++++++++++++++++++- Examples/test-suite/c/Makefile.in | 10 +- Examples/test-suite/c/char_strings_runme.c | 198 +++++++++++++++++++++ Lib/c/c.swg | 18 ++ Source/Modules/c.cxx | 95 +++++++--- 5 files changed, 485 insertions(+), 29 deletions(-) create mode 100644 Examples/test-suite/c/char_strings_runme.c diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index f489c02c1..0bab1a479 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -54,7 +54,7 @@ With wrapper interface generated by SWIG, it is easy to use functionality of C++

    -Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions becomes global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it. +Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.

    36.2 Preliminaries

    @@ -132,7 +132,9 @@ swig -c -help

    36.2.3 Compiling dynamic module

    +

    The next step is to build dynamically loadable module, which we can link to our application. This can be done easily, for example using gcc compiler (Linux, MINGW, etc.): +

     $ swig -c example.i
@@ -172,18 +174,207 @@ This will compile application code (runme.c), along with proxy and link
 
    36.3 Basic C wrapping
    
 
 
+
    
+Wrapping C functions and variables is obviously performed in straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.
+
    
+
 
    36.3.1 Functions
    
 
 
+
    
+For each C function declared in the interface file a wrapper function is created. Basically, the wrapper function performs a call to the original function, and returns its result.
+
    
+
+
    
+For example, for function declaration:
+
    
+
+
    +int gcd(int x, int y);
+
    
+
+
    
+The output is simply:
+
    
+
+
    +int _wrap_gcd(int arg1, int arg2) {
+  int result;
+  result = gcd(arg1,arg2);
+  return result;
+}
+
    
+
+
    
+Then again, this wrapper function is usually called from C using helper function declared in proxy file, preserving the original name:
+
    
+
+
    +int gcd(int arg1, int arg2) {
+  return _wrap_gcd(arg1,arg2);
+}
+
    
+
+
    
+Now one might think, what's the use of creating such functions in C? The answer is, you can apply special rules to the generated code. Take for example constraint checking. You can write a "check" typemap in your interface file:
+
    
+
+
    +%typemap(check) int POSITIVE {
+  if ($1 <= 0)
+    fprintf(stderr, "Expected positive value in $name.\n");
+}
+
+int gcd(int POSITIVE, int POSITIVE);
+
    
+
+
    
+And now the generated result looks like:
+
    
+
+
    +int _wrap_gcd(int arg1, int arg2) {
+  {
+    if (arg1 <= 0)
+      fprintf(stderr, "Expected positive value in gcd.\n");
+  }
+  {
+    if (arg1 <= 0)
+      fprintf(stderr, "Expected positive value in gcd.\n");
+  }
+  int result;
+  result = gcd(arg1,arg2);
+  return result;
+}
+
    
+
+
    
+This time calling gcd with negative value argument will trigger an error message. This can save you time writing all the constraint checking code by hand.
+
    
+
 
    36.3.2 Variables
    
 
 
+
    
+Wrapping variables comes also without any special issues. All global variables are directly accessible from application code. There is a difference in the semantics of struct definition in C and C++. When handling C struct, SWIG simply rewrites its declaration. In C++ struct is handled as class declaration. 
+
    
+
+
    
+You can still apply some of the SWIG features when handling structs, e.g. %extend directive. Suppose, you have a C struct declaration:
+
    
+
+
    +typedef struct {
+  int x;
+  char *str;
+} my_struct;
+
    
+
+
    
+You can redefine it to have an additional fields, like:
+
    
+
+
    +%extend my_struct {
+  double d;
+};
+
    
+
+
    
+In application code:
+
    
+
+
    +struct my_struct ms;
+ms.x = 123;
+ms.d = 123.123;
+
    
+
 
    36.4 Basic C++ wrapping
    
 
 
+
    
+The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of C++ language.
+
    
+
 
    36.4.1 Classes
    
 
 
+
    
+Consider the following example. We have a C++ class, and want to refer to it in C.
+
    
+
+
    +class Circle {
+public:
+  double radius;
+
+  Circle(double r) : radius(r) { };
+  double area(void);
+};
+
    
+
+
    
+What we need to do is to create an object of the class, then to be able to manipulate on it, and finally, to be able to destroy it. SWIG generates C functions for this purpose each time a class declaration is encountered in the interface file.
+
    
+
+
    
+The first two generated functions are used to create and destroy instances of class Circle. Such an instances are represented on the C side as pointers to special structs, called SwigObj. They are all "renamed" (via typedef) to the original class names, so that you can refer to the object instances on the C side using pointers like:
+
    
+
+
    +Circle *circle;
+
    
+
+
    
+The generated functions make calls to class' constructors and destructors, respectively. They also do all the necessary things required by the SWIG object management system in C.
+
    
+
+
    +Circle * new_Circle(double r);
+void delete_Circle(Circle * self);
+
    
+
+
    
+The class Circle has a public variable called radius. SWIG generates a pair of setters and getters for each such variable:
+
    
+
+
    +void Circle_radius_set(Circle * self, double radius);
+double Circle_radius_get(Circle * self);
+
    
+
+
    
+For each public method, an appropriate function is generated:
+
    
+
+
    +double Circle_area(Circle * self);
+
    
+
+
    
+You can see that in order to refer to the generated object we need to provide a pointer to the object instance (struct Circle in this case) as the first function argument. In fact, this struct is basically wrapping pointer to the "real" C++ object.
+
    
+
+
    
+Our application code could look like this:
+
    
+
+
    +  Circle *c = new_Circle(1.5);
+  printf("radius: %f\narea: %f\n", Circle_radius_get(c), Circle_area(c));
+  delete_Circle(c);
+
    
+
+
    
+After running this we'll get:
+
    
+
+
    +radius: 1.500000
+area: 7.068583
+
    
+
 
    36.5 Exception handling
    
 
 
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index bef483450..4c8134231 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -13,10 +13,12 @@ top_builddir = @top_builddir@/..
 C_TEST_CASES =
 
 CPP_TEST_CASES = \
-        exception_order \
-				exception_partial_info \
-				enums \
-				enum_plus \
+								 cast_operator \
+								 char_strings \
+								 exception_order \
+								 exception_partial_info \
+								 enums \
+								 enum_plus \
 
 include $(srcdir)/../common.mk
 
diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
new file mode 100644
index 000000000..6e831d5c2
--- /dev/null
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -0,0 +1,198 @@
+#include 
+
+#include "char_strings/char_strings_proxy.h"
+
+int main() {
+  char *CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
+  char *OTHERLAND_MSG = "Little message from the safe world.";
+
+  long count = 10000;
+  long i = 0;
+
+  // get functions
+  for (i=0; i}
@@ -58,6 +61,9 @@
 %typemap(in) const short &, const int &, const long &, const char &, const float &, const double & "$1 = ($1_basetype *) $input;"
 %typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char &  "$1 = ($1_basetype *) $input;"
 %typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype *) $input;"
+
+%typemap(in) short *&, int *&, long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;"
+%typemap(in) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;"
 %typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
 
@@ -119,6 +125,13 @@
     $1 = ($1_basetype *) 0;
 }
 
+%typemap(in) SWIGTYPE *& {
+  if ($input)
+    $1 = ($1_basetype **) &(*$input)->obj;
+  else
+    $1 = ($1_basetype **) 0;
+}
+
 // typemaps for return values
 
 %typemap(couttype) void, short, int, long, char, float, double "$1_type"
@@ -127,6 +140,8 @@
 %typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type"
 %typemap(couttype) short &, int &, long &, char &, float &, double & "$1_basetype *"
 %typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *"
+%typemap(couttype) short *&, int *&, long *&, char *&, float *&, double *& "$1_basetype **"
+%typemap(couttype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_basetype **"
 %typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *"
 %typemap(couttype) SWIGTYPE      "SwigObj *"
 %typemap(couttype) SWIGTYPE *    "SwigObj *"
@@ -149,6 +164,8 @@
 %typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$result = $1;"
 %typemap(out) const short &, const int &, const long &, const char &, const float &, const double & "$result = $1;"
 %typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$result = $1;"
+%typemap(out) short *&, int *&, long *&, char *&, float *&, double *& "$result = $1;"
+%typemap(out) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$result = $1;"
 %typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$result = $1;"
 %typemap(out) void ""
 
@@ -202,6 +219,7 @@
     $result = (SwigObj***) 0;
 }
 
+
 #ifdef SWIG_C_EXCEPT
 %insert("runtime") %{
 typedef struct {
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 3755d1446..162a96c5f 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -78,6 +78,9 @@ public:
       }
     }
 
+    if (!CPlusPlus)
+      except_flag = false;
+
     // add a symbol to the parser for conditional compilation
     Preprocessor_define("SWIGC 1", 0);
     Preprocessor_define("SWIG_C_RUNTME 1", 0);
@@ -256,8 +259,19 @@ public:
     SwigType *type = Getattr(n, "type");
     if (SwigType_isenum(type))
       type = make_enum_type(n, type);
-    String *type_str = SwigType_str(type, 0);
-    Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL);
+    String *type_str = Copy(SwigType_str(type, 0));
+    if (SwigType_isarray(type)) {
+      String *dims = Strchr(type_str, '[');
+      char *c = Char(type_str);
+      c[Len(type_str) - Len(dims) - 1] = '\0';
+      String *bare_type = NewStringf("%s", c);
+      //Printv(f_proxy_header, "SWIGIMPORT ", bare_type, " *", name, ";\n\n", NIL);
+      Printv(f_proxy_header, "SWIGIMPORT ", bare_type, " ", name, "[];\n\n", NIL);
+      Delete(bare_type);
+    }
+    else
+      Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL);
+    Delete(type_str);
     return SWIG_OK;
   }
 
@@ -452,6 +466,23 @@ ready:
         gencomma = 1;
       }
       Printv(wrapper->def, return_type, " ", wname, "(", proto, ") {\n", NIL);
+
+      // attach 'check' typemaps
+      Swig_typemap_attach_parms("check", parms, wrapper);
+
+      // insert constraint checking
+      for (p = parms; p; ) {
+        if ((tm = Getattr(p, "tmap:check"))) {
+          Replaceall(tm, "$target", Getattr(p, "lname"));
+          Replaceall(tm, "$name", name);
+          Printv(wrapper->code, tm, "\n", NIL);
+          p = Getattr(p, "tmap:check:next");
+        }
+        else {
+          p = nextSibling(p);
+        }
+      }
+
       Append(wrapper->code, prepend_feature(n));
       if (!is_void_return) {
         Printv(wrapper->code, return_type, " result;\n", NIL);
@@ -538,6 +569,9 @@ ready:
               return_var_type = SwigType_base(type);
               SwigType_add_pointer(return_var_type);
             }
+            if (SwigType_ispointer(type)) {
+              SwigType_add_pointer(return_var_type);
+            }
             SwigType_add_reference(type);
           }
           else if (SwigType_isarray(type)) {
@@ -562,6 +596,8 @@ ready:
           else if (SwigType_isreference(type)) {
             return_var_type = SwigType_base(type);
             SwigType_add_pointer(return_var_type);
+            if (SwigType_ispointer(type))
+              SwigType_add_pointer(return_var_type);
           }
           else if (SwigType_isarray(type)) {
             return_var_type = SwigType_base(type);
@@ -682,6 +718,19 @@ ready:
       // emit variable for holding function return value
       emit_return_variable(n, return_type, wrapper);
 
+      // insert constraint checking
+      for (p = parms; p; ) {
+        if ((tm = Getattr(p, "tmap:check"))) {
+          Replaceall(tm, "$target", Getattr(p, "lname"));
+          Replaceall(tm, "$name", name);
+          Printv(wrapper->code, tm, "\n", NIL);
+          p = Getattr(p, "tmap:check:next");
+        }
+        else {
+          p = nextSibling(p);
+        }
+      }
+
       // emit action code
       String *action = emit_action(n);
       String *except = Getattr(n, "feature:except");
@@ -724,18 +773,6 @@ ready:
         Append(wrapper->code, action);
       }
 
-      // insert constraint checking
-      for (p = parms; p; ) {
-        if ((tm = Getattr(p, "tmap:check"))) {
-          Replaceall(tm, "$target", Getattr(p, "lname"));
-          Printv(wrapper->code, tm, "\n", NIL);
-          p = Getattr(p, "tmap:check:next");
-        }
-        else {
-          p = nextSibling(p);
-        }
-      }
-
       // insert cleanup code
       for (p = parms; p; ) {
         if ((tm = Getattr(p, "tmap:freearg"))) {
@@ -822,6 +859,24 @@ ready:
     return false;
   }
 
+  /* ---------------------------------------------------------------------
+   * emit_c_struct_def()
+   * --------------------------------------------------------------------- */
+
+  void emit_c_struct_def(Node *node) {
+    for ( ; node; node = nextSibling(node)) {
+      String* kind = Getattr(node, "kind");
+      if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) {
+        String* type = NewString("");
+        Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL);
+        Printv(f_proxy_header, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
+        Delete(type);
+      }
+      if (Cmp(nodeType(node), "extend") == 0)
+        emit_c_struct_def(firstChild(node));
+    }
+  }
+
   /* ---------------------------------------------------------------------
    * classHandler()
    * --------------------------------------------------------------------- */
@@ -877,16 +932,8 @@ ready:
       // this is C struct, just declare it in proxy
       if (proxy_flag) {
         Printv(f_proxy_header, "struct ", name, " {\n", NIL);
-        Node* node;
-        for (node = firstChild(n); node; node = nextSibling(node)) {
-          String* kind = Getattr(node, "kind");
-          if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) {
-            String* type = NewString("");
-            Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL);
-            Printv(f_proxy_header, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
-            Delete(type);
-          }
-        }
+        Node *node = firstChild(n);
+        emit_c_struct_def(node);
         Append(f_proxy_header, "};\n\n");
       }
 

From f2cd76308ee55378cb6fc8fb060eee81854974ad Mon Sep 17 00:00:00 2001
From: Maciej Drwal 
Date: Sun, 24 Aug 2008 12:59:17 +0000
Subject: [PATCH 041/508] include in char_strings_runme.c

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10797 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/c/char_strings_runme.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index 6e831d5c2..4ddc217d0 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -1,4 +1,5 @@
 #include 
+#include 
 
 #include "char_strings/char_strings_proxy.h"
 

From c7942801c0915961fbcfa92025754810fc01c8a1 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 7 Sep 2008 21:59:24 +0000
Subject: [PATCH 042/508] minor display fix for swig -help

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10814 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/c.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 162a96c5f..d15f88d60 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1480,7 +1480,7 @@ extern "C" Language *swig_c(void) {
 
 const char *C::usage = (char *) "\
 C Options (available with -c)\n\
-    -noproxy      - do not generate proxy interface\n\
-    -noexcept     - do not generate exception handling code\n\
+     -noproxy      - do not generate proxy interface\n\
+     -noexcept     - do not generate exception handling code\n\
 \n";
 

From fde19227a364ad92f3ca206c34d159bdab92f7f2 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 7 Sep 2008 21:59:57 +0000
Subject: [PATCH 043/508] Fix typos after proof read

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10815 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 49 +++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 0bab1a479..80146298f 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -1,11 +1,11 @@
 
 
 
-SWIG and C
+SWIG and C as the target language
 
 
 
-
    36 SWIG and C
    
+
    36 SWIG and C as the target language
    
 
 
    
 
      
@@ -46,11 +46,14 @@ This chapter describes SWIG's support for creating ANSI C wrappers. This module
 
 
 
      
-SWIG is normally used to generate scripting language interface to C or C++ libraries. In the process, it performs analysis of library header files, generates intermediary C code, from which a set of language specific functions is constructed, which can be then accessed in the scripting language code. Having the C code needed to generate wrapper functions for specific language module, we are only one step away from being able to generate pure ANSI C interface to the input C or C++ library. Then we can think of C as just any other target language supported by SWIG. 
+SWIG is normally used to provide access to C or C++ libraries from target languages such as scripting languages or languages running on a virtual machine. 
+SWIG performs analysis of the input C/C++ library header files from which it generates further code. For most target languages this code consists of two layers; namely an intermediary C code layer and a set of language specific proxy classes and functions on top of the C code layer. 
+We could also think of C as just another target language supported by SWIG.
+The aim then is to generate a pure ANSI C interface to the input C or C++ library and hence the C target language module.
 
      
 
 
      
-With wrapper interface generated by SWIG, it is easy to use functionality of C++ libraries inside application code written in C. The module may also be useful to generate custom API for a library, to suit particular needs, e.g. to supply the function calls with error checking or to implement "design by contract" approach.
+With wrapper interfaces generated by SWIG, it is easy to use the functionality of C++ libraries inside application code written in C. This module may also be useful to generate custom APIs for a library, to suit particular needs, e.g. to supply function calls with error checking or to implement a "design by contract".
 
      
 
 
      
@@ -64,7 +67,7 @@ Flattening C++ language constructs into a set of C-style functions obviously com
 
 
 
      
-Consider following simple example. Suppose we have an interface file like:
+Consider the following simple example. Suppose we have an interface file like:
 
      
 
 
      
@@ -79,14 +82,14 @@ int fact(int n);
 
      
 
 
      
-To build a C module, run SWIG using the -c option :
      
+To build a C module (C as the target language), run SWIG using the -c option :
      
 
 
       %swig -c example.i
 
      
 
 
      
-If building C++, add the -c++ option:
+The above assumes C as the input language. If the input language is C++ add the -c++ option:
 
      
 
 
      @@ -94,11 +97,15 @@ $ swig -c++ -c example.i
 
      
 
 
      
-This will generate example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_proxy.h and example_proxy.c files. The name of the file is derived from the name of the input file. To change this, you can use the -o option. 
+Note that -c is the option specifying the target language and -c++ controls what the input language is.
+
      
+
+
      
+This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_proxy.h and example_proxy.c files. The name of the file is derived from the name of the input file. To change this, you can use the -o option common to all language modules. 
 
      
 
 
      
-The wrap file contains the wrapper functions, which perform the main functionality of SWIG: they translate input arguments from C to C++, make call to original functions and all the neccessery actions, and translate C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions.
+The wrap file contains the wrapper functions, which perform the main functionality of SWIG: it translates the input arguments from C to C++, makes calls to the original functions and marshalls C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions.
 
      
 
 
      36.2.2 Command line options
      
@@ -129,11 +136,11 @@ swig -c -help
 
 
 
-
      36.2.3 Compiling dynamic module
      
+
      36.2.3 Compiling a dynamic module
      
 
 
 
      
-The next step is to build dynamically loadable module, which we can link to our application. This can be done easily, for example using gcc compiler (Linux, MINGW, etc.):
+The next step is to build a dynamically loadable module, which we can link to our application. This can be done easily, for example using the gcc compiler (Linux, MinGW, etc.):
 
      
 
 
      @@ -153,14 +160,14 @@ $ g++ -shared example_wrap.o -o libexample.so
 
      
 
 
      
-Now the shared library module is ready to use. Note that the name of generated module is important: is should be prefixed with lib, and have the specific extension, like .dll for Windows or .so for Unix systems.
+Now the shared library module is ready to use. Note that the name of the generated module is important: is should be prefixed with lib on Unix, and have the specific extension, like .dll for Windows or .so for Unix systems.
 
      
 
-
      36.2.4 Using generated module
      
+
      36.2.4 Using the generated module
      
 
 
 
      
-The simplest way to use generated shared module is to link it to the application code on the compiling stage. We have to compile the proxy file as well. The process is usually similar to the shown below:
+The simplest way to use the generated shared module is to link it to the application code during the compilation stage. We have to compile the proxy file as well. The process is usually similar to this:
 
      
 
 
      @@ -168,14 +175,14 @@ $ gcc runme.c example_proxy.c -L. -lexample -o runme
 
      
 
 
      
-This will compile application code (runme.c), along with proxy and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH for other directories.
+This will compile the application code (runme.c), along with the proxy code and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.
 
      
 
 
      36.3 Basic C wrapping
      
 
 
 
      
-Wrapping C functions and variables is obviously performed in straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.
+Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.
 
      
 
 
      36.3.1 Functions
      
@@ -294,14 +301,14 @@ ms.d = 123.123;
 
 
 
      
-The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of C++ language.
+The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.
 
      
 
 
      36.4.1 Classes
      
 
 
 
      
-Consider the following example. We have a C++ class, and want to refer to it in C.
+Consider the following example. We have a C++ class, and want to use it from C code.
 
      
 
 
      @@ -315,11 +322,11 @@ public:
 
      
 
 
      
-What we need to do is to create an object of the class, then to be able to manipulate on it, and finally, to be able to destroy it. SWIG generates C functions for this purpose each time a class declaration is encountered in the interface file.
+What we need to do is to create an object of the class, manipulate it, and finally, destroy it. SWIG generates C functions for this purpose each time a class declaration is encountered in the interface file.
 
      
 
 
      
-The first two generated functions are used to create and destroy instances of class Circle. Such an instances are represented on the C side as pointers to special structs, called SwigObj. They are all "renamed" (via typedef) to the original class names, so that you can refer to the object instances on the C side using pointers like:
+The first two generated functions are used to create and destroy instances of class Circle. Such instances are represented on the C side as pointers to special structs, called SwigObj. They are all "renamed" (via typedef) to the original class names, so that you can use the object instances on the C side using pointers like:
 
      
 
 
      @@ -353,7 +360,7 @@ double Circle_area(Circle * self);
 
      
 
 
      
-You can see that in order to refer to the generated object we need to provide a pointer to the object instance (struct Circle in this case) as the first function argument. In fact, this struct is basically wrapping pointer to the "real" C++ object.
+You can see that in order to use the generated object we need to provide a pointer to the object instance (struct Circle in this case) as the first function argument. In fact, this struct is basically wrapping pointer to the "real" C++ object.
 
      
 
 
      

From a565b7250d305d711a8fe90a680ecbd9b167e2b9 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 8 Sep 2008 19:53:42 +0000
Subject: [PATCH 044/508] updates after running makechap.py

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10821 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html         |  32 +++---
 Doc/Manual/CSharp.html    |  38 +++----
 Doc/Manual/Chicken.html   |  40 ++++----
 Doc/Manual/Contents.html  |  63 ++++++++----
 Doc/Manual/Extending.html |  96 +++++++++---------
 Doc/Manual/Guile.html     |  42 ++++----
 Doc/Manual/Java.html      | 204 +++++++++++++++++++-------------------
 Doc/Manual/Lisp.html      |  22 ++--
 Doc/Manual/Lua.html       |  56 +++++------
 Doc/Manual/Modula3.html   |  46 ++++-----
 Doc/Manual/Mzscheme.html  |   4 +-
 Doc/Manual/Ocaml.html     |  62 ++++++------
 Doc/Manual/Octave.html    |  46 ++++-----
 Doc/Manual/Perl5.html     |  94 +++++++++---------
 Doc/Manual/Php.html       |  34 +++----
 Doc/Manual/Pike.html      |  24 ++---
 Doc/Manual/Python.html    | 144 +++++++++++++--------------
 Doc/Manual/R.html         |  16 +--
 Doc/Manual/Ruby.html      | 196 ++++++++++++++++++------------------
 Doc/Manual/Tcl.html       |  90 ++++++++---------
 20 files changed, 688 insertions(+), 661 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 80146298f..828a4b7a3 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -5,7 +5,7 @@
 
 
 
-
      36 SWIG and C as the target language
      
+
      17 SWIG and C as the target language
      
 
 
      
 
        
@@ -14,8 +14,8 @@
 
 
      • Basic C wrapping
 
          
@@ -42,7 +42,7 @@ This chapter describes SWIG's support for creating ANSI C wrappers. This module
 
          
 
 
-
          36.1 Overview
          
+
          17.1 Overview
          
 
 
 
          
@@ -60,10 +60,10 @@ With wrapper interfaces generated by SWIG, it is easy to use the functionality o
 Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.
 
          
 
-
          36.2 Preliminaries
          
+
          17.2 Preliminaries
          
 
 
-
          36.2.1 Running SWIG
          
+
          17.2.1 Running SWIG
          
 
 
 
          
@@ -98,7 +98,7 @@ $ swig -c++ -c example.i
 
 
          
 Note that -c is the option specifying the target language and -c++ controls what the input language is.
-
          
+
          
 
 
          
 This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_proxy.h and example_proxy.c files. The name of the file is derived from the name of the input file. To change this, you can use the -o option common to all language modules. 
@@ -108,7 +108,7 @@ This will generate an example_wrap.c file or, in the latter case, e
 The wrap file contains the wrapper functions, which perform the main functionality of SWIG: it translates the input arguments from C to C++, makes calls to the original functions and marshalls C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions.
 
          
 
-
          36.2.2 Command line options
          
+
          17.2.2 Command line options
          
 
 
 
          
@@ -136,7 +136,7 @@ swig -c -help
 
 
 
-
          36.2.3 Compiling a dynamic module
          
+
          17.2.3 Compiling a dynamic module
          
 
 
 
          
@@ -163,7 +163,7 @@ $ g++ -shared example_wrap.o -o libexample.so
 Now the shared library module is ready to use. Note that the name of the generated module is important: is should be prefixed with lib on Unix, and have the specific extension, like .dll for Windows or .so for Unix systems.
 
          
 
-
          36.2.4 Using the generated module
          
+
          17.2.4 Using the generated module
          
 
 
 
          
@@ -178,14 +178,14 @@ $ gcc runme.c example_proxy.c -L. -lexample -o runme
 This will compile the application code (runme.c), along with the proxy code and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.
 
          
 
-
          36.3 Basic C wrapping
          
+
          17.3 Basic C wrapping
          
 
 
 
          
 Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.
 
          
 
-
          36.3.1 Functions
          
+
          17.3.1 Functions
          
 
 
 
          
@@ -259,7 +259,7 @@ int _wrap_gcd(int arg1, int arg2) {
 This time calling gcd with negative value argument will trigger an error message. This can save you time writing all the constraint checking code by hand.
 
          
 
-
          36.3.2 Variables
          
+
          17.3.2 Variables
          
 
 
 
          
@@ -297,14 +297,14 @@ ms.x = 123;
 ms.d = 123.123;
    -

    36.4 Basic C++ wrapping

    +

    17.4 Basic C++ wrapping

    The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.

    -

    36.4.1 Classes

    +

    17.4.1 Classes

    @@ -382,7 +382,7 @@ radius: 1.500000 area: 7.068583 -

    36.5 Exception handling

    +

    17.5 Exception handling

    diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html index 97cb75409..94e3eca79 100644 --- a/Doc/Manual/CSharp.html +++ b/Doc/Manual/CSharp.html @@ -5,7 +5,7 @@ -

    17 SWIG and C#

    +

    18 SWIG and C#

      @@ -39,7 +39,7 @@ -

      17.1 Introduction

      +

      18.1 Introduction

      @@ -59,7 +59,7 @@ The Microsoft Developer Network (MSDN) h Monodoc, available from the Mono project, has a very useful section titled Interop with native libraries.

      -

      17.2 Differences to the Java module

      +

      18.2 Differences to the Java module

      @@ -397,7 +397,7 @@ Windows users can also get the examples working using a Cygwin or MinGW environment for automatic configuration of the example makefiles. Any one of the three C# compilers (Portable.NET, Mono or Microsoft) can be detected from within a Cygwin or Mingw environment if installed in your path. -

      17.3 C# Exceptions

      +

      18.3 C# Exceptions

      @@ -494,7 +494,7 @@ set so should only be used when a C# exception is not created.

      -

      17.3.1 C# exception example using "check" typemap

      +

      18.3.1 C# exception example using "check" typemap

      @@ -676,7 +676,7 @@ method and C# code does not handle pending exceptions via the canthrow attribute Actually it will issue this warning for any function beginning with SWIG_CSharpSetPendingException.

      -

      17.3.2 C# exception example using %exception

      +

      18.3.2 C# exception example using %exception

      @@ -741,7 +741,7 @@ The managed code generated does check for the pending exception as mentioned ear

    -

    17.3.3 C# exception example using exception specifications

    +

    18.3.3 C# exception example using exception specifications

    @@ -798,7 +798,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_evensonly(int jarg1) { Multiple catch handlers are generated should there be more than one exception specifications declared.

    -

    17.3.4 Custom C# ApplicationException example

    +

    18.3.4 Custom C# ApplicationException example

    @@ -932,7 +932,7 @@ try { -

    17.4 C# Directors

    +

    18.4 C# Directors

    @@ -945,7 +945,7 @@ The following sections provide information on the C# director implementation and However, the Java directors section should also be read in order to gain more insight into directors.

    -

    17.4.1 Directors example

    +

    18.4.1 Directors example

    @@ -1066,7 +1066,7 @@ CSharpDerived - UIntMethod(123) -

    17.4.2 Directors implementation

    +

    18.4.2 Directors implementation

    @@ -1252,7 +1252,7 @@ void SwigDirector_Base::BaseBoolMethod(Base const &b, bool flag) { -

    17.4.3 Director caveats

    +

    18.4.3 Director caveats

    @@ -1300,7 +1300,7 @@ However, a call from C# to CSharpDefaults.DefaultMethod() will of cours should pass the call on to CSharpDefaults.DefaultMethod(int)using the C++ default value, as shown above.

    -

    17.5 C# Typemap examples

    +

    18.5 C# Typemap examples

    This section includes a few examples of typemaps. For more examples, you @@ -1308,7 +1308,7 @@ might look at the files "csharp.swg" and "typemaps.i" in the SWIG library. -

    17.5.1 Memory management when returning references to member variables

    +

    18.5.1 Memory management when returning references to member variables

    @@ -1432,7 +1432,7 @@ public class Bike : IDisposable { Note the addReference call.

    -

    17.5.2 Memory management for objects passed to the C++ layer

    +

    18.5.2 Memory management for objects passed to the C++ layer

    @@ -1551,7 +1551,7 @@ The 'cscode' typemap simply adds in the specified code into the C# proxy class. -

    17.5.3 Date marshalling using the csin typemap and associated attributes

    +

    18.5.3 Date marshalling using the csin typemap and associated attributes

    @@ -1788,7 +1788,7 @@ public class example { -

    17.5.4 A date example demonstrating marshalling of C# properties

    +

    18.5.4 A date example demonstrating marshalling of C# properties

    @@ -1888,7 +1888,7 @@ Some points to note: -

    17.5.5 Turning wrapped classes into partial classes

    +

    18.5.5 Turning wrapped classes into partial classes

    @@ -1988,7 +1988,7 @@ demonstrating that the class contains methods calling both unmanaged code - The following example is an alternative approach to adding managed code to the generated proxy class.

    -

    17.5.6 Extending proxy classes with additional C# code

    +

    18.5.6 Extending proxy classes with additional C# code

    diff --git a/Doc/Manual/Chicken.html b/Doc/Manual/Chicken.html index bd1b3d94b..98372a0f7 100644 --- a/Doc/Manual/Chicken.html +++ b/Doc/Manual/Chicken.html @@ -8,7 +8,7 @@ -

    18 SWIG and Chicken

    +

    19 SWIG and Chicken

      @@ -72,7 +72,7 @@

      -

      18.1 Preliminaries

      +

      19.1 Preliminaries

      @@ -90,7 +90,7 @@ CHICKEN.

      -

      18.1.1 Running SWIG in C mode

      +

      19.1.1 Running SWIG in C mode

      @@ -123,7 +123,7 @@ object files and linked into your project.

      -

      18.1.2 Running SWIG in C++ mode

      +

      19.1.2 Running SWIG in C++ mode

      @@ -152,10 +152,10 @@ object files and linked into your project.

      -

      18.2 Code Generation

      +

      19.2 Code Generation

      -

      18.2.1 Naming Conventions

      +

      19.2.1 Naming Conventions

      @@ -171,7 +171,7 @@ %rename SWIG directive in the SWIG interface file.

      -

      18.2.2 Modules

      +

      19.2.2 Modules

      @@ -193,7 +193,7 @@ (uses modulename)) CHICKEN Scheme form.

      -

      18.2.3 Constants and Variables

      +

      19.2.3 Constants and Variables

      @@ -230,7 +230,7 @@ for info on how to apply the %feature.

      -

      18.2.4 Functions

      +

      19.2.4 Functions

      @@ -249,7 +249,7 @@ parameters). The return values can then be accessed with (call-with-values).

      -

      18.2.5 Exceptions

      +

      19.2.5 Exceptions

      The SWIG chicken module has support for exceptions thrown from @@ -291,7 +291,7 @@

    -

    18.3 TinyCLOS

    +

    19.3 TinyCLOS

    @@ -334,7 +334,7 @@

    -

    18.4 Linkage

    +

    19.4 Linkage

    @@ -355,7 +355,7 @@

    -

    18.4.1 Static binary or shared library linked at compile time

    +

    19.4.1 Static binary or shared library linked at compile time

    We can easily use csc to build a static binary.

    @@ -396,7 +396,7 @@ in which case the test script does not need to be linked with example.so. The t be run with csi.

    -

    18.4.2 Building chicken extension libraries

    +

    19.4.2 Building chicken extension libraries

    Building a shared library like in the above section only works if the library @@ -454,7 +454,7 @@ distributed and used by anyone, even if SWIG is not installed.

    See the Examples/chicken/egg directory in the SWIG source for an example that builds two eggs, one using the first method and one using the second method.

    -

    18.4.3 Linking multiple SWIG modules with TinyCLOS

    +

    19.4.3 Linking multiple SWIG modules with TinyCLOS

    Linking together multiple modules that share type information using the %import @@ -478,7 +478,7 @@ with (declare (uses ...)). To create an extension library or an egg, just create a module_load.scm file that (declare (uses ...)) all the modules.

    -

    18.5 Typemaps

    +

    19.5 Typemaps

    @@ -487,7 +487,7 @@ all the modules.

    Lib/chicken/chicken.swg.

    -

    18.6 Pointers

    +

    19.6 Pointers

    @@ -520,7 +520,7 @@ all the modules.

    type. flags is either zero or SWIG_POINTER_DISOWN (see below).

    -

    18.6.1 Garbage collection

    +

    19.6.1 Garbage collection

    If the owner flag passed to SWIG_NewPointerObj is 1, NewPointerObj will add a @@ -551,7 +551,7 @@ all the modules.

    must be called manually.

    -

    18.7 Unsupported features and known problems

    +

    19.7 Unsupported features and known problems

    -

    18.7.1 TinyCLOS problems with Chicken version <= 1.92

    +

    19.7.1 TinyCLOS problems with Chicken version <= 1.92

    In Chicken versions equal to or below 1.92, TinyCLOS has a limitation such that generic methods do not properly work on methods diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index c3197b9dc..ed90dc6d1 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -581,7 +581,34 @@ -

    17 SWIG and C#

    +

    17 SWIG and C as the target language

    + + +
    + +
    + + +

    18 SWIG and C#

    @@ -614,7 +641,7 @@
    -

    18 SWIG and Chicken

    +

    19 SWIG and Chicken

    @@ -652,7 +679,7 @@
    -

    19 SWIG and Guile

    +

    20 SWIG and Guile

    @@ -687,7 +714,7 @@
    -

    20 SWIG and Java

    +

    21 SWIG and Java

    @@ -829,7 +856,7 @@
    -

    21 SWIG and Common Lisp

    +

    22 SWIG and Common Lisp

    @@ -852,7 +879,7 @@
    -

    22 SWIG and Lua

    +

    23 SWIG and Lua

    @@ -894,7 +921,7 @@
    -

    23 SWIG and Modula-3

    +

    24 SWIG and Modula-3

    @@ -935,7 +962,7 @@
    -

    24 SWIG and MzScheme

    +

    25 SWIG and MzScheme

    @@ -945,7 +972,7 @@
    -

    25 SWIG and Ocaml

    +

    26 SWIG and Ocaml

    @@ -996,7 +1023,7 @@
    -

    26 SWIG and Octave

    +

    27 SWIG and Octave

    @@ -1031,7 +1058,7 @@
    -

    27 SWIG and Perl5

    +

    28 SWIG and Perl5

    @@ -1098,7 +1125,7 @@
    -

    28 SWIG and PHP

    +

    29 SWIG and PHP

    @@ -1129,7 +1156,7 @@
    -

    29 SWIG and Pike

    +

    30 SWIG and Pike

    @@ -1153,7 +1180,7 @@
    -

    30 SWIG and Python

    +

    31 SWIG and Python

    @@ -1253,7 +1280,7 @@
    -

    31 SWIG and Ruby

    +

    32 SWIG and Ruby

    @@ -1387,7 +1414,7 @@
    -

    32 SWIG and Tcl

    +

    33 SWIG and Tcl

    @@ -1452,7 +1479,7 @@
    -

    33 SWIG and R

    +

    34 SWIG and R

    @@ -1468,7 +1495,7 @@
    -

    34 Extending SWIG to support new languages

    +

    35 Extending SWIG to support new languages

    diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index 588912b68..b43441059 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -6,7 +6,7 @@ -

    34 Extending SWIG to support new languages

    +

    35 Extending SWIG to support new languages

      @@ -73,7 +73,7 @@ -

      34.1 Introduction

      +

      35.1 Introduction

      @@ -89,7 +89,7 @@ Also, this chapter is not meant to be a hand-holding tutorial. As a starting po you should probably look at one of SWIG's existing modules.

      -

      34.2 Prerequisites

      +

      35.2 Prerequisites

      @@ -119,7 +119,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of wrapper code are driven by C++ datatypes.

      -

      34.3 The Big Picture

      +

      35.3 The Big Picture

      @@ -156,7 +156,7 @@ role in making the system work. For example, both typemaps and declaration anno based on pattern matching and interact heavily with the underlying type system.

      -

      34.4 Execution Model

      +

      35.4 Execution Model

      @@ -201,7 +201,7 @@ latter stage of compilation. The next few sections briefly describe some of these stages.

      -

      34.4.1 Preprocessing

      +

      35.4.1 Preprocessing

      @@ -281,7 +281,7 @@ been expanded as well as everything else that goes into the low-level construction of the wrapper code.

      -

      34.4.2 Parsing

      +

      35.4.2 Parsing

      @@ -382,7 +382,7 @@ returning a foo and taking types a and b as arguments).

      -

      34.4.3 Parse Trees

      +

      35.4.3 Parse Trees

      @@ -636,7 +636,7 @@ $ swig -c++ -python -debug-module 4 example.i

    -

    34.4.4 Attribute namespaces

    +

    35.4.4 Attribute namespaces

    @@ -655,7 +655,7 @@ that matches the name of the target language. For example, python:foo perl:foo.

    -

    34.4.5 Symbol Tables

    +

    35.4.5 Symbol Tables

    @@ -746,7 +746,7 @@ example.i:5. Previous declaration is foo_i(int )

    -

    34.4.6 The %feature directive

    +

    35.4.6 The %feature directive

    @@ -802,7 +802,7 @@ For example, the exception code above is simply stored without any modifications.

    -

    34.4.7 Code Generation

    +

    35.4.7 Code Generation

    @@ -924,7 +924,7 @@ public : The role of these functions is described shortly.

    -

    34.4.8 SWIG and XML

    +

    35.4.8 SWIG and XML

    @@ -937,7 +937,7 @@ internal data structures, it may be useful to keep XML in the back of your mind as a model.

    -

    34.5 Primitive Data Structures

    +

    35.5 Primitive Data Structures

    @@ -983,7 +983,7 @@ typedef Hash Typetab; -

    34.5.1 Strings

    +

    35.5.1 Strings

    @@ -1124,7 +1124,7 @@ Returns the number of replacements made (if any). -

    34.5.2 Hashes

    +

    35.5.2 Hashes

    @@ -1201,7 +1201,7 @@ Returns the list of hash table keys. -

    34.5.3 Lists

    +

    35.5.3 Lists

    @@ -1290,7 +1290,7 @@ If t is not a standard object, it is assumed to be a char * and is used to create a String object. -

    34.5.4 Common operations

    +

    35.5.4 Common operations

    The following operations are applicable to all datatypes. @@ -1345,7 +1345,7 @@ objects and report errors. Gets the line number associated with x. -

    34.5.5 Iterating over Lists and Hashes

    +

    35.5.5 Iterating over Lists and Hashes

    To iterate over the elements of a list or a hash table, the following functions are used: @@ -1390,7 +1390,7 @@ for (j = First(j); j.item; j= Next(j)) { -

    34.5.6 I/O

    +

    35.5.6 I/O

    Special I/O functions are used for all internal I/O. These operations @@ -1526,7 +1526,7 @@ Similarly, the preprocessor and parser all operate on string-files. -

    34.6 Navigating and manipulating parse trees

    +

    35.6 Navigating and manipulating parse trees

    Parse trees are built as collections of hash tables. Each node is a hash table in which @@ -1660,7 +1660,7 @@ Deletes a node from the parse tree. Deletion reconnects siblings and properly u the parent so that sibling nodes are unaffected. -

    34.7 Working with attributes

    +

    35.7 Working with attributes

    @@ -1777,7 +1777,7 @@ the attribute is optional. Swig_restore() must always be called after function. -

    34.8 Type system

    +

    35.8 Type system

    @@ -1786,7 +1786,7 @@ pointers, references, and pointers to members. A detailed discussion of type theory is impossible here. However, let's cover the highlights.

    -

    34.8.1 String encoding of types

    +

    35.8.1 String encoding of types

    @@ -1887,7 +1887,7 @@ make the final type, the two parts are just joined together using string concatenation.

    -

    34.8.2 Type construction

    +

    35.8.2 Type construction

    @@ -2056,7 +2056,7 @@ Returns the prefix of a type. For example, if ty is ty is unmodified. -

    34.8.3 Type tests

    +

    35.8.3 Type tests

    @@ -2143,7 +2143,7 @@ Checks if ty is a varargs type. Checks if ty is a templatized type. -

    34.8.4 Typedef and inheritance

    +

    35.8.4 Typedef and inheritance

    @@ -2245,7 +2245,7 @@ Fully reduces ty according to typedef rules. Resulting datatype will consist only of primitive typenames. -

    34.8.5 Lvalues

    +

    35.8.5 Lvalues

    @@ -2282,7 +2282,7 @@ Literal y; // type = 'Literal', ltype='p.char' -

    34.8.6 Output functions

    +

    35.8.6 Output functions

    @@ -2344,7 +2344,7 @@ SWIG, but is most commonly associated with type-descriptor objects that appear in wrappers (e.g., SWIGTYPE_p_double). -

    34.9 Parameters

    +

    35.9 Parameters

    @@ -2443,7 +2443,7 @@ included. Used to emit prototypes. Returns the number of required (non-optional) arguments in p. -

    34.10 Writing a Language Module

    +

    35.10 Writing a Language Module

    @@ -2458,7 +2458,7 @@ describes the creation of a minimal Python module. You should be able to extra this to other languages.

    -

    34.10.1 Execution model

    +

    35.10.1 Execution model

    @@ -2468,7 +2468,7 @@ the parsing of command line options, all aspects of code generation are controll different methods of the Language that must be defined by your module.

    -

    34.10.2 Starting out

    +

    35.10.2 Starting out

    @@ -2576,7 +2576,7 @@ that activates your module. For example, swig -python foo.i. The messages from your new module should appear.

    -

    34.10.3 Command line options

    +

    35.10.3 Command line options

    @@ -2635,7 +2635,7 @@ to mark the option as valid. If you forget to do this, SWIG will terminate wit unrecognized command line option error.

    -

    34.10.4 Configuration and preprocessing

    +

    35.10.4 Configuration and preprocessing

    @@ -2684,7 +2684,7 @@ an implementation file python.cxx and a configuration file python.swg.

    -

    34.10.5 Entry point to code generation

    +

    35.10.5 Entry point to code generation

    @@ -2742,7 +2742,7 @@ int Python::top(Node *n) { -

    34.10.6 Module I/O and wrapper skeleton

    +

    35.10.6 Module I/O and wrapper skeleton

    @@ -2884,7 +2884,7 @@ functionWrapper : void Shape_y_set(Shape *self,double y) -

    34.10.7 Low-level code generators

    +

    35.10.7 Low-level code generators

    @@ -3038,7 +3038,7 @@ but without the typemaps, there is still work to do.

    -

    34.10.8 Configuration files

    +

    35.10.8 Configuration files

    @@ -3188,7 +3188,7 @@ politely displays the ignoring language message. -

    34.10.9 Runtime support

    +

    35.10.9 Runtime support

    @@ -3197,7 +3197,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g. the SWIG files that implement those functions.

    -

    34.10.10 Standard library files

    +

    35.10.10 Standard library files

    @@ -3216,7 +3216,7 @@ The following are the minimum that are usually supported: Please copy these and modify for any new language.

    -

    34.10.11 Examples and test cases

    +

    35.10.11 Examples and test cases

    @@ -3245,7 +3245,7 @@ during this process, see the section on configuration files.

    -

    34.10.12 Documentation

    +

    35.10.12 Documentation

    @@ -3277,7 +3277,7 @@ Some topics that you'll want to be sure to address include: if available. -

    34.10.13 Prerequisites for adding a new language module to the SWIG distribution

    +

    35.10.13 Prerequisites for adding a new language module to the SWIG distribution

    @@ -3334,7 +3334,7 @@ should be added should there be an area not already covered by the existing tests.

    -

    34.10.14 Coding style guidelines

    +

    35.10.14 Coding style guidelines

    @@ -3358,13 +3358,13 @@ The generated C/C++ code should also follow this style as close as possible. How should be avoided as unlike the SWIG developers, users will never have consistent tab settings.

    -

    34.11 Typemaps

    +

    35.11 Typemaps

    -

    34.11.1 Proxy classes

    +

    35.11.1 Proxy classes

    -

    34.12 Guide to parse tree nodes

    +

    35.12 Guide to parse tree nodes

    diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 20ab716e4..cf7e8da2c 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -8,7 +8,7 @@ -

    19 SWIG and Guile

    +

    20 SWIG and Guile

      @@ -47,7 +47,7 @@

      This section details guile-specific support in SWIG. -

      19.1 Meaning of "Module"

      +

      20.1 Meaning of "Module"

      @@ -55,7 +55,7 @@ There are three different concepts of "module" involved, defined separately for SWIG, Guile, and Libtool. To avoid horrible confusion, we explicitly prefix the context, e.g., "guile-module". -

      19.2 Using the SCM or GH Guile API

      +

      20.2 Using the SCM or GH Guile API

      The guile module can currently export wrapper files that use the guile GH interface or the @@ -103,7 +103,7 @@ for the specific API. Currently only the guile language module has created a ma but there is no reason other languages (like mzscheme or chicken) couldn't also use this. If that happens, there is A LOT less code duplication in the standard typemaps.

      -

      19.3 Linkage

      +

      20.3 Linkage

      @@ -111,7 +111,7 @@ Guile support is complicated by a lack of user community cohesiveness, which manifests in multiple shared-library usage conventions. A set of policies implementing a usage convention is called a linkage. -

      19.3.1 Simple Linkage

      +

      20.3.1 Simple Linkage

      @@ -206,7 +206,7 @@ placed between the define-module form and the SWIG_init via a preprocessor define to avoid symbol clashes. For this case, however, passive linkage is available. -

      19.3.2 Passive Linkage

      +

      20.3.2 Passive Linkage

      Passive linkage is just like simple linkage, but it generates an @@ -216,7 +216,7 @@ package name (see below).

      You should use passive linkage rather than simple linkage when you are using multiple modules. -

      19.3.3 Native Guile Module Linkage

      +

      20.3.3 Native Guile Module Linkage

      SWIG can also generate wrapper code that does all the Guile module @@ -257,7 +257,7 @@ Newer Guile versions have a shorthand procedure for this:

    -

    19.3.4 Old Auto-Loading Guile Module Linkage

    +

    20.3.4 Old Auto-Loading Guile Module Linkage

    Guile used to support an autoloading facility for object-code @@ -283,7 +283,7 @@ option, SWIG generates an exported module initialization function with an appropriate name. -

    19.3.5 Hobbit4D Linkage

    +

    20.3.5 Hobbit4D Linkage

    @@ -308,7 +308,7 @@ my/lib/libfoo.so.X.Y.Z and friends. This scheme is still very experimental; the (hobbit4d link) conventions are not well understood.

    -

    19.4 Underscore Folding

    +

    20.4 Underscore Folding

    @@ -320,7 +320,7 @@ complained so far. %rename to specify the Guile name of the wrapped functions and variables (see CHANGES). -

    19.5 Typemaps

    +

    20.5 Typemaps

    @@ -412,7 +412,7 @@ constant will appear as a scheme variable. See Features and the %feature directive for info on how to apply the %feature.

    -

    19.6 Representation of pointers as smobs

    +

    20.6 Representation of pointers as smobs

    @@ -433,7 +433,7 @@ representing the expected pointer type. See also If the Scheme object passed was not a SWIG smob representing a compatible pointer, a wrong-type-arg exception is raised. -

    19.6.1 GH Smobs

    +

    20.6.1 GH Smobs

    @@ -462,7 +462,7 @@ that created them, so the first module we check will most likely be correct. Once we have a swig_type_info structure, we loop through the linked list of casts, using pointer comparisons.

    -

    19.6.2 SCM Smobs

    +

    20.6.2 SCM Smobs

    The SCM interface (using the "-scm" argument to swig) uses swigrun.swg. @@ -477,7 +477,7 @@ in the smob tag. If a generated GOOPS module has been loaded, smobs will be wra GOOPS class.

    -

    19.6.3 Garbage Collection

    +

    20.6.3 Garbage Collection

    Garbage collection is a feature of the new SCM interface, and it is automatically included @@ -491,7 +491,7 @@ is exactly like described in Object ownership and %newobject in the SWIG manual. All typemaps use an $owner var, and the guile module replaces $owner with 0 or 1 depending on feature:new.

    -

    19.7 Exception Handling

    +

    20.7 Exception Handling

    @@ -517,7 +517,7 @@ mapping: The default when not specified here is to use "swig-error". See Lib/exception.i for details. -

    19.8 Procedure documentation

    +

    20.8 Procedure documentation

    If invoked with the command-line option -procdoc @@ -553,7 +553,7 @@ like this: typemap argument doc. See Lib/guile/typemaps.i for details. -

    19.9 Procedures with setters

    +

    20.9 Procedures with setters

    For global variables, SWIG creates a single wrapper procedure @@ -581,7 +581,7 @@ struct members, the procedures (struct-member-get pointer) and (struct-member-set pointer value) are not generated. -

    19.10 GOOPS Proxy Classes

    +

    20.10 GOOPS Proxy Classes

    SWIG can also generate classes and generic functions for use with @@ -730,7 +730,7 @@ Notice that <Foo> is used before it is defined. The fix is to just put th %import "foo.h" before the %inline block.

    -

    19.10.1 Naming Issues

    +

    20.10.1 Naming Issues

    As you can see in the example above, there are potential naming conflicts. The default exported @@ -769,7 +769,7 @@ guile-modules. For example,

    TODO: Renaming class name prefixes?

    -

    19.10.2 Linking

    +

    20.10.2 Linking

    The guile-modules generated above all need to be linked together. GOOPS support requires diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 164fc21e7..4b8993184 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -5,7 +5,7 @@ -

    20 SWIG and Java

    +

    21 SWIG and Java

      @@ -154,7 +154,7 @@ It covers most SWIG features, but certain low-level details are covered in less

      -

      20.1 Overview

      +

      21.1 Overview

      @@ -189,7 +189,7 @@ Various customisation tips and techniques using SWIG directives are covered. The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.

      -

      20.2 Preliminaries

      +

      21.2 Preliminaries

      @@ -205,7 +205,7 @@ Run make -k check from the SWIG root directory after installing SWIG on The Java module requires your system to support shared libraries and dynamic loading. This is the commonly used method to load JNI code so your system will more than likely support this.

      -

      20.2.1 Running SWIG

      +

      21.2.1 Running SWIG

      @@ -258,7 +258,7 @@ The following sections have further practical examples and details on how you mi compiling and using the generated files.

      -

      20.2.2 Additional Commandline Options

      +

      21.2.2 Additional Commandline Options

      @@ -295,7 +295,7 @@ swig -java -help Their use will become clearer by the time you have finished reading this section on SWIG and Java.

      -

      20.2.3 Getting the right header files

      +

      21.2.3 Getting the right header files

      @@ -310,7 +310,7 @@ They are usually in directories like this:

      The exact location may vary on your machine, but the above locations are typical.

      -

      20.2.4 Compiling a dynamic module

      +

      21.2.4 Compiling a dynamic module

      @@ -346,7 +346,7 @@ The name of the shared library output file is important. If the name of your SWIG module is "example", the name of the corresponding shared library file should be "libexample.so" (or equivalent depending on your machine, see Dynamic linking problems for more information). The name of the module is specified using the %module directive or -module command line option.

      -

      20.2.5 Using your module

      +

      21.2.5 Using your module

      @@ -381,7 +381,7 @@ $ If it doesn't work have a look at the following section which discusses problems loading the shared library.

      -

      20.2.6 Dynamic linking problems

      +

      21.2.6 Dynamic linking problems

      @@ -455,7 +455,7 @@ The following section also contains some C++ specific linking problems and solut

      -

      20.2.7 Compilation problems and compiling with C++

      +

      21.2.7 Compilation problems and compiling with C++

      @@ -508,7 +508,7 @@ Finally make sure the version of JDK header files matches the version of Java th

      -

      20.2.8 Building on Windows

      +

      21.2.8 Building on Windows

      @@ -517,7 +517,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine. This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers. In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.

      -

      20.2.8.1 Running SWIG from Visual Studio

      +

      21.2.8.1 Running SWIG from Visual Studio

      @@ -556,7 +556,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa If the library fails to load have a look at Dynamic linking problems.

      -

      20.2.8.2 Using NMAKE

      +

      21.2.8.2 Using NMAKE

      @@ -615,7 +615,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -

      -

      20.3 A tour of basic C/C++ wrapping

      +

      21.3 A tour of basic C/C++ wrapping

      @@ -625,7 +625,7 @@ variables are wrapped with JavaBean type getters and setters and so forth. This section briefly covers the essential aspects of this wrapping.

      -

      20.3.1 Modules, packages and generated Java classes

      +

      21.3.1 Modules, packages and generated Java classes

      @@ -659,7 +659,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i SWIG won't create the directory, so make sure it exists beforehand. -

      20.3.2 Functions

      +

      21.3.2 Functions

      @@ -693,7 +693,7 @@ System.out.println(example.fact(4));

    -

    20.3.3 Global variables

    +

    21.3.3 Global variables

    @@ -780,7 +780,7 @@ extern char *path; // Read-only (due to %immutable) -

    20.3.4 Constants

    +

    21.3.4 Constants

    @@ -920,7 +920,7 @@ Or if you decide this practice isn't so bad and your own class implements ex

    -

    20.3.5 Enumerations

    +

    21.3.5 Enumerations

    @@ -934,7 +934,7 @@ The final two approaches use simple integers for each enum item. Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.

    -

    20.3.5.1 Anonymous enums

    +

    21.3.5.1 Anonymous enums

    @@ -997,7 +997,7 @@ As in the case of constants, you can access them through either the module class

    -

    20.3.5.2 Typesafe enums

    +

    21.3.5.2 Typesafe enums

    @@ -1090,7 +1090,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit The following section details proper Java enum generation.

    -

    20.3.5.3 Proper Java enums

    +

    21.3.5.3 Proper Java enums

    @@ -1143,7 +1143,7 @@ The additional support methods need not be generated if none of the enum items h Simpler Java enums for enums without initializers section.

    -

    20.3.5.4 Type unsafe enums

    +

    21.3.5.4 Type unsafe enums

    @@ -1191,7 +1191,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.

    -

    20.3.5.5 Simple enums

    +

    21.3.5.5 Simple enums

    @@ -1210,7 +1210,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach. The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.

    -

    20.3.6 Pointers

    +

    21.3.6 Pointers

    @@ -1298,7 +1298,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return a NULL pointer if the conversion can't be performed.

    -

    20.3.7 Structures

    +

    21.3.7 Structures

    @@ -1466,7 +1466,7 @@ x.setA(3); // Modify x.a - this is the same as b.f.a -

    20.3.8 C++ classes

    +

    21.3.8 C++ classes

    @@ -1529,7 +1529,7 @@ int bar = Spam.getBar(); -

    20.3.9 C++ inheritance

    +

    21.3.9 C++ inheritance

    @@ -1590,7 +1590,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance A warning is given when multiple inheritance is detected and only the first base class is used.

    -

    20.3.10 Pointers, references, arrays and pass by value

    +

    21.3.10 Pointers, references, arrays and pass by value

    @@ -1645,7 +1645,7 @@ to hold the result and a pointer is returned (Java will release this memory when the returned object's finalizer is run by the garbage collector).

    -

    20.3.10.1 Null pointers

    +

    21.3.10.1 Null pointers

    @@ -1669,7 +1669,7 @@ For spam1 and spam4 above the Java null gets translat The converse also occurs, that is, NULL pointers are translated into null Java objects when returned from a C/C++ function.

    -

    20.3.11 C++ overloaded functions

    +

    21.3.11 C++ overloaded functions

    @@ -1784,7 +1784,7 @@ void spam(unsigned short); // Ignored -

    20.3.12 C++ default arguments

    +

    21.3.12 C++ default arguments

    @@ -1827,7 +1827,7 @@ Further details on default arguments and how to restore this approach are given

    -

    20.3.13 C++ namespaces

    +

    21.3.13 C++ namespaces

    @@ -1887,7 +1887,7 @@ symbols separate, consider wrapping them as separate SWIG modules. Each SWIG module can be placed into a separate package.

    -

    20.3.14 C++ templates

    +

    21.3.14 C++ templates

    @@ -1936,7 +1936,7 @@ Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter.

    -

    20.3.15 C++ Smart Pointers

    +

    21.3.15 C++ Smart Pointers

    @@ -2020,7 +2020,7 @@ Foo f = p.__deref__(); // Returns underlying Foo * -

    20.4 Further details on the generated Java classes

    +

    21.4 Further details on the generated Java classes

    @@ -2035,7 +2035,7 @@ Finally enum classes are covered. First, the crucial intermediary JNI class is considered.

    -

    20.4.1 The intermediary JNI class

    +

    21.4.1 The intermediary JNI class

    @@ -2155,7 +2155,7 @@ If name is the same as modulename then the module class name g from modulename to modulenameModule.

    -

    20.4.1.1 The intermediary JNI class pragmas

    +

    21.4.1.1 The intermediary JNI class pragmas

    @@ -2234,7 +2234,7 @@ For example, let's change the intermediary JNI class access to public. All the methods in the intermediary JNI class will then be callable outside of the package as the method modifiers are public by default.

    -

    20.4.2 The Java module class

    +

    21.4.2 The Java module class

    @@ -2265,7 +2265,7 @@ example.egg(new Foo()); The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a Foo can be passed to the egg function, whereas any long can be passed to the egg function in the intermediary JNI class.

    -

    20.4.2.1 The Java module class pragmas

    +

    21.4.2.1 The Java module class pragmas

    @@ -2316,7 +2316,7 @@ See The intermediary JNI class pragmas section fo

    -

    20.4.3 Java proxy classes

    +

    21.4.3 Java proxy classes

    @@ -2392,7 +2392,7 @@ int y = f.spam(5, new Foo()); -

    20.4.3.1 Memory management

    +

    21.4.3.1 Memory management

    @@ -2554,7 +2554,7 @@ and

    -

    20.4.3.2 Inheritance

    +

    21.4.3.2 Inheritance

    @@ -2670,7 +2670,7 @@ However, true cross language polymorphism can be achieved using the 20.4.3.3 Proxy classes and garbage collection +

    21.4.3.3 Proxy classes and garbage collection

    @@ -2753,7 +2753,7 @@ The section on Java typemaps details how to specify See the How to Handle Java Finalization's Memory-Retention Issues article for alternative approaches to managing memory by avoiding finalizers altogether.

    -

    20.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    +

    21.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    @@ -2871,7 +2871,7 @@ For example: Compatibility note: The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.

    -

    20.4.3.5 Single threaded applications and thread safety

    +

    21.4.3.5 Single threaded applications and thread safety

    @@ -2959,7 +2959,7 @@ for (int i=0; i<100000; i++) { -

    20.4.4 Type wrapper classes

    +

    21.4.4 Type wrapper classes

    @@ -3046,7 +3046,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... } -

    20.4.5 Enum classes

    +

    21.4.5 Enum classes

    @@ -3055,7 +3055,7 @@ The Enumerations section discussed these but omitted The following sub-sections detail the various types of enum classes that can be generated.

    -

    20.4.5.1 Typesafe enum classes

    +

    21.4.5.1 Typesafe enum classes

    @@ -3139,7 +3139,7 @@ The swigValue method is used for marshalling in the other direction. The toString method is overridden so that the enum name is available.

    -

    20.4.5.2 Proper Java enum classes

    +

    21.4.5.2 Proper Java enum classes

    @@ -3217,7 +3217,7 @@ These needn't be generated if the enum being wrapped does not have any initializ Simpler Java enums for enums without initializers section describes how typemaps can be used to achieve this.

    -

    20.4.5.3 Type unsafe enum classes

    +

    21.4.5.3 Type unsafe enum classes

    @@ -3248,7 +3248,7 @@ public final class Beverage { -

    20.5 Cross language polymorphism using directors

    +

    21.5 Cross language polymorphism using directors

    @@ -3270,7 +3270,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.

    -

    20.5.1 Enabling directors

    +

    21.5.1 Enabling directors

    @@ -3341,7 +3341,7 @@ public: -

    20.5.2 Director classes

    +

    21.5.2 Director classes

    @@ -3368,7 +3368,7 @@ If the correct implementation is in Java, the Java API is used to call the metho

    -

    20.5.3 Overhead and code bloat

    +

    21.5.3 Overhead and code bloat

    @@ -3386,7 +3386,7 @@ This situation can be optimized by selectively enabling director methods (using

    -

    20.5.4 Simple directors example

    +

    21.5.4 Simple directors example

    @@ -3451,7 +3451,7 @@ DirectorDerived::upcall_method() invoked. -

    20.5.5 Director threading issues

    +

    21.5.5 Director threading issues

    @@ -3471,7 +3471,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern -

    20.6 Accessing protected members

    +

    21.6 Accessing protected members

    @@ -3567,7 +3567,7 @@ class MyProtectedBase extends ProtectedBase -

    20.7 Common customization features

    +

    21.7 Common customization features

    @@ -3579,7 +3579,7 @@ be awkward. This section describes some common SWIG features that are used to improve the interface to existing C/C++ code.

    -

    20.7.1 C/C++ helper functions

    +

    21.7.1 C/C++ helper functions

    @@ -3645,7 +3645,7 @@ hard to implement. It is possible to improve on this using Java code, typemaps, customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.

    -

    20.7.2 Class extension with %extend

    +

    21.7.2 Class extension with %extend

    @@ -3708,7 +3708,7 @@ Vector(2,3,4) in any way---the extensions only show up in the Java interface.

    -

    20.7.3 Exception handling with %exception and %javaexception

    +

    21.7.3 Exception handling with %exception and %javaexception

    @@ -3865,7 +3865,7 @@ to raise exceptions. See the SWIG Library ch The typemap example Handling C++ exception specifications as Java exceptions provides further exception handling capabilities.

    -

    20.7.4 Method access with %javamethodmodifiers

    +

    21.7.4 Method access with %javamethodmodifiers

    @@ -3891,7 +3891,7 @@ protected static void protect_me() { -

    20.8 Tips and techniques

    +

    21.8 Tips and techniques

    @@ -3901,7 +3901,7 @@ strings and arrays. This chapter discusses the common techniques for solving these problems.

    -

    20.8.1 Input and output parameters using primitive pointers and references

    +

    21.8.1 Input and output parameters using primitive pointers and references

    @@ -4075,7 +4075,7 @@ void foo(Bar *OUTPUT); will not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

    -

    20.8.2 Simple pointers

    +

    21.8.2 Simple pointers

    @@ -4141,7 +4141,7 @@ System.out.println("3 + 4 = " + result); See the SWIG Library chapter for further details.

    -

    20.8.3 Wrapping C arrays with Java arrays

    +

    21.8.3 Wrapping C arrays with Java arrays

    @@ -4208,7 +4208,7 @@ Please be aware that the typemaps in this library are not efficient as all the e There is an alternative approach using the SWIG array library and this is covered in the next section.

    -

    20.8.4 Unbounded C Arrays

    +

    21.8.4 Unbounded C Arrays

    @@ -4353,7 +4353,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

    -

    20.8.5 Overriding new and delete to allocate from Java heap

    +

    21.8.5 Overriding new and delete to allocate from Java heap

    @@ -4470,7 +4470,7 @@ model and use these functions in place of malloc and free in your own code.

    -

    20.9 Java typemaps

    +

    21.9 Java typemaps

    @@ -4491,7 +4491,7 @@ Before proceeding, it should be stressed that typemaps are not a required part of using SWIG---the default wrapping behavior is enough in most cases. Typemaps are only used if you want to change some aspect of the generated code. -

    20.9.1 Default primitive type mappings

    +

    21.9.1 Default primitive type mappings

    @@ -4643,7 +4643,7 @@ However, the mappings allow the full range of values for each C type from Java.

    -

    20.9.2 Default typemaps for non-primitive types

    +

    21.9.2 Default typemaps for non-primitive types

    @@ -4658,7 +4658,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit The Java type is either the proxy class or type wrapper class.

    -

    20.9.3 Sixty four bit JVMs

    +

    21.9.3 Sixty four bit JVMs

    @@ -4671,7 +4671,7 @@ Unfortunately it won't of course hold true for JNI code.

    -

    20.9.4 What is a typemap?

    +

    21.9.4 What is a typemap?

    @@ -4794,7 +4794,7 @@ int c = example.count('e',"Hello World"); -

    20.9.5 Typemaps for mapping C/C++ types to Java types

    +

    21.9.5 Typemaps for mapping C/C++ types to Java types

    @@ -5054,7 +5054,7 @@ These are listed below: -

    20.9.6 Java typemap attributes

    +

    21.9.6 Java typemap attributes

    @@ -5100,7 +5100,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes. Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a this call. In Java the this call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a Date marshalling example showing 'pre', 'post' and 'pgcppname' attributes in action.

    -

    20.9.7 Java special variables

    +

    21.9.7 Java special variables

    @@ -5243,7 +5243,7 @@ This special variable expands to the intermediary class name. Usually this is th unless the jniclassname attribute is specified in the %module directive.

    -

    20.9.8 Typemaps for both C and C++ compilation

    +

    21.9.8 Typemaps for both C and C++ compilation

    @@ -5280,7 +5280,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps

    -

    20.9.9 Java code typemaps

    +

    21.9.9 Java code typemaps

    @@ -5476,7 +5476,7 @@ For the typemap to be used in all type wrapper classes, all the different types Again this is the same that is in "java.swg", barring the method modifier for getCPtr.

    -

    20.9.10 Director specific typemaps

    +

    21.9.10 Director specific typemaps

    @@ -5701,7 +5701,7 @@ The basic strategy here is to provide a default package typemap for the majority -

    20.10 Typemap Examples

    +

    21.10 Typemap Examples

    @@ -5711,7 +5711,7 @@ the SWIG library.

    -

    20.10.1 Simpler Java enums for enums without initializers

    +

    21.10.1 Simpler Java enums for enums without initializers

    @@ -5790,7 +5790,7 @@ This would be done by using the original versions of these typemaps in "enums.sw

    -

    20.10.2 Handling C++ exception specifications as Java exceptions

    +

    21.10.2 Handling C++ exception specifications as Java exceptions

    @@ -5915,7 +5915,7 @@ We could alternatively have used %rename to rename what() into

    -

    20.10.3 NaN Exception - exception handling for a particular type

    +

    21.10.3 NaN Exception - exception handling for a particular type

    @@ -6070,7 +6070,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.

    -

    20.10.4 Converting Java String arrays to char **

    +

    21.10.4 Converting Java String arrays to char **

    @@ -6214,7 +6214,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify what Java types to use.

    -

    20.10.5 Expanding a Java object to multiple arguments

    +

    21.10.5 Expanding a Java object to multiple arguments

    @@ -6296,7 +6296,7 @@ example.foo(new String[]{"red", "green", "blue", "white"}); -

    20.10.6 Using typemaps to return arguments

    +

    21.10.6 Using typemaps to return arguments

    @@ -6414,7 +6414,7 @@ $ java main 1 12.0 340.0 -

    20.10.7 Adding Java downcasts to polymorphic return types

    +

    21.10.7 Adding Java downcasts to polymorphic return types

    @@ -6620,7 +6620,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.

    -

    20.10.8 Adding an equals method to the Java classes

    +

    21.10.8 Adding an equals method to the Java classes

    @@ -6664,7 +6664,7 @@ System.out.println("foo1? " + foo1.equals(foo2)); -

    20.10.9 Void pointers and a common Java base class

    +

    21.10.9 Void pointers and a common Java base class

    @@ -6723,7 +6723,7 @@ This example contains some useful functionality which you may want in your code.

  • It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer. -

    20.10.10 Struct pointer to pointer

    +

    21.10.10 Struct pointer to pointer

    @@ -6903,7 +6903,7 @@ The C functional interface has been completely morphed into an object-oriented i the Butler class would behave much like any pure Java class and feel more natural to Java users.

    -

    20.10.11 Memory management when returning references to member variables

    +

    21.10.11 Memory management when returning references to member variables

    @@ -7026,7 +7026,7 @@ public class Bike { Note the addReference call.

    -

    20.10.12 Memory management for objects passed to the C++ layer

    +

    21.10.12 Memory management for objects passed to the C++ layer

    @@ -7142,7 +7142,7 @@ The 'javacode' typemap simply adds in the specified code into the Java proxy cla -

    20.10.13 Date marshalling using the javain typemap and associated attributes

    +

    21.10.13 Date marshalling using the javain typemap and associated attributes

    @@ -7319,7 +7319,7 @@ A few things to note: -

    20.11 Living with Java Directors

    +

    21.11 Living with Java Directors

    @@ -7500,10 +7500,10 @@ public abstract class UserVisibleFoo extends Foo {

    • -

    20.12 Odds and ends

    +

    21.12 Odds and ends

    -

    20.12.1 JavaDoc comments

    +

    21.12.1 JavaDoc comments

    @@ -7559,7 +7559,7 @@ public class Barmy { -

    20.12.2 Functional interface without proxy classes

    +

    21.12.2 Functional interface without proxy classes

    @@ -7620,7 +7620,7 @@ All destructors have to be called manually for example the delete_Foo(foo) -

    20.12.3 Using your own JNI functions

    +

    21.12.3 Using your own JNI functions

    @@ -7670,7 +7670,7 @@ This directive is only really useful if you want to mix your own hand crafted JN

    -

    20.12.4 Performance concerns and hints

    +

    21.12.4 Performance concerns and hints

    @@ -7691,7 +7691,7 @@ However, you will have to be careful about memory management and make sure that This method normally calls the C++ destructor or free() for C code.

    -

    20.12.5 Debugging

    +

    21.12.5 Debugging

    @@ -7713,7 +7713,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh

    -

    20.13 Examples

    +

    21.13 Examples

    diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html index ca2d0414e..14abead00 100644 --- a/Doc/Manual/Lisp.html +++ b/Doc/Manual/Lisp.html @@ -6,7 +6,7 @@ -

    21 SWIG and Common Lisp

    +

    22 SWIG and Common Lisp

      @@ -41,7 +41,7 @@ Lisp, Common Foreign Function Interface(CFFI), CLisp and UFFI foreign function interfaces.

      -

      21.1 Allegro Common Lisp

      +

      22.1 Allegro Common Lisp

      @@ -50,7 +50,7 @@ here

      -

      21.2 Common Foreign Function Interface(CFFI)

      +

      22.2 Common Foreign Function Interface(CFFI)

      @@ -77,7 +77,7 @@ swig -cffi -module module-name file-name files and the various things which you can do with them.

      -

      21.2.1 Additional Commandline Options

      +

      22.2.1 Additional Commandline Options

      @@ -118,7 +118,7 @@ swig -cffi -help -

      21.2.2 Generating CFFI bindings

      +

      22.2.2 Generating CFFI bindings

      As we mentioned earlier the ideal way to use SWIG is to use interface @@ -392,7 +392,7 @@ The feature intern_function ensures that all C names are
    -

    21.2.3 Generating CFFI bindings for C++ code

    +

    22.2.3 Generating CFFI bindings for C++ code

    This feature to SWIG (for CFFI) is very new and still far from @@ -568,7 +568,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI module feel free to contact us on the SWIG mailing list, and also please add a "[CFFI]" tag in the subject line. -

    21.2.4 Inserting user code into generated files

    +

    22.2.4 Inserting user code into generated files

    @@ -608,7 +608,7 @@ Note that the block %{ ... %} is effectively a shortcut for

    -

    21.3 CLISP

    +

    22.3 CLISP

    @@ -638,7 +638,7 @@ swig -clisp -module module-name file-name interface file for the CLISP module. The CLISP module tries to produce code which is both human readable and easily modifyable.

    -

    21.3.1 Additional Commandline Options

    +

    22.3.1 Additional Commandline Options

    @@ -671,7 +671,7 @@ and global variables will be created otherwise only definitions for
    -

    21.3.2 Details on CLISP bindings

    +

    22.3.2 Details on CLISP bindings

    @@ -795,7 +795,7 @@ struct bar { -

    21.4 UFFI

    +

    22.4 UFFI

    diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index 4ebf02349..99c7c9a3c 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -6,7 +6,7 @@ -

    22 SWIG and Lua

    +

    23 SWIG and Lua

      @@ -52,13 +52,13 @@

      Lua is an extension programming language designed to support general procedural programming with data description facilities. It also offers good support for object-oriented programming, functional programming, and data-driven programming. Lua is intended to be used as a powerful, light-weight configuration language for any program that needs one. Lua is implemented as a library, written in clean C (that is, in the common subset of ANSI C and C++). Its also a really tiny language, less than 6000 lines of code, which compiles to <100 kilobytes of binary code. It can be found at http://www.lua.org

      -

      22.1 Preliminaries

      +

      23.1 Preliminaries

      The current SWIG implementation is designed to work with Lua 5.0.x and Lua 5.1.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. ((Currently SWIG generated code has only been tested on Windows with MingW, though given the nature of Lua, is should not have problems on other OS's)). It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms).

      -

      22.2 Running SWIG

      +

      23.2 Running SWIG

      @@ -90,7 +90,7 @@ This creates a C/C++ source file example_wrap.c or example_wrap.cxx

      The name of the wrapper file is derived from the name of the input file. For example, if the input file is example.i, the name of the wrapper file is example_wrap.c. To change this, you can use the -o option. The wrappered module will export one function "int luaopen_example(lua_State* L)" which must be called to register the module with the Lua interpreter. The name "luaopen_example" depends upon the name of the module.

      -

      22.2.1 Compiling and Linking and Interpreter

      +

      23.2.1 Compiling and Linking and Interpreter

      @@ -137,7 +137,7 @@ $ gcc -c example.c -o example.o $ gcc -I/usr/include/lua -L/usr/lib/lua min.o example_wrap.o example.o -o my_lua

    -

    22.2.2 Compiling a dynamic module

    +

    23.2.2 Compiling a dynamic module

    @@ -205,7 +205,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib -

    22.2.3 Using your module

    +

    23.2.3 Using your module

    @@ -223,19 +223,19 @@ $ ./my_lua > -

    22.3 A tour of basic C/C++ wrapping

    +

    23.3 A tour of basic C/C++ wrapping

    By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.

    -

    22.3.1 Modules

    +

    23.3.1 Modules

    The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.

    -

    22.3.2 Functions

    +

    23.3.2 Functions

    @@ -273,7 +273,7 @@ It is also possible to rename the module with an assignment. 24 -

    22.3.3 Global variables

    +

    23.3.3 Global variables

    @@ -347,7 +347,7 @@ nil 3.142 -

    22.3.4 Constants and enums

    +

    23.3.4 Constants and enums

    @@ -370,7 +370,7 @@ example.SUNDAY=0

    Constants are not guaranteed to remain constant in Lua. The name of the constant could be accidentally reassigned to refer to some other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

    -

    22.3.5 Pointers

    +

    23.3.5 Pointers

    @@ -408,7 +408,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor nil -

    22.3.6 Structures

    +

    23.3.6 Structures

    @@ -494,7 +494,7 @@ Because the pointer points inside the structure, you can modify the contents and > x.a = 3 -- Modifies the same structure -

    22.3.7 C++ classes

    +

    23.3.7 C++ classes

    @@ -555,7 +555,7 @@ It is not (currently) possible to access static members of an instance: -- does NOT work -

    22.3.8 C++ inheritance

    +

    23.3.8 C++ inheritance

    @@ -580,7 +580,7 @@ then the function spam() accepts a Foo pointer or a pointer to any clas

    It is safe to use multiple inheritance with SWIG.

    -

    22.3.9 Pointers, references, values, and arrays

    +

    23.3.9 Pointers, references, values, and arrays

    @@ -611,7 +611,7 @@ Foo spam7();

    then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.

    -

    22.3.10 C++ overloaded functions

    +

    23.3.10 C++ overloaded functions

    @@ -697,7 +697,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin

    Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.

    -

    22.3.11 C++ operators

    +

    23.3.11 C++ operators

    @@ -809,7 +809,7 @@ It is also possible to overload the operator[], but currently this cann }; -

    22.3.12 Class extension with %extend

    +

    23.3.12 Class extension with %extend

    @@ -864,7 +864,7 @@ true

    Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).

    -

    22.3.13 C++ templates

    +

    23.3.13 C++ templates

    @@ -899,7 +899,7 @@ In Lua:

    Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.

    -

    22.3.14 C++ Smart Pointers

    +

    23.3.14 C++ Smart Pointers

    @@ -951,7 +951,7 @@ If you ever need to access the underlying pointer returned by operator->( > f = p:__deref__() -- Returns underlying Foo * -

    22.3.15 C++ Exceptions

    +

    23.3.15 C++ Exceptions

    @@ -1098,7 +1098,7 @@ add exception specification to functions or globally (respectively).

    -

    22.3.16 Writing your own custom wrappers

    +

    23.3.16 Writing your own custom wrappers

    @@ -1117,7 +1117,7 @@ int native_function(lua_State*L) // my native code The %native directive in the above example, tells SWIG that there is a function int native_function(lua_State*L); which is to be added into the module under the name 'my_func'. SWIG will not add any wrappering for this function, beyond adding it into the function table. How you write your code is entirely up to you.

    -

    22.3.17 Adding additional Lua code

    +

    23.3.17 Adding additional Lua code

    @@ -1155,7 +1155,7 @@ Good uses for this feature is adding of new code, or writing helper functions to See Examples/lua/arrays for an example of this code.

    -

    22.4 Details on the Lua binding

    +

    23.4 Details on the Lua binding

    @@ -1166,7 +1166,7 @@ See Examples/lua/arrays for an example of this code.

    -

    22.4.1 Binding global data into the module.

    +

    23.4.1 Binding global data into the module.

    @@ -1226,7 +1226,7 @@ end

    That way when you call 'a=example.Foo', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code 'example.Foo=10', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.

    -

    22.4.2 Userdata and Metatables

    +

    23.4.2 Userdata and Metatables

    @@ -1306,7 +1306,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrappered classes/s

    Note: Operator overloads are basically done in the same way, by adding functions such as '__add' & '__call' to the classes metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.

    -

    22.4.3 Memory management

    +

    23.4.3 Memory management

    diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html index ff70fc143..7a6bacd34 100644 --- a/Doc/Manual/Modula3.html +++ b/Doc/Manual/Modula3.html @@ -5,7 +5,7 @@ -

    23 SWIG and Modula-3

    +

    24 SWIG and Modula-3

      @@ -57,7 +57,7 @@ especially typemaps.

      -

      23.1 Overview

      +

      24.1 Overview

      @@ -90,7 +90,7 @@ So the introduction got a bit longer than it should ... ;-)

      -

      23.1.1 Why not scripting ?

      +

      24.1.1 Why not scripting ?

      @@ -126,7 +126,7 @@ are not advantages of the language itself but can be provided by function libraries.

      -

      23.1.2 Why Modula-3 ?

      +

      24.1.2 Why Modula-3 ?

      @@ -166,7 +166,7 @@ it's statically typed, too.

      -

      23.1.3 Why C / C++ ?

      +

      24.1.3 Why C / C++ ?

      @@ -179,7 +179,7 @@ Even more fortunately even non-C libraries may provide C header files. This is where SWIG becomes helpful.

      -

      23.1.4 Why SWIG ?

      +

      24.1.4 Why SWIG ?

      @@ -252,10 +252,10 @@ integrate Modula-3 code into a C / C++ project.

      -

      23.2 Conception

      +

      24.2 Conception

      -

      23.2.1 Interfaces to C libraries

      +

      24.2.1 Interfaces to C libraries

      @@ -404,7 +404,7 @@ and the principal type must be renamed (%typemap).

      -

      23.2.2 Interfaces to C++ libraries

      +

      24.2.2 Interfaces to C++ libraries

      @@ -505,10 +505,10 @@ There is no C++ library I wrote a SWIG interface for, so I'm not sure if this is possible or sensible, yet.

      -

      23.3 Preliminaries

      +

      24.3 Preliminaries

      -

      23.3.1 Compilers

      +

      24.3.1 Compilers

      @@ -522,7 +522,7 @@ For testing examples I use Critical Mass cm3.

      -

      23.3.2 Additional Commandline Options

      +

      24.3.2 Additional Commandline Options

      @@ -599,10 +599,10 @@ Instead generate templates for some basic typemaps. -

      23.4 Modula-3 typemaps

      +

      24.4 Modula-3 typemaps

      -

      23.4.1 Inputs and outputs

      +

      24.4.1 Inputs and outputs

      @@ -818,7 +818,7 @@ consist of the following parts: -

      23.4.2 Subranges, Enumerations, Sets

      +

      24.4.2 Subranges, Enumerations, Sets

      @@ -870,7 +870,7 @@ that I'd like to automate.

      -

      23.4.3 Objects

      +

      24.4.3 Objects

      @@ -883,7 +883,7 @@ is not really useful, yet.

      -

      23.4.4 Imports

      +

      24.4.4 Imports

      @@ -918,7 +918,7 @@ IMPORT M3toC;

    -

    23.4.5 Exceptions

    +

    24.4.5 Exceptions

    @@ -942,7 +942,7 @@ you should declare %typemap("m3wrapinconv:throws") blah * %{OSError.E%}.

    -

    23.4.6 Example

    +

    24.4.6 Example

    @@ -989,10 +989,10 @@ where almost everything is generated by a typemap: -

    23.5 More hints to the generator

    +

    24.5 More hints to the generator

    -

    23.5.1 Features

    +

    24.5.1 Features

    @@ -1029,7 +1029,7 @@ where almost everything is generated by a typemap:
    -

    23.5.2 Pragmas

    +

    24.5.2 Pragmas

    @@ -1052,7 +1052,7 @@ where almost everything is generated by a typemap:
    -

    23.6 Remarks

    +

    24.6 Remarks

      diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html index 699168322..9413bb010 100644 --- a/Doc/Manual/Mzscheme.html +++ b/Doc/Manual/Mzscheme.html @@ -8,7 +8,7 @@ -

      24 SWIG and MzScheme

      +

      25 SWIG and MzScheme

        @@ -22,7 +22,7 @@

        This section contains information on SWIG's support of MzScheme. -

        24.1 Creating native MzScheme structures

        +

        25.1 Creating native MzScheme structures

        diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html index 79ede443f..6dbf24c11 100644 --- a/Doc/Manual/Ocaml.html +++ b/Doc/Manual/Ocaml.html @@ -6,7 +6,7 @@ -

        25 SWIG and Ocaml

        +

        26 SWIG and Ocaml

          @@ -80,7 +80,7 @@ If you're not familiar with the Objective Caml language, you can visit The Ocaml Website.

          -

          25.1 Preliminaries

          +

          26.1 Preliminaries

          @@ -99,7 +99,7 @@ file Examples/Makefile illustrate how to compile and link SWIG modules that will be loaded dynamically. This has only been tested on Linux so far.

          -

          25.1.1 Running SWIG

          +

          26.1.1 Running SWIG

          @@ -122,7 +122,7 @@ you will compile the file example_wrap.c with ocamlc or the resulting .ml and .mli files as well, and do the final link with -custom (not needed for native link).

          -

          25.1.2 Compiling the code

          +

          26.1.2 Compiling the code

          @@ -158,7 +158,7 @@ the user more freedom with respect to custom typing.

        -

        25.1.3 The camlp4 module

        +

        26.1.3 The camlp4 module

        @@ -234,7 +234,7 @@ let b = C_string (getenv "PATH") -

        25.1.4 Using your module

        +

        26.1.4 Using your module

        @@ -248,7 +248,7 @@ When linking any ocaml bytecode with your module, use the -custom option is not needed when you build native code.

        -

        25.1.5 Compilation problems and compiling with C++

        +

        26.1.5 Compilation problems and compiling with C++

        @@ -259,7 +259,7 @@ liberal with pointer types may not compile under the C++ compiler. Most code meant to be compiled as C++ will not have problems.

        -

        25.2 The low-level Ocaml/C interface

        +

        26.2 The low-level Ocaml/C interface

        @@ -360,7 +360,7 @@ is that you must append them to the return list with swig_result = caml_list_a signature for a function that uses value in this way.

        -

        25.2.1 The generated module

        +

        26.2.1 The generated module

        @@ -394,7 +394,7 @@ it describes the output SWIG will generate for class definitions. -

        25.2.2 Enums

        +

        26.2.2 Enums

        @@ -457,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a

      -

      25.2.2.1 Enum typing in Ocaml

      +

      26.2.2.1 Enum typing in Ocaml

      @@ -470,10 +470,10 @@ functions imported from different modules. You must convert values to master values using the swig_val function before sharing them with another module.

      -

      25.2.3 Arrays

      +

      26.2.3 Arrays

      -

      25.2.3.1 Simple types of bounded arrays

      +

      26.2.3.1 Simple types of bounded arrays

      @@ -494,7 +494,7 @@ arrays of simple types with known bounds in your code, but this only works for arrays whose bounds are completely specified.

      -

      25.2.3.2 Complex and unbounded arrays

      +

      26.2.3.2 Complex and unbounded arrays

      @@ -507,7 +507,7 @@ SWIG can't predict which of these methods will be used in the array, so you have to specify it for yourself in the form of a typemap.

      -

      25.2.3.3 Using an object

      +

      26.2.3.3 Using an object

      @@ -521,7 +521,7 @@ Consider writing an object when the ending condition of your array is complex, such as using a required sentinel, etc.

      -

      25.2.3.4 Example typemap for a function taking float * and int

      +

      26.2.3.4 Example typemap for a function taking float * and int

      @@ -572,7 +572,7 @@ void printfloats( float *tab, int len ); -

      25.2.4 C++ Classes

      +

      26.2.4 C++ Classes

      @@ -615,7 +615,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the returned value for the same object.

      -

      25.2.4.1 STL vector and string Example

      +

      26.2.4.1 STL vector and string Example

      @@ -695,7 +695,7 @@ baz # -

      25.2.4.2 C++ Class Example

      +

      26.2.4.2 C++ Class Example

      @@ -725,7 +725,7 @@ public: }; -

      25.2.4.3 Compiling the example

      +

      26.2.4.3 Compiling the example

      @@ -743,7 +743,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
      -

      25.2.4.4 Sample Session

      +

      26.2.4.4 Sample Session

      @@ -770,10 +770,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.  
 
      
 
-
      25.2.5 Director Classes
      
+
      26.2.5 Director Classes
      
 
 
-
      25.2.5.1 Director Introduction
      
+
      26.2.5.1 Director Introduction
      
 
 
 
      
@@ -800,7 +800,7 @@ class foo {
 };
      -

      25.2.5.2 Overriding Methods in Ocaml

      +

      26.2.5.2 Overriding Methods in Ocaml

      @@ -828,7 +828,7 @@ In this example, I'll examine the objective caml code involved in providing an overloaded class. This example is contained in Examples/ocaml/shapes.

      -

      25.2.5.3 Director Usage Example

      +

      26.2.5.3 Director Usage Example

      @@ -887,7 +887,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the program in C++.

      -

      25.2.5.4 Creating director objects

      +

      26.2.5.4 Creating director objects

      @@ -928,7 +928,7 @@ object from causing a core dump, as long as the object is destroyed properly.

      -

      25.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      +

      26.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      @@ -939,7 +939,7 @@ well as a function return value in the same way you provide function arguments, and to receive arguments the same way you normally receive function returns.

      -

      25.2.5.6 directorin typemap

      +

      26.2.5.6 directorin typemap

      @@ -950,7 +950,7 @@ code receives when you are called. In general, a simple directorin typ can use the same body as a simple out typemap.

      -

      25.2.5.7 directorout typemap

      +

      26.2.5.7 directorout typemap

      @@ -961,7 +961,7 @@ for the same type, except when there are special requirements for object ownership, etc.

      -

      25.2.5.8 directorargout typemap

      +

      26.2.5.8 directorargout typemap

      @@ -978,7 +978,7 @@ In the event that you don't specify all of the necessary values, integral values will read zero, and struct or object returns have undefined results.

      -

      25.2.6 Exceptions

      +

      26.2.6 Exceptions

      diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index 97e1be17c..7409d78f1 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -8,7 +8,7 @@ -

      26 SWIG and Octave

      +

      27 SWIG and Octave

        @@ -54,14 +54,14 @@ More information can be found at www.octave.org< Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).

        -

        26.1 Preliminaries

        +

        27.1 Preliminaries

        The current SWIG implemention is based on Octave 2.9.12. Support for other versions (in particular the recent 3.0) has not been tested, nor has support for any OS other than Linux.

        -

        26.2 Running SWIG

        +

        27.2 Running SWIG

        @@ -89,7 +89,7 @@ This creates a C/C++ source file example_wrap.cxx. The generated C++ so The swig command line has a number of options you can use, like to redirect it's output. Use swig --help to learn about these.

        -

        26.2.1 Compiling a dynamic module

        +

        27.2.1 Compiling a dynamic module

        @@ -116,7 +116,7 @@ $ mkoctfile example_wrap.cxx example.c 

        octave:1> example
        -

        26.2.2 Using your module

        +

        27.2.2 Using your module

        @@ -134,10 +134,10 @@ octave:4> example.cvar.Foo=4; octave:5> example.cvar.Foo ans = 4

      -

      26.3 A tour of basic C/C++ wrapping

      +

      27.3 A tour of basic C/C++ wrapping

      -

      26.3.1 Modules

      +

      27.3.1 Modules

      @@ -179,7 +179,7 @@ One can also rename it by simple assignment, e.g., octave:1> some_vars = cvar; -

      26.3.2 Functions

      +

      27.3.2 Functions

      @@ -196,7 +196,7 @@ int fact(int n); 

      octave:1> example.fact(4)
 24
      -

      26.3.3 Global variables

      +

      27.3.3 Global variables

      @@ -249,7 +249,7 @@ octave:2> example.PI=3.142; octave:3> example.PI ans = 3.1420 -

      26.3.4 Constants and enums

      +

      27.3.4 Constants and enums

      @@ -271,7 +271,7 @@ example.SCONST="Hello World" example.SUNDAY=0 .... -

      26.3.5 Pointers

      +

      27.3.5 Pointers

      @@ -318,7 +318,7 @@ octave:2> f=example.fopen("not there","r"); error: value on right hand side of assignment is undefined error: evaluating assignment expression near line 2, column 2 -

      26.3.6 Structures and C++ classes

      +

      27.3.6 Structures and C++ classes

      @@ -453,7 +453,7 @@ ans = 1 Depending on the ownership setting of a swig_ref, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.

      -

      26.3.7 C++ inheritance

      +

      27.3.7 C++ inheritance

      @@ -462,7 +462,7 @@ This information contains the full class hierarchy. When an indexing operation ( the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the swig_ref.

      -

      26.3.8 C++ overloaded functions

      +

      27.3.8 C++ overloaded functions

      @@ -472,7 +472,7 @@ The dispatch function selects which overload to call (if any) based on the passe typecheck typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.

      -

      26.3.9 C++ operators

      +

      27.3.9 C++ operators

      @@ -572,7 +572,7 @@ On the C++ side, the default mappings are as follows: %rename(__brace) *::operator[]; -

      26.3.10 Class extension with %extend

      +

      27.3.10 Class extension with %extend

      @@ -602,7 +602,7 @@ octave:3> printf("%s\n",a); octave:4> a.__str() 4 -

      26.3.11 C++ templates

      +

      27.3.11 C++ templates

      @@ -679,14 +679,14 @@ ans = -

      26.3.12 C++ Smart Pointers

      +

      27.3.12 C++ Smart Pointers

      C++ smart pointers are fully supported as in other modules.

      -

      26.3.13 Directors (calling Octave from C++ code)

      +

      27.3.13 Directors (calling Octave from C++ code)

      @@ -766,14 +766,14 @@ c-side routine called octave-side routine called -

      26.3.14 Threads

      +

      27.3.14 Threads

      The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.

      -

      26.3.15 Memory management

      +

      27.3.15 Memory management

      @@ -807,14 +807,14 @@ The %newobject directive may be used to control this behavior for pointers retur In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/subclass()'ing).

      -

      26.3.16 STL support

      +

      27.3.16 STL support

      This is some skeleton support for various STL containers.

      -

      26.3.17 Matrix typemaps

      +

      27.3.17 Matrix typemaps

      diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html index b7cdaf0e5..1dc8e7d2f 100644 --- a/Doc/Manual/Perl5.html +++ b/Doc/Manual/Perl5.html @@ -6,7 +6,7 @@ -

      27 SWIG and Perl5

      +

      28 SWIG and Perl5

        @@ -87,7 +87,7 @@ later. Earlier versions are problematic and SWIG generated extensions may not compile or run correctly.

        -

        27.1 Overview

        +

        28.1 Overview

        @@ -108,7 +108,7 @@ described. Advanced customization features, typemaps, and other options are found near the end of the chapter.

        -

        27.2 Preliminaries

        +

        28.2 Preliminaries

        @@ -133,7 +133,7 @@ To build the module, you will need to compile the file example_wrap.c and link it with the rest of your program.

        -

        27.2.1 Getting the right header files

        +

        28.2.1 Getting the right header files

        @@ -165,7 +165,7 @@ loaded, an easy way to find out is to run Perl itself.

      -

      27.2.2 Compiling a dynamic module

      +

      28.2.2 Compiling a dynamic module

      @@ -198,7 +198,7 @@ the target should be named `example.so', `example.sl', or the appropriate dynamic module name on your system.

      -

      27.2.3 Building a dynamic module with MakeMaker

      +

      28.2.3 Building a dynamic module with MakeMaker

      @@ -232,7 +232,7 @@ the preferred approach to compilation. More information about MakeMaker can be found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen, and Randal Schwartz.

      -

      27.2.4 Building a static version of Perl

      +

      28.2.4 Building a static version of Perl

      @@ -301,7 +301,7 @@ added to it. Depending on your machine, you may need to link with additional libraries such as -lsocket, -lnsl, -ldl, etc.

      -

      27.2.5 Using the module

      +

      28.2.5 Using the module

      @@ -456,7 +456,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      27.2.6 Compilation problems and compiling with C++

      +

      28.2.6 Compilation problems and compiling with C++

      @@ -599,7 +599,7 @@ have to find the macro that conflicts and add an #undef into the .i file. Pleas any conflicting macros you find to swig-user mailing list.

      -

      27.2.7 Compiling for 64-bit platforms

      +

      28.2.7 Compiling for 64-bit platforms

      @@ -626,7 +626,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

      -

      27.3 Building Perl Extensions under Windows

      +

      28.3 Building Perl Extensions under Windows

      @@ -637,7 +637,7 @@ section assumes you are using SWIG with Microsoft Visual C++ although the procedure may be similar with other compilers.

      -

      27.3.1 Running SWIG from Developer Studio

      +

      28.3.1 Running SWIG from Developer Studio

      @@ -700,7 +700,7 @@ print "$a\n"; -

      27.3.2 Using other compilers

      +

      28.3.2 Using other compilers

      @@ -708,7 +708,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows. For general hints and suggestions refer to the Windows chapter.

      -

      27.4 The low-level interface

      +

      28.4 The low-level interface

      @@ -718,7 +718,7 @@ can be used to control your application. However, it is also used to construct more user-friendly proxy classes as described in the next section.

      -

      27.4.1 Functions

      +

      28.4.1 Functions

      @@ -741,7 +741,7 @@ use example; $a = &example::fact(2); -

      27.4.2 Global variables

      +

      28.4.2 Global variables

      @@ -811,7 +811,7 @@ extern char *path; // Declared later in the input -

      27.4.3 Constants

      +

      28.4.3 Constants

      @@ -838,7 +838,7 @@ $example::FOO = 2; # Error -

      27.4.4 Pointers

      +

      28.4.4 Pointers

      @@ -947,7 +947,7 @@ as XS and xsubpp. Given the advancement of the SWIG typesystem and the SWIG and XS, this is no longer supported.

      -

      27.4.5 Structures

      +

      28.4.5 Structures

      @@ -1081,7 +1081,7 @@ void Bar_f_set(Bar *b, Foo *val) { -

      27.4.6 C++ classes

      +

      28.4.6 C++ classes

      @@ -1146,7 +1146,7 @@ provides direct access to C++ objects. A higher level interface using Perl prox can be built using these low-level accessors. This is described shortly.

      -

      27.4.7 C++ classes and type-checking

      +

      28.4.7 C++ classes and type-checking

      @@ -1182,7 +1182,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece multiple inheritance is used).

      -

      27.4.8 C++ overloaded functions

      +

      28.4.8 C++ overloaded functions

      @@ -1226,7 +1226,7 @@ example::Spam_foo_d($s,3.14); Please refer to the "SWIG Basics" chapter for more information.

      -

      27.4.9 Operators

      +

      28.4.9 Operators

      @@ -1253,7 +1253,7 @@ The following C++ operators are currently supported by the Perl module:

    • operator or
      • -

      27.4.10 Modules and packages

      +

      28.4.10 Modules and packages

      @@ -1348,7 +1348,7 @@ print Foo::fact(4),"\n"; # Call a function in package FooBar --> -

      27.5 Input and output parameters

      +

      28.5 Input and output parameters

      @@ -1567,7 +1567,7 @@ print "$c\n"; Note: The REFERENCE feature is only currently supported for numeric types (integers and floating point).

      -

      27.6 Exception handling

      +

      28.6 Exception handling

      @@ -1732,7 +1732,7 @@ This is still supported, but it is deprecated. The newer %exception di functionality, but it has additional capabilities that make it more powerful.

      -

      27.7 Remapping datatypes with typemaps

      +

      28.7 Remapping datatypes with typemaps

      @@ -1749,7 +1749,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Perl interface.

      -

      27.7.1 A simple typemap example

      +

      28.7.1 A simple typemap example

      @@ -1853,7 +1853,7 @@ example::count("e","Hello World"); -

      27.7.2 Perl5 typemaps

      +

      28.7.2 Perl5 typemaps

      @@ -1958,7 +1958,7 @@ Return of C++ member data (all languages). Check value of input parameter. -

      27.7.3 Typemap variables

      +

      28.7.3 Typemap variables

      @@ -2029,7 +2029,7 @@ properly assigned. The Perl name of the wrapper function being created. -

      27.7.4 Useful functions

      +

      28.7.4 Useful functions

      @@ -2098,7 +2098,7 @@ int sv_isa(SV *, char *0; -

      27.8 Typemap Examples

      +

      28.8 Typemap Examples

      @@ -2107,7 +2107,7 @@ might look at the files "perl5.swg" and "typemaps.i" in the SWIG library.

      -

      27.8.1 Converting a Perl5 array to a char **

      +

      28.8.1 Converting a Perl5 array to a char **

      @@ -2199,7 +2199,7 @@ print @$b,"\n"; # Print it out -

      27.8.2 Return values

      +

      28.8.2 Return values

      @@ -2228,7 +2228,7 @@ can be done using the EXTEND() macro as in : } -

      27.8.3 Returning values from arguments

      +

      28.8.3 Returning values from arguments

      @@ -2282,7 +2282,7 @@ print "multout(7,13) = @r\n"; ($x,$y) = multout(7,13); -

      27.8.4 Accessing array structure members

      +

      28.8.4 Accessing array structure members

      @@ -2345,7 +2345,7 @@ the "in" typemap in the previous section would be used to convert an to copy the converted array into a C data structure.

      -

      27.8.5 Turning Perl references into C pointers

      +

      28.8.5 Turning Perl references into C pointers

      @@ -2410,7 +2410,7 @@ print "$c\n"; -

      27.8.6 Pointer handling

      +

      28.8.6 Pointer handling

      @@ -2489,7 +2489,7 @@ For example: -

      27.9 Proxy classes

      +

      28.9 Proxy classes

      @@ -2505,7 +2505,7 @@ to the underlying code. This section describes the implementation details of the proxy interface.

      -

      27.9.1 Preliminaries

      +

      28.9.1 Preliminaries

      @@ -2527,7 +2527,7 @@ SWIG creates a collection of high-level Perl wrappers. In your scripts, you wil high level wrappers. The wrappers, in turn, interact with the low-level procedural module.

      -

      27.9.2 Structure and class wrappers

      +

      28.9.2 Structure and class wrappers

      @@ -2653,7 +2653,7 @@ $v->DESTROY(); -

      27.9.3 Object Ownership

      +

      28.9.3 Object Ownership

      @@ -2740,7 +2740,7 @@ counting, garbage collection, or advanced features one might find in sophisticated languages.

      -

      27.9.4 Nested Objects

      +

      28.9.4 Nested Objects

      @@ -2793,7 +2793,7 @@ $p->{f}->{x} = 0.0; %${$p->{v}} = ( x=>0, y=>0, z=>0); -

      27.9.5 Proxy Functions

      +

      28.9.5 Proxy Functions

      @@ -2827,7 +2827,7 @@ This function replaces the original function, but operates in an identical manner.

      -

      27.9.6 Inheritance

      +

      28.9.6 Inheritance

      @@ -2903,7 +2903,7 @@ particular, inheritance of data members is extremely tricky (and I'm not even sure if it really works).

      -

      27.9.7 Modifying the proxy methods

      +

      28.9.7 Modifying the proxy methods

      @@ -2931,7 +2931,7 @@ public: }; -

      27.10 Adding additional Perl code

      +

      28.10 Adding additional Perl code

      diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index 6b654fde5..092bd0423 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -7,7 +7,7 @@ -

      28 SWIG and PHP

      +

      29 SWIG and PHP

        @@ -67,7 +67,7 @@ your extension into php directly, you will need the complete PHP source tree available.

        -

        28.1 Generating PHP Extensions

        +

        29.1 Generating PHP Extensions

        @@ -114,7 +114,7 @@ this approach, but if you really want to do this, the -phpfull command line argument to swig may be of use - see below for details.

        -

        28.1.1 Building a loadable extension

        +

        29.1.1 Building a loadable extension

        @@ -138,7 +138,7 @@ add them to your Makefile or other build system directly. We recommend that you don't use -make and it's likely to be removed at some point.

        -

        28.1.2 Building extensions into PHP

        +

        29.1.2 Building extensions into PHP

        @@ -257,7 +257,7 @@ which contains your new module. You can test it with a php script which does not have the 'dl' command as used above.

        -

        28.1.3 Using PHP Extensions

        +

        29.1.3 Using PHP Extensions

        @@ -288,7 +288,7 @@ attempts to do the dl() call for you: include("example.php");

      -

      28.2 Basic PHP interface

      +

      29.2 Basic PHP interface

      @@ -298,7 +298,7 @@ possible for names of symbols in one extension module to clash with other symbols unless care is taken to %rename them.

      -

      28.2.1 Constants

      +

      29.2.1 Constants

      @@ -423,7 +423,7 @@ both point to the same value, without the case test taking place. ( Apologies, this paragraph needs rewriting to make some sense. )

      -

      28.2.2 Global Variables

      +

      29.2.2 Global Variables

      @@ -472,7 +472,7 @@ undefined. At this time SWIG does not support custom accessor methods.

      -

      28.2.3 Functions

      +

      29.2.3 Functions

      @@ -525,7 +525,7 @@ print $s; # The value of $s was not changed. --> -

      28.2.4 Overloading

      +

      29.2.4 Overloading

      @@ -581,7 +581,7 @@ taking the integer argument.

      --> -

      28.2.5 Pointers and References

      +

      29.2.5 Pointers and References

      @@ -713,7 +713,7 @@ PHP in a number of ways: by using unset on an existing variable, or assigning NULL to a variable.

      -

      28.2.6 Structures and C++ classes

      +

      29.2.6 Structures and C++ classes

      @@ -783,7 +783,7 @@ Would be used in the following way from either PHP4 or PHP5: Member variables and methods are accessed using the -> operator.

      -

      28.2.6.1 Using -noproxy

      +

      29.2.6.1 Using -noproxy

      @@ -809,7 +809,7 @@ Complex_im_set($obj,$d); Complex_im_get($obj); -

      28.2.6.2 Constructors and Destructors

      +

      29.2.6.2 Constructors and Destructors

      @@ -850,7 +850,7 @@ the programmer can either reassign the variable or call unset($v)

      -

      28.2.6.3 Static Member Variables

      +

      29.2.6.3 Static Member Variables

      @@ -893,7 +893,7 @@ Ko::threats(10); echo "There has now been " . Ko::threats() . " threats\n"; -

      28.2.6.4 Static Member Functions

      +

      29.2.6.4 Static Member Functions

      @@ -915,7 +915,7 @@ Ko::threats(); -

      28.2.7 PHP Pragmas, Startup and Shutdown code

      +

      29.2.7 PHP Pragmas, Startup and Shutdown code

      diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html index 3e39d4062..a47d07865 100644 --- a/Doc/Manual/Pike.html +++ b/Doc/Manual/Pike.html @@ -6,7 +6,7 @@ -

      29 SWIG and Pike

      +

      30 SWIG and Pike

        @@ -46,10 +46,10 @@ least, make sure you read the "SWIG Basics" chapter.

        -

        29.1 Preliminaries

        +

        30.1 Preliminaries

        -

        29.1.1 Running SWIG

        +

        30.1.1 Running SWIG

        @@ -94,7 +94,7 @@ can use the -o option: 

        $ swig -pike -o pseudonym.c example.i
        -

        29.1.2 Getting the right header files

        +

        30.1.2 Getting the right header files

        @@ -114,7 +114,7 @@ You're looking for files with the names global.h, program.h and so on.

        -

        29.1.3 Using your module

        +

        30.1.3 Using your module

        @@ -129,10 +129,10 @@ Pike v7.4 release 10 running Hilfe v3.5 (Incremental Pike Frontend) (1) Result: 24

      -

      29.2 Basic C/C++ Mapping

      +

      30.2 Basic C/C++ Mapping

      -

      29.2.1 Modules

      +

      30.2.1 Modules

      @@ -143,7 +143,7 @@ concerned), SWIG's %module directive doesn't really have any significance.

      -

      29.2.2 Functions

      +

      30.2.2 Functions

      @@ -168,7 +168,7 @@ exactly as you'd expect it to: (1) Result: 24 -

      29.2.3 Global variables

      +

      30.2.3 Global variables

      @@ -197,7 +197,7 @@ will result in two functions, Foo_get() and Foo_set(): (3) Result: 3.141590 -

      29.2.4 Constants and enumerated types

      +

      30.2.4 Constants and enumerated types

      @@ -205,7 +205,7 @@ Enumerated types in C/C++ declarations are wrapped as Pike constants, not as Pike enums.

      -

      29.2.5 Constructors and Destructors

      +

      30.2.5 Constructors and Destructors

      @@ -213,7 +213,7 @@ Constructors are wrapped as create() methods, and destructors are wrapped as destroy() methods, for Pike classes.

      -

      29.2.6 Static Members

      +

      30.2.6 Static Members

      diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html index 62b72fabf..5a8653597 100644 --- a/Doc/Manual/Python.html +++ b/Doc/Manual/Python.html @@ -6,7 +6,7 @@ -

      30 SWIG and Python

      +

      31 SWIG and Python

        @@ -125,7 +125,7 @@ very least, make sure you read the "SWIG Basics" chapter.

        -

        30.1 Overview

        +

        31.1 Overview

        @@ -152,10 +152,10 @@ described followed by a discussion of low-level implementation details.

        -

        30.2 Preliminaries

        +

        31.2 Preliminaries

        -

        30.2.1 Running SWIG

        +

        31.2.1 Running SWIG

        @@ -253,7 +253,7 @@ The following sections have further practical examples and details on how you might go about compiling and using the generated files.

        -

        30.2.2 Using distutils

        +

        31.2.2 Using distutils

        @@ -345,7 +345,7 @@ This same approach works on all platforms if the appropriate compiler is install can even build extensions to the standard Windows Python using MingGW)

        -

        30.2.3 Hand compiling a dynamic module

        +

        31.2.3 Hand compiling a dynamic module

        @@ -393,7 +393,7 @@ module actually consists of two files; socket.py and

        -

        30.2.4 Static linking

        +

        31.2.4 Static linking

        @@ -472,7 +472,7 @@ If using static linking, you might want to rely on a different approach (perhaps using distutils).

        -

        30.2.5 Using your module

        +

        31.2.5 Using your module

        @@ -629,7 +629,7 @@ system configuration (this requires root access and you will need to read the man pages).

        -

        30.2.6 Compilation of C++ extensions

        +

        31.2.6 Compilation of C++ extensions

        @@ -728,7 +728,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

        -

        30.2.7 Compiling for 64-bit platforms

        +

        31.2.7 Compiling for 64-bit platforms

        @@ -765,7 +765,7 @@ and -m64 allow you to choose the desired binary format for your python extension.

        -

        30.2.8 Building Python Extensions under Windows

        +

        31.2.8 Building Python Extensions under Windows

        @@ -874,7 +874,7 @@ SWIG Wiki.

        -

        30.3 A tour of basic C/C++ wrapping

        +

        31.3 A tour of basic C/C++ wrapping

        @@ -883,7 +883,7 @@ to your C/C++ code. Functions are wrapped as functions, classes are wrapped as This section briefly covers the essential aspects of this wrapping.

        -

        30.3.1 Modules

        +

        31.3.1 Modules

        @@ -896,7 +896,7 @@ module name, make sure you don't use the same name as a built-in Python command or standard module name.

        -

        30.3.2 Functions

        +

        31.3.2 Functions

        @@ -920,7 +920,7 @@ like you think it does: >>>

      -

      30.3.3 Global variables

      +

      31.3.3 Global variables

      @@ -1058,7 +1058,7 @@ that starts with a leading underscore. SWIG does not create cvar if there are no global variables in a module.

      -

      30.3.4 Constants and enums

      +

      31.3.4 Constants and enums

      @@ -1098,7 +1098,7 @@ other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

      -

      30.3.5 Pointers

      +

      31.3.5 Pointers

      @@ -1239,7 +1239,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      30.3.6 Structures

      +

      31.3.6 Structures

      @@ -1428,7 +1428,7 @@ everything works just like you would expect. For example: -

      30.3.7 C++ classes

      +

      31.3.7 C++ classes

      @@ -1517,7 +1517,7 @@ they are accessed through cvar like this: -

      30.3.8 C++ inheritance

      +

      31.3.8 C++ inheritance

      @@ -1572,7 +1572,7 @@ then the function spam() accepts Foo * or a pointer to any cla It is safe to use multiple inheritance with SWIG.

      -

      30.3.9 Pointers, references, values, and arrays

      +

      31.3.9 Pointers, references, values, and arrays

      @@ -1633,7 +1633,7 @@ treated as a returning value, and it will follow the same allocation/deallocation process.

      -

      30.3.10 C++ overloaded functions

      +

      31.3.10 C++ overloaded functions

      @@ -1756,7 +1756,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      30.3.11 C++ operators

      +

      31.3.11 C++ operators

      @@ -1845,7 +1845,7 @@ Also, be aware that certain operators don't map cleanly to Python. For instance overloaded assignment operators don't map to Python semantics and will be ignored.

      -

      30.3.12 C++ namespaces

      +

      31.3.12 C++ namespaces

      @@ -1912,7 +1912,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      30.3.13 C++ templates

      +

      31.3.13 C++ templates

      @@ -1966,7 +1966,7 @@ Some more complicated examples will appear later.

      -

      30.3.14 C++ Smart Pointers

      +

      31.3.14 C++ Smart Pointers

      @@ -2051,7 +2051,7 @@ simply use the __deref__() method. For example: -

      30.3.15 C++ Reference Counted Objects (ref/unref)

      +

      31.3.15 C++ Reference Counted Objects (ref/unref)

      @@ -2213,7 +2213,7 @@ python releases the proxy instance.

      -

      30.4 Further details on the Python class interface

      +

      31.4 Further details on the Python class interface

      @@ -2226,7 +2226,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      30.4.1 Proxy classes

      +

      31.4.1 Proxy classes

      @@ -2315,7 +2315,7 @@ you can attach new Python methods to the class and you can even inherit from it by Python built-in types until Python 2.2).

      -

      30.4.2 Memory management

      +

      31.4.2 Memory management

      @@ -2507,7 +2507,7 @@ It is also possible to deal with situations like this using typemaps--an advanced topic discussed later.

      -

      30.4.3 Python 2.2 and classic classes

      +

      31.4.3 Python 2.2 and classic classes

      @@ -2544,7 +2544,7 @@ class itself. In Python-2.1 and earlier, they have to be accessed as a global function or through an instance (see the earlier section).

      -

      30.5 Cross language polymorphism

      +

      31.5 Cross language polymorphism

      @@ -2578,7 +2578,7 @@ proxy classes, director classes, and C wrapper functions takes care of all the cross-language method routing transparently.

      -

      30.5.1 Enabling directors

      +

      31.5.1 Enabling directors

      @@ -2671,7 +2671,7 @@ class MyFoo(mymodule.Foo): -

      30.5.2 Director classes

      +

      31.5.2 Director classes

      @@ -2753,7 +2753,7 @@ so there is no need for the extra overhead involved with routing the calls through Python.

      -

      30.5.3 Ownership and object destruction

      +

      31.5.3 Ownership and object destruction

      @@ -2820,7 +2820,7 @@ deleting all the Foo pointers it contains at some point. Note that no hard references to the Foo objects remain in Python.

      -

      30.5.4 Exception unrolling

      +

      31.5.4 Exception unrolling

      @@ -2879,7 +2879,7 @@ Swig::DirectorMethodException is thrown, Python will register the exception as soon as the C wrapper function returns.

      -

      30.5.5 Overhead and code bloat

      +

      31.5.5 Overhead and code bloat

      @@ -2913,7 +2913,7 @@ directive) for only those methods that are likely to be extended in Python.

      -

      30.5.6 Typemaps

      +

      31.5.6 Typemaps

      @@ -2927,7 +2927,7 @@ need to be supported.

      -

      30.5.7 Miscellaneous

      +

      31.5.7 Miscellaneous

      @@ -2974,7 +2974,7 @@ methods that return const references.

      -

      30.6 Common customization features

      +

      31.6 Common customization features

      @@ -2987,7 +2987,7 @@ This section describes some common SWIG features that are used to improve your the interface to an extension module.

      -

      30.6.1 C/C++ helper functions

      +

      31.6.1 C/C++ helper functions

      @@ -3068,7 +3068,7 @@ hard to implement. It is possible to clean this up using Python code, typemaps, customization features as covered in later sections.

      -

      30.6.2 Adding additional Python code

      +

      31.6.2 Adding additional Python code

      @@ -3217,7 +3217,7 @@ public: -

      30.6.3 Class extension with %extend

      +

      31.6.3 Class extension with %extend

      @@ -3306,7 +3306,7 @@ Vector(12,14,16) in any way---the extensions only show up in the Python interface.

      -

      30.6.4 Exception handling with %exception

      +

      31.6.4 Exception handling with %exception

      @@ -3432,7 +3432,7 @@ The language-independent exception.i library file can also be used to raise exceptions. See the SWIG Library chapter.

      -

      30.7 Tips and techniques

      +

      31.7 Tips and techniques

      @@ -3442,7 +3442,7 @@ strings, binary data, and arrays. This chapter discusses the common techniques solving these problems.

      -

      30.7.1 Input and output parameters

      +

      31.7.1 Input and output parameters

      @@ -3655,7 +3655,7 @@ void foo(Bar *OUTPUT); may not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

      -

      30.7.2 Simple pointers

      +

      31.7.2 Simple pointers

      @@ -3724,7 +3724,7 @@ If you replace %pointer_functions() by %pointer_class(type,name)SWIG Library chapter for further details.

      -

      30.7.3 Unbounded C Arrays

      +

      31.7.3 Unbounded C Arrays

      @@ -3786,7 +3786,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

      -

      30.7.4 String handling

      +

      31.7.4 String handling

      @@ -3855,16 +3855,16 @@ If you need to return binary data, you might use the also be used to extra binary data from arbitrary pointers.

      -

      30.7.5 Arrays

      +

      31.7.5 Arrays

      -

      30.7.6 String arrays

      +

      31.7.6 String arrays

      -

      30.7.7 STL wrappers

      +

      31.7.7 STL wrappers

      -

      30.8 Typemaps

      +

      31.8 Typemaps

      @@ -3881,7 +3881,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Python interface or if you want to elevate your guru status.

      -

      30.8.1 What is a typemap?

      +

      31.8.1 What is a typemap?

      @@ -3997,7 +3997,7 @@ parameter is omitted): -

      30.8.2 Python typemaps

      +

      31.8.2 Python typemaps

      @@ -4038,7 +4038,7 @@ a look at the SWIG library version 1.3.20 or so.

      -

      30.8.3 Typemap variables

      +

      31.8.3 Typemap variables

      @@ -4109,7 +4109,7 @@ properly assigned. The Python name of the wrapper function being created. -

      30.8.4 Useful Python Functions

      +

      31.8.4 Useful Python Functions

      @@ -4237,7 +4237,7 @@ write me -

      30.9 Typemap Examples

      +

      31.9 Typemap Examples

      @@ -4246,7 +4246,7 @@ might look at the files "python.swg" and "typemaps.i" in the SWIG library.

      -

      30.9.1 Converting Python list to a char **

      +

      31.9.1 Converting Python list to a char **

      @@ -4326,7 +4326,7 @@ memory allocation is used to allocate memory for the array, the the C function.

      -

      30.9.2 Expanding a Python object into multiple arguments

      +

      31.9.2 Expanding a Python object into multiple arguments

      @@ -4405,7 +4405,7 @@ to supply the argument count. This is automatically set by the typemap code. F -

      30.9.3 Using typemaps to return arguments

      +

      31.9.3 Using typemaps to return arguments

      @@ -4494,7 +4494,7 @@ function can now be used as follows: >>> -

      30.9.4 Mapping Python tuples into small arrays

      +

      31.9.4 Mapping Python tuples into small arrays

      @@ -4543,7 +4543,7 @@ array, such an approach would not be recommended for huge arrays, but for small structures, this approach works fine.

      -

      30.9.5 Mapping sequences to C arrays

      +

      31.9.5 Mapping sequences to C arrays

      @@ -4632,7 +4632,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) { -

      30.9.6 Pointer handling

      +

      31.9.6 Pointer handling

      @@ -4729,7 +4729,7 @@ class object (if applicable). -

      30.10 Docstring Features

      +

      31.10 Docstring Features

      @@ -4757,7 +4757,7 @@ of your users much simpler.

      -

      30.10.1 Module docstring

      +

      31.10.1 Module docstring

      @@ -4791,7 +4791,7 @@ layout of controls on a panel, etc. to be loaded from an XML file." -

      30.10.2 %feature("autodoc")

      +

      31.10.2 %feature("autodoc")

      @@ -4818,7 +4818,7 @@ names, default values if any, and return type if any. There are also three options for autodoc controlled by the value given to the feature, described below. -

      30.10.2.1 %feature("autodoc", "0")

      +

      31.10.2.1 %feature("autodoc", "0")

      @@ -4847,7 +4847,7 @@ def function_name(*args, **kwargs): -

      30.10.2.2 %feature("autodoc", "1")

      +

      31.10.2.2 %feature("autodoc", "1")

      @@ -4872,7 +4872,7 @@ def function_name(*args, **kwargs): -

      30.10.2.3 %feature("autodoc", "docstring")

      +

      31.10.2.3 %feature("autodoc", "docstring")

      @@ -4891,7 +4891,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT); -

      30.10.3 %feature("docstring")

      +

      31.10.3 %feature("docstring")

      @@ -4923,7 +4923,7 @@ with more than one line. -

      30.11 Python Packages

      +

      31.11 Python Packages

      diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html index 3b37d53a0..0ed43fc52 100644 --- a/Doc/Manual/R.html +++ b/Doc/Manual/R.html @@ -6,7 +6,7 @@ -

      33 SWIG and R

      +

      34 SWIG and R

        @@ -33,7 +33,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux with gcc. The R bindings also work on Microsoft Windows using Visual C++.

        -

        33.1 Bugs

        +

        34.1 Bugs

        @@ -45,7 +45,7 @@ Currently the following features are not implemented or broken:

      • C Array wrappings
      -

      33.2 Using R and SWIG

      +

      34.2 Using R and SWIG

      @@ -99,7 +99,7 @@ Without it, inheritance of wrapped objects may fail. These two files can be loaded in any order

      -

      33.3 Precompiling large R files

      +

      34.3 Precompiling large R files

      In cases where the R file is large, one make save a lot of loading @@ -117,7 +117,7 @@ will save a large amount of loading time. -

      33.4 General policy

      +

      34.4 General policy

      @@ -126,7 +126,7 @@ wrapping over the underlying functions and rely on the R type system to provide R syntax.

      -

      33.5 Language conventions

      +

      34.5 Language conventions

      @@ -135,7 +135,7 @@ and [ are overloaded to allow for R syntax (one based indices and slices)

      -

      33.6 C++ classes

      +

      34.6 C++ classes

      @@ -147,7 +147,7 @@ keep track of the pointer object which removes the necessity for a lot of the proxy class baggage you see in other languages.

      -

      33.7 Enumerations

      +

      34.7 Enumerations

      diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html index 9cd83d494..7360f732d 100644 --- a/Doc/Manual/Ruby.html +++ b/Doc/Manual/Ruby.html @@ -26,7 +26,7 @@ -

      31 SWIG and Ruby

      +

      32 SWIG and Ruby

        @@ -167,7 +167,7 @@ -

        31.1 Preliminaries

        +

        32.1 Preliminaries

        SWIG 1.3 is known to work with Ruby versions 1.6 and later. @@ -190,7 +190,7 @@ of Ruby.

        -

        31.1.1 Running SWIG

        +

        32.1.1 Running SWIG

        To build a Ruby module, run SWIG using the -ruby @@ -244,7 +244,7 @@ to compile this file and link it with the rest of your program.

        -

        31.1.2 Getting the right header files

        +

        32.1.2 Getting the right header files

        In order to compile the wrapper code, the compiler needs the ruby.h @@ -288,7 +288,7 @@ installed, you can run Ruby to find out. For example:

        -

        31.1.3 Compiling a dynamic module

        +

        32.1.3 Compiling a dynamic module

        Ruby extension modules are typically compiled into shared @@ -443,7 +443,7 @@ manual pages for your compiler and linker to determine the correct set of options. You might also check the SWIG Wiki for additional information.

        -

        31.1.4 Using your module

        +

        32.1.4 Using your module

        Ruby module names must be capitalized, @@ -498,7 +498,7 @@ begins with:

        -

        31.1.5 Static linking

        +

        32.1.5 Static linking

        An alternative approach to dynamic linking is to rebuild the @@ -519,7 +519,7 @@ finally rebuilding Ruby.

        -

        31.1.6 Compilation of C++ extensions

        +

        32.1.6 Compilation of C++ extensions

        On most machines, C++ extension modules should be linked @@ -571,7 +571,7 @@ extension, e.g.

        -

        31.2 Building Ruby Extensions under Windows 95/NT

        +

        32.2 Building Ruby Extensions under Windows 95/NT

        Building a SWIG extension to Ruby under Windows 95/NT is @@ -610,7 +610,7 @@ files.

        -

        31.2.1 Running SWIG from Developer Studio

        +

        32.2.1 Running SWIG from Developer Studio

        If you are developing your application within Microsoft @@ -752,7 +752,7 @@ directory, then run the Ruby script from the DOS/Command prompt:

        -

        31.3 The Ruby-to-C/C++ Mapping

        +

        32.3 The Ruby-to-C/C++ Mapping

        This section describes the basics of how SWIG maps C or C++ @@ -762,7 +762,7 @@ declarations in your SWIG interface files to Ruby constructs.

        -

        31.3.1 Modules

        +

        32.3.1 Modules

        The SWIG %module directive specifies @@ -931,7 +931,7 @@ Ruby's built-in names.

        -

        31.3.2 Functions

        +

        32.3.2 Functions

        Global functions are wrapped as Ruby module methods. For @@ -994,7 +994,7 @@ module that can be used like so:

        -

        31.3.3 Variable Linking

        +

        32.3.3 Variable Linking

        C/C++ global variables are wrapped as a pair of singleton @@ -1094,7 +1094,7 @@ effect until it is explicitly disabled using %mutable. -

        31.3.4 Constants

        +

        32.3.4 Constants

        C/C++ constants are wrapped as module constants initialized @@ -1138,7 +1138,7 @@ constant values, e.g.

        -

        31.3.5 Pointers

        +

        32.3.5 Pointers

        "Opaque" pointers to arbitrary C/C++ types (i.e. types that @@ -1190,7 +1190,7 @@ the Ruby nil object.

        -

        31.3.6 Structures

        +

        32.3.6 Structures

        C/C++ structs are wrapped as Ruby classes, with accessor @@ -1365,7 +1365,7 @@ pointers. For example,

        -

        31.3.7 C++ classes

        +

        32.3.7 C++ classes

        Like structs, C++ classes are wrapped by creating a new Ruby @@ -1451,7 +1451,7 @@ class. -

        31.3.8 C++ Inheritance

        +

        32.3.8 C++ Inheritance

        The SWIG type-checker is fully aware of C++ inheritance. @@ -1682,7 +1682,7 @@ Typing").

        -

        31.3.9 C++ Overloaded Functions

        +

        32.3.9 C++ Overloaded Functions

        C++ overloaded functions, methods, and constructors are @@ -1878,7 +1878,7 @@ and C++" chapter for more information about overloading.

        -

        31.3.10 C++ Operators

        +

        32.3.10 C++ Operators

        For the most part, overloaded operators are handled @@ -1959,7 +1959,7 @@ on operator overloading.

        -

        31.3.11 C++ namespaces

        +

        32.3.11 C++ namespaces

        SWIG is aware of C++ namespaces, but namespace names do not @@ -2035,7 +2035,7 @@ identical symbol names, well, then you get what you deserve.

        -

        31.3.12 C++ templates

        +

        32.3.12 C++ templates

        C++ templates don't present a huge problem for SWIG. However, @@ -2079,7 +2079,7 @@ directive. For example:

        -

        31.3.13 C++ Standard Template Library (STL)

        +

        32.3.13 C++ Standard Template Library (STL)

        On a related note, the standard SWIG library contains a @@ -2332,7 +2332,7 @@ chapter.

        -

        31.3.14 C++ STL Functors

        +

        32.3.14 C++ STL Functors

        Some containers in the STL allow you to modify their default @@ -2532,7 +2532,7 @@ b
        -

        31.3.15 C++ STL Iterators

        +

        32.3.15 C++ STL Iterators

        The STL is well known for the use of iterators.  There @@ -2743,7 +2743,7 @@ i
        -

        31.3.16 C++ Smart Pointers

        +

        32.3.16 C++ Smart Pointers

        In certain C++ programs, it is common to use classes that @@ -2868,7 +2868,7 @@ method. For example:

        -

        31.3.17 Cross-Language Polymorphism

        +

        32.3.17 Cross-Language Polymorphism

        SWIG's Ruby module supports cross-language polymorphism @@ -2881,7 +2881,7 @@ using this feature with Ruby.

        -

        31.3.17.1 Exception Unrolling

        +

        32.3.17.1 Exception Unrolling

        Whenever a C++ director class routes one of its virtual @@ -2919,7 +2919,7 @@ caught here and a C++ exception is raised in its place.

        -

        31.4 Naming

        +

        32.4 Naming

        Ruby has several common naming conventions. Constants are @@ -3015,7 +3015,7 @@ planned to become the default option in future releases.

        -

        31.4.1 Defining Aliases

        +

        32.4.1 Defining Aliases

        It's a fairly common practice in the Ruby built-ins and @@ -3107,7 +3107,7 @@ Features") for more details).

        -

        31.4.2 Predicate Methods

        +

        32.4.2 Predicate Methods

        Ruby methods that return a boolean value and end in a @@ -3196,7 +3196,7 @@ Features") for more details).

        -

        31.4.3 Bang Methods

        +

        32.4.3 Bang Methods

        Ruby methods that modify an object in-place and end in an @@ -3260,7 +3260,7 @@ Features") for more details).

        -

        31.4.4 Getters and Setters

        +

        32.4.4 Getters and Setters

        Often times a C++ library will expose properties through @@ -3330,7 +3330,7 @@ methods to be exposed in Ruby as value and value=. -

        31.5 Input and output parameters

        +

        32.5 Input and output parameters

        A common problem in some C programs is handling parameters @@ -3581,10 +3581,10 @@ of %apply

        -

        31.6 Exception handling

        +

        32.6 Exception handling

        -

        31.6.1 Using the %exception directive

        +

        32.6.1 Using the %exception directive

        The SWIG %exception directive can be @@ -3679,7 +3679,7 @@ Features for more examples.

        -

        31.6.2 Handling Ruby Blocks

        +

        32.6.2 Handling Ruby Blocks

        One of the highlights of Ruby and most of its standard library @@ -3860,7 +3860,7 @@ RUBY_YIELD_SELF );

        For more information on typemaps, see Typemaps.

        -

        31.6.3 Raising exceptions

        +

        32.6.3 Raising exceptions

        There are three ways to raise exceptions from C++ code to @@ -4621,7 +4621,7 @@ the built-in Ruby exception types.

        -

        31.6.4 Exception classes

        +

        32.6.4 Exception classes

        Starting with SWIG 1.3.28, the Ruby module supports the %exceptionclass @@ -4679,7 +4679,7 @@ providing for a more natural integration between C++ code and Ruby code.

        -

        31.7 Typemaps

        +

        32.7 Typemaps

        This section describes how you can modify SWIG's default @@ -4702,7 +4702,7 @@ of the primitive C-Ruby interface.

        -

        31.7.1 What is a typemap?

        +

        32.7.1 What is a typemap?

        A typemap is nothing more than a code generation rule that is @@ -4964,7 +4964,7 @@ to be used as follows (notice how the length parameter is omitted):

        -

        31.7.2 Typemap scope

        +

        32.7.2 Typemap scope

        Once defined, a typemap remains in effect for all of the @@ -5012,7 +5012,7 @@ where the class itself is defined. For example:

        -

        31.7.3 Copying a typemap

        +

        32.7.3 Copying a typemap

        A typemap is copied by using assignment. For example:

        @@ -5114,7 +5114,7 @@ rules as for -

        31.7.4 Deleting a typemap

        +

        32.7.4 Deleting a typemap

        A typemap can be deleted by simply defining no code. For @@ -5166,7 +5166,7 @@ typemaps immediately after the clear operation.

        -

        31.7.5 Placement of typemaps

        +

        32.7.5 Placement of typemaps

        Typemap declarations can be declared in the global scope, @@ -5250,7 +5250,7 @@ string -

        31.7.6 Ruby typemaps

        +

        32.7.6 Ruby typemaps

        The following list details all of the typemap methods that @@ -5260,7 +5260,7 @@ can be used by the Ruby module:

        -

        31.7.6.1  "in" typemap

        +

        32.7.6.1  "in" typemap

        Converts Ruby objects to input @@ -5503,7 +5503,7 @@ arguments to be specified. For example:

        -

        31.7.6.2 "typecheck" typemap

        +

        32.7.6.2 "typecheck" typemap

        The "typecheck" typemap is used to support overloaded @@ -5544,7 +5544,7 @@ on "Typemaps and Overloading."

        -

        31.7.6.3  "out" typemap

        +

        32.7.6.3  "out" typemap

        Converts return value of a C function @@ -5776,7 +5776,7 @@ version of the C datatype matched by the typemap. -

        31.7.6.4 "arginit" typemap

        +

        32.7.6.4 "arginit" typemap

        The "arginit" typemap is used to set the initial value of a @@ -5801,7 +5801,7 @@ applications. For example:

        -

        31.7.6.5 "default" typemap

        +

        32.7.6.5 "default" typemap

        The "default" typemap is used to turn an argument into a @@ -5843,7 +5843,7 @@ default argument wrapping.

        -

        31.7.6.6 "check" typemap

        +

        32.7.6.6 "check" typemap

        The "check" typemap is used to supply value checking code @@ -5867,7 +5867,7 @@ arguments have been converted. For example:

        -

        31.7.6.7 "argout" typemap

        +

        32.7.6.7 "argout" typemap

        The "argout" typemap is used to return values from arguments. @@ -6025,7 +6025,7 @@ some function like SWIG_Ruby_AppendOutput.

        -

        31.7.6.8 "freearg" typemap

        +

        32.7.6.8 "freearg" typemap

        The "freearg" typemap is used to cleanup argument data. It is @@ -6061,7 +6061,7 @@ abort prematurely.

        -

        31.7.6.9 "newfree" typemap

        +

        32.7.6.9 "newfree" typemap

        The "newfree" typemap is used in conjunction with the %newobject @@ -6092,7 +6092,7 @@ ownership and %newobject for further details.

        -

        31.7.6.10 "memberin" typemap

        +

        32.7.6.10 "memberin" typemap

        The "memberin" typemap is used to copy data from an @@ -6125,7 +6125,7 @@ other objects.

        -

        31.7.6.11 "varin" typemap

        +

        32.7.6.11 "varin" typemap

        The "varin" typemap is used to convert objects in the target @@ -6136,7 +6136,7 @@ This is implementation specific.

        -

        31.7.6.12 "varout" typemap

        +

        32.7.6.12 "varout" typemap

        The "varout" typemap is used to convert a C/C++ object to an @@ -6147,7 +6147,7 @@ This is implementation specific.

        -

        31.7.6.13 "throws" typemap

        +

        32.7.6.13 "throws" typemap

        The "throws" typemap is only used when SWIG parses a C++ @@ -6206,7 +6206,7 @@ handling with %exception section.

        -

        31.7.6.14 directorin typemap

        +

        32.7.6.14 directorin typemap

        Converts C++ objects in director @@ -6460,7 +6460,7 @@ referring to the class itself. -

        31.7.6.15 directorout typemap

        +

        32.7.6.15 directorout typemap

        Converts Ruby objects in director @@ -6720,7 +6720,7 @@ exception.
        -

        31.7.6.16 directorargout typemap

        +

        32.7.6.16 directorargout typemap

        Output argument processing in director @@ -6960,7 +6960,7 @@ referring to the instance of the class itself -

        31.7.6.17 ret typemap

        +

        32.7.6.17 ret typemap

        Cleanup of function return values @@ -6970,7 +6970,7 @@ referring to the instance of the class itself -

        31.7.6.18 globalin typemap

        +

        32.7.6.18 globalin typemap

        Setting of C global variables @@ -6980,7 +6980,7 @@ referring to the instance of the class itself -

        31.7.7 Typemap variables

        +

        32.7.7 Typemap variables

        @@ -7090,7 +7090,7 @@ being created.

      -

      31.7.8 Useful Functions

      +

      32.7.8 Useful Functions

      When you write a typemap, you usually have to work directly @@ -7114,7 +7114,7 @@ across multiple languages.

      -

      31.7.8.1 C Datatypes to Ruby Objects

      +

      32.7.8.1 C Datatypes to Ruby Objects

      @@ -7170,7 +7170,7 @@ SWIG_From_float(float) -

      31.7.8.2 Ruby Objects to C Datatypes

      +

      32.7.8.2 Ruby Objects to C Datatypes

      Here, while the Ruby versions return the value directly, the SWIG @@ -7259,7 +7259,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      31.7.8.3 Macros for VALUE

      +

      32.7.8.3 Macros for VALUE

      RSTRING_LEN(str)

      @@ -7322,7 +7322,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      31.7.8.4 Exceptions

      +

      32.7.8.4 Exceptions

      void rb_raise(VALUE exception, const char *fmt, @@ -7489,7 +7489,7 @@ arguments are interpreted as with printf().

      -

      31.7.8.5 Iterators

      +

      32.7.8.5 Iterators

      void rb_iter_break()

      @@ -7591,7 +7591,7 @@ VALUE), VALUE value)

      -

      31.7.9 Typemap Examples

      +

      32.7.9 Typemap Examples

      This section includes a few examples of typemaps. For more @@ -7602,7 +7602,7 @@ directory.

      -

      31.7.10 Converting a Ruby array to a char **

      +

      32.7.10 Converting a Ruby array to a char **

      A common problem in many C programs is the processing of @@ -7657,7 +7657,7 @@ after the execution of the C function.

      -

      31.7.11 Collecting arguments in a hash

      +

      32.7.11 Collecting arguments in a hash

      Ruby's solution to the "keyword arguments" capability of some @@ -7936,7 +7936,7 @@ directory of the SWIG distribution.

      -

      31.7.12 Pointer handling

      +

      32.7.12 Pointer handling

      Occasionally, it might be necessary to convert pointer values @@ -8035,7 +8035,7 @@ For example:

      -

      31.7.12.1 Ruby Datatype Wrapping

      +

      32.7.12.1 Ruby Datatype Wrapping

      VALUE Data_Wrap_Struct(VALUE class, void @@ -8086,7 +8086,7 @@ and assigns that pointer to ptr.

      -

      31.7.13 Example: STL Vector to Ruby Array

      +

      32.7.13 Example: STL Vector to Ruby Array

      Another use for macros and type maps is to create a Ruby array @@ -8195,7 +8195,7 @@ the C++ Standard Template Library.
      -

      31.8 Docstring Features

      +

      32.8 Docstring Features

      @@ -8256,7 +8256,7 @@ generate ri documentation from a c wrap file, you could do:

      -

      31.8.1 Module docstring

      +

      32.8.1 Module docstring

      @@ -8307,7 +8307,7 @@ macro. For example: -

      31.8.2 %feature("autodoc")

      +

      32.8.2 %feature("autodoc")

      Since SWIG does know everything about the function it wraps, @@ -8336,7 +8336,7 @@ feature, described below. -

      31.8.2.1 %feature("autodoc", "0")

      +

      32.8.2.1 %feature("autodoc", "0")

      @@ -8384,7 +8384,7 @@ Then Ruby code like this will be generated: -

      31.8.2.2 %feature("autodoc", "1")

      +

      32.8.2.2 %feature("autodoc", "1")

      @@ -8416,7 +8416,7 @@ this: -

      31.8.2.3 %feature("autodoc", "2")

      +

      32.8.2.3 %feature("autodoc", "2")

      @@ -8432,7 +8432,7 @@ this: -

      31.8.2.4 %feature("autodoc", "3")

      +

      32.8.2.4 %feature("autodoc", "3")

      @@ -8460,7 +8460,7 @@ this: -

      31.8.2.5 %feature("autodoc", "docstring")

      +

      32.8.2.5 %feature("autodoc", "docstring")

      @@ -8488,7 +8488,7 @@ generated string. For example: -

      31.8.3 %feature("docstring")

      +

      32.8.3 %feature("docstring")

      @@ -8503,10 +8503,10 @@ docstring and they are output together.

      -

      31.9 Advanced Topics

      +

      32.9 Advanced Topics

      -

      31.9.1 Operator overloading

      +

      32.9.1 Operator overloading

      SWIG allows operator overloading with, by using the %extend @@ -9523,7 +9523,7 @@ parses the expression a != b as !(a == b). -

      31.9.2 Creating Multi-Module Packages

      +

      32.9.2 Creating Multi-Module Packages

      The chapter on Working @@ -9704,7 +9704,7 @@ initialized:

      -

      31.9.3 Specifying Mixin Modules

      +

      32.9.3 Specifying Mixin Modules

      The Ruby language doesn't support multiple inheritance, but @@ -9802,7 +9802,7 @@ Features") for more details).

      -

      31.10 Memory Management

      +

      32.10 Memory Management

      One of the most common issues in generating SWIG bindings for @@ -9849,7 +9849,7 @@ understanding of how the underlying library manages memory.

      -

      31.10.1 Mark and Sweep Garbage Collector

      +

      32.10.1 Mark and Sweep Garbage Collector

      Ruby uses a mark and sweep garbage collector. When the garbage @@ -9897,7 +9897,7 @@ this memory.

      -

      31.10.2 Object Ownership

      +

      32.10.2 Object Ownership

      As described above, memory management depends on clearly @@ -10124,7 +10124,7 @@ classes is:

      -

      31.10.3 Object Tracking

      +

      32.10.3 Object Tracking

      The remaining parts of this section will use the class library @@ -10338,7 +10338,7 @@ methods.

      -

      31.10.4 Mark Functions

      +

      32.10.4 Mark Functions

      With a bit more testing, we see that our class library still @@ -10456,7 +10456,7 @@ test suite.

      -

      31.10.5 Free Functions

      +

      32.10.5 Free Functions

      By default, SWIG creates a "free" function that is called when @@ -10611,7 +10611,7 @@ been freed, and thus raises a runtime exception.

      -

      31.10.6 Embedded Ruby and the C++ Stack

      +

      32.10.6 Embedded Ruby and the C++ Stack

      As has been said, the Ruby GC runs and marks objects before diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html index e837a5b17..b36395cab 100644 --- a/Doc/Manual/Tcl.html +++ b/Doc/Manual/Tcl.html @@ -6,7 +6,7 @@ -

      32 SWIG and Tcl

      +

      33 SWIG and Tcl

        @@ -82,7 +82,7 @@ Tcl 8.0 or a later release. Earlier releases of SWIG supported Tcl 7.x, but this is no longer supported.

        -

        32.1 Preliminaries

        +

        33.1 Preliminaries

        @@ -108,7 +108,7 @@ build a Tcl extension module. To finish building the module, you need to compile this file and link it with the rest of your program.

        -

        32.1.1 Getting the right header files

        +

        33.1.1 Getting the right header files

        @@ -126,7 +126,7 @@ this is the case, you should probably make a symbolic link so that tcl.h -

        32.1.2 Compiling a dynamic module

        +

        33.1.2 Compiling a dynamic module

        @@ -161,7 +161,7 @@ The name of the module is specified using the %module directive or the -module command line option.

        -

        32.1.3 Static linking

        +

        33.1.3 Static linking

        @@ -227,7 +227,7 @@ minimal in most situations (and quite frankly not worth the extra hassle in the opinion of this author).

        -

        32.1.4 Using your module

        +

        33.1.4 Using your module

        @@ -355,7 +355,7 @@ to the default system configuration (this requires root access and you will need the man pages).

        -

        32.1.5 Compilation of C++ extensions

        +

        33.1.5 Compilation of C++ extensions

        @@ -438,7 +438,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

        -

        32.1.6 Compiling for 64-bit platforms

        +

        33.1.6 Compiling for 64-bit platforms

        @@ -465,7 +465,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

        -

        32.1.7 Setting a package prefix

        +

        33.1.7 Setting a package prefix

        @@ -484,7 +484,7 @@ option will append the prefix to the name when creating a command and call it "Foo_bar".

        -

        32.1.8 Using namespaces

        +

        33.1.8 Using namespaces

        @@ -506,7 +506,7 @@ When the -namespace option is used, objects in the module are always accessed with the namespace name such as Foo::bar.

        -

        32.2 Building Tcl/Tk Extensions under Windows 95/NT

        +

        33.2 Building Tcl/Tk Extensions under Windows 95/NT

        @@ -517,7 +517,7 @@ covers the process of using SWIG with Microsoft Visual C++. although the procedure may be similar with other compilers.

        -

        32.2.1 Running SWIG from Developer Studio

        +

        33.2.1 Running SWIG from Developer Studio

        @@ -575,7 +575,7 @@ MSDOS > tclsh80 %

      -

      32.2.2 Using NMAKE

      +

      33.2.2 Using NMAKE

      @@ -638,7 +638,7 @@ to get you started. With a little practice, you'll be making lots of Tcl extensions.

      -

      32.3 A tour of basic C/C++ wrapping

      +

      33.3 A tour of basic C/C++ wrapping

      @@ -649,7 +649,7 @@ classes. This section briefly covers the essential aspects of this wrapping.

      -

      32.3.1 Modules

      +

      33.3.1 Modules

      @@ -683,7 +683,7 @@ To fix this, supply an extra argument to load like this: -

      32.3.2 Functions

      +

      33.3.2 Functions

      @@ -708,7 +708,7 @@ like you think it does: % -

      32.3.3 Global variables

      +

      33.3.3 Global variables

      @@ -788,7 +788,7 @@ extern char *path; // Read-only (due to %immutable) -

      32.3.4 Constants and enums

      +

      33.3.4 Constants and enums

      @@ -872,7 +872,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l conversion. This allows the global statement to be omitted.

      -

      32.3.5 Pointers

      +

      33.3.5 Pointers

      @@ -968,7 +968,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      32.3.6 Structures

      +

      33.3.6 Structures

      @@ -1250,7 +1250,7 @@ Note: Tcl only destroys the underlying object if it has ownership. See the memory management section that appears shortly.

      -

      32.3.7 C++ classes

      +

      33.3.7 C++ classes

      @@ -1317,7 +1317,7 @@ In Tcl, the static member is accessed as follows: -

      32.3.8 C++ inheritance

      +

      33.3.8 C++ inheritance

      @@ -1366,7 +1366,7 @@ For instance: It is safe to use multiple inheritance with SWIG.

      -

      32.3.9 Pointers, references, values, and arrays

      +

      33.3.9 Pointers, references, values, and arrays

      @@ -1420,7 +1420,7 @@ to hold the result and a pointer is returned (Tcl will release this memory when the return value is garbage collected).

      -

      32.3.10 C++ overloaded functions

      +

      33.3.10 C++ overloaded functions

      @@ -1543,7 +1543,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      32.3.11 C++ operators

      +

      33.3.11 C++ operators

      @@ -1645,7 +1645,7 @@ There are ways to make this operator appear as part of the class using the % Keep reading.

      -

      32.3.12 C++ namespaces

      +

      33.3.12 C++ namespaces

      @@ -1709,7 +1709,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      32.3.13 C++ templates

      +

      33.3.13 C++ templates

      @@ -1761,7 +1761,7 @@ More details can be found in the SWIG and C++ -

      32.3.14 C++ Smart Pointers

      +

      33.3.14 C++ Smart Pointers

      @@ -1845,7 +1845,7 @@ simply use the __deref__() method. For example: -

      32.4 Further details on the Tcl class interface

      +

      33.4 Further details on the Tcl class interface

      @@ -1858,7 +1858,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      32.4.1 Proxy classes

      +

      33.4.1 Proxy classes

      @@ -1923,7 +1923,7 @@ function. This allows objects to be encapsulated objects that look a lot like as shown in the last section.

      -

      32.4.2 Memory management

      +

      33.4.2 Memory management

      @@ -2111,7 +2111,7 @@ typemaps--an advanced topic discussed later.

      -

      32.5 Input and output parameters

      +

      33.5 Input and output parameters

      @@ -2299,7 +2299,7 @@ set c [lindex $dim 1] -

      32.6 Exception handling

      +

      33.6 Exception handling

      @@ -2433,7 +2433,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex See the chapter on "Customization Features" for more examples.

      -

      32.7 Typemaps

      +

      33.7 Typemaps

      @@ -2450,7 +2450,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Tcl interface.

      -

      32.7.1 What is a typemap?

      +

      33.7.1 What is a typemap?

      @@ -2567,7 +2567,7 @@ parameter is omitted): -

      32.7.2 Tcl typemaps

      +

      33.7.2 Tcl typemaps

      @@ -2705,7 +2705,7 @@ Initialize an argument to a value before any conversions occur. Examples of these methods will appear shortly.

      -

      32.7.3 Typemap variables

      +

      33.7.3 Typemap variables

      @@ -2776,7 +2776,7 @@ properly assigned. The Tcl name of the wrapper function being created. -

      32.7.4 Converting a Tcl list to a char **

      +

      33.7.4 Converting a Tcl list to a char **

      @@ -2838,7 +2838,7 @@ argv[2] = Larry 3 -

      32.7.5 Returning values in arguments

      +

      33.7.5 Returning values in arguments

      @@ -2880,7 +2880,7 @@ result, a Tcl function using these typemaps will work like this : % -

      32.7.6 Useful functions

      +

      33.7.6 Useful functions

      @@ -2957,7 +2957,7 @@ int Tcl_IsShared(Tcl_Obj *obj); -

      32.7.7 Standard typemaps

      +

      33.7.7 Standard typemaps

      @@ -3041,7 +3041,7 @@ work) -

      32.7.8 Pointer handling

      +

      33.7.8 Pointer handling

      @@ -3117,7 +3117,7 @@ For example: -

      32.8 Turning a SWIG module into a Tcl Package.

      +

      33.8 Turning a SWIG module into a Tcl Package.

      @@ -3189,7 +3189,7 @@ As a final note, most SWIG examples do not yet use the to use the load command instead.

      -

      32.9 Building new kinds of Tcl interfaces (in Tcl)

      +

      33.9 Building new kinds of Tcl interfaces (in Tcl)

      @@ -3288,7 +3288,7 @@ danger of blowing something up (although it is easily accomplished with an out of bounds array access).

      -

      32.9.1 Proxy classes

      +

      33.9.1 Proxy classes

      From a3ad15a6d681acf678c8e9d532b44a1204611a18 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 8 Sep 2008 20:02:18 +0000 Subject: [PATCH 045/508] revert last checkin git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10822 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 32 +++--- Doc/Manual/CSharp.html | 38 +++---- Doc/Manual/Chicken.html | 40 ++++---- Doc/Manual/Contents.html | 63 ++++-------- Doc/Manual/Extending.html | 96 +++++++++--------- Doc/Manual/Guile.html | 42 ++++---- Doc/Manual/Java.html | 204 +++++++++++++++++++------------------- Doc/Manual/Lisp.html | 22 ++-- Doc/Manual/Lua.html | 56 +++++------ Doc/Manual/Modula3.html | 46 ++++----- Doc/Manual/Mzscheme.html | 4 +- Doc/Manual/Ocaml.html | 62 ++++++------ Doc/Manual/Octave.html | 46 ++++----- Doc/Manual/Perl5.html | 94 +++++++++--------- Doc/Manual/Php.html | 34 +++---- Doc/Manual/Pike.html | 24 ++--- Doc/Manual/Python.html | 144 +++++++++++++-------------- Doc/Manual/R.html | 16 +-- Doc/Manual/Ruby.html | 196 ++++++++++++++++++------------------ Doc/Manual/Tcl.html | 90 ++++++++--------- 20 files changed, 661 insertions(+), 688 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 828a4b7a3..80146298f 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -5,7 +5,7 @@ -

      17 SWIG and C as the target language

      +

      36 SWIG and C as the target language

        @@ -14,8 +14,8 @@
      • Basic C wrapping
          @@ -42,7 +42,7 @@ This chapter describes SWIG's support for creating ANSI C wrappers. This module

          -

          17.1 Overview

          +

          36.1 Overview

          @@ -60,10 +60,10 @@ With wrapper interfaces generated by SWIG, it is easy to use the functionality o Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.

          -

          17.2 Preliminaries

          +

          36.2 Preliminaries

          -

          17.2.1 Running SWIG

          +

          36.2.1 Running SWIG

          @@ -98,7 +98,7 @@ $ swig -c++ -c example.i

          Note that -c is the option specifying the target language and -c++ controls what the input language is. -

          +

          This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_proxy.h and example_proxy.c files. The name of the file is derived from the name of the input file. To change this, you can use the -o option common to all language modules. @@ -108,7 +108,7 @@ This will generate an example_wrap.c file or, in the latter case, e The wrap file contains the wrapper functions, which perform the main functionality of SWIG: it translates the input arguments from C to C++, makes calls to the original functions and marshalls C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions.

          -

          17.2.2 Command line options

          +

          36.2.2 Command line options

          @@ -136,7 +136,7 @@ swig -c -help

      -

      17.2.3 Compiling a dynamic module

      +

      36.2.3 Compiling a dynamic module

      @@ -163,7 +163,7 @@ $ g++ -shared example_wrap.o -o libexample.so Now the shared library module is ready to use. Note that the name of the generated module is important: is should be prefixed with lib on Unix, and have the specific extension, like .dll for Windows or .so for Unix systems.

      -

      17.2.4 Using the generated module

      +

      36.2.4 Using the generated module

      @@ -178,14 +178,14 @@ $ gcc runme.c example_proxy.c -L. -lexample -o runme This will compile the application code (runme.c), along with the proxy code and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.

      -

      17.3 Basic C wrapping

      +

      36.3 Basic C wrapping

      Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.

      -

      17.3.1 Functions

      +

      36.3.1 Functions

      @@ -259,7 +259,7 @@ int _wrap_gcd(int arg1, int arg2) { This time calling gcd with negative value argument will trigger an error message. This can save you time writing all the constraint checking code by hand.

      -

      17.3.2 Variables

      +

      36.3.2 Variables

      @@ -297,14 +297,14 @@ ms.x = 123; ms.d = 123.123; -

      17.4 Basic C++ wrapping

      +

      36.4 Basic C++ wrapping

      The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.

      -

      17.4.1 Classes

      +

      36.4.1 Classes

      @@ -382,7 +382,7 @@ radius: 1.500000 area: 7.068583 -

      17.5 Exception handling

      +

      36.5 Exception handling

      diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html index 94e3eca79..97cb75409 100644 --- a/Doc/Manual/CSharp.html +++ b/Doc/Manual/CSharp.html @@ -5,7 +5,7 @@ -

      18 SWIG and C#

      +

      17 SWIG and C#

        @@ -39,7 +39,7 @@ -

        18.1 Introduction

        +

        17.1 Introduction

        @@ -59,7 +59,7 @@ The Microsoft Developer Network (MSDN) h Monodoc, available from the Mono project, has a very useful section titled Interop with native libraries.

        -

        18.2 Differences to the Java module

        +

        17.2 Differences to the Java module

        @@ -397,7 +397,7 @@ Windows users can also get the examples working using a Cygwin or MinGW environment for automatic configuration of the example makefiles. Any one of the three C# compilers (Portable.NET, Mono or Microsoft) can be detected from within a Cygwin or Mingw environment if installed in your path. -

        18.3 C# Exceptions

        +

        17.3 C# Exceptions

        @@ -494,7 +494,7 @@ set so should only be used when a C# exception is not created.

        -

        18.3.1 C# exception example using "check" typemap

        +

        17.3.1 C# exception example using "check" typemap

        @@ -676,7 +676,7 @@ method and C# code does not handle pending exceptions via the canthrow attribute Actually it will issue this warning for any function beginning with SWIG_CSharpSetPendingException.

        -

        18.3.2 C# exception example using %exception

        +

        17.3.2 C# exception example using %exception

        @@ -741,7 +741,7 @@ The managed code generated does check for the pending exception as mentioned ear

      -

      18.3.3 C# exception example using exception specifications

      +

      17.3.3 C# exception example using exception specifications

      @@ -798,7 +798,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_evensonly(int jarg1) { Multiple catch handlers are generated should there be more than one exception specifications declared.

      -

      18.3.4 Custom C# ApplicationException example

      +

      17.3.4 Custom C# ApplicationException example

      @@ -932,7 +932,7 @@ try { -

      18.4 C# Directors

      +

      17.4 C# Directors

      @@ -945,7 +945,7 @@ The following sections provide information on the C# director implementation and However, the Java directors section should also be read in order to gain more insight into directors.

      -

      18.4.1 Directors example

      +

      17.4.1 Directors example

      @@ -1066,7 +1066,7 @@ CSharpDerived - UIntMethod(123) -

      18.4.2 Directors implementation

      +

      17.4.2 Directors implementation

      @@ -1252,7 +1252,7 @@ void SwigDirector_Base::BaseBoolMethod(Base const &b, bool flag) { -

      18.4.3 Director caveats

      +

      17.4.3 Director caveats

      @@ -1300,7 +1300,7 @@ However, a call from C# to CSharpDefaults.DefaultMethod() will of cours should pass the call on to CSharpDefaults.DefaultMethod(int)using the C++ default value, as shown above.

      -

      18.5 C# Typemap examples

      +

      17.5 C# Typemap examples

      This section includes a few examples of typemaps. For more examples, you @@ -1308,7 +1308,7 @@ might look at the files "csharp.swg" and "typemaps.i" in the SWIG library. -

      18.5.1 Memory management when returning references to member variables

      +

      17.5.1 Memory management when returning references to member variables

      @@ -1432,7 +1432,7 @@ public class Bike : IDisposable { Note the addReference call.

      -

      18.5.2 Memory management for objects passed to the C++ layer

      +

      17.5.2 Memory management for objects passed to the C++ layer

      @@ -1551,7 +1551,7 @@ The 'cscode' typemap simply adds in the specified code into the C# proxy class. -

      18.5.3 Date marshalling using the csin typemap and associated attributes

      +

      17.5.3 Date marshalling using the csin typemap and associated attributes

      @@ -1788,7 +1788,7 @@ public class example { -

      18.5.4 A date example demonstrating marshalling of C# properties

      +

      17.5.4 A date example demonstrating marshalling of C# properties

      @@ -1888,7 +1888,7 @@ Some points to note:

    -

    18.5.5 Turning wrapped classes into partial classes

    +

    17.5.5 Turning wrapped classes into partial classes

    @@ -1988,7 +1988,7 @@ demonstrating that the class contains methods calling both unmanaged code - The following example is an alternative approach to adding managed code to the generated proxy class.

    -

    18.5.6 Extending proxy classes with additional C# code

    +

    17.5.6 Extending proxy classes with additional C# code

    diff --git a/Doc/Manual/Chicken.html b/Doc/Manual/Chicken.html index 98372a0f7..bd1b3d94b 100644 --- a/Doc/Manual/Chicken.html +++ b/Doc/Manual/Chicken.html @@ -8,7 +8,7 @@ -

    19 SWIG and Chicken

    +

    18 SWIG and Chicken

      @@ -72,7 +72,7 @@

      -

      19.1 Preliminaries

      +

      18.1 Preliminaries

      @@ -90,7 +90,7 @@ CHICKEN.

      -

      19.1.1 Running SWIG in C mode

      +

      18.1.1 Running SWIG in C mode

      @@ -123,7 +123,7 @@ object files and linked into your project.

      -

      19.1.2 Running SWIG in C++ mode

      +

      18.1.2 Running SWIG in C++ mode

      @@ -152,10 +152,10 @@ object files and linked into your project.

      -

      19.2 Code Generation

      +

      18.2 Code Generation

      -

      19.2.1 Naming Conventions

      +

      18.2.1 Naming Conventions

      @@ -171,7 +171,7 @@ %rename SWIG directive in the SWIG interface file.

      -

      19.2.2 Modules

      +

      18.2.2 Modules

      @@ -193,7 +193,7 @@ (uses modulename)) CHICKEN Scheme form.

      -

      19.2.3 Constants and Variables

      +

      18.2.3 Constants and Variables

      @@ -230,7 +230,7 @@ for info on how to apply the %feature.

      -

      19.2.4 Functions

      +

      18.2.4 Functions

      @@ -249,7 +249,7 @@ parameters). The return values can then be accessed with (call-with-values).

      -

      19.2.5 Exceptions

      +

      18.2.5 Exceptions

      The SWIG chicken module has support for exceptions thrown from @@ -291,7 +291,7 @@

    -

    19.3 TinyCLOS

    +

    18.3 TinyCLOS

    @@ -334,7 +334,7 @@

    -

    19.4 Linkage

    +

    18.4 Linkage

    @@ -355,7 +355,7 @@

    -

    19.4.1 Static binary or shared library linked at compile time

    +

    18.4.1 Static binary or shared library linked at compile time

    We can easily use csc to build a static binary.

    @@ -396,7 +396,7 @@ in which case the test script does not need to be linked with example.so. The t be run with csi.

    -

    19.4.2 Building chicken extension libraries

    +

    18.4.2 Building chicken extension libraries

    Building a shared library like in the above section only works if the library @@ -454,7 +454,7 @@ distributed and used by anyone, even if SWIG is not installed.

    See the Examples/chicken/egg directory in the SWIG source for an example that builds two eggs, one using the first method and one using the second method.

    -

    19.4.3 Linking multiple SWIG modules with TinyCLOS

    +

    18.4.3 Linking multiple SWIG modules with TinyCLOS

    Linking together multiple modules that share type information using the %import @@ -478,7 +478,7 @@ with (declare (uses ...)). To create an extension library or an egg, just create a module_load.scm file that (declare (uses ...)) all the modules.

    -

    19.5 Typemaps

    +

    18.5 Typemaps

    @@ -487,7 +487,7 @@ all the modules.

    Lib/chicken/chicken.swg.

    -

    19.6 Pointers

    +

    18.6 Pointers

    @@ -520,7 +520,7 @@ all the modules.

    type. flags is either zero or SWIG_POINTER_DISOWN (see below).

    -

    19.6.1 Garbage collection

    +

    18.6.1 Garbage collection

    If the owner flag passed to SWIG_NewPointerObj is 1, NewPointerObj will add a @@ -551,7 +551,7 @@ all the modules.

    must be called manually.

    -

    19.7 Unsupported features and known problems

    +

    18.7 Unsupported features and known problems

    -

    19.7.1 TinyCLOS problems with Chicken version <= 1.92

    +

    18.7.1 TinyCLOS problems with Chicken version <= 1.92

    In Chicken versions equal to or below 1.92, TinyCLOS has a limitation such that generic methods do not properly work on methods diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index ed90dc6d1..c3197b9dc 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -581,34 +581,7 @@ -

    17 SWIG and C as the target language

    - - -
    - -
    - - -

    18 SWIG and C#

    +

    17 SWIG and C#

    @@ -641,7 +614,7 @@
    -

    19 SWIG and Chicken

    +

    18 SWIG and Chicken

    @@ -679,7 +652,7 @@
    -

    20 SWIG and Guile

    +

    19 SWIG and Guile

    @@ -714,7 +687,7 @@
    -

    21 SWIG and Java

    +

    20 SWIG and Java

    @@ -856,7 +829,7 @@
    -

    22 SWIG and Common Lisp

    +

    21 SWIG and Common Lisp

    @@ -879,7 +852,7 @@
    -

    23 SWIG and Lua

    +

    22 SWIG and Lua

    @@ -921,7 +894,7 @@
    -

    24 SWIG and Modula-3

    +

    23 SWIG and Modula-3

    @@ -962,7 +935,7 @@
    -

    25 SWIG and MzScheme

    +

    24 SWIG and MzScheme

    @@ -972,7 +945,7 @@
    -

    26 SWIG and Ocaml

    +

    25 SWIG and Ocaml

    @@ -1023,7 +996,7 @@
    -

    27 SWIG and Octave

    +

    26 SWIG and Octave

    @@ -1058,7 +1031,7 @@
    -

    28 SWIG and Perl5

    +

    27 SWIG and Perl5

    @@ -1125,7 +1098,7 @@
    -

    29 SWIG and PHP

    +

    28 SWIG and PHP

    @@ -1156,7 +1129,7 @@
    -

    30 SWIG and Pike

    +

    29 SWIG and Pike

    @@ -1180,7 +1153,7 @@
    -

    31 SWIG and Python

    +

    30 SWIG and Python

    @@ -1280,7 +1253,7 @@
    -

    32 SWIG and Ruby

    +

    31 SWIG and Ruby

    @@ -1414,7 +1387,7 @@
    -

    33 SWIG and Tcl

    +

    32 SWIG and Tcl

    @@ -1479,7 +1452,7 @@
    -

    34 SWIG and R

    +

    33 SWIG and R

    @@ -1495,7 +1468,7 @@
    -

    35 Extending SWIG to support new languages

    +

    34 Extending SWIG to support new languages

    diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index b43441059..588912b68 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -6,7 +6,7 @@ -

    35 Extending SWIG to support new languages

    +

    34 Extending SWIG to support new languages

      @@ -73,7 +73,7 @@ -

      35.1 Introduction

      +

      34.1 Introduction

      @@ -89,7 +89,7 @@ Also, this chapter is not meant to be a hand-holding tutorial. As a starting po you should probably look at one of SWIG's existing modules.

      -

      35.2 Prerequisites

      +

      34.2 Prerequisites

      @@ -119,7 +119,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of wrapper code are driven by C++ datatypes.

      -

      35.3 The Big Picture

      +

      34.3 The Big Picture

      @@ -156,7 +156,7 @@ role in making the system work. For example, both typemaps and declaration anno based on pattern matching and interact heavily with the underlying type system.

      -

      35.4 Execution Model

      +

      34.4 Execution Model

      @@ -201,7 +201,7 @@ latter stage of compilation. The next few sections briefly describe some of these stages.

      -

      35.4.1 Preprocessing

      +

      34.4.1 Preprocessing

      @@ -281,7 +281,7 @@ been expanded as well as everything else that goes into the low-level construction of the wrapper code.

      -

      35.4.2 Parsing

      +

      34.4.2 Parsing

      @@ -382,7 +382,7 @@ returning a foo and taking types a and b as arguments).

      -

      35.4.3 Parse Trees

      +

      34.4.3 Parse Trees

      @@ -636,7 +636,7 @@ $ swig -c++ -python -debug-module 4 example.i

    -

    35.4.4 Attribute namespaces

    +

    34.4.4 Attribute namespaces

    @@ -655,7 +655,7 @@ that matches the name of the target language. For example, python:foo perl:foo.

    -

    35.4.5 Symbol Tables

    +

    34.4.5 Symbol Tables

    @@ -746,7 +746,7 @@ example.i:5. Previous declaration is foo_i(int )

    -

    35.4.6 The %feature directive

    +

    34.4.6 The %feature directive

    @@ -802,7 +802,7 @@ For example, the exception code above is simply stored without any modifications.

    -

    35.4.7 Code Generation

    +

    34.4.7 Code Generation

    @@ -924,7 +924,7 @@ public : The role of these functions is described shortly.

    -

    35.4.8 SWIG and XML

    +

    34.4.8 SWIG and XML

    @@ -937,7 +937,7 @@ internal data structures, it may be useful to keep XML in the back of your mind as a model.

    -

    35.5 Primitive Data Structures

    +

    34.5 Primitive Data Structures

    @@ -983,7 +983,7 @@ typedef Hash Typetab; -

    35.5.1 Strings

    +

    34.5.1 Strings

    @@ -1124,7 +1124,7 @@ Returns the number of replacements made (if any). -

    35.5.2 Hashes

    +

    34.5.2 Hashes

    @@ -1201,7 +1201,7 @@ Returns the list of hash table keys. -

    35.5.3 Lists

    +

    34.5.3 Lists

    @@ -1290,7 +1290,7 @@ If t is not a standard object, it is assumed to be a char * and is used to create a String object. -

    35.5.4 Common operations

    +

    34.5.4 Common operations

    The following operations are applicable to all datatypes. @@ -1345,7 +1345,7 @@ objects and report errors. Gets the line number associated with x. -

    35.5.5 Iterating over Lists and Hashes

    +

    34.5.5 Iterating over Lists and Hashes

    To iterate over the elements of a list or a hash table, the following functions are used: @@ -1390,7 +1390,7 @@ for (j = First(j); j.item; j= Next(j)) { -

    35.5.6 I/O

    +

    34.5.6 I/O

    Special I/O functions are used for all internal I/O. These operations @@ -1526,7 +1526,7 @@ Similarly, the preprocessor and parser all operate on string-files. -

    35.6 Navigating and manipulating parse trees

    +

    34.6 Navigating and manipulating parse trees

    Parse trees are built as collections of hash tables. Each node is a hash table in which @@ -1660,7 +1660,7 @@ Deletes a node from the parse tree. Deletion reconnects siblings and properly u the parent so that sibling nodes are unaffected. -

    35.7 Working with attributes

    +

    34.7 Working with attributes

    @@ -1777,7 +1777,7 @@ the attribute is optional. Swig_restore() must always be called after function. -

    35.8 Type system

    +

    34.8 Type system

    @@ -1786,7 +1786,7 @@ pointers, references, and pointers to members. A detailed discussion of type theory is impossible here. However, let's cover the highlights.

    -

    35.8.1 String encoding of types

    +

    34.8.1 String encoding of types

    @@ -1887,7 +1887,7 @@ make the final type, the two parts are just joined together using string concatenation.

    -

    35.8.2 Type construction

    +

    34.8.2 Type construction

    @@ -2056,7 +2056,7 @@ Returns the prefix of a type. For example, if ty is ty is unmodified. -

    35.8.3 Type tests

    +

    34.8.3 Type tests

    @@ -2143,7 +2143,7 @@ Checks if ty is a varargs type. Checks if ty is a templatized type. -

    35.8.4 Typedef and inheritance

    +

    34.8.4 Typedef and inheritance

    @@ -2245,7 +2245,7 @@ Fully reduces ty according to typedef rules. Resulting datatype will consist only of primitive typenames. -

    35.8.5 Lvalues

    +

    34.8.5 Lvalues

    @@ -2282,7 +2282,7 @@ Literal y; // type = 'Literal', ltype='p.char' -

    35.8.6 Output functions

    +

    34.8.6 Output functions

    @@ -2344,7 +2344,7 @@ SWIG, but is most commonly associated with type-descriptor objects that appear in wrappers (e.g., SWIGTYPE_p_double). -

    35.9 Parameters

    +

    34.9 Parameters

    @@ -2443,7 +2443,7 @@ included. Used to emit prototypes. Returns the number of required (non-optional) arguments in p. -

    35.10 Writing a Language Module

    +

    34.10 Writing a Language Module

    @@ -2458,7 +2458,7 @@ describes the creation of a minimal Python module. You should be able to extra this to other languages.

    -

    35.10.1 Execution model

    +

    34.10.1 Execution model

    @@ -2468,7 +2468,7 @@ the parsing of command line options, all aspects of code generation are controll different methods of the Language that must be defined by your module.

    -

    35.10.2 Starting out

    +

    34.10.2 Starting out

    @@ -2576,7 +2576,7 @@ that activates your module. For example, swig -python foo.i. The messages from your new module should appear.

    -

    35.10.3 Command line options

    +

    34.10.3 Command line options

    @@ -2635,7 +2635,7 @@ to mark the option as valid. If you forget to do this, SWIG will terminate wit unrecognized command line option error.

    -

    35.10.4 Configuration and preprocessing

    +

    34.10.4 Configuration and preprocessing

    @@ -2684,7 +2684,7 @@ an implementation file python.cxx and a configuration file python.swg.

    -

    35.10.5 Entry point to code generation

    +

    34.10.5 Entry point to code generation

    @@ -2742,7 +2742,7 @@ int Python::top(Node *n) { -

    35.10.6 Module I/O and wrapper skeleton

    +

    34.10.6 Module I/O and wrapper skeleton

    @@ -2884,7 +2884,7 @@ functionWrapper : void Shape_y_set(Shape *self,double y) -

    35.10.7 Low-level code generators

    +

    34.10.7 Low-level code generators

    @@ -3038,7 +3038,7 @@ but without the typemaps, there is still work to do.

    -

    35.10.8 Configuration files

    +

    34.10.8 Configuration files

    @@ -3188,7 +3188,7 @@ politely displays the ignoring language message. -

    35.10.9 Runtime support

    +

    34.10.9 Runtime support

    @@ -3197,7 +3197,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g. the SWIG files that implement those functions.

    -

    35.10.10 Standard library files

    +

    34.10.10 Standard library files

    @@ -3216,7 +3216,7 @@ The following are the minimum that are usually supported: Please copy these and modify for any new language.

    -

    35.10.11 Examples and test cases

    +

    34.10.11 Examples and test cases

    @@ -3245,7 +3245,7 @@ during this process, see the section on configuration files.

    -

    35.10.12 Documentation

    +

    34.10.12 Documentation

    @@ -3277,7 +3277,7 @@ Some topics that you'll want to be sure to address include: if available. -

    35.10.13 Prerequisites for adding a new language module to the SWIG distribution

    +

    34.10.13 Prerequisites for adding a new language module to the SWIG distribution

    @@ -3334,7 +3334,7 @@ should be added should there be an area not already covered by the existing tests.

    -

    35.10.14 Coding style guidelines

    +

    34.10.14 Coding style guidelines

    @@ -3358,13 +3358,13 @@ The generated C/C++ code should also follow this style as close as possible. How should be avoided as unlike the SWIG developers, users will never have consistent tab settings.

    -

    35.11 Typemaps

    +

    34.11 Typemaps

    -

    35.11.1 Proxy classes

    +

    34.11.1 Proxy classes

    -

    35.12 Guide to parse tree nodes

    +

    34.12 Guide to parse tree nodes

    diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index cf7e8da2c..20ab716e4 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -8,7 +8,7 @@ -

    20 SWIG and Guile

    +

    19 SWIG and Guile

      @@ -47,7 +47,7 @@

      This section details guile-specific support in SWIG. -

      20.1 Meaning of "Module"

      +

      19.1 Meaning of "Module"

      @@ -55,7 +55,7 @@ There are three different concepts of "module" involved, defined separately for SWIG, Guile, and Libtool. To avoid horrible confusion, we explicitly prefix the context, e.g., "guile-module". -

      20.2 Using the SCM or GH Guile API

      +

      19.2 Using the SCM or GH Guile API

      The guile module can currently export wrapper files that use the guile GH interface or the @@ -103,7 +103,7 @@ for the specific API. Currently only the guile language module has created a ma but there is no reason other languages (like mzscheme or chicken) couldn't also use this. If that happens, there is A LOT less code duplication in the standard typemaps.

      -

      20.3 Linkage

      +

      19.3 Linkage

      @@ -111,7 +111,7 @@ Guile support is complicated by a lack of user community cohesiveness, which manifests in multiple shared-library usage conventions. A set of policies implementing a usage convention is called a linkage. -

      20.3.1 Simple Linkage

      +

      19.3.1 Simple Linkage

      @@ -206,7 +206,7 @@ placed between the define-module form and the SWIG_init via a preprocessor define to avoid symbol clashes. For this case, however, passive linkage is available. -

      20.3.2 Passive Linkage

      +

      19.3.2 Passive Linkage

      Passive linkage is just like simple linkage, but it generates an @@ -216,7 +216,7 @@ package name (see below).

      You should use passive linkage rather than simple linkage when you are using multiple modules. -

      20.3.3 Native Guile Module Linkage

      +

      19.3.3 Native Guile Module Linkage

      SWIG can also generate wrapper code that does all the Guile module @@ -257,7 +257,7 @@ Newer Guile versions have a shorthand procedure for this:

    -

    20.3.4 Old Auto-Loading Guile Module Linkage

    +

    19.3.4 Old Auto-Loading Guile Module Linkage

    Guile used to support an autoloading facility for object-code @@ -283,7 +283,7 @@ option, SWIG generates an exported module initialization function with an appropriate name. -

    20.3.5 Hobbit4D Linkage

    +

    19.3.5 Hobbit4D Linkage

    @@ -308,7 +308,7 @@ my/lib/libfoo.so.X.Y.Z and friends. This scheme is still very experimental; the (hobbit4d link) conventions are not well understood.

    -

    20.4 Underscore Folding

    +

    19.4 Underscore Folding

    @@ -320,7 +320,7 @@ complained so far. %rename to specify the Guile name of the wrapped functions and variables (see CHANGES). -

    20.5 Typemaps

    +

    19.5 Typemaps

    @@ -412,7 +412,7 @@ constant will appear as a scheme variable. See Features and the %feature directive for info on how to apply the %feature.

    -

    20.6 Representation of pointers as smobs

    +

    19.6 Representation of pointers as smobs

    @@ -433,7 +433,7 @@ representing the expected pointer type. See also If the Scheme object passed was not a SWIG smob representing a compatible pointer, a wrong-type-arg exception is raised. -

    20.6.1 GH Smobs

    +

    19.6.1 GH Smobs

    @@ -462,7 +462,7 @@ that created them, so the first module we check will most likely be correct. Once we have a swig_type_info structure, we loop through the linked list of casts, using pointer comparisons.

    -

    20.6.2 SCM Smobs

    +

    19.6.2 SCM Smobs

    The SCM interface (using the "-scm" argument to swig) uses swigrun.swg. @@ -477,7 +477,7 @@ in the smob tag. If a generated GOOPS module has been loaded, smobs will be wra GOOPS class.

    -

    20.6.3 Garbage Collection

    +

    19.6.3 Garbage Collection

    Garbage collection is a feature of the new SCM interface, and it is automatically included @@ -491,7 +491,7 @@ is exactly like described in Object ownership and %newobject in the SWIG manual. All typemaps use an $owner var, and the guile module replaces $owner with 0 or 1 depending on feature:new.

    -

    20.7 Exception Handling

    +

    19.7 Exception Handling

    @@ -517,7 +517,7 @@ mapping: The default when not specified here is to use "swig-error". See Lib/exception.i for details. -

    20.8 Procedure documentation

    +

    19.8 Procedure documentation

    If invoked with the command-line option -procdoc @@ -553,7 +553,7 @@ like this: typemap argument doc. See Lib/guile/typemaps.i for details. -

    20.9 Procedures with setters

    +

    19.9 Procedures with setters

    For global variables, SWIG creates a single wrapper procedure @@ -581,7 +581,7 @@ struct members, the procedures (struct-member-get pointer) and (struct-member-set pointer value) are not generated. -

    20.10 GOOPS Proxy Classes

    +

    19.10 GOOPS Proxy Classes

    SWIG can also generate classes and generic functions for use with @@ -730,7 +730,7 @@ Notice that <Foo> is used before it is defined. The fix is to just put th %import "foo.h" before the %inline block.

    -

    20.10.1 Naming Issues

    +

    19.10.1 Naming Issues

    As you can see in the example above, there are potential naming conflicts. The default exported @@ -769,7 +769,7 @@ guile-modules. For example,

    TODO: Renaming class name prefixes?

    -

    20.10.2 Linking

    +

    19.10.2 Linking

    The guile-modules generated above all need to be linked together. GOOPS support requires diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 4b8993184..164fc21e7 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -5,7 +5,7 @@ -

    21 SWIG and Java

    +

    20 SWIG and Java

      @@ -154,7 +154,7 @@ It covers most SWIG features, but certain low-level details are covered in less

      -

      21.1 Overview

      +

      20.1 Overview

      @@ -189,7 +189,7 @@ Various customisation tips and techniques using SWIG directives are covered. The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.

      -

      21.2 Preliminaries

      +

      20.2 Preliminaries

      @@ -205,7 +205,7 @@ Run make -k check from the SWIG root directory after installing SWIG on The Java module requires your system to support shared libraries and dynamic loading. This is the commonly used method to load JNI code so your system will more than likely support this.

      -

      21.2.1 Running SWIG

      +

      20.2.1 Running SWIG

      @@ -258,7 +258,7 @@ The following sections have further practical examples and details on how you mi compiling and using the generated files.

      -

      21.2.2 Additional Commandline Options

      +

      20.2.2 Additional Commandline Options

      @@ -295,7 +295,7 @@ swig -java -help Their use will become clearer by the time you have finished reading this section on SWIG and Java.

      -

      21.2.3 Getting the right header files

      +

      20.2.3 Getting the right header files

      @@ -310,7 +310,7 @@ They are usually in directories like this:

      The exact location may vary on your machine, but the above locations are typical.

      -

      21.2.4 Compiling a dynamic module

      +

      20.2.4 Compiling a dynamic module

      @@ -346,7 +346,7 @@ The name of the shared library output file is important. If the name of your SWIG module is "example", the name of the corresponding shared library file should be "libexample.so" (or equivalent depending on your machine, see Dynamic linking problems for more information). The name of the module is specified using the %module directive or -module command line option.

      -

      21.2.5 Using your module

      +

      20.2.5 Using your module

      @@ -381,7 +381,7 @@ $ If it doesn't work have a look at the following section which discusses problems loading the shared library.

      -

      21.2.6 Dynamic linking problems

      +

      20.2.6 Dynamic linking problems

      @@ -455,7 +455,7 @@ The following section also contains some C++ specific linking problems and solut

      -

      21.2.7 Compilation problems and compiling with C++

      +

      20.2.7 Compilation problems and compiling with C++

      @@ -508,7 +508,7 @@ Finally make sure the version of JDK header files matches the version of Java th

      -

      21.2.8 Building on Windows

      +

      20.2.8 Building on Windows

      @@ -517,7 +517,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine. This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers. In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.

      -

      21.2.8.1 Running SWIG from Visual Studio

      +

      20.2.8.1 Running SWIG from Visual Studio

      @@ -556,7 +556,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa If the library fails to load have a look at Dynamic linking problems.

      -

      21.2.8.2 Using NMAKE

      +

      20.2.8.2 Using NMAKE

      @@ -615,7 +615,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -

      -

      21.3 A tour of basic C/C++ wrapping

      +

      20.3 A tour of basic C/C++ wrapping

      @@ -625,7 +625,7 @@ variables are wrapped with JavaBean type getters and setters and so forth. This section briefly covers the essential aspects of this wrapping.

      -

      21.3.1 Modules, packages and generated Java classes

      +

      20.3.1 Modules, packages and generated Java classes

      @@ -659,7 +659,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i SWIG won't create the directory, so make sure it exists beforehand. -

      21.3.2 Functions

      +

      20.3.2 Functions

      @@ -693,7 +693,7 @@ System.out.println(example.fact(4));

    -

    21.3.3 Global variables

    +

    20.3.3 Global variables

    @@ -780,7 +780,7 @@ extern char *path; // Read-only (due to %immutable) -

    21.3.4 Constants

    +

    20.3.4 Constants

    @@ -920,7 +920,7 @@ Or if you decide this practice isn't so bad and your own class implements ex

    -

    21.3.5 Enumerations

    +

    20.3.5 Enumerations

    @@ -934,7 +934,7 @@ The final two approaches use simple integers for each enum item. Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.

    -

    21.3.5.1 Anonymous enums

    +

    20.3.5.1 Anonymous enums

    @@ -997,7 +997,7 @@ As in the case of constants, you can access them through either the module class

    -

    21.3.5.2 Typesafe enums

    +

    20.3.5.2 Typesafe enums

    @@ -1090,7 +1090,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit The following section details proper Java enum generation.

    -

    21.3.5.3 Proper Java enums

    +

    20.3.5.3 Proper Java enums

    @@ -1143,7 +1143,7 @@ The additional support methods need not be generated if none of the enum items h Simpler Java enums for enums without initializers section.

    -

    21.3.5.4 Type unsafe enums

    +

    20.3.5.4 Type unsafe enums

    @@ -1191,7 +1191,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.

    -

    21.3.5.5 Simple enums

    +

    20.3.5.5 Simple enums

    @@ -1210,7 +1210,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach. The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.

    -

    21.3.6 Pointers

    +

    20.3.6 Pointers

    @@ -1298,7 +1298,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return a NULL pointer if the conversion can't be performed.

    -

    21.3.7 Structures

    +

    20.3.7 Structures

    @@ -1466,7 +1466,7 @@ x.setA(3); // Modify x.a - this is the same as b.f.a -

    21.3.8 C++ classes

    +

    20.3.8 C++ classes

    @@ -1529,7 +1529,7 @@ int bar = Spam.getBar(); -

    21.3.9 C++ inheritance

    +

    20.3.9 C++ inheritance

    @@ -1590,7 +1590,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance A warning is given when multiple inheritance is detected and only the first base class is used.

    -

    21.3.10 Pointers, references, arrays and pass by value

    +

    20.3.10 Pointers, references, arrays and pass by value

    @@ -1645,7 +1645,7 @@ to hold the result and a pointer is returned (Java will release this memory when the returned object's finalizer is run by the garbage collector).

    -

    21.3.10.1 Null pointers

    +

    20.3.10.1 Null pointers

    @@ -1669,7 +1669,7 @@ For spam1 and spam4 above the Java null gets translat The converse also occurs, that is, NULL pointers are translated into null Java objects when returned from a C/C++ function.

    -

    21.3.11 C++ overloaded functions

    +

    20.3.11 C++ overloaded functions

    @@ -1784,7 +1784,7 @@ void spam(unsigned short); // Ignored -

    21.3.12 C++ default arguments

    +

    20.3.12 C++ default arguments

    @@ -1827,7 +1827,7 @@ Further details on default arguments and how to restore this approach are given

    -

    21.3.13 C++ namespaces

    +

    20.3.13 C++ namespaces

    @@ -1887,7 +1887,7 @@ symbols separate, consider wrapping them as separate SWIG modules. Each SWIG module can be placed into a separate package.

    -

    21.3.14 C++ templates

    +

    20.3.14 C++ templates

    @@ -1936,7 +1936,7 @@ Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter.

    -

    21.3.15 C++ Smart Pointers

    +

    20.3.15 C++ Smart Pointers

    @@ -2020,7 +2020,7 @@ Foo f = p.__deref__(); // Returns underlying Foo * -

    21.4 Further details on the generated Java classes

    +

    20.4 Further details on the generated Java classes

    @@ -2035,7 +2035,7 @@ Finally enum classes are covered. First, the crucial intermediary JNI class is considered.

    -

    21.4.1 The intermediary JNI class

    +

    20.4.1 The intermediary JNI class

    @@ -2155,7 +2155,7 @@ If name is the same as modulename then the module class name g from modulename to modulenameModule.

    -

    21.4.1.1 The intermediary JNI class pragmas

    +

    20.4.1.1 The intermediary JNI class pragmas

    @@ -2234,7 +2234,7 @@ For example, let's change the intermediary JNI class access to public. All the methods in the intermediary JNI class will then be callable outside of the package as the method modifiers are public by default.

    -

    21.4.2 The Java module class

    +

    20.4.2 The Java module class

    @@ -2265,7 +2265,7 @@ example.egg(new Foo()); The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a Foo can be passed to the egg function, whereas any long can be passed to the egg function in the intermediary JNI class.

    -

    21.4.2.1 The Java module class pragmas

    +

    20.4.2.1 The Java module class pragmas

    @@ -2316,7 +2316,7 @@ See The intermediary JNI class pragmas section fo

    -

    21.4.3 Java proxy classes

    +

    20.4.3 Java proxy classes

    @@ -2392,7 +2392,7 @@ int y = f.spam(5, new Foo()); -

    21.4.3.1 Memory management

    +

    20.4.3.1 Memory management

    @@ -2554,7 +2554,7 @@ and

    -

    21.4.3.2 Inheritance

    +

    20.4.3.2 Inheritance

    @@ -2670,7 +2670,7 @@ However, true cross language polymorphism can be achieved using the 21.4.3.3 Proxy classes and garbage collection +

    20.4.3.3 Proxy classes and garbage collection

    @@ -2753,7 +2753,7 @@ The section on Java typemaps details how to specify See the How to Handle Java Finalization's Memory-Retention Issues article for alternative approaches to managing memory by avoiding finalizers altogether.

    -

    21.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    +

    20.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    @@ -2871,7 +2871,7 @@ For example: Compatibility note: The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.

    -

    21.4.3.5 Single threaded applications and thread safety

    +

    20.4.3.5 Single threaded applications and thread safety

    @@ -2959,7 +2959,7 @@ for (int i=0; i<100000; i++) { -

    21.4.4 Type wrapper classes

    +

    20.4.4 Type wrapper classes

    @@ -3046,7 +3046,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... } -

    21.4.5 Enum classes

    +

    20.4.5 Enum classes

    @@ -3055,7 +3055,7 @@ The Enumerations section discussed these but omitted The following sub-sections detail the various types of enum classes that can be generated.

    -

    21.4.5.1 Typesafe enum classes

    +

    20.4.5.1 Typesafe enum classes

    @@ -3139,7 +3139,7 @@ The swigValue method is used for marshalling in the other direction. The toString method is overridden so that the enum name is available.

    -

    21.4.5.2 Proper Java enum classes

    +

    20.4.5.2 Proper Java enum classes

    @@ -3217,7 +3217,7 @@ These needn't be generated if the enum being wrapped does not have any initializ Simpler Java enums for enums without initializers section describes how typemaps can be used to achieve this.

    -

    21.4.5.3 Type unsafe enum classes

    +

    20.4.5.3 Type unsafe enum classes

    @@ -3248,7 +3248,7 @@ public final class Beverage { -

    21.5 Cross language polymorphism using directors

    +

    20.5 Cross language polymorphism using directors

    @@ -3270,7 +3270,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.

    -

    21.5.1 Enabling directors

    +

    20.5.1 Enabling directors

    @@ -3341,7 +3341,7 @@ public: -

    21.5.2 Director classes

    +

    20.5.2 Director classes

    @@ -3368,7 +3368,7 @@ If the correct implementation is in Java, the Java API is used to call the metho

    -

    21.5.3 Overhead and code bloat

    +

    20.5.3 Overhead and code bloat

    @@ -3386,7 +3386,7 @@ This situation can be optimized by selectively enabling director methods (using

    -

    21.5.4 Simple directors example

    +

    20.5.4 Simple directors example

    @@ -3451,7 +3451,7 @@ DirectorDerived::upcall_method() invoked. -

    21.5.5 Director threading issues

    +

    20.5.5 Director threading issues

    @@ -3471,7 +3471,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern -

    21.6 Accessing protected members

    +

    20.6 Accessing protected members

    @@ -3567,7 +3567,7 @@ class MyProtectedBase extends ProtectedBase -

    21.7 Common customization features

    +

    20.7 Common customization features

    @@ -3579,7 +3579,7 @@ be awkward. This section describes some common SWIG features that are used to improve the interface to existing C/C++ code.

    -

    21.7.1 C/C++ helper functions

    +

    20.7.1 C/C++ helper functions

    @@ -3645,7 +3645,7 @@ hard to implement. It is possible to improve on this using Java code, typemaps, customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.

    -

    21.7.2 Class extension with %extend

    +

    20.7.2 Class extension with %extend

    @@ -3708,7 +3708,7 @@ Vector(2,3,4) in any way---the extensions only show up in the Java interface.

    -

    21.7.3 Exception handling with %exception and %javaexception

    +

    20.7.3 Exception handling with %exception and %javaexception

    @@ -3865,7 +3865,7 @@ to raise exceptions. See the SWIG Library ch The typemap example Handling C++ exception specifications as Java exceptions provides further exception handling capabilities.

    -

    21.7.4 Method access with %javamethodmodifiers

    +

    20.7.4 Method access with %javamethodmodifiers

    @@ -3891,7 +3891,7 @@ protected static void protect_me() { -

    21.8 Tips and techniques

    +

    20.8 Tips and techniques

    @@ -3901,7 +3901,7 @@ strings and arrays. This chapter discusses the common techniques for solving these problems.

    -

    21.8.1 Input and output parameters using primitive pointers and references

    +

    20.8.1 Input and output parameters using primitive pointers and references

    @@ -4075,7 +4075,7 @@ void foo(Bar *OUTPUT); will not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

    -

    21.8.2 Simple pointers

    +

    20.8.2 Simple pointers

    @@ -4141,7 +4141,7 @@ System.out.println("3 + 4 = " + result); See the SWIG Library chapter for further details.

    -

    21.8.3 Wrapping C arrays with Java arrays

    +

    20.8.3 Wrapping C arrays with Java arrays

    @@ -4208,7 +4208,7 @@ Please be aware that the typemaps in this library are not efficient as all the e There is an alternative approach using the SWIG array library and this is covered in the next section.

    -

    21.8.4 Unbounded C Arrays

    +

    20.8.4 Unbounded C Arrays

    @@ -4353,7 +4353,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

    -

    21.8.5 Overriding new and delete to allocate from Java heap

    +

    20.8.5 Overriding new and delete to allocate from Java heap

    @@ -4470,7 +4470,7 @@ model and use these functions in place of malloc and free in your own code.

    -

    21.9 Java typemaps

    +

    20.9 Java typemaps

    @@ -4491,7 +4491,7 @@ Before proceeding, it should be stressed that typemaps are not a required part of using SWIG---the default wrapping behavior is enough in most cases. Typemaps are only used if you want to change some aspect of the generated code. -

    21.9.1 Default primitive type mappings

    +

    20.9.1 Default primitive type mappings

    @@ -4643,7 +4643,7 @@ However, the mappings allow the full range of values for each C type from Java.

    -

    21.9.2 Default typemaps for non-primitive types

    +

    20.9.2 Default typemaps for non-primitive types

    @@ -4658,7 +4658,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit The Java type is either the proxy class or type wrapper class.

    -

    21.9.3 Sixty four bit JVMs

    +

    20.9.3 Sixty four bit JVMs

    @@ -4671,7 +4671,7 @@ Unfortunately it won't of course hold true for JNI code.

    -

    21.9.4 What is a typemap?

    +

    20.9.4 What is a typemap?

    @@ -4794,7 +4794,7 @@ int c = example.count('e',"Hello World"); -

    21.9.5 Typemaps for mapping C/C++ types to Java types

    +

    20.9.5 Typemaps for mapping C/C++ types to Java types

    @@ -5054,7 +5054,7 @@ These are listed below: -

    21.9.6 Java typemap attributes

    +

    20.9.6 Java typemap attributes

    @@ -5100,7 +5100,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes. Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a this call. In Java the this call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a Date marshalling example showing 'pre', 'post' and 'pgcppname' attributes in action.

    -

    21.9.7 Java special variables

    +

    20.9.7 Java special variables

    @@ -5243,7 +5243,7 @@ This special variable expands to the intermediary class name. Usually this is th unless the jniclassname attribute is specified in the %module directive.

    -

    21.9.8 Typemaps for both C and C++ compilation

    +

    20.9.8 Typemaps for both C and C++ compilation

    @@ -5280,7 +5280,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps

    -

    21.9.9 Java code typemaps

    +

    20.9.9 Java code typemaps

    @@ -5476,7 +5476,7 @@ For the typemap to be used in all type wrapper classes, all the different types Again this is the same that is in "java.swg", barring the method modifier for getCPtr.

    -

    21.9.10 Director specific typemaps

    +

    20.9.10 Director specific typemaps

    @@ -5701,7 +5701,7 @@ The basic strategy here is to provide a default package typemap for the majority -

    21.10 Typemap Examples

    +

    20.10 Typemap Examples

    @@ -5711,7 +5711,7 @@ the SWIG library.

    -

    21.10.1 Simpler Java enums for enums without initializers

    +

    20.10.1 Simpler Java enums for enums without initializers

    @@ -5790,7 +5790,7 @@ This would be done by using the original versions of these typemaps in "enums.sw

    -

    21.10.2 Handling C++ exception specifications as Java exceptions

    +

    20.10.2 Handling C++ exception specifications as Java exceptions

    @@ -5915,7 +5915,7 @@ We could alternatively have used %rename to rename what() into

    -

    21.10.3 NaN Exception - exception handling for a particular type

    +

    20.10.3 NaN Exception - exception handling for a particular type

    @@ -6070,7 +6070,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.

    -

    21.10.4 Converting Java String arrays to char **

    +

    20.10.4 Converting Java String arrays to char **

    @@ -6214,7 +6214,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify what Java types to use.

    -

    21.10.5 Expanding a Java object to multiple arguments

    +

    20.10.5 Expanding a Java object to multiple arguments

    @@ -6296,7 +6296,7 @@ example.foo(new String[]{"red", "green", "blue", "white"}); -

    21.10.6 Using typemaps to return arguments

    +

    20.10.6 Using typemaps to return arguments

    @@ -6414,7 +6414,7 @@ $ java main 1 12.0 340.0 -

    21.10.7 Adding Java downcasts to polymorphic return types

    +

    20.10.7 Adding Java downcasts to polymorphic return types

    @@ -6620,7 +6620,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.

    -

    21.10.8 Adding an equals method to the Java classes

    +

    20.10.8 Adding an equals method to the Java classes

    @@ -6664,7 +6664,7 @@ System.out.println("foo1? " + foo1.equals(foo2)); -

    21.10.9 Void pointers and a common Java base class

    +

    20.10.9 Void pointers and a common Java base class

    @@ -6723,7 +6723,7 @@ This example contains some useful functionality which you may want in your code.

  • It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer. -

    21.10.10 Struct pointer to pointer

    +

    20.10.10 Struct pointer to pointer

    @@ -6903,7 +6903,7 @@ The C functional interface has been completely morphed into an object-oriented i the Butler class would behave much like any pure Java class and feel more natural to Java users.

    -

    21.10.11 Memory management when returning references to member variables

    +

    20.10.11 Memory management when returning references to member variables

    @@ -7026,7 +7026,7 @@ public class Bike { Note the addReference call.

    -

    21.10.12 Memory management for objects passed to the C++ layer

    +

    20.10.12 Memory management for objects passed to the C++ layer

    @@ -7142,7 +7142,7 @@ The 'javacode' typemap simply adds in the specified code into the Java proxy cla -

    21.10.13 Date marshalling using the javain typemap and associated attributes

    +

    20.10.13 Date marshalling using the javain typemap and associated attributes

    @@ -7319,7 +7319,7 @@ A few things to note: -

    21.11 Living with Java Directors

    +

    20.11 Living with Java Directors

    @@ -7500,10 +7500,10 @@ public abstract class UserVisibleFoo extends Foo {

    • -

    21.12 Odds and ends

    +

    20.12 Odds and ends

    -

    21.12.1 JavaDoc comments

    +

    20.12.1 JavaDoc comments

    @@ -7559,7 +7559,7 @@ public class Barmy { -

    21.12.2 Functional interface without proxy classes

    +

    20.12.2 Functional interface without proxy classes

    @@ -7620,7 +7620,7 @@ All destructors have to be called manually for example the delete_Foo(foo) -

    21.12.3 Using your own JNI functions

    +

    20.12.3 Using your own JNI functions

    @@ -7670,7 +7670,7 @@ This directive is only really useful if you want to mix your own hand crafted JN

    -

    21.12.4 Performance concerns and hints

    +

    20.12.4 Performance concerns and hints

    @@ -7691,7 +7691,7 @@ However, you will have to be careful about memory management and make sure that This method normally calls the C++ destructor or free() for C code.

    -

    21.12.5 Debugging

    +

    20.12.5 Debugging

    @@ -7713,7 +7713,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh

    -

    21.13 Examples

    +

    20.13 Examples

    diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html index 14abead00..ca2d0414e 100644 --- a/Doc/Manual/Lisp.html +++ b/Doc/Manual/Lisp.html @@ -6,7 +6,7 @@ -

    22 SWIG and Common Lisp

    +

    21 SWIG and Common Lisp

      @@ -41,7 +41,7 @@ Lisp, Common Foreign Function Interface(CFFI), CLisp and UFFI foreign function interfaces.

      -

      22.1 Allegro Common Lisp

      +

      21.1 Allegro Common Lisp

      @@ -50,7 +50,7 @@ here

      -

      22.2 Common Foreign Function Interface(CFFI)

      +

      21.2 Common Foreign Function Interface(CFFI)

      @@ -77,7 +77,7 @@ swig -cffi -module module-name file-name files and the various things which you can do with them.

      -

      22.2.1 Additional Commandline Options

      +

      21.2.1 Additional Commandline Options

      @@ -118,7 +118,7 @@ swig -cffi -help -

      22.2.2 Generating CFFI bindings

      +

      21.2.2 Generating CFFI bindings

      As we mentioned earlier the ideal way to use SWIG is to use interface @@ -392,7 +392,7 @@ The feature intern_function ensures that all C names are
    -

    22.2.3 Generating CFFI bindings for C++ code

    +

    21.2.3 Generating CFFI bindings for C++ code

    This feature to SWIG (for CFFI) is very new and still far from @@ -568,7 +568,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI module feel free to contact us on the SWIG mailing list, and also please add a "[CFFI]" tag in the subject line. -

    22.2.4 Inserting user code into generated files

    +

    21.2.4 Inserting user code into generated files

    @@ -608,7 +608,7 @@ Note that the block %{ ... %} is effectively a shortcut for

    -

    22.3 CLISP

    +

    21.3 CLISP

    @@ -638,7 +638,7 @@ swig -clisp -module module-name file-name interface file for the CLISP module. The CLISP module tries to produce code which is both human readable and easily modifyable.

    -

    22.3.1 Additional Commandline Options

    +

    21.3.1 Additional Commandline Options

    @@ -671,7 +671,7 @@ and global variables will be created otherwise only definitions for
    -

    22.3.2 Details on CLISP bindings

    +

    21.3.2 Details on CLISP bindings

    @@ -795,7 +795,7 @@ struct bar { -

    22.4 UFFI

    +

    21.4 UFFI

    diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index 99c7c9a3c..4ebf02349 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -6,7 +6,7 @@ -

    23 SWIG and Lua

    +

    22 SWIG and Lua

      @@ -52,13 +52,13 @@

      Lua is an extension programming language designed to support general procedural programming with data description facilities. It also offers good support for object-oriented programming, functional programming, and data-driven programming. Lua is intended to be used as a powerful, light-weight configuration language for any program that needs one. Lua is implemented as a library, written in clean C (that is, in the common subset of ANSI C and C++). Its also a really tiny language, less than 6000 lines of code, which compiles to <100 kilobytes of binary code. It can be found at http://www.lua.org

      -

      23.1 Preliminaries

      +

      22.1 Preliminaries

      The current SWIG implementation is designed to work with Lua 5.0.x and Lua 5.1.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. ((Currently SWIG generated code has only been tested on Windows with MingW, though given the nature of Lua, is should not have problems on other OS's)). It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms).

      -

      23.2 Running SWIG

      +

      22.2 Running SWIG

      @@ -90,7 +90,7 @@ This creates a C/C++ source file example_wrap.c or example_wrap.cxx

      The name of the wrapper file is derived from the name of the input file. For example, if the input file is example.i, the name of the wrapper file is example_wrap.c. To change this, you can use the -o option. The wrappered module will export one function "int luaopen_example(lua_State* L)" which must be called to register the module with the Lua interpreter. The name "luaopen_example" depends upon the name of the module.

      -

      23.2.1 Compiling and Linking and Interpreter

      +

      22.2.1 Compiling and Linking and Interpreter

      @@ -137,7 +137,7 @@ $ gcc -c example.c -o example.o $ gcc -I/usr/include/lua -L/usr/lib/lua min.o example_wrap.o example.o -o my_lua

    -

    23.2.2 Compiling a dynamic module

    +

    22.2.2 Compiling a dynamic module

    @@ -205,7 +205,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib -

    23.2.3 Using your module

    +

    22.2.3 Using your module

    @@ -223,19 +223,19 @@ $ ./my_lua > -

    23.3 A tour of basic C/C++ wrapping

    +

    22.3 A tour of basic C/C++ wrapping

    By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.

    -

    23.3.1 Modules

    +

    22.3.1 Modules

    The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.

    -

    23.3.2 Functions

    +

    22.3.2 Functions

    @@ -273,7 +273,7 @@ It is also possible to rename the module with an assignment. 24 -

    23.3.3 Global variables

    +

    22.3.3 Global variables

    @@ -347,7 +347,7 @@ nil 3.142 -

    23.3.4 Constants and enums

    +

    22.3.4 Constants and enums

    @@ -370,7 +370,7 @@ example.SUNDAY=0

    Constants are not guaranteed to remain constant in Lua. The name of the constant could be accidentally reassigned to refer to some other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

    -

    23.3.5 Pointers

    +

    22.3.5 Pointers

    @@ -408,7 +408,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor nil -

    23.3.6 Structures

    +

    22.3.6 Structures

    @@ -494,7 +494,7 @@ Because the pointer points inside the structure, you can modify the contents and > x.a = 3 -- Modifies the same structure -

    23.3.7 C++ classes

    +

    22.3.7 C++ classes

    @@ -555,7 +555,7 @@ It is not (currently) possible to access static members of an instance: -- does NOT work -

    23.3.8 C++ inheritance

    +

    22.3.8 C++ inheritance

    @@ -580,7 +580,7 @@ then the function spam() accepts a Foo pointer or a pointer to any clas

    It is safe to use multiple inheritance with SWIG.

    -

    23.3.9 Pointers, references, values, and arrays

    +

    22.3.9 Pointers, references, values, and arrays

    @@ -611,7 +611,7 @@ Foo spam7();

    then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.

    -

    23.3.10 C++ overloaded functions

    +

    22.3.10 C++ overloaded functions

    @@ -697,7 +697,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin

    Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.

    -

    23.3.11 C++ operators

    +

    22.3.11 C++ operators

    @@ -809,7 +809,7 @@ It is also possible to overload the operator[], but currently this cann }; -

    23.3.12 Class extension with %extend

    +

    22.3.12 Class extension with %extend

    @@ -864,7 +864,7 @@ true

    Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).

    -

    23.3.13 C++ templates

    +

    22.3.13 C++ templates

    @@ -899,7 +899,7 @@ In Lua:

    Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.

    -

    23.3.14 C++ Smart Pointers

    +

    22.3.14 C++ Smart Pointers

    @@ -951,7 +951,7 @@ If you ever need to access the underlying pointer returned by operator->( > f = p:__deref__() -- Returns underlying Foo * -

    23.3.15 C++ Exceptions

    +

    22.3.15 C++ Exceptions

    @@ -1098,7 +1098,7 @@ add exception specification to functions or globally (respectively).

    -

    23.3.16 Writing your own custom wrappers

    +

    22.3.16 Writing your own custom wrappers

    @@ -1117,7 +1117,7 @@ int native_function(lua_State*L) // my native code The %native directive in the above example, tells SWIG that there is a function int native_function(lua_State*L); which is to be added into the module under the name 'my_func'. SWIG will not add any wrappering for this function, beyond adding it into the function table. How you write your code is entirely up to you.

    -

    23.3.17 Adding additional Lua code

    +

    22.3.17 Adding additional Lua code

    @@ -1155,7 +1155,7 @@ Good uses for this feature is adding of new code, or writing helper functions to See Examples/lua/arrays for an example of this code.

    -

    23.4 Details on the Lua binding

    +

    22.4 Details on the Lua binding

    @@ -1166,7 +1166,7 @@ See Examples/lua/arrays for an example of this code.

    -

    23.4.1 Binding global data into the module.

    +

    22.4.1 Binding global data into the module.

    @@ -1226,7 +1226,7 @@ end

    That way when you call 'a=example.Foo', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code 'example.Foo=10', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.

    -

    23.4.2 Userdata and Metatables

    +

    22.4.2 Userdata and Metatables

    @@ -1306,7 +1306,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrappered classes/s

    Note: Operator overloads are basically done in the same way, by adding functions such as '__add' & '__call' to the classes metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.

    -

    23.4.3 Memory management

    +

    22.4.3 Memory management

    diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html index 7a6bacd34..ff70fc143 100644 --- a/Doc/Manual/Modula3.html +++ b/Doc/Manual/Modula3.html @@ -5,7 +5,7 @@ -

    24 SWIG and Modula-3

    +

    23 SWIG and Modula-3

      @@ -57,7 +57,7 @@ especially typemaps.

      -

      24.1 Overview

      +

      23.1 Overview

      @@ -90,7 +90,7 @@ So the introduction got a bit longer than it should ... ;-)

      -

      24.1.1 Why not scripting ?

      +

      23.1.1 Why not scripting ?

      @@ -126,7 +126,7 @@ are not advantages of the language itself but can be provided by function libraries.

      -

      24.1.2 Why Modula-3 ?

      +

      23.1.2 Why Modula-3 ?

      @@ -166,7 +166,7 @@ it's statically typed, too.

      -

      24.1.3 Why C / C++ ?

      +

      23.1.3 Why C / C++ ?

      @@ -179,7 +179,7 @@ Even more fortunately even non-C libraries may provide C header files. This is where SWIG becomes helpful.

      -

      24.1.4 Why SWIG ?

      +

      23.1.4 Why SWIG ?

      @@ -252,10 +252,10 @@ integrate Modula-3 code into a C / C++ project.

      -

      24.2 Conception

      +

      23.2 Conception

      -

      24.2.1 Interfaces to C libraries

      +

      23.2.1 Interfaces to C libraries

      @@ -404,7 +404,7 @@ and the principal type must be renamed (%typemap).

      -

      24.2.2 Interfaces to C++ libraries

      +

      23.2.2 Interfaces to C++ libraries

      @@ -505,10 +505,10 @@ There is no C++ library I wrote a SWIG interface for, so I'm not sure if this is possible or sensible, yet.

      -

      24.3 Preliminaries

      +

      23.3 Preliminaries

      -

      24.3.1 Compilers

      +

      23.3.1 Compilers

      @@ -522,7 +522,7 @@ For testing examples I use Critical Mass cm3.

      -

      24.3.2 Additional Commandline Options

      +

      23.3.2 Additional Commandline Options

      @@ -599,10 +599,10 @@ Instead generate templates for some basic typemaps. -

      24.4 Modula-3 typemaps

      +

      23.4 Modula-3 typemaps

      -

      24.4.1 Inputs and outputs

      +

      23.4.1 Inputs and outputs

      @@ -818,7 +818,7 @@ consist of the following parts: -

      24.4.2 Subranges, Enumerations, Sets

      +

      23.4.2 Subranges, Enumerations, Sets

      @@ -870,7 +870,7 @@ that I'd like to automate.

      -

      24.4.3 Objects

      +

      23.4.3 Objects

      @@ -883,7 +883,7 @@ is not really useful, yet.

      -

      24.4.4 Imports

      +

      23.4.4 Imports

      @@ -918,7 +918,7 @@ IMPORT M3toC;

    -

    24.4.5 Exceptions

    +

    23.4.5 Exceptions

    @@ -942,7 +942,7 @@ you should declare %typemap("m3wrapinconv:throws") blah * %{OSError.E%}.

    -

    24.4.6 Example

    +

    23.4.6 Example

    @@ -989,10 +989,10 @@ where almost everything is generated by a typemap: -

    24.5 More hints to the generator

    +

    23.5 More hints to the generator

    -

    24.5.1 Features

    +

    23.5.1 Features

    @@ -1029,7 +1029,7 @@ where almost everything is generated by a typemap:
    -

    24.5.2 Pragmas

    +

    23.5.2 Pragmas

    @@ -1052,7 +1052,7 @@ where almost everything is generated by a typemap:
    -

    24.6 Remarks

    +

    23.6 Remarks

      diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html index 9413bb010..699168322 100644 --- a/Doc/Manual/Mzscheme.html +++ b/Doc/Manual/Mzscheme.html @@ -8,7 +8,7 @@ -

      25 SWIG and MzScheme

      +

      24 SWIG and MzScheme

        @@ -22,7 +22,7 @@

        This section contains information on SWIG's support of MzScheme. -

        25.1 Creating native MzScheme structures

        +

        24.1 Creating native MzScheme structures

        diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html index 6dbf24c11..79ede443f 100644 --- a/Doc/Manual/Ocaml.html +++ b/Doc/Manual/Ocaml.html @@ -6,7 +6,7 @@ -

        26 SWIG and Ocaml

        +

        25 SWIG and Ocaml

          @@ -80,7 +80,7 @@ If you're not familiar with the Objective Caml language, you can visit The Ocaml Website.

          -

          26.1 Preliminaries

          +

          25.1 Preliminaries

          @@ -99,7 +99,7 @@ file Examples/Makefile illustrate how to compile and link SWIG modules that will be loaded dynamically. This has only been tested on Linux so far.

          -

          26.1.1 Running SWIG

          +

          25.1.1 Running SWIG

          @@ -122,7 +122,7 @@ you will compile the file example_wrap.c with ocamlc or the resulting .ml and .mli files as well, and do the final link with -custom (not needed for native link).

          -

          26.1.2 Compiling the code

          +

          25.1.2 Compiling the code

          @@ -158,7 +158,7 @@ the user more freedom with respect to custom typing.

        -

        26.1.3 The camlp4 module

        +

        25.1.3 The camlp4 module

        @@ -234,7 +234,7 @@ let b = C_string (getenv "PATH") -

        26.1.4 Using your module

        +

        25.1.4 Using your module

        @@ -248,7 +248,7 @@ When linking any ocaml bytecode with your module, use the -custom option is not needed when you build native code.

        -

        26.1.5 Compilation problems and compiling with C++

        +

        25.1.5 Compilation problems and compiling with C++

        @@ -259,7 +259,7 @@ liberal with pointer types may not compile under the C++ compiler. Most code meant to be compiled as C++ will not have problems.

        -

        26.2 The low-level Ocaml/C interface

        +

        25.2 The low-level Ocaml/C interface

        @@ -360,7 +360,7 @@ is that you must append them to the return list with swig_result = caml_list_a signature for a function that uses value in this way.

        -

        26.2.1 The generated module

        +

        25.2.1 The generated module

        @@ -394,7 +394,7 @@ it describes the output SWIG will generate for class definitions. -

        26.2.2 Enums

        +

        25.2.2 Enums

        @@ -457,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a

      -

      26.2.2.1 Enum typing in Ocaml

      +

      25.2.2.1 Enum typing in Ocaml

      @@ -470,10 +470,10 @@ functions imported from different modules. You must convert values to master values using the swig_val function before sharing them with another module.

      -

      26.2.3 Arrays

      +

      25.2.3 Arrays

      -

      26.2.3.1 Simple types of bounded arrays

      +

      25.2.3.1 Simple types of bounded arrays

      @@ -494,7 +494,7 @@ arrays of simple types with known bounds in your code, but this only works for arrays whose bounds are completely specified.

      -

      26.2.3.2 Complex and unbounded arrays

      +

      25.2.3.2 Complex and unbounded arrays

      @@ -507,7 +507,7 @@ SWIG can't predict which of these methods will be used in the array, so you have to specify it for yourself in the form of a typemap.

      -

      26.2.3.3 Using an object

      +

      25.2.3.3 Using an object

      @@ -521,7 +521,7 @@ Consider writing an object when the ending condition of your array is complex, such as using a required sentinel, etc.

      -

      26.2.3.4 Example typemap for a function taking float * and int

      +

      25.2.3.4 Example typemap for a function taking float * and int

      @@ -572,7 +572,7 @@ void printfloats( float *tab, int len ); -

      26.2.4 C++ Classes

      +

      25.2.4 C++ Classes

      @@ -615,7 +615,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the returned value for the same object.

      -

      26.2.4.1 STL vector and string Example

      +

      25.2.4.1 STL vector and string Example

      @@ -695,7 +695,7 @@ baz # -

      26.2.4.2 C++ Class Example

      +

      25.2.4.2 C++ Class Example

      @@ -725,7 +725,7 @@ public: }; -

      26.2.4.3 Compiling the example

      +

      25.2.4.3 Compiling the example

      @@ -743,7 +743,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
      -

      26.2.4.4 Sample Session

      +

      25.2.4.4 Sample Session

      @@ -770,10 +770,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.  
 
      
 
-
      26.2.5 Director Classes
      
+
      25.2.5 Director Classes
      
 
 
-
      26.2.5.1 Director Introduction
      
+
      25.2.5.1 Director Introduction
      
 
 
 
      
@@ -800,7 +800,7 @@ class foo {
 };
      -

      26.2.5.2 Overriding Methods in Ocaml

      +

      25.2.5.2 Overriding Methods in Ocaml

      @@ -828,7 +828,7 @@ In this example, I'll examine the objective caml code involved in providing an overloaded class. This example is contained in Examples/ocaml/shapes.

      -

      26.2.5.3 Director Usage Example

      +

      25.2.5.3 Director Usage Example

      @@ -887,7 +887,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the program in C++.

      -

      26.2.5.4 Creating director objects

      +

      25.2.5.4 Creating director objects

      @@ -928,7 +928,7 @@ object from causing a core dump, as long as the object is destroyed properly.

      -

      26.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      +

      25.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      @@ -939,7 +939,7 @@ well as a function return value in the same way you provide function arguments, and to receive arguments the same way you normally receive function returns.

      -

      26.2.5.6 directorin typemap

      +

      25.2.5.6 directorin typemap

      @@ -950,7 +950,7 @@ code receives when you are called. In general, a simple directorin typ can use the same body as a simple out typemap.

      -

      26.2.5.7 directorout typemap

      +

      25.2.5.7 directorout typemap

      @@ -961,7 +961,7 @@ for the same type, except when there are special requirements for object ownership, etc.

      -

      26.2.5.8 directorargout typemap

      +

      25.2.5.8 directorargout typemap

      @@ -978,7 +978,7 @@ In the event that you don't specify all of the necessary values, integral values will read zero, and struct or object returns have undefined results.

      -

      26.2.6 Exceptions

      +

      25.2.6 Exceptions

      diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index 7409d78f1..97e1be17c 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -8,7 +8,7 @@ -

      27 SWIG and Octave

      +

      26 SWIG and Octave

        @@ -54,14 +54,14 @@ More information can be found at www.octave.org< Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).

        -

        27.1 Preliminaries

        +

        26.1 Preliminaries

        The current SWIG implemention is based on Octave 2.9.12. Support for other versions (in particular the recent 3.0) has not been tested, nor has support for any OS other than Linux.

        -

        27.2 Running SWIG

        +

        26.2 Running SWIG

        @@ -89,7 +89,7 @@ This creates a C/C++ source file example_wrap.cxx. The generated C++ so The swig command line has a number of options you can use, like to redirect it's output. Use swig --help to learn about these.

        -

        27.2.1 Compiling a dynamic module

        +

        26.2.1 Compiling a dynamic module

        @@ -116,7 +116,7 @@ $ mkoctfile example_wrap.cxx example.c 

        octave:1> example
        -

        27.2.2 Using your module

        +

        26.2.2 Using your module

        @@ -134,10 +134,10 @@ octave:4> example.cvar.Foo=4; octave:5> example.cvar.Foo ans = 4

      -

      27.3 A tour of basic C/C++ wrapping

      +

      26.3 A tour of basic C/C++ wrapping

      -

      27.3.1 Modules

      +

      26.3.1 Modules

      @@ -179,7 +179,7 @@ One can also rename it by simple assignment, e.g., octave:1> some_vars = cvar; -

      27.3.2 Functions

      +

      26.3.2 Functions

      @@ -196,7 +196,7 @@ int fact(int n); 

      octave:1> example.fact(4)
 24
      -

      27.3.3 Global variables

      +

      26.3.3 Global variables

      @@ -249,7 +249,7 @@ octave:2> example.PI=3.142; octave:3> example.PI ans = 3.1420 -

      27.3.4 Constants and enums

      +

      26.3.4 Constants and enums

      @@ -271,7 +271,7 @@ example.SCONST="Hello World" example.SUNDAY=0 .... -

      27.3.5 Pointers

      +

      26.3.5 Pointers

      @@ -318,7 +318,7 @@ octave:2> f=example.fopen("not there","r"); error: value on right hand side of assignment is undefined error: evaluating assignment expression near line 2, column 2 -

      27.3.6 Structures and C++ classes

      +

      26.3.6 Structures and C++ classes

      @@ -453,7 +453,7 @@ ans = 1 Depending on the ownership setting of a swig_ref, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.

      -

      27.3.7 C++ inheritance

      +

      26.3.7 C++ inheritance

      @@ -462,7 +462,7 @@ This information contains the full class hierarchy. When an indexing operation ( the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the swig_ref.

      -

      27.3.8 C++ overloaded functions

      +

      26.3.8 C++ overloaded functions

      @@ -472,7 +472,7 @@ The dispatch function selects which overload to call (if any) based on the passe typecheck typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.

      -

      27.3.9 C++ operators

      +

      26.3.9 C++ operators

      @@ -572,7 +572,7 @@ On the C++ side, the default mappings are as follows: %rename(__brace) *::operator[]; -

      27.3.10 Class extension with %extend

      +

      26.3.10 Class extension with %extend

      @@ -602,7 +602,7 @@ octave:3> printf("%s\n",a); octave:4> a.__str() 4 -

      27.3.11 C++ templates

      +

      26.3.11 C++ templates

      @@ -679,14 +679,14 @@ ans = -

      27.3.12 C++ Smart Pointers

      +

      26.3.12 C++ Smart Pointers

      C++ smart pointers are fully supported as in other modules.

      -

      27.3.13 Directors (calling Octave from C++ code)

      +

      26.3.13 Directors (calling Octave from C++ code)

      @@ -766,14 +766,14 @@ c-side routine called octave-side routine called -

      27.3.14 Threads

      +

      26.3.14 Threads

      The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.

      -

      27.3.15 Memory management

      +

      26.3.15 Memory management

      @@ -807,14 +807,14 @@ The %newobject directive may be used to control this behavior for pointers retur In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/subclass()'ing).

      -

      27.3.16 STL support

      +

      26.3.16 STL support

      This is some skeleton support for various STL containers.

      -

      27.3.17 Matrix typemaps

      +

      26.3.17 Matrix typemaps

      diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html index 1dc8e7d2f..b7cdaf0e5 100644 --- a/Doc/Manual/Perl5.html +++ b/Doc/Manual/Perl5.html @@ -6,7 +6,7 @@ -

      28 SWIG and Perl5

      +

      27 SWIG and Perl5

        @@ -87,7 +87,7 @@ later. Earlier versions are problematic and SWIG generated extensions may not compile or run correctly.

        -

        28.1 Overview

        +

        27.1 Overview

        @@ -108,7 +108,7 @@ described. Advanced customization features, typemaps, and other options are found near the end of the chapter.

        -

        28.2 Preliminaries

        +

        27.2 Preliminaries

        @@ -133,7 +133,7 @@ To build the module, you will need to compile the file example_wrap.c and link it with the rest of your program.

        -

        28.2.1 Getting the right header files

        +

        27.2.1 Getting the right header files

        @@ -165,7 +165,7 @@ loaded, an easy way to find out is to run Perl itself.

      -

      28.2.2 Compiling a dynamic module

      +

      27.2.2 Compiling a dynamic module

      @@ -198,7 +198,7 @@ the target should be named `example.so', `example.sl', or the appropriate dynamic module name on your system.

      -

      28.2.3 Building a dynamic module with MakeMaker

      +

      27.2.3 Building a dynamic module with MakeMaker

      @@ -232,7 +232,7 @@ the preferred approach to compilation. More information about MakeMaker can be found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen, and Randal Schwartz.

      -

      28.2.4 Building a static version of Perl

      +

      27.2.4 Building a static version of Perl

      @@ -301,7 +301,7 @@ added to it. Depending on your machine, you may need to link with additional libraries such as -lsocket, -lnsl, -ldl, etc.

      -

      28.2.5 Using the module

      +

      27.2.5 Using the module

      @@ -456,7 +456,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      28.2.6 Compilation problems and compiling with C++

      +

      27.2.6 Compilation problems and compiling with C++

      @@ -599,7 +599,7 @@ have to find the macro that conflicts and add an #undef into the .i file. Pleas any conflicting macros you find to swig-user mailing list.

      -

      28.2.7 Compiling for 64-bit platforms

      +

      27.2.7 Compiling for 64-bit platforms

      @@ -626,7 +626,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

      -

      28.3 Building Perl Extensions under Windows

      +

      27.3 Building Perl Extensions under Windows

      @@ -637,7 +637,7 @@ section assumes you are using SWIG with Microsoft Visual C++ although the procedure may be similar with other compilers.

      -

      28.3.1 Running SWIG from Developer Studio

      +

      27.3.1 Running SWIG from Developer Studio

      @@ -700,7 +700,7 @@ print "$a\n"; -

      28.3.2 Using other compilers

      +

      27.3.2 Using other compilers

      @@ -708,7 +708,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows. For general hints and suggestions refer to the Windows chapter.

      -

      28.4 The low-level interface

      +

      27.4 The low-level interface

      @@ -718,7 +718,7 @@ can be used to control your application. However, it is also used to construct more user-friendly proxy classes as described in the next section.

      -

      28.4.1 Functions

      +

      27.4.1 Functions

      @@ -741,7 +741,7 @@ use example; $a = &example::fact(2); -

      28.4.2 Global variables

      +

      27.4.2 Global variables

      @@ -811,7 +811,7 @@ extern char *path; // Declared later in the input -

      28.4.3 Constants

      +

      27.4.3 Constants

      @@ -838,7 +838,7 @@ $example::FOO = 2; # Error -

      28.4.4 Pointers

      +

      27.4.4 Pointers

      @@ -947,7 +947,7 @@ as XS and xsubpp. Given the advancement of the SWIG typesystem and the SWIG and XS, this is no longer supported.

      -

      28.4.5 Structures

      +

      27.4.5 Structures

      @@ -1081,7 +1081,7 @@ void Bar_f_set(Bar *b, Foo *val) { -

      28.4.6 C++ classes

      +

      27.4.6 C++ classes

      @@ -1146,7 +1146,7 @@ provides direct access to C++ objects. A higher level interface using Perl prox can be built using these low-level accessors. This is described shortly.

      -

      28.4.7 C++ classes and type-checking

      +

      27.4.7 C++ classes and type-checking

      @@ -1182,7 +1182,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece multiple inheritance is used).

      -

      28.4.8 C++ overloaded functions

      +

      27.4.8 C++ overloaded functions

      @@ -1226,7 +1226,7 @@ example::Spam_foo_d($s,3.14); Please refer to the "SWIG Basics" chapter for more information.

      -

      28.4.9 Operators

      +

      27.4.9 Operators

      @@ -1253,7 +1253,7 @@ The following C++ operators are currently supported by the Perl module:

    • operator or
      • -

      28.4.10 Modules and packages

      +

      27.4.10 Modules and packages

      @@ -1348,7 +1348,7 @@ print Foo::fact(4),"\n"; # Call a function in package FooBar --> -

      28.5 Input and output parameters

      +

      27.5 Input and output parameters

      @@ -1567,7 +1567,7 @@ print "$c\n"; Note: The REFERENCE feature is only currently supported for numeric types (integers and floating point).

      -

      28.6 Exception handling

      +

      27.6 Exception handling

      @@ -1732,7 +1732,7 @@ This is still supported, but it is deprecated. The newer %exception di functionality, but it has additional capabilities that make it more powerful.

      -

      28.7 Remapping datatypes with typemaps

      +

      27.7 Remapping datatypes with typemaps

      @@ -1749,7 +1749,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Perl interface.

      -

      28.7.1 A simple typemap example

      +

      27.7.1 A simple typemap example

      @@ -1853,7 +1853,7 @@ example::count("e","Hello World"); -

      28.7.2 Perl5 typemaps

      +

      27.7.2 Perl5 typemaps

      @@ -1958,7 +1958,7 @@ Return of C++ member data (all languages). Check value of input parameter. -

      28.7.3 Typemap variables

      +

      27.7.3 Typemap variables

      @@ -2029,7 +2029,7 @@ properly assigned. The Perl name of the wrapper function being created. -

      28.7.4 Useful functions

      +

      27.7.4 Useful functions

      @@ -2098,7 +2098,7 @@ int sv_isa(SV *, char *0; -

      28.8 Typemap Examples

      +

      27.8 Typemap Examples

      @@ -2107,7 +2107,7 @@ might look at the files "perl5.swg" and "typemaps.i" in the SWIG library.

      -

      28.8.1 Converting a Perl5 array to a char **

      +

      27.8.1 Converting a Perl5 array to a char **

      @@ -2199,7 +2199,7 @@ print @$b,"\n"; # Print it out -

      28.8.2 Return values

      +

      27.8.2 Return values

      @@ -2228,7 +2228,7 @@ can be done using the EXTEND() macro as in : } -

      28.8.3 Returning values from arguments

      +

      27.8.3 Returning values from arguments

      @@ -2282,7 +2282,7 @@ print "multout(7,13) = @r\n"; ($x,$y) = multout(7,13); -

      28.8.4 Accessing array structure members

      +

      27.8.4 Accessing array structure members

      @@ -2345,7 +2345,7 @@ the "in" typemap in the previous section would be used to convert an to copy the converted array into a C data structure.

      -

      28.8.5 Turning Perl references into C pointers

      +

      27.8.5 Turning Perl references into C pointers

      @@ -2410,7 +2410,7 @@ print "$c\n"; -

      28.8.6 Pointer handling

      +

      27.8.6 Pointer handling

      @@ -2489,7 +2489,7 @@ For example: -

      28.9 Proxy classes

      +

      27.9 Proxy classes

      @@ -2505,7 +2505,7 @@ to the underlying code. This section describes the implementation details of the proxy interface.

      -

      28.9.1 Preliminaries

      +

      27.9.1 Preliminaries

      @@ -2527,7 +2527,7 @@ SWIG creates a collection of high-level Perl wrappers. In your scripts, you wil high level wrappers. The wrappers, in turn, interact with the low-level procedural module.

      -

      28.9.2 Structure and class wrappers

      +

      27.9.2 Structure and class wrappers

      @@ -2653,7 +2653,7 @@ $v->DESTROY(); -

      28.9.3 Object Ownership

      +

      27.9.3 Object Ownership

      @@ -2740,7 +2740,7 @@ counting, garbage collection, or advanced features one might find in sophisticated languages.

      -

      28.9.4 Nested Objects

      +

      27.9.4 Nested Objects

      @@ -2793,7 +2793,7 @@ $p->{f}->{x} = 0.0; %${$p->{v}} = ( x=>0, y=>0, z=>0); -

      28.9.5 Proxy Functions

      +

      27.9.5 Proxy Functions

      @@ -2827,7 +2827,7 @@ This function replaces the original function, but operates in an identical manner.

      -

      28.9.6 Inheritance

      +

      27.9.6 Inheritance

      @@ -2903,7 +2903,7 @@ particular, inheritance of data members is extremely tricky (and I'm not even sure if it really works).

      -

      28.9.7 Modifying the proxy methods

      +

      27.9.7 Modifying the proxy methods

      @@ -2931,7 +2931,7 @@ public: }; -

      28.10 Adding additional Perl code

      +

      27.10 Adding additional Perl code

      diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index 092bd0423..6b654fde5 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -7,7 +7,7 @@ -

      29 SWIG and PHP

      +

      28 SWIG and PHP

        @@ -67,7 +67,7 @@ your extension into php directly, you will need the complete PHP source tree available.

        -

        29.1 Generating PHP Extensions

        +

        28.1 Generating PHP Extensions

        @@ -114,7 +114,7 @@ this approach, but if you really want to do this, the -phpfull command line argument to swig may be of use - see below for details.

        -

        29.1.1 Building a loadable extension

        +

        28.1.1 Building a loadable extension

        @@ -138,7 +138,7 @@ add them to your Makefile or other build system directly. We recommend that you don't use -make and it's likely to be removed at some point.

        -

        29.1.2 Building extensions into PHP

        +

        28.1.2 Building extensions into PHP

        @@ -257,7 +257,7 @@ which contains your new module. You can test it with a php script which does not have the 'dl' command as used above.

        -

        29.1.3 Using PHP Extensions

        +

        28.1.3 Using PHP Extensions

        @@ -288,7 +288,7 @@ attempts to do the dl() call for you: include("example.php");

      -

      29.2 Basic PHP interface

      +

      28.2 Basic PHP interface

      @@ -298,7 +298,7 @@ possible for names of symbols in one extension module to clash with other symbols unless care is taken to %rename them.

      -

      29.2.1 Constants

      +

      28.2.1 Constants

      @@ -423,7 +423,7 @@ both point to the same value, without the case test taking place. ( Apologies, this paragraph needs rewriting to make some sense. )

      -

      29.2.2 Global Variables

      +

      28.2.2 Global Variables

      @@ -472,7 +472,7 @@ undefined. At this time SWIG does not support custom accessor methods.

      -

      29.2.3 Functions

      +

      28.2.3 Functions

      @@ -525,7 +525,7 @@ print $s; # The value of $s was not changed. --> -

      29.2.4 Overloading

      +

      28.2.4 Overloading

      @@ -581,7 +581,7 @@ taking the integer argument.

      --> -

      29.2.5 Pointers and References

      +

      28.2.5 Pointers and References

      @@ -713,7 +713,7 @@ PHP in a number of ways: by using unset on an existing variable, or assigning NULL to a variable.

      -

      29.2.6 Structures and C++ classes

      +

      28.2.6 Structures and C++ classes

      @@ -783,7 +783,7 @@ Would be used in the following way from either PHP4 or PHP5: Member variables and methods are accessed using the -> operator.

      -

      29.2.6.1 Using -noproxy

      +

      28.2.6.1 Using -noproxy

      @@ -809,7 +809,7 @@ Complex_im_set($obj,$d); Complex_im_get($obj); -

      29.2.6.2 Constructors and Destructors

      +

      28.2.6.2 Constructors and Destructors

      @@ -850,7 +850,7 @@ the programmer can either reassign the variable or call unset($v)

      -

      29.2.6.3 Static Member Variables

      +

      28.2.6.3 Static Member Variables

      @@ -893,7 +893,7 @@ Ko::threats(10); echo "There has now been " . Ko::threats() . " threats\n"; -

      29.2.6.4 Static Member Functions

      +

      28.2.6.4 Static Member Functions

      @@ -915,7 +915,7 @@ Ko::threats(); -

      29.2.7 PHP Pragmas, Startup and Shutdown code

      +

      28.2.7 PHP Pragmas, Startup and Shutdown code

      diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html index a47d07865..3e39d4062 100644 --- a/Doc/Manual/Pike.html +++ b/Doc/Manual/Pike.html @@ -6,7 +6,7 @@ -

      30 SWIG and Pike

      +

      29 SWIG and Pike

        @@ -46,10 +46,10 @@ least, make sure you read the "SWIG Basics" chapter.

        -

        30.1 Preliminaries

        +

        29.1 Preliminaries

        -

        30.1.1 Running SWIG

        +

        29.1.1 Running SWIG

        @@ -94,7 +94,7 @@ can use the -o option: 

        $ swig -pike -o pseudonym.c example.i
        -

        30.1.2 Getting the right header files

        +

        29.1.2 Getting the right header files

        @@ -114,7 +114,7 @@ You're looking for files with the names global.h, program.h and so on.

        -

        30.1.3 Using your module

        +

        29.1.3 Using your module

        @@ -129,10 +129,10 @@ Pike v7.4 release 10 running Hilfe v3.5 (Incremental Pike Frontend) (1) Result: 24

      -

      30.2 Basic C/C++ Mapping

      +

      29.2 Basic C/C++ Mapping

      -

      30.2.1 Modules

      +

      29.2.1 Modules

      @@ -143,7 +143,7 @@ concerned), SWIG's %module directive doesn't really have any significance.

      -

      30.2.2 Functions

      +

      29.2.2 Functions

      @@ -168,7 +168,7 @@ exactly as you'd expect it to: (1) Result: 24 -

      30.2.3 Global variables

      +

      29.2.3 Global variables

      @@ -197,7 +197,7 @@ will result in two functions, Foo_get() and Foo_set(): (3) Result: 3.141590 -

      30.2.4 Constants and enumerated types

      +

      29.2.4 Constants and enumerated types

      @@ -205,7 +205,7 @@ Enumerated types in C/C++ declarations are wrapped as Pike constants, not as Pike enums.

      -

      30.2.5 Constructors and Destructors

      +

      29.2.5 Constructors and Destructors

      @@ -213,7 +213,7 @@ Constructors are wrapped as create() methods, and destructors are wrapped as destroy() methods, for Pike classes.

      -

      30.2.6 Static Members

      +

      29.2.6 Static Members

      diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html index 5a8653597..62b72fabf 100644 --- a/Doc/Manual/Python.html +++ b/Doc/Manual/Python.html @@ -6,7 +6,7 @@ -

      31 SWIG and Python

      +

      30 SWIG and Python

        @@ -125,7 +125,7 @@ very least, make sure you read the "SWIG Basics" chapter.

        -

        31.1 Overview

        +

        30.1 Overview

        @@ -152,10 +152,10 @@ described followed by a discussion of low-level implementation details.

        -

        31.2 Preliminaries

        +

        30.2 Preliminaries

        -

        31.2.1 Running SWIG

        +

        30.2.1 Running SWIG

        @@ -253,7 +253,7 @@ The following sections have further practical examples and details on how you might go about compiling and using the generated files.

        -

        31.2.2 Using distutils

        +

        30.2.2 Using distutils

        @@ -345,7 +345,7 @@ This same approach works on all platforms if the appropriate compiler is install can even build extensions to the standard Windows Python using MingGW)

        -

        31.2.3 Hand compiling a dynamic module

        +

        30.2.3 Hand compiling a dynamic module

        @@ -393,7 +393,7 @@ module actually consists of two files; socket.py and

        -

        31.2.4 Static linking

        +

        30.2.4 Static linking

        @@ -472,7 +472,7 @@ If using static linking, you might want to rely on a different approach (perhaps using distutils).

        -

        31.2.5 Using your module

        +

        30.2.5 Using your module

        @@ -629,7 +629,7 @@ system configuration (this requires root access and you will need to read the man pages).

        -

        31.2.6 Compilation of C++ extensions

        +

        30.2.6 Compilation of C++ extensions

        @@ -728,7 +728,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

        -

        31.2.7 Compiling for 64-bit platforms

        +

        30.2.7 Compiling for 64-bit platforms

        @@ -765,7 +765,7 @@ and -m64 allow you to choose the desired binary format for your python extension.

        -

        31.2.8 Building Python Extensions under Windows

        +

        30.2.8 Building Python Extensions under Windows

        @@ -874,7 +874,7 @@ SWIG Wiki.

        -

        31.3 A tour of basic C/C++ wrapping

        +

        30.3 A tour of basic C/C++ wrapping

        @@ -883,7 +883,7 @@ to your C/C++ code. Functions are wrapped as functions, classes are wrapped as This section briefly covers the essential aspects of this wrapping.

        -

        31.3.1 Modules

        +

        30.3.1 Modules

        @@ -896,7 +896,7 @@ module name, make sure you don't use the same name as a built-in Python command or standard module name.

        -

        31.3.2 Functions

        +

        30.3.2 Functions

        @@ -920,7 +920,7 @@ like you think it does: >>>

      -

      31.3.3 Global variables

      +

      30.3.3 Global variables

      @@ -1058,7 +1058,7 @@ that starts with a leading underscore. SWIG does not create cvar if there are no global variables in a module.

      -

      31.3.4 Constants and enums

      +

      30.3.4 Constants and enums

      @@ -1098,7 +1098,7 @@ other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

      -

      31.3.5 Pointers

      +

      30.3.5 Pointers

      @@ -1239,7 +1239,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      31.3.6 Structures

      +

      30.3.6 Structures

      @@ -1428,7 +1428,7 @@ everything works just like you would expect. For example: -

      31.3.7 C++ classes

      +

      30.3.7 C++ classes

      @@ -1517,7 +1517,7 @@ they are accessed through cvar like this: -

      31.3.8 C++ inheritance

      +

      30.3.8 C++ inheritance

      @@ -1572,7 +1572,7 @@ then the function spam() accepts Foo * or a pointer to any cla It is safe to use multiple inheritance with SWIG.

      -

      31.3.9 Pointers, references, values, and arrays

      +

      30.3.9 Pointers, references, values, and arrays

      @@ -1633,7 +1633,7 @@ treated as a returning value, and it will follow the same allocation/deallocation process.

      -

      31.3.10 C++ overloaded functions

      +

      30.3.10 C++ overloaded functions

      @@ -1756,7 +1756,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      31.3.11 C++ operators

      +

      30.3.11 C++ operators

      @@ -1845,7 +1845,7 @@ Also, be aware that certain operators don't map cleanly to Python. For instance overloaded assignment operators don't map to Python semantics and will be ignored.

      -

      31.3.12 C++ namespaces

      +

      30.3.12 C++ namespaces

      @@ -1912,7 +1912,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      31.3.13 C++ templates

      +

      30.3.13 C++ templates

      @@ -1966,7 +1966,7 @@ Some more complicated examples will appear later.

      -

      31.3.14 C++ Smart Pointers

      +

      30.3.14 C++ Smart Pointers

      @@ -2051,7 +2051,7 @@ simply use the __deref__() method. For example: -

      31.3.15 C++ Reference Counted Objects (ref/unref)

      +

      30.3.15 C++ Reference Counted Objects (ref/unref)

      @@ -2213,7 +2213,7 @@ python releases the proxy instance.

      -

      31.4 Further details on the Python class interface

      +

      30.4 Further details on the Python class interface

      @@ -2226,7 +2226,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      31.4.1 Proxy classes

      +

      30.4.1 Proxy classes

      @@ -2315,7 +2315,7 @@ you can attach new Python methods to the class and you can even inherit from it by Python built-in types until Python 2.2).

      -

      31.4.2 Memory management

      +

      30.4.2 Memory management

      @@ -2507,7 +2507,7 @@ It is also possible to deal with situations like this using typemaps--an advanced topic discussed later.

      -

      31.4.3 Python 2.2 and classic classes

      +

      30.4.3 Python 2.2 and classic classes

      @@ -2544,7 +2544,7 @@ class itself. In Python-2.1 and earlier, they have to be accessed as a global function or through an instance (see the earlier section).

      -

      31.5 Cross language polymorphism

      +

      30.5 Cross language polymorphism

      @@ -2578,7 +2578,7 @@ proxy classes, director classes, and C wrapper functions takes care of all the cross-language method routing transparently.

      -

      31.5.1 Enabling directors

      +

      30.5.1 Enabling directors

      @@ -2671,7 +2671,7 @@ class MyFoo(mymodule.Foo): -

      31.5.2 Director classes

      +

      30.5.2 Director classes

      @@ -2753,7 +2753,7 @@ so there is no need for the extra overhead involved with routing the calls through Python.

      -

      31.5.3 Ownership and object destruction

      +

      30.5.3 Ownership and object destruction

      @@ -2820,7 +2820,7 @@ deleting all the Foo pointers it contains at some point. Note that no hard references to the Foo objects remain in Python.

      -

      31.5.4 Exception unrolling

      +

      30.5.4 Exception unrolling

      @@ -2879,7 +2879,7 @@ Swig::DirectorMethodException is thrown, Python will register the exception as soon as the C wrapper function returns.

      -

      31.5.5 Overhead and code bloat

      +

      30.5.5 Overhead and code bloat

      @@ -2913,7 +2913,7 @@ directive) for only those methods that are likely to be extended in Python.

      -

      31.5.6 Typemaps

      +

      30.5.6 Typemaps

      @@ -2927,7 +2927,7 @@ need to be supported.

      -

      31.5.7 Miscellaneous

      +

      30.5.7 Miscellaneous

      @@ -2974,7 +2974,7 @@ methods that return const references.

      -

      31.6 Common customization features

      +

      30.6 Common customization features

      @@ -2987,7 +2987,7 @@ This section describes some common SWIG features that are used to improve your the interface to an extension module.

      -

      31.6.1 C/C++ helper functions

      +

      30.6.1 C/C++ helper functions

      @@ -3068,7 +3068,7 @@ hard to implement. It is possible to clean this up using Python code, typemaps, customization features as covered in later sections.

      -

      31.6.2 Adding additional Python code

      +

      30.6.2 Adding additional Python code

      @@ -3217,7 +3217,7 @@ public: -

      31.6.3 Class extension with %extend

      +

      30.6.3 Class extension with %extend

      @@ -3306,7 +3306,7 @@ Vector(12,14,16) in any way---the extensions only show up in the Python interface.

      -

      31.6.4 Exception handling with %exception

      +

      30.6.4 Exception handling with %exception

      @@ -3432,7 +3432,7 @@ The language-independent exception.i library file can also be used to raise exceptions. See the SWIG Library chapter.

      -

      31.7 Tips and techniques

      +

      30.7 Tips and techniques

      @@ -3442,7 +3442,7 @@ strings, binary data, and arrays. This chapter discusses the common techniques solving these problems.

      -

      31.7.1 Input and output parameters

      +

      30.7.1 Input and output parameters

      @@ -3655,7 +3655,7 @@ void foo(Bar *OUTPUT); may not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

      -

      31.7.2 Simple pointers

      +

      30.7.2 Simple pointers

      @@ -3724,7 +3724,7 @@ If you replace %pointer_functions() by %pointer_class(type,name)SWIG Library chapter for further details.

      -

      31.7.3 Unbounded C Arrays

      +

      30.7.3 Unbounded C Arrays

      @@ -3786,7 +3786,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

      -

      31.7.4 String handling

      +

      30.7.4 String handling

      @@ -3855,16 +3855,16 @@ If you need to return binary data, you might use the also be used to extra binary data from arbitrary pointers.

      -

      31.7.5 Arrays

      +

      30.7.5 Arrays

      -

      31.7.6 String arrays

      +

      30.7.6 String arrays

      -

      31.7.7 STL wrappers

      +

      30.7.7 STL wrappers

      -

      31.8 Typemaps

      +

      30.8 Typemaps

      @@ -3881,7 +3881,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Python interface or if you want to elevate your guru status.

      -

      31.8.1 What is a typemap?

      +

      30.8.1 What is a typemap?

      @@ -3997,7 +3997,7 @@ parameter is omitted): -

      31.8.2 Python typemaps

      +

      30.8.2 Python typemaps

      @@ -4038,7 +4038,7 @@ a look at the SWIG library version 1.3.20 or so.

      -

      31.8.3 Typemap variables

      +

      30.8.3 Typemap variables

      @@ -4109,7 +4109,7 @@ properly assigned. The Python name of the wrapper function being created. -

      31.8.4 Useful Python Functions

      +

      30.8.4 Useful Python Functions

      @@ -4237,7 +4237,7 @@ write me -

      31.9 Typemap Examples

      +

      30.9 Typemap Examples

      @@ -4246,7 +4246,7 @@ might look at the files "python.swg" and "typemaps.i" in the SWIG library.

      -

      31.9.1 Converting Python list to a char **

      +

      30.9.1 Converting Python list to a char **

      @@ -4326,7 +4326,7 @@ memory allocation is used to allocate memory for the array, the the C function.

      -

      31.9.2 Expanding a Python object into multiple arguments

      +

      30.9.2 Expanding a Python object into multiple arguments

      @@ -4405,7 +4405,7 @@ to supply the argument count. This is automatically set by the typemap code. F -

      31.9.3 Using typemaps to return arguments

      +

      30.9.3 Using typemaps to return arguments

      @@ -4494,7 +4494,7 @@ function can now be used as follows: >>> -

      31.9.4 Mapping Python tuples into small arrays

      +

      30.9.4 Mapping Python tuples into small arrays

      @@ -4543,7 +4543,7 @@ array, such an approach would not be recommended for huge arrays, but for small structures, this approach works fine.

      -

      31.9.5 Mapping sequences to C arrays

      +

      30.9.5 Mapping sequences to C arrays

      @@ -4632,7 +4632,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) { -

      31.9.6 Pointer handling

      +

      30.9.6 Pointer handling

      @@ -4729,7 +4729,7 @@ class object (if applicable). -

      31.10 Docstring Features

      +

      30.10 Docstring Features

      @@ -4757,7 +4757,7 @@ of your users much simpler.

      -

      31.10.1 Module docstring

      +

      30.10.1 Module docstring

      @@ -4791,7 +4791,7 @@ layout of controls on a panel, etc. to be loaded from an XML file." -

      31.10.2 %feature("autodoc")

      +

      30.10.2 %feature("autodoc")

      @@ -4818,7 +4818,7 @@ names, default values if any, and return type if any. There are also three options for autodoc controlled by the value given to the feature, described below. -

      31.10.2.1 %feature("autodoc", "0")

      +

      30.10.2.1 %feature("autodoc", "0")

      @@ -4847,7 +4847,7 @@ def function_name(*args, **kwargs): -

      31.10.2.2 %feature("autodoc", "1")

      +

      30.10.2.2 %feature("autodoc", "1")

      @@ -4872,7 +4872,7 @@ def function_name(*args, **kwargs): -

      31.10.2.3 %feature("autodoc", "docstring")

      +

      30.10.2.3 %feature("autodoc", "docstring")

      @@ -4891,7 +4891,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT); -

      31.10.3 %feature("docstring")

      +

      30.10.3 %feature("docstring")

      @@ -4923,7 +4923,7 @@ with more than one line. -

      31.11 Python Packages

      +

      30.11 Python Packages

      diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html index 0ed43fc52..3b37d53a0 100644 --- a/Doc/Manual/R.html +++ b/Doc/Manual/R.html @@ -6,7 +6,7 @@ -

      34 SWIG and R

      +

      33 SWIG and R

        @@ -33,7 +33,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux with gcc. The R bindings also work on Microsoft Windows using Visual C++.

        -

        34.1 Bugs

        +

        33.1 Bugs

        @@ -45,7 +45,7 @@ Currently the following features are not implemented or broken:

      • C Array wrappings
      -

      34.2 Using R and SWIG

      +

      33.2 Using R and SWIG

      @@ -99,7 +99,7 @@ Without it, inheritance of wrapped objects may fail. These two files can be loaded in any order

      -

      34.3 Precompiling large R files

      +

      33.3 Precompiling large R files

      In cases where the R file is large, one make save a lot of loading @@ -117,7 +117,7 @@ will save a large amount of loading time. -

      34.4 General policy

      +

      33.4 General policy

      @@ -126,7 +126,7 @@ wrapping over the underlying functions and rely on the R type system to provide R syntax.

      -

      34.5 Language conventions

      +

      33.5 Language conventions

      @@ -135,7 +135,7 @@ and [ are overloaded to allow for R syntax (one based indices and slices)

      -

      34.6 C++ classes

      +

      33.6 C++ classes

      @@ -147,7 +147,7 @@ keep track of the pointer object which removes the necessity for a lot of the proxy class baggage you see in other languages.

      -

      34.7 Enumerations

      +

      33.7 Enumerations

      diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html index 7360f732d..9cd83d494 100644 --- a/Doc/Manual/Ruby.html +++ b/Doc/Manual/Ruby.html @@ -26,7 +26,7 @@ -

      32 SWIG and Ruby

      +

      31 SWIG and Ruby

        @@ -167,7 +167,7 @@ -

        32.1 Preliminaries

        +

        31.1 Preliminaries

        SWIG 1.3 is known to work with Ruby versions 1.6 and later. @@ -190,7 +190,7 @@ of Ruby.

        -

        32.1.1 Running SWIG

        +

        31.1.1 Running SWIG

        To build a Ruby module, run SWIG using the -ruby @@ -244,7 +244,7 @@ to compile this file and link it with the rest of your program.

        -

        32.1.2 Getting the right header files

        +

        31.1.2 Getting the right header files

        In order to compile the wrapper code, the compiler needs the ruby.h @@ -288,7 +288,7 @@ installed, you can run Ruby to find out. For example:

        -

        32.1.3 Compiling a dynamic module

        +

        31.1.3 Compiling a dynamic module

        Ruby extension modules are typically compiled into shared @@ -443,7 +443,7 @@ manual pages for your compiler and linker to determine the correct set of options. You might also check the SWIG Wiki for additional information.

        -

        32.1.4 Using your module

        +

        31.1.4 Using your module

        Ruby module names must be capitalized, @@ -498,7 +498,7 @@ begins with:

        -

        32.1.5 Static linking

        +

        31.1.5 Static linking

        An alternative approach to dynamic linking is to rebuild the @@ -519,7 +519,7 @@ finally rebuilding Ruby.

        -

        32.1.6 Compilation of C++ extensions

        +

        31.1.6 Compilation of C++ extensions

        On most machines, C++ extension modules should be linked @@ -571,7 +571,7 @@ extension, e.g.

        -

        32.2 Building Ruby Extensions under Windows 95/NT

        +

        31.2 Building Ruby Extensions under Windows 95/NT

        Building a SWIG extension to Ruby under Windows 95/NT is @@ -610,7 +610,7 @@ files.

        -

        32.2.1 Running SWIG from Developer Studio

        +

        31.2.1 Running SWIG from Developer Studio

        If you are developing your application within Microsoft @@ -752,7 +752,7 @@ directory, then run the Ruby script from the DOS/Command prompt:

        -

        32.3 The Ruby-to-C/C++ Mapping

        +

        31.3 The Ruby-to-C/C++ Mapping

        This section describes the basics of how SWIG maps C or C++ @@ -762,7 +762,7 @@ declarations in your SWIG interface files to Ruby constructs.

        -

        32.3.1 Modules

        +

        31.3.1 Modules

        The SWIG %module directive specifies @@ -931,7 +931,7 @@ Ruby's built-in names.

        -

        32.3.2 Functions

        +

        31.3.2 Functions

        Global functions are wrapped as Ruby module methods. For @@ -994,7 +994,7 @@ module that can be used like so:

        -

        32.3.3 Variable Linking

        +

        31.3.3 Variable Linking

        C/C++ global variables are wrapped as a pair of singleton @@ -1094,7 +1094,7 @@ effect until it is explicitly disabled using %mutable. -

        32.3.4 Constants

        +

        31.3.4 Constants

        C/C++ constants are wrapped as module constants initialized @@ -1138,7 +1138,7 @@ constant values, e.g.

        -

        32.3.5 Pointers

        +

        31.3.5 Pointers

        "Opaque" pointers to arbitrary C/C++ types (i.e. types that @@ -1190,7 +1190,7 @@ the Ruby nil object.

        -

        32.3.6 Structures

        +

        31.3.6 Structures

        C/C++ structs are wrapped as Ruby classes, with accessor @@ -1365,7 +1365,7 @@ pointers. For example,

        -

        32.3.7 C++ classes

        +

        31.3.7 C++ classes

        Like structs, C++ classes are wrapped by creating a new Ruby @@ -1451,7 +1451,7 @@ class. -

        32.3.8 C++ Inheritance

        +

        31.3.8 C++ Inheritance

        The SWIG type-checker is fully aware of C++ inheritance. @@ -1682,7 +1682,7 @@ Typing").

        -

        32.3.9 C++ Overloaded Functions

        +

        31.3.9 C++ Overloaded Functions

        C++ overloaded functions, methods, and constructors are @@ -1878,7 +1878,7 @@ and C++" chapter for more information about overloading.

        -

        32.3.10 C++ Operators

        +

        31.3.10 C++ Operators

        For the most part, overloaded operators are handled @@ -1959,7 +1959,7 @@ on operator overloading.

        -

        32.3.11 C++ namespaces

        +

        31.3.11 C++ namespaces

        SWIG is aware of C++ namespaces, but namespace names do not @@ -2035,7 +2035,7 @@ identical symbol names, well, then you get what you deserve.

        -

        32.3.12 C++ templates

        +

        31.3.12 C++ templates

        C++ templates don't present a huge problem for SWIG. However, @@ -2079,7 +2079,7 @@ directive. For example:

        -

        32.3.13 C++ Standard Template Library (STL)

        +

        31.3.13 C++ Standard Template Library (STL)

        On a related note, the standard SWIG library contains a @@ -2332,7 +2332,7 @@ chapter.

        -

        32.3.14 C++ STL Functors

        +

        31.3.14 C++ STL Functors

        Some containers in the STL allow you to modify their default @@ -2532,7 +2532,7 @@ b
        -

        32.3.15 C++ STL Iterators

        +

        31.3.15 C++ STL Iterators

        The STL is well known for the use of iterators.  There @@ -2743,7 +2743,7 @@ i
        -

        32.3.16 C++ Smart Pointers

        +

        31.3.16 C++ Smart Pointers

        In certain C++ programs, it is common to use classes that @@ -2868,7 +2868,7 @@ method. For example:

        -

        32.3.17 Cross-Language Polymorphism

        +

        31.3.17 Cross-Language Polymorphism

        SWIG's Ruby module supports cross-language polymorphism @@ -2881,7 +2881,7 @@ using this feature with Ruby.

        -

        32.3.17.1 Exception Unrolling

        +

        31.3.17.1 Exception Unrolling

        Whenever a C++ director class routes one of its virtual @@ -2919,7 +2919,7 @@ caught here and a C++ exception is raised in its place.

        -

        32.4 Naming

        +

        31.4 Naming

        Ruby has several common naming conventions. Constants are @@ -3015,7 +3015,7 @@ planned to become the default option in future releases.

        -

        32.4.1 Defining Aliases

        +

        31.4.1 Defining Aliases

        It's a fairly common practice in the Ruby built-ins and @@ -3107,7 +3107,7 @@ Features") for more details).

        -

        32.4.2 Predicate Methods

        +

        31.4.2 Predicate Methods

        Ruby methods that return a boolean value and end in a @@ -3196,7 +3196,7 @@ Features") for more details).

        -

        32.4.3 Bang Methods

        +

        31.4.3 Bang Methods

        Ruby methods that modify an object in-place and end in an @@ -3260,7 +3260,7 @@ Features") for more details).

        -

        32.4.4 Getters and Setters

        +

        31.4.4 Getters and Setters

        Often times a C++ library will expose properties through @@ -3330,7 +3330,7 @@ methods to be exposed in Ruby as value and value=. -

        32.5 Input and output parameters

        +

        31.5 Input and output parameters

        A common problem in some C programs is handling parameters @@ -3581,10 +3581,10 @@ of %apply

        -

        32.6 Exception handling

        +

        31.6 Exception handling

        -

        32.6.1 Using the %exception directive

        +

        31.6.1 Using the %exception directive

        The SWIG %exception directive can be @@ -3679,7 +3679,7 @@ Features for more examples.

        -

        32.6.2 Handling Ruby Blocks

        +

        31.6.2 Handling Ruby Blocks

        One of the highlights of Ruby and most of its standard library @@ -3860,7 +3860,7 @@ RUBY_YIELD_SELF );

        For more information on typemaps, see Typemaps.

        -

        32.6.3 Raising exceptions

        +

        31.6.3 Raising exceptions

        There are three ways to raise exceptions from C++ code to @@ -4621,7 +4621,7 @@ the built-in Ruby exception types.

        -

        32.6.4 Exception classes

        +

        31.6.4 Exception classes

        Starting with SWIG 1.3.28, the Ruby module supports the %exceptionclass @@ -4679,7 +4679,7 @@ providing for a more natural integration between C++ code and Ruby code.

        -

        32.7 Typemaps

        +

        31.7 Typemaps

        This section describes how you can modify SWIG's default @@ -4702,7 +4702,7 @@ of the primitive C-Ruby interface.

        -

        32.7.1 What is a typemap?

        +

        31.7.1 What is a typemap?

        A typemap is nothing more than a code generation rule that is @@ -4964,7 +4964,7 @@ to be used as follows (notice how the length parameter is omitted):

        -

        32.7.2 Typemap scope

        +

        31.7.2 Typemap scope

        Once defined, a typemap remains in effect for all of the @@ -5012,7 +5012,7 @@ where the class itself is defined. For example:

        -

        32.7.3 Copying a typemap

        +

        31.7.3 Copying a typemap

        A typemap is copied by using assignment. For example:

        @@ -5114,7 +5114,7 @@ rules as for -

        32.7.4 Deleting a typemap

        +

        31.7.4 Deleting a typemap

        A typemap can be deleted by simply defining no code. For @@ -5166,7 +5166,7 @@ typemaps immediately after the clear operation.

        -

        32.7.5 Placement of typemaps

        +

        31.7.5 Placement of typemaps

        Typemap declarations can be declared in the global scope, @@ -5250,7 +5250,7 @@ string -

        32.7.6 Ruby typemaps

        +

        31.7.6 Ruby typemaps

        The following list details all of the typemap methods that @@ -5260,7 +5260,7 @@ can be used by the Ruby module:

        -

        32.7.6.1  "in" typemap

        +

        31.7.6.1  "in" typemap

        Converts Ruby objects to input @@ -5503,7 +5503,7 @@ arguments to be specified. For example:

        -

        32.7.6.2 "typecheck" typemap

        +

        31.7.6.2 "typecheck" typemap

        The "typecheck" typemap is used to support overloaded @@ -5544,7 +5544,7 @@ on "Typemaps and Overloading."

        -

        32.7.6.3  "out" typemap

        +

        31.7.6.3  "out" typemap

        Converts return value of a C function @@ -5776,7 +5776,7 @@ version of the C datatype matched by the typemap. -

        32.7.6.4 "arginit" typemap

        +

        31.7.6.4 "arginit" typemap

        The "arginit" typemap is used to set the initial value of a @@ -5801,7 +5801,7 @@ applications. For example:

        -

        32.7.6.5 "default" typemap

        +

        31.7.6.5 "default" typemap

        The "default" typemap is used to turn an argument into a @@ -5843,7 +5843,7 @@ default argument wrapping.

        -

        32.7.6.6 "check" typemap

        +

        31.7.6.6 "check" typemap

        The "check" typemap is used to supply value checking code @@ -5867,7 +5867,7 @@ arguments have been converted. For example:

        -

        32.7.6.7 "argout" typemap

        +

        31.7.6.7 "argout" typemap

        The "argout" typemap is used to return values from arguments. @@ -6025,7 +6025,7 @@ some function like SWIG_Ruby_AppendOutput.

        -

        32.7.6.8 "freearg" typemap

        +

        31.7.6.8 "freearg" typemap

        The "freearg" typemap is used to cleanup argument data. It is @@ -6061,7 +6061,7 @@ abort prematurely.

        -

        32.7.6.9 "newfree" typemap

        +

        31.7.6.9 "newfree" typemap

        The "newfree" typemap is used in conjunction with the %newobject @@ -6092,7 +6092,7 @@ ownership and %newobject for further details.

        -

        32.7.6.10 "memberin" typemap

        +

        31.7.6.10 "memberin" typemap

        The "memberin" typemap is used to copy data from an @@ -6125,7 +6125,7 @@ other objects.

        -

        32.7.6.11 "varin" typemap

        +

        31.7.6.11 "varin" typemap

        The "varin" typemap is used to convert objects in the target @@ -6136,7 +6136,7 @@ This is implementation specific.

        -

        32.7.6.12 "varout" typemap

        +

        31.7.6.12 "varout" typemap

        The "varout" typemap is used to convert a C/C++ object to an @@ -6147,7 +6147,7 @@ This is implementation specific.

        -

        32.7.6.13 "throws" typemap

        +

        31.7.6.13 "throws" typemap

        The "throws" typemap is only used when SWIG parses a C++ @@ -6206,7 +6206,7 @@ handling with %exception section.

        -

        32.7.6.14 directorin typemap

        +

        31.7.6.14 directorin typemap

        Converts C++ objects in director @@ -6460,7 +6460,7 @@ referring to the class itself. -

        32.7.6.15 directorout typemap

        +

        31.7.6.15 directorout typemap

        Converts Ruby objects in director @@ -6720,7 +6720,7 @@ exception.
        -

        32.7.6.16 directorargout typemap

        +

        31.7.6.16 directorargout typemap

        Output argument processing in director @@ -6960,7 +6960,7 @@ referring to the instance of the class itself -

        32.7.6.17 ret typemap

        +

        31.7.6.17 ret typemap

        Cleanup of function return values @@ -6970,7 +6970,7 @@ referring to the instance of the class itself -

        32.7.6.18 globalin typemap

        +

        31.7.6.18 globalin typemap

        Setting of C global variables @@ -6980,7 +6980,7 @@ referring to the instance of the class itself -

        32.7.7 Typemap variables

        +

        31.7.7 Typemap variables

        @@ -7090,7 +7090,7 @@ being created.

      -

      32.7.8 Useful Functions

      +

      31.7.8 Useful Functions

      When you write a typemap, you usually have to work directly @@ -7114,7 +7114,7 @@ across multiple languages.

      -

      32.7.8.1 C Datatypes to Ruby Objects

      +

      31.7.8.1 C Datatypes to Ruby Objects

      @@ -7170,7 +7170,7 @@ SWIG_From_float(float) -

      32.7.8.2 Ruby Objects to C Datatypes

      +

      31.7.8.2 Ruby Objects to C Datatypes

      Here, while the Ruby versions return the value directly, the SWIG @@ -7259,7 +7259,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      32.7.8.3 Macros for VALUE

      +

      31.7.8.3 Macros for VALUE

      RSTRING_LEN(str)

      @@ -7322,7 +7322,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      32.7.8.4 Exceptions

      +

      31.7.8.4 Exceptions

      void rb_raise(VALUE exception, const char *fmt, @@ -7489,7 +7489,7 @@ arguments are interpreted as with printf().

      -

      32.7.8.5 Iterators

      +

      31.7.8.5 Iterators

      void rb_iter_break()

      @@ -7591,7 +7591,7 @@ VALUE), VALUE value)

      -

      32.7.9 Typemap Examples

      +

      31.7.9 Typemap Examples

      This section includes a few examples of typemaps. For more @@ -7602,7 +7602,7 @@ directory.

      -

      32.7.10 Converting a Ruby array to a char **

      +

      31.7.10 Converting a Ruby array to a char **

      A common problem in many C programs is the processing of @@ -7657,7 +7657,7 @@ after the execution of the C function.

      -

      32.7.11 Collecting arguments in a hash

      +

      31.7.11 Collecting arguments in a hash

      Ruby's solution to the "keyword arguments" capability of some @@ -7936,7 +7936,7 @@ directory of the SWIG distribution.

      -

      32.7.12 Pointer handling

      +

      31.7.12 Pointer handling

      Occasionally, it might be necessary to convert pointer values @@ -8035,7 +8035,7 @@ For example:

      -

      32.7.12.1 Ruby Datatype Wrapping

      +

      31.7.12.1 Ruby Datatype Wrapping

      VALUE Data_Wrap_Struct(VALUE class, void @@ -8086,7 +8086,7 @@ and assigns that pointer to ptr.

      -

      32.7.13 Example: STL Vector to Ruby Array

      +

      31.7.13 Example: STL Vector to Ruby Array

      Another use for macros and type maps is to create a Ruby array @@ -8195,7 +8195,7 @@ the C++ Standard Template Library.
      -

      32.8 Docstring Features

      +

      31.8 Docstring Features

      @@ -8256,7 +8256,7 @@ generate ri documentation from a c wrap file, you could do:

      -

      32.8.1 Module docstring

      +

      31.8.1 Module docstring

      @@ -8307,7 +8307,7 @@ macro. For example: -

      32.8.2 %feature("autodoc")

      +

      31.8.2 %feature("autodoc")

      Since SWIG does know everything about the function it wraps, @@ -8336,7 +8336,7 @@ feature, described below. -

      32.8.2.1 %feature("autodoc", "0")

      +

      31.8.2.1 %feature("autodoc", "0")

      @@ -8384,7 +8384,7 @@ Then Ruby code like this will be generated: -

      32.8.2.2 %feature("autodoc", "1")

      +

      31.8.2.2 %feature("autodoc", "1")

      @@ -8416,7 +8416,7 @@ this: -

      32.8.2.3 %feature("autodoc", "2")

      +

      31.8.2.3 %feature("autodoc", "2")

      @@ -8432,7 +8432,7 @@ this: -

      32.8.2.4 %feature("autodoc", "3")

      +

      31.8.2.4 %feature("autodoc", "3")

      @@ -8460,7 +8460,7 @@ this: -

      32.8.2.5 %feature("autodoc", "docstring")

      +

      31.8.2.5 %feature("autodoc", "docstring")

      @@ -8488,7 +8488,7 @@ generated string. For example: -

      32.8.3 %feature("docstring")

      +

      31.8.3 %feature("docstring")

      @@ -8503,10 +8503,10 @@ docstring and they are output together.

      -

      32.9 Advanced Topics

      +

      31.9 Advanced Topics

      -

      32.9.1 Operator overloading

      +

      31.9.1 Operator overloading

      SWIG allows operator overloading with, by using the %extend @@ -9523,7 +9523,7 @@ parses the expression a != b as !(a == b). -

      32.9.2 Creating Multi-Module Packages

      +

      31.9.2 Creating Multi-Module Packages

      The chapter on Working @@ -9704,7 +9704,7 @@ initialized:

      -

      32.9.3 Specifying Mixin Modules

      +

      31.9.3 Specifying Mixin Modules

      The Ruby language doesn't support multiple inheritance, but @@ -9802,7 +9802,7 @@ Features") for more details).

      -

      32.10 Memory Management

      +

      31.10 Memory Management

      One of the most common issues in generating SWIG bindings for @@ -9849,7 +9849,7 @@ understanding of how the underlying library manages memory.

      -

      32.10.1 Mark and Sweep Garbage Collector

      +

      31.10.1 Mark and Sweep Garbage Collector

      Ruby uses a mark and sweep garbage collector. When the garbage @@ -9897,7 +9897,7 @@ this memory.

      -

      32.10.2 Object Ownership

      +

      31.10.2 Object Ownership

      As described above, memory management depends on clearly @@ -10124,7 +10124,7 @@ classes is:

      -

      32.10.3 Object Tracking

      +

      31.10.3 Object Tracking

      The remaining parts of this section will use the class library @@ -10338,7 +10338,7 @@ methods.

      -

      32.10.4 Mark Functions

      +

      31.10.4 Mark Functions

      With a bit more testing, we see that our class library still @@ -10456,7 +10456,7 @@ test suite.

      -

      32.10.5 Free Functions

      +

      31.10.5 Free Functions

      By default, SWIG creates a "free" function that is called when @@ -10611,7 +10611,7 @@ been freed, and thus raises a runtime exception.

      -

      32.10.6 Embedded Ruby and the C++ Stack

      +

      31.10.6 Embedded Ruby and the C++ Stack

      As has been said, the Ruby GC runs and marks objects before diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html index b36395cab..e837a5b17 100644 --- a/Doc/Manual/Tcl.html +++ b/Doc/Manual/Tcl.html @@ -6,7 +6,7 @@ -

      33 SWIG and Tcl

      +

      32 SWIG and Tcl

        @@ -82,7 +82,7 @@ Tcl 8.0 or a later release. Earlier releases of SWIG supported Tcl 7.x, but this is no longer supported.

        -

        33.1 Preliminaries

        +

        32.1 Preliminaries

        @@ -108,7 +108,7 @@ build a Tcl extension module. To finish building the module, you need to compile this file and link it with the rest of your program.

        -

        33.1.1 Getting the right header files

        +

        32.1.1 Getting the right header files

        @@ -126,7 +126,7 @@ this is the case, you should probably make a symbolic link so that tcl.h -

        33.1.2 Compiling a dynamic module

        +

        32.1.2 Compiling a dynamic module

        @@ -161,7 +161,7 @@ The name of the module is specified using the %module directive or the -module command line option.

        -

        33.1.3 Static linking

        +

        32.1.3 Static linking

        @@ -227,7 +227,7 @@ minimal in most situations (and quite frankly not worth the extra hassle in the opinion of this author).

        -

        33.1.4 Using your module

        +

        32.1.4 Using your module

        @@ -355,7 +355,7 @@ to the default system configuration (this requires root access and you will need the man pages).

        -

        33.1.5 Compilation of C++ extensions

        +

        32.1.5 Compilation of C++ extensions

        @@ -438,7 +438,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

        -

        33.1.6 Compiling for 64-bit platforms

        +

        32.1.6 Compiling for 64-bit platforms

        @@ -465,7 +465,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

        -

        33.1.7 Setting a package prefix

        +

        32.1.7 Setting a package prefix

        @@ -484,7 +484,7 @@ option will append the prefix to the name when creating a command and call it "Foo_bar".

        -

        33.1.8 Using namespaces

        +

        32.1.8 Using namespaces

        @@ -506,7 +506,7 @@ When the -namespace option is used, objects in the module are always accessed with the namespace name such as Foo::bar.

        -

        33.2 Building Tcl/Tk Extensions under Windows 95/NT

        +

        32.2 Building Tcl/Tk Extensions under Windows 95/NT

        @@ -517,7 +517,7 @@ covers the process of using SWIG with Microsoft Visual C++. although the procedure may be similar with other compilers.

        -

        33.2.1 Running SWIG from Developer Studio

        +

        32.2.1 Running SWIG from Developer Studio

        @@ -575,7 +575,7 @@ MSDOS > tclsh80 %

      -

      33.2.2 Using NMAKE

      +

      32.2.2 Using NMAKE

      @@ -638,7 +638,7 @@ to get you started. With a little practice, you'll be making lots of Tcl extensions.

      -

      33.3 A tour of basic C/C++ wrapping

      +

      32.3 A tour of basic C/C++ wrapping

      @@ -649,7 +649,7 @@ classes. This section briefly covers the essential aspects of this wrapping.

      -

      33.3.1 Modules

      +

      32.3.1 Modules

      @@ -683,7 +683,7 @@ To fix this, supply an extra argument to load like this: -

      33.3.2 Functions

      +

      32.3.2 Functions

      @@ -708,7 +708,7 @@ like you think it does: % -

      33.3.3 Global variables

      +

      32.3.3 Global variables

      @@ -788,7 +788,7 @@ extern char *path; // Read-only (due to %immutable) -

      33.3.4 Constants and enums

      +

      32.3.4 Constants and enums

      @@ -872,7 +872,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l conversion. This allows the global statement to be omitted.

      -

      33.3.5 Pointers

      +

      32.3.5 Pointers

      @@ -968,7 +968,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      33.3.6 Structures

      +

      32.3.6 Structures

      @@ -1250,7 +1250,7 @@ Note: Tcl only destroys the underlying object if it has ownership. See the memory management section that appears shortly.

      -

      33.3.7 C++ classes

      +

      32.3.7 C++ classes

      @@ -1317,7 +1317,7 @@ In Tcl, the static member is accessed as follows: -

      33.3.8 C++ inheritance

      +

      32.3.8 C++ inheritance

      @@ -1366,7 +1366,7 @@ For instance: It is safe to use multiple inheritance with SWIG.

      -

      33.3.9 Pointers, references, values, and arrays

      +

      32.3.9 Pointers, references, values, and arrays

      @@ -1420,7 +1420,7 @@ to hold the result and a pointer is returned (Tcl will release this memory when the return value is garbage collected).

      -

      33.3.10 C++ overloaded functions

      +

      32.3.10 C++ overloaded functions

      @@ -1543,7 +1543,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      33.3.11 C++ operators

      +

      32.3.11 C++ operators

      @@ -1645,7 +1645,7 @@ There are ways to make this operator appear as part of the class using the % Keep reading.

      -

      33.3.12 C++ namespaces

      +

      32.3.12 C++ namespaces

      @@ -1709,7 +1709,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      33.3.13 C++ templates

      +

      32.3.13 C++ templates

      @@ -1761,7 +1761,7 @@ More details can be found in the SWIG and C++ -

      33.3.14 C++ Smart Pointers

      +

      32.3.14 C++ Smart Pointers

      @@ -1845,7 +1845,7 @@ simply use the __deref__() method. For example: -

      33.4 Further details on the Tcl class interface

      +

      32.4 Further details on the Tcl class interface

      @@ -1858,7 +1858,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      33.4.1 Proxy classes

      +

      32.4.1 Proxy classes

      @@ -1923,7 +1923,7 @@ function. This allows objects to be encapsulated objects that look a lot like as shown in the last section.

      -

      33.4.2 Memory management

      +

      32.4.2 Memory management

      @@ -2111,7 +2111,7 @@ typemaps--an advanced topic discussed later.

      -

      33.5 Input and output parameters

      +

      32.5 Input and output parameters

      @@ -2299,7 +2299,7 @@ set c [lindex $dim 1] -

      33.6 Exception handling

      +

      32.6 Exception handling

      @@ -2433,7 +2433,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex See the chapter on "Customization Features" for more examples.

      -

      33.7 Typemaps

      +

      32.7 Typemaps

      @@ -2450,7 +2450,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Tcl interface.

      -

      33.7.1 What is a typemap?

      +

      32.7.1 What is a typemap?

      @@ -2567,7 +2567,7 @@ parameter is omitted): -

      33.7.2 Tcl typemaps

      +

      32.7.2 Tcl typemaps

      @@ -2705,7 +2705,7 @@ Initialize an argument to a value before any conversions occur. Examples of these methods will appear shortly.

      -

      33.7.3 Typemap variables

      +

      32.7.3 Typemap variables

      @@ -2776,7 +2776,7 @@ properly assigned. The Tcl name of the wrapper function being created. -

      33.7.4 Converting a Tcl list to a char **

      +

      32.7.4 Converting a Tcl list to a char **

      @@ -2838,7 +2838,7 @@ argv[2] = Larry 3 -

      33.7.5 Returning values in arguments

      +

      32.7.5 Returning values in arguments

      @@ -2880,7 +2880,7 @@ result, a Tcl function using these typemaps will work like this : % -

      33.7.6 Useful functions

      +

      32.7.6 Useful functions

      @@ -2957,7 +2957,7 @@ int Tcl_IsShared(Tcl_Obj *obj); -

      33.7.7 Standard typemaps

      +

      32.7.7 Standard typemaps

      @@ -3041,7 +3041,7 @@ work) -

      33.7.8 Pointer handling

      +

      32.7.8 Pointer handling

      @@ -3117,7 +3117,7 @@ For example: -

      33.8 Turning a SWIG module into a Tcl Package.

      +

      32.8 Turning a SWIG module into a Tcl Package.

      @@ -3189,7 +3189,7 @@ As a final note, most SWIG examples do not yet use the to use the load command instead.

      -

      33.9 Building new kinds of Tcl interfaces (in Tcl)

      +

      32.9 Building new kinds of Tcl interfaces (in Tcl)

      @@ -3288,7 +3288,7 @@ danger of blowing something up (although it is easily accomplished with an out of bounds array access).

      -

      33.9.1 Proxy classes

      +

      32.9.1 Proxy classes

      From d0ae20ec39f9b5f59aa9b1dfa5ff9cd7d1f1a5e3 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 8 Sep 2008 20:09:41 +0000 Subject: [PATCH 046/508] set the references right git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@10824 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 80146298f..85ea10aea 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -9,24 +9,24 @@

      @@ -42,7 +42,7 @@ This chapter describes SWIG's support for creating ANSI C wrappers. This module

      -

      36.1 Overview

      +

      36.1 Overview

      @@ -60,10 +60,10 @@ With wrapper interfaces generated by SWIG, it is easy to use the functionality o Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.

      -

      36.2 Preliminaries

      +

      36.2 Preliminaries

      -

      36.2.1 Running SWIG

      +

      36.2.1 Running SWIG

      @@ -108,7 +108,7 @@ This will generate an example_wrap.c file or, in the latter case, e The wrap file contains the wrapper functions, which perform the main functionality of SWIG: it translates the input arguments from C to C++, makes calls to the original functions and marshalls C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions.

      -

      36.2.2 Command line options

      +

      36.2.2 Command line options

      @@ -131,12 +131,12 @@ swig -c -help

      - +
      -noexceptgenerate wrappers with no support of exception handling; see Exceptions chapter for more details generate wrappers with no support of exception handling; see Exceptions chapter for more details
      -

      36.2.3 Compiling a dynamic module

      +

      36.2.3 Compiling a dynamic module

      @@ -163,7 +163,7 @@ $ g++ -shared example_wrap.o -o libexample.so Now the shared library module is ready to use. Note that the name of the generated module is important: is should be prefixed with lib on Unix, and have the specific extension, like .dll for Windows or .so for Unix systems.

      -

      36.2.4 Using the generated module

      +

      36.2.4 Using the generated module

      @@ -178,14 +178,14 @@ $ gcc runme.c example_proxy.c -L. -lexample -o runme This will compile the application code (runme.c), along with the proxy code and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.

      -

      36.3 Basic C wrapping

      +

      36.3 Basic C wrapping

      Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.

      -

      36.3.1 Functions

      +

      36.3.1 Functions

      @@ -259,7 +259,7 @@ int _wrap_gcd(int arg1, int arg2) { This time calling gcd with negative value argument will trigger an error message. This can save you time writing all the constraint checking code by hand.

      -

      36.3.2 Variables

      +

      36.3.2 Variables

      @@ -297,14 +297,14 @@ ms.x = 123; ms.d = 123.123; -

      36.4 Basic C++ wrapping

      +

      36.4 Basic C++ wrapping

      The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.

      -

      36.4.1 Classes

      +

      36.4.1 Classes

      @@ -382,7 +382,7 @@ radius: 1.500000 area: 7.068583 -

      36.5 Exception handling

      +

      36.5 Exception handling

      From 4acb01b741b4323cfcf4ee1ceb54ba0809e0d262 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 4 Feb 2009 16:10:07 +0000 Subject: [PATCH 047/508] Fix for returning objects. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11109 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/std_string.i | 100 +++++++++++++++++++------------------- Source/Modules/c.cxx | 2 - Tools/config/config.guess | 32 +++--------- Tools/config/config.sub | 16 ++---- 4 files changed, 63 insertions(+), 87 deletions(-) diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index a1ef885d6..adbca07cf 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -1,50 +1,50 @@ -%{ -#include -%} - -namespace std { - -// use "const string &" typemaps for wrapping member strings -%naturalvar string; - -class string; - -%typemap(ctype) string "char *" -%typemap(ctype) const string & "char *" -%typemap(couttype) string "char *" -%typemap(couttype) const string & "char *" - -%typemap(in) string { - if ($input) { - $1.assign($input); - } - else { - $1.resize(0); - } -} - -%typemap(in) const string & { - if ($input) { - $1 = new std::string($input); - } - else { - $1 = new std::string(); - $1->resize(0); - } -} - -%typemap(freearg) const string & { - if ($1) - delete $1; -} - -%typemap(out) string, const string &, string * { - const char *str = cppresult->c_str(); - size_t len = strlen(str); - $result = (char *) malloc(len + 1); - memcpy($result, str, len); - $result[len] = '\0'; -} - -} - +%{ +#include +%} + +namespace std { + +// use "const string &" typemaps for wrapping member strings +%naturalvar string; + +class string; + +%typemap(ctype) string "char *" +%typemap(ctype) const string & "char *" +%typemap(couttype) string "char *" +%typemap(couttype) const string & "char *" + +%typemap(in) string { + if ($input) { + $1.assign($input); + } + else { + $1.resize(0); + } +} + +%typemap(in) const string & { + if ($input) { + $1 = new std::string($input); + } + else { + $1 = new std::string(); + $1->resize(0); + } +} + +%typemap(freearg) const string & { + if ($1) + delete $1; +} + +%typemap(out) string, const string &, string * { + const char *str = cppresult.c_str(); + size_t len = strlen(str); + $result = (char *) malloc(len + 1); + memcpy($result, str, len); + $result[len] = '\0'; +} + +} + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d15f88d60..8d0c2c0be 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -612,9 +612,7 @@ ready: } else { return_var_type = type; - SwigType_add_pointer(return_var_type); } - Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); return_object = true; } diff --git a/Tools/config/config.guess b/Tools/config/config.guess index 0f0fe712a..396482d6c 100755 --- a/Tools/config/config.guess +++ b/Tools/config/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -781,7 +780,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -791,15 +790,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -954,9 +950,6 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1215,15 +1208,6 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/Tools/config/config.sub b/Tools/config/config.sub index 5defff65a..fab0aa355 100755 --- a/Tools/config/config.sub +++ b/Tools/config/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ case $basic_machine in | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ case $basic_machine in | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,9 +925,6 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1222,7 +1219,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1417,9 +1414,6 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; From 5002c69cd66b67501b5abe99700eed875b1122d6 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 18 Mar 2009 15:04:20 +0000 Subject: [PATCH 048/508] Fixed some issues with member variables handling git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11155 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 8 ++-- Examples/c/class/Makefile | 2 +- Examples/c/exception/Makefile | 2 +- Examples/c/simple/Makefile | 2 +- Examples/test-suite/c/Makefile.in | 13 +++--- Lib/c/c.swg | 50 +++++++++++++++----- Lib/c/clabels.swg | 4 +- Source/Modules/c.cxx | 77 +++++++++++++++++-------------- configure.in | 18 ++++++++ 9 files changed, 115 insertions(+), 61 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 24e022b20..c47bb6a7b 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1098,17 +1098,19 @@ r_clean: # ---------------------------------------------------------------- CLIBPREFIX = lib +C_LDSHARED = @C_LDSHARED@ +CXX_LDSHARED = @CXX_LDSHARED@ +C_SO = @C_SO@ c: $(SRCS) $(SWIG) -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) + $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(SO) + $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_compile: $(RUNME) $(PROXY) $(CC) $(RUNME) $(PROXY) -L. -l$(TARGET) -o $(RUNME:.c=) - diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index 97066462a..fb2879087 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -24,6 +24,6 @@ memchk: env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ runme + rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme check: all diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile index 97066462a..5de8ad83b 100644 --- a/Examples/c/exception/Makefile +++ b/Examples/c/exception/Makefile @@ -24,6 +24,6 @@ memchk: env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme clean: - rm -f *.o *.out *.so *.a *.dll *.exe *_wrap* *_proxy* *~ runme + rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme check: all diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index aaaf32b49..eb07f6914 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -24,6 +24,6 @@ memchk: env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme clean: - rm -f *.o *.so *.out *.a *.exe *.dll *_wrap* *_proxy* *~ runme + rm -f *.o *.so *.out *.a *.exe *.dll *.dylib *_wrap* *_proxy* *~ runme check: all diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 4c8134231..1108ff337 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -12,13 +12,12 @@ top_builddir = @top_builddir@/.. C_TEST_CASES = -CPP_TEST_CASES = \ - cast_operator \ - char_strings \ - exception_order \ - exception_partial_info \ - enums \ - enum_plus \ +CPP_TEST_CASES = cast_operator \ + char_strings \ + exception_order \ + exception_partial_info \ + enums \ + enum_plus include $(srcdir)/../common.mk diff --git a/Lib/c/c.swg b/Lib/c/c.swg index d62ef9b94..bf0752dcf 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -15,6 +15,7 @@ #include #define SWIG_STR(x) #x +#define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else %} // typemaps for function parameters @@ -34,7 +35,7 @@ %typemap(ctype) short *&, int *&, long *&, char *&, float *&, double *& "$1_basetype **" %typemap(ctype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_basetype **" %typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype **" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype *" %typemap(ctype) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_basetype **" %typemap(ctype) SWIGTYPE "SwigObj *" %typemap(ctype) SWIGTYPE * "SwigObj *" @@ -96,10 +97,13 @@ $1 = ($1_ltype) 0; } +/* + * unsupported yet %typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY], SWIGTYPE **, SWIGTYPE *** { - if (arg2) - free(arg2); + if ($input) + free($input); } +*/ %typemap(in) SWIGTYPE * [ANY][ANY], SWIGTYPE *** { if ($input) { @@ -143,9 +147,11 @@ %typemap(couttype) short *&, int *&, long *&, char *&, float *&, double *& "$1_basetype **" %typemap(couttype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_basetype **" %typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" +%typemap(couttype) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype *" %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "SwigObj *" %typemap(couttype) SWIGTYPE & "SwigObj *" +%typemap(couttype) SWIGTYPE [ANY] "SwigObj **" %typemap(couttype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" %typemap(couttype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" %typemap(couttype) enum SWIGTYPE "$1_type" @@ -167,6 +173,7 @@ %typemap(out) short *&, int *&, long *&, char *&, float *&, double *& "$result = $1;" %typemap(out) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$result = $1;" %typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$result = $1;" +%typemap(out) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$result = $1;" %typemap(out) void "" %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = $1;" @@ -175,31 +182,41 @@ %typemap(out) enum SWIGTYPE "$result = ($1_type) $1;" %typemap(out) SWIGTYPE { - $result = SWIG_create_object(SWIG_STR($1_type)); + $result = SWIG_temporary; $result->obj = (void*) &$1; } %typemap(out) SWIGTYPE *, SWIGTYPE & { - $result = SWIG_create_object(SWIG_STR($1_basetype)); + $result = SWIG_temporary; $result->obj = (void*) $1; } %typemap(out) SWIGTYPE * [ANY], SWIGTYPE ** { + static SwigObj **_temp = 0; if ($1) { - $result = (SwigObj**) malloc($1_dim0 * sizeof(SwigObj*)); size_t i = 0; - for ( ; i < $1_dim0; ++i) + if (_temp) { + for ( ; i < $1_dim0; ++i) + SWIG_destroy_object(_temp[i]); + free(_temp); + } + _temp = (SwigObj**) malloc($1_dim0 * sizeof(SwigObj*)); + for (i = 0 ; i < $1_dim0; ++i) { if ($1[i]) { - $result[i] = SWIG_create_object(SWIG_STR($1_ltype)); - $result[i]->obj = (void*) $1[i]; + _temp[i] = SWIG_create_object(SWIG_STR($1_ltype)); + _temp[i]->obj = (void*) $1[i]; } else - $result[i] = (SwigObj*) 0; + _temp[i] = (SwigObj*) 0; + } + $result = _temp; } else $result = (SwigObj**) 0; } +/* + * 2+ dim arrays - not supported yet %typemap(out) SWIGTYPE * [ANY][ANY], SWIGTYPE *** { if ($1) { $result = (SwigObj***) malloc($1_dim0 * $1_dim1 * sizeof(SwigObj*)); @@ -217,7 +234,7 @@ } else $result = (SwigObj***) 0; -} +}*/ #ifdef SWIG_C_EXCEPT @@ -228,6 +245,11 @@ typedef struct { } SwigObj; %} %include "cexcept.swg" +#ifdef SWIG_CPPMODE +%insert("runtime") %{ +SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj)); +%} +#endif #else %insert("runtime") %{ typedef struct { @@ -247,6 +269,12 @@ SWIGEXPORTC int SWIG_exit(int code) { #endif %} +#ifdef SWIG_CPPMODE +%insert("runtime") %{ +SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj)); +%} +#endif + %insert("proxy_header") %{ typedef struct { void *obj; diff --git a/Lib/c/clabels.swg b/Lib/c/clabels.swg index cae432a52..ab6a7360a 100644 --- a/Lib/c/clabels.swg +++ b/Lib/c/clabels.swg @@ -7,7 +7,7 @@ // this is used instead of default SWIGEXPORT symbol #ifndef SWIGEXPORTC -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__APPLE__) # define SWIGEXPORTC # else # if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) @@ -19,7 +19,7 @@ #endif #ifndef SWIGPROTECT -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__APPLE__) # define SWIGPROTECT(x) # else # if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8d0c2c0be..74e87fc6c 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -78,14 +78,15 @@ public: } } - if (!CPlusPlus) + if (!CPlusPlus) except_flag = false; // add a symbol to the parser for conditional compilation Preprocessor_define("SWIGC 1", 0); - Preprocessor_define("SWIG_C_RUNTME 1", 0); if (except_flag) Preprocessor_define("SWIG_C_EXCEPT 1", 0); + if (CPlusPlus) + Preprocessor_define("SWIG_CPPMODE 1", 0); SWIG_library_directory("c"); @@ -199,7 +200,7 @@ public: } Swig_register_filebyname("header", f_header); - Swig_register_filebyname("wrappers", f_wrappers); + Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -425,7 +426,7 @@ ready: /* ---------------------------------------------------------------------- * functionWrapper() * ---------------------------------------------------------------------- */ - + virtual int functionWrapper(Node *n) { String *name = Getattr(n, "sym:name"); SwigType *type = Getattr(n, "type"); @@ -544,13 +545,13 @@ ready: Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); } - // add variable for holding result of original function + // add variable for holding result of original function 'cppresult' bool return_object = false; if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { SwigType *tdtype = SwigType_typedef_resolve(type); if (tdtype) type = tdtype; - + if (SwigType_isenum(type)) { Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); } @@ -575,12 +576,15 @@ ready: SwigType_add_reference(type); } else if (SwigType_isarray(type)) { + return_var_type = SwigType_base(type); SwigType *atype = Copy(type); do { SwigType_del_array(atype); SwigType_add_pointer(return_var_type); } while (SwigType_isarray(atype)); + if (SwigType_ispointer(atype)) + SwigType_add_pointer(return_var_type); Delete(atype); } else { @@ -611,6 +615,7 @@ ready: SwigType_add_pointer(return_var_type); } else { + SwigType_add_pointer(type); return_var_type = type; } Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); @@ -687,7 +692,10 @@ ready: gencomma = 1; // apply typemaps for input parameter - if ((tm = Getattr(p, "tmap:in"))) { + if (Cmp(nodeType(n), "destructor") == 0) { + p = Getattr(p, "tmap:in:next"); + } + else if ((tm = Getattr(p, "tmap:in"))) { if (dont_apply_tmap) { Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); } @@ -702,6 +710,7 @@ ready: Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); p = nextSibling(p); } + Delete(arg_name); Delete(proxy_parm_type); @@ -710,12 +719,14 @@ ready: Printf(wrapper->def, ") {"); - // emit variables for holding parameters - emit_parameter_variables(parms, wrapper); - - // emit variable for holding function return value - emit_return_variable(n, return_type, wrapper); - + if (Cmp(nodeType(n), "destructor") != 0) { + // emit variables for holding parameters + emit_parameter_variables(parms, wrapper); + + // emit variable for holding function return value + emit_return_variable(n, return_type, wrapper); + } + // insert constraint checking for (p = parms; p; ) { if ((tm = Getattr(p, "tmap:check"))) { @@ -1043,7 +1054,11 @@ ready: String *code = NewString(""); // create code for 'get' function - Printv(code, "result = ", classname, "::", name, ";\n", NIL); + Printv(code, "result = $mod", classname, "::", name, ";\n", NIL); + if (!SwigType_isbuiltin(SwigType_base(type)) && !SwigType_ispointer(type)) + Replaceall(code, "$mod", "&"); + else + Replaceall(code, "$mod", ""); wrap_get_variable(n, classname, newclassname, name, code); // create parameter for 'set' function @@ -1066,7 +1081,11 @@ ready: } else code = NewString(""); - Printv(code, classname, "::", name, " = arg1;\n", NIL); + Printv(code, classname, "::", name, " = $mod arg1;\nresult = arg1;\n", NIL); + if (!SwigType_isbuiltin(SwigType_base(type)) && !SwigType_ispointer(type)) + Replaceall(code, "$mod", "*"); + else + Replaceall(code, "$mod", ""); wrap_set_variable(n, classname, newclassname, name, code); } @@ -1082,26 +1101,14 @@ ready: * --------------------------------------------------------------------- */ virtual int membervariableHandler(Node *n) { - SwigType *type = Copy(Getattr(n, "type")); - SwigType *tdtype; - tdtype = SwigType_typedef_resolve(type); - if (tdtype) - type = tdtype; - - int array_count = 0; - while (SwigType_isarray(type)) { - SwigType_del_array(type); - array_count++; + SwigType *type = Getattr(n, "type"); + SwigType *btype = SwigType_base(type); + if (SwigType_isarray(type) && !SwigType_isbuiltin(btype)) { + // this hack applies to member objects array (not ptrs.) + SwigType_add_pointer(btype); + SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0))); + Setattr(n, "type", btype); } - if (type) { - if (!SwigType_ispointer(type) && !SwigType_isreference(type)) - Setattr(n, "c:retval", "1"); - } - while (array_count) { - SwigType_add_pointer(type); - array_count--; - } - Delete(type); return Language::membervariableHandler(n); } @@ -1289,7 +1296,7 @@ ready: // create action code if (except_flag) { Printf(code, "SWIG_remove_registry_entry(carg1);\n"); - Printf(code, "SWIG_destroy_object(arg1);\n"); + Printf(code, "SWIG_destroy_object(carg1);"); } else { Printv(code, "if (carg1->obj)\ndelete (", classname, " *) (carg1->obj);\n", NIL); diff --git a/configure.in b/configure.in index b1d302264..a8b8be5f3 100644 --- a/configure.in +++ b/configure.in @@ -1815,6 +1815,24 @@ fi AC_SUBST(RBIN) +# C module on Mac OS X tweaks +case $host in +*-*-darwin*) + C_LDSHARED="cc -dynamiclib" + CXX_LDSHARED="g++ -dynamiclib" + C_SO=".dylib" + ;; +*) + C_LDSHARED=$(LDSHARED) + CXX_LDSHARED="$(CXXSHARED)" + C_SO=$(SO) + ;; +esac + +AC_SUBST(C_LDSHARED) +AC_SUBST(CXX_LDSHARED) +AC_SUBST(C_SO) + #---------------------------------------------------------------- # Determine which languages to use for examples/test-suite #---------------------------------------------------------------- From 8c04b766d4f61cbad139c8f84332444baa771035 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 8 Apr 2009 20:32:30 +0000 Subject: [PATCH 049/508] Fix for warning on return by value. Fix for std_string. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11184 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/std_string.i | 8 +++++--- Source/Modules/c.cxx | 34 +++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index adbca07cf..a6dc0607b 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -10,9 +10,11 @@ namespace std { class string; %typemap(ctype) string "char *" +%typemap(ctype) string * "char *" %typemap(ctype) const string & "char *" %typemap(couttype) string "char *" %typemap(couttype) const string & "char *" +%typemap(couttype) string * "char *" %typemap(in) string { if ($input) { @@ -23,7 +25,7 @@ class string; } } -%typemap(in) const string & { +%typemap(in) const string &, string * { if ($input) { $1 = new std::string($input); } @@ -33,13 +35,13 @@ class string; } } -%typemap(freearg) const string & { +%typemap(freearg) const string &, string * { if ($1) delete $1; } %typemap(out) string, const string &, string * { - const char *str = cppresult.c_str(); + const char *str = cppresult->c_str(); size_t len = strlen(str); $result = (char *) malloc(len + 1); memcpy($result, str, len); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 74e87fc6c..557ff0cae 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -293,6 +293,9 @@ public: call = Swig_cfunction_call(Getattr(n, "name"), parms); cres = Swig_cresult(type, "result", call); Setattr(n, "wrap:action", cres); + + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) + Setattr(n, "c:retval", "1"); functionWrapper(n); @@ -747,25 +750,26 @@ ready: if (!except || (Cmp(except, "0") != 0)) Printf(action, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); } - if (Cmp(nodeType(n), "constructor") != 0) - Replace(action, "result =", "cppresult = $mod", DOH_REPLACE_FIRST); // handle special cases of cpp return result - - String *mod = NewString("$mod"); - if (SwigType_isreference(type)) - Replaceall(mod, "$mod", ""); - else if (SwigType_isenum(type)) - Replaceall(mod, "$mod", "(int)"); - else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type)) - Replaceall(mod, "$mod", "&"); - else { - Delete(mod); - mod = empty_string; + if (Cmp(nodeType(n), "constructor") != 0) { + if (SwigType_isenum(type)) { + // returning enum value + Replace(action, "result =", "cppresult = (int)", DOH_REPLACE_FIRST); + } + else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type)) { + // returning object by value + String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref"); + String *lstr = SwigType_lstr(type, 0); + Replace(action, "result =", NewStringf("const %s = ", str), DOH_REPLACE_FIRST); + Printf(action, "cppresult = (%s) &_result_ref;\n", lstr); + Delete(str); + Delete(lstr); + } + else + Replace(action, "result =", "cppresult = ", DOH_REPLACE_FIRST); } - Replaceall(action, "$mod", mod); - // emit output typemap if needed if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { From da5ade31431cc13599ab9f976a93258c9b2390c2 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 11 Apr 2009 10:46:13 +0000 Subject: [PATCH 050/508] Refactored enums handling git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11186 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 4 +- Source/Modules/c.cxx | 193 +++----------------------------------- Tools/config/config.guess | 84 ++++++++++++----- Tools/config/config.sub | 99 +++++++++++++++---- 4 files changed, 158 insertions(+), 222 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index bf0752dcf..9418e7d8e 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -43,7 +43,7 @@ %typemap(ctype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" %typemap(ctype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" %typemap(ctype) SWIGTYPE *& "SwigObj **" -%typemap(ctype) enum SWIGTYPE "$1_type" +%typemap(ctype) enum SWIGTYPE "int" %fragment("stdbool_inc", "proxy_header") {#include } %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -154,7 +154,7 @@ %typemap(couttype) SWIGTYPE [ANY] "SwigObj **" %typemap(couttype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" %typemap(couttype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" -%typemap(couttype) enum SWIGTYPE "$1_type" +%typemap(couttype) enum SWIGTYPE "int" %typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_type" %typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 557ff0cae..cc7073ae8 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -28,12 +28,9 @@ class C:public Language { String *empty_string; String *int_string; - String *enum_values; String *create_object; String *destroy_object; - int enum_id; - bool proxy_flag; bool except_flag; @@ -46,10 +43,8 @@ public: C() : empty_string(NewString("")), int_string(NewString("int")), - enum_values(0), create_object(0), destroy_object(0), - enum_id(1), proxy_flag(true), except_flag(true) { } @@ -258,8 +253,6 @@ public: return SWIG_OK; String *name = Getattr(n, "name"); SwigType *type = Getattr(n, "type"); - if (SwigType_isenum(type)) - type = make_enum_type(n, type); String *type_str = Copy(SwigType_str(type, 0)); if (SwigType_isarray(type)) { String *dims = Strchr(type_str, '['); @@ -397,35 +390,6 @@ ready: return result; } - /* ---------------------------------------------------------------------- - * make_enum_type() - * - * given C++ enum type this function returns its C representation - * ---------------------------------------------------------------------- */ - - String *make_enum_type(Node *n, SwigType *enumtype) { - Symtab *symtab = Getattr(n, "sym:symtab"); - String *unnamed = Getattr(n, "unnamed"); - String *newtype = 0; - String *query = 0; - - if (!unnamed) - query = Swig_scopename_last(SwigType_str(enumtype, 0)); - else { - Replaceall(unnamed, "$unnamed", "enum"); - Replaceall(unnamed, "$", ""); - query = unnamed; - } - - Node *node = Swig_symbol_clookup(query, symtab); - if (node) - newtype = NewStringf("enum %s", Getattr(node, "name")); - else - newtype = SwigType_str(enumtype, 0); - - return newtype; - } - /* ---------------------------------------------------------------------- * functionWrapper() * ---------------------------------------------------------------------- */ @@ -534,10 +498,6 @@ ready: if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { Printv(return_type, SwigType_str(type, 0), NIL); } - else if (SwigType_isenum(type)) { - type = return_type = make_enum_type(n, type); - Setattr(n, "type", return_type); - } else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { String *ctypeout = Getattr(n, "tmap:couttype:out"); if (ctypeout) @@ -662,18 +622,9 @@ ready: String *arg_name = NewString(""); Printf(arg_name, "c%s", lname); - bool dont_apply_tmap = false; // set the appropriate type for parameter - if (SwigType_isenum(type)) { - c_parm_type = make_enum_type(n, type); - if (Getattr(n, "unnamed")) { - type = int_string; - Setattr(p, "type", type); - dont_apply_tmap = true; - } - } - else if ((tm = Getattr(p, "tmap:ctype"))) { + if ((tm = Getattr(p, "tmap:ctype"))) { Printv(c_parm_type, tm, NIL); } else { @@ -699,14 +650,9 @@ ready: p = Getattr(p, "tmap:in:next"); } else if ((tm = Getattr(p, "tmap:in"))) { - if (dont_apply_tmap) { - Printv(wrapper->code, lname, " = ", arg_name, ";\n", NIL); - } - else { - Replaceall(tm, "$input", arg_name); - Setattr(p, "emit:input", arg_name); - Printf(wrapper->code, "%s\n", tm); - } + Replaceall(tm, "$input", arg_name); + Setattr(p, "emit:input", arg_name); + Printf(wrapper->code, "%s\n", tm); p = Getattr(p, "tmap:in:next"); } else { @@ -1321,82 +1267,10 @@ ready: /* --------------------------------------------------------------------- * enumDeclaration() - * - * for enums declared inside class we create global enum declaration - * and change enum parameter and return value names * --------------------------------------------------------------------- */ virtual int enumDeclaration(Node *n) { - if (!proxy_flag) - return SWIG_OK; - String *newclassname = Getattr(Swig_methodclass(n), "sym:name"); - String *name = Getattr(n, "sym:name"); - String *code = NewString(""); - String *tdname = Getattr(n, "tdname"); - - if (tdname) { - Printf(code, "typedef "); - name = Getattr(n, "name"); - String *td_def_name = NewStringf("enum %s", name); - SwigType_typedef(td_def_name, name); - Delete(td_def_name); - SwigType_istypedef(name); - } - - Symtab *symtab = Getattr(n, "sym:symtab"); - String *newname = newclassname ? NewStringf("%s_", newclassname) : Copy(name); - - Printf(code, "enum "); - - if (!name) { - String *anonymous_name = NewStringf("enum%d ", enum_id++); - Setattr(n, "sym:name", anonymous_name); - Setattr(n, "unnamed", "1"); - name = Getattr(n, "sym:name"); - Delete(anonymous_name); - } - if (Delattr(n, "unnamed")) { - // unnamed enum declaration: create new symbol - Replaceall(name, "$unnamed", "enum"); - Delitem(name, DOH_END); - - Node *entry = NewHash(); - set_nodeType(entry, "enum"); - Setattr(entry, "name", name); - Setattr(entry, "sym:name", name); - Setattr(entry, "sym:symtab", symtab); - Swig_symbol_add(name, entry); - } - if (newclassname) { - if (symtab) { - Node *node = Swig_symbol_clookup(name, symtab); - if (node) - Append(newname, name); - } - else - Append(newname, "enum"); - - Setattr(n, "name", newname); - } - else { - Delete(newname); - newname = name; - } - Printv(code, newname ? newname : "", " {\n$enumvalues\n} ", tdname ? tdname : "", ";\n\n", NIL); - emit_children(n); - - if (enum_values) { - Replaceall(code, "$enumvalues", enum_values); - Append(f_proxy_header, code); - if (newclassname) - Append(f_header, code); - Delete(enum_values); - enum_values = 0; - } - - Delete(newname); - Delete(code); - return SWIG_OK; + return Language::enumDeclaration(n); } /* --------------------------------------------------------------------- @@ -1404,55 +1278,14 @@ ready: * --------------------------------------------------------------------- */ virtual int enumvalueDeclaration(Node *n) { - String *name = Getattr(n, "sym:name"); - String *enumvalue = Getattr(n, "enumvalue"); - String *init = 0; - if (enumvalue) { - char *value_repr = Char(enumvalue); - if (value_repr) - if (!isdigit(*value_repr) && *value_repr != '+' && *value_repr != '-') { - init = NewStringf(" = '%c'", *value_repr); - } - else - init = NewStringf(" = %s", enumvalue); - } - - String *newclassname = Getattr(Swig_methodclass(parentNode(n)), "sym:name"); - String *newname = NewStringf("%s_%s", newclassname, name); - int gencomma = 1; - if (!enum_values) { - enum_values = NewString(""); - gencomma = 0; - } - Printv(enum_values, gencomma ? ",\n " : " ", newclassname ? newname : name, enumvalue ? init : "", NIL); - Delete(newname); - if (init) - Delete(init); - return SWIG_OK; - } - - /* --------------------------------------------------------------------- - * typedefHandler() - * --------------------------------------------------------------------- */ - - virtual int typedefHandler(Node *n) { - if (!proxy_flag) - return SWIG_OK; - String *name = Getattr(n, "sym:name"); - String *type = Getattr(n, "type"); - char *c = Char(SwigType_str(type, 0)); - - if (!name) - name = Getattr(n, "name"); - - if (strncmp(c, "enum", 4) != 0) { - if (name && type) { - String *code = NewStringf("typedef %s %s;\n\n", name, type); - Append(f_proxy_header, code); - Delete(code); - SwigType_typedef(type, name); - } - } + if (Cmp(Getattr(n, "ismember"), "1") == 0 && Cmp(Getattr(n, "access"), "public") != 0) + return SWIG_NOWRAP; + Swig_require("enumvalueDeclaration", n, "*value", "?enumvalueex", "?enumvalue", NIL); + String *name = Getattr(n, "value"); + String *value = Getattr(n, "enumvalueex"); + value = value ? value : Getattr(n, "enumvalue"); + Printv(f_proxy_header, "#define ", Swig_name_mangle(name), " ", value, "\n", NIL); + Swig_restore(n); return SWIG_OK; } diff --git a/Tools/config/config.guess b/Tools/config/config.guess index 396482d6c..7b24a8728 100755 --- a/Tools/config/config.guess +++ b/Tools/config/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2008-11-15' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -329,8 +330,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -531,7 +545,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -780,7 +794,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +804,18 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -829,7 +849,14 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -921,6 +948,9 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -950,6 +980,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -968,9 +1001,6 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1199,6 +1229,9 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1208,6 +1241,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1458,9 +1500,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/Tools/config/config.sub b/Tools/config/config.sub index fab0aa355..053e7381f 100755 --- a/Tools/config/config.sub +++ b/Tools/config/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2008-09-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,17 +245,19 @@ case $basic_machine in | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -286,7 +288,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -324,19 +326,21 @@ case $basic_machine in | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -364,14 +368,18 @@ case $basic_machine in | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -443,10 +451,22 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -475,8 +495,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -514,6 +534,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -668,6 +692,14 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +715,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +845,14 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -925,6 +969,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1014,6 +1061,10 @@ case $basic_machine in basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1089,6 +1140,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1209,7 +1264,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1219,7 +1274,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1349,6 +1404,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1414,6 +1472,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; From 8c74fa0f46faf347b936eec202543fc3dd591946 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Sat, 11 Apr 2009 16:46:47 +0000 Subject: [PATCH 051/508] Merged with recent changes from trunk. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11187 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 22 +- CCache/COPYING | 339 ++++ CCache/Makefile.in | 73 + CCache/README | 31 + CCache/README.swig | 8 + CCache/args.c | 91 + CCache/ccache.c | 1388 ++++++++++++++ CCache/ccache.h | 205 ++ CCache/ccache.yo | 422 +++++ CCache/ccache_swig_config.h.in | 1 + CCache/cleanup.c | 193 ++ CCache/configure.in | 87 + CCache/debian/NEWS | 22 + CCache/debian/README.Debian | 59 + CCache/debian/changelog | 221 +++ CCache/debian/compat | 1 + CCache/debian/control | 20 + CCache/debian/copyright | 29 + CCache/debian/dirs | 3 + CCache/debian/docs | 1 + CCache/debian/examples | 2 + CCache/debian/patches/01_no_home.diff | 100 + .../debian/patches/02_ccache-compressed.diff | 1026 ++++++++++ CCache/debian/patches/03_long_options.diff | 133 ++ CCache/debian/patches/04_ignore_profile.diff | 13 + CCache/debian/patches/05_nfs_fix.diff | 45 + CCache/debian/patches/06_md.diff | 77 + CCache/debian/patches/07_cachedirtag.diff | 75 + CCache/debian/patches/08_manpage_hyphens.diff | 89 + CCache/debian/patches/09_respect_ldflags.diff | 11 + CCache/debian/patches/10_lru_cleanup.diff | 23 + CCache/debian/patches/11_utimes.diff | 85 + .../patches/12_cachesize_permissions.diff | 83 + CCache/debian/patches/13_html_links.diff | 33 + CCache/debian/patches/14_hardlink_doc.diff | 48 + CCache/debian/patches/CREDITS | 47 + CCache/debian/rules | 141 ++ CCache/debian/update-ccache | 43 + CCache/debian/watch | 2 + CCache/execute.c | 286 +++ CCache/hash.c | 80 + CCache/install-sh | 238 +++ CCache/mdfour.c | 284 +++ CCache/mdfour.h | 36 + CCache/packaging/README | 5 + CCache/packaging/ccache.spec | 37 + CCache/snprintf.c | 962 ++++++++++ CCache/stats.c | 361 ++++ CCache/test.sh | 452 +++++ CCache/unify.c | 307 +++ CCache/util.c | 884 +++++++++ CCache/web/index.html | 158 ++ CHANGES | 508 ++++- CHANGES.current | 19 +- Doc/Manual/Allegrocl.html | 112 +- Doc/Manual/CSharp.html | 377 +++- Doc/Manual/Chicken.html | 40 +- Doc/Manual/Contents.html | 111 +- Doc/Manual/Customization.html | 14 + Doc/Manual/Extending.html | 108 +- Doc/Manual/Guile.html | 42 +- Doc/Manual/Introduction.html | 3 +- Doc/Manual/Java.html | 244 +-- Doc/Manual/Library.html | 6 +- Doc/Manual/Lisp.html | 26 +- Doc/Manual/Lua.html | 356 +++- Doc/Manual/Makefile | 13 +- Doc/Manual/Modula3.html | 54 +- Doc/Manual/Modules.html | 81 +- Doc/Manual/Mzscheme.html | 4 +- Doc/Manual/Ocaml.html | 62 +- Doc/Manual/Octave.html | 46 +- Doc/Manual/Perl5.html | 94 +- Doc/Manual/Php.html | 227 +-- Doc/Manual/Pike.html | 24 +- Doc/Manual/Preprocessor.html | 11 +- Doc/Manual/Python.html | 410 +++- Doc/Manual/R.html | 16 +- Doc/Manual/Ruby.html | 198 +- Doc/Manual/SWIG.html | 42 +- Doc/Manual/Sections.html | 3 +- Doc/Manual/Tcl.html | 90 +- Doc/Manual/Typemaps.html | 62 +- Doc/Manual/Warnings.html | 2 +- Doc/Manual/Windows.html | 2 +- Doc/Manual/chapters | 2 +- Doc/Manual/swig16.png | Bin Doc/README | 3 +- Examples/GIFPlot/Java/full/README | 6 +- .../Java/full/{main.java => runme.java} | 2 +- Examples/GIFPlot/Java/shadow/Makefile | 5 +- Examples/GIFPlot/Java/shadow/README | 4 +- .../Java/shadow/{main.java => runme.java} | 2 +- Examples/GIFPlot/Java/simple/README | 2 +- .../Java/simple/{main.java => runme.java} | 2 +- Examples/GIFPlot/Lib/color.c | 5 +- Examples/GIFPlot/Lib/gif.c | 8 +- Examples/GIFPlot/Perl5/shadow/Makefile | 7 +- Examples/GIFPlot/{Php4 => Php}/check.list | 0 Examples/GIFPlot/{Php4 => Php}/full/Makefile | 4 +- Examples/GIFPlot/{Php4 => Php}/full/README | 0 Examples/GIFPlot/{Php4 => Php}/full/cmap | Bin Examples/GIFPlot/{Php4 => Php}/full/gifplot.i | 0 .../full/runme.php4 => Php/full/runme.php} | 0 .../GIFPlot/{Php4 => Php}/shadow/Makefile | 4 +- Examples/GIFPlot/{Php4 => Php}/shadow/README | 0 Examples/GIFPlot/{Php4 => Php}/shadow/cmap | Bin .../runme.php4 => Php/shadow/runme.php} | 0 .../GIFPlot/{Php4 => Php}/simple/Makefile | 4 +- Examples/GIFPlot/{Php4 => Php}/simple/README | 0 .../runme.php4 => Php/simple/runme.php} | 0 .../GIFPlot/{Php4 => Php}/simple/simple.i | 0 Examples/GIFPlot/Python/full/Makefile | 3 +- Examples/GIFPlot/Python/shadow/Makefile | 10 +- Examples/GIFPlot/Python/simple/Makefile | 3 +- Examples/GIFPlot/Ruby/shadow/Makefile | 7 +- Examples/Makefile.in | 260 +-- Examples/csharp/arrays/Makefile | 20 + Examples/csharp/arrays/example.c | 22 + Examples/csharp/arrays/example.h | 4 + Examples/csharp/arrays/example.i | 45 + Examples/csharp/arrays/runme.cs | 43 + Examples/csharp/check.list | 1 + Examples/guile/matrix/matrix.scm | 0 .../java/callback/{main.java => runme.java} | 2 +- Examples/java/class/index.html | 2 +- Examples/java/class/{main.java => runme.java} | 2 +- Examples/java/constants/index.html | 2 +- .../java/constants/{main.java => runme.java} | 2 +- Examples/java/enum/index.html | 2 +- Examples/java/enum/{main.java => runme.java} | 2 +- .../java/extend/{main.java => runme.java} | 2 +- Examples/java/funcptr/index.html | 2 +- .../java/funcptr/{main.java => runme.java} | 2 +- Examples/java/index.html | 4 +- .../java/multimap/{main.java => runme.java} | 2 +- Examples/java/native/index.html | 2 +- .../java/native/{main.java => runme.java} | 2 +- Examples/java/pointer/index.html | 2 +- .../java/pointer/{main.java => runme.java} | 2 +- Examples/java/reference/index.html | 2 +- .../java/reference/{main.java => runme.java} | 2 +- Examples/java/simple/index.html | 8 +- .../java/simple/{main.java => runme.java} | 2 +- Examples/java/template/index.html | 2 +- .../java/template/{main.java => runme.java} | 2 +- Examples/java/typemap/index.html | 2 +- .../java/typemap/{main.java => runme.java} | 2 +- Examples/java/variables/index.html | 2 +- .../java/variables/{main.java => runme.java} | 2 +- Examples/lua/embed3/embed3.cpp | 7 +- Examples/perl5/class/example.dsp | 4 +- Examples/perl5/import/bar.dsp | 4 +- Examples/perl5/import/base.dsp | 4 +- Examples/perl5/import/foo.dsp | 4 +- Examples/perl5/import/spam.dsp | 4 +- Examples/perl5/multimap/example.dsp | 4 +- Examples/perl5/simple/example.dsp | 4 +- Examples/{php4 => php}/check.list | 0 Examples/{php4/enum => php/class}/Makefile | 10 +- Examples/{php4 => php}/class/example.cxx | 0 Examples/{php4 => php}/class/example.h | 0 Examples/{php4 => php}/class/example.i | 0 .../class/runme.php4 => php/class/runme.php} | 0 Examples/{php4 => php}/constants/Makefile | 10 +- Examples/{php4 => php}/constants/example.i | 0 .../runme.php4 => php/constants/runme.php} | 0 .../{php4/simple => php/cpointer}/Makefile | 10 +- Examples/{php4 => php}/cpointer/example.c | 0 Examples/{php4 => php}/cpointer/example.i | 0 .../runme.php4 => php/cpointer/runme.php} | 0 Examples/{php4/proxy => php/disown}/Makefile | 10 +- Examples/{php4 => php}/disown/example.cxx | 0 Examples/{php4 => php}/disown/example.h | 0 Examples/{php4 => php}/disown/example.i | 0 .../runme.php4 => php/disown/runme.php} | 0 .../{php4/reference => php/enum}/Makefile | 10 +- Examples/{php4 => php}/enum/example.cxx | 0 Examples/{php4 => php}/enum/example.h | 0 Examples/{php4 => php}/enum/example.i | 0 .../enum/runme.php4 => php/enum/runme.php} | 0 .../{php4/cpointer => php/funcptr}/Makefile | 10 +- Examples/{php4 => php}/funcptr/example.c | 0 Examples/{php4 => php}/funcptr/example.h | 0 Examples/{php4 => php}/funcptr/example.i | 0 .../runme.php4 => php/funcptr/runme.php} | 0 Examples/{php4 => php}/overloading/Makefile | 10 +- .../{php4 => php}/overloading/example.cxx | 10 +- Examples/{php4 => php}/overloading/example.h | 10 +- Examples/{php4 => php}/overloading/example.i | 0 .../runme.php4 => php/overloading/runme.php} | 0 .../{php4/funcptr => php/pointer}/Makefile | 10 +- Examples/{php4 => php}/pointer/example.c | 0 Examples/{php4 => php}/pointer/example.i | 0 .../runme.php4 => php/pointer/runme.php} | 0 Examples/{php4 => php}/pragmas/Makefile | 10 +- Examples/{php4 => php}/pragmas/example.i | 8 +- Examples/{php4 => php}/pragmas/include.php | 0 .../runme.php4 => php/pragmas/runme.php} | 0 Examples/{php4/sync => php/proxy}/Makefile | 10 +- Examples/{php4 => php}/proxy/example.cxx | 0 Examples/{php4 => php}/proxy/example.h | 0 Examples/{php4 => php}/proxy/example.i | 0 .../proxy/runme.php4 => php/proxy/runme.php} | 0 .../{php4/class => php/reference}/Makefile | 10 +- Examples/{php4 => php}/reference/example.cxx | 0 Examples/{php4 => php}/reference/example.h | 0 Examples/{php4 => php}/reference/example.i | 0 .../{php4 => php}/reference/runme-proxy.php4 | 0 .../runme.php4 => php/reference/runme.php} | 0 .../{php4/pointer => php/simple}/Makefile | 10 +- Examples/{php4 => php}/simple/example.c | 0 Examples/{php4 => php}/simple/example.i | 0 .../runme.php4 => php/simple/runme.php} | 0 Examples/{php4/disown => php/sync}/Makefile | 10 +- Examples/{php4 => php}/sync/example.cxx | 2 +- Examples/{php4 => php}/sync/example.h | 0 Examples/{php4 => php}/sync/example.i | 0 .../sync/runme.php4 => php/sync/runme.php} | 0 Examples/{php4 => php}/value/Makefile | 10 +- Examples/{php4 => php}/value/example.c | 0 Examples/{php4 => php}/value/example.h | 0 Examples/{php4 => php}/value/example.i | 0 .../value/runme.php4 => php/value/runme.php} | 0 Examples/php/variables/Makefile | 24 + Examples/{php4 => php}/variables/example.c | 0 Examples/{php4 => php}/variables/example.h | 0 Examples/{php4 => php}/variables/example.i | 0 .../runme.php4 => php/variables/runme.php} | 0 .../{php4 => php}/variables/runme.php4.old | 0 Examples/php4/reference/BUILD-proxy.sh | 5 - Examples/php4/variables/Makefile | 24 - Examples/pike/class/Makefile | 0 Examples/pike/class/example.cxx | 0 Examples/pike/class/example.h | 0 Examples/pike/class/example.i | 0 Examples/pike/constants/Makefile | 0 Examples/pike/constants/example.i | 0 Examples/pike/overload/example.cxx | 0 Examples/pike/overload/example.h | 0 Examples/pike/template/Makefile | 0 Examples/pike/template/example.h | 0 Examples/pike/template/example.i | 0 Examples/python/callback/Makefile | 1 + Examples/python/class/Makefile | 1 + Examples/python/class/example.dsp | 4 +- Examples/python/class/example.i | 4 - Examples/python/constants/Makefile | 1 + Examples/python/contract/Makefile | 1 + Examples/python/contract/example.dsp | 4 +- Examples/python/docstrings/Makefile | 1 + Examples/python/enum/Makefile | 1 + Examples/python/exception/Makefile | 1 + Examples/python/exceptproxy/Makefile | 1 + Examples/python/extend/Makefile | 1 + Examples/python/funcptr/Makefile | 1 + Examples/python/funcptr2/Makefile | 1 + Examples/python/functor/Makefile | 1 + Examples/python/import/Makefile | 1 + Examples/python/import/bar.dsp | 4 +- Examples/python/import/base.dsp | 4 +- Examples/python/import/foo.dsp | 4 +- Examples/python/import/spam.dsp | 4 +- Examples/python/import_template/Makefile | 1 + Examples/python/libffi/Makefile | 1 + Examples/python/multimap/Makefile | 1 + Examples/python/multimap/example.dsp | 4 +- Examples/python/multimap/example.i | 34 +- Examples/python/operator/Makefile | 1 + Examples/python/pointer/Makefile | 1 + Examples/python/reference/Makefile | 1 + Examples/python/simple/Makefile | 1 + Examples/python/simple/example.dsp | 4 +- Examples/python/smartptr/Makefile | 1 + Examples/python/std_map/Makefile | 1 + Examples/python/std_map/example.i | 4 +- Examples/python/std_vector/Makefile | 1 + Examples/python/swigrun/Makefile | 1 + Examples/python/template/Makefile | 1 + Examples/python/varargs/Makefile | 1 + Examples/python/variables/Makefile | 1 + Examples/python/weave/Makefile | 1 + Examples/r/class/example.dsp | 4 +- Examples/r/simple/example.dsp | 4 +- Examples/ruby/class/example.dsp | 4 +- Examples/ruby/free_function/example.dsp | 4 +- Examples/ruby/free_function/example.i | 4 +- Examples/ruby/hashargs/Makefile | 0 Examples/ruby/hashargs/example.i | 0 Examples/ruby/import/bar.dsp | 4 +- Examples/ruby/import/base.dsp | 4 +- Examples/ruby/import/foo.dsp | 4 +- Examples/ruby/import/spam.dsp | 4 +- Examples/ruby/mark_function/example.dsp | 4 +- Examples/ruby/multimap/example.dsp | 4 +- Examples/ruby/simple/example.dsp | 4 +- Examples/ruby/std_vector/runme.rb | 8 +- Examples/tcl/class/example.dsp | 4 +- Examples/tcl/contract/example.dsp | 4 +- Examples/tcl/import/bar.dsp | 4 +- Examples/tcl/import/base.dsp | 4 +- Examples/tcl/import/foo.dsp | 4 +- Examples/tcl/import/spam.dsp | 4 +- Examples/tcl/multimap/example.dsp | 4 +- Examples/tcl/simple/example.dsp | 4 +- Examples/test-suite/abstract_virtual.i | 4 +- Examples/test-suite/allegrocl/Makefile.in | 114 +- Examples/test-suite/allowexcept.i | 14 +- .../test-suite/{python => }/argcargvtest.i | 0 Examples/test-suite/c/Makefile.in | 2 + Examples/test-suite/{python => }/callback.i | 0 Examples/test-suite/char_strings.i | 6 + Examples/test-suite/chicken/Makefile.in | 2 +- ...est_runme.ss => chicken_ext_test_runme.ss} | 2 +- .../ext_test.i => chicken_ext_test.i} | 2 +- Examples/test-suite/common.mk | 25 +- .../test-suite/{python => }/complextest.i | 0 Examples/test-suite/contract.i | 32 +- Examples/test-suite/csharp/Makefile.in | 13 +- .../csharp/csharp_lib_arrays_runme.cs | 70 + .../test-suite/csharp/director_basic_runme.cs | 74 + .../test-suite/csharp/li_attribute_runme.cs | 78 + .../csharp/li_boost_shared_ptr_runme.cs | 10 + .../test-suite/csharp/li_std_vector_runme.cs | 34 +- Examples/test-suite/csharp_lib_arrays.i | 61 + Examples/test-suite/csharp_prepost.i | 101 +- Examples/test-suite/default_constructor.i | 4 +- Examples/test-suite/director_basic.i | 6 +- Examples/test-suite/director_classic.i | 0 Examples/test-suite/director_ignore.i | 0 .../{python => }/director_profile.i | 0 .../director_protected_overloaded.i | 21 + .../test-suite/{python => }/director_stl.i | 0 Examples/test-suite/director_thread.i | 19 +- Examples/test-suite/evil_diamond.i | 2 +- Examples/test-suite/evil_diamond_ns.i | 2 +- Examples/test-suite/evil_diamond_prop.i | 2 +- Examples/test-suite/features.i | 17 + Examples/test-suite/global_namespace.i | 60 + Examples/test-suite/guile/Makefile.in | 2 +- Examples/test-suite/guilescm/Makefile.in | 4 +- ..._runme.scm => guilescm_ext_test_runme.scm} | 2 +- .../ext_test.i => guilescm_ext_test.i} | 2 +- Examples/test-suite/{python/iadd.h => iadd.i} | 11 + .../test-suite/ignore_template_constructor.i | 6 + .../test-suite/{octave => }/implicittest.i | 0 Examples/test-suite/import_nomodule.i | 3 + Examples/test-suite/imports_b.i | 9 +- Examples/test-suite/{python => }/inout.i | 0 Examples/test-suite/{python => }/inplaceadd.i | 0 Examples/test-suite/{python => }/input.i | 0 Examples/test-suite/insert_directive.i | 38 + Examples/test-suite/intermediary_classname.i | 1 + Examples/test-suite/java/Makefile.in | 4 +- .../test-suite/java/allprotected_runme.java | 0 .../test-suite/java/director_basic_runme.java | 57 +- .../java/director_classic_runme.java | 0 .../java/director_ignore_runme.java | 0 .../java/global_namespace_runme.java | 25 + .../test-suite/java/java_throws_runme.java | 15 + .../java/li_boost_intrusive_ptr_runme.java | 701 +++++++ .../java/li_boost_shared_ptr_runme.java | 10 + .../java/overload_complicated_runme.java | 0 Examples/test-suite/java_throws.i | 38 + Examples/test-suite/li_attribute.i | 31 + Examples/test-suite/li_boost_intrusive_ptr.i | 494 +++++ Examples/test-suite/li_boost_shared_ptr.i | 38 +- Examples/test-suite/li_cstring.i | 8 +- Examples/test-suite/li_cwstring.i | 8 +- .../test-suite/{python => }/li_std_carray.i | 0 .../test-suite/{ruby => }/li_std_functors.i | 0 Examples/test-suite/{perl5 => }/li_std_list.i | 0 Examples/test-suite/li_std_map.i | 9 +- .../li_std_pair.i => li_std_pair_extra.i} | 2 +- .../{ruby => }/li_std_pair_lang_object.i | 0 Examples/test-suite/{ruby => }/li_std_queue.i | 0 Examples/test-suite/li_std_set.i | 8 +- Examples/test-suite/{ruby => }/li_std_stack.i | 0 .../li_std_string.i => li_std_string_extra.i} | 4 +- Examples/test-suite/li_std_vector.i | 2 + .../li_std_vector.i => li_std_vector_extra.i} | 12 +- Examples/test-suite/li_std_vector_ptr.i | 29 + .../test-suite/{python => }/li_std_vectora.i | 0 .../test-suite/{python => }/li_std_wstream.i | 0 Examples/test-suite/minherit2.i | 2 +- Examples/test-suite/multiple_inheritance.i | 4 +- Examples/test-suite/name_warnings.i | 3 +- Examples/test-suite/namespace_typemap.i | 2 +- Examples/test-suite/nested_comment.i | 27 +- Examples/test-suite/nested_structs.i | 22 + Examples/test-suite/ocaml/Makefile.in | 2 +- Examples/test-suite/octave/Makefile.in | 4 +- .../test-suite/octave/li_attribute_runme.m | 38 +- .../octave/li_std_pair_extra_runme.m | 69 + .../test-suite/octave/li_std_pair_runme.m | 69 - Examples/test-suite/octave/li_std_string.i | 55 - .../octave/li_std_string_extra_runme.m | 162 ++ .../test-suite/octave/li_std_string_runme.m | 162 -- ...eref_runme.m => octave_cell_deref_runme.m} | 2 +- .../cell_deref.i => octave_cell_deref.i} | 2 +- Examples/test-suite/operator_overload.i | 6 + Examples/test-suite/operbool.i | 12 + Examples/test-suite/packageoption.h | 9 +- Examples/test-suite/packageoption.list | 1 + Examples/test-suite/packageoption_a.i | 10 +- Examples/test-suite/packageoption_b.i | 2 +- Examples/test-suite/packageoption_c.i | 13 + .../test-suite/perl5/char_strings_runme.pl | 5 +- .../test-suite/perl5/li_typemaps_runme.pl | 39 +- .../test-suite/perl5/packageoption_runme.pl | 8 +- Examples/test-suite/{php4 => php}/Makefile.in | 25 +- .../abstract_inherit_ok_runme.php} | 2 +- .../abstract_inherit_runme.php} | 2 +- .../add_link_runme.php} | 2 +- .../argout_runme.php} | 2 +- .../arrayptr_runme.php} | 2 +- .../arrays_global_runme.php} | 12 +- .../arrays_global_twodim_runme.php} | 2 +- .../arrays_runme.php} | 2 +- .../arrays_scope_runme.php} | 2 +- .../casts_runme.php4 => php/casts_runme.php} | 2 +- .../class_ignore_runme.php} | 2 +- .../conversion_namespace_runme.php} | 2 +- .../conversion_ns_template_runme.php} | 2 +- .../conversion_runme.php} | 2 +- .../cpp_static_runme.php} | 2 +- .../enum_scope_template_runme.php} | 2 +- .../evil_diamond_ns_runme.php} | 2 +- .../evil_diamond_prop_runme.php} | 2 +- .../evil_diamond_runme.php} | 2 +- .../extend_template_ns_runme.php} | 2 +- .../extend_template_runme.php} | 2 +- .../grouping_runme.php} | 2 +- .../ignore_parameter_runme.php} | 2 +- .../li_carrays_runme.php} | 2 +- .../li_std_string_runme.php} | 2 +- .../rename_scope_runme.php} | 2 +- .../{php4/skel.php4 => php/skel.php} | 2 +- .../smart_pointer_rename_runme.php} | 2 +- .../sym_runme.php4 => php/sym_runme.php} | 2 +- .../template_arg_typename_runme.php} | 2 +- .../template_construct_runme.php} | 2 +- .../{php4/tests.php4 => php/tests.php} | 4 +- .../typedef_reference_runme.php} | 2 +- .../typemap_ns_using_runme.php} | 2 +- .../using1_runme.php} | 2 +- .../using2_runme.php} | 2 +- .../valuewrapper_base_runme.php} | 2 +- ...amewarn_rename.i => php_namewarn_rename.i} | 2 +- Examples/test-suite/preproc.i | 5 + Examples/test-suite/pure_virtual.i | 6 +- Examples/test-suite/python/Makefile.in | 83 +- Examples/test-suite/python/README | 6 +- Examples/test-suite/python/contract_runme.py | 8 + .../test-suite/python/cpp_namespace_runme.py | 20 +- .../test-suite/python/cpp_static_runme.py | 7 + .../python/director_classic_runme.py | 68 +- .../python/director_exception_runme.py | 50 +- .../python/director_thread_runme.py | 2 + Examples/test-suite/python/file_test_runme.py | 3 +- Examples/test-suite/python/hugemod.pl | 8 +- Examples/test-suite/python/iadd.i | 12 - Examples/test-suite/python/implicittest.i | 68 - .../test-suite/python/li_attribute_runme.py | 36 +- .../python/li_boost_shared_ptr_runme.py | 9 + Examples/test-suite/python/li_std_map.i | 58 - Examples/test-suite/python/li_std_pair.i | 210 --- .../python/li_std_pair_extra_runme.py | 59 + .../test-suite/python/li_std_pair_runme.py | 59 - Examples/test-suite/python/li_std_set.i | 17 - Examples/test-suite/python/li_std_stream.i | 59 - ..._runme.py => li_std_string_extra_runme.py} | 66 +- ..._runme.py => li_std_vector_extra_runme.py} | 23 +- .../python/li_std_vector_ptr_runme.py | 8 + Examples/test-suite/python/li_std_wstring.i | 89 - Examples/test-suite/python/operbool_runme.py | 4 + .../python/python_abstractbase_runme3.py | 8 + .../test-suite/python/python_append_runme.py | 4 + ...kwargs_runme.py => python_kwargs_runme.py} | 2 +- ...ic_runme.py => python_nondynamic_runme.py} | 10 +- ...y => python_overload_simple_cast_runme.py} | 2 +- .../test-suite/python/python_pybuf_runme3.py | 42 + .../python/rename_strip_encoder_runme.py | 6 + Examples/test-suite/python/std_containers.i | 199 -- .../test-suite/python/swigobject_runme.py | 10 +- .../python/tag_no_clash_with_variable_runme.i | 3 - .../python/template_typedef_cplx2_runme.py | 13 +- .../python/template_typedef_cplx_runme.py | 13 +- Examples/test-suite/python/vector.i | 51 - Examples/test-suite/python_abstractbase.i | 18 + Examples/test-suite/python_append.i | 32 + .../{python/autodoc.i => python_autodoc.i} | 2 +- .../{python/kwargs.i => python_kwargs.i} | 2 +- .../nondynamic.i => python_nondynamic.i} | 2 +- ...e_cast.i => python_overload_simple_cast.i} | 2 +- Examples/test-suite/python_pybuf.i | 64 + Examples/test-suite/r/Makefile.in | 4 +- .../test-suite/r/arrays_dimensionless_runme.R | 20 + Examples/test-suite/r/double_delete_runme.R | 12 - Examples/test-suite/r/integers_runme.R | 20 + ...y_struct_runme.R => r_copy_struct_runme.R} | 9 +- Examples/test-suite/r/r_double_delete_runme.R | 9 + .../r/{legacy_runme.R => r_legacy_runme.R} | 4 +- .../{r/copy_struct.i => r_copy_struct.i} | 2 +- .../{r/double_delete.i => r_double_delete.i} | 3 +- .../test-suite/{r/legacy.i => r_legacy.i} | 2 +- Examples/test-suite/rename_strip_encoder.i | 16 + Examples/test-suite/ruby/Makefile.in | 14 +- ...ywords_runme.rb => ruby_keywords_runme.rb} | 4 +- ...ed_runme.rb => ruby_li_std_speed_runme.rb} | 4 +- .../{naming_runme.rb => ruby_naming_runme.rb} | 40 +- ... => ruby_track_objects_directors_runme.rb} | 8 +- ...s_runme.rb => ruby_track_objects_runme.rb} | 24 +- .../{ruby/keywords.i => ruby_keywords.i} | 2 +- .../li_std_speed.i => ruby_li_std_speed.i} | 4 +- .../{ruby/naming.i => ruby_naming.i} | 2 +- .../track_objects.i => ruby_track_objects.i} | 2 +- ...ctors.i => ruby_track_objects_directors.i} | 2 +- Examples/test-suite/{r => }/simple_array.i | 0 Examples/test-suite/{python => }/simutry.i | 0 Examples/test-suite/{ruby => }/stl_new.i | 0 Examples/test-suite/swig_examples_lock.h | 17 +- Examples/test-suite/{python => }/swigobject.i | 2 +- Examples/test-suite/tcl/Makefile.in | 5 +- ...on_runme.tcl => union_parameter_runme.tcl} | 2 +- .../test-suite/template_inherit_abstract.i | 4 +- .../test-suite/{python => }/template_matrix.i | 0 .../test-suite/template_typedef_funcptr.i | 5 + Examples/test-suite/typemap_namespace.i | 2 +- Examples/test-suite/types_directive.i | 8 + .../{tcl/union.i => union_parameter.i} | 2 +- Examples/test-suite/using_composition.i | 6 +- Examples/test-suite/using_extend.i | 2 +- Examples/test-suite/using_namespace.i | 2 +- Lib/allegrocl/allegrocl.swg | 199 +- Lib/allegrocl/inout_typemaps.i | 0 Lib/allegrocl/longlongs.i | 0 Lib/allegrocl/std_list.i | 0 Lib/allegrocl/std_string.i | 0 Lib/allkw.swg | 2 +- Lib/cdata.i | 9 +- Lib/chicken/chicken.swg | 1 + Lib/chicken/chickenrun.swg | 1 + Lib/csharp/arrays_csharp.i | 140 ++ Lib/csharp/boost_shared_ptr.i | 22 +- Lib/csharp/csharp.swg | 25 +- Lib/csharp/std_vector.i | 83 +- Lib/csharp/std_wstring.i | 0 Lib/csharp/wchar.i | 0 Lib/intrusive_ptr.i | 96 + Lib/java/boost_intrusive_ptr.i | 460 +++++ Lib/java/boost_shared_ptr.i | 22 +- Lib/java/java.swg | 34 +- Lib/java/javahead.swg | 2 +- Lib/java/std_vector.i | 34 + Lib/lua/luatypemaps.swg | 25 +- Lib/ocaml/std_deque.i | 2 +- Lib/octave/carrays.i | 2 +- Lib/octave/octcontainer.swg | 10 +- Lib/octave/octopers.swg | 116 +- Lib/octave/octrun.swg | 117 +- Lib/octave/octruntime.swg | 1 + Lib/octave/octstdcommon.swg | 2 +- Lib/octave/std_basic_string.i | 38 +- Lib/octave/std_carray.i | 6 +- Lib/octave/std_map.i | 14 +- Lib/perl5/noembed.h | 6 + Lib/perl5/perlrun.swg | 25 +- Lib/perl5/perlstrings.swg | 5 + Lib/perl5/perltypemaps.swg | 1 + Lib/perl5/std_vector.i | 4 +- Lib/{php4 => php}/const.i | 0 Lib/{php4 => php}/globalvar.i | 2 +- Lib/{php4/php4.swg => php/php.swg} | 47 +- Lib/{php4/php4init.swg => php/phpinit.swg} | 0 Lib/{php4/php4kw.swg => php/phpkw.swg} | 4 +- Lib/{php4 => php}/phppointers.i | 0 Lib/{php4/php4run.swg => php/phprun.swg} | 12 +- Lib/{php4 => php}/std_common.i | 0 Lib/{php4 => php}/std_deque.i | 0 Lib/{php4 => php}/std_map.i | 4 + Lib/{php4 => php}/std_pair.i | 0 Lib/{php4 => php}/std_string.i | 0 Lib/{php4 => php}/std_vector.i | 2 + Lib/{php4 => php}/stl.i | 0 Lib/{php4 => php}/typemaps.i | 96 +- Lib/{php4 => php}/utils.i | 12 +- Lib/python/boost_shared_ptr.i | 14 +- Lib/python/director.swg | 9 +- Lib/python/file.i | 4 +- Lib/python/pyabc.i | 10 + Lib/python/pyapi.swg | 14 + Lib/python/pybuffer.i | 107 ++ Lib/python/pyclasses.swg | 62 +- Lib/python/pycontainer.swg | 219 ++- Lib/python/pyerrors.swg | 7 +- Lib/python/pyhead.swg | 64 +- Lib/python/pyinit.swg | 76 +- Lib/python/pyiterators.swg | 172 +- Lib/python/pyname_compat.i | 88 + Lib/python/pyopers.swg | 8 +- Lib/python/pyrun.swg | 420 +++-- Lib/python/pystdcommon.swg | 2 +- Lib/python/pystrings.swg | 34 +- Lib/python/pytypemaps.swg | 2 +- Lib/python/pywstrings.swg | 4 +- Lib/python/std_carray.i | 6 +- Lib/python/std_map.i | 48 +- Lib/python/std_multimap.i | 14 +- Lib/python/std_multiset.i | 12 +- Lib/python/std_pair.i | 8 +- Lib/python/std_set.i | 12 +- Lib/r/r.swg | 82 +- Lib/r/rrun.swg | 2 - Lib/r/rstdcommon.swg | 2 +- Lib/r/rtype.swg | 101 +- Lib/ruby/file.i | 7 + Lib/ruby/rubyhead.swg | 3 + Lib/ruby/rubywstrings.swg | 2 +- Lib/shared_ptr.i | 12 +- Lib/swig.swg | 66 +- Lib/swigrun.swg | 98 +- Lib/typemaps/attribute.swg | 87 +- Lib/typemaps/swigtype.swg | 20 +- Makefile.in | 131 +- README | 23 +- Source/CParse/cparse.h | 8 +- Source/CParse/cscanner.c | 43 +- Source/CParse/parser.y | 141 +- Source/CParse/templ.c | 25 +- Source/DOH/README | 12 +- Source/DOH/base.c | 4 +- Source/DOH/doh.h | 15 +- Source/DOH/file.c | 11 +- Source/DOH/hash.c | 2 +- Source/DOH/list.c | 2 +- Source/DOH/string.c | 2 +- Source/Include/swigwarn.h | 15 +- Source/Makefile.am | 4 +- Source/Modules/allegrocl.cxx | 384 ++-- Source/Modules/c.cxx | 20 +- Source/Modules/cffi.cxx | 51 +- Source/Modules/chicken.cxx | 41 +- Source/Modules/clisp.cxx | 13 +- Source/Modules/contract.cxx | 8 + Source/Modules/csharp.cxx | 99 +- Source/Modules/directors.cxx | 4 +- Source/Modules/guile.cxx | 41 +- Source/Modules/java.cxx | 51 +- Source/Modules/lang.cxx | 79 +- Source/Modules/lua.cxx | 30 +- Source/Modules/main.cxx | 204 +- Source/Modules/modula3.cxx | 50 +- Source/Modules/mzscheme.cxx | 24 +- Source/Modules/ocaml.cxx | 112 +- Source/Modules/octave.cxx | 44 +- Source/Modules/overload.cxx | 8 +- Source/Modules/perl5.cxx | 35 +- Source/Modules/{php4.cxx => php.cxx} | 981 ++-------- Source/Modules/pike.cxx | 28 +- Source/Modules/python.cxx | 678 +++++-- Source/Modules/r.cxx | 36 +- Source/Modules/ruby.cxx | 94 +- Source/Modules/s-exp.cxx | 12 +- Source/Modules/swigmain.cxx | 8 +- Source/Modules/swigmod.h | 21 +- Source/Modules/tcl8.cxx | 30 +- Source/Modules/uffi.cxx | 25 +- Source/Modules/xml.cxx | 6 +- Source/Preprocessor/cpp.c | 35 +- Source/Preprocessor/preprocessor.h | 4 +- Source/README | 9 +- Source/Swig/cwrap.c | 53 +- Source/Swig/error.c | 10 +- Source/Swig/getopt.c | 2 +- Source/Swig/include.c | 57 +- Source/Swig/misc.c | 95 +- Source/Swig/naming.c | 32 +- Source/Swig/parms.c | 2 +- Source/Swig/scanner.c | 25 +- Source/Swig/stype.c | 22 +- Source/Swig/swig.h | 138 +- Source/Swig/swigfile.h | 31 +- Source/Swig/swigopt.h | 2 +- Source/Swig/swigparm.h | 2 +- Source/Swig/swigscan.h | 4 +- Source/Swig/swigtree.h | 2 +- Source/Swig/swigwrap.h | 12 +- Source/Swig/symbol.c | 34 +- Source/Swig/tree.c | 2 +- Source/Swig/typemap.c | 30 +- Source/Swig/typeobj.c | 10 +- Source/Swig/typesys.c | 17 +- Source/Swig/wrapfunc.c | 12 +- TODO | 10 +- Tools/config/config.guess | 1542 --------------- Tools/config/config.sub | 1677 ----------------- Tools/mkdist.py | 10 +- Tools/mkrelease.py | 2 +- Tools/mkwindows.sh | 5 +- Tools/pyname_patch.py | 123 ++ autogen.sh | 6 +- configure.in | 379 ++-- 703 files changed, 21126 insertions(+), 9266 deletions(-) create mode 100644 CCache/COPYING create mode 100644 CCache/Makefile.in create mode 100644 CCache/README create mode 100644 CCache/README.swig create mode 100644 CCache/args.c create mode 100644 CCache/ccache.c create mode 100644 CCache/ccache.h create mode 100644 CCache/ccache.yo create mode 100644 CCache/ccache_swig_config.h.in create mode 100644 CCache/cleanup.c create mode 100644 CCache/configure.in create mode 100644 CCache/debian/NEWS create mode 100644 CCache/debian/README.Debian create mode 100644 CCache/debian/changelog create mode 100644 CCache/debian/compat create mode 100644 CCache/debian/control create mode 100644 CCache/debian/copyright create mode 100644 CCache/debian/dirs create mode 100644 CCache/debian/docs create mode 100644 CCache/debian/examples create mode 100644 CCache/debian/patches/01_no_home.diff create mode 100644 CCache/debian/patches/02_ccache-compressed.diff create mode 100644 CCache/debian/patches/03_long_options.diff create mode 100644 CCache/debian/patches/04_ignore_profile.diff create mode 100644 CCache/debian/patches/05_nfs_fix.diff create mode 100644 CCache/debian/patches/06_md.diff create mode 100644 CCache/debian/patches/07_cachedirtag.diff create mode 100644 CCache/debian/patches/08_manpage_hyphens.diff create mode 100644 CCache/debian/patches/09_respect_ldflags.diff create mode 100644 CCache/debian/patches/10_lru_cleanup.diff create mode 100644 CCache/debian/patches/11_utimes.diff create mode 100644 CCache/debian/patches/12_cachesize_permissions.diff create mode 100644 CCache/debian/patches/13_html_links.diff create mode 100644 CCache/debian/patches/14_hardlink_doc.diff create mode 100644 CCache/debian/patches/CREDITS create mode 100644 CCache/debian/rules create mode 100644 CCache/debian/update-ccache create mode 100644 CCache/debian/watch create mode 100644 CCache/execute.c create mode 100644 CCache/hash.c create mode 100755 CCache/install-sh create mode 100644 CCache/mdfour.c create mode 100644 CCache/mdfour.h create mode 100644 CCache/packaging/README create mode 100644 CCache/packaging/ccache.spec create mode 100644 CCache/snprintf.c create mode 100644 CCache/stats.c create mode 100755 CCache/test.sh create mode 100644 CCache/unify.c create mode 100644 CCache/util.c create mode 100644 CCache/web/index.html mode change 100755 => 100644 Doc/Manual/Allegrocl.html mode change 100755 => 100644 Doc/Manual/swig16.png rename Examples/GIFPlot/Java/full/{main.java => runme.java} (99%) rename Examples/GIFPlot/Java/shadow/{main.java => runme.java} (99%) rename Examples/GIFPlot/Java/simple/{main.java => runme.java} (98%) rename Examples/GIFPlot/{Php4 => Php}/check.list (100%) rename Examples/GIFPlot/{Php4 => Php}/full/Makefile (81%) rename Examples/GIFPlot/{Php4 => Php}/full/README (100%) rename Examples/GIFPlot/{Php4 => Php}/full/cmap (100%) rename Examples/GIFPlot/{Php4 => Php}/full/gifplot.i (100%) rename Examples/GIFPlot/{Php4/full/runme.php4 => Php/full/runme.php} (100%) rename Examples/GIFPlot/{Php4 => Php}/shadow/Makefile (80%) rename Examples/GIFPlot/{Php4 => Php}/shadow/README (100%) rename Examples/GIFPlot/{Php4 => Php}/shadow/cmap (100%) rename Examples/GIFPlot/{Php4/shadow/runme.php4 => Php/shadow/runme.php} (100%) rename Examples/GIFPlot/{Php4 => Php}/simple/Makefile (80%) rename Examples/GIFPlot/{Php4 => Php}/simple/README (100%) rename Examples/GIFPlot/{Php4/simple/runme.php4 => Php/simple/runme.php} (100%) rename Examples/GIFPlot/{Php4 => Php}/simple/simple.i (100%) create mode 100644 Examples/csharp/arrays/Makefile create mode 100644 Examples/csharp/arrays/example.c create mode 100644 Examples/csharp/arrays/example.h create mode 100644 Examples/csharp/arrays/example.i create mode 100644 Examples/csharp/arrays/runme.cs mode change 100755 => 100644 Examples/guile/matrix/matrix.scm rename Examples/java/callback/{main.java => runme.java} (98%) rename Examples/java/class/{main.java => runme.java} (99%) rename Examples/java/constants/{main.java => runme.java} (98%) rename Examples/java/enum/{main.java => runme.java} (98%) rename Examples/java/extend/{main.java => runme.java} (99%) rename Examples/java/funcptr/{main.java => runme.java} (98%) rename Examples/java/multimap/{main.java => runme.java} (97%) rename Examples/java/native/{main.java => runme.java} (96%) rename Examples/java/pointer/{main.java => runme.java} (98%) rename Examples/java/reference/{main.java => runme.java} (99%) rename Examples/java/simple/{main.java => runme.java} (97%) rename Examples/java/template/{main.java => runme.java} (98%) rename Examples/java/typemap/{main.java => runme.java} (96%) rename Examples/java/variables/{main.java => runme.java} (99%) rename Examples/{php4 => php}/check.list (100%) rename Examples/{php4/enum => php/class}/Makefile (71%) rename Examples/{php4 => php}/class/example.cxx (100%) rename Examples/{php4 => php}/class/example.h (100%) rename Examples/{php4 => php}/class/example.i (100%) rename Examples/{php4/class/runme.php4 => php/class/runme.php} (100%) rename Examples/{php4 => php}/constants/Makefile (70%) rename Examples/{php4 => php}/constants/example.i (100%) rename Examples/{php4/constants/runme.php4 => php/constants/runme.php} (100%) rename Examples/{php4/simple => php/cpointer}/Makefile (71%) rename Examples/{php4 => php}/cpointer/example.c (100%) rename Examples/{php4 => php}/cpointer/example.i (100%) rename Examples/{php4/cpointer/runme.php4 => php/cpointer/runme.php} (100%) rename Examples/{php4/proxy => php/disown}/Makefile (70%) rename Examples/{php4 => php}/disown/example.cxx (100%) rename Examples/{php4 => php}/disown/example.h (100%) rename Examples/{php4 => php}/disown/example.i (100%) rename Examples/{php4/disown/runme.php4 => php/disown/runme.php} (100%) rename Examples/{php4/reference => php/enum}/Makefile (71%) rename Examples/{php4 => php}/enum/example.cxx (100%) rename Examples/{php4 => php}/enum/example.h (100%) rename Examples/{php4 => php}/enum/example.i (100%) rename Examples/{php4/enum/runme.php4 => php/enum/runme.php} (100%) rename Examples/{php4/cpointer => php/funcptr}/Makefile (71%) rename Examples/{php4 => php}/funcptr/example.c (100%) rename Examples/{php4 => php}/funcptr/example.h (100%) rename Examples/{php4 => php}/funcptr/example.i (100%) rename Examples/{php4/funcptr/runme.php4 => php/funcptr/runme.php} (100%) rename Examples/{php4 => php}/overloading/Makefile (70%) rename Examples/{php4 => php}/overloading/example.cxx (78%) rename Examples/{php4 => php}/overloading/example.h (77%) rename Examples/{php4 => php}/overloading/example.i (100%) rename Examples/{php4/overloading/runme.php4 => php/overloading/runme.php} (100%) rename Examples/{php4/funcptr => php/pointer}/Makefile (71%) rename Examples/{php4 => php}/pointer/example.c (100%) rename Examples/{php4 => php}/pointer/example.i (100%) rename Examples/{php4/pointer/runme.php4 => php/pointer/runme.php} (100%) rename Examples/{php4 => php}/pragmas/Makefile (70%) rename Examples/{php4 => php}/pragmas/example.i (70%) rename Examples/{php4 => php}/pragmas/include.php (100%) rename Examples/{php4/pragmas/runme.php4 => php/pragmas/runme.php} (100%) rename Examples/{php4/sync => php/proxy}/Makefile (70%) rename Examples/{php4 => php}/proxy/example.cxx (100%) rename Examples/{php4 => php}/proxy/example.h (100%) rename Examples/{php4 => php}/proxy/example.i (100%) rename Examples/{php4/proxy/runme.php4 => php/proxy/runme.php} (100%) rename Examples/{php4/class => php/reference}/Makefile (71%) rename Examples/{php4 => php}/reference/example.cxx (100%) rename Examples/{php4 => php}/reference/example.h (100%) rename Examples/{php4 => php}/reference/example.i (100%) rename Examples/{php4 => php}/reference/runme-proxy.php4 (100%) rename Examples/{php4/reference/runme.php4 => php/reference/runme.php} (100%) rename Examples/{php4/pointer => php/simple}/Makefile (71%) rename Examples/{php4 => php}/simple/example.c (100%) rename Examples/{php4 => php}/simple/example.i (100%) rename Examples/{php4/simple/runme.php4 => php/simple/runme.php} (100%) rename Examples/{php4/disown => php/sync}/Makefile (70%) rename Examples/{php4 => php}/sync/example.cxx (91%) rename Examples/{php4 => php}/sync/example.h (100%) rename Examples/{php4 => php}/sync/example.i (100%) rename Examples/{php4/sync/runme.php4 => php/sync/runme.php} (100%) rename Examples/{php4 => php}/value/Makefile (71%) rename Examples/{php4 => php}/value/example.c (100%) rename Examples/{php4 => php}/value/example.h (100%) rename Examples/{php4 => php}/value/example.i (100%) rename Examples/{php4/value/runme.php4 => php/value/runme.php} (100%) create mode 100644 Examples/php/variables/Makefile rename Examples/{php4 => php}/variables/example.c (100%) rename Examples/{php4 => php}/variables/example.h (100%) rename Examples/{php4 => php}/variables/example.i (100%) rename Examples/{php4/variables/runme.php4 => php/variables/runme.php} (100%) rename Examples/{php4 => php}/variables/runme.php4.old (100%) delete mode 100755 Examples/php4/reference/BUILD-proxy.sh delete mode 100644 Examples/php4/variables/Makefile mode change 100755 => 100644 Examples/pike/class/Makefile mode change 100755 => 100644 Examples/pike/class/example.cxx mode change 100755 => 100644 Examples/pike/class/example.h mode change 100755 => 100644 Examples/pike/class/example.i mode change 100755 => 100644 Examples/pike/constants/Makefile mode change 100755 => 100644 Examples/pike/constants/example.i mode change 100755 => 100644 Examples/pike/overload/example.cxx mode change 100755 => 100644 Examples/pike/overload/example.h mode change 100755 => 100644 Examples/pike/template/Makefile mode change 100755 => 100644 Examples/pike/template/example.h mode change 100755 => 100644 Examples/pike/template/example.i mode change 100755 => 100644 Examples/ruby/hashargs/Makefile mode change 100755 => 100644 Examples/ruby/hashargs/example.i rename Examples/test-suite/{python => }/argcargvtest.i (100%) rename Examples/test-suite/{python => }/callback.i (100%) rename Examples/test-suite/chicken/{ext_test_runme.ss => chicken_ext_test_runme.ss} (57%) rename Examples/test-suite/{chicken/ext_test.i => chicken_ext_test.i} (94%) rename Examples/test-suite/{python => }/complextest.i (100%) create mode 100644 Examples/test-suite/csharp/csharp_lib_arrays_runme.cs create mode 100644 Examples/test-suite/csharp/director_basic_runme.cs create mode 100644 Examples/test-suite/csharp/li_attribute_runme.cs create mode 100644 Examples/test-suite/csharp_lib_arrays.i mode change 100755 => 100644 Examples/test-suite/director_classic.i mode change 100755 => 100644 Examples/test-suite/director_ignore.i rename Examples/test-suite/{python => }/director_profile.i (100%) create mode 100644 Examples/test-suite/director_protected_overloaded.i rename Examples/test-suite/{python => }/director_stl.i (100%) create mode 100644 Examples/test-suite/global_namespace.i rename Examples/test-suite/guilescm/{ext_test_runme.scm => guilescm_ext_test_runme.scm} (82%) rename Examples/test-suite/{guilescm/ext_test.i => guilescm_ext_test.i} (93%) rename Examples/test-suite/{python/iadd.h => iadd.i} (79%) rename Examples/test-suite/{octave => }/implicittest.i (100%) rename Examples/test-suite/{python => }/inout.i (100%) rename Examples/test-suite/{python => }/inplaceadd.i (100%) rename Examples/test-suite/{python => }/input.i (100%) create mode 100644 Examples/test-suite/insert_directive.i mode change 100755 => 100644 Examples/test-suite/java/allprotected_runme.java mode change 100755 => 100644 Examples/test-suite/java/director_classic_runme.java mode change 100755 => 100644 Examples/test-suite/java/director_ignore_runme.java create mode 100644 Examples/test-suite/java/global_namespace_runme.java create mode 100644 Examples/test-suite/java/li_boost_intrusive_ptr_runme.java mode change 100755 => 100644 Examples/test-suite/java/overload_complicated_runme.java create mode 100644 Examples/test-suite/li_boost_intrusive_ptr.i rename Examples/test-suite/{python => }/li_std_carray.i (100%) rename Examples/test-suite/{ruby => }/li_std_functors.i (100%) rename Examples/test-suite/{perl5 => }/li_std_list.i (100%) rename Examples/test-suite/{octave/li_std_pair.i => li_std_pair_extra.i} (99%) rename Examples/test-suite/{ruby => }/li_std_pair_lang_object.i (100%) rename Examples/test-suite/{ruby => }/li_std_queue.i (100%) rename Examples/test-suite/{ruby => }/li_std_stack.i (100%) rename Examples/test-suite/{python/li_std_string.i => li_std_string_extra.i} (93%) rename Examples/test-suite/{python/li_std_vector.i => li_std_vector_extra.i} (85%) create mode 100644 Examples/test-suite/li_std_vector_ptr.i rename Examples/test-suite/{python => }/li_std_vectora.i (100%) rename Examples/test-suite/{python => }/li_std_wstream.i (100%) create mode 100644 Examples/test-suite/nested_structs.i create mode 100644 Examples/test-suite/octave/li_std_pair_extra_runme.m delete mode 100644 Examples/test-suite/octave/li_std_pair_runme.m delete mode 100644 Examples/test-suite/octave/li_std_string.i create mode 100644 Examples/test-suite/octave/li_std_string_extra_runme.m delete mode 100644 Examples/test-suite/octave/li_std_string_runme.m rename Examples/test-suite/octave/{cell_deref_runme.m => octave_cell_deref_runme.m} (85%) rename Examples/test-suite/{octave/cell_deref.i => octave_cell_deref.i} (86%) create mode 100644 Examples/test-suite/operbool.i create mode 100644 Examples/test-suite/packageoption_c.i rename Examples/test-suite/{php4 => php}/Makefile.in (69%) rename Examples/test-suite/{php4/abstract_inherit_ok_runme.php4 => php/abstract_inherit_ok_runme.php} (88%) rename Examples/test-suite/{php4/abstract_inherit_runme.php4 => php/abstract_inherit_runme.php} (93%) rename Examples/test-suite/{php4/add_link_runme.php4 => php/add_link_runme.php} (95%) rename Examples/test-suite/{php4/argout_runme.php4 => php/argout_runme.php} (97%) rename Examples/test-suite/{php4/arrayptr_runme.php4 => php/arrayptr_runme.php} (90%) rename Examples/test-suite/{php4/arrays_global_runme.php4 => php/arrays_global_runme.php} (60%) rename Examples/test-suite/{php4/arrays_global_twodim_runme.php4 => php/arrays_global_twodim_runme.php} (97%) rename Examples/test-suite/{php4/arrays_runme.php4 => php/arrays_runme.php} (95%) rename Examples/test-suite/{php4/arrays_scope_runme.php4 => php/arrays_scope_runme.php} (92%) rename Examples/test-suite/{php4/casts_runme.php4 => php/casts_runme.php} (93%) rename Examples/test-suite/{php4/class_ignore_runme.php4 => php/class_ignore_runme.php} (93%) rename Examples/test-suite/{php4/conversion_namespace_runme.php4 => php/conversion_namespace_runme.php} (90%) rename Examples/test-suite/{php4/conversion_ns_template_runme.php4 => php/conversion_ns_template_runme.php} (89%) rename Examples/test-suite/{php4/conversion_runme.php4 => php/conversion_runme.php} (90%) rename Examples/test-suite/{php4/cpp_static_runme.php4 => php/cpp_static_runme.php} (91%) rename Examples/test-suite/{php4/enum_scope_template_runme.php4 => php/enum_scope_template_runme.php} (96%) rename Examples/test-suite/{php4/evil_diamond_ns_runme.php4 => php/evil_diamond_ns_runme.php} (94%) rename Examples/test-suite/{php4/evil_diamond_prop_runme.php4 => php/evil_diamond_prop_runme.php} (97%) rename Examples/test-suite/{php4/evil_diamond_runme.php4 => php/evil_diamond_runme.php} (93%) rename Examples/test-suite/{php4/extend_template_ns_runme.php4 => php/extend_template_ns_runme.php} (91%) rename Examples/test-suite/{php4/extend_template_runme.php4 => php/extend_template_runme.php} (90%) rename Examples/test-suite/{php4/grouping_runme.php4 => php/grouping_runme.php} (96%) rename Examples/test-suite/{php4/ignore_parameter_runme.php4 => php/ignore_parameter_runme.php} (98%) rename Examples/test-suite/{php4/li_carrays_runme.php4 => php/li_carrays_runme.php} (92%) rename Examples/test-suite/{php4/li_std_string_runme.php4 => php/li_std_string_runme.php} (98%) rename Examples/test-suite/{php4/rename_scope_runme.php4 => php/rename_scope_runme.php} (96%) rename Examples/test-suite/{php4/skel.php4 => php/skel.php} (90%) rename Examples/test-suite/{php4/smart_pointer_rename_runme.php4 => php/smart_pointer_rename_runme.php} (97%) rename Examples/test-suite/{php4/sym_runme.php4 => php/sym_runme.php} (95%) rename Examples/test-suite/{php4/template_arg_typename_runme.php4 => php/template_arg_typename_runme.php} (94%) rename Examples/test-suite/{php4/template_construct_runme.php4 => php/template_construct_runme.php} (88%) rename Examples/test-suite/{php4/tests.php4 => php/tests.php} (96%) rename Examples/test-suite/{php4/typedef_reference_runme.php4 => php/typedef_reference_runme.php} (93%) rename Examples/test-suite/{php4/typemap_ns_using_runme.php4 => php/typemap_ns_using_runme.php} (89%) rename Examples/test-suite/{php4/using1_runme.php4 => php/using1_runme.php} (88%) rename Examples/test-suite/{php4/using2_runme.php4 => php/using2_runme.php} (88%) rename Examples/test-suite/{php4/valuewrapper_base_runme.php4 => php/valuewrapper_base_runme.php} (91%) rename Examples/test-suite/{php4/namewarn_rename.i => php_namewarn_rename.i} (81%) create mode 100644 Examples/test-suite/python/cpp_static_runme.py delete mode 100644 Examples/test-suite/python/iadd.i delete mode 100644 Examples/test-suite/python/implicittest.i delete mode 100644 Examples/test-suite/python/li_std_map.i delete mode 100644 Examples/test-suite/python/li_std_pair.i create mode 100644 Examples/test-suite/python/li_std_pair_extra_runme.py delete mode 100644 Examples/test-suite/python/li_std_pair_runme.py delete mode 100644 Examples/test-suite/python/li_std_set.i delete mode 100644 Examples/test-suite/python/li_std_stream.i rename Examples/test-suite/python/{li_std_string_runme.py => li_std_string_extra_runme.py} (54%) rename Examples/test-suite/python/{li_std_vector_runme.py => li_std_vector_extra_runme.py} (84%) create mode 100644 Examples/test-suite/python/li_std_vector_ptr_runme.py delete mode 100644 Examples/test-suite/python/li_std_wstring.i create mode 100644 Examples/test-suite/python/operbool_runme.py create mode 100644 Examples/test-suite/python/python_abstractbase_runme3.py create mode 100644 Examples/test-suite/python/python_append_runme.py rename Examples/test-suite/python/{kwargs_runme.py => python_kwargs_runme.py} (97%) rename Examples/test-suite/python/{nondynamic_runme.py => python_nondynamic_runme.py} (67%) rename Examples/test-suite/python/{overload_simple_cast_runme.py => python_overload_simple_cast_runme.py} (98%) create mode 100644 Examples/test-suite/python/python_pybuf_runme3.py create mode 100644 Examples/test-suite/python/rename_strip_encoder_runme.py delete mode 100644 Examples/test-suite/python/std_containers.i delete mode 100644 Examples/test-suite/python/tag_no_clash_with_variable_runme.i delete mode 100644 Examples/test-suite/python/vector.i create mode 100644 Examples/test-suite/python_abstractbase.i create mode 100644 Examples/test-suite/python_append.i rename Examples/test-suite/{python/autodoc.i => python_autodoc.i} (97%) rename Examples/test-suite/{python/kwargs.i => python_kwargs.i} (98%) rename Examples/test-suite/{python/nondynamic.i => python_nondynamic.i} (96%) rename Examples/test-suite/{python/overload_simple_cast.i => python_overload_simple_cast.i} (58%) create mode 100644 Examples/test-suite/python_pybuf.i create mode 100644 Examples/test-suite/r/arrays_dimensionless_runme.R delete mode 100644 Examples/test-suite/r/double_delete_runme.R create mode 100644 Examples/test-suite/r/integers_runme.R rename Examples/test-suite/r/{copy_struct_runme.R => r_copy_struct_runme.R} (81%) create mode 100644 Examples/test-suite/r/r_double_delete_runme.R rename Examples/test-suite/r/{legacy_runme.R => r_legacy_runme.R} (86%) rename Examples/test-suite/{r/copy_struct.i => r_copy_struct.i} (97%) rename Examples/test-suite/{r/double_delete.i => r_double_delete.i} (67%) rename Examples/test-suite/{r/legacy.i => r_legacy.i} (98%) create mode 100644 Examples/test-suite/rename_strip_encoder.i rename Examples/test-suite/ruby/{keywords_runme.rb => ruby_keywords_runme.rb} (98%) rename Examples/test-suite/ruby/{li_std_speed_runme.rb => ruby_li_std_speed_runme.rb} (97%) rename Examples/test-suite/ruby/{naming_runme.rb => ruby_naming_runme.rb} (68%) rename Examples/test-suite/ruby/{track_objects_directors_runme.rb => ruby_track_objects_directors_runme.rb} (74%) rename Examples/test-suite/ruby/{track_objects_runme.rb => ruby_track_objects_runme.rb} (78%) rename Examples/test-suite/{ruby/keywords.i => ruby_keywords.i} (98%) rename Examples/test-suite/{ruby/li_std_speed.i => ruby_li_std_speed.i} (90%) rename Examples/test-suite/{ruby/naming.i => ruby_naming.i} (98%) rename Examples/test-suite/{ruby/track_objects.i => ruby_track_objects.i} (98%) rename Examples/test-suite/{ruby/track_objects_directors.i => ruby_track_objects_directors.i} (88%) rename Examples/test-suite/{r => }/simple_array.i (100%) rename Examples/test-suite/{python => }/simutry.i (100%) rename Examples/test-suite/{ruby => }/stl_new.i (100%) rename Examples/test-suite/{python => }/swigobject.i (81%) rename Examples/test-suite/tcl/{union_runme.tcl => union_parameter_runme.tcl} (92%) mode change 100755 => 100644 rename Examples/test-suite/{python => }/template_matrix.i (100%) rename Examples/test-suite/{tcl/union.i => union_parameter.i} (97%) mode change 100755 => 100644 Lib/allegrocl/inout_typemaps.i mode change 100755 => 100644 Lib/allegrocl/longlongs.i mode change 100755 => 100644 Lib/allegrocl/std_list.i mode change 100755 => 100644 Lib/allegrocl/std_string.i create mode 100644 Lib/csharp/arrays_csharp.i mode change 100755 => 100644 Lib/csharp/std_vector.i mode change 100755 => 100644 Lib/csharp/std_wstring.i mode change 100755 => 100644 Lib/csharp/wchar.i create mode 100644 Lib/intrusive_ptr.i create mode 100644 Lib/java/boost_intrusive_ptr.i rename Lib/{php4 => php}/const.i (100%) rename Lib/{php4 => php}/globalvar.i (99%) rename Lib/{php4/php4.swg => php/php.swg} (89%) rename Lib/{php4/php4init.swg => php/phpinit.swg} (100%) rename Lib/{php4/php4kw.swg => php/phpkw.swg} (99%) rename Lib/{php4 => php}/phppointers.i (100%) rename Lib/{php4/php4run.swg => php/phprun.swg} (96%) rename Lib/{php4 => php}/std_common.i (100%) rename Lib/{php4 => php}/std_deque.i (100%) rename Lib/{php4 => php}/std_map.i (97%) rename Lib/{php4 => php}/std_pair.i (100%) rename Lib/{php4 => php}/std_string.i (100%) rename Lib/{php4 => php}/std_vector.i (98%) rename Lib/{php4 => php}/stl.i (100%) rename Lib/{php4 => php}/typemaps.i (62%) rename Lib/{php4 => php}/utils.i (86%) create mode 100644 Lib/python/pyabc.i create mode 100644 Lib/python/pybuffer.i create mode 100644 Lib/python/pyname_compat.i mode change 100755 => 100644 Source/Modules/ocaml.cxx rename Source/Modules/{php4.cxx => php.cxx} (64%) delete mode 100755 Tools/config/config.guess delete mode 100755 Tools/config/config.sub create mode 100644 Tools/pyname_patch.py diff --git a/ANNOUNCE b/ANNOUNCE index 7c0e95e3f..9ef41142a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,11 +1,11 @@ -*** ANNOUNCE: SWIG 1.3.36 (24 June 2008) *** +*** ANNOUNCE: SWIG 1.3.40 (in progress) *** http://www.swig.org -We're pleased to announce SWIG-1.3.36, the latest installment in the -SWIG development effort. SWIG-1.3.36 includes a number of bug fixes -and large number of enhancements throughout. +We're pleased to announce SWIG-1.3.40, the latest installment in the +SWIG development effort. SWIG-1.3.40 includes a number of bug fixes +and enhancements. What is SWIG? ------------- @@ -24,21 +24,11 @@ Availability: ------------- The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-1.3.36.tar.gz + http://prdownloads.sourceforge.net/swig/swig-1.3.40.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-1.3.36.zip - -Release numbers ---------------- -With SWIG-1.3, we are adopting an odd/even version numbering scheme for -SWIG. Odd version numbers (1.3, 1.5, 1.7, etc...) are considered to -be development releases. Even numbers (1.4,1.6,1.8) are stable -releases. The current 1.3 effort is working to produce a stable 2.0 -release. A stable 2.0 release will not be made until it can -accompanied by fully updated documentation. In the meantime, we will -continue to make periodic 1.3.x releases. + http://prdownloads.sourceforge.net/swig/swigwin-1.3.40.zip Please report problems with this release to the swig-dev mailing list, details at http://www.swig.org/mail.html. diff --git a/CCache/COPYING b/CCache/COPYING new file mode 100644 index 000000000..a43ea2126 --- /dev/null +++ b/CCache/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/CCache/Makefile.in b/CCache/Makefile.in new file mode 100644 index 000000000..ec55ccaf5 --- /dev/null +++ b/CCache/Makefile.in @@ -0,0 +1,73 @@ +datarootdir = @datarootdir@ +srcdir=@srcdir@ +VPATH=@srcdir@ + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +mandir=@mandir@ +INSTALLCMD=@INSTALL@ +PACKAGE_NAME=@PACKAGE_NAME@ +# Soft link test can be skipped on systems that don't support soft linking +NOSOFTLINKSTEST= + +CC=@CC@ +CFLAGS=@CFLAGS@ -I. +SWIG=swig +SWIG_LIB=../../Lib +EXEEXT=@EXEEXT@ + +# Use standard autoconf approach to transform executable name using --program-prefix and --program-suffix +transform = @program_transform_name@ + +LIBS= @LIBS@ +OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \ + cleanup.o snprintf.o unify.o +HEADERS = ccache.h mdfour.h + +all: $(PACKAGE_NAME)$(EXEEXT) + +# Note that HTML documentation is actually generated and used from the main SWIG documentation Makefile +docs: $(PACKAGE_NAME).1 web/ccache-man.html + +$(PACKAGE_NAME)$(EXEEXT): $(OBJS) $(HEADERS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + +$(PACKAGE_NAME).1: ccache.yo + -yodl2man -o $(PACKAGE_NAME).1 ccache.yo + +web/ccache-man.html: ccache.yo + mkdir -p man + yodl2html -o web/ccache-man.html ccache.yo + +install: $(PACKAGE_NAME)$(EXEEXT) $(PACKAGE_NAME).1 + ${INSTALLCMD} -d $(DESTDIR)${bindir} + ${INSTALLCMD} -m 755 $(PACKAGE_NAME)$(EXEEXT) $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT) + ${INSTALLCMD} -d $(DESTDIR)${mandir}/man1 + ${INSTALLCMD} -m 644 ${srcdir}/$(PACKAGE_NAME).1 $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1 + +uninstall: $(PACKAGE_NAME)$(EXEEXT) $(PACKAGE_NAME).1 + rm -f $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT) + rm -f $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1 + +clean: + /bin/rm -f $(OBJS) *~ $(PACKAGE_NAME)$(EXEEXT) + +clean-docs: + rm -f $(PACKAGE_NAME).1 web/ccache-man.html + +check : test + +test: test.sh + SWIG_LIB='$(SWIG_LIB)' PATH=../..:$$PATH SWIG='$(SWIG)' CC='$(CC)' NOSOFTLINKSTEST='$(NOSOFTLINKSTEST)' ./test.sh + +check: test + +distclean: clean + /bin/rm -f Makefile config.h config.sub config.log build-stamp config.status configure config.h + +# FIXME: To fix this, test.sh needs to be able to take ccache from the +# installed prefix, not from the source dir. +installcheck: + @echo "WARNING! This is not really \"installcheck\" yet." + $(MAKE) check diff --git a/CCache/README b/CCache/README new file mode 100644 index 000000000..6e68a6eb0 --- /dev/null +++ b/CCache/README @@ -0,0 +1,31 @@ +This is a re-implementation of "compilercache" in C + +The original compilercache scripts were by Erik Thiele +(erikyyy@erikyyy.de) and I would like to thank him for an excellent +piece of work. See http://www.erikyyy.de/compilercache/ for the +original shell scripts. + +I wrote ccache because I wanted to get a bit more speed out of a +compiler cache and I wanted to remove some of the limitations of the +shell-script version. + +Please see the manual page and documentation at +http://ccache.samba.org/ + +INSTALLATION +------------ + +Please run: + + ./configure + make + make install + +then read the ccache manual page + +----------- + +Andrew Tridgell +http://samba.org/~tridge/ +bugs@ccache.samba.org + diff --git a/CCache/README.swig b/CCache/README.swig new file mode 100644 index 000000000..aea0f3d82 --- /dev/null +++ b/CCache/README.swig @@ -0,0 +1,8 @@ +This directory contains a version of ccache. The initial version was based on ccache-2.4 plus +debian patches 01-02, 04-14, see the debian/patches subdirectory. The ccache-win32-2.4 modifications +to ccache-2.4 have also been merged in. + +Changes have been made to support cacheing the output from SWIG. The ability to cache c/c++ compiler +output has been retained. + +Additional features added are the CCACHE_VERBOSE and CCACHE_SWIG environment variables, see docs. diff --git a/CCache/args.c b/CCache/args.c new file mode 100644 index 000000000..31e5471c1 --- /dev/null +++ b/CCache/args.c @@ -0,0 +1,91 @@ +/* + convenient routines for argument list handling + + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "ccache.h" + +ARGS *args_init(int init_argc, char **init_args) +{ + ARGS *args; + int i; + args = (ARGS *)x_malloc(sizeof(ARGS)); + args->argc = 0; + args->argv = (char **)x_malloc(sizeof(char *)); + args->argv[0] = NULL; + for (i=0;iargv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *)); + args->argv[args->argc] = x_strdup(s); + args->argc++; + args->argv[args->argc] = NULL; +} + +/* pop the last element off the args list */ +void args_pop(ARGS *args, int n) +{ + while (n--) { + args->argc--; + free(args->argv[args->argc]); + args->argv[args->argc] = NULL; + } +} + +/* remove the first element of the argument list */ +void args_remove_first(ARGS *args) +{ + free(args->argv[0]); + memmove(&args->argv[0], + &args->argv[1], + args->argc * sizeof(args->argv[0])); + args->argc--; +} + +/* add an argument into the front of the argument list */ +void args_add_prefix(ARGS *args, const char *s) +{ + args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *)); + memmove(&args->argv[1], &args->argv[0], + (args->argc+1) * sizeof(args->argv[0])); + args->argv[0] = x_strdup(s); + args->argc++; +} + +/* strip any arguments beginning with the specified prefix */ +void args_strip(ARGS *args, const char *prefix) +{ + int i; + for (i=0; iargc; ) { + if (strncmp(args->argv[i], prefix, strlen(prefix)) == 0) { + free(args->argv[i]); + memmove(&args->argv[i], + &args->argv[i+1], + args->argc * sizeof(args->argv[i])); + args->argc--; + } else { + i++; + } + } +} diff --git a/CCache/ccache.c b/CCache/ccache.c new file mode 100644 index 000000000..d1696da88 --- /dev/null +++ b/CCache/ccache.c @@ -0,0 +1,1388 @@ +/* + a re-implementation of the compilercache scripts in C + + The idea is based on the shell-script compilercache by Erik Thiele + + Copyright (C) Andrew Tridgell 2002 + Copyright (C) Martin Pool 2003 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "ccache.h" + +/* verbose mode */ +int ccache_verbose = 0; + +/* the base cache directory */ +char *cache_dir = NULL; + +/* the directory for temporary files */ +static char *temp_dir = NULL; + +/* the debug logfile name, if set */ +char *cache_logfile = NULL; + +/* the argument list after processing */ +static ARGS *stripped_args; + +/* the original argument list */ +static ARGS *orig_args; + +/* the output filename being compiled to */ +static char *output_file; + +/* the source file */ +static char *input_file; + +/* the name of the file containing the cached object code */ +static char *hashname; + +/* the extension of the file after pre-processing */ +static const char *i_extension; + +/* the name of the temporary pre-processor file */ +static char *i_tmpfile; + +/* are we compiling a .i or .ii file directly? */ +static int direct_i_file; + +/* the name of the cpp stderr file */ +static char *cpp_stderr; + +/* the name of the statistics file */ +char *stats_file = NULL; + +/* can we safely use the unification hashing backend? */ +static int enable_unify; + +/* should we strip -c when running the preprocessor only? */ +static int strip_c_option; + +/* customisation for using the SWIG compiler */ +static int swig; + +/* a list of supported file extensions, and the equivalent + extension for code that has been through the pre-processor +*/ +static struct { + char *extension; + char *i_extension; +} extensions[] = { + {"c", "i"}, + {"C", "ii"}, + {"m", "mi"}, + {"cc", "ii"}, + {"CC", "ii"}, + {"cpp", "ii"}, + {"CPP", "ii"}, + {"cxx", "ii"}, + {"CXX", "ii"}, + {"c++", "ii"}, + {"C++", "ii"}, + {"i", "i"}, + {"ii", "ii"}, + {NULL, NULL}}; + +/* + something went badly wrong - just execute the real compiler +*/ +static void failed(void) +{ + char *e; + + /* delete intermediate pre-processor file if needed */ + if (i_tmpfile) { + if (!direct_i_file) { + unlink(i_tmpfile); + } + free(i_tmpfile); + i_tmpfile = NULL; + } + + /* delete the cpp stderr file if necessary */ + if (cpp_stderr) { + unlink(cpp_stderr); + free(cpp_stderr); + cpp_stderr = NULL; + } + + /* strip any local args */ + args_strip(orig_args, "--ccache-"); + + if ((e=getenv("CCACHE_PREFIX"))) { + char *p = find_executable(e, MYNAME); + if (!p) { + cc_log("could not find executable (%s)\n", e); + perror(e); + exit(1); + } + args_add_prefix(orig_args, p); + } + + if (ccache_verbose) { + display_execute_args(orig_args->argv); + } + + if (swig) { + putenv("CCACHE_OUTFILES"); + } + +#ifndef _WIN32 + execv(orig_args->argv[0], orig_args->argv); + cc_log("execv returned (%s)!\n", strerror(errno)); + perror(orig_args->argv[0]); + exit(1); +#else + /* execv on Windows causes the 'non-regular' testcase to fail, so use Win32 API instead */ + { + PROCESS_INFORMATION pinfo; + STARTUPINFO sinfo; + BOOL ret; + DWORD exitcode; + char *args; + + ZeroMemory(&pinfo, sizeof(PROCESS_INFORMATION)); + ZeroMemory(&sinfo, sizeof(STARTUPINFO)); + sinfo.cb = sizeof(STARTUPINFO); + args = argvtos(orig_args->argv); + ret = CreateProcessA(orig_args->argv[0], args, NULL, NULL, TRUE, 0, NULL, NULL, + &sinfo, &pinfo); + if (!ret) { + exitcode = 1; + cc_log("CreateProcessA failed starting %s\n", orig_args->argv[0]); + perror_win32(orig_args->argv[0]); + } else { + WaitForSingleObject(pinfo.hProcess, INFINITE); + GetExitCodeProcess(pinfo.hProcess, &exitcode); + CloseHandle(pinfo.hProcess); + CloseHandle(pinfo.hThread); + } + free(args); + exit(exitcode); + } +#endif +} + + +/* return a string to be used to distinguish temporary files + this also tries to cope with NFS by adding the local hostname +*/ +static const char *tmp_string(void) +{ + static char *ret; + + if (!ret) { + char hostname[200]; + strcpy(hostname, "unknown"); +#if HAVE_GETHOSTNAME + gethostname(hostname, sizeof(hostname)-1); +#endif + hostname[sizeof(hostname)-1] = 0; + if (asprintf(&ret, "%s.%u", hostname, (unsigned)getpid()) == -1) { + fatal("could not allocate tmp_string"); + } + } + + return ret; +} + +/* update cached file sizes and count helper function for to_cache() */ +static void to_cache_stats_helper(struct stat *pstat, char *cached_filename, char *tmp_outfiles, int *files_size, int *cached_files_count) +{ +#if ENABLE_ZLIB + /* do an extra stat on the cache file for the size statistics */ + if (stat(cached_filename, pstat) != 0) { + cc_log("failed to stat cache files - %s\n", strerror(errno)); + stats_update(STATS_ERROR); + if (tmp_outfiles) { + unlink(tmp_outfiles); + } + failed(); + } +#else + (void)cached_filename; + (void)tmp_outfiles; +#endif + (*files_size) += file_size(pstat); + (*cached_files_count)++; +} + +/* run the real compiler and put the result in cache */ +static void to_cache(ARGS *args) +{ + char *path_stderr; + char *tmp_stdout, *tmp_stderr, *tmp_outfiles; + struct stat st1; + int status; + int cached_files_count = 0; + int files_size = 0; + + x_asprintf(&tmp_stdout, "%s/tmp.stdout.%s", temp_dir, tmp_string()); + x_asprintf(&tmp_stderr, "%s/tmp.stderr.%s", temp_dir, tmp_string()); + x_asprintf(&tmp_outfiles, "%s/tmp.outfiles.%s", temp_dir, tmp_string()); + + if (strip_c_option && !swig) { + args_add(stripped_args, "-c"); + } + + if (output_file) { + args_add(args, "-o"); + args_add(args, output_file); + } + + /* Turn off DEPENDENCIES_OUTPUT when running cc1, because + * otherwise it will emit a line like + * + * tmp.stdout.vexed.732.o: /home/mbp/.ccache/tmp.stdout.vexed.732.i + * + * unsetenv() is on BSD and Linux but not portable. */ + putenv("DEPENDENCIES_OUTPUT"); + + /* Give SWIG a filename for it to create and populate with a list of files that it generates */ + if (swig) { + char *ccache_outfiles; + x_asprintf(&ccache_outfiles, "CCACHE_OUTFILES=%s", tmp_outfiles); + unlink(tmp_outfiles); + if (getenv("CCACHE_OUTFILES") || putenv(ccache_outfiles) == -1) { + cc_log("CCACHE_OUTFILES env variable already set or could not be set\n"); + stats_update(STATS_ERROR); + failed(); + } + } + + if (getenv("CCACHE_CPP2")) { + args_add(args, input_file); + } else { + if (swig) { + args_add(args, "-nopreprocess"); + } + args_add(args, i_tmpfile); + } + status = execute(args->argv, tmp_stdout, tmp_stderr); + args_pop(args, 3); + + if (stat(tmp_stdout, &st1) != 0 || st1.st_size != 0) { + cc_log("compiler produced stdout for %s\n", input_file); + stats_update(STATS_STDOUT); + unlink(tmp_stdout); + unlink(tmp_stderr); + unlink(tmp_outfiles); + if (!swig) unlink(output_file); + failed(); + } + unlink(tmp_stdout); + + if (status != 0) { + int fd; + cc_log("compile of %s gave status = %d\n", input_file, status); + stats_update(STATS_STATUS); + + fd = open(tmp_stderr, O_RDONLY | O_BINARY); + if (fd != -1) { + if (cpp_stderr) { + /* we might have some stderr from cpp */ + int fd2 = open(cpp_stderr, O_RDONLY | O_BINARY); + if (fd2 != -1) { + copy_fd(fd2, 2); + close(fd2); + unlink(cpp_stderr); + cpp_stderr = NULL; + } + } + + /* we can use a quick method of + getting the failed output */ + copy_fd(fd, 2); + close(fd); + unlink(tmp_stderr); + if (i_tmpfile && !direct_i_file) { + unlink(i_tmpfile); + } + exit(status); + } + + unlink(tmp_stderr); + unlink(tmp_outfiles); + if (!swig) unlink(output_file); + failed(); + } else { + int hardlink = (getenv("CCACHE_NOCOMPRESS") != 0) && (getenv("CCACHE_HARDLINK") != 0); + if (swig) { + /* read the list of generated files and copy each of them into the cache */ + FILE *file; + file = fopen(tmp_outfiles, "r"); + if (file) { + char out_filename[FILENAME_MAX + 1]; + char out_filename_cache[FILENAME_MAX + 1]; + while (fgets(out_filename, FILENAME_MAX, file)) { + char *linefeed = strchr(out_filename, '\n'); + if (linefeed) { + char *potential_cr = linefeed - 1; + if (potential_cr >= out_filename && *potential_cr == '\r') + *potential_cr = 0; + *linefeed = 0; + + if (cached_files_count == 0) { + strcpy(out_filename_cache, hashname); + } else { + sprintf(out_filename_cache, "%s.%d", hashname, cached_files_count); + } + + if (commit_to_cache(out_filename, out_filename_cache, hardlink) != 0) { + fclose(file); + unlink(tmp_outfiles); + failed(); + } + to_cache_stats_helper(&st1, out_filename_cache, tmp_outfiles, &files_size, &cached_files_count); + } else { + cached_files_count = 0; + break; + } + } + fclose(file); + if (cached_files_count == 0) { + cc_log("failed to copy output files to cache - internal error\n"); + stats_update(STATS_ERROR); + unlink(tmp_outfiles); + failed(); + } + + /* also copy the (uncompressed) file containing the list of generated files into the cache */ + sprintf(out_filename_cache, "%s.outfiles", hashname); + if (stat(tmp_outfiles, &st1) != 0 || + safe_rename(tmp_outfiles, out_filename_cache) != 0) { + cc_log("failed to copy outfiles file to cache - %s\n", strerror(errno)); + stats_update(STATS_ERROR); + unlink(tmp_outfiles); + failed(); + } + to_cache_stats_helper(&st1, out_filename_cache, tmp_outfiles, &files_size, &cached_files_count); + unlink(tmp_outfiles); + } else { + cc_log("failed to open temp outfiles file - %s\n", strerror(errno)); + stats_update(STATS_ERROR); + failed(); + } + } else { + if (commit_to_cache(output_file, hashname, hardlink) != 0) { + failed(); + } + to_cache_stats_helper(&st1, hashname, 0, &files_size, &cached_files_count); + } + } + + x_asprintf(&path_stderr, "%s.stderr", hashname); + + if (stat(tmp_stderr, &st1) != 0 || + move_file(tmp_stderr, path_stderr) != 0) { + cc_log("failed to rename tmp files - %s\n", strerror(errno)); + stats_update(STATS_ERROR); + failed(); + } + + to_cache_stats_helper(&st1, path_stderr, 0, &files_size, &cached_files_count); + + cc_log("Placed %d files for %s into cache\n", cached_files_count, input_file); + stats_tocache(files_size, cached_files_count); + + free(tmp_stderr); + free(tmp_stdout); + free(tmp_outfiles); + free(path_stderr); +} + +/* find the hash for a command. The hash includes all argument lists, + plus the output from running the compiler with -E */ +static void find_hash(ARGS *args) +{ + int i; + char *path_stdout, *path_stderr; + char *hash_dir; + char *s; + struct stat st; + int status; + int nlevels = 2; + char *input_base; + char *tmp; + + if ((s = getenv("CCACHE_NLEVELS"))) { + nlevels = atoi(s); + if (nlevels < 1) nlevels = 1; + if (nlevels > 8) nlevels = 8; + } + + hash_start(); + + /* when we are doing the unifying tricks we need to include + the input file name in the hash to get the warnings right */ + if (enable_unify || swig) { + hash_string(input_file); + } + + if (swig) { + if (output_file) { + hash_string(output_file); + } + } else { + /* we have to hash the extension, as a .i file isn't treated the same + by the compiler as a .ii file */ + hash_string(i_extension); + } + + /* first the arguments */ + for (i=1;iargc;i++) { + /* some arguments don't contribute to the hash. The + theory is that these arguments will change the + output of -E if they are going to have any effect + at all, or they only affect linking */ + if (i < args->argc-1) { + if (strcmp(args->argv[i], "-I") == 0 || + strcmp(args->argv[i], "-include") == 0 || + strcmp(args->argv[i], "-L") == 0 || + strcmp(args->argv[i], "-D") == 0 || + strcmp(args->argv[i], "-idirafter") == 0 || + strcmp(args->argv[i], "-isystem") == 0) { + i++; + continue; + } + } + if (strncmp(args->argv[i], "-I", 2) == 0 || + strncmp(args->argv[i], "-L", 2) == 0 || + strncmp(args->argv[i], "-D", 2) == 0 || + strncmp(args->argv[i], "-idirafter", 10) == 0 || + strncmp(args->argv[i], "-isystem", 8) == 0) { + continue; + } + + if (strncmp(args->argv[i], "--specs=", 8) == 0 && + stat(args->argv[i]+8, &st) == 0) { + /* if given a explicit specs file, then hash that file, but + don't include the path to it in the hash */ + hash_file(args->argv[i]+8); + continue; + } + + /* all other arguments are included in the hash */ + hash_string(args->argv[i]); + } + + /* the compiler driver size and date. This is a simple minded way + to try and detect compiler upgrades. It is not 100% reliable */ + if (stat(args->argv[0], &st) != 0) { + cc_log("Couldn't stat the compiler!? (argv[0]='%s')\n", args->argv[0]); + stats_update(STATS_COMPILER); + failed(); + } + + /* also include the hash of the compiler name - as some compilers + use hard links and behave differently depending on the real name */ + if (st.st_nlink > 1) { + hash_string(str_basename(args->argv[0])); + } + + hash_int(st.st_size); + hash_int(st.st_mtime); + + /* possibly hash the current working directory */ + if (getenv("CCACHE_HASHDIR")) { + char *cwd = gnu_getcwd(); + if (cwd) { + hash_string(cwd); + free(cwd); + } + } + + /* ~/hello.c -> tmp.hello.123.i + limit the basename to 10 + characters in order to cope with filesystem with small + maximum filename length limits */ + input_base = str_basename(input_file); + tmp = strchr(input_base, '.'); + if (tmp != NULL) { + *tmp = 0; + } + if (strlen(input_base) > 10) { + input_base[10] = 0; + } + + /* now the run */ + x_asprintf(&path_stdout, "%s/%s.tmp.%s.%s", temp_dir, + input_base, tmp_string(), + i_extension); + x_asprintf(&path_stderr, "%s/tmp.cpp_stderr.%s", temp_dir, tmp_string()); + + if (!direct_i_file) { + /* run cpp on the input file to obtain the .i */ + args_add(args, "-E"); + args_add(args, input_file); + status = execute(args->argv, path_stdout, path_stderr); + args_pop(args, 2); + } else { + /* we are compiling a .i or .ii file - that means we + can skip the cpp stage and directly form the + correct i_tmpfile */ + path_stdout = x_strdup(input_file); + if (create_empty_file(path_stderr) != 0) { + cc_log("failed to create empty stderr file\n"); + stats_update(STATS_ERROR); + failed(); + } + status = 0; + } + + if (status != 0) { + if (!direct_i_file) { + unlink(path_stdout); + } + unlink(path_stderr); + cc_log("the preprocessor gave %d\n", status); + stats_update(STATS_PREPROCESSOR); + failed(); + } + + /* if the compilation is with -g then we have to include the whole of the + preprocessor output, which means we are sensitive to line number + information. Otherwise we can discard line number info, which makes + us less sensitive to reformatting changes + + Note! I have now disabled the unification code by default + as it gives the wrong line numbers for warnings. Pity. + */ + if (!enable_unify) { + hash_file(path_stdout); + } else { + if (unify_hash(path_stdout) != 0) { + stats_update(STATS_ERROR); + failed(); + } + } + hash_file(path_stderr); + + i_tmpfile = path_stdout; + + if (!getenv("CCACHE_CPP2")) { + /* if we are using the CPP trick then we need to remember this stderr + data and output it just before the main stderr from the compiler + pass */ + cpp_stderr = path_stderr; + } else { + unlink(path_stderr); + free(path_stderr); + } + + /* we use a N level subdir for the cache path to reduce the impact + on filesystems which are slow for large directories + */ + s = hash_result(); + x_asprintf(&hash_dir, "%s/%c", cache_dir, s[0]); + x_asprintf(&stats_file, "%s/stats", hash_dir); + for (i=1; i= out_filename && *potential_cr == '\r') + *potential_cr = 0; + *linefeed = 0; + + if (retrieved_files_count == 0) { + strcpy(out_filename_cache, hashname); + } else { + sprintf(out_filename_cache, "%s.%d", hashname, retrieved_files_count); + } + + passfail = retrieve_from_cache(out_filename_cache, out_filename, hardlink); + if (passfail == -1) { + break; + } + + retrieved_files_count++; + } else { + cc_log("failed to copy output files from cache - internal error\n"); + stats_update(STATS_ERROR); + passfail = -1; + break; + } + } + if (retrieved_files_count == 0) { + cc_log("failed to copy output files from cache - internal error\n"); + stats_update(STATS_ERROR); + passfail = -1; + } + fclose(file); + } else { + cc_log("failed to open cached outfiles file - %s\n", strerror(errno)); + stats_update(STATS_ERROR); + } + } else { + passfail = retrieve_from_cache(hashname, output_file, hardlink); + } + + free(stderr_file); + if (passfail == -1) { + close(fd_stderr); + unlink(stderr_file); + return; + } + } + + /* get rid of the intermediate preprocessor file */ + if (i_tmpfile) { + if (!direct_i_file) { + unlink(i_tmpfile); + } + free(i_tmpfile); + i_tmpfile = NULL; + } + + /* send the cpp stderr, if applicable */ + fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY); + if (fd_cpp_stderr != -1) { + copy_fd(fd_cpp_stderr, 2); + close(fd_cpp_stderr); + unlink(cpp_stderr); + free(cpp_stderr); + cpp_stderr = NULL; + } + + /* send the stderr */ + copy_fd(fd_stderr, 2); + close(fd_stderr); + + /* and exit with the right status code */ + if (first) { + cc_log("got cached result for %s\n", input_file); + stats_update(STATS_CACHED); + } + + exit(0); +} + +/* find the real compiler. We just search the PATH to find a executable of the + same name that isn't a link to ourselves */ +static void find_compiler(int argc, char **argv) +{ + char *base; + char *path; + + orig_args = args_init(argc, argv); + + base = str_basename(argv[0]); + + /* we might be being invoked like "ccache gcc -c foo.c" */ + if (strcmp(base, MYNAME) == 0) { + args_remove_first(orig_args); + free(base); + if (strchr(argv[1],'/') +#ifdef _WIN32 + || strchr(argv[1],'\\') +#endif + ) { + /* a full path was given */ + return; + } + base = str_basename(argv[1]); + } + + /* support user override of the compiler */ + if ((path=getenv("CCACHE_CC"))) { + base = x_strdup(path); + } + + orig_args->argv[0] = find_executable(base, MYNAME); + + /* can't find the compiler! */ + if (!orig_args->argv[0]) { + stats_update(STATS_COMPILER); + cc_log("could not find compiler (%s)\n", base); + perror(base); + exit(1); + } +} + + +/* check a filename for C/C++ extension. Return the pre-processor + extension */ +static const char *check_extension(const char *fname, int *direct_i) +{ + int i; + const char *p; + + if (direct_i) { + *direct_i = 0; + } + + if (swig) return "ii"; /* any file extension is acceptable as input for SWIG */ + + p = strrchr(fname, '.'); + if (!p) return NULL; + p++; + for (i=0; extensions[i].extension; i++) { + if (strcmp(p, extensions[i].extension) == 0) { + if (direct_i && strcmp(p, extensions[i].i_extension) == 0) { + *direct_i = 1; + } + p = getenv("CCACHE_EXTENSION"); + if (p) return p; + return extensions[i].i_extension; + } + } + return NULL; +} + + +/* + process the compiler options to form the correct set of options + for obtaining the preprocessor output +*/ +static void process_args(int argc, char **argv) +{ + int i; + int found_c_opt = 0; + int found_S_opt = 0; + struct stat st; + char *e; + /* is gcc being asked to output dependencies? */ + int generating_dependencies = 0; + /* is the dependency makefile name overridden with -MF? */ + int dependency_filename_specified = 0; + /* is the dependency makefile target name specified with -MQ or -MF? */ + int dependency_target_specified = 0; + + + stripped_args = args_init(0, NULL); + + args_add(stripped_args, argv[0]); + + /* -c not required for SWIG */ + if (swig) { + found_c_opt = 1; + } + + for (i=1; iargv[0]); + if (strstr(basename, "swig") || getenv("CCACHE_SWIG")) { + swig = 1; + } + free(basename); +} + +/* the main ccache driver function */ +static void ccache(int argc, char *argv[]) +{ + /* find the real compiler */ + find_compiler(argc, argv); + + /* use the real compiler if HOME is not set */ + if (!cache_dir) { + cc_log("Unable to determine home directory\n"); + cc_log("ccache is disabled\n"); + failed(); + } + + /* we might be disabled */ + if (getenv("CCACHE_DISABLE")) { + cc_log("ccache is disabled\n"); + failed(); + } + + if (getenv("CCACHE_STRIPC")) { + strip_c_option = 1; + } + + if (getenv("CCACHE_UNIFY")) { + enable_unify = 1; + } + + detect_swig(); + + /* process argument list, returning a new set of arguments for pre-processing */ + process_args(orig_args->argc, orig_args->argv); + + /* run with -E to find the hash */ + find_hash(stripped_args); + + /* if we can return from cache at this point then do */ + from_cache(1); + + if (getenv("CCACHE_READONLY")) { + cc_log("read-only set - doing real compile\n"); + failed(); + } + + /* run real compiler, sending output to cache */ + to_cache(stripped_args); + + /* return from cache */ + from_cache(0); + + /* oh oh! */ + cc_log("secondary from_cache failed!\n"); + stats_update(STATS_ERROR); + failed(); +} + + +static void usage(void) +{ + printf("%s, a compiler cache including support for SWIG. Version %s\n", MYNAME, CCACHE_VERSION); + printf("Copyright Andrew Tridgell, 2002\n\n"); + + printf("Usage:\n"); + printf("\t" MYNAME " [options]\n"); + printf("\t" MYNAME " compiler [compile options]\n"); + printf("\tcompiler [compile options] (via symbolic link)\n"); + printf("\nOptions:\n"); + + printf("-s show statistics summary\n"); + printf("-z zero statistics\n"); + printf("-c run a cache cleanup\n"); + printf("-C clear the cache completely\n"); + printf("-F set maximum files in cache\n"); + printf("-M set maximum size of cache (use G, M or K)\n"); + printf("-h this help page\n"); + printf("-V print version number\n"); +} + +static void check_cache_dir(void) +{ + if (!cache_dir) { + fatal("Unable to determine home directory"); + } +} + +/* the main program when not doing a compile */ +static int ccache_main(int argc, char *argv[]) +{ + int c; + size_t v; + + while ((c = getopt(argc, argv, "hszcCF:M:V")) != -1) { + switch (c) { + case 'V': + printf("%s version %s\n", MYNAME, CCACHE_VERSION); + printf("Copyright Andrew Tridgell 2002\n"); + printf("Released under the GNU GPL v2 or later\n"); + exit(0); + + case 'h': + usage(); + exit(0); + + case 's': + check_cache_dir(); + stats_summary(); + break; + + case 'c': + check_cache_dir(); + cleanup_all(cache_dir); + printf("Cleaned cache\n"); + break; + + case 'C': + check_cache_dir(); + wipe_all(cache_dir); + printf("Cleared cache\n"); + break; + + case 'z': + check_cache_dir(); + stats_zero(); + printf("Statistics cleared\n"); + break; + + case 'F': + check_cache_dir(); + v = atoi(optarg); + if (stats_set_limits(v, -1) == 0) { + printf("Set cache file limit to %u\n", (unsigned)v); + } else { + printf("Could not set cache file limit.\n"); + exit(1); + } + break; + + case 'M': + check_cache_dir(); + v = value_units(optarg); + if (stats_set_limits(-1, v) == 0) { + printf("Set cache size limit to %uk\n", (unsigned)v); + } else { + printf("Could not set cache size limit.\n"); + exit(1); + } + break; + + default: + usage(); + exit(1); + } + } + + return 0; +} + + +/* Make a copy of stderr that will not be cached, so things like + distcc can send networking errors to it. */ +static void setup_uncached_err(void) +{ + char *buf; + int uncached_fd; + + uncached_fd = dup(2); + if (uncached_fd == -1) { + cc_log("dup(2) failed\n"); + stats_update(STATS_ERROR); + failed(); + } + + /* leak a pointer to the environment */ + x_asprintf(&buf, "UNCACHED_ERR_FD=%d", uncached_fd); + + if (putenv(buf) == -1) { + cc_log("putenv failed\n"); + stats_update(STATS_ERROR); + failed(); + } +} + + +int main(int argc, char *argv[]) +{ + char *p; + + cache_dir = getenv("CCACHE_DIR"); + if (!cache_dir) { + const char *home_directory = get_home_directory(); + if (home_directory) { + x_asprintf(&cache_dir, "%s/.ccache", home_directory); + } + } + + cache_logfile = getenv("CCACHE_LOGFILE"); + + if (getenv("CCACHE_VERBOSE")) { + ccache_verbose = 1; + } + + setup_uncached_err(); + + + /* the user might have set CCACHE_UMASK */ + p = getenv("CCACHE_UMASK"); + if (p) { + mode_t mask; + errno = 0; + mask = strtol(p, NULL, 8); + if (errno == 0) { + umask(mask); + } + } + + + /* check if we are being invoked as "ccache" */ + if (strlen(argv[0]) >= strlen(MYNAME) && + strcmp(argv[0] + strlen(argv[0]) - strlen(MYNAME), MYNAME) == 0) { + if (argc < 2) { + usage(); + exit(1); + } + /* if the first argument isn't an option, then assume we are + being passed a compiler name and options */ + if (argv[1][0] == '-') { + return ccache_main(argc, argv); + } + } + + /* make sure the cache dir exists */ + if (cache_dir && (create_dir(cache_dir) != 0)) { + fprintf(stderr,"ccache: failed to create %s (%s)\n", + cache_dir, strerror(errno)); + exit(1); + } + + temp_dir = getenv("CCACHE_TEMPDIR"); + if (!temp_dir) { + x_asprintf(&temp_dir, "%s/temp", cache_dir); + /* make sure temp dir exists if not supplied by user */ + if (temp_dir && create_dir(temp_dir) != 0) { + fprintf(stderr,"ccache: failed to create %s (%s)\n", + temp_dir, strerror(errno)); + exit(1); + } + } + + if (!getenv("CCACHE_READONLY")) { + if (create_cachedirtag(cache_dir) != 0) { + fprintf(stderr,"ccache: failed to create %s/CACHEDIR.TAG (%s)\n", + cache_dir, strerror(errno)); + exit(1); + } + } + + ccache(argc, argv); + return 1; +} diff --git a/CCache/ccache.h b/CCache/ccache.h new file mode 100644 index 000000000..668ce8288 --- /dev/null +++ b/CCache/ccache.h @@ -0,0 +1,205 @@ +#include "ccache_swig_config.h" + +#define CCACHE_VERSION SWIG_VERSION + +#ifndef _WIN32 +#include "config.h" +#else +#include +#define PACKAGE_NAME "ccache-swig.exe" +#endif + +#include +#include +#include +#include +#include +#include + +#ifndef _WIN32 + #include + #include +#else +#define _WIN32_WINNT 0x0500 + #include + #include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef HAVE_PWD_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif + +#ifdef ENABLE_ZLIB +#include +#endif + +#define STATUS_NOTFOUND 3 +#define STATUS_FATAL 4 +#define STATUS_NOCACHE 5 + +#define MYNAME PACKAGE_NAME + +#define LIMIT_MULTIPLE 0.8 + +/* default maximum cache size */ +#ifndef DEFAULT_MAXSIZE +#define DEFAULT_MAXSIZE (1000*1000) +#endif + +/* file copy mode */ +#ifdef ENABLE_ZLIB +#define COPY_UNCOMPRESSED 0 +#define COPY_FROM_CACHE 1 +#define COPY_TO_CACHE 2 +#endif + +enum stats { + STATS_NONE=0, + STATS_STDOUT, + STATS_STATUS, + STATS_ERROR, + STATS_TOCACHE, + STATS_PREPROCESSOR, + STATS_COMPILER, + STATS_MISSING, + STATS_CACHED, + STATS_ARGS, + STATS_LINK, + STATS_NUMFILES, + STATS_TOTALSIZE, + STATS_MAXFILES, + STATS_MAXSIZE, + STATS_NOTC, + STATS_DEVICE, + STATS_NOINPUT, + STATS_ENVIRONMMENT, + STATS_MULTIPLE, + STATS_CONFTEST, + STATS_UNSUPPORTED, + STATS_OUTSTDOUT, + + STATS_END +}; + +typedef unsigned uint32; + +#include "mdfour.h" + +void hash_start(void); +void hash_string(const char *s); +void hash_int(int x); +void hash_file(const char *fname); +char *hash_result(void); +void hash_buffer(const char *s, int len); + +void cc_log(const char *format, ...); +void fatal(const char *msg); + +void copy_fd(int fd_in, int fd_out); +int safe_rename(const char* oldpath, const char* newpath); +int move_file(const char *src, const char *dest); +int test_if_compressed(const char *filename); + +int commit_to_cache(const char *src, const char *dest, int hardlink); +int retrieve_from_cache(const char *src, const char *dest, int hardlink); + +int create_dir(const char *dir); +int create_cachedirtag(const char *dir); +void x_asprintf(char **ptr, const char *format, ...); +char *x_strdup(const char *s); +void *x_realloc(void *ptr, size_t size); +void *x_malloc(size_t size); +void traverse(const char *dir, void (*fn)(const char *, struct stat *)); +char *str_basename(const char *s); +char *dirname(char *s); +int lock_fd(int fd); +size_t file_size(struct stat *st); +int safe_open(const char *fname); +char *x_realpath(const char *path); +char *gnu_getcwd(void); +int create_empty_file(const char *fname); +const char *get_home_directory(void); +int x_utimes(const char *filename); +#ifdef _WIN32 +void perror_win32(LPTSTR pszFunction); +#endif + +void stats_update(enum stats stat); +void stats_zero(void); +void stats_summary(void); +void stats_tocache(size_t size, size_t numfiles); +void stats_read(const char *stats_file, unsigned counters[STATS_END]); +int stats_set_limits(long maxfiles, long maxsize); +size_t value_units(const char *s); +void display_size(unsigned v); +void stats_set_sizes(const char *dir, size_t num_files, size_t total_size); + +int unify_hash(const char *fname); + +#ifndef HAVE_VASPRINTF +int vasprintf(char **, const char *, va_list ); +#endif +#ifndef HAVE_ASPRINTF +int asprintf(char **ptr, const char *format, ...); +#endif + +#ifndef HAVE_SNPRINTF +int snprintf(char *,size_t ,const char *, ...); +#endif + +void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize); +void cleanup_all(const char *dir); +void wipe_all(const char *dir); + +#ifdef _WIN32 +char *argvtos(char **argv); +#endif +int execute(char **argv, + const char *path_stdout, + const char *path_stderr); +char *find_executable(const char *name, const char *exclude_name); +void display_execute_args(char **argv); + +typedef struct { + char **argv; + int argc; +} ARGS; + + +ARGS *args_init(int , char **); +void args_add(ARGS *args, const char *s); +void args_add_prefix(ARGS *args, const char *s); +void args_pop(ARGS *args, int n); +void args_strip(ARGS *args, const char *prefix); +void args_remove_first(ARGS *args); + +extern int ccache_verbose; + +#if HAVE_COMPAR_FN_T +#define COMPAR_FN_T __compar_fn_t +#else +typedef int (*COMPAR_FN_T)(const void *, const void *); +#endif + +/* work with silly DOS binary open */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif + +/* mkstemp() on some versions of cygwin don't handle binary files, so + override */ +#ifdef __CYGWIN__ +#undef HAVE_MKSTEMP +#endif diff --git a/CCache/ccache.yo b/CCache/ccache.yo new file mode 100644 index 000000000..2477662dc --- /dev/null +++ b/CCache/ccache.yo @@ -0,0 +1,422 @@ +whenman( +COMMENT(html output not great if included when using html2doc) +manpage(ccache-swig)(1)()()() +) + +whenhtml(htmlcommand( + + + + +ccache-swig(1) manpage + + + + +

      Using SWIG with ccache - ccache-swig(1) manpage

      + +
      + + +)) + + +manpagename(ccache-swig)(a fast compiler cache) + +whenhtml(htmlcommand( +ccache-swig - a fast compiler cache +)) + +manpagesynopsis() + +ccache-swig [OPTION] + +ccache-swig [COMPILER OPTIONS] + + [COMPILER OPTIONS] + +manpagedescription() + +ccache-swig is a compiler cache. It speeds up re-compilation of C/C++/SWIG code +by caching previous compiles and detecting when the same compile is +being done again. ccache-swig is ccache plus support for SWIG. ccache +and ccache-swig are used interchangeably in this document. + +manpagesection(OPTIONS SUMMARY) + +Here is a summary of the options to ccache-swig. + +verb( +-s show statistics summary +-z zero statistics +-c run a cache cleanup +-C clear the cache completely +-F set maximum files in cache +-M set maximum size of cache (use G, M or K) +-h this help page +-V print version number +) + +manpageoptions() + +These options only apply when you invoke ccache as "ccache-swig". When +invoked as a compiler none of these options apply. In that case your +normal compiler options apply and you should refer to your compilers +documentation. + +startdit() +dit(bf(-h)) Print a options summary page + +dit(bf(-s)) Print the current statistics summary for the cache. The +statistics are stored spread across the subdirectories of the +cache. Using "ccache-swig -s" adds up the statistics across all +subdirectories and prints the totals. + +dit(bf(-z)) Zero the cache statistics. + +dit(bf(-V)) Print the ccache version number + +dit(bf(-c)) Clean the cache and re-calculate the cache file count and +size totals. Normally the -c option should not be necessary as ccache +keeps the cache below the specified limits at runtime and keeps +statistics up to date on each compile. This option is mostly useful +if you manually modify the cache contents or believe that the cache +size statistics may be inaccurate. + +dit(bf(-C)) Clear the entire cache, removing all cached files. + +dit(bf(-F )) This sets the maximum number of files allowed in +the cache. The value is stored inside the cache directory and applies +to all future compiles. Due to the way the value is stored the actual +value used is always rounded down to the nearest multiple of 16. + +dit(bf(-M )) This sets the maximum cache size. You can specify +a value in gigabytes, megabytes or kilobytes by appending a G, M or K +to the value. The default is gigabytes. The actual value stored is +rounded down to the nearest multiple of 16 kilobytes. + +enddit() + +manpagesection(INSTALLATION) + +There are two ways to use ccache. You can either prefix your compile +commands with "ccache-swig" or you can create a symbolic link between +ccache-swig and the names of your compilers. The first method is most +convenient if you just want to try out ccache or wish to use it for +some specific projects. The second method is most useful for when you +wish to use ccache for all your compiles. + +To install for usage by the first method just copy ccache-swig to somewhere +in your path. + +To install for the second method do something like this: +verb( + cp ccache-swig /usr/local/bin/ + ln -s /usr/local/bin/ccache-swig /usr/local/bin/gcc + ln -s /usr/local/bin/ccache-swig /usr/local/bin/g++ + ln -s /usr/local/bin/ccache-swig /usr/local/bin/cc + ln -s /usr/local/bin/ccache-swig /usr/local/bin/swig +) +This will work as long as /usr/local/bin comes before the path to gcc +(which is usually in /usr/bin). After installing you may wish to run +"which gcc" to make sure that the correct link is being used. + +Note! Do not use a hard link, use a symbolic link. A hardlink will +cause "interesting" problems. + +manpagesection(EXTRA OPTIONS) + +When run as a compiler front end ccache usually just takes the same +command line options as the compiler you are using. The only exception +to this is the option '--ccache-skip'. That option can be used to tell +ccache that the next option is definitely not a input filename, and +should be passed along to the compiler as-is. + +The reason this can be important is that ccache does need to parse the +command line and determine what is an input filename and what is a +compiler option, as it needs the input filename to determine the name +of the resulting object file (among other things). The heuristic +ccache uses in this parse is that any string on the command line that +exists as a file is treated as an input file name (usually a C +file). By using --ccache-skip you can force an option to not be +treated as an input file name and instead be passed along to the +compiler as a command line option. + +manpagesection(ENVIRONMENT VARIABLES) + +ccache uses a number of environment variables to control operation. In +most cases you won't need any of these as the defaults will be fine. + +startdit() + +dit(bf(CCACHE_DIR)) the CCACHE_DIR environment variable specifies +where ccache will keep its cached compiler output. The default is +"$HOME/.ccache". + +dit(bf(CCACHE_TEMPDIR)) the CCACHE_TEMPDIR environment variable specifies +where ccache will put temporary files. The default is the same as +CCACHE_DIR. Note that the CCACHE_TEMPDIR path must be on the same +filesystem as the CCACHE_DIR path, so that renames of files between +the two directories can work. + +dit(bf(CCACHE_LOGFILE)) If you set the CCACHE_LOGFILE environment +variable then ccache will write some log information on cache hits +and misses in that file. This is useful for tracking down problems. + +dit(bf(CCACHE_VERBOSE)) If you set the CCACHE_VERBOSE environment +variable then ccache will display on stdout all the compiler invocations +that it makes. This can useful for debugging unexpected problems. + +dit(bf(CCACHE_PATH)) You can optionally set CCACHE_PATH to a colon +separated path where ccache will look for the real compilers. If you +don't do this then ccache will look for the first executable matching +the compiler name in the normal PATH that isn't a symbolic link to +ccache itself. + +dit(bf(CCACHE_CC)) You can optionally set CCACHE_CC to force the name +of the compiler to use. If you don't do this then ccache works it out +from the command line. + +dit(bf(CCACHE_PREFIX)) This option adds a prefix to the command line +that ccache runs when invoking the compiler. Also see the section +below on using ccache with distcc. + +dit(bf(CCACHE_DISABLE)) If you set the environment variable +CCACHE_DISABLE then ccache will just call the real compiler, +bypassing the cache completely. + +dit(bf(CCACHE_READONLY)) the CCACHE_READONLY environment variable +tells ccache to attempt to use existing cached object files, but not +to try to add anything new to the cache. If you are using this because +your CCACHE_DIR is read-only, then you may find that you also need to +set CCACHE_TEMPDIR as otherwise ccache will fail to create the +temporary files. + +dit(bf(CCACHE_CPP2)) If you set the environment variable CCACHE_CPP2 +then ccache will not use the optimisation of avoiding the 2nd call to +the pre-processor by compiling the pre-processed output that was used +for finding the hash in the case of a cache miss. This is primarily a +debugging option, although it is possible that some unusual compilers +will have problems with the intermediate filename extensions used in +this optimisation, in which case this option could allow ccache to be +used. + +dit(bf(CCACHE_NOCOMPRESS)) If you set the environment variable +CCACHE_NOCOMPRESS then there is no compression used on files that go +into the cache. However, this setting has no effect on how files are +retrieved from the cache, compressed results will still be usable. + +dit(bf(CCACHE_NOSTATS)) If you set the environment variable +CCACHE_NOSTATS then ccache will not update the statistics files on +each compile. + +dit(bf(CCACHE_NLEVELS)) The environment variable CCACHE_NLEVELS allows +you to choose the number of levels of hash in the cache directory. The +default is 2. The minimum is 1 and the maximum is 8. + +dit(bf(CCACHE_HARDLINK)) If you set the environment variable +CCACHE_HARDLINK then ccache will attempt to use hard links from the +cache directory when creating the compiler output rather than using a +file copy. Using hard links is faster, but can confuse programs like +'make' that rely on modification times. Hard links are never made for +compressed cache files. + +dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached +results, even if it finds them. New results are still cached, but +existing cache entries are ignored. + +dit(bf(CCACHE_UMASK)) This sets the umask for ccache and all child +processes (such as the compiler). This is mostly useful when you wish +to share your cache with other users. Note that this also affects the +file permissions set on the object files created from your +compilations. + +dit(bf(CCACHE_HASHDIR)) This tells ccache to hash the current working +directory when calculating the hash that is used to distinguish two +compiles. This prevents a problem with the storage of the current +working directory in the debug info of a object file, which can lead +ccache to give a cached object file that has the working directory in +the debug info set incorrectly. This option is off by default as the +incorrect setting of this debug info rarely causes problems. If you +strike problems with gdb not using the correct directory then enable +this option. + +dit(bf(CCACHE_UNIFY)) If you set the environment variable CCACHE_UNIFY +then ccache will use the C/C++ unifier when hashing the pre-processor +output if -g is not used in the compile. The unifier is slower than a +normal hash, so setting this environment variable loses a little bit +of speed, but it means that ccache can take advantage of not +recompiling when the changes to the source code consist of +reformatting only. Note that using CCACHE_UNIFY changes the hash, so +cached compiles with CCACHE_UNIFY set cannot be used when +CCACHE_UNIFY is not set and vice versa. The reason the unifier is off +by default is that it can give incorrect line number information in +compiler warning messages. + +dit(bf(CCACHE_EXTENSION)) Normally ccache tries to automatically +determine the extension to use for intermediate C pre-processor files +based on the type of file being compiled. Unfortunately this sometimes +doesn't work, for example when using the aCC compiler on HP-UX. On +systems like this you can use the CCACHE_EXTENSION option to override +the default. On HP-UX set this environment variable to "i" if you use +the aCC compiler. + +dit(bf(CCACHE_STRIPC)) If you set the environment variable +CCACHE_STRIPC then ccache will strip the -c option when invoking +the preprocessor. This option is primarily for the Sun Workshop +C++ compiler as without this option an unwarranted warning is displayed: +CC: Warning: "-E" redefines product from "object" to "source (stdout)" +when -E and -c is used together. + +dit(bf(CCACHE_SWIG)) When using SWIG as the compiler and it does not +have 'swig' in the executable name, then the CCACHE_SWIG environment +variable needs to be set in order for ccache to work correctly with +SWIG. The use of CCACHE_CPP2 is also recommended for SWIG due to some +preprocessor quirks, however, use of CCACHE_CPP2 can often be skipped +-- check your generated code with and without this option set. Known +problems are using preprocessor directives within %inline blocks and +the use of '#pragma SWIG'. + +enddit() + +manpagesection(CACHE SIZE MANAGEMENT) + +By default ccache has a one gigabyte limit on the cache size and no +maximum number of files. You can set a different limit using the +"ccache -M" and "ccache -F" options, which set the size and number of +files limits. + +When these limits are reached ccache will reduce the cache to 20% +below the numbers you specified in order to avoid doing the cache +clean operation too often. + +manpagesection(CACHE COMPRESSION) + +By default on most platforms ccache will compress all files it puts +into the cache +using the zlib compression. While this involves a negligible +performance slowdown, it significantly increases the number of files +that fit in the cache. You can turn off compression setting the +CCACHE_NOCOMPRESS environment variable. + +manpagesection(HOW IT WORKS) + +The basic idea is to detect when you are compiling exactly the same +code a 2nd time and use the previously compiled output. You detect +that it is the same code by forming a hash of: + +itemization( + it() the pre-processor output from running the compiler with -E + it() the command line options + it() the real compilers size and modification time + it() any stderr output generated by the compiler +) + +These are hashed using md4 (a strong hash) and a cache file is formed +based on that hash result. When the same compilation is done a second +time ccache is able to supply the correct compiler output (including +all warnings etc) from the cache. + +ccache has been carefully written to always produce exactly the same +compiler output that you would get without the cache. If you ever +discover a case where ccache changes the output of your compiler then +please let me know. + +manpagesection(USING CCACHE WITH DISTCC) + +distcc is a very useful program for distributing compilation across a +range of compiler servers. It is often useful to combine distcc with +ccache, so that compiles that are done are sped up by distcc, but that +ccache avoids the compile completely where possible. + +To use distcc with ccache I recommend using the CCACHE_PREFIX +option. You just need to set the environment variable CCACHE_PREFIX to +'distcc' and ccache will prefix the command line used with the +compiler with the command 'distcc'. + +manpagesection(SHARING A CACHE) + +A group of developers can increase the cache hit rate by sharing a +cache directory. The hard links however cause unwanted side effects, +as all links to a cached file share the file's modification timestamp. +This results in false dependencies to be triggered by timestamp-based +build systems whenever another user links to an existing +file. Typically, users will see that their libraries and binaries are +relinked without reason. To share a cache without side effects, the +following conditions need to be met: + +itemization( + it() Use the same bf(CCACHE_DIR) environment variable setting + it() Unset the bf(CCACHE_HARDLINK) environment variable + it() Make sure everyone sets the CCACHE_UMASK environment variable + to 002, this ensures that cached files are accessible to everyone in + the group. + it() Make sure that all users have write permission in the entire + cache directory (and that you trust all users of the shared cache). + it() Make sure that the setgid bit is set on all directories in the + cache. This tells the filesystem to inherit group ownership for new + directories. The command "chmod g+s `find $CCACHE_DIR -type d`" might + be useful for this. + it() Set bf(CCACHE_NOCOMPRESS) for all users, if there are users with + versions of ccache that do not support compression. +) + +manpagesection(HISTORY) + +ccache was inspired by the compilercache shell script script written +by Erik Thiele and I would like to thank him for an excellent piece of +work. See +url(http://www.erikyyy.de/compilercache/)(http://www.erikyyy.de/compilercache/) +for the Erik's scripts. +ccache-swig is a port of the original ccache with support added for use +with SWIG. + +I wrote ccache because I wanted to get a bit more speed out of a +compiler cache and I wanted to remove some of the limitations of the +shell-script version. + +manpagesection(DIFFERENCES FROM COMPILERCACHE) + +The biggest differences between Erik's compilercache script and ccache +are: +itemization( +it() ccache is written in C, which makes it a bit faster (calling out to + external programs is mostly what slowed down the scripts). +it() ccache can automatically find the real compiler +it() ccache keeps statistics on hits/misses +it() ccache can do automatic cache management +it() ccache can cache compiler output that includes warnings. In many + cases this gives ccache a much higher cache hit rate. +it() ccache can handle a much wider ranger of compiler options +it() ccache avoids a double call to cpp on a cache miss +) + +manpagesection(CREDITS) + +Thanks to the following people for their contributions to ccache +itemization( + it() Erik Thiele for the original compilercache script + it() Luciano Rocha for the idea of compiling the pre-processor output + to avoid a 2nd cpp pass + it() Paul Russell for many suggestions and the debian packaging +) + +manpageauthor() + +ccache was written by Andrew Tridgell +url(http://samba.org/~tridge/)(http://samba.org/~tridge/). +ccache was adapted to create ccache-swig for use with SWIG by William Fulton. + +If you wish to report a problem or make a suggestion then please email +the SWIG developers on the swig-devel mailing list, see +url(http://www.swig.org/mail.html)(http://www.swig.org/mail.html) + +ccache is released under the GNU General Public License version 2 or +later. Please see the file COPYING for license details. + +whenhtml(htmlcommand( + + + + +)) diff --git a/CCache/ccache_swig_config.h.in b/CCache/ccache_swig_config.h.in new file mode 100644 index 000000000..bbb205f77 --- /dev/null +++ b/CCache/ccache_swig_config.h.in @@ -0,0 +1 @@ +#define SWIG_VERSION "@PACKAGE_VERSION@" diff --git a/CCache/cleanup.c b/CCache/cleanup.c new file mode 100644 index 000000000..99312283e --- /dev/null +++ b/CCache/cleanup.c @@ -0,0 +1,193 @@ +/* + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* + functions to cleanup the cache directory when it gets too large + */ + +#include "ccache.h" + +static struct files { + char *fname; + time_t mtime; + size_t size; +} **files; +static unsigned allocated; +static unsigned num_files; +static size_t total_size; +static size_t total_files; +static size_t size_threshold; +static size_t files_threshold; + +/* file comparison function to try to delete the oldest files first */ +static int files_compare(struct files **f1, struct files **f2) +{ + if ((*f2)->mtime == (*f1)->mtime) { + return strcmp((*f2)->fname, (*f1)->fname); + } + if ((*f2)->mtime > (*f1)->mtime) { + return -1; + } + return 1; +} + +/* this builds the list of files in the cache */ +static void traverse_fn(const char *fname, struct stat *st) +{ + char *p; + + if (!S_ISREG(st->st_mode)) return; + + p = str_basename(fname); + if (strcmp(p, "stats") == 0) { + free(p); + return; + } + free(p); + + if (num_files == allocated) { + allocated = 10000 + num_files*2; + files = (struct files **)x_realloc(files, + sizeof(struct files *)*allocated); + } + + files[num_files] = (struct files *)x_malloc(sizeof(struct files)); + files[num_files]->fname = x_strdup(fname); + files[num_files]->mtime = st->st_mtime; + files[num_files]->size = file_size(st) / 1024; + total_size += files[num_files]->size; + num_files++; +} + +/* sort the files we've found and delete the oldest ones until we are + below the thresholds */ +static void sort_and_clean(void) +{ + unsigned i; + + if (num_files > 1) { + /* sort in ascending data order */ + qsort(files, num_files, sizeof(struct files *), + (COMPAR_FN_T)files_compare); + } + + /* delete enough files to bring us below the threshold */ + for (i=0;ifname) != 0 && errno != ENOENT) { + fprintf(stderr, "unlink %s - %s\n", + files[i]->fname, strerror(errno)); + continue; + } + + total_size -= files[i]->size; + } + + total_files = num_files - i; +} + +/* cleanup in one cache subdir */ +void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize) +{ + unsigned i; + + size_threshold = maxsize * LIMIT_MULTIPLE; + files_threshold = maxfiles * LIMIT_MULTIPLE; + + num_files = 0; + total_size = 0; + + /* build a list of files */ + traverse(dir, traverse_fn); + + /* clean the cache */ + sort_and_clean(); + + stats_set_sizes(dir, total_files, total_size); + + /* free it up */ + for (i=0;ifname); + free(files[i]); + files[i] = NULL; + } + if (files) free(files); + allocated = 0; + files = NULL; + + num_files = 0; + total_size = 0; +} + +/* cleanup in all cache subdirs */ +void cleanup_all(const char *dir) +{ + unsigned counters[STATS_END]; + char *dname, *sfile; + int i; + + for (i=0;i<=0xF;i++) { + x_asprintf(&dname, "%s/%1x", dir, i); + x_asprintf(&sfile, "%s/%1x/stats", dir, i); + + memset(counters, 0, sizeof(counters)); + stats_read(sfile, counters); + + cleanup_dir(dname, + counters[STATS_MAXFILES], + counters[STATS_MAXSIZE]); + free(dname); + free(sfile); + } +} + + +/* traverse function for wiping files */ +static void wipe_fn(const char *fname, struct stat *st) +{ + char *p; + + if (!S_ISREG(st->st_mode)) return; + + p = str_basename(fname); + if (strcmp(p, "stats") == 0) { + free(p); + return; + } + free(p); + + unlink(fname); +} + + +/* wipe all cached files in all subdirs */ +void wipe_all(const char *dir) +{ + char *dname; + int i; + + for (i=0;i<=0xF;i++) { + x_asprintf(&dname, "%s/%1x", dir, i); + traverse(dir, wipe_fn); + free(dname); + } + + /* and fix the counters */ + cleanup_all(dir); +} diff --git a/CCache/configure.in b/CCache/configure.in new file mode 100644 index 000000000..dfbf86dbc --- /dev/null +++ b/CCache/configure.in @@ -0,0 +1,87 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT([ccache-swig], [0.0]) # Get version from SWIG in ccache_swig_config.h.in +AC_PREREQ(2.52) +AC_CONFIG_SRCDIR([ccache.h]) + +AC_MSG_NOTICE([Configuring ccache]) + +AC_CONFIG_HEADER(config.h) + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_ARG_PROGRAM # for program_transform_name + +AC_DEFINE([_GNU_SOURCE], 1, + [Define _GNU_SOURCE so that we get all necessary prototypes]) + +# If GCC, turn on warnings. +if test "x$GCC" = "xyes" +then + CFLAGS="$CFLAGS -Wall -W" +else + CFLAGS="$CFLAGS -O" +fi + +AC_HEADER_DIRENT +AC_HEADER_TIME +AC_HEADER_SYS_WAIT + +AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h) + +AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp) +AC_CHECK_FUNCS(gethostname getpwuid) +AC_CHECK_FUNCS(utimes) + +AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ + AC_TRY_COMPILE( +[#include ], +[ +void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); } +], + ccache_cv_COMPAR_FN_T=yes,ccache_cv_COMPAR_FN_T=no)]) +if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then + AC_DEFINE(HAVE_COMPAR_FN_T, 1, [ ]) +fi + +dnl Note: This could be replaced by AC_FUNC_SNPRINTF() in the autoconf macro archive +AC_CACHE_CHECK([for C99 vsnprintf],ccache_cv_HAVE_C99_VSNPRINTF,[ +AC_TRY_RUN([ +#include +#include +void foo(const char *format, ...) { + va_list ap; + int len; + char buf[5]; + + va_start(ap, format); + len = vsnprintf(0, 0, format, ap); + va_end(ap); + if (len != 5) exit(1); + + if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1); + + exit(0); +} +main() { foo("hello"); } +], +ccache_cv_HAVE_C99_VSNPRINTF=yes,ccache_cv_HAVE_C99_VSNPRINTF=no,ccache_cv_HAVE_C99_VSNPRINTF=cross)]) +if test x"$ccache_cv_HAVE_C99_VSNPRINTF" = x"yes"; then + AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ]) +fi + +dnl Check for zlib. +dnl Note: This could be replaced by CHECK_ZLIB() in the autoconf macro archive +AC_ARG_ENABLE([zlib], + AS_HELP_STRING([--enable-zlib], [enable zlib support for ccache compression]),, + [enable_zlib=yes]) + +if test x"$enable_zlib" = x"yes"; then + AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzdopen, [LIBS="-lz $LIBS" + AC_DEFINE([ENABLE_ZLIB], 1, [Define to 1 if you would like to have zlib compression for ccache.]) ] )) +fi + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/CCache/debian/NEWS b/CCache/debian/NEWS new file mode 100644 index 000000000..be245dc7d --- /dev/null +++ b/CCache/debian/NEWS @@ -0,0 +1,22 @@ +ccache (2.4-8) unstable; urgency=high + + zlib compression is now enabled by default in order to increase the amount + of object files that can fit in the cache. + + The impact on performance is supposed to be almost negligible + (see http://www.gustaebel.de/lars/ccache/). If you do want to disable + it however, simply export the CCACHE_NOCOMPRESS environment variable. + + Note that a zlib-enabled ccache will still read your existing + uncompressed cache. If you want to compress/uncompress your cache, + see the manage-cache.sh script under /usr/share/doc/ccache/examples/. + + -- Francois Marier Sun, 20 May 2007 19:45:07 +1200 + +ccache (2.4-1) unstable; urgency=low + + * This release changes the hash input slighly, so you will probably find + that you will not get any hits against your existing cache when you + upgrade. + + -- Francois Marier Sat, 11 Jun 2005 13:54:33 -0400 diff --git a/CCache/debian/README.Debian b/CCache/debian/README.Debian new file mode 100644 index 000000000..5478bb720 --- /dev/null +++ b/CCache/debian/README.Debian @@ -0,0 +1,59 @@ +Installing ccache +----------------- + +The recommended way to use this with Debian is to either create "cc" +and "gcc" symlinks to /usr/bin/ccache in your private bin directory +(which must be before the real cc and gcc in your path), or use +CC="ccache gcc" on the make command line. + +Another option is to just prepend /usr/lib/ccache in your PATH +environment variable, like + + export PATH="/usr/lib/ccache:$PATH" + +Note that ccache works with both native and cross compilers. + +Ignoring whitespace +------------------- + +If you wish to set up ccache so that it ignores blank lines, have a +look at the CCACHE_UNIFY option. However, please note that this +option is off by default since the reported line numbers may not +match the source files anymore. + + +NFS Issues +---------- + +(from John Coiner on the ccache mailing list) + +When CCache creates a hardlinked output file, it calls utime() to update +the timestamp on the object, so that Make realizes that the object has +changed. + +On NFS, utime() has no coherency guarantee, AFAIK. When utime() runs on +host A, and our parallel implementation of Make is running on host B, +sometimes Make doesn't see the new timestamp soon enough -- and neglects +to relink the final binary. That's a one-way ticket to Silent Mysterious +Failure Town. + +Instead of relying on the object file timestamp, we create a dummy file +with a reliable timestamp: + +objs/foo.o objs/foo.o.built : + if ( ccache gcc -o foo.o -c foo.c ) ; \ + then touch objs/foo.o.built ; \ + else exit 1; \ + fi + +binary : objs/foo.o.built + gcc -o binary objs/foo.o + +NFS does make a coherency guarantee, that if a file is written and +close()d on host A, and subsequently open()ed on host B, that the second +open() will reflect all modifications and attributes from the close(). +Since Make does open() when checking timestamps, and the dummy file is +close()d when it's created, the binary will always relink after the +object is recompiled. + + -- Francois Marier Sun, 20 May 2007 17:35:36 +1200 diff --git a/CCache/debian/changelog b/CCache/debian/changelog new file mode 100644 index 000000000..45500d4bd --- /dev/null +++ b/CCache/debian/changelog @@ -0,0 +1,221 @@ +ccache (2.4-15) unstable; urgency=low + + * Add a new patch which improve the consistency of timestamps on cached + objects to make sure clean-up is based on least recently used objects. + * Patch the set_limit call so that non-writable cache directories return + an error when attempting to size the max(files|size) (closes: #332527) + + -- Francois Marier Sun, 13 Apr 2008 15:07:05 +1200 + +ccache (2.4-14) unstable; urgency=low + + * Mention the long options everywhere in the manpage + * Merge Gentoo patches: + - respect user's LDFLAGS + - use utimes() for timestamp if possible + + -- Francois Marier Sun, 23 Mar 2008 16:30:11 +1300 + +ccache (2.4-13) unstable; urgency=low + + * Update CACHEDIR.TAG patch to avoid creating the tag file when the + CCACHE_READONLY environment variable is set. (closes: #464356) + * Mention the GNU-style long options in the manpage + + -- Francois Marier Thu, 07 Feb 2008 10:50:42 +1300 + +ccache (2.4-12) unstable; urgency=low + + * Add symlink for gcc 4.3 (closes: #463590) + * Add support for the CACHEDIR.TAG spec, thanks to Karl Chen. + (see http://www.brynosaurus.com/cachedir/) + * Fix hyphens in manpage (lintian notice) + * Bump Standards-Version up to 3.7.3 (no changes) + * Bump debhelper compatibility to 6 + + -- Francois Marier Sat, 02 Feb 2008 10:37:22 +1300 + +ccache (2.4-11) unstable; urgency=low + + * Add the collab-maint repo to debian/control + + -- Francois Marier Tue, 20 Nov 2007 15:26:37 +1300 + +ccache (2.4-10) unstable; urgency=low + + * Document where the patches are from in debian/patches/CREDITS + * debian/rules: + - Fixed "make distclean" lintian warning + - Removed commented-out entries + * Set debhelper compatibility to 5 + * Add homepage field in debian/control + * Add symlinks for MinGW (closes: #445782) + * Bump the version to 5 in the debhelper dependency + + -- Francois Marier Fri, 19 Oct 2007 16:04:37 +1300 + +ccache (2.4-9) unstable; urgency=low + + * Add a symlink for gcc 4.2 (closes: #431007) + * Fix dependencies when using -o (closes: #217713) + + -- Francois Marier Sat, 30 Jun 2007 17:58:44 +1200 + +ccache (2.4-8) unstable; urgency=low + + * Enable zlib compression of the cache by default (closes: #409848). + Thanks to Sami Liedes for suggesting this. + * Disable ccache when profiling (closes: #215849). + Thanks to Ted Percival for the Patch. + * Fix NFS renaming issues and add instructions to the README. + Thanks to John Coiner and instructions. + * Put all patches in debian/patches and apply them at build time. + + -- Francois Marier Sun, 20 May 2007 19:42:34 +1200 + +ccache (2.4-7) unstable; urgency=low + + * Use the real compiler when HOME is not set (closes: #396350) + * Include user script under doc/examples (closes: #392435) + Thanks to Behan Webster! + * Add support for GNU --long options (closes: #297126) + + -- Francois Marier Sat, 18 Nov 2006 00:50:59 -0500 + +ccache (2.4-6) unstable; urgency=low + + * Include symlinks for gcc 4.1 (closes: #372838) + * Update watch file + + -- Francois Marier Tue, 13 Jun 2006 22:17:37 -0400 + +ccache (2.4-5) unstable; urgency=low + + * Document the fact that cross-compiling is supported (closes: #349221) + * Bump Standards-Version up to 3.7.2 (no changes) + + -- Francois Marier Sun, 4 Jun 2006 01:20:07 -0400 + +ccache (2.4-4) unstable; urgency=low + + * Mention another way to use ccache in README.Debian (thanks to Benjamin + Drieu for the suggestion) (closes: #267632) + * Update FSF address + * Fix watch file + + -- Francois Marier Sat, 26 Nov 2005 00:15:13 -0500 + +ccache (2.4-3) unstable; urgency=low + + * Actually use the configuration flags in debian/rules + * Bump Standards-Version up to 3.6.2 (no changes) + + -- Francois Marier Sun, 26 Jun 2005 13:33:19 -0400 + +ccache (2.4-2) unstable; urgency=low + + * Add gcc and g++ symlinks to /usr/lib/ccache (closes: #313490) + * Remove invalid entry from Depends + + -- Francois Marier Wed, 15 Jun 2005 20:51:03 -0400 + +ccache (2.4-1) unstable; urgency=low + + * New maintainer (closes: #312867) + * New upstream version: (closes: #273753, #239640) + - New CCACHE_READONLY and CCACHE_TEMPDIR options + - Fixed handling of hard-linked compilers on AIX + - Fixed handling of HOME environment variable (closes: #299880) + - Show cache directory in stats output + * Fix copyright file + * Add 'distcc' to Suggests (closes: #269158) + * Add a note about whitespace in README.Debian (closes: #229116) + * Update rules to add symmlinks for gcc 3.4 & 4.0 (closes: #261177) + * Acknowledge NMUs (closes: #200185, #177129, #174417) + + -- Francois Marier Sun, 12 Jun 2005 12:05:34 -0400 + +ccache (2.3-1.1) unstable; urgency=low + + * Non-maintainer upload during BSP + * Re-apply patch for + #200185 ccache: Incorrect symlinks in /usr/lib/ccache + (Closes: #200185) + + -- Frank Lichtenheld Fri, 19 Mar 2004 11:14:50 +0100 + +ccache (2.3-1) unstable; urgency=low + + * New upstream release: obsoletes existing caches. + * Tweak package description in arbitrary way (closes: #181721) + + -- Paul Russell Mon, 29 Sep 2003 02:53:20 +0200 + +ccache (2.2-2) unstable; urgency=low + + * Insert more symlinks in ccache dir (closes: #197468) + + -- Paul Russell Mon, 16 Jun 2003 10:52:50 +0100 + +ccache (2.2-1) unstable; urgency=low + + * New upstream release (closes: #150755) + * Insert more symlinks in ccache dir (closes: #144462) + + -- Paul Russell Mon, 17 Feb 2003 07:19:36 +0100 + +ccache (2.1.1-2) unstable; urgency=low + + * Restored /usr/lib/ccache symlinks (closes: #179393) + * Fixed manpage typo (closes: #179564) + * With thanks to Andreas Rottmann. + + -- Paul Russell Wed, 5 Feb 2003 10:01:10 +0100 + +ccache (2.1.1-1) unstable; urgency=low + + * NMU (with maintainer consent). + * New upstream release (closes: #174417, #177129). + * debian/control: + + Build-Depend on and use dephelper 4 (DH_COMPAT = 4). + + Bumped Standards-Version to 3.5.8. + + No full stop on short package description (fixes linda warning). + * debian/copright: + + Make lintian feel comfortable; fixes warnings: + - copyright-should-refer-to-common-license-file-for-gpl + - copyright-lists-upstream-authors-with-dh_make-boilerplate + * Built with g++ 3.2 :-). + + -- Andreas Rottmann Thu, 16 Jan 2003 11:42:38 +0100 + +ccache (1.9-1) unstable; urgency=low + + * New upstream release (closes: #144920) + + -- Paul Russell Mon, 13 May 2002 10:01:09 +0200 + +ccache (1.8-1) unstable; urgency=low + + * New upstream release (closes: #145401) + + -- Paul Russell Fri, 3 May 2002 02:26:32 +0200 + +ccache (1.7-1) unstable; urgency=low + + * New upstream release + * Install symlinks in /usr/lib/ccache (closes: #141337) + + -- Paul Russell Wed, 10 Apr 2002 17:51:21 +0200 + +ccache (1.4-1) unstable; urgency=low + + * New upstream release + + -- Paul Russell Wed, 3 Apr 2002 03:41:46 +0200 + +ccache (1.2-1) unstable; urgency=low + + * Initial Release. + + -- Paul Russell Sun, 31 Mar 2002 14:08:57 +0200 + diff --git a/CCache/debian/compat b/CCache/debian/compat new file mode 100644 index 000000000..1e8b31496 --- /dev/null +++ b/CCache/debian/compat @@ -0,0 +1 @@ +6 diff --git a/CCache/debian/control b/CCache/debian/control new file mode 100644 index 000000000..0b7e57282 --- /dev/null +++ b/CCache/debian/control @@ -0,0 +1,20 @@ +Source: ccache +Section: devel +Priority: optional +Maintainer: Francois Marier +Build-Depends: debhelper (>> 6), autotools-dev, zlib1g-dev +Standards-Version: 3.7.3 +Homepage: http://ccache.samba.org +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/ccache/ +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/ccache/ + +Package: ccache +Architecture: any +Depends: ${shlibs:Depends} +Suggests: distcc +Description: Compiler results cacher, for fast recompiles + ccache is a compiler cache. It speeds up re-compilation of C/C++ code + by caching previous compiles and detecting when the same compile is + being done again. + . + This is similar to, but faster than, the compilercache package. diff --git a/CCache/debian/copyright b/CCache/debian/copyright new file mode 100644 index 000000000..7ac791dc5 --- /dev/null +++ b/CCache/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Paul Russell on +Sun, 31 Mar 2002 14:08:57 +0200. + +It was downloaded from http://ccache.samba.org/ftp/ccache/ + +The ccache-zlib patch was downloaded from http://www.gustaebel.de/lars/ccache/ + +Upstream Author: Andrew Tridgell + +Copyright: 2002-2005 Andrew Tridgell + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA + +You are free to distribute this software under the terms of the GNU General +Public License. On Debian systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL file. diff --git a/CCache/debian/dirs b/CCache/debian/dirs new file mode 100644 index 000000000..8ceb4c4e8 --- /dev/null +++ b/CCache/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/lib/ccache +usr/share/man/man1 diff --git a/CCache/debian/docs b/CCache/debian/docs new file mode 100644 index 000000000..e845566c0 --- /dev/null +++ b/CCache/debian/docs @@ -0,0 +1 @@ +README diff --git a/CCache/debian/examples b/CCache/debian/examples new file mode 100644 index 000000000..fc549228c --- /dev/null +++ b/CCache/debian/examples @@ -0,0 +1,2 @@ +debian/update-ccache +manage-cache.sh diff --git a/CCache/debian/patches/01_no_home.diff b/CCache/debian/patches/01_no_home.diff new file mode 100644 index 000000000..019634c0c --- /dev/null +++ b/CCache/debian/patches/01_no_home.diff @@ -0,0 +1,100 @@ +--- ccache.c ++++ ccache.c +@@ -836,6 +836,13 @@ + { + /* find the real compiler */ + find_compiler(argc, argv); ++ ++ /* use the real compiler if HOME is not set */ ++ if (!cache_dir) { ++ cc_log("Unable to determine home directory\n"); ++ cc_log("ccache is disabled\n"); ++ failed(); ++ } + + /* we might be disabled */ + if (getenv("CCACHE_DISABLE")) { +@@ -895,6 +902,13 @@ + printf("-V print version number\n"); + } + ++static void check_cache_dir(void) ++{ ++ if (!cache_dir) { ++ fatal("Unable to determine home directory"); ++ } ++} ++ + /* the main program when not doing a compile */ + static int ccache_main(int argc, char *argv[]) + { +@@ -914,31 +928,37 @@ + exit(0); + + case 's': ++ check_cache_dir(); + stats_summary(); + break; + + case 'c': ++ check_cache_dir(); + cleanup_all(cache_dir); + printf("Cleaned cache\n"); + break; + + case 'C': ++ check_cache_dir(); + wipe_all(cache_dir); + printf("Cleared cache\n"); + break; + + case 'z': ++ check_cache_dir(); + stats_zero(); + printf("Statistics cleared\n"); + break; + + case 'F': ++ check_cache_dir(); + v = atoi(optarg); + stats_set_limits(v, -1); + printf("Set cache file limit to %u\n", (unsigned)v); + break; + + case 'M': ++ check_cache_dir(); + v = value_units(optarg); + stats_set_limits(-1, v); + printf("Set cache size limit to %uk\n", (unsigned)v); +@@ -983,7 +1003,10 @@ + + cache_dir = getenv("CCACHE_DIR"); + if (!cache_dir) { +- x_asprintf(&cache_dir, "%s/.ccache", get_home_directory()); ++ const char *home_directory = get_home_directory(); ++ if (home_directory) { ++ x_asprintf(&cache_dir, "%s/.ccache", home_directory); ++ } + } + + temp_dir = getenv("CCACHE_TEMPDIR"); +@@ -1023,7 +1046,7 @@ + } + + /* make sure the cache dir exists */ +- if (create_dir(cache_dir) != 0) { ++ if (cache_dir && (create_dir(cache_dir) != 0)) { + fprintf(stderr,"ccache: failed to create %s (%s)\n", + cache_dir, strerror(errno)); + exit(1); +--- util.c ++++ util.c +@@ -448,7 +448,7 @@ + } + } + #endif +- fatal("Unable to determine home directory"); ++ cc_log("Unable to determine home directory"); + return NULL; + } + diff --git a/CCache/debian/patches/02_ccache-compressed.diff b/CCache/debian/patches/02_ccache-compressed.diff new file mode 100644 index 000000000..5740c2ca4 --- /dev/null +++ b/CCache/debian/patches/02_ccache-compressed.diff @@ -0,0 +1,1026 @@ +Index: ccache.1 +=================================================================== +RCS file: /home/cvsroot/lars/ccache/ccache.1,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.6 +diff -u -r1.1.1.1.2.1 -r1.6 +--- ccache.1 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ ccache.1 21 Nov 2004 18:19:28 -0000 1.6 +@@ -210,7 +210,8 @@ + CCACHE_HARDLINK then ccache will attempt to use hard links from the + cache directory when creating the compiler output rather than using a + file copy\&. Using hard links is faster, but can confuse programs like +-\&'make\&' that rely on modification times\&. ++\&'make\&' that rely on modification times\&. Hard links are never made for ++compressed cache files\&. + .IP + .IP "\fBCCACHE_RECACHE\fP" + This forces ccache to not use any cached +@@ -257,6 +258,11 @@ + the default\&. On HP-UX set this environment variable to "i" if you use + the aCC compiler\&. + .IP ++.IP "\fBCCACHE_NOCOMPRESS\fP" ++If you set the environment variable ++CCACHE_NOCOMPRESS then there is no compression used on files that go ++into the cache\&. ++.IP + .PP + .SH "CACHE SIZE MANAGEMENT" + .PP +@@ -269,6 +275,14 @@ + below the numbers you specified in order to avoid doing the cache + clean operation too often\&. + .PP ++.SH "CACHE COMPRESSION" ++.PP ++By default ccache will compress all files it puts into the cache ++using the zlib compression\&. While this involves a negligible ++performance slowdown, it significantly increases the number of files ++that fit in the cache\&. You can turn off compression setting the ++CCACHE_NOCOMPRESS environment variable\&. ++.PP + .SH "HOW IT WORKS" + .PP + The basic idea is to detect when you are compiling exactly the same +Index: ccache.c +=================================================================== +RCS file: /home/cvsroot/lars/ccache/ccache.c,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.9 +diff -u -r1.1.1.1.2.1 -r1.9 +--- ccache.c 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ ccache.c 21 Nov 2004 18:19:28 -0000 1.9 +@@ -199,7 +199,7 @@ + fd = open(tmp_stderr, O_RDONLY | O_BINARY); + if (fd != -1) { + if (strcmp(output_file, "/dev/null") == 0 || +- rename(tmp_hashname, output_file) == 0 || errno == ENOENT) { ++ move_file(tmp_hashname, output_file) == 0 || errno == ENOENT) { + if (cpp_stderr) { + /* we might have some stderr from cpp */ + int fd2 = open(cpp_stderr, O_RDONLY | O_BINARY); +@@ -231,14 +231,25 @@ + x_asprintf(&path_stderr, "%s.stderr", hashname); + + if (stat(tmp_stderr, &st1) != 0 || +- stat(tmp_hashname, &st2) != 0 || +- rename(tmp_hashname, hashname) != 0 || +- rename(tmp_stderr, path_stderr) != 0) { ++ stat(tmp_hashname, &st2) != 0 || ++ move_file(tmp_hashname, hashname) != 0 || ++ move_file(tmp_stderr, path_stderr) != 0) { + cc_log("failed to rename tmp files - %s\n", strerror(errno)); + stats_update(STATS_ERROR); + failed(); + } + ++#if ENABLE_ZLIB ++ /* do an extra stat on the cache files for ++ the size statistics */ ++ if (stat(path_stderr, &st1) != 0 || ++ stat(hashname, &st2) != 0) { ++ cc_log("failed to stat cache files - %s\n", strerror(errno)); ++ stats_update(STATS_ERROR); ++ failed(); ++ } ++#endif ++ + cc_log("Placed %s into cache\n", output_file); + stats_tocache(file_size(&st1) + file_size(&st2)); + +@@ -474,7 +485,13 @@ + } + + /* the user might be disabling cache hits */ ++#ifndef ENABLE_ZLIB ++ /* if the cache file is compressed we must recache */ ++ if ((first && getenv("CCACHE_RECACHE")) || ++ test_if_compressed(hashname) == 1) { ++#else + if (first && getenv("CCACHE_RECACHE")) { ++#endif + close(fd_stderr); + unlink(stderr_file); + free(stderr_file); +@@ -487,7 +504,9 @@ + ret = 0; + } else { + unlink(output_file); +- if (getenv("CCACHE_HARDLINK")) { ++ /* only make a hardlink if the cache file is uncompressed */ ++ if (getenv("CCACHE_HARDLINK") && ++ test_if_compressed(hashname) == 0) { + ret = link(hashname, output_file); + } else { + ret = copy_file(hashname, output_file); +Index: ccache.h +=================================================================== +RCS file: /home/cvsroot/lars/ccache/ccache.h,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.7 +diff -u -r1.1.1.1.2.1 -r1.7 +--- ccache.h 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ ccache.h 21 Nov 2004 18:19:28 -0000 1.7 +@@ -23,6 +23,10 @@ + #include + #endif + ++#ifdef ENABLE_ZLIB ++#include ++#endif ++ + #define STATUS_NOTFOUND 3 + #define STATUS_FATAL 4 + #define STATUS_NOCACHE 5 +@@ -36,6 +40,13 @@ + #define DEFAULT_MAXSIZE (1000*1000) + #endif + ++/* file copy mode */ ++#ifdef ENABLE_ZLIB ++#define COPY_UNCOMPRESSED 0 ++#define COPY_FROM_CACHE 1 ++#define COPY_TO_CACHE 2 ++#endif ++ + enum stats { + STATS_NONE=0, + STATS_STDOUT, +@@ -79,6 +90,8 @@ + + void copy_fd(int fd_in, int fd_out); + int copy_file(const char *src, const char *dest); ++int move_file(const char *src, const char *dest); ++int test_if_compressed(const char *filename); + + int create_dir(const char *dir); + void x_asprintf(char **ptr, const char *format, ...); +Index: ccache.yo +=================================================================== +RCS file: /home/cvsroot/lars/ccache/ccache.yo,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.5 +diff -u -r1.1.1.1.2.1 -r1.5 +--- ccache.yo 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ ccache.yo 21 Nov 2004 18:19:28 -0000 1.5 +@@ -169,6 +169,11 @@ + this optimisation, in which case this option could allow ccache to be + used. + ++dit(bf(CCACHE_NOCOMPRESS)) If you set the environment variable ++CCACHE_NOCOMPRESS then there is no compression used on files that go ++into the cache. However, this setting has no effect on how files are ++retrieved from the cache, compressed results will still be usable. ++ + dit(bf(CCACHE_NOSTATS)) If you set the environment variable + CCACHE_NOSTATS then ccache will not update the statistics files on + each compile. +@@ -181,7 +186,8 @@ + CCACHE_HARDLINK then ccache will attempt to use hard links from the + cache directory when creating the compiler output rather than using a + file copy. Using hard links is faster, but can confuse programs like +-'make' that rely on modification times. ++'make' that rely on modification times. Hard links are never made for ++compressed cache files. + + dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached + results, even if it finds them. New results are still cached, but +@@ -236,6 +242,14 @@ + below the numbers you specified in order to avoid doing the cache + clean operation too often. + ++manpagesection(CACHE COMPRESSION) ++ ++By default ccache will compress all files it puts into the cache ++using the zlib compression. While this involves a negligible ++performance slowdown, it significantly increases the number of files ++that fit in the cache. You can turn off compression setting the ++CCACHE_NOCOMPRESS environment variable. ++ + manpagesection(HOW IT WORKS) + + The basic idea is to detect when you are compiling exactly the same +@@ -294,6 +308,8 @@ + cache. This tells the filesystem to inherit group ownership for new + directories. The command "chmod g+s `find $CCACHE_DIR -type d`" might + be useful for this. ++ it() Set bf(CCACHE_NOCOMPRESS) for all users, if there are users with ++ versions of ccache that do not support compression. + ) + + manpagesection(HISTORY) +Index: config.h.in +=================================================================== +RCS file: /home/cvsroot/lars/ccache/config.h.in,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -r1.1.1.1 -r1.2 +--- config.h.in 30 Apr 2004 13:13:41 -0000 1.1.1.1 ++++ config.h.in 4 May 2004 20:49:26 -0000 1.2 +@@ -98,3 +98,6 @@ + + /* Define _GNU_SOURCE so that we get all necessary prototypes */ + #undef _GNU_SOURCE ++ ++/* Define to 1 if you like to have zlib compression for the ccache. */ ++#undef ENABLE_ZLIB +Index: configure +=================================================================== +RCS file: /home/cvsroot/lars/ccache/configure,v +retrieving revision 1.1.1.1.2.1 +diff -u -r1.1.1.1.2.1 configure +--- configure 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ configure 21 Nov 2004 18:24:42 -0000 +@@ -836,6 +836,11 @@ + + cat <<\_ACEOF + ++Optional Features: ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-zlib enable zlib support for ccache compression ++ + Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags +@@ -936,7 +941,7 @@ + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd "$ac_popdir" ++ cd $ac_popdir + done + fi + +@@ -1859,7 +1864,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -1917,7 +1923,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2033,7 +2040,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2087,7 +2095,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2132,7 +2141,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2176,7 +2186,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2609,7 +2620,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2681,7 +2693,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2735,7 +2748,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2806,7 +2820,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2860,7 +2875,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2927,7 +2943,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2997,7 +3014,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3078,7 +3096,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3248,7 +3267,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3319,7 +3339,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3509,7 +3530,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3611,7 +3633,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3676,7 +3699,8 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3775,6 +3799,229 @@ + + fi + ++# Check whether --enable-zlib or --disable-zlib was given. ++if test "${enable_zlib+set}" = set; then ++ enableval="$enable_zlib" ++ ++else ++ enable_zlib=yes ++fi; ++ ++if test x"$enable_zlib" = x"yes"; then ++ if test "${ac_cv_header_zlib_h+set}" = set; then ++ echo "$as_me:$LINENO: checking for zlib.h" >&5 ++echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 ++if test "${ac_cv_header_zlib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 ++echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking zlib.h usability" >&5 ++echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking zlib.h presence" >&5 ++echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for zlib.h" >&5 ++echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 ++if test "${ac_cv_header_zlib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_zlib_h=$ac_header_preproc ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 ++echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 ++ ++fi ++if test $ac_cv_header_zlib_h = yes; then ++ echo "$as_me:$LINENO: checking for gzdopen in -lz" >&5 ++echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6 ++if test "${ac_cv_lib_z_gzdopen+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lz $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char gzdopen (); ++int ++main () ++{ ++gzdopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_z_gzdopen=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_z_gzdopen=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzdopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_z_gzdopen" >&6 ++if test $ac_cv_lib_z_gzdopen = yes; then ++ LIBS="-lz $LIBS"; cat >>confdefs.h <<\_ACEOF ++#define ENABLE_ZLIB 1 ++_ACEOF ++ ++fi ++ ++fi ++ ++ ++fi ++ + ac_config_files="$ac_config_files Makefile" + + cat >confcache <<\_ACEOF +@@ -4568,6 +4815,11 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -4606,12 +4858,6 @@ + fi;; + esac + done` || { (exit 1); exit 1; } +- +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +Index: configure.in +=================================================================== +RCS file: /home/cvsroot/lars/ccache/configure.in,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.4 +diff -u -r1.1.1.1.2.1 -r1.4 +--- configure.in 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ configure.in 21 Nov 2004 18:19:28 -0000 1.4 +@@ -68,5 +68,14 @@ + AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ]) + fi + ++dnl Check for zlib. ++AC_ARG_ENABLE([zlib], ++ AS_HELP_STRING([--enable-zlib], [enable zlib support for ccache compression]),, ++ [enable_zlib=yes]) ++ ++if test x"$enable_zlib" = x"yes"; then ++ AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzdopen, LIBS="-lz $LIBS"; AC_DEFINE(ENABLE_ZLIB))) ++fi ++ + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT +Index: util.c +=================================================================== +RCS file: /home/cvsroot/lars/ccache/util.c,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.11 +diff -u -r1.1.1.1.2.1 -r1.11 +--- util.c 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ util.c 21 Nov 2004 18:19:28 -0000 1.11 +@@ -44,6 +44,7 @@ + exit(1); + } + ++#ifndef ENABLE_ZLIB + /* copy all data from one file descriptor to another */ + void copy_fd(int fd_in, int fd_out) + { +@@ -57,6 +58,11 @@ + } + } + ++/* move a file using rename */ ++int move_file(const char *src, const char *dest) { ++ return rename(src, dest); ++} ++ + /* copy a file - used when hard links don't work + the copy is done via a temporary file and atomic rename + */ +@@ -120,6 +126,174 @@ + return 0; + } + ++#else /* ENABLE_ZLIB */ ++ ++/* copy all data from one file descriptor to another ++ possibly decompressing it ++*/ ++void copy_fd(int fd_in, int fd_out) { ++ char buf[10240]; ++ int n; ++ gzFile gz_in; ++ ++ gz_in = gzdopen(dup(fd_in), "rb"); ++ ++ if (!gz_in) { ++ fatal("Failed to copy fd"); ++ } ++ ++ while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { ++ if (write(fd_out, buf, n) != n) { ++ fatal("Failed to copy fd"); ++ } ++ } ++} ++ ++static int _copy_file(const char *src, const char *dest, int mode) { ++ int fd_in, fd_out; ++ gzFile gz_in, gz_out = NULL; ++ char buf[10240]; ++ int n, ret; ++ char *tmp_name; ++ mode_t mask; ++ struct stat st; ++ ++ x_asprintf(&tmp_name, "%s.XXXXXX", dest); ++ ++ if (getenv("CCACHE_NOCOMPRESS")) { ++ mode = COPY_UNCOMPRESSED; ++ } ++ ++ /* open source file */ ++ fd_in = open(src, O_RDONLY); ++ if (fd_in == -1) { ++ return -1; ++ } ++ ++ gz_in = gzdopen(fd_in, "rb"); ++ if (!gz_in) { ++ close(fd_in); ++ return -1; ++ } ++ ++ /* open destination file */ ++ fd_out = mkstemp(tmp_name); ++ if (fd_out == -1) { ++ gzclose(gz_in); ++ free(tmp_name); ++ return -1; ++ } ++ ++ if (mode == COPY_TO_CACHE) { ++ /* The gzip file format occupies at least 20 bytes. So ++ it will always occupy an entire filesystem block, ++ even for empty files. ++ Since most stderr files will be empty, we turn off ++ compression in this case to save space. ++ */ ++ if (fstat(fd_in, &st) != 0) { ++ gzclose(gz_in); ++ close(fd_out); ++ free(tmp_name); ++ return -1; ++ } ++ if (file_size(&st) == 0) { ++ mode = COPY_UNCOMPRESSED; ++ } ++ } ++ ++ if (mode == COPY_TO_CACHE) { ++ gz_out = gzdopen(dup(fd_out), "wb"); ++ if (!gz_out) { ++ gzclose(gz_in); ++ close(fd_out); ++ free(tmp_name); ++ return -1; ++ } ++ } ++ ++ while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { ++ if (mode == COPY_TO_CACHE) { ++ ret = gzwrite(gz_out, buf, n); ++ } else { ++ ret = write(fd_out, buf, n); ++ } ++ if (ret != n) { ++ gzclose(gz_in); ++ if (gz_out) { ++ gzclose(gz_out); ++ } ++ close(fd_out); ++ unlink(tmp_name); ++ free(tmp_name); ++ return -1; ++ } ++ } ++ ++ gzclose(gz_in); ++ if (gz_out) { ++ gzclose(gz_out); ++ } ++ ++ /* get perms right on the tmp file */ ++ mask = umask(0); ++ fchmod(fd_out, 0666 & ~mask); ++ umask(mask); ++ ++ /* the close can fail on NFS if out of space */ ++ if (close(fd_out) == -1) { ++ unlink(tmp_name); ++ free(tmp_name); ++ return -1; ++ } ++ ++ unlink(dest); ++ ++ if (rename(tmp_name, dest) == -1) { ++ unlink(tmp_name); ++ free(tmp_name); ++ return -1; ++ } ++ ++ free(tmp_name); ++ ++ return 0; ++} ++ ++/* move a file to the cache, compressing it */ ++int move_file(const char *src, const char *dest) { ++ int ret; ++ ++ ret = _copy_file(src, dest, COPY_TO_CACHE); ++ if (ret != -1) unlink(src); ++ return ret; ++} ++ ++/* copy a file from the cache, decompressing it */ ++int copy_file(const char *src, const char *dest) { ++ return _copy_file(src, dest, COPY_FROM_CACHE); ++} ++#endif /* ENABLE_ZLIB */ ++ ++/* test if a file is zlib compressed */ ++int test_if_compressed(const char *filename) { ++ FILE *f; ++ ++ f = fopen(filename, "rb"); ++ if (!f) { ++ return 0; ++ } ++ ++ /* test if file starts with 1F8B, which is zlib's ++ * magic number */ ++ if ((fgetc(f) != 0x1f) || (fgetc(f) != 0x8b)) { ++ fclose(f); ++ return 0; ++ } ++ ++ fclose(f); ++ return 1; ++} + + /* make sure a directory exists */ + int create_dir(const char *dir) +Index: manage-cache.sh +=================================================================== +RCS file: manage-cache.sh +diff -N manage-cache.sh +--- manage-cache.sh 1 Jan 1970 00:00:00 -0000 ++++ manage-cache.sh-cache.sh 12 May 2004 19:22:20 -0000 1.1 +@@ -0,0 +1,68 @@ ++#!/bin/bash ++# ++# 2004-05-12 lars@gustaebel.de ++ ++CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} ++ ++echo "Do you want to compress or decompress the ccache in $CCACHE_DIR?" ++read -p "Type c or d: " mode ++ ++if [ "$mode" != "c" ] && [ "$mode" != "d" ] ++then ++ exit 1 ++fi ++ ++is_compressed() { ++ test "$(head -c 2 $1)" = $'\x1f\x8b' ++ return $? ++} ++ ++tmpfile=$(mktemp) ++ ++for dir in 0 1 2 3 4 5 6 7 8 9 a b c d e f ++do ++ # process ccache subdir ++ echo -n "$dir " ++ ++ # find cache files ++ find $CCACHE_DIR/$dir -type f -name '*-*' | ++ sort > $tmpfile ++ ++ oldsize=$(cat $CCACHE_DIR/$dir/stats | cut -d ' ' -f 13) ++ newsize=0 ++ ++ while read file ++ do ++ # empty files will be ignored since compressing ++ # them makes them bigger ++ test $(stat -c %s $file) -eq 0 && continue ++ ++ if [ $mode = c ] ++ then ++ if ! is_compressed $file ++ then ++ gzip $file ++ mv $file.gz $file ++ fi ++ else ++ if is_compressed $file ++ then ++ mv $file $file.gz ++ gzip -d $file.gz ++ fi ++ fi ++ ++ # calculate new size statistic for this subdir ++ let newsize=$newsize+$(stat -c "%B*%b" $file)/1024 ++ done < $tmpfile ++ ++ # update statistic file ++ read -a numbers < $CCACHE_DIR/$dir/stats ++ numbers[12]=$newsize ++ echo "${numbers[*]} " > $CCACHE_DIR/$dir/stats ++done ++echo ++ ++# clean up ++rm $tmpfile ++ +Index: Makefile.in +=================================================================== +RCS file: /home/cvsroot/lars/ccache/Makefile.in,v +retrieving revision 1.1.1.1.2.1 +retrieving revision 1.12 +diff -u -r1.1.1.1.2.1 -r1.12 +--- Makefile.in 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 ++++ Makefile.in 21 Nov 2004 18:19:28 -0000 1.12 +@@ -11,6 +11,7 @@ + CFLAGS=@CFLAGS@ -I. + EXEEXT=@EXEEXT@ + ++LIBS= @LIBS@ + OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \ + cleanup.o snprintf.o unify.o + HEADERS = ccache.h mdfour.h +@@ -20,7 +21,7 @@ + docs: ccache.1 web/ccache-man.html + + ccache$(EXEEXT): $(OBJS) $(HEADERS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) ++ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) + + ccache.1: ccache.yo + -yodl2man -o ccache.1 ccache.yo diff --git a/CCache/debian/patches/03_long_options.diff b/CCache/debian/patches/03_long_options.diff new file mode 100644 index 000000000..3235c3806 --- /dev/null +++ b/CCache/debian/patches/03_long_options.diff @@ -0,0 +1,133 @@ +Index: ccache.c +=================================================================== +--- ccache.c (révision 7695) ++++ ccache.c (copie de travail) +@@ -22,6 +22,7 @@ + */ + + #include "ccache.h" ++#include + + /* the base cache directory */ + char *cache_dir = NULL; +@@ -885,14 +886,14 @@ + printf("\tcompiler [compile options] (via symbolic link)\n"); + printf("\nOptions:\n"); + +- printf("-s show statistics summary\n"); +- printf("-z zero statistics\n"); +- printf("-c run a cache cleanup\n"); +- printf("-C clear the cache completely\n"); +- printf("-F set maximum files in cache\n"); +- printf("-M set maximum size of cache (use G, M or K)\n"); +- printf("-h this help page\n"); +- printf("-V print version number\n"); ++ printf("-s, --show-stats show statistics summary\n"); ++ printf("-z, --zero-stats zero statistics\n"); ++ printf("-c, --cleanup run a cache cleanup\n"); ++ printf("-C, --clear clear the cache completely\n"); ++ printf("-F , --max-files= set maximum files in cache\n"); ++ printf("-M , --max-size= set maximum size of cache (use G, M or K)\n"); ++ printf("-h, --help this help page\n"); ++ printf("-V, --version print version number\n"); + } + + /* the main program when not doing a compile */ +@@ -901,7 +902,21 @@ + int c; + size_t v; + +- while ((c = getopt(argc, argv, "hszcCF:M:V")) != -1) { ++ static struct option long_options[] = ++ { ++ {"show-stats", no_argument, 0, 's'}, ++ {"zero-stats", no_argument, 0, 'z'}, ++ {"cleanup", no_argument, 0, 'c'}, ++ {"clear", no_argument, 0, 'C'}, ++ {"max-files", required_argument, 0, 'F'}, ++ {"max-size", required_argument, 0, 'M'}, ++ {"help", no_argument, 0, 'h'}, ++ {"version", no_argument, 0, 'V'}, ++ {0, 0, 0, 0} ++ }; ++ int option_index = 0; ++ ++ while ((c = getopt_long(argc, argv, "hszcCF:M:V", long_options, &option_index)) != -1) { + switch (c) { + case 'V': + printf("ccache version %s\n", CCACHE_VERSION); +Index: ccache.1 +=================================================================== +--- ccache.1 (révision 7695) ++++ ccache.1 (copie de travail) +@@ -23,14 +23,14 @@ + .nf + + +--s show statistics summary +--z zero statistics +--c run a cache cleanup +--C clear the cache completely +--F set maximum files in cache +--M set maximum size of cache (use G, M or K) +--h this help page +--V print version number ++\-s, \-\-show-stats show statistics summary ++\-z, \-\-zero-stats zero statistics ++\-c, \-\-cleanup run a cache cleanup ++\-C, \-\-clear clear the cache completely ++\-F , \-\-max-files= set maximum files in cache ++\-M , \-\-max-size= set maximum size of cache (use G, M or K) ++\-h, \-\-help this help page ++\-V, \-\-version print version number + + .fi + +@@ -43,22 +43,22 @@ + normal compiler options apply and you should refer to your compilers + documentation\&. + .PP +-.IP "\fB-h\fP" ++.IP "\fB-h, --help\fP" + Print a options summary page + .IP +-.IP "\fB-s\fP" ++.IP "\fB-s, --show-stats\fP" + Print the current statistics summary for the cache\&. The + statistics are stored spread across the subdirectories of the + cache\&. Using "ccache -s" adds up the statistics across all + subdirectories and prints the totals\&. + .IP +-.IP "\fB-z\fP" ++.IP "\fB-z, --zero-stats\fP" + Zero the cache statistics\&. + .IP +-.IP "\fB-V\fP" ++.IP "\fB-V, --version\fP" + Print the ccache version number + .IP +-.IP "\fB-c\fP" ++.IP "\fB-c, --cleanup\fP" + Clean the cache and re-calculate the cache file count and + size totals\&. Normally the -c option should not be necessary as ccache + keeps the cache below the specified limits at runtime and keeps +@@ -66,16 +66,16 @@ + if you manually modify the cache contents or believe that the cache + size statistics may be inaccurate\&. + .IP +-.IP "\fB-C\fP" ++.IP "\fB-C, --clear\fP" + Clear the entire cache, removing all cached files\&. + .IP +-.IP "\fB-F maxfiles\fP" ++.IP "\fB-F , --max-files=\fP" + This sets the maximum number of files allowed in + the cache\&. The value is stored inside the cache directory and applies + to all future compiles\&. Due to the way the value is stored the actual + value used is always rounded down to the nearest multiple of 16\&. + .IP +-.IP "\fB-M maxsize\fP" ++.IP "\fB-M , --max-size=\fP" + This sets the maximum cache size\&. You can specify + a value in gigabytes, megabytes or kilobytes by appending a G, M or K + to the value\&. The default is gigabytes\&. The actual value stored is diff --git a/CCache/debian/patches/04_ignore_profile.diff b/CCache/debian/patches/04_ignore_profile.diff new file mode 100644 index 000000000..568375092 --- /dev/null +++ b/CCache/debian/patches/04_ignore_profile.diff @@ -0,0 +1,13 @@ +diff -ru ccache-2.4/ccache.c ccache-2.4-tp/ccache.c +--- ccache.c 2007-05-20 03:14:19.000000000 +1000 ++++ ccache.c 2007-05-20 03:17:54.000000000 +1000 +@@ -641,6 +641,9 @@ + + /* these are too hard */ + if (strcmp(argv[i], "-fbranch-probabilities")==0 || ++ strcmp(argv[i], "-fprofile-arcs") == 0 || ++ strcmp(argv[i], "-ftest-coverage") == 0 || ++ strcmp(argv[i], "--coverage") == 0 || + strcmp(argv[i], "-M") == 0 || + strcmp(argv[i], "-MM") == 0 || + strcmp(argv[i], "-x") == 0) { diff --git a/CCache/debian/patches/05_nfs_fix.diff b/CCache/debian/patches/05_nfs_fix.diff new file mode 100644 index 000000000..662d97639 --- /dev/null +++ b/CCache/debian/patches/05_nfs_fix.diff @@ -0,0 +1,45 @@ +--- ccache.1.orig 2007-05-20 17:30:57.000000000 +1200 ++++ ccache.1 2007-05-20 17:31:27.000000000 +1200 +@@ -367,12 +367,6 @@ + .IP o + ccache avoids a double call to cpp on a cache miss + .PP +-.SH "BUGS" +-.PP +-When the cache is stored on an NFS filesystem, the filesystem must be +-exported with the \fBno_subtree_check\fP option to make renames between +-directories reliable\&. +-.PP + .SH "CREDITS" + .PP + Thanks to the following people for their contributions to ccache +--- util.c.patched 2007-05-20 18:19:11.000000000 +1200 ++++ util.c 2007-05-20 18:20:55.000000000 +1200 +@@ -58,9 +58,26 @@ + } + } + ++static int safe_rename(const char* oldpath, const char* newpath) ++{ ++ /* safe_rename is for creating entries in the cache. ++ ++ Works like rename(), but it never overwrites an existing ++ cache entry. This avoids corruption on NFS. */ ++ int status = link( oldpath, newpath ); ++ if( status == 0 || errno == EEXIST ) ++ { ++ return unlink( oldpath ); ++ } ++ else ++ { ++ return -1; ++ } ++} ++ + /* move a file using rename */ + int move_file(const char *src, const char *dest) { +- return rename(src, dest); ++ return safe_rename(src, dest); + } + + /* copy a file - used when hard links don't work diff --git a/CCache/debian/patches/06_md.diff b/CCache/debian/patches/06_md.diff new file mode 100644 index 000000000..3f68850ca --- /dev/null +++ b/CCache/debian/patches/06_md.diff @@ -0,0 +1,77 @@ +--- ccache.c Mon Sep 13 11:38:30 2004 ++++ ccache.c Thu Jun 21 22:17:32 2007 +@@ -627,6 +627,13 @@ static void process_args(int argc, char + int found_S_opt = 0; + struct stat st; + char *e; ++ /* is gcc being asked to output dependencies? */ ++ int generating_dependencies = 0; ++ /* is the dependency makefile name overridden with -MF? */ ++ int dependency_filename_specified = 0; ++ /* is the dependency makefile target name specified with -MQ or -MF? */ ++ int dependency_target_specified = 0; ++ + + stripped_args = args_init(0, NULL); + +@@ -702,6 +709,18 @@ static void process_args(int argc, char + continue; + } + ++ /* These options require special handling, because they ++ behave differently with gcc -E, when the output ++ file is not specified. */ ++ ++ if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) { ++ generating_dependencies = 1; ++ } else if (strcmp(argv[i], "-MF") == 0) { ++ dependency_filename_specified = 1; ++ } else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) { ++ dependency_target_specified = 1; ++ } ++ + /* options that take an argument */ + { + const char *opts[] = {"-I", "-include", "-imacros", "-iprefix", +@@ -812,6 +831,41 @@ static void process_args(int argc, char + } + p[1] = found_S_opt ? 's' : 'o'; + p[2] = 0; ++ } ++ ++ /* If dependencies are generated, configure the preprocessor */ ++ ++ if (generating_dependencies && output_file) { ++ if (!dependency_filename_specified) { ++ char *default_depfile_name = x_strdup(output_file); ++ char *p = strrchr(default_depfile_name, '.'); ++ ++ if (p) { ++ if (strlen(p) < 2) { ++ stats_update(STATS_ARGS); ++ failed(); ++ return; ++ } ++ *p = 0; ++ } ++ else { ++ int len = p - default_depfile_name; ++ ++ p = x_malloc(len + 3); ++ strncpy(default_depfile_name, p, len - 1); ++ free(default_depfile_name); ++ default_depfile_name = p; ++ } ++ ++ strcat(default_depfile_name, ".d"); ++ args_add(stripped_args, "-MF"); ++ args_add(stripped_args, default_depfile_name); ++ } ++ ++ if (!dependency_target_specified) { ++ args_add(stripped_args, "-MT"); ++ args_add(stripped_args, output_file); ++ } + } + + /* cope with -o /dev/null */ diff --git a/CCache/debian/patches/07_cachedirtag.diff b/CCache/debian/patches/07_cachedirtag.diff new file mode 100644 index 000000000..683b48d14 --- /dev/null +++ b/CCache/debian/patches/07_cachedirtag.diff @@ -0,0 +1,75 @@ +Index: ccache.c +=================================================================== +--- ccache.c (révision 7695) ++++ ccache.c (copie de travail) +@@ -1029,6 +1029,14 @@ + exit(1); + } + ++ if (!getenv("CCACHE_READONLY")) { ++ if (create_cachedirtag(cache_dir) != 0) { ++ fprintf(stderr,"ccache: failed to create %s/CACHEDIR.TAG (%s)\n", ++ cache_dir, strerror(errno)); ++ exit(1); ++ } ++ } ++ + ccache(argc, argv); + return 1; + } +Index: ccache.h +=================================================================== +--- ccache.h (révision 7695) ++++ ccache.h (copie de travail) +@@ -81,6 +81,7 @@ + int copy_file(const char *src, const char *dest); + + int create_dir(const char *dir); ++int create_cachedirtag(const char *dir); + void x_asprintf(char **ptr, const char *format, ...); + char *x_strdup(const char *s); + void *x_realloc(void *ptr, size_t size); +Index: util.c +=================================================================== +--- util.c (révision 7695) ++++ util.c (copie de travail) +@@ -138,6 +138,39 @@ + return 0; + } + ++char const CACHEDIR_TAG[] = ++ "Signature: 8a477f597d28d172789f06886806bc55\n" ++ "# This file is a cache directory tag created by ccache.\n" ++ "# For information about cache directory tags, see:\n" ++ "# http://www.brynosaurus.com/cachedir/\n"; ++ ++int create_cachedirtag(const char *dir) ++{ ++ char *filename; ++ struct stat st; ++ FILE *f; ++ x_asprintf(&filename, "%s/CACHEDIR.TAG", dir); ++ if (stat(filename, &st) == 0) { ++ if (S_ISREG(st.st_mode)) { ++ goto success; ++ } ++ errno = EEXIST; ++ goto error; ++ } ++ f = fopen(filename, "w"); ++ if (!f) goto error; ++ if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) { ++ goto error; ++ } ++ if (fclose(f)) goto error; ++success: ++ free(filename); ++ return 0; ++error: ++ free(filename); ++ return 1; ++} ++ + /* + this is like asprintf() but dies if the malloc fails + note that we use vsnprintf in a rather poor way to make this more portable diff --git a/CCache/debian/patches/08_manpage_hyphens.diff b/CCache/debian/patches/08_manpage_hyphens.diff new file mode 100644 index 000000000..55ced4a23 --- /dev/null +++ b/CCache/debian/patches/08_manpage_hyphens.diff @@ -0,0 +1,89 @@ +Index: ccache.1 +=================================================================== +--- ccache.1 (révision 7695) ++++ ccache.1 (copie de travail) +@@ -49,7 +49,7 @@ + .IP "\fB-s\fP" + Print the current statistics summary for the cache\&. The + statistics are stored spread across the subdirectories of the +-cache\&. Using "ccache -s" adds up the statistics across all ++cache\&. Using "ccache \-s" adds up the statistics across all + subdirectories and prints the totals\&. + .IP + .IP "\fB-z\fP" +@@ -60,7 +60,7 @@ + .IP + .IP "\fB-c\fP" + Clean the cache and re-calculate the cache file count and +-size totals\&. Normally the -c option should not be necessary as ccache ++size totals\&. Normally the \-c option should not be necessary as ccache + keeps the cache below the specified limits at runtime and keeps + statistics up to date on each compile\&. This option is mostly useful + if you manually modify the cache contents or believe that the cache +@@ -100,9 +100,9 @@ + + + cp ccache /usr/local/bin/ +- ln -s /usr/local/bin/ccache /usr/local/bin/gcc +- ln -s /usr/local/bin/ccache /usr/local/bin/g++ +- ln -s /usr/local/bin/ccache /usr/local/bin/cc ++ ln \-s /usr/local/bin/ccache /usr/local/bin/gcc ++ ln \-s /usr/local/bin/ccache /usr/local/bin/g++ ++ ln \-s /usr/local/bin/ccache /usr/local/bin/cc + + .fi + +@@ -118,7 +118,7 @@ + .PP + When run as a compiler front end ccache usually just takes the same + command line options as the compiler you are using\&. The only exception +-to this is the option \&'--ccache-skip\&'\&. That option can be used to tell ++to this is the option \&'\-\-ccache-skip\&'\&. That option can be used to tell + ccache that the next option is definitely not a input filename, and + should be passed along to the compiler as-is\&. + .PP +@@ -128,7 +128,7 @@ + of the resulting object file (among other things)\&. The heuristic + ccache uses in this parse is that any string on the command line that + exists as a file is treated as an input file name (usually a C +-file)\&. By using --ccache-skip you can force an option to not be ++file)\&. By using \-\-ccache-skip you can force an option to not be + treated as an input file name and instead be passed along to the + compiler as a command line option\&. + .PP +@@ -238,7 +238,7 @@ + .IP "\fBCCACHE_UNIFY\fP" + If you set the environment variable CCACHE_UNIFY + then ccache will use the C/C++ unifier when hashing the pre-processor +-output if -g is not used in the compile\&. The unifier is slower than a ++output if \-g is not used in the compile\&. The unifier is slower than a + normal hash, so setting this environment variable loses a little bit + of speed, but it means that ccache can take advantage of not + recompiling when the changes to the source code consist of +@@ -262,7 +262,7 @@ + .PP + By default ccache has a one gigabyte limit on the cache size and no + maximum number of files\&. You can set a different limit using the +-"ccache -M" and "ccache -F" options, which set the size and number of ++"ccache \-M" and "ccache \-F" options, which set the size and number of + files limits\&. + .PP + When these limits are reached ccache will reduce the cache to 20% +@@ -276,7 +276,7 @@ + that it is the same code by forming a hash of: + .PP + .IP o +-the pre-processor output from running the compiler with -E ++the pre-processor output from running the compiler with \-E + .IP o + the command line options + .IP o +@@ -331,7 +331,7 @@ + .IP o + Make sure that the setgid bit is set on all directories in the + cache\&. This tells the filesystem to inherit group ownership for new +-directories\&. The command "chmod g+s `find $CCACHE_DIR -type d`" might ++directories\&. The command "chmod g+s `find $CCACHE_DIR \-type d`" might + be useful for this\&. + .PP + .SH "HISTORY" diff --git a/CCache/debian/patches/09_respect_ldflags.diff b/CCache/debian/patches/09_respect_ldflags.diff new file mode 100644 index 000000000..0ce2c2de3 --- /dev/null +++ b/CCache/debian/patches/09_respect_ldflags.diff @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2008-03-23 17:01:19.000000000 +1300 ++++ Makefile.in 2008-03-23 17:03:03.000000000 +1300 +@@ -21,7 +21,7 @@ + docs: ccache.1 web/ccache-man.html + + ccache$(EXEEXT): $(OBJS) $(HEADERS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + ccache.1: ccache.yo + -yodl2man -o ccache.1 ccache.yo diff --git a/CCache/debian/patches/10_lru_cleanup.diff b/CCache/debian/patches/10_lru_cleanup.diff new file mode 100644 index 000000000..24463e529 --- /dev/null +++ b/CCache/debian/patches/10_lru_cleanup.diff @@ -0,0 +1,23 @@ +--- ccache.c (révision 8804) ++++ ccache.c (copie de travail) +@@ -481,6 +481,9 @@ + return; + } + ++ /* update timestamps for LRU cleanup ++ also gives output_file a sensible mtime when hard-linking (for make) */ ++ utime(hashname, NULL); + utime(stderr_file, NULL); + + if (strcmp(output_file, "/dev/null") == 0) { +@@ -513,10 +516,6 @@ + failed(); + } + } +- if (ret == 0) { +- /* update the mtime on the file so that make doesn't get confused */ +- utime(output_file, NULL); +- } + + /* get rid of the intermediate preprocessor file */ + if (i_tmpfile) { diff --git a/CCache/debian/patches/11_utimes.diff b/CCache/debian/patches/11_utimes.diff new file mode 100644 index 000000000..2886bf3d6 --- /dev/null +++ b/CCache/debian/patches/11_utimes.diff @@ -0,0 +1,85 @@ +--- ccache.c 2004-09-13 03:38:30.000000000 -0700 ++++ ccache.c 2006-06-09 16:29:16.695117780 -0700 +@@ -481,8 +481,13 @@ + + /* update timestamps for LRU cleanup + also gives output_file a sensible mtime when hard-linking (for make) */ ++#ifdef HAVE_UTIMES ++ utimes(hashname, NULL); ++ utimes(stderr_file, NULL); ++#else + utime(hashname, NULL); + utime(stderr_file, NULL); ++#endif + + if (strcmp(output_file, "/dev/null") == 0) { + ret = 0; +--- ccache.h 2004-09-13 03:38:30.000000000 -0700 ++++ ccache.h 2006-06-09 16:28:16.601658626 -0700 +@@ -22,6 +22,9 @@ + #ifdef HAVE_PWD_H + #include + #endif ++#ifdef HAVE_SYS_TIME_H ++#include ++#endif + + #define STATUS_NOTFOUND 3 + #define STATUS_FATAL 4 +--- config.h.in 2003-09-27 21:48:17.000000000 -0700 ++++ config.h.in 2006-06-09 16:25:43.000000000 -0700 +@@ -19,6 +19,9 @@ + /* Define to 1 if you have the `gethostname' function. */ + #undef HAVE_GETHOSTNAME + ++/* Define to 1 if you have the `getpwuid' function. */ ++#undef HAVE_GETPWUID ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_INTTYPES_H + +@@ -31,6 +34,9 @@ + /* Define to 1 if you have the header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_PWD_H ++ + /* Define to 1 if you have the `realpath' function. */ + #undef HAVE_REALPATH + +@@ -60,6 +66,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_STAT_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TIME_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TYPES_H + +@@ -69,6 +78,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_UNISTD_H + ++/* Define to 1 if you have the `utimes' function. */ ++#undef HAVE_UTIMES ++ + /* Define to 1 if you have the `vasprintf' function. */ + #undef HAVE_VASPRINTF + +--- configure.in 2004-09-13 03:38:30.000000000 -0700 ++++ configure.in 2006-06-09 16:25:15.541288184 -0700 +@@ -27,10 +27,11 @@ + AC_HEADER_TIME + AC_HEADER_SYS_WAIT + +-AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h) ++AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h) + + AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp) + AC_CHECK_FUNCS(gethostname getpwuid) ++AC_CHECK_FUNCS(utimes) + + AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ + AC_TRY_COMPILE( diff --git a/CCache/debian/patches/12_cachesize_permissions.diff b/CCache/debian/patches/12_cachesize_permissions.diff new file mode 100644 index 000000000..28801b771 --- /dev/null +++ b/CCache/debian/patches/12_cachesize_permissions.diff @@ -0,0 +1,83 @@ +--- stats.c (révision 8804) ++++ stats.c (copie de travail) +@@ -286,7 +286,7 @@ + + + /* set the per directory limits */ +-void stats_set_limits(long maxfiles, long maxsize) ++int stats_set_limits(long maxfiles, long maxsize) + { + int dir; + unsigned counters[STATS_END]; +@@ -298,7 +298,9 @@ + maxsize /= 16; + } + +- create_dir(cache_dir); ++ if (create_dir(cache_dir) != 0) { ++ return 1; ++ } + + /* set the limits in each directory */ + for (dir=0;dir<=0xF;dir++) { +@@ -306,7 +308,9 @@ + int fd; + + x_asprintf(&cdir, "%s/%1x", cache_dir, dir); +- create_dir(cdir); ++ if (create_dir(cdir) != 0) { ++ return 1; ++ } + x_asprintf(&fname, "%s/stats", cdir); + free(cdir); + +@@ -326,6 +330,8 @@ + } + free(fname); + } ++ ++ return 0; + } + + /* set the per directory sizes */ +--- ccache.c (révision 8804) ++++ ccache.c (copie de travail) +@@ -935,15 +934,23 @@ + case 'F': + check_cache_dir(); + v = atoi(optarg); +- stats_set_limits(v, -1); +- printf("Set cache file limit to %u\n", (unsigned)v); ++ if (stats_set_limits(v, -1) == 0) { ++ printf("Set cache file limit to %u\n", (unsigned)v); ++ } else { ++ printf("Could not set cache file limit.\n"); ++ exit(1); ++ } + break; + + case 'M': + check_cache_dir(); + v = value_units(optarg); +- stats_set_limits(-1, v); +- printf("Set cache size limit to %uk\n", (unsigned)v); ++ if (stats_set_limits(-1, v) == 0) { ++ printf("Set cache size limit to %uk\n", (unsigned)v); ++ } else { ++ printf("Could not set cache size limit.\n"); ++ exit(1); ++ } + break; + + default: +--- ccache.h (révision 8804) ++++ ccache.h (copie de travail) +@@ -101,7 +101,7 @@ + void stats_summary(void); + void stats_tocache(size_t size); + void stats_read(const char *stats_file, unsigned counters[STATS_END]); +-void stats_set_limits(long maxfiles, long maxsize); ++int stats_set_limits(long maxfiles, long maxsize); + size_t value_units(const char *s); + void display_size(unsigned v); + void stats_set_sizes(const char *dir, size_t num_files, size_t total_size); diff --git a/CCache/debian/patches/13_html_links.diff b/CCache/debian/patches/13_html_links.diff new file mode 100644 index 000000000..dadf1b6c2 --- /dev/null +++ b/CCache/debian/patches/13_html_links.diff @@ -0,0 +1,33 @@ +--- web/index.html~ 2004-09-13 13:38:30.000000000 +0300 ++++ web/index.html 2004-09-26 01:04:38.458008118 +0300 +@@ -29,10 +29,10 @@ +
    • fixed handling of HOME environment variable +
    + +-See the manual page for details ++See the manual page for details + on the new options.

    + +-You can get this release from the download directory ++You can get this release from the download directory + +

    NOTE! This release changes the hash input slighly, so you will + probably find that you will not get any hits against your existing +@@ -87,7 +87,7 @@ + +

    Documentation

    + +-See the manual page ++See the manual page + + +

    Performance

    +@@ -116,7 +116,7 @@ +

    Download

    + + You can download the latest release from the download directory.

    ++href="http://ccache.samba.org/ftp/ccache/">download directory.

    + + For the bleeding edge, you can fetch ccache via CVS or + rsync. To fetch via cvs use the following command: diff --git a/CCache/debian/patches/14_hardlink_doc.diff b/CCache/debian/patches/14_hardlink_doc.diff new file mode 100644 index 000000000..bd9e25ba6 --- /dev/null +++ b/CCache/debian/patches/14_hardlink_doc.diff @@ -0,0 +1,48 @@ +Index: ccache.1 +=================================================================== +RCS file: /cvsroot/ccache/ccache.1,v +retrieving revision 1.26 +diff -u -r1.26 ccache.1 +--- ccache.1 24 Nov 2005 21:10:08 -0000 1.26 ++++ ccache.1 21 Jul 2007 21:03:32 -0000 +@@ -330,7 +330,7 @@ + .IP o + Use the same \fBCCACHE_DIR\fP environment variable setting + .IP o +-Set the \fBCCACHE_NOLINK\fP environment variable ++Unset the \fBCCACHE_HARDLINK\fP environment variable + .IP o + Make sure everyone sets the CCACHE_UMASK environment variable + to 002, this ensures that cached files are accessible to everyone in +Index: ccache.yo +=================================================================== +RCS file: /cvsroot/ccache/ccache.yo,v +retrieving revision 1.27 +diff -u -r1.27 ccache.yo +--- ccache.yo 24 Nov 2005 21:54:09 -0000 1.27 ++++ ccache.yo 21 Jul 2007 21:03:32 -0000 +@@ -289,7 +289,7 @@ + + itemize( + it() Use the same bf(CCACHE_DIR) environment variable setting +- it() Set the bf(CCACHE_NOLINK) environment variable ++ it() Unset the bf(CCACHE_HARDLINK) environment variable + it() Make sure everyone sets the CCACHE_UMASK environment variable + to 002, this ensures that cached files are accessible to everyone in + the group. +Index: web/ccache-man.html +=================================================================== +RCS file: /cvsroot/ccache/web/ccache-man.html,v +retrieving revision 1.25 +diff -u -r1.25 ccache-man.html +--- web/ccache-man.html 13 Sep 2004 10:38:17 -0000 1.25 ++++ web/ccache-man.html 21 Jul 2007 21:03:32 -0000 +@@ -256,7 +256,7 @@ + following conditions need to be met: +

      +
    • Use the same CCACHE_DIR environment variable setting +-
    • Set the CCACHE_NOLINK environment variable ++
    • Unset the CCACHE_HARDLINK environment variable +
    • Make sure everyone sets the CCACHE_UMASK environment variable + to 002, this ensures that cached files are accessible to everyone in + the group. diff --git a/CCache/debian/patches/CREDITS b/CCache/debian/patches/CREDITS new file mode 100644 index 000000000..c4e323b7b --- /dev/null +++ b/CCache/debian/patches/CREDITS @@ -0,0 +1,47 @@ +01_no_home.diff: + Francois Marier + Made especially for the Debian package. + +02_ccache_compressed.diff: + Lars Gustäbel + http://www.gustaebel.de/lars/ccache/ (downloaded on 2007-05-20) + +03_long_options.diff: + Francois Marier + Made especially for the Debian package. + +04_ignore_profile.diff: + Ted Percival + http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=20;filename=ccache-profile.patch;att=1;bug=215849 + +05_nfs_fix.diff: + John Coiner + http://lists.samba.org/archive/ccache/2007q1/000265.html + +06_md.diff: + Andrea Bittau + http://darkircop.org/ccache/ccache-2.4-md.patch (downloaded on 2007-06-30) + +07_cachedirtag.diff: + Karl Chen + http://lists.samba.org/archive/ccache/2008q1/000316.html (downloaded on 2008-02-02) + +08_manpage_hyphens.diff: + Francois Marier + Made especially for the Debian package. + +09_respect_ldflags.diff: + Lisa Seelye + http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ccache/files/ccache-2.4-respectflags.patch?rev=1.1&view=markup + +10_lru_cleanup.diff: + RW + http://lists.samba.org/archive/ccache/2008q2/000339.html (downloaded on 2008-04-11) + +11_utimes.diff: + Robin H. Johnson + http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ccache/files/ccache-2.4-utimes.patch?rev=1.1&view=markup + +12_cachesize_permissions.diff: + Francois Marier + Made especially for the Debian package to fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=332527 diff --git a/CCache/debian/rules b/CCache/debian/rules new file mode 100644 index 000000000..c5b538b78 --- /dev/null +++ b/CCache/debian/rules @@ -0,0 +1,141 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + + # Apply Debian specific patches + cp $(CURDIR)/ccache.c $(CURDIR)/ccache.c.unpatched + cp $(CURDIR)/util.c $(CURDIR)/util.c.unpatched + cp $(CURDIR)/ccache.1 $(CURDIR)/ccache.1.unpatched + cp $(CURDIR)/ccache.h $(CURDIR)/ccache.h.unpatched + cp $(CURDIR)/ccache.yo $(CURDIR)/ccache.yo.unpatched + cp $(CURDIR)/config.h.in $(CURDIR)/config.h.in.unpatched + cp $(CURDIR)/configure $(CURDIR)/configure.unpatched + cp $(CURDIR)/configure.in $(CURDIR)/configure.in.unpatched + cp $(CURDIR)/Makefile.in $(CURDIR)/Makefile.in.unpatched + if test ! -f patch-stamp; then \ + for patch in $(CURDIR)/debian/patches/*.diff ;\ + do \ + echo APPLYING PATCH\: $${patch##*/};\ + patch -p0 < $$patch ;\ + done ;\ + touch patch-stamp ;\ + fi + chmod +x $(CURDIR)/manage-cache.sh + + ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + +build: build-stamp + +build-stamp: config.status + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Unapply patches + -test -r $(CURDIR)/ccache.c.unpatched && mv $(CURDIR)/ccache.c.unpatched $(CURDIR)/ccache.c + -test -r $(CURDIR)/util.c.unpatched && mv $(CURDIR)/util.c.unpatched $(CURDIR)/util.c + -test -r $(CURDIR)/ccache.1.unpatched && mv $(CURDIR)/ccache.1.unpatched $(CURDIR)/ccache.1 + -test -r $(CURDIR)/ccache.h.unpatched && mv $(CURDIR)/ccache.h.unpatched $(CURDIR)/ccache.h + -test -r $(CURDIR)/ccache.yo.unpatched && mv $(CURDIR)/ccache.yo.unpatched $(CURDIR)/ccache.yo + -test -r $(CURDIR)/config.h.in.unpatched && mv $(CURDIR)/config.h.in.unpatched $(CURDIR)/config.h.in + -test -r $(CURDIR)/configure.unpatched && mv $(CURDIR)/configure.unpatched $(CURDIR)/configure + -test -r $(CURDIR)/configure.in.unpatched && mv $(CURDIR)/configure.in.unpatched $(CURDIR)/configure.in + -test -r $(CURDIR)/Makefile.in.unpatched && mv $(CURDIR)/Makefile.in.unpatched $(CURDIR)/Makefile.in + -rm -f $(CURDIR)/manage-cache.sh + -rm -f patch-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + + # Update config.sub and config.guess + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/ccache. + $(MAKE) install prefix=$(CURDIR)/debian/ccache/usr + + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-gcc + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-g++ + set -e; for ver in 2.95 3.0 3.2 3.3 3.4 4.0 4.1 4.2 4.3; do \ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-gcc-$$ver; \ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/gcc-$$ver; \ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-g++-$$ver; \ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/g++-$$ver; \ + done + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/cc + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/c++ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/gcc + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/g++ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-c++ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-cc + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-g++ + ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-gcc + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/CCache/debian/update-ccache b/CCache/debian/update-ccache new file mode 100644 index 000000000..0ef97a140 --- /dev/null +++ b/CCache/debian/update-ccache @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Update compiler links to ccache (in /usr/local/bin) +# +# The idea is that /usr/local/bin is ahead of /usr/bin in your PATH, so adding +# the link /usr/local/bin/cc -> /usr/bin/ccache means that it is run instead of +# /usr/bin/cc +# +# Written by: Behan Webster +# + +DIRECTORY=/usr/local/bin +CCACHE=/usr/bin/ccache +CCDIR=/usr/lib/ccache + +usage() { + echo "Usage: `basename $0` [--directory ] [--remove]" + exit 0 +} + +while [ $# -gt 0 ] ; do + case "$1" in + -d*|--d*|--directory) DIRECTORY=$2; shift; shift;; + -h*|--h*|--help) usage;; + -r*|--r*|--remove) REMOVE=1; shift;; + -t*|--t*|--test) TEST=echo; shift;; + esac +done + +for FILE in `cd $CCDIR; ls` ; do + LINK=$DIRECTORY/$FILE + if [ -z "$REMOVE" ] ; then + # Add link + $TEST ln -fs $CCACHE $LINK + else + # Remove link + if [ -L "$LINK" ] ; then + $TEST rm -f $LINK + fi + fi +done + +# vim: sw=4 ts=4 diff --git a/CCache/debian/watch b/CCache/debian/watch new file mode 100644 index 000000000..a72959e50 --- /dev/null +++ b/CCache/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://samba.org/ftp/ccache/ccache-(.*)\.tar\.gz diff --git a/CCache/execute.c b/CCache/execute.c new file mode 100644 index 000000000..165b91e66 --- /dev/null +++ b/CCache/execute.c @@ -0,0 +1,286 @@ +/* + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "ccache.h" + +#ifdef _WIN32 +char *argvtos(char **argv) +{ + int i, len; + char *ptr, *str; + + for (i = 0, len = 0; argv[i]; i++) { + len += strlen(argv[i]) + 3; + } + + str = ptr = (char *)malloc(len + 1); + if (str == NULL) + return NULL; + + for (i = 0; argv[i]; i++) { + len = strlen(argv[i]); + *ptr++ = '"'; + memcpy(ptr, argv[i], len); + ptr += len; + *ptr++ = '"'; + *ptr++ = ' '; + } + *ptr = 0; + + return str; +} +#endif + +/* + execute a compiler backend, capturing all output to the given paths + the full path to the compiler to run is in argv[0] +*/ +int execute(char **argv, + const char *path_stdout, + const char *path_stderr) +{ +#ifdef _WIN32 + +#if 1 + PROCESS_INFORMATION pinfo; + STARTUPINFO sinfo; + BOOL ret; + DWORD exitcode; + char *args; + HANDLE fd_out, fd_err; + SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; + + /* TODO: needs moving after possible exit() below, but before stdout is redirected */ + if (ccache_verbose) { + display_execute_args(argv); + } + + fd_out = CreateFile(path_stdout, GENERIC_WRITE, 0, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if (fd_out == INVALID_HANDLE_VALUE) { + return STATUS_NOCACHE; + } + + fd_err = CreateFile(path_stderr, GENERIC_WRITE, 0, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if (fd_err == INVALID_HANDLE_VALUE) { + return STATUS_NOCACHE; + } + + ZeroMemory(&pinfo, sizeof(PROCESS_INFORMATION)); + ZeroMemory(&sinfo, sizeof(STARTUPINFO)); + + sinfo.cb = sizeof(STARTUPINFO); + sinfo.hStdError = fd_err; + sinfo.hStdOutput = fd_out; + sinfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + sinfo.dwFlags |= STARTF_USESTDHANDLES; + + args = argvtos(argv); + + ret = CreateProcessA(argv[0], args, NULL, NULL, TRUE, 0, NULL, NULL, + &sinfo, &pinfo); + + free(args); + CloseHandle(fd_out); + CloseHandle(fd_err); + + if (ret == 0) + return -1; + + WaitForSingleObject(pinfo.hProcess, INFINITE); + GetExitCodeProcess(pinfo.hProcess, &exitcode); + CloseHandle(pinfo.hProcess); + CloseHandle(pinfo.hThread); + + return exitcode; +#else /* possibly slightly faster */ + /* needs fixing to quote commandline options to handle spaces in CCACHE_DIR etc */ + int status = -2; + int fd, std_od = -1, std_ed = -1; + + /* TODO: needs moving after possible exit() below, but before stdout is redirected */ + if (ccache_verbose) { + display_execute_args(argv); + } + + unlink(path_stdout); + std_od = _dup(1); + fd = _open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); + if (fd == -1) { + exit(STATUS_NOCACHE); + } + _dup2(fd, 1); + _close(fd); + + unlink(path_stderr); + fd = _open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); + std_ed = _dup(2); + if (fd == -1) { + exit(STATUS_NOCACHE); + } + _dup2(fd, 2); + _close(fd); + + /* Spawn process (_exec* familly doesn't return) */ + status = _spawnv(_P_WAIT, argv[0], (const char **)argv); + + /* Restore descriptors */ + if (std_od != -1) _dup2(std_od, 1); + if (std_ed != -1) _dup2(std_ed, 2); + _flushall(); + + return (status>0); + +#endif + +#else + pid_t pid; + int status; + + pid = fork(); + if (pid == -1) fatal("Failed to fork"); + + if (pid == 0) { + int fd; + + /* TODO: needs moving after possible exit() below, but before stdout is redirected */ + if (ccache_verbose) { + display_execute_args(argv); + } + + unlink(path_stdout); + fd = open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); + if (fd == -1) { + exit(STATUS_NOCACHE); + } + dup2(fd, 1); + close(fd); + + unlink(path_stderr); + fd = open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); + if (fd == -1) { + exit(STATUS_NOCACHE); + } + dup2(fd, 2); + close(fd); + + exit(execv(argv[0], argv)); + } + + if (waitpid(pid, &status, 0) != pid) { + fatal("waitpid failed"); + } + + if (WEXITSTATUS(status) == 0 && WIFSIGNALED(status)) { + return -1; + } + + return WEXITSTATUS(status); +#endif +} + + +/* + find an executable by name in $PATH. Exclude any that are links to exclude_name +*/ +char *find_executable(const char *name, const char *exclude_name) +{ +#if _WIN32 + (void)exclude_name; + DWORD ret; + char namebuf[MAX_PATH]; + + ret = SearchPathA(getenv("CCACHE_PATH"), name, ".exe", + sizeof(namebuf), namebuf, NULL); + if (ret != 0) { + return x_strdup(namebuf); + } + + return NULL; +#else + char *path; + char *tok; + struct stat st1, st2; + + if (*name == '/') { + return x_strdup(name); + } + + path = getenv("CCACHE_PATH"); + if (!path) { + path = getenv("PATH"); + } + if (!path) { + cc_log("no PATH variable!?\n"); + stats_update(STATS_ENVIRONMMENT); + return NULL; + } + + path = x_strdup(path); + + /* search the path looking for the first compiler of the right name + that isn't us */ + for (tok=strtok(path,":"); tok; tok = strtok(NULL, ":")) { + char *fname; + x_asprintf(&fname, "%s/%s", tok, name); + /* look for a normal executable file */ + if (access(fname, X_OK) == 0 && + lstat(fname, &st1) == 0 && + stat(fname, &st2) == 0 && + S_ISREG(st2.st_mode)) { + /* if its a symlink then ensure it doesn't + point at something called exclude_name */ + if (S_ISLNK(st1.st_mode)) { + char *buf = x_realpath(fname); + if (buf) { + char *p = str_basename(buf); + if (strcmp(p, exclude_name) == 0) { + /* its a link to "ccache" ! */ + free(p); + free(buf); + continue; + } + free(buf); + free(p); + } + } + + /* found it! */ + free(path); + return fname; + } + free(fname); + } + + return NULL; +#endif +} + +void display_execute_args(char **argv) +{ + if (argv) { + printf("ccache executing: "); + while (*argv) { + printf("%s ", *argv); + ++argv; + } + printf("\n"); + fflush(stdout); + } +} diff --git a/CCache/hash.c b/CCache/hash.c new file mode 100644 index 000000000..d0ce8a6ba --- /dev/null +++ b/CCache/hash.c @@ -0,0 +1,80 @@ +/* + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* + simple front-end functions to mdfour code +*/ + +#include "ccache.h" + +static struct mdfour md; + +void hash_buffer(const char *s, int len) +{ + mdfour_update(&md, (unsigned char *)s, len); +} + +void hash_start(void) +{ + mdfour_begin(&md); +} + +void hash_string(const char *s) +{ + hash_buffer(s, strlen(s)); +} + +void hash_int(int x) +{ + hash_buffer((char *)&x, sizeof(x)); +} + +/* add contents of a file to the hash */ +void hash_file(const char *fname) +{ + char buf[1024]; + int fd, n; + + fd = open(fname, O_RDONLY|O_BINARY); + if (fd == -1) { + cc_log("Failed to open %s\n", fname); + fatal("hash_file"); + } + + while ((n = read(fd, buf, sizeof(buf))) > 0) { + hash_buffer(buf, n); + } + close(fd); +} + +/* return the hash result as a static string */ +char *hash_result(void) +{ + unsigned char sum[16]; + static char ret[53]; + int i; + + hash_buffer(NULL, 0); + mdfour_result(&md, sum); + + for (i=0;i<16;i++) { + sprintf(&ret[i*2], "%02x", (unsigned)sum[i]); + } + sprintf(&ret[i*2], "-%u", (unsigned)md.totalN); + + return ret; +} diff --git a/CCache/install-sh b/CCache/install-sh new file mode 100755 index 000000000..58719246f --- /dev/null +++ b/CCache/install-sh @@ -0,0 +1,238 @@ +#! /bin/sh +# +# install - install a program, script, or datafile +# This comes from X11R5. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. +# + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +transformbasename="" +transform_arg="" +instcmd="$mvprog" +chmodcmd="$chmodprog 0755" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" +dir_arg="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + # this colon is to work around a 386BSD /bin/sh bug + : + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +else + true +fi + +if [ x"$dir_arg" != x ]; then + dst=$src + src="" + + if [ -d $dst ]; then + instcmd=: + else + instcmd=mkdir + fi +else + +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +# might cause directories to be created, which would be especially bad +# if $src (and thus $dsttmp) contains '*'. + + if [ -f $src -o -d $src ] + then + true + else + echo "install: $src does not exist" + exit 1 + fi + + if [ x"$dst" = x ] + then + echo "install: no destination specified" + exit 1 + else + true + fi + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + + if [ -d $dst ] + then + dst="$dst"/`basename $src` + else + true + fi +fi + +## this sed command emulates the dirname command +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + +# Make sure that the destination directory exists. +# this part is taken from Noah Friedman's mkinstalldirs script + +# Skip lots of stat calls in the usual case. +if [ ! -d "$dstdir" ]; then +defaultIFS=' +' +IFS="${IFS-${defaultIFS}}" + +oIFS="${IFS}" +# Some sh's can't handle IFS=/ for some reason. +IFS='%' +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS="${oIFS}" + +pathcomp='' + +while [ $# -ne 0 ] ; do + pathcomp="${pathcomp}${1}" + shift + + if [ ! -d "${pathcomp}" ] ; + then + $mkdirprog "${pathcomp}" + else + true + fi + + pathcomp="${pathcomp}/" +done +fi + +if [ x"$dir_arg" != x ] +then + $doit $instcmd $dst && + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi +else + +# If we're going to rename the final executable, determine the name now. + + if [ x"$transformarg" = x ] + then + dstfile=`basename $dst` + else + dstfile=`basename $dst $transformbasename | + sed $transformarg`$transformbasename + fi + +# don't allow the sed command to completely eliminate the filename + + if [ x"$dstfile" = x ] + then + dstfile=`basename $dst` + else + true + fi + +# Make a temp file name in the proper directory. + + dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + + $doit $instcmd $src $dsttmp && + + trap "rm -f ${dsttmp}" 0 && + +# and set any options; do chmod last to preserve setuid bits + +# If any of these fail, we abort the whole thing. If we want to +# ignore errors from any of these, just make sure not to ignore +# errors from the above "$doit $instcmd $src $dsttmp" command. + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + +# Now rename the file to the real destination. + + $doit $rmcmd -f $dstdir/$dstfile && + $doit $mvcmd $dsttmp $dstdir/$dstfile + +fi && + + +exit 0 diff --git a/CCache/mdfour.c b/CCache/mdfour.c new file mode 100644 index 000000000..b098e0215 --- /dev/null +++ b/CCache/mdfour.c @@ -0,0 +1,284 @@ +/* + a implementation of MD4 designed for use in the SMB authentication protocol + Copyright (C) Andrew Tridgell 1997-1998. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "ccache.h" + +/* NOTE: This code makes no attempt to be fast! + + It assumes that a int is at least 32 bits long +*/ + +static struct mdfour *m; + +#define MASK32 (0xffffffff) + +#define F(X,Y,Z) ((((X)&(Y)) | ((~(X))&(Z)))) +#define G(X,Y,Z) ((((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z)))) +#define H(X,Y,Z) (((X)^(Y)^(Z))) +#define lshift(x,s) (((((x)<<(s))&MASK32) | (((x)>>(32-(s)))&MASK32))) + +#define ROUND1(a,b,c,d,k,s) a = lshift((a + F(b,c,d) + M[k])&MASK32, s) +#define ROUND2(a,b,c,d,k,s) a = lshift((a + G(b,c,d) + M[k] + 0x5A827999)&MASK32,s) +#define ROUND3(a,b,c,d,k,s) a = lshift((a + H(b,c,d) + M[k] + 0x6ED9EBA1)&MASK32,s) + +/* this applies md4 to 64 byte chunks */ +static void mdfour64(uint32 *M) +{ + uint32 AA, BB, CC, DD; + uint32 A,B,C,D; + + A = m->A; B = m->B; C = m->C; D = m->D; + AA = A; BB = B; CC = C; DD = D; + + ROUND1(A,B,C,D, 0, 3); ROUND1(D,A,B,C, 1, 7); + ROUND1(C,D,A,B, 2, 11); ROUND1(B,C,D,A, 3, 19); + ROUND1(A,B,C,D, 4, 3); ROUND1(D,A,B,C, 5, 7); + ROUND1(C,D,A,B, 6, 11); ROUND1(B,C,D,A, 7, 19); + ROUND1(A,B,C,D, 8, 3); ROUND1(D,A,B,C, 9, 7); + ROUND1(C,D,A,B, 10, 11); ROUND1(B,C,D,A, 11, 19); + ROUND1(A,B,C,D, 12, 3); ROUND1(D,A,B,C, 13, 7); + ROUND1(C,D,A,B, 14, 11); ROUND1(B,C,D,A, 15, 19); + + + ROUND2(A,B,C,D, 0, 3); ROUND2(D,A,B,C, 4, 5); + ROUND2(C,D,A,B, 8, 9); ROUND2(B,C,D,A, 12, 13); + ROUND2(A,B,C,D, 1, 3); ROUND2(D,A,B,C, 5, 5); + ROUND2(C,D,A,B, 9, 9); ROUND2(B,C,D,A, 13, 13); + ROUND2(A,B,C,D, 2, 3); ROUND2(D,A,B,C, 6, 5); + ROUND2(C,D,A,B, 10, 9); ROUND2(B,C,D,A, 14, 13); + ROUND2(A,B,C,D, 3, 3); ROUND2(D,A,B,C, 7, 5); + ROUND2(C,D,A,B, 11, 9); ROUND2(B,C,D,A, 15, 13); + + ROUND3(A,B,C,D, 0, 3); ROUND3(D,A,B,C, 8, 9); + ROUND3(C,D,A,B, 4, 11); ROUND3(B,C,D,A, 12, 15); + ROUND3(A,B,C,D, 2, 3); ROUND3(D,A,B,C, 10, 9); + ROUND3(C,D,A,B, 6, 11); ROUND3(B,C,D,A, 14, 15); + ROUND3(A,B,C,D, 1, 3); ROUND3(D,A,B,C, 9, 9); + ROUND3(C,D,A,B, 5, 11); ROUND3(B,C,D,A, 13, 15); + ROUND3(A,B,C,D, 3, 3); ROUND3(D,A,B,C, 11, 9); + ROUND3(C,D,A,B, 7, 11); ROUND3(B,C,D,A, 15, 15); + + A += AA; B += BB; + C += CC; D += DD; + + A &= MASK32; B &= MASK32; + C &= MASK32; D &= MASK32; + + m->A = A; m->B = B; m->C = C; m->D = D; +} + +static void copy64(uint32 *M, const unsigned char *in) +{ + int i; + + for (i=0;i<16;i++) + M[i] = (in[i*4+3]<<24) | (in[i*4+2]<<16) | + (in[i*4+1]<<8) | (in[i*4+0]<<0); +} + +static void copy4(unsigned char *out,uint32 x) +{ + out[0] = x&0xFF; + out[1] = (x>>8)&0xFF; + out[2] = (x>>16)&0xFF; + out[3] = (x>>24)&0xFF; +} + +void mdfour_begin(struct mdfour *md) +{ + md->A = 0x67452301; + md->B = 0xefcdab89; + md->C = 0x98badcfe; + md->D = 0x10325476; + md->totalN = 0; + md->tail_len = 0; +} + + +static void mdfour_tail(const unsigned char *in, int n) +{ + unsigned char buf[128]; + uint32 M[16]; + uint32 b; + + m->totalN += n; + + b = m->totalN * 8; + + memset(buf, 0, 128); + if (n) memcpy(buf, in, n); + buf[n] = 0x80; + + if (n <= 55) { + copy4(buf+56, b); + copy64(M, buf); + mdfour64(M); + } else { + copy4(buf+120, b); + copy64(M, buf); + mdfour64(M); + copy64(M, buf+64); + mdfour64(M); + } +} + +void mdfour_update(struct mdfour *md, const unsigned char *in, int n) +{ + uint32 M[16]; + + m = md; + + if (in == NULL) { + mdfour_tail(md->tail, md->tail_len); + return; + } + + if (md->tail_len) { + int len = 64 - md->tail_len; + if (len > n) len = n; + memcpy(md->tail+md->tail_len, in, len); + md->tail_len += len; + n -= len; + in += len; + if (md->tail_len == 64) { + copy64(M, md->tail); + mdfour64(M); + m->totalN += 64; + md->tail_len = 0; + } + } + + while (n >= 64) { + copy64(M, in); + mdfour64(M); + in += 64; + n -= 64; + m->totalN += 64; + } + + if (n) { + memcpy(md->tail, in, n); + md->tail_len = n; + } +} + + +void mdfour_result(struct mdfour *md, unsigned char *out) +{ + m = md; + + copy4(out, m->A); + copy4(out+4, m->B); + copy4(out+8, m->C); + copy4(out+12, m->D); +} + + +void mdfour(unsigned char *out, const unsigned char *in, int n) +{ + struct mdfour md; + mdfour_begin(&md); + mdfour_update(&md, in, n); + mdfour_update(&md, NULL, 0); + mdfour_result(&md, out); +} + +#ifdef TEST_MDFOUR +static void file_checksum1(char *fname) +{ + int fd, i; + struct mdfour md; + unsigned char buf[1024], sum[16]; + unsigned chunk; + + fd = open(fname,O_RDONLY|O_BINARY); + if (fd == -1) { + perror("fname"); + exit(1); + } + + chunk = 1 + random() % (sizeof(buf) - 1); + + mdfour_begin(&md); + + while (1) { + int n = read(fd, buf, chunk); + if (n >= 0) { + mdfour_update(&md, buf, n); + } + if (n < chunk) break; + } + + close(fd); + + mdfour_update(&md, NULL, 0); + + mdfour_result(&md, sum); + + for (i=0;i<16;i++) + printf("%02x", sum[i]); + printf("\n"); +} + +#if 0 +#include "../md4.h" + +static void file_checksum2(char *fname) +{ + int fd, i; + MDstruct md; + unsigned char buf[64], sum[16]; + + fd = open(fname,O_RDONLY|O_BINARY); + if (fd == -1) { + perror("fname"); + exit(1); + } + + MDbegin(&md); + + while (1) { + int n = read(fd, buf, sizeof(buf)); + if (n <= 0) break; + MDupdate(&md, buf, n*8); + } + + if (!md.done) { + MDupdate(&md, buf, 0); + } + + close(fd); + + memcpy(sum, md.buffer, 16); + + for (i=0;i<16;i++) + printf("%02x", sum[i]); + printf("\n"); +} +#endif + + int main(int argc, char *argv[]) +{ + file_checksum1(argv[1]); +#if 0 + file_checksum2(argv[1]); +#endif + return 0; +} +#endif diff --git a/CCache/mdfour.h b/CCache/mdfour.h new file mode 100644 index 000000000..92ef2f831 --- /dev/null +++ b/CCache/mdfour.h @@ -0,0 +1,36 @@ +/* + Unix SMB/Netbios implementation. + Version 1.9. + a implementation of MD4 designed for use in the SMB authentication protocol + Copyright (C) Andrew Tridgell 1997-1998. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +struct mdfour { + uint32 A, B, C, D; + uint32 totalN; + unsigned char tail[64]; + unsigned tail_len; +}; + +void mdfour_begin(struct mdfour *md); +void mdfour_update(struct mdfour *md, const unsigned char *in, int n); +void mdfour_result(struct mdfour *md, unsigned char *out); +void mdfour(unsigned char *out, const unsigned char *in, int n); + + + + diff --git a/CCache/packaging/README b/CCache/packaging/README new file mode 100644 index 000000000..fadc342c4 --- /dev/null +++ b/CCache/packaging/README @@ -0,0 +1,5 @@ +These packaging files are contributd by users of ccache. I do not +maintain them, and they may well need updating before you use them. + +I don't distribute binary packages of ccache myself, but if you wish +to add ccache to a distribution then that's OK diff --git a/CCache/packaging/ccache.spec b/CCache/packaging/ccache.spec new file mode 100644 index 000000000..0972121d7 --- /dev/null +++ b/CCache/packaging/ccache.spec @@ -0,0 +1,37 @@ +Summary: Compiler Cache +Name: ccache +Version: 2.3 +Release: 1 +Group: Development/Languages +License: GPL +URL: http://ccache.samba.org/ +Source: ccache-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +ccache caches gcc output files + +%prep +%setup -q + +%build +%configure +make + +install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} +install -m 0755 ccache $RPM_BUILD_ROOT%{_bindir} +install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%files +%defattr(-,root,root) +%doc README +%{_mandir}/man1/ccache.1* +%{_bindir}/ccache + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%changelog +* Mon Apr 01 2002 Peter Jones +- Created the package diff --git a/CCache/snprintf.c b/CCache/snprintf.c new file mode 100644 index 000000000..32187c1a5 --- /dev/null +++ b/CCache/snprintf.c @@ -0,0 +1,962 @@ +/* + * Copyright Patrick Powell 1995 + * This code is based on code written by Patrick Powell (papowell@astart.com) + * It may be used for any purpose as long as this notice remains intact + * on all source code distributions + */ + +/************************************************************** + * Original: + * Patrick Powell Tue Apr 11 09:48:21 PDT 1995 + * A bombproof version of doprnt (dopr) included. + * Sigh. This sort of thing is always nasty do deal with. Note that + * the version here does not include floating point... + * + * snprintf() is used instead of sprintf() as it does limit checks + * for string length. This covers a nasty loophole. + * + * The other functions are there to prevent NULL pointers from + * causing nast effects. + * + * More Recently: + * Brandon Long 9/15/96 for mutt 0.43 + * This was ugly. It is still ugly. I opted out of floating point + * numbers, but the formatter understands just about everything + * from the normal C string format, at least as far as I can tell from + * the Solaris 2.5 printf(3S) man page. + * + * Brandon Long 10/22/97 for mutt 0.87.1 + * Ok, added some minimal floating point support, which means this + * probably requires libm on most operating systems. Don't yet + * support the exponent (e,E) and sigfig (g,G). Also, fmtint() + * was pretty badly broken, it just wasn't being exercised in ways + * which showed it, so that's been fixed. Also, formated the code + * to mutt conventions, and removed dead code left over from the + * original. Also, there is now a builtin-test, just compile with: + * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm + * and run snprintf for results. + * + * Thomas Roessler 01/27/98 for mutt 0.89i + * The PGP code was using unsigned hexadecimal formats. + * Unfortunately, unsigned formats simply didn't work. + * + * Michael Elkins 03/05/98 for mutt 0.90.8 + * The original code assumed that both snprintf() and vsnprintf() were + * missing. Some systems only have snprintf() but not vsnprintf(), so + * the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF. + * + * Andrew Tridgell (tridge@samba.org) Oct 1998 + * fixed handling of %.0f + * added test for HAVE_LONG_DOUBLE + * + * tridge@samba.org, idra@samba.org, April 2001 + * got rid of fcvt code (twas buggy and made testing harder) + * added C99 semantics + * + **************************************************************/ + +#ifndef NO_CONFIG_H /* for some tests */ +#include "config.h" +#endif + +#ifdef HAVE_STRING_H +#include +#endif + +#ifdef HAVE_STRINGS_H +#include +#endif +#ifdef HAVE_CTYPE_H +#include +#endif +#include +#include +#ifdef HAVE_STDLIB_H +#include +#endif + +#if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) && defined(HAVE_C99_VSNPRINTF) +/* only include stdio.h if we are not re-defining snprintf or vsnprintf */ +#include + /* make the compiler happy with an empty file */ + void dummy_snprintf(void) {} +#else + +#ifdef HAVE_LONG_DOUBLE +#define LDOUBLE long double +#else +#define LDOUBLE double +#endif + +#ifdef HAVE_LONG_LONG +#define LLONG long long +#else +#define LLONG long +#endif + +static size_t dopr(char *buffer, size_t maxlen, const char *format, + va_list args); +static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, + char *value, int flags, int min, int max); +static void fmtint(char *buffer, size_t *currlen, size_t maxlen, + long value, int base, int min, int max, int flags); +static void fmtfp(char *buffer, size_t *currlen, size_t maxlen, + LDOUBLE fvalue, int min, int max, int flags); +static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c); + +/* + * dopr(): poor man's version of doprintf + */ + +/* format read states */ +#define DP_S_DEFAULT 0 +#define DP_S_FLAGS 1 +#define DP_S_MIN 2 +#define DP_S_DOT 3 +#define DP_S_MAX 4 +#define DP_S_MOD 5 +#define DP_S_CONV 6 +#define DP_S_DONE 7 + +/* format flags - Bits */ +#define DP_F_MINUS (1 << 0) +#define DP_F_PLUS (1 << 1) +#define DP_F_SPACE (1 << 2) +#define DP_F_NUM (1 << 3) +#define DP_F_ZERO (1 << 4) +#define DP_F_UP (1 << 5) +#define DP_F_UNSIGNED (1 << 6) + +/* Conversion Flags */ +#define DP_C_SHORT 1 +#define DP_C_LONG 2 +#define DP_C_LDOUBLE 3 +#define DP_C_LLONG 4 + +#define char_to_int(p) ((p)- '0') +#ifndef MAX +#define MAX(p,q) (((p) >= (q)) ? (p) : (q)) +#endif + +static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args) +{ + char ch; + LLONG value; + LDOUBLE fvalue; + char *strvalue; + int min; + int max; + int state; + int flags; + int cflags; + size_t currlen; + + state = DP_S_DEFAULT; + currlen = flags = cflags = min = 0; + max = -1; + ch = *format++; + + while (state != DP_S_DONE) { + if (ch == '\0') + state = DP_S_DONE; + + switch(state) { + case DP_S_DEFAULT: + if (ch == '%') + state = DP_S_FLAGS; + else + dopr_outch (buffer, &currlen, maxlen, ch); + ch = *format++; + break; + case DP_S_FLAGS: + switch (ch) { + case '-': + flags |= DP_F_MINUS; + ch = *format++; + break; + case '+': + flags |= DP_F_PLUS; + ch = *format++; + break; + case ' ': + flags |= DP_F_SPACE; + ch = *format++; + break; + case '#': + flags |= DP_F_NUM; + ch = *format++; + break; + case '0': + flags |= DP_F_ZERO; + ch = *format++; + break; + default: + state = DP_S_MIN; + break; + } + break; + case DP_S_MIN: + if (isdigit((unsigned char)ch)) { + min = 10*min + char_to_int (ch); + ch = *format++; + } else if (ch == '*') { + min = va_arg (args, int); + ch = *format++; + state = DP_S_DOT; + } else { + state = DP_S_DOT; + } + break; + case DP_S_DOT: + if (ch == '.') { + state = DP_S_MAX; + ch = *format++; + } else { + state = DP_S_MOD; + } + break; + case DP_S_MAX: + if (isdigit((unsigned char)ch)) { + if (max < 0) + max = 0; + max = 10*max + char_to_int (ch); + ch = *format++; + } else if (ch == '*') { + max = va_arg (args, int); + ch = *format++; + state = DP_S_MOD; + } else { + state = DP_S_MOD; + } + break; + case DP_S_MOD: + switch (ch) { + case 'h': + cflags = DP_C_SHORT; + ch = *format++; + break; + case 'l': + cflags = DP_C_LONG; + ch = *format++; + if (ch == 'l') { /* It's a long long */ + cflags = DP_C_LLONG; + ch = *format++; + } + break; + case 'L': + cflags = DP_C_LDOUBLE; + ch = *format++; + break; + default: + break; + } + state = DP_S_CONV; + break; + case DP_S_CONV: + switch (ch) { + case 'd': + case 'i': + if (cflags == DP_C_SHORT) + value = va_arg (args, int); + else if (cflags == DP_C_LONG) + value = va_arg (args, long int); + else if (cflags == DP_C_LLONG) + value = va_arg (args, LLONG); + else + value = va_arg (args, int); + fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); + break; + case 'o': + flags |= DP_F_UNSIGNED; + if (cflags == DP_C_SHORT) + value = va_arg (args, unsigned int); + else if (cflags == DP_C_LONG) + value = (long)va_arg (args, unsigned long int); + else if (cflags == DP_C_LLONG) + value = (long)va_arg (args, unsigned LLONG); + else + value = (long)va_arg (args, unsigned int); + fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags); + break; + case 'u': + flags |= DP_F_UNSIGNED; + if (cflags == DP_C_SHORT) + value = va_arg (args, unsigned int); + else if (cflags == DP_C_LONG) + value = (long)va_arg (args, unsigned long int); + else if (cflags == DP_C_LLONG) + value = (LLONG)va_arg (args, unsigned LLONG); + else + value = (long)va_arg (args, unsigned int); + fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); + break; + case 'X': + flags |= DP_F_UP; + case 'x': + flags |= DP_F_UNSIGNED; + if (cflags == DP_C_SHORT) + value = va_arg (args, unsigned int); + else if (cflags == DP_C_LONG) + value = (long)va_arg (args, unsigned long int); + else if (cflags == DP_C_LLONG) + value = (LLONG)va_arg (args, unsigned LLONG); + else + value = (long)va_arg (args, unsigned int); + fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags); + break; + case 'f': + if (cflags == DP_C_LDOUBLE) + fvalue = va_arg (args, LDOUBLE); + else + fvalue = va_arg (args, double); + /* um, floating point? */ + fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags); + break; + case 'E': + flags |= DP_F_UP; + case 'e': + if (cflags == DP_C_LDOUBLE) + fvalue = va_arg (args, LDOUBLE); + else + fvalue = va_arg (args, double); + break; + case 'G': + flags |= DP_F_UP; + case 'g': + if (cflags == DP_C_LDOUBLE) + fvalue = va_arg (args, LDOUBLE); + else + fvalue = va_arg (args, double); + break; + case 'c': + dopr_outch (buffer, &currlen, maxlen, va_arg (args, int)); + break; + case 's': + strvalue = va_arg (args, char *); + if (!strvalue) strvalue = "(NULL)"; + if (max == -1) { + max = strlen(strvalue); + } + if (min > 0 && max >= 0 && min > max) max = min; + fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max); + break; + case 'p': + strvalue = (char *)va_arg(args, void *); + fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags); + break; + case 'n': + if (cflags == DP_C_SHORT) { + short int *num; + num = va_arg (args, short int *); + *num = currlen; + } else if (cflags == DP_C_LONG) { + long int *num; + num = va_arg (args, long int *); + *num = (long int)currlen; + } else if (cflags == DP_C_LLONG) { + LLONG *num; + num = va_arg (args, LLONG *); + *num = (LLONG)currlen; + } else { + int *num; + num = va_arg (args, int *); + *num = currlen; + } + break; + case '%': + dopr_outch (buffer, &currlen, maxlen, ch); + break; + case 'w': + /* not supported yet, treat as next char */ + ch = *format++; + break; + default: + /* Unknown, skip */ + break; + } + ch = *format++; + state = DP_S_DEFAULT; + flags = cflags = min = 0; + max = -1; + break; + case DP_S_DONE: + break; + default: + /* hmm? */ + break; /* some picky compilers need this */ + } + } + if (maxlen != 0) { + if (currlen < maxlen - 1) + buffer[currlen] = '\0'; + else if (maxlen > 0) + buffer[maxlen - 1] = '\0'; + } + + return currlen; +} + +static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, + char *value, int flags, int min, int max) +{ + int padlen, strln; /* amount to pad */ + int cnt = 0; + +#ifdef DEBUG_SNPRINTF + printf("fmtstr min=%d max=%d s=[%s]\n", min, max, value); +#endif + if (value == 0) { + value = ""; + } + + for (strln = 0; value[strln]; ++strln); /* strlen */ + padlen = min - strln; + if (padlen < 0) + padlen = 0; + if (flags & DP_F_MINUS) + padlen = -padlen; /* Left Justify */ + + while ((padlen > 0) && (cnt < max)) { + dopr_outch (buffer, currlen, maxlen, ' '); + --padlen; + ++cnt; + } + while (*value && (cnt < max)) { + dopr_outch (buffer, currlen, maxlen, *value++); + ++cnt; + } + while ((padlen < 0) && (cnt < max)) { + dopr_outch (buffer, currlen, maxlen, ' '); + ++padlen; + ++cnt; + } +} + +/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ + +static void fmtint(char *buffer, size_t *currlen, size_t maxlen, + long value, int base, int min, int max, int flags) +{ + int signvalue = 0; + unsigned long uvalue; + char convert[20]; + int place = 0; + int spadlen = 0; /* amount to space pad */ + int zpadlen = 0; /* amount to zero pad */ + int caps = 0; + + if (max < 0) + max = 0; + + uvalue = value; + + if(!(flags & DP_F_UNSIGNED)) { + if( value < 0 ) { + signvalue = '-'; + uvalue = -value; + } else { + if (flags & DP_F_PLUS) /* Do a sign (+/i) */ + signvalue = '+'; + else if (flags & DP_F_SPACE) + signvalue = ' '; + } + } + + if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ + + do { + convert[place++] = + (caps? "0123456789ABCDEF":"0123456789abcdef") + [uvalue % (unsigned)base ]; + uvalue = (uvalue / (unsigned)base ); + } while(uvalue && (place < 20)); + if (place == 20) place--; + convert[place] = 0; + + zpadlen = max - place; + spadlen = min - MAX (max, place) - (signvalue ? 1 : 0); + if (zpadlen < 0) zpadlen = 0; + if (spadlen < 0) spadlen = 0; + if (flags & DP_F_ZERO) { + zpadlen = MAX(zpadlen, spadlen); + spadlen = 0; + } + if (flags & DP_F_MINUS) + spadlen = -spadlen; /* Left Justifty */ + +#ifdef DEBUG_SNPRINTF + printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n", + zpadlen, spadlen, min, max, place); +#endif + + /* Spaces */ + while (spadlen > 0) { + dopr_outch (buffer, currlen, maxlen, ' '); + --spadlen; + } + + /* Sign */ + if (signvalue) + dopr_outch (buffer, currlen, maxlen, signvalue); + + /* Zeros */ + if (zpadlen > 0) { + while (zpadlen > 0) { + dopr_outch (buffer, currlen, maxlen, '0'); + --zpadlen; + } + } + + /* Digits */ + while (place > 0) + dopr_outch (buffer, currlen, maxlen, convert[--place]); + + /* Left Justified spaces */ + while (spadlen < 0) { + dopr_outch (buffer, currlen, maxlen, ' '); + ++spadlen; + } +} + +static LDOUBLE abs_val(LDOUBLE value) +{ + LDOUBLE result = value; + + if (value < 0) + result = -value; + + return result; +} + +static LDOUBLE POW10(int exp) +{ + LDOUBLE result = 1; + + while (exp) { + result *= 10; + exp--; + } + + return result; +} + +static LLONG ROUND(LDOUBLE value) +{ + LLONG intpart; + + intpart = (LLONG)value; + value = value - intpart; + if (value >= 0.5) intpart++; + + return intpart; +} + +/* a replacement for modf that doesn't need the math library. Should + be portable, but slow */ +static double my_modf(double x0, double *iptr) +{ + int i; + long l; + double x = x0; + double f = 1.0; + + for (i=0;i<100;i++) { + l = (long)x; + if (l <= (x+1) && l >= (x-1)) break; + x *= 0.1; + f *= 10.0; + } + + if (i == 100) { + /* yikes! the number is beyond what we can handle. What do we do? */ + (*iptr) = 0; + return 0; + } + + if (i != 0) { + double i2; + double ret; + + ret = my_modf(x0-l*f, &i2); + (*iptr) = l*f + i2; + return ret; + } + + (*iptr) = l; + return x - (*iptr); +} + + +static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, + LDOUBLE fvalue, int min, int max, int flags) +{ + int signvalue = 0; + double ufvalue; + char iconvert[311]; + char fconvert[311]; + int iplace = 0; + int fplace = 0; + int padlen = 0; /* amount to pad */ + int zpadlen = 0; + int caps = 0; + int index; + double intpart; + double fracpart; + double temp; + + /* + * AIX manpage says the default is 0, but Solaris says the default + * is 6, and sprintf on AIX defaults to 6 + */ + if (max < 0) + max = 6; + + ufvalue = abs_val (fvalue); + + if (fvalue < 0) { + signvalue = '-'; + } else { + if (flags & DP_F_PLUS) { /* Do a sign (+/i) */ + signvalue = '+'; + } else { + if (flags & DP_F_SPACE) + signvalue = ' '; + } + } + +#if 0 + if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ +#endif + +#if 0 + if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */ +#endif + + /* + * Sorry, we only support 16 digits past the decimal because of our + * conversion method + */ + if (max > 16) + max = 16; + + /* We "cheat" by converting the fractional part to integer by + * multiplying by a factor of 10 + */ + + temp = ufvalue; + my_modf(temp, &intpart); + + fracpart = ROUND((POW10(max)) * (ufvalue - intpart)); + + if (fracpart >= POW10(max)) { + intpart++; + fracpart -= POW10(max); + } + + + /* Convert integer part */ + do { + temp = intpart; + my_modf(intpart*0.1, &intpart); + temp = temp*0.1; + index = (int) ((temp -intpart +0.05)* 10.0); + /* index = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */ + /* printf ("%llf, %f, %x\n", temp, intpart, index); */ + iconvert[iplace++] = + (caps? "0123456789ABCDEF":"0123456789abcdef")[index]; + } while (intpart && (iplace < 311)); + if (iplace == 311) iplace--; + iconvert[iplace] = 0; + + /* Convert fractional part */ + if (fracpart) + { + do { + temp = fracpart; + my_modf(fracpart*0.1, &fracpart); + temp = temp*0.1; + index = (int) ((temp -fracpart +0.05)* 10.0); + /* index = (int) ((((temp/10) -fracpart) +0.05) *10); */ + /* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */ + fconvert[fplace++] = + (caps? "0123456789ABCDEF":"0123456789abcdef")[index]; + } while(fracpart && (fplace < 311)); + if (fplace == 311) fplace--; + } + fconvert[fplace] = 0; + + /* -1 for decimal point, another -1 if we are printing a sign */ + padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); + zpadlen = max - fplace; + if (zpadlen < 0) zpadlen = 0; + if (padlen < 0) + padlen = 0; + if (flags & DP_F_MINUS) + padlen = -padlen; /* Left Justifty */ + + if ((flags & DP_F_ZERO) && (padlen > 0)) { + if (signvalue) { + dopr_outch (buffer, currlen, maxlen, signvalue); + --padlen; + signvalue = 0; + } + while (padlen > 0) { + dopr_outch (buffer, currlen, maxlen, '0'); + --padlen; + } + } + while (padlen > 0) { + dopr_outch (buffer, currlen, maxlen, ' '); + --padlen; + } + if (signvalue) + dopr_outch (buffer, currlen, maxlen, signvalue); + + while (iplace > 0) + dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]); + +#ifdef DEBUG_SNPRINTF + printf("fmtfp: fplace=%d zpadlen=%d\n", fplace, zpadlen); +#endif + + /* + * Decimal point. This should probably use locale to find the correct + * char to print out. + */ + if (max > 0) { + dopr_outch (buffer, currlen, maxlen, '.'); + + while (fplace > 0) + dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]); + } + + while (zpadlen > 0) { + dopr_outch (buffer, currlen, maxlen, '0'); + --zpadlen; + } + + while (padlen < 0) { + dopr_outch (buffer, currlen, maxlen, ' '); + ++padlen; + } +} + +static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) +{ + if (*currlen < maxlen) { + buffer[(*currlen)] = c; + } + (*currlen)++; +} + +/* yes this really must be a ||. Don't muck with this (tridge) */ +#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) + int vsnprintf (char *str, size_t count, const char *fmt, va_list args) +{ + return dopr(str, count, fmt, args); +} +#endif + +/* yes this really must be a ||. Don't muck wiith this (tridge) + * + * The logic for these two is that we need our own definition if the + * OS *either* has no definition of *sprintf, or if it does have one + * that doesn't work properly according to the autoconf test. Perhaps + * these should really be smb_snprintf to avoid conflicts with buggy + * linkers? -- mbp + */ +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_SNPRINTF) + int snprintf(char *str,size_t count,const char *fmt,...) +{ + size_t ret; + va_list ap; + + va_start(ap, fmt); + ret = vsnprintf(str, count, fmt, ap); + va_end(ap); + return ret; +} +#endif + +#endif + +#ifndef HAVE_VASPRINTF + int vasprintf(char **ptr, const char *format, va_list ap) +{ + int ret; + + ret = vsnprintf(0, 0, format, ap); + if (ret <= 0) return ret; + + (*ptr) = (char *)malloc(ret+1); + if (!*ptr) return -1; + ret = vsnprintf(*ptr, ret+1, format, ap); + + return ret; +} +#endif + + +#ifndef HAVE_ASPRINTF + int asprintf(char **ptr, const char *format, ...) +{ + va_list ap; + int ret; + + *ptr = 0; + va_start(ap, format); + ret = vasprintf(ptr, format, ap); + va_end(ap); + + return ret; +} +#endif + +#ifndef HAVE_VSYSLOG +#ifdef HAVE_SYSLOG + void vsyslog (int facility_priority, char *format, va_list arglist) +{ + char *msg = 0; + vasprintf(&msg, format, arglist); + if (!msg) + return; + syslog(facility_priority, "%s", msg); + free(msg); +} +#endif /* HAVE_SYSLOG */ +#endif /* HAVE_VSYSLOG */ + +#ifdef TEST_SNPRINTF + + int sprintf(char *str,const char *fmt,...); + + int main (void) +{ + char buf1[1024]; + char buf2[1024]; + char *fp_fmt[] = { + "%1.1f", + "%-1.5f", + "%1.5f", + "%123.9f", + "%10.5f", + "% 10.5f", + "%+22.9f", + "%+4.9f", + "%01.3f", + "%4f", + "%3.1f", + "%3.2f", + "%.0f", + "%f", + "-16.16f", + 0 + }; + double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, + 0.9996, 1.996, 4.136, 0}; + char *int_fmt[] = { + "%-1.5d", + "%1.5d", + "%123.9d", + "%5.5d", + "%10.5d", + "% 10.5d", + "%+22.33d", + "%01.3d", + "%4d", + "%d", + 0 + }; + long int_nums[] = { -1, 134, 91340, 341, 0203, 0}; + char *str_fmt[] = { + "10.5s", + "5.10s", + "10.1s", + "0.10s", + "10.0s", + "1.10s", + "%s", + "%.1s", + "%.10s", + "%10s", + 0 + }; + char *str_vals[] = {"hello", "a", "", "a longer string", 0}; + int x, y; + int fail = 0; + int num = 0; + + printf ("Testing snprintf format codes against system sprintf...\n"); + + for (x = 0; fp_fmt[x] ; x++) { + for (y = 0; fp_nums[y] != 0 ; y++) { + int l1 = snprintf(0, 0, fp_fmt[x], fp_nums[y]); + int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]); + sprintf (buf2, fp_fmt[x], fp_nums[y]); + if (strcmp (buf1, buf2)) { + printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", + fp_fmt[x], buf1, buf2); + fail++; + } + if (l1 != l2) { + printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, fp_fmt[x]); + fail++; + } + num++; + } + } + + for (x = 0; int_fmt[x] ; x++) { + for (y = 0; int_nums[y] != 0 ; y++) { + int l1 = snprintf(0, 0, int_fmt[x], int_nums[y]); + int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]); + sprintf (buf2, int_fmt[x], int_nums[y]); + if (strcmp (buf1, buf2)) { + printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", + int_fmt[x], buf1, buf2); + fail++; + } + if (l1 != l2) { + printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, int_fmt[x]); + fail++; + } + num++; + } + } + + for (x = 0; str_fmt[x] ; x++) { + for (y = 0; str_vals[y] != 0 ; y++) { + int l1 = snprintf(0, 0, str_fmt[x], str_vals[y]); + int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x], str_vals[y]); + sprintf (buf2, str_fmt[x], str_vals[y]); + if (strcmp (buf1, buf2)) { + printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", + str_fmt[x], buf1, buf2); + fail++; + } + if (l1 != l2) { + printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, str_fmt[x]); + fail++; + } + num++; + } + } + + printf ("%d tests failed out of %d.\n", fail, num); + + printf("seeing how many digits we support\n"); + { + double v0 = 0.12345678901234567890123456789012345678901; + for (x=0; x<100; x++) { + snprintf(buf1, sizeof(buf1), "%1.1f", v0*pow(10, x)); + sprintf(buf2, "%1.1f", v0*pow(10, x)); + if (strcmp(buf1, buf2)) { + printf("we seem to support %d digits\n", x-1); + break; + } + } + } + + return 0; +} +#endif /* SNPRINTF_TEST */ diff --git a/CCache/stats.c b/CCache/stats.c new file mode 100644 index 000000000..92bc4a835 --- /dev/null +++ b/CCache/stats.c @@ -0,0 +1,361 @@ +/* + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* + routines to handle the stats files + + the stats file is stored one per cache subdirectory to make this more + scalable + */ + +#include "ccache.h" + +extern char *stats_file; +extern char *cache_dir; + +#define STATS_VERSION 1 + +#define FLAG_NOZERO 1 /* don't zero with the -z option */ +#define FLAG_ALWAYS 2 /* always show, even if zero */ + +static struct { + enum stats stat; + char *message; + void (*fn)(unsigned ); + unsigned flags; +} stats_info[] = { + { STATS_CACHED, "cache hit ", NULL, FLAG_ALWAYS }, + { STATS_TOCACHE, "cache miss ", NULL, FLAG_ALWAYS }, + { STATS_LINK, "called for link ", NULL, 0 }, + { STATS_MULTIPLE, "multiple source files ", NULL, 0 }, + { STATS_STDOUT, "compiler produced stdout ", NULL, 0 }, + { STATS_STATUS, "compile failed ", NULL, 0 }, + { STATS_ERROR, "ccache internal error ", NULL, 0 }, + { STATS_PREPROCESSOR, "preprocessor error ", NULL, 0 }, + { STATS_COMPILER, "couldn't find the compiler ", NULL, 0 }, + { STATS_MISSING, "cache file missing ", NULL, 0 }, + { STATS_ARGS, "bad compiler arguments ", NULL, 0 }, + { STATS_NOTC, "not a C/C++ file ", NULL, 0 }, + { STATS_CONFTEST, "autoconf compile/link ", NULL, 0 }, + { STATS_UNSUPPORTED, "unsupported compiler option ", NULL, 0 }, + { STATS_OUTSTDOUT, "output to stdout ", NULL, 0 }, + { STATS_DEVICE, "output to a non-regular file ", NULL, 0 }, + { STATS_NOINPUT, "no input file ", NULL, 0 }, + { STATS_ENVIRONMMENT, "error due to bad env variable ", NULL, 0 }, + { STATS_NUMFILES, "files in cache ", NULL, FLAG_NOZERO|FLAG_ALWAYS }, + { STATS_TOTALSIZE, "cache size ", display_size , FLAG_NOZERO|FLAG_ALWAYS }, + { STATS_MAXFILES, "max files ", NULL, FLAG_NOZERO }, + { STATS_MAXSIZE, "max cache size ", display_size, FLAG_NOZERO }, + { STATS_NONE, NULL, NULL, 0 } +}; + +/* parse a stats file from a buffer - adding to the counters */ +static void parse_stats(unsigned counters[STATS_END], char *buf) +{ + int i; + char *p, *p2; + + p = buf; + for (i=0;i= (int)sizeof(buf)-1) fatal("stats too long?!"); + } + len += snprintf(buf+len, sizeof(buf)-(len+1), "\n"); + if (len >= (int)sizeof(buf)-1) fatal("stats too long?!"); + + lseek(fd, 0, SEEK_SET); + if (write(fd, buf, len) == -1) fatal("could not write stats"); +} + + +/* fill in some default stats values */ +static void stats_default(unsigned counters[STATS_END]) +{ + counters[STATS_MAXSIZE] += DEFAULT_MAXSIZE / 16; +} + +/* read in the stats from one dir and add to the counters */ +static void stats_read_fd(int fd, unsigned counters[STATS_END]) +{ + char buf[1024]; + int len; + len = read(fd, buf, sizeof(buf)-1); + if (len <= 0) { + stats_default(counters); + return; + } + buf[len] = 0; + parse_stats(counters, buf); +} + +/* update the stats counter for this compile */ +static void stats_update_size(enum stats stat, size_t size, size_t numfiles) +{ + int fd; + unsigned counters[STATS_END]; + int need_cleanup = 0; + + if (getenv("CCACHE_NOSTATS")) return; + + if (!stats_file) { + if (!cache_dir) return; + x_asprintf(&stats_file, "%s/stats", cache_dir); + } + + /* open safely to try to prevent symlink races */ + fd = safe_open(stats_file); + + /* still can't get it? don't bother ... */ + if (fd == -1) return; + + memset(counters, 0, sizeof(counters)); + + if (lock_fd(fd) != 0) return; + + /* read in the old stats */ + stats_read_fd(fd, counters); + + /* update them */ + counters[stat]++; + + /* on a cache miss we up the file count and size */ + if (stat == STATS_TOCACHE) { + counters[STATS_NUMFILES] += numfiles; + counters[STATS_TOTALSIZE] += size; + } + + /* and write them out */ + write_stats(fd, counters); + close(fd); + + /* we might need to cleanup if the cache has now got too big */ + if (counters[STATS_MAXFILES] != 0 && + counters[STATS_NUMFILES] > counters[STATS_MAXFILES]) { + need_cleanup = 1; + } + if (counters[STATS_MAXSIZE] != 0 && + counters[STATS_TOTALSIZE] > counters[STATS_MAXSIZE]) { + need_cleanup = 1; + } + + if (need_cleanup) { + char *p = dirname(stats_file); + cleanup_dir(p, counters[STATS_MAXFILES], counters[STATS_MAXSIZE]); + free(p); + } +} + +/* record a cache miss */ +void stats_tocache(size_t size, size_t numfiles) +{ + /* convert size to kilobytes */ + size = size / 1024; + + stats_update_size(STATS_TOCACHE, size, numfiles); +} + +/* update a normal stat */ +void stats_update(enum stats stat) +{ + stats_update_size(stat, 0, 0); +} + +/* read in the stats from one dir and add to the counters */ +void stats_read(const char *stats_file, unsigned counters[STATS_END]) +{ + int fd; + + fd = open(stats_file, O_RDONLY|O_BINARY); + if (fd == -1) { + stats_default(counters); + return; + } + lock_fd(fd); + stats_read_fd(fd, counters); + close(fd); +} + +/* sum and display the total stats for all cache dirs */ +void stats_summary(void) +{ + int dir, i; + unsigned counters[STATS_END]; + + memset(counters, 0, sizeof(counters)); + + /* add up the stats in each directory */ + for (dir=-1;dir<=0xF;dir++) { + char *fname; + + if (dir == -1) { + x_asprintf(&fname, "%s/stats", cache_dir); + } else { + x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir); + } + + stats_read(fname, counters); + free(fname); + + /* oh what a nasty hack ... */ + if (dir == -1) { + counters[STATS_MAXSIZE] = 0; + } + + } + + printf("cache directory %s\n", cache_dir); + + /* and display them */ + for (i=0;stats_info[i].message;i++) { + enum stats stat = stats_info[i].stat; + + if (counters[stat] == 0 && + !(stats_info[i].flags & FLAG_ALWAYS)) { + continue; + } + + printf("%s ", stats_info[i].message); + if (stats_info[i].fn) { + stats_info[i].fn(counters[stat]); + printf("\n"); + } else { + printf("%8u\n", counters[stat]); + } + } +} + +/* zero all the stats structures */ +void stats_zero(void) +{ + int dir, fd; + unsigned i; + char *fname; + unsigned counters[STATS_END]; + + x_asprintf(&fname, "%s/stats", cache_dir); + unlink(fname); + free(fname); + + for (dir=0;dir<=0xF;dir++) { + x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir); + fd = safe_open(fname); + if (fd == -1) { + free(fname); + continue; + } + memset(counters, 0, sizeof(counters)); + lock_fd(fd); + stats_read_fd(fd, counters); + for (i=0;stats_info[i].message;i++) { + if (!(stats_info[i].flags & FLAG_NOZERO)) { + counters[stats_info[i].stat] = 0; + } + } + write_stats(fd, counters); + close(fd); + free(fname); + } +} + + +/* set the per directory limits */ +int stats_set_limits(long maxfiles, long maxsize) +{ + int dir; + unsigned counters[STATS_END]; + + if (maxfiles != -1) { + maxfiles /= 16; + } + if (maxsize != -1) { + maxsize /= 16; + } + + if (create_dir(cache_dir) != 0) { + return 1; + } + + /* set the limits in each directory */ + for (dir=0;dir<=0xF;dir++) { + char *fname, *cdir; + int fd; + + x_asprintf(&cdir, "%s/%1x", cache_dir, dir); + if (create_dir(cdir) != 0) { + return 1; + } + x_asprintf(&fname, "%s/stats", cdir); + free(cdir); + + memset(counters, 0, sizeof(counters)); + fd = safe_open(fname); + if (fd != -1) { + lock_fd(fd); + stats_read_fd(fd, counters); + if (maxfiles != -1) { + counters[STATS_MAXFILES] = maxfiles; + } + if (maxsize != -1) { + counters[STATS_MAXSIZE] = maxsize; + } + write_stats(fd, counters); + close(fd); + } + free(fname); + } + + return 0; +} + +/* set the per directory sizes */ +void stats_set_sizes(const char *dir, size_t num_files, size_t total_size) +{ + int fd; + unsigned counters[STATS_END]; + char *stats_file; + + create_dir(dir); + x_asprintf(&stats_file, "%s/stats", dir); + + memset(counters, 0, sizeof(counters)); + + fd = safe_open(stats_file); + if (fd != -1) { + lock_fd(fd); + stats_read_fd(fd, counters); + counters[STATS_NUMFILES] = num_files; + counters[STATS_TOTALSIZE] = total_size; + write_stats(fd, counters); + close(fd); + } + + free(stats_file); +} diff --git a/CCache/test.sh b/CCache/test.sh new file mode 100755 index 000000000..9581c85e3 --- /dev/null +++ b/CCache/test.sh @@ -0,0 +1,452 @@ +#!/bin/sh + +# a simple test suite for ccache +# tridge@samba.org + +if test -n "$CC"; then + COMPILER="$CC" +else + COMPILER=cc +fi + +if test -n "$SWIG"; then + SWIG="$SWIG" +else + SWIG=swig +fi + +CCACHE=../ccache-swig +TESTDIR=test.$$ + +test_failed() { + reason="$1" + echo $1 + $CCACHE -s + cd .. + rm -rf $TESTDIR + echo TEST FAILED + exit 1 +} + +randcode() { + outfile="$1" + nlines=$2 + i=0; + ( + while [ $i -lt $nlines ]; do + echo "int foo$nlines$i(int x) { return x; }" + i=`expr $i + 1` + done + ) >> "$outfile" +} + +genswigcode() { + outfile="$1" + nlines=$2 + i=0; + ( + echo "%module swigtest$2;" + while [ $i -lt $nlines ]; do + echo "int foo$nlines$i(int x);" + echo "struct Bar$nlines$i { int y; };" + i=`expr $i + 1` + done + ) >> "$outfile" +} + + +getstat() { + stat="$1" + value=`$CCACHE -s | grep "$stat" | cut -c34-40` + echo $value +} + +checkstat() { + stat="$1" + expected_value="$2" + value=`getstat "$stat"` +# echo "exp: $expected_value got: $value $testname" + if [ "$expected_value" != "$value" ]; then + test_failed "SUITE: $testsuite TEST: $testname - Expected $stat to be $expected_value got $value" + fi +} + + +basetests() { + echo "starting testsuite $testsuite" + rm -rf "$CCACHE_DIR" + checkstat 'cache hit' 0 + checkstat 'cache miss' 0 + + j=1 + rm -f *.c + while [ $j -lt 32 ]; do + randcode test$j.c $j + j=`expr $j + 1` + done + + testname="BASIC" + $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 0 + checkstat 'cache miss' 1 + + testname="BASIC2" + $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 1 + checkstat 'cache miss' 1 + + testname="debug" + $CCACHE_COMPILE -c test1.c -g + checkstat 'cache hit' 1 + checkstat 'cache miss' 2 + + testname="debug2" + $CCACHE_COMPILE -c test1.c -g + checkstat 'cache hit' 2 + checkstat 'cache miss' 2 + + testname="output" + $CCACHE_COMPILE -c test1.c -o foo.o + checkstat 'cache hit' 3 + checkstat 'cache miss' 2 + + testname="link" + $CCACHE_COMPILE test1.c -o test 2> /dev/null + checkstat 'called for link' 1 + + testname="multiple" + $CCACHE_COMPILE -c test1.c test2.c + checkstat 'multiple source files' 1 + + testname="find" + $CCACHE blahblah -c test1.c 2> /dev/null + checkstat "couldn't find the compiler" 1 + + testname="bad" + $CCACHE_COMPILE -c test1.c -I 2> /dev/null + checkstat 'bad compiler arguments' 1 + + testname="c/c++" + ln -f test1.c test1.ccc + $CCACHE_COMPILE -c test1.ccc 2> /dev/null + checkstat 'not a C/C++ file' 1 + + testname="unsupported" + $CCACHE_COMPILE -M foo -c test1.c > /dev/null 2>&1 + checkstat 'unsupported compiler option' 1 + + testname="stdout" + $CCACHE echo foo -c test1.c > /dev/null + checkstat 'compiler produced stdout' 1 + + testname="non-regular" + mkdir testd + $CCACHE_COMPILE -o testd -c test1.c > /dev/null 2>&1 + rmdir testd + checkstat 'output to a non-regular file' 1 + + testname="no-input" + $CCACHE_COMPILE -c -O2 2> /dev/null + checkstat 'no input file' 1 + + + testname="CCACHE_DISABLE" + CCACHE_DISABLE=1 $CCACHE_COMPILE -c test1.c 2> /dev/null + checkstat 'cache hit' 3 + $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 4 + + testname="CCACHE_CPP2" + CCACHE_CPP2=1 $CCACHE_COMPILE -c test1.c -O -O + checkstat 'cache hit' 4 + checkstat 'cache miss' 3 + + CCACHE_CPP2=1 $CCACHE_COMPILE -c test1.c -O -O + checkstat 'cache hit' 5 + checkstat 'cache miss' 3 + + testname="CCACHE_NOSTATS" + CCACHE_NOSTATS=1 $CCACHE_COMPILE -c test1.c -O -O + checkstat 'cache hit' 5 + checkstat 'cache miss' 3 + + testname="CCACHE_RECACHE" + CCACHE_RECACHE=1 $CCACHE_COMPILE -c test1.c -O -O + checkstat 'cache hit' 5 + checkstat 'cache miss' 4 + + # strictly speaking should be 6 - RECACHE causes a double counting! + checkstat 'files in cache' 8 + $CCACHE -c > /dev/null + checkstat 'files in cache' 6 + + + testname="CCACHE_HASHDIR" + CCACHE_HASHDIR=1 $CCACHE_COMPILE -c test1.c -O -O + checkstat 'cache hit' 5 + checkstat 'cache miss' 5 + + CCACHE_HASHDIR=1 $CCACHE_COMPILE -c test1.c -O -O + checkstat 'cache hit' 6 + checkstat 'cache miss' 5 + + checkstat 'files in cache' 8 + + testname="comments" + echo '/* a silly comment */' > test1-comment.c + cat test1.c >> test1-comment.c + $CCACHE_COMPILE -c test1-comment.c + rm -f test1-comment* + checkstat 'cache hit' 6 + checkstat 'cache miss' 6 + + testname="CCACHE_UNIFY" + CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 6 + checkstat 'cache miss' 7 + mv test1.c test1-saved.c + echo '/* another comment */' > test1.c + cat test1-saved.c >> test1.c + CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c + mv test1-saved.c test1.c + checkstat 'cache hit' 7 + checkstat 'cache miss' 7 + + testname="cache-size" + for f in *.c; do + $CCACHE_COMPILE -c $f + done + checkstat 'cache hit' 8 + checkstat 'cache miss' 37 + checkstat 'files in cache' 72 + $CCACHE -F 48 -c > /dev/null + if [ `getstat 'files in cache'` -gt 48 ]; then + test_failed '-F test failed' + fi + + testname="cpp call" + $CCACHE_COMPILE -c test1.c -E > test1.i + checkstat 'cache hit' 8 + checkstat 'cache miss' 37 + + testname="direct .i compile" + $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 8 + checkstat 'cache miss' 38 + + $CCACHE_COMPILE -c test1.i + checkstat 'cache hit' 9 + checkstat 'cache miss' 38 + + $CCACHE_COMPILE -c test1.i + checkstat 'cache hit' 10 + checkstat 'cache miss' 38 + + # removed these tests as some compilers (including newer versions of gcc) + # determine which language to use based on .ii/.i extension, and C++ may + # not be installed +# testname="direct .ii file" +# mv test1.i test1.ii +# $CCACHE_COMPILE -c test1.ii +# checkstat 'cache hit' 10 +# checkstat 'cache miss' 39 + +# $CCACHE_COMPILE -c test1.ii +# checkstat 'cache hit' 11 +# checkstat 'cache miss' 39 + + testname="stripc" # This test might not be portable + CCACHE_STRIPC=1 $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 10 + checkstat 'cache miss' 39 + + CCACHE_STRIPC=1 $CCACHE_COMPILE -c test1.c + checkstat 'cache hit' 11 + checkstat 'cache miss' 39 + + testname="zero-stats" + $CCACHE -z > /dev/null + checkstat 'cache hit' 0 + checkstat 'cache miss' 0 + + testname="clear" + $CCACHE -C > /dev/null + checkstat 'files in cache' 0 + + + rm -f test1.c +} + +swigtests() { + echo "starting swig testsuite $testsuite" + rm -rf "$CCACHE_DIR" + checkstat 'cache hit' 0 + checkstat 'cache miss' 0 + + j=1 + rm -f *.i + genswigcode testswig1.i 1 + + testname="BASIC" + $CCACHE_COMPILE -java testswig1.i + checkstat 'cache hit' 0 + checkstat 'cache miss' 1 + + checkstat 'files in cache' 6 + + testname="BASIC2" + $CCACHE_COMPILE -java testswig1.i + checkstat 'cache hit' 1 + checkstat 'cache miss' 1 + + testname="output" + $CCACHE_COMPILE -java testswig1.i -o foo_wrap.c + checkstat 'cache hit' 1 + checkstat 'cache miss' 2 + + testname="bad" + $CCACHE_COMPILE -java testswig1.i -I 2> /dev/null + checkstat 'bad compiler arguments' 1 + + testname="stdout" + $CCACHE_COMPILE -v -java testswig1.i > /dev/null + checkstat 'compiler produced stdout' 1 + + testname="non-regular" + mkdir testd + $CCACHE_COMPILE -o testd -java testswig1.i > /dev/null 2>&1 + rmdir testd + checkstat 'output to a non-regular file' 1 + + testname="no-input" + $CCACHE_COMPILE -java 2> /dev/null + checkstat 'no input file' 1 + + + testname="CCACHE_DISABLE" + CCACHE_DISABLE=1 $CCACHE_COMPILE -java testswig1.i 2> /dev/null + checkstat 'cache hit' 1 + $CCACHE_COMPILE -java testswig1.i + checkstat 'cache hit' 2 + + testname="CCACHE_CPP2" + CCACHE_CPP2=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 2 + checkstat 'cache miss' 3 + + CCACHE_CPP2=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 3 + checkstat 'cache miss' 3 + + testname="CCACHE_NOSTATS" + CCACHE_NOSTATS=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 3 + checkstat 'cache miss' 3 + + testname="CCACHE_RECACHE" + CCACHE_RECACHE=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 3 + checkstat 'cache miss' 4 + + # strictly speaking should be 3x6=18 instead of 4x6=24 - RECACHE causes a double counting! + checkstat 'files in cache' 24 + $CCACHE -c > /dev/null + checkstat 'files in cache' 18 + + + testname="CCACHE_HASHDIR" + CCACHE_HASHDIR=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 3 + checkstat 'cache miss' 5 + + CCACHE_HASHDIR=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 4 + checkstat 'cache miss' 5 + + checkstat 'files in cache' 24 + + testname="cpp call" + $CCACHE_COMPILE -java -E testswig1.i > testswig1-preproc.i + checkstat 'cache hit' 4 + checkstat 'cache miss' 5 + + testname="direct .i compile" + $CCACHE_COMPILE -java testswig1.i + checkstat 'cache hit' 5 + checkstat 'cache miss' 5 + + # No cache hit due to different input file name, -nopreprocess should not be given twice to SWIG + $CCACHE_COMPILE -java -nopreprocess testswig1-preproc.i + checkstat 'cache hit' 5 + checkstat 'cache miss' 6 + + $CCACHE_COMPILE -java -nopreprocess testswig1-preproc.i + checkstat 'cache hit' 6 + checkstat 'cache miss' 6 + + testname="stripc" + CCACHE_STRIPC=1 $CCACHE_COMPILE -java -O -O testswig1.i + checkstat 'cache hit' 7 + checkstat 'cache miss' 6 + + CCACHE_STRIPC=1 $CCACHE_COMPILE -java -O -O -O testswig1.i + checkstat 'cache hit' 7 + checkstat 'cache miss' 7 + + rm -f testswig1-preproc.i + rm -f testswig1.i +} + +###### +# main program +rm -rf $TESTDIR +mkdir $TESTDIR +cd $TESTDIR || exit 1 +CCACHE_DIR="ccache dir" # with space in directory name (like Windows default) +mkdir "$CCACHE_DIR" +export CCACHE_DIR + +testsuite="base" +CCACHE_COMPILE="$CCACHE $COMPILER" +basetests +CCACHE_COMPILE="$CCACHE $SWIG" +swigtests + +if test -z "$NOSOFTLINKSTEST"; then + testsuite="link" + ln -s $CCACHE $COMPILER + CCACHE_COMPILE="./$COMPILER" + basetests + rm "./$COMPILER" + ln -s $CCACHE $SWIG + CCACHE_COMPILE="./$SWIG" + swigtests + rm "./$SWIG" +else + echo "skipping testsuite link" +fi + +testsuite="hardlink" +CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $COMPILER" +basetests +CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $SWIG" +swigtests + +testsuite="cpp2" +CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $COMPILER" +basetests +CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $SWIG" +swigtests + +testsuite="nlevels4" +CCACHE_COMPILE="env CCACHE_NLEVELS=4 $CCACHE $COMPILER" +basetests + +testsuite="nlevels1" +CCACHE_COMPILE="env CCACHE_NLEVELS=1 $CCACHE $COMPILER" +basetests + +cd .. +rm -rf $TESTDIR +echo test done - OK +exit 0 diff --git a/CCache/unify.c b/CCache/unify.c new file mode 100644 index 000000000..a93d48a02 --- /dev/null +++ b/CCache/unify.c @@ -0,0 +1,307 @@ +/* + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* + C/C++ unifier + + the idea is that changes that don't affect the resulting C code + should not change the hash. This is achieved by folding white-space + and other non-semantic fluff in the input into a single unified format. + + This unifier was design to match the output of the unifier in + compilercache, which is flex based. The major difference is that + this unifier is much faster (about 2x) and more forgiving of + syntactic errors. Continuing on syntactic errors is important to + cope with C/C++ extensions in the local compiler (for example, + inline assembly systems). +*/ + +#include "ccache.h" + +static char *s_tokens[] = { + "...", ">>=", "<<=", "+=", "-=", "*=", "/=", "%=", "&=", "^=", + "|=", ">>", "<<", "++", "--", "->", "&&", "||", "<=", ">=", + "==", "!=", ";", "{", "<%", "}", "%>", ",", ":", "=", + "(", ")", "[", "<:", "]", ":>", ".", "&", "!", "~", + "-", "+", "*", "/", "%", "<", ">", "^", "|", "?", + 0 +}; + +#define C_ALPHA 1 +#define C_SPACE 2 +#define C_TOKEN 4 +#define C_QUOTE 8 +#define C_DIGIT 16 +#define C_HEX 32 +#define C_FLOAT 64 +#define C_SIGN 128 + +static struct { + unsigned char type; + unsigned char num_toks; + char *toks[7]; +} tokens[256]; + +/* build up the table used by the unifier */ +static void build_table(void) +{ + unsigned char c; + int i; + static int done; + + if (done) return; + done = 1; + + memset(tokens, 0, sizeof(tokens)); + for (c=0;c<128;c++) { + if (isalpha(c) || c == '_') tokens[c].type |= C_ALPHA; + if (isdigit(c)) tokens[c].type |= C_DIGIT; + if (isspace(c)) tokens[c].type |= C_SPACE; + if (isxdigit(c)) tokens[c].type |= C_HEX; + } + tokens['\''].type |= C_QUOTE; + tokens['"'].type |= C_QUOTE; + tokens['l'].type |= C_FLOAT; + tokens['L'].type |= C_FLOAT; + tokens['f'].type |= C_FLOAT; + tokens['F'].type |= C_FLOAT; + tokens['U'].type |= C_FLOAT; + tokens['u'].type |= C_FLOAT; + + tokens['-'].type |= C_SIGN; + tokens['+'].type |= C_SIGN; + + for (i=0;s_tokens[i];i++) { + c = s_tokens[i][0]; + tokens[c].type |= C_TOKEN; + tokens[c].toks[tokens[c].num_toks] = s_tokens[i]; + tokens[c].num_toks++; + } +} + +/* buffer up characters before hashing them */ +static void pushchar(unsigned char c) +{ + static unsigned char buf[64]; + static int len; + + if (c == 0) { + if (len > 0) { + hash_buffer((char *)buf, len); + len = 0; + } + hash_buffer(NULL, 0); + return; + } + + buf[len++] = c; + if (len == 64) { + hash_buffer((char *)buf, len); + len = 0; + } +} + +/* hash some C/C++ code after unifying */ +static void unify(unsigned char *p, size_t size) +{ + size_t ofs; + unsigned char q; + int i; + + build_table(); + + for (ofs=0; ofs 2 && p[ofs+1] == ' ' && isdigit(p[ofs+2])) { + do { + ofs++; + } while (ofs < size && p[ofs] != '\n'); + ofs++; + } else { + do { + pushchar(p[ofs]); + ofs++; + } while (ofs < size && p[ofs] != '\n'); + pushchar('\n'); + ofs++; + } + continue; + } + + if (tokens[p[ofs]].type & C_ALPHA) { + do { + pushchar(p[ofs]); + ofs++; + } while (ofs < size && + (tokens[p[ofs]].type & (C_ALPHA|C_DIGIT))); + pushchar('\n'); + continue; + } + + if (tokens[p[ofs]].type & C_DIGIT) { + do { + pushchar(p[ofs]); + ofs++; + } while (ofs < size && + ((tokens[p[ofs]].type & C_DIGIT) || p[ofs] == '.')); + if (ofs < size && (p[ofs] == 'x' || p[ofs] == 'X')) { + do { + pushchar(p[ofs]); + ofs++; + } while (ofs < size && (tokens[p[ofs]].type & C_HEX)); + } + if (ofs < size && (p[ofs] == 'E' || p[ofs] == 'e')) { + pushchar(p[ofs]); + ofs++; + while (ofs < size && + (tokens[p[ofs]].type & (C_DIGIT|C_SIGN))) { + pushchar(p[ofs]); + ofs++; + } + } + while (ofs < size && (tokens[p[ofs]].type & C_FLOAT)) { + pushchar(p[ofs]); + ofs++; + } + pushchar('\n'); + continue; + } + + if (tokens[p[ofs]].type & C_SPACE) { + do { + ofs++; + } while (ofs < size && (tokens[p[ofs]].type & C_SPACE)); + continue; + } + + if (tokens[p[ofs]].type & C_QUOTE) { + q = p[ofs]; + pushchar(p[ofs]); + do { + ofs++; + while (ofs < size-1 && p[ofs] == '\\') { + pushchar(p[ofs]); + pushchar(p[ofs+1]); + ofs+=2; + } + pushchar(p[ofs]); + } while (ofs < size && p[ofs] != q); + pushchar('\n'); + ofs++; + continue; + } + + if (tokens[p[ofs]].type & C_TOKEN) { + q = p[ofs]; + for (i=0;i= ofs+len && memcmp(&p[ofs], s, len) == 0) { + int j; + for (j=0;s[j];j++) { + pushchar(s[j]); + ofs++; + } + pushchar('\n'); + break; + } + } + if (i < tokens[q].num_toks) { + continue; + } + } + + pushchar(p[ofs]); + pushchar('\n'); + ofs++; + } + pushchar(0); +} + + +/* hash a file that consists of preprocessor output, but remove any line + number information from the hash +*/ +int unify_hash(const char *fname) +{ +#ifdef _WIN32 + HANDLE file; + HANDLE section; + DWORD filesize_low; + char *map; + int ret = -1; + + file = CreateFileA(fname, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) { + filesize_low = GetFileSize(file, NULL); + if (!(filesize_low == INVALID_FILE_SIZE && GetLastError() != NO_ERROR)) { + section = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if (section != NULL) { + map = MapViewOfFile(section, FILE_MAP_READ, 0, 0, 0); + CloseHandle(section); + if (map != NULL) + ret = 0; + } + } + } + + if (ret == -1) { + cc_log("Failed to open preprocessor output %s\n", fname); + stats_update(STATS_PREPROCESSOR); + return -1; + } + + /* pass it through the unifier */ + unify((unsigned char *)map, filesize_low); + + UnmapViewOfFile(map); + + return 0; +#else + int fd; + struct stat st; + char *map; + + fd = open(fname, O_RDONLY|O_BINARY); + if (fd == -1 || fstat(fd, &st) != 0) { + cc_log("Failed to open preprocessor output %s\n", fname); + stats_update(STATS_PREPROCESSOR); + return -1; + } + + /* we use mmap() to make it easy to handle arbitrarily long + lines in preprocessor output. I have seen lines of over + 100k in length, so this is well worth it */ + map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); + if (map == (char *)-1) { + cc_log("Failed to mmap %s\n", fname); + stats_update(STATS_PREPROCESSOR); + return -1; + } + close(fd); + + /* pass it through the unifier */ + unify((unsigned char *)map, st.st_size); + + munmap(map, st.st_size); + + return 0; +#endif +} + diff --git a/CCache/util.c b/CCache/util.c new file mode 100644 index 000000000..bba232492 --- /dev/null +++ b/CCache/util.c @@ -0,0 +1,884 @@ +/* + Copyright (C) Andrew Tridgell 2002 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "ccache.h" + +static FILE *logfile; + +/* log a message to the CCACHE_LOGFILE location */ +void cc_log(const char *format, ...) +{ + va_list ap; + extern char *cache_logfile; + + if (!cache_logfile) return; + + if (!logfile) logfile = fopen(cache_logfile, "a"); + if (!logfile) return; + + va_start(ap, format); + vfprintf(logfile, format, ap); + va_end(ap); + fflush(logfile); +} + +/* something went badly wrong! */ +void fatal(const char *msg) +{ + cc_log("FATAL: %s\n", msg); + exit(1); +} + +int safe_rename(const char* oldpath, const char* newpath) +{ + /* safe_rename is for creating entries in the cache. + + Works like rename(), but it never overwrites an existing + cache entry. This avoids corruption on NFS. */ +#ifndef _WIN32 + int status = link(oldpath, newpath); + if( status == 0 || errno == EEXIST ) +#else + int status = CreateHardLinkA(newpath, oldpath, NULL) ? 0 : -1; + if( status == 0 || GetLastError() == ERROR_ALREADY_EXISTS ) +#endif + { + return unlink( oldpath ); + } + else + { + return -1; + } +} + +#ifndef ENABLE_ZLIB +/* copy all data from one file descriptor to another */ +void copy_fd(int fd_in, int fd_out) +{ + char buf[10240]; + int n; + + while ((n = read(fd_in, buf, sizeof(buf))) > 0) { + if (write(fd_out, buf, n) != n) { + fatal("Failed to copy fd"); + } + } +} + +#ifndef HAVE_MKSTEMP +/* cheap and nasty mkstemp replacement */ +static int mkstemp(char *template) +{ + mktemp(template); + return open(template, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600); +} +#endif + +/* move a file using rename */ +int move_file(const char *src, const char *dest) { + return safe_rename(src, dest); +} + +/* copy a file - used when hard links don't work + the copy is done via a temporary file and atomic rename +*/ +static int copy_file(const char *src, const char *dest) +{ + int fd1, fd2; + char buf[10240]; + int n; + char *tmp_name; + mode_t mask; + + x_asprintf(&tmp_name, "%s.XXXXXX", dest); + + fd1 = open(src, O_RDONLY|O_BINARY); + if (fd1 == -1) { + free(tmp_name); + return -1; + } + + fd2 = mkstemp(tmp_name); + if (fd2 == -1) { + close(fd1); + free(tmp_name); + return -1; + } + + while ((n = read(fd1, buf, sizeof(buf))) > 0) { + if (write(fd2, buf, n) != n) { + close(fd2); + close(fd1); + unlink(tmp_name); + free(tmp_name); + return -1; + } + } + + close(fd1); + + /* get perms right on the tmp file */ +#ifndef _WIN32 + mask = umask(0); + fchmod(fd2, 0666 & ~mask); + umask(mask); +#else + (void)mask; +#endif + + /* the close can fail on NFS if out of space */ + if (close(fd2) == -1) { + unlink(tmp_name); + free(tmp_name); + return -1; + } + + unlink(dest); + + if (rename(tmp_name, dest) == -1) { + unlink(tmp_name); + free(tmp_name); + return -1; + } + + free(tmp_name); + + return 0; +} + +/* copy a file to the cache */ +static int copy_file_to_cache(const char *src, const char *dest) { + return copy_file(src, dest); +} + +/* copy a file from the cache */ +static int copy_file_from_cache(const char *src, const char *dest) { + return copy_file(src, dest); +} + +#else /* ENABLE_ZLIB */ + +/* copy all data from one file descriptor to another + possibly decompressing it +*/ +void copy_fd(int fd_in, int fd_out) { + char buf[10240]; + int n; + gzFile gz_in; + + gz_in = gzdopen(dup(fd_in), "rb"); + + if (!gz_in) { + fatal("Failed to copy fd"); + } + + while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { + if (write(fd_out, buf, n) != n) { + fatal("Failed to copy fd"); + } + } +} + +static int _copy_file(const char *src, const char *dest, int mode) { + int fd_in, fd_out; + gzFile gz_in, gz_out = NULL; + char buf[10240]; + int n, ret; + char *tmp_name; + mode_t mask; + struct stat st; + + x_asprintf(&tmp_name, "%s.XXXXXX", dest); + + if (getenv("CCACHE_NOCOMPRESS")) { + mode = COPY_UNCOMPRESSED; + } + + /* open source file */ + fd_in = open(src, O_RDONLY); + if (fd_in == -1) { + return -1; + } + + gz_in = gzdopen(fd_in, "rb"); + if (!gz_in) { + close(fd_in); + return -1; + } + + /* open destination file */ + fd_out = mkstemp(tmp_name); + if (fd_out == -1) { + gzclose(gz_in); + free(tmp_name); + return -1; + } + + if (mode == COPY_TO_CACHE) { + /* The gzip file format occupies at least 20 bytes. So + it will always occupy an entire filesystem block, + even for empty files. + Since most stderr files will be empty, we turn off + compression in this case to save space. + */ + if (fstat(fd_in, &st) != 0) { + gzclose(gz_in); + close(fd_out); + free(tmp_name); + return -1; + } + if (file_size(&st) == 0) { + mode = COPY_UNCOMPRESSED; + } + } + + if (mode == COPY_TO_CACHE) { + gz_out = gzdopen(dup(fd_out), "wb"); + if (!gz_out) { + gzclose(gz_in); + close(fd_out); + free(tmp_name); + return -1; + } + } + + while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { + if (mode == COPY_TO_CACHE) { + ret = gzwrite(gz_out, buf, n); + } else { + ret = write(fd_out, buf, n); + } + if (ret != n) { + gzclose(gz_in); + if (gz_out) { + gzclose(gz_out); + } + close(fd_out); + unlink(tmp_name); + free(tmp_name); + return -1; + } + } + + gzclose(gz_in); + if (gz_out) { + gzclose(gz_out); + } + + /* get perms right on the tmp file */ + mask = umask(0); + fchmod(fd_out, 0666 & ~mask); + umask(mask); + + /* the close can fail on NFS if out of space */ + if (close(fd_out) == -1) { + unlink(tmp_name); + free(tmp_name); + return -1; + } + + unlink(dest); + + if (rename(tmp_name, dest) == -1) { + unlink(tmp_name); + free(tmp_name); + return -1; + } + + free(tmp_name); + + return 0; +} + +/* move a file to the cache, compressing it */ +int move_file(const char *src, const char *dest) { + int ret; + + ret = _copy_file(src, dest, COPY_TO_CACHE); + if (ret != -1) unlink(src); + return ret; +} + +/* copy a file to the cache, compressing it */ +static int copy_file_to_cache(const char *src, const char *dest) { + return _copy_file(src, dest, COPY_TO_CACHE); +} + +/* copy a file from the cache, decompressing it */ +static int copy_file_from_cache(const char *src, const char *dest) { + return _copy_file(src, dest, COPY_FROM_CACHE); +} +#endif /* ENABLE_ZLIB */ + +/* test if a file is zlib compressed */ +int test_if_compressed(const char *filename) { + FILE *f; + + f = fopen(filename, "rb"); + if (!f) { + return 0; + } + + /* test if file starts with 1F8B, which is zlib's + * magic number */ + if ((fgetc(f) != 0x1f) || (fgetc(f) != 0x8b)) { + fclose(f); + return 0; + } + + fclose(f); + return 1; +} + +/* copy file to the cache with error checking taking into account compression and hard linking if desired */ +int commit_to_cache(const char *src, const char *dest, int hardlink) +{ + int ret = -1; + struct stat st; + if (stat(src, &st) == 0) { + unlink(dest); + if (hardlink) { +#ifdef _WIN32 + ret = CreateHardLinkA(dest, src, NULL) ? 0 : -1; +#else + ret = link(src, dest); +#endif + } + if (ret == -1) { + ret = copy_file_to_cache(src, dest); + if (ret == -1) { + cc_log("failed to commit %s -> %s (%s)\n", src, dest, strerror(errno)); + stats_update(STATS_ERROR); + } + } + } else { + cc_log("failed to put %s in the cache (%s)\n", src, strerror(errno)); + stats_update(STATS_ERROR); + } + return ret; +} + +/* copy file out of the cache with error checking taking into account compression and hard linking if desired */ +int retrieve_from_cache(const char *src, const char *dest, int hardlink) +{ + int ret = 0; + + x_utimes(src); + + if (strcmp(dest, "/dev/null") == 0) { + ret = 0; + } else { + unlink(dest); + /* only make a hardlink if the cache file is uncompressed */ + if (hardlink && test_if_compressed(src) == 0) { +#ifdef _WIN32 + ret = CreateHardLinkA(dest, src, NULL) ? 0 : -1; +#else + ret = link(src, dest); +#endif + } else { + ret = copy_file_from_cache(src, dest); + } + } + + /* the cached file might have been deleted by some external process */ + if (ret == -1 && errno == ENOENT) { + cc_log("hashfile missing for %s\n", dest); + stats_update(STATS_MISSING); + return -1; + } + + if (ret == -1) { + ret = copy_file_from_cache(src, dest); + if (ret == -1) { + cc_log("failed to retrieve %s -> %s (%s)\n", src, dest, strerror(errno)); + stats_update(STATS_ERROR); + return -1; + } + } + return ret; +} + +/* make sure a directory exists */ +int create_dir(const char *dir) +{ + struct stat st; + if (stat(dir, &st) == 0) { + if (S_ISDIR(st.st_mode)) { + return 0; + } + errno = ENOTDIR; + return 1; + } +#ifdef _WIN32 + if (mkdir(dir) != 0 && errno != EEXIST) { + return 1; + } +#else + if (mkdir(dir, 0777) != 0 && errno != EEXIST) { + return 1; + } +#endif + return 0; +} + +char const CACHEDIR_TAG[] = + "Signature: 8a477f597d28d172789f06886806bc55\n" + "# This file is a cache directory tag created by ccache.\n" + "# For information about cache directory tags, see:\n" + "# http://www.brynosaurus.com/cachedir/\n"; + +int create_cachedirtag(const char *dir) +{ + char *filename; + struct stat st; + FILE *f; + x_asprintf(&filename, "%s/CACHEDIR.TAG", dir); + if (stat(filename, &st) == 0) { + if (S_ISREG(st.st_mode)) { + goto success; + } + errno = EEXIST; + goto error; + } + f = fopen(filename, "w"); + if (!f) goto error; + if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) { + goto error; + } + if (fclose(f)) goto error; +success: + free(filename); + return 0; +error: + free(filename); + return 1; +} + +/* + this is like asprintf() but dies if the malloc fails + note that we use vsnprintf in a rather poor way to make this more portable +*/ +void x_asprintf(char **ptr, const char *format, ...) +{ + va_list ap; + + *ptr = NULL; + va_start(ap, format); + if (vasprintf(ptr, format, ap) == -1) { + fatal("out of memory in x_asprintf"); + } + va_end(ap); + + if (!ptr) fatal("out of memory in x_asprintf"); +} + +/* + this is like strdup() but dies if the malloc fails +*/ +char *x_strdup(const char *s) +{ + char *ret; + ret = strdup(s); + if (!ret) { + fatal("out of memory in strdup\n"); + } + return ret; +} + +/* + this is like malloc() but dies if the malloc fails +*/ +void *x_malloc(size_t size) +{ + void *ret; + ret = malloc(size); + if (!ret) { + fatal("out of memory in malloc\n"); + } + return ret; +} + +/* + this is like realloc() but dies if the malloc fails +*/ +void *x_realloc(void *ptr, size_t size) +{ + void *p2; +#if 1 + /* Avoid invalid read in memcpy below */ + p2 = realloc(ptr, size); + if (!p2) { + fatal("out of memory in x_realloc"); + } +#else + if (!ptr) return x_malloc(size); + p2 = malloc(size); + if (!p2) { + fatal("out of memory in x_realloc"); + } + if (ptr) { + /* Note invalid read as the memcpy reads beyond the memory allocated by ptr */ + memcpy(p2, ptr, size); + free(ptr); + } +#endif + return p2; +} + + +/* + revsusive directory traversal - used for cleanup + fn() is called on all files/dirs in the tree + */ +void traverse(const char *dir, void (*fn)(const char *, struct stat *)) +{ + DIR *d; + struct dirent *de; + + d = opendir(dir); + if (!d) return; + + while ((de = readdir(d))) { + char *fname; + struct stat st; + + if (strcmp(de->d_name,".") == 0) continue; + if (strcmp(de->d_name,"..") == 0) continue; + + if (strlen(de->d_name) == 0) continue; + + x_asprintf(&fname, "%s/%s", dir, de->d_name); +#ifdef _WIN32 + if (stat(fname, &st)) +#else + if (lstat(fname, &st)) +#endif + { + if (errno != ENOENT) { + perror(fname); + } + free(fname); + continue; + } + + if (S_ISDIR(st.st_mode)) { + traverse(fname, fn); + } + + fn(fname, &st); + free(fname); + } + + closedir(d); +} + + +/* return the base name of a file - caller frees */ +char *str_basename(const char *s) +{ + char *p = strrchr(s, '/'); + if (p) { + s = (p+1); + } + +#ifdef _WIN32 + p = strrchr(s, '\\'); + + if (p) { + s = (p+1); + } +#endif + + return x_strdup(s); +} + +/* return the dir name of a file - caller frees */ +char *dirname(char *s) +{ + char *p; + s = x_strdup(s); + p = strrchr(s, '/'); +#ifdef _WIN32 + p = strrchr(s, '\\'); +#endif + if (p) { + *p = 0; + } + return s; +} + +/* + http://www.ecst.csuchico.edu/~beej/guide/ipc/flock.html + http://cvs.php.net/viewvc.cgi/php-src/win32/flock.c?revision=1.2&view=markup + Should return 0 for success, >0 otherwise + */ +int lock_fd(int fd) +{ +#ifdef _WIN32 +# if 1 + return _locking(fd, _LK_NBLCK, 1); +# else + HANDLE fl = (HANDLE)_get_osfhandle(fd); + OVERLAPPED o; + memset(&o, 0, sizeof(o)); + return (LockFileEx(fl, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &o)) + ? 0 : GetLastError(); +# endif +#else + struct flock fl; + int ret; + + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 1; + fl.l_pid = 0; + + /* not sure why we would be getting a signal here, + but one user claimed it is possible */ + do { + ret = fcntl(fd, F_SETLKW, &fl); + } while (ret == -1 && errno == EINTR); + return ret; +#endif +} + +/* return size on disk of a file */ +size_t file_size(struct stat *st) +{ +#ifdef _WIN32 + return (st->st_size + 1023) & ~1023; +#else + size_t size = st->st_blocks * 512; + if ((size_t)st->st_size > size) { + /* probably a broken stat() call ... */ + size = (st->st_size + 1023) & ~1023; + } + return size; +#endif +} + + +/* a safe open/create for read-write */ +int safe_open(const char *fname) +{ + int fd = open(fname, O_RDWR|O_BINARY); + if (fd == -1 && errno == ENOENT) { + fd = open(fname, O_RDWR|O_CREAT|O_EXCL|O_BINARY, 0666); + if (fd == -1 && errno == EEXIST) { + fd = open(fname, O_RDWR|O_BINARY); + } + } + return fd; +} + +/* display a kilobyte unsigned value in M, k or G */ +void display_size(unsigned v) +{ + if (v > 1024*1024) { + printf("%8.1f Gbytes", v/((double)(1024*1024))); + } else if (v > 1024) { + printf("%8.1f Mbytes", v/((double)(1024))); + } else { + printf("%8u Kbytes", v); + } +} + +/* return a value in multiples of 1024 give a string that can end + in K, M or G +*/ +size_t value_units(const char *s) +{ + char m; + double v = atof(s); + m = s[strlen(s)-1]; + switch (m) { + case 'G': + case 'g': + default: + v *= 1024*1024; + break; + case 'M': + case 'm': + v *= 1024; + break; + case 'K': + case 'k': + v *= 1; + break; + } + return (size_t)v; +} + + +/* + a sane realpath() function, trying to cope with stupid path limits and + a broken API +*/ +char *x_realpath(const char *path) +{ +#ifdef _WIN32 + char namebuf[MAX_PATH]; + DWORD ret; + + ret = GetFullPathNameA(path, sizeof(namebuf), namebuf, NULL); + if (ret == 0 || ret >= sizeof(namebuf)) { + return NULL; + } + + return x_strdup(namebuf); +#else + int maxlen; + char *ret, *p; +#ifdef PATH_MAX + maxlen = PATH_MAX; +#elif defined(MAXPATHLEN) + maxlen = MAXPATHLEN; +#elif defined(_PC_PATH_MAX) + maxlen = pathconf(path, _PC_PATH_MAX); +#endif + if (maxlen < 4096) maxlen = 4096; + + ret = x_malloc(maxlen); + +#if HAVE_REALPATH + p = realpath(path, ret); +#else + /* yes, there are such systems. This replacement relies on + the fact that when we call x_realpath we only care about symlinks */ + { + int len = readlink(path, ret, maxlen-1); + if (len == -1) { + free(ret); + return NULL; + } + ret[len] = 0; + p = ret; + } +#endif + if (p) { + p = x_strdup(p); + free(ret); + return p; + } + free(ret); + return NULL; +#endif +} + +/* a getcwd that will returns an allocated buffer */ +char *gnu_getcwd(void) +{ + unsigned size = 128; + + while (1) { + char *buffer = (char *)x_malloc(size); + if (getcwd(buffer, size) == buffer) { + return buffer; + } + free(buffer); + if (errno != ERANGE) { + return 0; + } + size *= 2; + } +} + +/* create an empty file */ +int create_empty_file(const char *fname) +{ + int fd; + + fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); + if (fd == -1) { + return -1; + } + close(fd); + return 0; +} + +/* + return current users home directory or die +*/ +const char *get_home_directory(void) +{ +#ifdef _WIN32 + static char home_path[MAX_PATH] = {0}; + HRESULT ret; + + /* we already have the path */ + if (home_path[0] != 0) { + return home_path; + } + + /* get the path to "Application Data" folder */ + ret = SHGetFolderPathA(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, home_path); + if (SUCCEEDED(ret)) { + return home_path; + } + + fprintf(stderr, "ccache: Unable to determine home directory\n"); + return NULL; +#else + const char *p = getenv("HOME"); + if (p) { + return p; + } +#ifdef HAVE_GETPWUID + { + struct passwd *pwd = getpwuid(getuid()); + if (pwd) { + return pwd->pw_dir; + } + } +#endif + fatal("Unable to determine home directory"); + return NULL; +#endif +} + +int x_utimes(const char *filename) +{ +#ifdef HAVE_UTIMES + return utimes(filename, NULL); +#else + return utime(filename, NULL); +#endif +} + +#ifdef _WIN32 +/* perror for Win32 API calls, using GetLastError() instead of errno */ +void perror_win32(LPTSTR pszFunction) +{ + LPTSTR pszMessage; + DWORD dwLastError = GetLastError(); + + FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwLastError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&pszMessage, + 0, NULL ); + + fprintf(stderr, "%s: %s\n", pszFunction, pszMessage); + LocalFree(pszMessage); +} +#endif diff --git a/CCache/web/index.html b/CCache/web/index.html new file mode 100644 index 000000000..4af839135 --- /dev/null +++ b/CCache/web/index.html @@ -0,0 +1,158 @@ + + + +ccache + + +

      ccache

      + +ccache is a compiler cache. It acts as a caching pre-processor to +C/C++ compilers, using the -E compiler switch and a hash to detect +when a compilation can be satisfied from cache. This often results in +a 5 to 10 times speedup in common compilations.

      + +The idea came from Erik Thiele wrote the original compilercache program +as a bourne shell script. ccache is a re-implementation of Erik's idea +in C with more features and better performance.

      + +

      Latest release

      + +The latest release is ccache 2.4. + +
        +
      • Added CCACHE_READONLY option +
      • Added CCACHE_TEMPDIR option +
      • fixed handling of hard-linked compilers on AIX +
      • added O_BINARY support, to try and support win32 compiles +
      • show cache directory in stats output +
      • fixed handling of HOME environment variable +
      + +See the manual page for details +on the new options.

      + +You can get this release from the download directory + +

      NOTE! This release changes the hash input slighly, so you will +probably find that you will not get any hits against your existing +cache when you upgrade. + +

      Why bother?

      + +Why bother with a compiler cache? If you ever run "make clean; make" +then you can probably benefit from ccache. It is very common for +developers to do a clean build of a project for a whole host of +reasons, and this throws away all the information from your previous +compiles.

      + +By using ccache you can get exactly the same effect as "make clean; +make" but much faster. It also helps a lot when doing RPM builds, +as RPM can make doing incremental builds tricky.

      + +I put the effort into writing ccache for 2 reasons. The first is the +Samba build farm +(http://build.samba.org/) +which constantly does clean builds of Samba on about 30 machines after each +CVS commit. On some of those machines the build took over an hour. By +using ccache we get the same effect as clean builds but about 6 times +faster.

      + +The second reason is the autobuild system I used to run for +Quantum. That system builds our whole Linux based OS from scratch +after every CVS commit to catch compilation problems quickly. Using +ccache those builds are much faster. + +

      Is it safe?

      + +Yes. The most important aspect of a compiler cache is to always +produce exactly the same output that the real compiler would +produce. The includes providing exactly the same object files and +exactly the same compiler warnings that would be produced if you use +the real compiler. The only way you should be able to tell that you +are using ccache is the speed.

      + +I have coded ccache very carefully to try to provide these guarantees. + +

      Features

      + +
        +
      • keeps statistics on hits/misses +
      • automatic cache size management +
      • can cache compiles that generate warnings +
      • easy installation +
      • very low overhead +
      • uses hard links where possible to avoid copies +
      + +

      Documentation

      + +See the manual page + + +

      Performance

      + +Here are some results for compiling Samba on my Linux laptop. I have +also included the results of using Erik's compilercache program +(version 1.0.10) for comparison.

      + + + + + + +
          ccache  compilercache
      normal 13m 4s 13m 4s
      uncached 13m 15s 15m 41s
      cached 2m 45s 4m 26s
      + +

      How to use it

      + +You can use ccache in two ways. The first is just to prefix your +compile commands with "ccache". For example, you could change the +"CC=gcc" line in your Makefile to be "CC=ccache gcc".

      + +Alternatively, you can create symbolic links from your compilers name +to ccache. This allows you to use ccache without any changes to your +build system. + +

      Download

      + +You can download the latest release from the download directory.

      + +For the bleeding edge, you can fetch ccache via CVS or +rsync. To fetch via cvs use the following command: + +

      +  cvs -d :pserver:cvs@pserver.samba.org:/cvsroot co ccache
+
      + +To fetch via rsync use this command: + +
      +  rsync -Pavz samba.org::ftp/unpacked/ccache .
+
      + +

      Related projects

      + +Here are some related programs you may find interesting + +
        +
      • distcc - a distributed compilation system +
      • cachecc1 - a gcc specific cache +
      • gocache - a cross platform compiler cache +
      +

      + +

      Mailing list

      + +

      A mailing +list is available for discussion of ccache. + + +

      + +Andrew Tridgell
      +bugs@ccache.samba.org +       + + + diff --git a/CHANGES b/CHANGES index 782849c6f..d9426512b 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,488 @@ SWIG (Simplified Wrapper and Interface Generator) See CHANGES.current for current version. +Version 1.3.39 (21 March 2009) +============================== + +2009-03-19: bhy + [Python] Fix the memory leak related to Python 3 unicode and C char* conversion, + which can be shown in the following example before this fix: + + from li_cstring import * + i=0 + while True: + i += 1 + n = str(i)*10 + test3(n) + + This fix affected SWIG_AsCharPtrAndSize() so you cannot call this function with + a null alloc and non-null cptr argument in Python 3, otherwise a runtime error + will be raised. + +2009-03-18: wsfulton + [C#] std::vector wrapper improvements for .NET 2 and also providing the + necessary machinery to use the std::vector wrappers with more advanced features such + as LINQ - the C# proxy class now derives from IEnumerable<>. The default is now to + generate code requiring .NET 2 as a minimum, although the C# code can be compiled + for .NET 1 by defining the SWIG_DOTNET_1 C# preprocessor constant. See the + std_vector.i file for more details. + + *** POTENTIAL INCOMPATIBILITY *** + +2009-03-12: wsfulton + [Ruby] Fix #2676738 SWIG generated symbol name clashes. + +2009-03-01: bhy + [Python] Some fixes for Python 3.0.1 and higher support. In 3.0.1, the C API function + PyObject_Compare is removed, so PyObject_RichCompareBool is used for replacement. + Struct initilization of SwigPyObject and SwigPyObject_as_number changed to reflect + the drop of tp_compare and nb_long. + +2009-03-01: bhy + [Python] Fix SF#2583160. Now the importer in Python shadow wrapper take care of the + case that module already imported at other place. + +2009-02-28: bhy + [Python] Fix SF#2637352. Move struct declaration of SWIG_module in pyinit.swg before + the method calls, since some C compiler don't allow declaration in middle of function + body. + +2009-02-21: wsfulton + [Allegrocl] Fix seg fault wrapping some constant variable (%constant) types. + +2009-02-20: wsfulton + [CFFI] Fix seg faults when for %extend and using statements. + +2009-02-20: wsfulton + Fix SF #2605955: -co option which broke in 1.3.37. + +2009-02-20: wsfulton + New %insert("begin") section added. Also can be used as %begin. This is a new + code section reserved entirely for users and the code within the section is generated + at the top of the C/C++ wrapper file and so provides a means to put custom code + into the wrapper file before anything else that SWIG generates. + +2009-02-17: wsfulton + 'make clean-test-suite' will now run clean on ALL languages. Previously it only + ran the correctly configured languages. This way it is now possible to clean up + properly after running 'make partialcheck-test-suite'. + +2009-02-14: wsfulton + Extend attribute library support for structs/classes and the accessor functions use + pass/return by value semantics. Two new macros are available and usage is identical + to %attribute. These are %attributeval for structs/classes and %attributestring for + string classes, like std::string. See attribute.swg for more details. + +2009-02-13: wsfulton + Add support for %extend and memberin typemaps. Previously the memberin typemaps were + ignored for member variables within a %extend block. + +2009-02-12: wsfulton + Remove unnecessary temporary variable when wrapping return values that are references. + Example of generated code for wrapping: + + struct XYZ { + std::string& refReturn(); + }; + + used to be: + + std::string *result = 0 ; + ... + { + std::string &_result_ref = (arg1)->refReturn(); + result = (std::string *) &_result_ref; + } + + Now it is: + + std::string *result = 0 ; + ... + result = (std::string *) &(arg1)->refReturn(); + +2009-02-08: bhy + Change the SIZE mapped by %pybuffer_mutable_binary and %pybuffer_binary in pybuffer.i from + the length of the buffer to the number of items in the buffer. + +2009-02-08: wsfulton + Fix %feature not working for conversion operators, reported by Matt Sprague, for example: + %feature("cs:methodmodifiers") operator bool "protected"; + +2009-02-07: wsfulton + [MzScheme] Apply #2081967 configure changes for examples to build with recent PLT versions. + Also fixes Makefile errors building SWIG executable when mzscheme package is installed + (version 3.72 approx and later). + +2009-02-04: talby + [Perl] Fix SF#2564192 reported by David Kolovratnk. + SWIG_AsCharPtrAndSize() now handles "get" magic. + +Version 1.3.38 (31 January 2009) +================================ + +2009-01-31: bhy + [Python] Fix SF#2552488 reported by Gaetan Lehmann. Now %pythonprepend + and %pythonappend have correct indentation. + +2009-01-31: bhy + [Python] Fix SF#2552048 reported by Gaetan Lehmann. The parameter list + of static member function in generated proxy code should not have the + 'self' parameter. + +2009-01-29: wsfulton + Fix regression introduced in 1.3.37 where the default output directory + for target language specific files (in the absence of -outdir) was no + longer the same directory as the generated c/c++ file. + +2009-01-28: wsfulton + [Java, C#] Fix proxy class not being used when the global scope operator + was used for parameters passed by value. Reported by David Piepgrass. + +2009-01-15: wsfulton + [Perl] Fix seg fault when running with -v option, reported by John Ky. + +Version 1.3.37 (13 January 2009) +================================ + +2009-01-13: mgossage + [Lua] Added contract support for requiring that unsigned numbers are >=0 + Rewrote much of Examples/Lua/embed3. + Added a lot to the Lua documentation. + +2009-01-13: wsfulton + Fix compilation error when using directors on protected virtual overloaded + methods reported by Sam Hendley. + +2009-01-12: drjoe + [R] Fixed handling of integer arrays + +2009-01-10: drjoe + [R] Fix integer handling in r to deal correctly with signed + and unsigned issues + +2009-01-10: wsfulton + Patch #1992756 from Colin McDonald - %contract not working for classes + in namespace + +2009-01-05: olly + Mark SWIGPERL5, SWIGPHP5, and SWIGTCL8 as deprecated in the source + code and remove documentation of them. + +2008-12-30: wsfulton + Bug #2430756. All the languages now define a macro in the generated C/C++ + wrapper file indicating which language is being wrapped. The macro name is the + same as those defined when SWIG is run, eg SWIGJAVA, SWIGOCTAVE, SWIGCSHARP etc + and are listed in the "Conditional Compilation" section in the documentation. + +2008-12-23: wsfulton + [Java] Fix #2153773 - %nojavaexception was clearing the exception feature + instead of disabling it. Clearing checked Java exceptions also didn't work. + The new %clearjavaexception can be used for clearing the exception feature. + +2008-12-22: wsfulton + Fix #2432801 - Make SwigValueWrapper exception safe for when copy constructors + throw exceptions. + +2008-12-21: wsfulton + Apply patch #2440046 which fixes possible seg faults for member and global + variable char arrays when the strings are larger than the string array size. + +2008-12-20: wsfulton + The ccache compiler cache has been adapted to work with SWIG and + named ccache-swig. It now works with C/C++ compilers as well as SWIG + and can result in impressive speedups when used to recompile unchanged + code with either a C/C++ compiler or SWIG. Documentation is in CCache.html + or the installed ccache-swig man page. + +2008-12-12: wsfulton + Apply patch from Kalyanov Dmitry which fixes parsing of nested structs + containing comments. + +2008-12-12: wsfulton + Fix error message in some nested struct and %inline parsing error situations + such as unterminated strings and comments. + +2008-12-07: olly + [PHP] Fix warnings when compiling generated wrapper with GCC 4.3. + +2008-12-06: wsfulton + [PHP] Deprecate %pragma(php4). Please use %pragma(php) instead. + The following two warnings have been renamed: + WARN_PHP4_MULTIPLE_INHERITANCE -> WARN_PHP_MULTIPLE_INHERITANCE + WARN_PHP4_UNKNOWN_PRAGMA -> WARN_PHP_UNKNOWN_PRAGMA + + *** POTENTIAL INCOMPATIBILITY *** + +2008-12-04: bhy + [Python] Applied patch SF#2158938: all the SWIG symbol names started with Py + are changed, since they are inappropriate and discouraged in Python + documentation (from http://www.python.org/doc/2.5.2/api/includes.html): + + "All user visible names defined by Python.h (except those defined by + the included standard headers) have one of the prefixes "Py" or "_Py". + Names beginning with "_Py" are for internal use by the Python implementation + and should not be used by extension writers. Structure member names do + not have a reserved prefix. + + Important: user code should never define names that begin with "Py" or "_Py". + This confuses the reader, and jeopardizes the portability of the user + code to future Python versions, which may define additional names beginning + with one of these prefixes." + + Here is a brief list of what changed: + + PySwig* -> SwigPy* + PyObject_ptr -> SwigPtr_PyObject + PyObject_var -> SwigVar_PyObject + PySequence_Base, PySequence_Cont, PySequence_Ref -> + SwigPySequence_Base, SwigPySequence_Cont, SwigPySequence_Ref + PyMap* -> SwigPyMap* + + We provided a pyname_compat.i for backward compatibility. Users whose code having + these symbols and do not want to change it could simply include this file + at front of your code. A better solution is to run the converting tool on + your code, which has been put in SWIG's SVN trunk (Tools/pyname_patch.py) and + you can download it here: + https://swig.svn.sourceforge.net/svnroot/swig/trunk/Tools/pyname_patch.py + + *** POTENTIAL INCOMPATIBILITY *** + +2008-12-02: wsfulton + [Python] Apply patch #2143727 from Serge Monkewitz to fix importing base classes + when the package option is specified in %module and that module is %import'ed. + +2008-11-28: wsfulton + [UTL] Fix #2080497. Some incorrect acceptance of types in the STL, eg a double * element + passed into a vector constructor would be accepted, but the ensuing behaviour + was undefined. Now the type conversion correctly raises an exception. + +2008-11-24: wsfulton + Add -outcurrentdir option. This sets the default output directory to the current + directory instead of the path specified by the input file. This option enables + behaviour similar to c/c++ compilers. Note that this controls the output directory, + but only in the absence of the -o and/or -outdir options. + +2008-11-23: wsfulton + [ruby] Apply patch #2263850 to fix ruby/file.i ... rubyio.h filename change in + ruby 1.9. + +2008-11-23: wsfulton + Apply patch #2319790 from Johan Hake to fix shared_ptr usage in std::tr1 namespace. + +2008-11-21: wsfulton + The use of the include path to find the input file is now deprecated. + This makes the behaviour of SWIG the same as C/C++ compilers in preparation + for use with ccache. + +2008-11-16: wsfulton + Fix -nopreprocess option to: + - correctly report file names in warning and error messages. + - use the original input filename that created the preprocessed output when + determining the C++ wrapper file name (in the absence of -o). Previously + the name of the input file containing the preprocessed output was used. + +2008-11-11: wsfulton + [Java] Add patch #2152691 from MATSUURA Takanori which fixes compiles using the + Intel compiler + +2008-11-01: wsfulton + Add patch #2128249 from Anatoly Techtonik which corrects the C/C++ proxy + class being reported for Python docstrings when %rename is used. + +2008-11-01: wsfulton + Add the strip encoder patch from Anatoly Techtonik #2130016. This enables an + easy way to rename symbols by stripping a commonly used prefix in all the + function/struct names. It works in the same way as the other encoders, such as + title, lower, command etc outlined in CHANGES file dated 12/30/2005. Example + below will rename wxAnotherWidget to AnotherWidget and wxDoSomething to + DoSomething: + + %rename("%(strip:[wx])s") ""; + + struct wxAnotherWidget { + void wxDoSomething(); + }; + +2008-09-26: mutandiz + [allegrocl] + Lots of test-suite work. + - Fix ordering of wrapper output and %{ %} header output. + - Fix declarations of local vars in C wrappers. + - Fix declaration of defined constants in C wrappers. + - Fix declaration of EnumValues in C wrappers. + - add some const typemaps to allegrocl.swg + - add rename for operator bool() overloads. + +2008-09-25: olly + [PHP5] Fill in typemaps for SWIGTYPE and void * (SF#2095186). + +2008-09-22: mutandiz (Mikel Bancroft) + [allegrocl] + - Support wrapping of types whose definitions are not seen by + SWIG. They are treated as forward-referenced classes and if a + definition is not seen are treated as (* :void). + - Don't wrap the contents of unnamed namespaces. + - More code cleanup. Removed some extraneous warnings. + - start work on having the allegrocl mod pass the cpp test-suite. + +2008-09-19: olly + [PHP5] Add typemaps for long long and unsigned long long. + +2008-09-18: wsfulton + [C#] Added C# array typemaps provided by Antti Karanta. + The arrays provide a way to use MarshalAs(UnmanagedType.LPArray) + and pinning the array using 'fixed'. See arrays_csharp.i library file + for details. + +2008-09-18: wsfulton + Document the optional module attribute in the %import directive, + see Modules.html. Add a warning for Python wrappers when the + module name for an imported base class is missing, requiring the + module attribute to be added to %import, eg + + %import(module="FooModule") foo.h + +2008-09-18: olly + [PHP5] Change the default input typemap for char * to turn PHP + Null into C NULL (previously it was converted to an empty string). + The new behaviour is consistent with how the corresponding output + typemap works (SF#2025719). + + If you want to keep the old behaviour, add the following typemap + to your interface file (PHP's convert_to_string_ex() function does + the converting from PHP Null to an empty string): + + %typemap(in) char * { + convert_to_string_ex($input); + $1 = Z_STRVAL_PP($input); + } + +2008-09-18: olly + [PHP5] Fix extra code added to proxy class constructors in the case + where the only constructor takes no arguments. + +2008-09-18: olly + [PHP5] Fix wrapping of a renamed enumerated value of an enum class + member (SF#2095273). + +2008-09-17: mutandiz (Mikel Bancroft) + [allegrocl] + - Fix how forward reference typedefs are handled, so as not to conflict + with other legit typedefs. + - Don't (for now) perform an ffitype typemap lookup when trying to + when calling compose_foreign_type(). This is actually a useful thing + to do in certain cases, the test cases for which I can't currently + locate :/. It's breaking some wrapping behavior that is more commonly + seen, however. I'll readd in a more appropriate way when I can + recreate the needed test case, or a user complains (which means + they probably have a test case). + - document the -isolate command-line arg in the 'swig -help' output. + It was in the html docs, but not there. + - small amount of code cleanup, removed some unused code. + - some minor aesthetic changes. + +2008-09-12: bhy + [Python] Python 3.0 support branch merged into SWIG trunk. Thanks to + Google Summer of Code 2008 for supporting this project! By default + SWIG will generate interface files compatible with both Python 2.x + and 3.0. And there's also some Python 3 new features that can be + enabled by passing a "-py3" command line option to SWIG. These + features are: + + - Function annotation support + Also, the parameter list of proxy function will be generated, + even without the "-py3" option. However, the parameter list + will fallback to *args if the function (or method) is overloaded. + - Buffer interface support + - Abstract base class support + + For details of Python 3 support and these features, please see the + "Python 3 Support" section in the "SWIG and Python" chapter of the SWIG + documentation. + + The "-apply" command line option and support of generating codes + using apply() is removed. Since this is only required by very old + Python. + + This merge also patched SWIG's parser to solve a bug. By this patch, + SWIG features able to be correctly applied on C++ conversion operator, + such like this: + + %feature("shadow") *::operator bool %{ ... %} + +2008-09-02: richardb + [Python] Commit patch #2089149: Director exception handling mangles + returned exception. Exceptions raised by Python code in directors + are now passed through to the caller without change. Also, remove + the ": " prefix which used to be added to other director exceptions + (eg, those due to incorrect return types). + +2008-09-02: wsfulton + [Python] Commit patch #1988296 GCItem multiple module linking issue when using + directors. + +2008-09-02: wsfulton + [C#] Support for 'using' and 'fixed' blocks in the 'csin' typemap is now + possible through the use of the pre attribute and the new terminator attribute, eg + + %typemap(csin, + pre=" using (CDate temp$csinput = new CDate($csinput)) {", + terminator=" } // terminate temp$csinput using block", + ) const CDate & + "$csclassname.getCPtr(temp$csinput)" + + See CSharp.html for more info. + +2008-09-01: wsfulton + [CFFI] Commit patch #2079381 submitted by Boris Smilga - constant exprs put into + no-eval context in DEFCENUM + +2008-08-02: wuzzeb + [Chicken,Allegro] Commit Patch 2019314 + Fixes a build error in chicken, and several build errors and other errors + in Allegro CL + +2008-07-19: wsfulton + Fix building of Tcl examples/test-suite on Mac OSX reported by Gideon Simpson. + +2008-07-17: wsfulton + Fix SF #2019156 Configuring with --without-octave or --without-alllang + did not disable octave. + +2008-07-14: wsfulton + [Java, C#] Fix director typemaps for pointers so that NULL pointers are correctly + marshalled to C#/Java null in director methods. + +2008-07-04: olly + [PHP] For std_vector.i and std_map.i, rename empty() to is_empty() + since "empty" is a PHP reserved word. Based on patch from Mark Klein + in SF#1943417. + +2008-07-04: olly + [PHP] The deprecated command line option "-make" has been removed. + Searches on Google codesearch suggest that nobody is using it now + anyway. + +2008-07-04: olly + [PHP] The SWIG cdata.i library module is now supported. + +2008-07-03: olly + [PHP] The deprecated command line option "-phpfull" has been + removed. We recommend building your extension as a dynamically + loadable module. + +2008-07-02: olly + [PHP4] Support for PHP4 has been removed. The PHP developers are + no longer making new PHP4 releases, and won't even be providing + patches for critical security issues after 2008-08-08. + +2008-07-02: olly + [Python] Import the C extension differently for Python 2.6 and + later so that an implicit relative import doesn't produce a + deprecation warning for 2.6 and a failure for 2.7 and later. + Patch from Richard Boulton in SF#2008229, plus follow-up patches + from Richard and Haoyu Bai. + Version 1.3.36 (24 June 2008) ============================= @@ -477,7 +959,7 @@ Version 1.3.34 (27 February 2008) }; Version 1.3.33 (November 23, 2007) -================================= +================================== 11/21/2007: mikel [allegrocl] omit private slot type info in the classes/types @@ -1409,7 +1891,7 @@ Version 1.3.31 (November 20, 2006) [lua] update to typemap for object by value, to make it c89 compliant Version 1.3.30 (November 13, 2006) -================================= +================================== 11/12/2006: wsfulton [java] Remove DetachCurrentThread patch from 08/11/2006 - it causes segfaults @@ -5732,7 +6214,7 @@ Version 1.3.24 (December 14, 2004) compile with no errors, java shows some problems. Version 1.3.23 (November 11, 2004) -================================= +================================== 11/05/2004: wsfulton Patch #982753 from Fabrice Salvaire: Adds dependencies generation for @@ -7983,7 +8465,8 @@ Version 1.3.22 (September 4, 2004) exception instead. Version 1.3.21 (January 11, 2004) -================================== +================================= + 01/10/2004: cheetah (William Fulton) The output format for both warnings and errors can be selected for integration with your favourite IDE/editor. Editors and IDEs can usually @@ -9757,6 +10240,7 @@ Version 1.3.20 (December 17, 2003) Version 1.3.19 (March 28, 2003) =============================== + 03/28/2003: beazley Variety of minor bug fixes to the 1.3.18 release including: @@ -10343,6 +10827,7 @@ Version 1.3.18 (March 23, 2003) Version 1.3.17 (November 22, 2002) ================================== + 11/19/2002: beazley Fixed [ 613922 ] preprocessor errors with HAVE_LONG_LONG. @@ -10698,6 +11183,7 @@ Version 1.3.16 (October 14, 2002) Version 1.3.15 (September 9, 2002) ================================== + 09/09/2002: beazley Fixed nasty runtime type checking bug with subtypes and inheritance and templates. @@ -12390,6 +12876,7 @@ Version 1.3.14 (August 12, 2002) Version 1.3.13 (June 17, 2002) ============================== + 06/16/2002: beazley Fixed a bug with __FILE__ expansion in the preprocessor. On Windows, the backslash (\) is now converted to (\\) in the string literal @@ -15521,6 +16008,7 @@ Version 1.3.10 (December 10, 2001) Version 1.3.9 (September 25, 2001) ================================== + 9/25/2001: beazley Fixed parsing problem with type declarations like 'char ** const'. SWIG parsed this correctly, but the @@ -15533,6 +16021,7 @@ Version 1.3.9 (September 25, 2001) Version 1.3.8 (September 23, 2001) ================================== + 9/23/2001: beazley Included improved distutils setup.py file in the Tools directory (look for the setup.py.tmpl file). Contributed by @@ -16905,7 +17394,7 @@ Version 1.3 Alpha 5 and function bodies. Preprocessor bug. Version 1.3 Alpha 4 (September 4, 2000) -====================================== +======================================= 9/3/00 : ttn Added instructions for maintainers in Examples/README on how @@ -17991,6 +18480,7 @@ Version 1.3 Alpha 1 (February 11, 2000) Version 1.1 Patch 5 (February 5, 1998) ====================================== + 2/4/98 : Fixed a bug in the configure script when different package locations are specified (--with-tclincl, etc...). @@ -18243,6 +18733,7 @@ Version 1.1 Patch 3 (November 24, 1997) Version 1.1 Patch 2 (September 4, 1997) ======================================= + 9/4/97 : Fixed problem with handling of virtual functions that was introduced by some changes in the C++ module. @@ -19378,7 +19869,7 @@ This release should fix most, if not all, of those problems. it generated alot of unnecessary code). Version 1.1 Beta3 (January 9, 1997) -==================================== +=================================== Note : A *huge* number of changes related to ongoing modifications. @@ -19501,6 +19992,7 @@ Version 1.1 Beta1 (October 30, 1996) Version 1.0 Final (August 31, 1996) =================================== + 1. Fixed minor bug in C++ module 2. Fixed minor bug in pointer type-checker when using @@ -19584,7 +20076,7 @@ number of immediate problems : 3. A few minor fixes were made in the Makefile Version 1.0 Beta 3 (June 14, 1996) -=================================== +================================== There are lots of changes in this release : @@ -19674,6 +20166,7 @@ let me know. Version 1.0 Beta 2 (April 26, 1996) =================================== + This release is identical to Beta1 except a few minor bugs are fixed and the SWIG library has been updated to work with Tcl 7.5/Tk 4.1. A tcl7.5 examples directory is now included. @@ -19688,6 +20181,7 @@ A tcl7.5 examples directory is now included. Version 1.0 Beta 1 (April 10, 1996). ===================================== + This is the first "semi-official" release of SWIG. It has a number of substantial improvements over the Alpha release. These notes are in no particular order--hope I remembered everything.... diff --git a/CHANGES.current b/CHANGES.current index ef3fcca54..fcf35a6b5 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -1,3 +1,18 @@ -Version 1.3.36 (in progress) -============================= +Version 1.3.40 (in progress) +============================ +2009-04-09: wsfulton + Fix #2746858 - C macro expression using floating point numbers + +2009-03-30: olly + [PHP] The default out typemap for char[ANY] now returns the string up to a + zero byte, or the end of the array if there is no zero byte. This + is the same as Python does, and seems more generally useful than + the previous behaviour of returning the whole contents of the array + including any zero bytes. If you want the old behaviour, you can provide + your own typemap to do this: + + %typemap(out) char [ANY] + %{ + RETVAL_STRINGL($1, $1_dim0, 1); + %} diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html old mode 100755 new mode 100644 index 8981f52b5..cc950db7c --- a/Doc/Manual/Allegrocl.html +++ b/Doc/Manual/Allegrocl.html @@ -8,7 +8,7 @@ -

      16 SWIG and Allegro Common Lisp

      +

      17 SWIG and Allegro Common Lisp

        @@ -135,10 +135,10 @@ be unhappy to see some enterprising folk use this work to add to it.

        -

        16.1 Basics

        +

        17.1 Basics

        -

        16.1.1 Running Swig

        +

        17.1.1 Running Swig

        @@ -360,7 +360,7 @@ need to link in the Allegro shared library. The library you create from the C++ wrapper will be what you then load into Allegro CL.

        -

        16.1.2 Command Line Options

        +

        17.1.2 Command Line Options

        @@ -396,7 +396,7 @@ See Section 17.5 Identifier converter functions for more details.

        -

        16.1.3 Inserting user code into generated files

        +

        17.1.3 Inserting user code into generated files

        @@ -411,7 +411,7 @@ using the SWIG %insert(section) %{ ...code... %} directive: 

         %module example
 
-%insert("runtime") %{
+%{
 #include "header.h"
 %}
 
@@ -432,11 +432,11 @@ generated lisp interface file

      Note that the block %{ ... %} is effectively a shortcut for -%insert("runtime") %{ ... %}. +%insert("header") %{ ... %}.

      -

      16.2 Wrapping Overview

      +

      17.2 Wrapping Overview

      @@ -446,7 +446,7 @@ New users to SWIG are encouraged to read interested in generating an interface to C++.

      -

      16.2.1 Function Wrapping

      +

      17.2.1 Function Wrapping

      @@ -499,7 +499,7 @@ interested in generating an interface to C++.

      -

      16.2.2 Foreign Wrappers

      +

      17.2.2 Foreign Wrappers

      @@ -512,7 +512,7 @@ interested in generating an interface to C++. typemap.

      -

      16.2.3 FFI Wrappers

      +

      17.2.3 FFI Wrappers

      @@ -593,7 +593,7 @@ char *xxx(); ff:def-foreign-call's.

      -

      16.2.4 Non-overloaded Defuns

      +

      17.2.4 Non-overloaded Defuns

      @@ -606,7 +606,7 @@ char *xxx(); this function can be manipulated via the lout typemap.

      -

      16.2.5 Overloaded Defuns

      +

      17.2.5 Overloaded Defuns

      @@ -622,7 +622,7 @@ char *xxx(); can be manipulated via the lout typemap.

      -

      16.2.6 What about constant and variable access?

      +

      17.2.6 What about constant and variable access?

      @@ -635,7 +635,7 @@ char *xxx(); into the foreign module.

      -

      16.2.7 Object Wrapping

      +

      17.2.7 Object Wrapping

      @@ -657,7 +657,7 @@ char *xxx(); foreign function interface.

      -

      16.3 Wrapping Details

      +

      17.3 Wrapping Details

      @@ -665,7 +665,7 @@ char *xxx(); translated into lisp.

      -

      16.3.1 Namespaces

      +

      17.3.1 Namespaces

      @@ -742,7 +742,7 @@ namespace car { function such as (car '(1 2 3).

      -

      16.3.2 Constants

      +

      17.3.2 Constants

      @@ -803,7 +803,7 @@ namespace car { not use the -nocwrap command-line option.

      -

      16.3.3 Variables

      +

      17.3.3 Variables

      @@ -881,7 +881,7 @@ globalvar> (globalvar.nnn::glob_float) -

      16.3.4 Enumerations

      +

      17.3.4 Enumerations

      @@ -957,7 +957,7 @@ EXPORT const int ACL_ENUM___FOO3__SWIG_0 = FOO3; -

      16.3.5 Arrays

      +

      17.3.5 Arrays

      @@ -1105,10 +1105,10 @@ namespace BAR { -

      16.3.6 Classes and Structs and Unions (oh my!)

      +

      17.3.6 Classes and Structs and Unions (oh my!)

      -

      16.3.6.1 CLOS wrapping of

      +

      17.3.6.1 CLOS wrapping of

      @@ -1123,7 +1123,7 @@ namespace BAR { integer values.

      -

      16.3.6.2 CLOS Inheritance

      +

      17.3.6.2 CLOS Inheritance

      @@ -1136,7 +1136,7 @@ namespace BAR { parameter.

      -

      16.3.6.3 Member fields and functions

      +

      17.3.6.3 Member fields and functions

      @@ -1152,7 +1152,7 @@ namespace BAR { the interface does nothing for friend directives,

      -

      16.3.6.4 Why not directly access C++ classes using foreign types?

      +

      17.3.6.4 Why not directly access C++ classes using foreign types?

      @@ -1170,11 +1170,11 @@ namespace BAR { use the more robust wrapper functions.

      -

      16.3.7 Templates

      +

      17.3.7 Templates

      -

      16.3.7.1 Generating wrapper code for templates

      +

      17.3.7.1 Generating wrapper code for templates

      @@ -1187,7 +1187,7 @@ namespace BAR { directive.

      -

      16.3.7.2 Implicit Template instantiation

      +

      17.3.7.2 Implicit Template instantiation

      @@ -1197,7 +1197,7 @@ namespace BAR { class schema.

      -

      16.3.8 Typedef, Templates, and Synonym Types

      +

      17.3.8 Typedef, Templates, and Synonym Types

      @@ -1277,7 +1277,7 @@ synonym> -

      16.3.8.1 Choosing a primary type

      +

      17.3.8.1 Choosing a primary type

      @@ -1298,7 +1298,7 @@ synonym>

    -

    16.3.9 Function overloading/Parameter defaulting

    +

    17.3.9 Function overloading/Parameter defaulting

    @@ -1461,7 +1461,7 @@ overload> -

    16.3.10 Operator wrapping and Operator overloading

    +

    17.3.10 Operator wrapping and Operator overloading

    @@ -1607,7 +1607,7 @@ opoverload> -

    16.3.11 Varargs

    +

    17.3.11 Varargs

    @@ -1628,7 +1628,7 @@ opoverload> with other ways such functions can be wrapped.

    -

    16.3.12 C++ Exceptions

    +

    17.3.12 C++ Exceptions

    @@ -1640,7 +1640,7 @@ opoverload> implemented.

    -

    16.3.13 Pass by value, pass by reference

    +

    17.3.13 Pass by value, pass by reference

    @@ -1652,7 +1652,7 @@ opoverload> newly defined types.

    -

    16.4 Typemaps

    +

    17.4 Typemaps

    @@ -1663,7 +1663,7 @@ opoverload> on Typemaps for more information.

    -

    16.4.1 Code Generation in the C++ Wrapper

    +

    17.4.1 Code Generation in the C++ Wrapper

    @@ -1693,7 +1693,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.1.1 IN Typemap

    +

    17.4.1.1 IN Typemap

    @@ -1728,7 +1728,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.1.2 OUT Typemap

    +

    17.4.1.2 OUT Typemap

    @@ -1752,7 +1752,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.1.3 CTYPE Typemap

    +

    17.4.1.3 CTYPE Typemap

    @@ -1784,7 +1784,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) these common typemaps here.

    -

    16.4.2 Code generation in Lisp wrappers

    +

    17.4.2 Code generation in Lisp wrappers

    @@ -1803,7 +1803,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) 16.3.1 Namespaces for details.

    -

    16.4.2.1 LIN Typemap

    +

    17.4.2.1 LIN Typemap

    @@ -1846,7 +1846,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.2.2 LOUT Typemap

    +

    17.4.2.2 LOUT Typemap

    @@ -1889,7 +1889,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.2.3 FFITYPE Typemap

    +

    17.4.2.3 FFITYPE Typemap

    @@ -1939,7 +1939,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.2.4 LISPTYPE Typemap

    +

    17.4.2.4 LISPTYPE Typemap

    @@ -1959,7 +1959,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.2.5 LISPCLASS Typemap

    +

    17.4.2.5 LISPCLASS Typemap

    @@ -1983,7 +1983,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.4.3 Modifying SWIG behavior using typemaps

    +

    17.4.3 Modifying SWIG behavior using typemaps

    @@ -2017,10 +2017,10 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    16.5 Identifier Converter functions

    +

    17.5 Identifier Converter functions

    -

    16.5.1 Creating symbols in the lisp environment

    +

    17.5.1 Creating symbols in the lisp environment

    @@ -2041,11 +2041,11 @@ return-val wrapper-name(parm0, parm1, ..., parmN) of arguments.

    -

    16.5.2 Existing identifier-converter functions

    +

    17.5.2 Existing identifier-converter functions

    Two basic identifier routines have been defined. -

    16.5.2.1 identifier-convert-null

    +

    17.5.2.1 identifier-convert-null

    @@ -2054,7 +2054,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) strings, from which a symbol will be created.

    -

    16.5.2.2 identifier-convert-lispify

    +

    17.5.2.2 identifier-convert-lispify

    @@ -2063,7 +2063,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) same symbol transformations.

    -

    16.5.2.3 Default identifier to symbol conversions

    +

    17.5.2.3 Default identifier to symbol conversions

    @@ -2072,7 +2072,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) default naming conventions.

    -

    16.5.3 Defining your own identifier-converter

    +

    17.5.3 Defining your own identifier-converter

    @@ -2128,7 +2128,7 @@ indicating the number of arguments passed to the routine indicated by this identifier.

    -

    16.5.4 Instructing SWIG to use a particular identifier-converter

    +

    17.5.4 Instructing SWIG to use a particular identifier-converter

    diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html index 97cb75409..81c8a232b 100644 --- a/Doc/Manual/CSharp.html +++ b/Doc/Manual/CSharp.html @@ -5,12 +5,18 @@ -

    17 SWIG and C#

    +

    18 SWIG and C#

    • Introduction
    • Differences to the Java module +
    • C# Arrays +
    • C# Exceptions
      • C# exception example using "check" typemap @@ -39,7 +45,7 @@ -

        17.1 Introduction

        +

        18.1 Introduction

        @@ -59,7 +65,7 @@ The Microsoft Developer Network (MSDN) h Monodoc, available from the Mono project, has a very useful section titled Interop with native libraries.

        -

        17.2 Differences to the Java module

        +

        18.2 Differences to the Java module

        @@ -201,7 +207,12 @@ $jnicall -> $imcall

      • -Unlike the "javain" typemap, the "csin" typemap does not support the 'pgcpp' attribute as the C# module does not have a premature garbage collection prevention parameter. The "csin" typemap supports an additional optional attribute called 'cshin'. It should contain the parameter type and name whenever a constructor helper function is generated due to the 'pre' or 'post' attributes. Note that 'pre', 'post' and 'cshin' attributes are not used for marshalling the property set. Please see the Date marshalling example and Date marshalling of properties example for further understanding. +Unlike the "javain" typemap, the "csin" typemap does not support the 'pgcpp' attribute as the C# module does not have a premature garbage collection prevention parameter. +The "csin" typemap supports additional optional attributes called 'cshin' and 'terminator'. +The 'cshin' attribute should contain the parameter type and name whenever a constructor helper function is generated due to the 'pre' or 'post' attributes. +The 'terminator' attribute normally just contains a closing brace for when the 'pre' attribute contains an opening brace, such as when a C# using or fixed block is started. +Note that 'pre', 'post', 'terminator' and 'cshin' attributes are not used for marshalling the property set. +Please see the Date marshalling example and Date marshalling of properties example for further understanding of these "csin" applicable attributes.

        • @@ -397,7 +408,275 @@ Windows users can also get the examples working using a Cygwin or MinGW environment for automatic configuration of the example makefiles. Any one of the three C# compilers (Portable.NET, Mono or Microsoft) can be detected from within a Cygwin or Mingw environment if installed in your path. -

        17.3 C# Exceptions

        +

        18.3 C# Arrays

        + + +

        +There are various ways to pass arrays from C# to C/C++. +The default wrapping treats arrays as pointers and as such simple type wrapper classes are generated, +eg SWIGTYPE_p_int when wrapping the C type int [] or int *. +This gives a rather restricted use of the underlying unmanaged code and the most practical way to use arrays is to enhance or customise +with one of the following three approaches; namely the SWIG C arrays library, P/Invoke default array marshalling or +pinned arrays. +

        + +

        18.3.1 The SWIG C arrays library

        + + +

        +The C arrays library keeps all the array memory in the unmanaged layer. +The library is available to all language modules and is documented in the carrays.i library section. +Please refer to this section for details, but for convenience, the C# usage for the two examples outlined there is shown below. +

        + +

        +For the %array_functions example, the equivalent usage would be: +

        + +
        +
        +SWIGTYPE_p_double a = example.new_doubleArray(10);  // Create an array
+for (int i=0; i<10; i++)
+  example.doubleArray_setitem(a,i,2*i);             // Set a value
+example.print_array(a);                             // Pass to C
+example.delete_doubleArray(a);                      // Destroy array
+
        +
        + +

        +and for the %array_class example, the equivalent usage would be: +

        + +
        +
        +doubleArray c = new doubleArray(10);    // Create double[10]
+for (int i=0; i<10; i++)
+  c.setitem(i, 2*i);                    // Assign values
+example.print_array(c.cast());          // Pass to C
+
        +
        + + +

        18.3.2 Managed arrays using P/Invoke default array marshalling

        + + +

        +In the P/Invoke default marshalling scheme, one needs to designate whether the invoked function will treat a managed +array parameter as input, output, or both. When the function is invoked, the CLR allocates a separate chunk of memory as big as the given managed array, +which is automatically released at the end of the function call. If the array parameter is marked as being input, the content of the managed array is copied +into this buffer when the call is made. Correspondingly, if the array parameter is marked as being output, the contents of the reserved buffer are copied +back into the managed array after the call returns. A pointer to to this buffer +is passed to the native function. +

        + +

        +The reason for allocating a separate buffer is to leave the CLR free to relocate the managed array object +during garbage collection. If the overhead caused by the copying is causing a significant performance penalty, consider pinning the managed array and +passing a direct reference as described in the next section. +

        + +

        +For more information on the subject, see the +Default Marshaling for Arrays article +on MSDN. +

        + + +

        +The P/Invoke default marshalling is supported by the arrays_csharp.i library via the INPUT, OUTPUT and INOUT typemaps. +Let's look at some example usage. Consider the following C function: +

        +
        +
        +void myArrayCopy(int *sourceArray, int *targetArray, int nitems);
+
        +
        + +

        +We can now instruct SWIG to use the default marshalling typemaps by +

        + +
        +
        +%include "arrays_csharp.i"
+
+%apply int INPUT[]  {int *sourceArray}
+%apply int OUTPUT[] {int *targetArray}
+
        +
        + +

        +As a result, we get the following method in the module class: +

        + +
        +
        +public static void myArrayCopy(int[] sourceArray, int[] targetArray, int nitems) {
+    examplePINVOKE.myArrayCopy(sourceArray, targetArray, nitems);
+}
+
        +
        + +

        +If we look beneath the surface at the corresponding intermediary class code, we see +that SWIG has generated code that uses attributes +(from the System.Runtime.InteropServices namespace) to tell the CLR to use default +marshalling for the arrays: +

        + +
        +
        +[DllImport("example", EntryPoint="CSharp_myArrayCopy")]
+public static extern void myArrayCopy([In, MarshalAs(UnmanagedType.LPArray)]int[] jarg1, 
+                                      [Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2, int jarg3);
+
        +
        + +

        +As an example of passing an inout array (i.e. the target function will both read from and +write to the array), consider this C function that swaps a given number of elements +in the given arrays: +

        + +
        +
        +void myArraySwap(int *array1, int *array2, int nitems);
+
        +
        + +

        +Now, we can instruct SWIG to wrap this by +

        + +
        +
        +%include "arrays_csharp.i"
+
+%apply int INOUT[] {int *array1}
+%apply int INOUT[] {int *array2}
+
        +
        + +

        +This results in the module class method +

        + +
        +
        +  public static void myArraySwap(int[] array1, int[] array2, int nitems) {
+    examplePINVOKE.myArraySwap(array1, array2, nitems);
+  }
+
        +
        + +

        +and intermediate class method +

        + +
        +
        +  [DllImport("example", EntryPoint="CSharp_myArraySwap")]
+  public static extern void myArraySwap([In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg1, 
+                                        [In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2, int jarg3);
+
        +
        + + +

        18.3.3 Managed arrays using pinning

        + + +

        +It is also possible to pin a given array in memory (i.e. fix its location in memory), obtain a +direct pointer to it, and then pass this pointer to the wrapped C/C++ function. This approach +involves no copying, but it makes the work of the garbage collector harder as +the managed array object can not be relocated before the fix on the array is released. You should avoid +fixing arrays in memory in cases where the control may re-enter the managed side via a callback and/or +another thread may produce enough garbage to trigger garbage collection. +

        + +

        +For more information, see the fixed statement in the C# language reference. +

        + + +

        +Now let's look at an example using pinning, thus avoiding the CLR making copies +of the arrays passed as parameters. The arrays_csharp.i library file again provides the required support via the FIXED typemaps. +Let's use the same function from the previous section: +

        + +
        +
        +void myArrayCopy(int *sourceArray, int *targetArray, int nitems);
+
        +
        + +

        +We now need to declare the module class method unsafe, as we are using pointers: +

        + +
        +
        +%csmethodmodifiers myArrayCopy "public unsafe";
+
        +
        + +

        +Apply the appropriate typemaps to the array parameters: +

        + +
        +
        +%include "arrays_csharp.i"
+
+%apply int FIXED[] {int *sourceArray}
+%apply int FIXED[] {int *targetArray}
+
        +
        + +

        +Notice that there is no need for separate in, out or inout typemaps as is the +case when using P/Invoke default marshalling. +

        + +

        +As a result, we get the following method in the module class: +

        + +
        +
        +  public unsafe static void myArrayCopy(int[] sourceArray, int[] targetArray, int nitems) {
+    fixed ( int *swig_ptrTo_sourceArray = sourceArray ) {
+    fixed ( int *swig_ptrTo_targetArray = targetArray ) {
+    {
+      examplePINVOKE.myArrayCopy((IntPtr)swig_ptrTo_sourceArray, (IntPtr)swig_ptrTo_targetArray, nitems);
+    }
+    }
+    }
+  }
+
        +
        + +

        +On the method signature level the only difference to the version using P/Invoke default +marshalling is the "unsafe" quantifier, which is required because we are handling pointers. +

        + +

        +Also the intermediate class method looks a little different from the default marshalling +example - the method is expecting an IntPtr as the parameter type. +

        + +
        +
        +[DllImport("example", EntryPoint="CSharp_myArrayCopy")]
+public static extern void myArrayCopy(IntPtr jarg1, IntPtr jarg2, int jarg3);
+
        +
        + + + +

        18.4 C# Exceptions

        @@ -494,7 +773,7 @@ set so should only be used when a C# exception is not created.

        -

        17.3.1 C# exception example using "check" typemap

        +

        18.4.1 C# exception example using "check" typemap

        @@ -676,7 +955,7 @@ method and C# code does not handle pending exceptions via the canthrow attribute Actually it will issue this warning for any function beginning with SWIG_CSharpSetPendingException.

        -

        17.3.2 C# exception example using %exception

        +

        18.4.2 C# exception example using %exception

        @@ -741,7 +1020,7 @@ The managed code generated does check for the pending exception as mentioned ear

    -

    17.3.3 C# exception example using exception specifications

    +

    18.4.3 C# exception example using exception specifications

    @@ -798,7 +1077,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_evensonly(int jarg1) { Multiple catch handlers are generated should there be more than one exception specifications declared.

    -

    17.3.4 Custom C# ApplicationException example

    +

    18.4.4 Custom C# ApplicationException example

    @@ -932,7 +1211,7 @@ try { -

    17.4 C# Directors

    +

    18.5 C# Directors

    @@ -945,7 +1224,7 @@ The following sections provide information on the C# director implementation and However, the Java directors section should also be read in order to gain more insight into directors.

    -

    17.4.1 Directors example

    +

    18.5.1 Directors example

    @@ -1066,7 +1345,7 @@ CSharpDerived - UIntMethod(123) -

    17.4.2 Directors implementation

    +

    18.5.2 Directors implementation

    @@ -1252,7 +1531,7 @@ void SwigDirector_Base::BaseBoolMethod(Base const &b, bool flag) { -

    17.4.3 Director caveats

    +

    18.5.3 Director caveats

    @@ -1300,7 +1579,7 @@ However, a call from C# to CSharpDefaults.DefaultMethod() will of cours should pass the call on to CSharpDefaults.DefaultMethod(int)using the C++ default value, as shown above.

    -

    17.5 C# Typemap examples

    +

    18.6 C# Typemap examples

    This section includes a few examples of typemaps. For more examples, you @@ -1308,7 +1587,7 @@ might look at the files "csharp.swg" and "typemaps.i" in the SWIG library. -

    17.5.1 Memory management when returning references to member variables

    +

    18.6.1 Memory management when returning references to member variables

    @@ -1432,7 +1711,7 @@ public class Bike : IDisposable { Note the addReference call.

    -

    17.5.2 Memory management for objects passed to the C++ layer

    +

    18.6.2 Memory management for objects passed to the C++ layer

    @@ -1551,7 +1830,7 @@ The 'cscode' typemap simply adds in the specified code into the C# proxy class. -

    17.5.3 Date marshalling using the csin typemap and associated attributes

    +

    18.6.3 Date marshalling using the csin typemap and associated attributes

    @@ -1567,6 +1846,7 @@ Let's assume the code being wrapped is as follows: 

     class CDate {
 public:
+  CDate();
   CDate(int year, int month, int day);
   int getYear();
   int getMonth();
@@ -1649,8 +1929,8 @@ The typemaps to achieve this are shown below.
 
     %typemap(cstype) const CDate& "System.DateTime"
 %typemap(csin, 
-         pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);")
-         const CDate &
+         pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);"
+        ) const CDate &
          "$csclassname.getCPtr(temp$csinput)"
 
 %typemap(cstype) CDate& "out System.DateTime"
@@ -1658,7 +1938,8 @@ The typemaps to achieve this are shown below.
          pre="    CDate temp$csinput = new CDate();", 
          post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
               " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
-         cshin="out $csinput") CDate &
+         cshin="out $csinput"
+        ) CDate &
          "$csclassname.getCPtr(temp$csinput)"
 
 
    
@@ -1763,7 +2044,8 @@ will be possible with the following CDate * typemaps
          pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);",
          post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
               " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
-         cshin="ref $csinput") CDate *
+         cshin="ref $csinput"
+        ) CDate *
          "$csclassname.getCPtr(temp$csinput)"
    @@ -1788,7 +2070,51 @@ public class example { -

    17.5.4 A date example demonstrating marshalling of C# properties

    +

    +The following typemap is the same as the previous but demonstrates how a using block can be used for the temporary variable. +The only change to the previous typemap is the introduction of the 'terminator' attribute to terminate the using block. +The subtractYears method is nearly identical to the above addYears method. +

    + +
    +
    +%typemap(csin,
+         pre="    using (CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day)) {",
+         post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
+              " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
+         terminator="    } // terminate temp$csinput using block",
+         cshin="ref $csinput"
+        ) CDate *
+         "$csclassname.getCPtr(temp$csinput)"
+
+void subtractYears(CDate *pDate, int years) {
+  *pDate = CDate(pDate->getYear() - years, pDate->getMonth(), pDate->getDay());
+}
+
    +
    + +

    +The resulting generated code shows the termination of the using block: +

    + +
    +
    +public class example {
+  public static void subtractYears(ref System.DateTime pDate, int years) {
+    using (CDate temppDate = new CDate(pDate.Year, pDate.Month, pDate.Day)) {
+    try {
+      examplePINVOKE.subtractYears(CDate.getCPtr(temppDate), years);
+    } finally {
+      pDate = new System.DateTime(temppDate.getYear(), temppDate.getMonth(), temppDate.getDay(), 0, 0, 0);
+    }
+    } // terminate temppDate using block
+  }
+  ...
+}
+
    +
    + +

    18.6.4 A date example demonstrating marshalling of C# properties

    @@ -1827,7 +2153,8 @@ The typemap type required is thus CDate *. Given that the previous sect pre=" CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);", post=" $csinput = new System.DateTime(temp$csinput.getYear()," " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", - cshin="ref $csinput") CDate * + cshin="ref $csinput" + ) CDate * "$csclassname.getCPtr(temp$csinput)" %typemap(csvarin, excode=SWIGEXCODE2) CDate * %{ @@ -1888,7 +2215,7 @@ Some points to note: -

    17.5.5 Turning wrapped classes into partial classes

    +

    18.6.5 Turning wrapped classes into partial classes

    @@ -1988,7 +2315,7 @@ demonstrating that the class contains methods calling both unmanaged code - The following example is an alternative approach to adding managed code to the generated proxy class.

    -

    17.5.6 Extending proxy classes with additional C# code

    +

    18.6.6 Extending proxy classes with additional C# code

    diff --git a/Doc/Manual/Chicken.html b/Doc/Manual/Chicken.html index bd1b3d94b..98372a0f7 100644 --- a/Doc/Manual/Chicken.html +++ b/Doc/Manual/Chicken.html @@ -8,7 +8,7 @@ -

    18 SWIG and Chicken

    +

    19 SWIG and Chicken

      @@ -72,7 +72,7 @@

      -

      18.1 Preliminaries

      +

      19.1 Preliminaries

      @@ -90,7 +90,7 @@ CHICKEN.

      -

      18.1.1 Running SWIG in C mode

      +

      19.1.1 Running SWIG in C mode

      @@ -123,7 +123,7 @@ object files and linked into your project.

      -

      18.1.2 Running SWIG in C++ mode

      +

      19.1.2 Running SWIG in C++ mode

      @@ -152,10 +152,10 @@ object files and linked into your project.

      -

      18.2 Code Generation

      +

      19.2 Code Generation

      -

      18.2.1 Naming Conventions

      +

      19.2.1 Naming Conventions

      @@ -171,7 +171,7 @@ %rename SWIG directive in the SWIG interface file.

      -

      18.2.2 Modules

      +

      19.2.2 Modules

      @@ -193,7 +193,7 @@ (uses modulename)) CHICKEN Scheme form.

      -

      18.2.3 Constants and Variables

      +

      19.2.3 Constants and Variables

      @@ -230,7 +230,7 @@ for info on how to apply the %feature.

      -

      18.2.4 Functions

      +

      19.2.4 Functions

      @@ -249,7 +249,7 @@ parameters). The return values can then be accessed with (call-with-values).

      -

      18.2.5 Exceptions

      +

      19.2.5 Exceptions

      The SWIG chicken module has support for exceptions thrown from @@ -291,7 +291,7 @@

    -

    18.3 TinyCLOS

    +

    19.3 TinyCLOS

    @@ -334,7 +334,7 @@

    -

    18.4 Linkage

    +

    19.4 Linkage

    @@ -355,7 +355,7 @@

    -

    18.4.1 Static binary or shared library linked at compile time

    +

    19.4.1 Static binary or shared library linked at compile time

    We can easily use csc to build a static binary.

    @@ -396,7 +396,7 @@ in which case the test script does not need to be linked with example.so. The t be run with csi.

    -

    18.4.2 Building chicken extension libraries

    +

    19.4.2 Building chicken extension libraries

    Building a shared library like in the above section only works if the library @@ -454,7 +454,7 @@ distributed and used by anyone, even if SWIG is not installed.

    See the Examples/chicken/egg directory in the SWIG source for an example that builds two eggs, one using the first method and one using the second method.

    -

    18.4.3 Linking multiple SWIG modules with TinyCLOS

    +

    19.4.3 Linking multiple SWIG modules with TinyCLOS

    Linking together multiple modules that share type information using the %import @@ -478,7 +478,7 @@ with (declare (uses ...)). To create an extension library or an egg, just create a module_load.scm file that (declare (uses ...)) all the modules.

    -

    18.5 Typemaps

    +

    19.5 Typemaps

    @@ -487,7 +487,7 @@ all the modules.

    Lib/chicken/chicken.swg.

    -

    18.6 Pointers

    +

    19.6 Pointers

    @@ -520,7 +520,7 @@ all the modules.

    type. flags is either zero or SWIG_POINTER_DISOWN (see below).

    -

    18.6.1 Garbage collection

    +

    19.6.1 Garbage collection

    If the owner flag passed to SWIG_NewPointerObj is 1, NewPointerObj will add a @@ -551,7 +551,7 @@ all the modules.

    must be called manually.

    -

    18.7 Unsupported features and known problems

    +

    19.7 Unsupported features and known problems

    -

    18.7.1 TinyCLOS problems with Chicken version <= 1.92

    +

    19.7.1 TinyCLOS problems with Chicken version <= 1.92

    In Chicken versions equal to or below 1.92, TinyCLOS has a limitation such that generic methods do not properly work on methods diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index c3197b9dc..c135b7c6f 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -162,7 +162,7 @@

  • Character strings and structures
  • Array members
  • Structure data members -
  • C constructors and destructors +
  • C constructors and destructors
  • Adding member functions to C structures
  • Nested structures
  • Other things to note about structure wrapping @@ -272,7 +272,7 @@
  • C Arrays and Pointers @@ -390,6 +390,7 @@
  • More about %apply and %clear
  • Reducing wrapper code size
  • Passing data between typemaps +
  • C++ "this" pointer
  • Where to go for more information? @@ -497,7 +498,33 @@ -

    16 SWIG and Allegro Common Lisp

    +

    16 Using SWIG with ccache - ccache-swig(1) manpage

    + + +
    + +
    + + +

    17 SWIG and Allegro Common Lisp

    @@ -581,13 +608,19 @@
    -

    17 SWIG and C#

    +

    18 SWIG and C#

    -

    18 SWIG and Chicken

    +

    19 SWIG and Chicken

    @@ -652,7 +685,7 @@
    -

    19 SWIG and Guile

    +

    20 SWIG and Guile

    @@ -687,7 +720,7 @@
    -

    20 SWIG and Java

    +

    21 SWIG and Java

    @@ -829,7 +862,7 @@
    -

    21 SWIG and Common Lisp

    +

    22 SWIG and Common Lisp

    @@ -852,7 +885,7 @@
    -

    22 SWIG and Lua

    +

    23 SWIG and Lua

    @@ -881,20 +914,35 @@
  • C++ templates
  • C++ Smart Pointers
  • C++ Exceptions -
  • Writing your own custom wrappers -
  • Adding additional Lua code -
  • Details on the Lua binding +
  • Typemaps +
  • Writing typemaps + +
  • Customization of your Bindings + +
  • Details on the Lua binding + -

    23 SWIG and Modula-3

    +

    24 SWIG and Modula-3

    @@ -935,7 +983,7 @@
    -

    24 SWIG and MzScheme

    +

    25 SWIG and MzScheme

    @@ -945,7 +993,7 @@
    -

    25 SWIG and Ocaml

    +

    26 SWIG and Ocaml

    @@ -996,7 +1044,7 @@
    -

    26 SWIG and Octave

    +

    27 SWIG and Octave

    @@ -1031,7 +1079,7 @@
    -

    27 SWIG and Perl5

    +

    28 SWIG and Perl5

    @@ -1098,7 +1146,7 @@
    -

    28 SWIG and PHP

    +

    29 SWIG and PHP

    @@ -1106,7 +1154,6 @@
  • Generating PHP Extensions
  • Basic PHP interface @@ -1129,7 +1176,7 @@ -

    29 SWIG and Pike

    +

    30 SWIG and Pike

    @@ -1153,7 +1200,7 @@
    -

    30 SWIG and Python

    +

    31 SWIG and Python

    @@ -1194,7 +1241,7 @@
  • Memory management
  • Python 2.2 and classic classes -
  • Cross language polymorphism +
  • Cross language polymorphism
  • Python Packages +
  • Python 3 Support + -

    31 SWIG and Ruby

    +

    32 SWIG and Ruby

    @@ -1387,7 +1440,7 @@
    -

    32 SWIG and Tcl

    +

    33 SWIG and Tcl

    @@ -1452,7 +1505,7 @@
    -

    33 SWIG and R

    +

    34 SWIG and R

    @@ -1468,7 +1521,7 @@
    -

    34 Extending SWIG to support new languages

    +

    35 Extending SWIG to support new languages

    diff --git a/Doc/Manual/Customization.html b/Doc/Manual/Customization.html index e9d70e39a..ec73e5460 100644 --- a/Doc/Manual/Customization.html +++ b/Doc/Manual/Customization.html @@ -1019,6 +1019,20 @@ but this will:
    +

    +SWIG provides macros for disabling and clearing features. Many of these can be found in the swig.swg library file. +The typical pattern is to define three macros; one to define the feature itself, one to disable the feature and one to clear the feature. +The three macros below show this for the "except" feature: +

    + +
    +
    +#define %exception      %feature("except")
+#define %noexception    %feature("except","0")
+#define %clearexception %feature("except","")
+
    +
    +

    11.3.4 Features and default arguments

    diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index 588912b68..73f1a6673 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -6,7 +6,7 @@ -

    34 Extending SWIG to support new languages

    +

    35 Extending SWIG to support new languages

      @@ -73,7 +73,7 @@ -

      34.1 Introduction

      +

      35.1 Introduction

      @@ -89,7 +89,7 @@ Also, this chapter is not meant to be a hand-holding tutorial. As a starting po you should probably look at one of SWIG's existing modules.

      -

      34.2 Prerequisites

      +

      35.2 Prerequisites

      @@ -119,7 +119,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of wrapper code are driven by C++ datatypes.

      -

      34.3 The Big Picture

      +

      35.3 The Big Picture

      @@ -156,7 +156,7 @@ role in making the system work. For example, both typemaps and declaration anno based on pattern matching and interact heavily with the underlying type system.

      -

      34.4 Execution Model

      +

      35.4 Execution Model

      @@ -201,7 +201,7 @@ latter stage of compilation. The next few sections briefly describe some of these stages.

      -

      34.4.1 Preprocessing

      +

      35.4.1 Preprocessing

      @@ -232,10 +232,11 @@ of swig.swg looks like this: ... /* Code insertion directives such as %wrapper %{ ... %} */ -#define %init %insert("init") -#define %wrapper %insert("wrapper") -#define %header %insert("header") +#define %begin %insert("begin") #define %runtime %insert("runtime") +#define %header %insert("header") +#define %wrapper %insert("wrapper") +#define %init %insert("init") /* Access control directives */ @@ -281,7 +282,7 @@ been expanded as well as everything else that goes into the low-level construction of the wrapper code.

      -

      34.4.2 Parsing

      +

      35.4.2 Parsing

      @@ -382,7 +383,7 @@ returning a foo and taking types a and b as arguments).

      -

      34.4.3 Parse Trees

      +

      35.4.3 Parse Trees

      @@ -448,7 +449,8 @@ of the output.

      The contents of each parse tree node consist of a collection of attribute/value pairs. Internally, the nodes are simply represented by hash tables. A display of -the entire parse-tree structure can be obtained using swig -dump_tree. +the entire parse-tree structure can be obtained using swig -debug-top <n>, where n is +the stage being processed. There are a number of other parse tree display options, for example, swig -debug-module <n> will avoid displaying system parse information and only display the parse tree pertaining to the user's module at stage n of processing. @@ -636,7 +638,7 @@ $ swig -c++ -python -debug-module 4 example.i

    -

    34.4.4 Attribute namespaces

    +

    35.4.4 Attribute namespaces

    @@ -655,7 +657,7 @@ that matches the name of the target language. For example, python:foo perl:foo.

    -

    34.4.5 Symbol Tables

    +

    35.4.5 Symbol Tables

    @@ -746,7 +748,7 @@ example.i:5. Previous declaration is foo_i(int ) -

    34.4.6 The %feature directive

    +

    35.4.6 The %feature directive

    @@ -802,7 +804,7 @@ For example, the exception code above is simply stored without any modifications.

    -

    34.4.7 Code Generation

    +

    35.4.7 Code Generation

    @@ -924,7 +926,7 @@ public : The role of these functions is described shortly.

    -

    34.4.8 SWIG and XML

    +

    35.4.8 SWIG and XML

    @@ -937,7 +939,7 @@ internal data structures, it may be useful to keep XML in the back of your mind as a model.

    -

    34.5 Primitive Data Structures

    +

    35.5 Primitive Data Structures

    @@ -983,7 +985,7 @@ typedef Hash Typetab; -

    34.5.1 Strings

    +

    35.5.1 Strings

    @@ -1124,7 +1126,7 @@ Returns the number of replacements made (if any). -

    34.5.2 Hashes

    +

    35.5.2 Hashes

    @@ -1201,7 +1203,7 @@ Returns the list of hash table keys. -

    34.5.3 Lists

    +

    35.5.3 Lists

    @@ -1290,7 +1292,7 @@ If t is not a standard object, it is assumed to be a char * and is used to create a String object. -

    34.5.4 Common operations

    +

    35.5.4 Common operations

    The following operations are applicable to all datatypes. @@ -1345,7 +1347,7 @@ objects and report errors. Gets the line number associated with x. -

    34.5.5 Iterating over Lists and Hashes

    +

    35.5.5 Iterating over Lists and Hashes

    To iterate over the elements of a list or a hash table, the following functions are used: @@ -1390,7 +1392,7 @@ for (j = First(j); j.item; j= Next(j)) { -

    34.5.6 I/O

    +

    35.5.6 I/O

    Special I/O functions are used for all internal I/O. These operations @@ -1526,7 +1528,7 @@ Similarly, the preprocessor and parser all operate on string-files. -

    34.6 Navigating and manipulating parse trees

    +

    35.6 Navigating and manipulating parse trees

    Parse trees are built as collections of hash tables. Each node is a hash table in which @@ -1660,7 +1662,7 @@ Deletes a node from the parse tree. Deletion reconnects siblings and properly u the parent so that sibling nodes are unaffected. -

    34.7 Working with attributes

    +

    35.7 Working with attributes

    @@ -1777,7 +1779,7 @@ the attribute is optional. Swig_restore() must always be called after function. -

    34.8 Type system

    +

    35.8 Type system

    @@ -1786,7 +1788,7 @@ pointers, references, and pointers to members. A detailed discussion of type theory is impossible here. However, let's cover the highlights.

    -

    34.8.1 String encoding of types

    +

    35.8.1 String encoding of types

    @@ -1887,7 +1889,7 @@ make the final type, the two parts are just joined together using string concatenation.

    -

    34.8.2 Type construction

    +

    35.8.2 Type construction

    @@ -2056,7 +2058,7 @@ Returns the prefix of a type. For example, if ty is ty is unmodified. -

    34.8.3 Type tests

    +

    35.8.3 Type tests

    @@ -2143,7 +2145,7 @@ Checks if ty is a varargs type. Checks if ty is a templatized type. -

    34.8.4 Typedef and inheritance

    +

    35.8.4 Typedef and inheritance

    @@ -2245,7 +2247,7 @@ Fully reduces ty according to typedef rules. Resulting datatype will consist only of primitive typenames. -

    34.8.5 Lvalues

    +

    35.8.5 Lvalues

    @@ -2282,7 +2284,7 @@ Literal y; // type = 'Literal', ltype='p.char' -

    34.8.6 Output functions

    +

    35.8.6 Output functions

    @@ -2344,7 +2346,7 @@ SWIG, but is most commonly associated with type-descriptor objects that appear in wrappers (e.g., SWIGTYPE_p_double). -

    34.9 Parameters

    +

    35.9 Parameters

    @@ -2443,7 +2445,7 @@ included. Used to emit prototypes. Returns the number of required (non-optional) arguments in p. -

    34.10 Writing a Language Module

    +

    35.10 Writing a Language Module

    @@ -2458,7 +2460,7 @@ describes the creation of a minimal Python module. You should be able to extra this to other languages.

    -

    34.10.1 Execution model

    +

    35.10.1 Execution model

    @@ -2468,7 +2470,7 @@ the parsing of command line options, all aspects of code generation are controll different methods of the Language that must be defined by your module.

    -

    34.10.2 Starting out

    +

    35.10.2 Starting out

    @@ -2576,7 +2578,7 @@ that activates your module. For example, swig -python foo.i. The messages from your new module should appear.

    -

    34.10.3 Command line options

    +

    35.10.3 Command line options

    @@ -2635,7 +2637,7 @@ to mark the option as valid. If you forget to do this, SWIG will terminate wit unrecognized command line option error.

    -

    34.10.4 Configuration and preprocessing

    +

    35.10.4 Configuration and preprocessing

    @@ -2684,7 +2686,7 @@ an implementation file python.cxx and a configuration file python.swg.

    -

    34.10.5 Entry point to code generation

    +

    35.10.5 Entry point to code generation

    @@ -2742,7 +2744,7 @@ int Python::top(Node *n) { -

    34.10.6 Module I/O and wrapper skeleton

    +

    35.10.6 Module I/O and wrapper skeleton

    @@ -2884,7 +2886,7 @@ functionWrapper : void Shape_y_set(Shape *self,double y) -

    34.10.7 Low-level code generators

    +

    35.10.7 Low-level code generators

    @@ -3038,7 +3040,7 @@ but without the typemaps, there is still work to do.

    -

    34.10.8 Configuration files

    +

    35.10.8 Configuration files

    @@ -3113,7 +3115,7 @@ entirely upcased.

    At the end of the new section is the place to put the aforementioned -nickname kludges (should they be needed). See Perl5 and Php4 for +nickname kludges (should they be needed). See Perl5 for examples of what to do. [If this is still unclear after you've read the code, ping me and I'll expand on this further. --ttn]

    @@ -3188,7 +3190,7 @@ politely displays the ignoring language message. -

    34.10.9 Runtime support

    +

    35.10.9 Runtime support

    @@ -3197,7 +3199,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g. the SWIG files that implement those functions.

    -

    34.10.10 Standard library files

    +

    35.10.10 Standard library files

    @@ -3216,7 +3218,7 @@ The following are the minimum that are usually supported: Please copy these and modify for any new language.

    -

    34.10.11 Examples and test cases

    +

    35.10.11 Examples and test cases

    @@ -3245,7 +3247,7 @@ during this process, see the section on configuration files.

    -

    34.10.12 Documentation

    +

    35.10.12 Documentation

    @@ -3277,7 +3279,7 @@ Some topics that you'll want to be sure to address include: if available. -

    34.10.13 Prerequisites for adding a new language module to the SWIG distribution

    +

    35.10.13 Prerequisites for adding a new language module to the SWIG distribution

    @@ -3334,7 +3336,7 @@ should be added should there be an area not already covered by the existing tests.

    -

    34.10.14 Coding style guidelines

    +

    35.10.14 Coding style guidelines

    @@ -3358,13 +3360,13 @@ The generated C/C++ code should also follow this style as close as possible. How should be avoided as unlike the SWIG developers, users will never have consistent tab settings.

    -

    34.11 Typemaps

    +

    35.11 Typemaps

    -

    34.11.1 Proxy classes

    +

    35.11.1 Proxy classes

    -

    34.12 Guide to parse tree nodes

    +

    35.12 Guide to parse tree nodes

    diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 20ab716e4..cf7e8da2c 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -8,7 +8,7 @@ -

    19 SWIG and Guile

    +

    20 SWIG and Guile

      @@ -47,7 +47,7 @@

      This section details guile-specific support in SWIG. -

      19.1 Meaning of "Module"

      +

      20.1 Meaning of "Module"

      @@ -55,7 +55,7 @@ There are three different concepts of "module" involved, defined separately for SWIG, Guile, and Libtool. To avoid horrible confusion, we explicitly prefix the context, e.g., "guile-module". -

      19.2 Using the SCM or GH Guile API

      +

      20.2 Using the SCM or GH Guile API

      The guile module can currently export wrapper files that use the guile GH interface or the @@ -103,7 +103,7 @@ for the specific API. Currently only the guile language module has created a ma but there is no reason other languages (like mzscheme or chicken) couldn't also use this. If that happens, there is A LOT less code duplication in the standard typemaps.

      -

      19.3 Linkage

      +

      20.3 Linkage

      @@ -111,7 +111,7 @@ Guile support is complicated by a lack of user community cohesiveness, which manifests in multiple shared-library usage conventions. A set of policies implementing a usage convention is called a linkage. -

      19.3.1 Simple Linkage

      +

      20.3.1 Simple Linkage

      @@ -206,7 +206,7 @@ placed between the define-module form and the SWIG_init via a preprocessor define to avoid symbol clashes. For this case, however, passive linkage is available. -

      19.3.2 Passive Linkage

      +

      20.3.2 Passive Linkage

      Passive linkage is just like simple linkage, but it generates an @@ -216,7 +216,7 @@ package name (see below).

      You should use passive linkage rather than simple linkage when you are using multiple modules. -

      19.3.3 Native Guile Module Linkage

      +

      20.3.3 Native Guile Module Linkage

      SWIG can also generate wrapper code that does all the Guile module @@ -257,7 +257,7 @@ Newer Guile versions have a shorthand procedure for this:

    -

    19.3.4 Old Auto-Loading Guile Module Linkage

    +

    20.3.4 Old Auto-Loading Guile Module Linkage

    Guile used to support an autoloading facility for object-code @@ -283,7 +283,7 @@ option, SWIG generates an exported module initialization function with an appropriate name. -

    19.3.5 Hobbit4D Linkage

    +

    20.3.5 Hobbit4D Linkage

    @@ -308,7 +308,7 @@ my/lib/libfoo.so.X.Y.Z and friends. This scheme is still very experimental; the (hobbit4d link) conventions are not well understood.

    -

    19.4 Underscore Folding

    +

    20.4 Underscore Folding

    @@ -320,7 +320,7 @@ complained so far. %rename to specify the Guile name of the wrapped functions and variables (see CHANGES). -

    19.5 Typemaps

    +

    20.5 Typemaps

    @@ -412,7 +412,7 @@ constant will appear as a scheme variable. See Features and the %feature directive for info on how to apply the %feature.

    -

    19.6 Representation of pointers as smobs

    +

    20.6 Representation of pointers as smobs

    @@ -433,7 +433,7 @@ representing the expected pointer type. See also If the Scheme object passed was not a SWIG smob representing a compatible pointer, a wrong-type-arg exception is raised. -

    19.6.1 GH Smobs

    +

    20.6.1 GH Smobs

    @@ -462,7 +462,7 @@ that created them, so the first module we check will most likely be correct. Once we have a swig_type_info structure, we loop through the linked list of casts, using pointer comparisons.

    -

    19.6.2 SCM Smobs

    +

    20.6.2 SCM Smobs

    The SCM interface (using the "-scm" argument to swig) uses swigrun.swg. @@ -477,7 +477,7 @@ in the smob tag. If a generated GOOPS module has been loaded, smobs will be wra GOOPS class.

    -

    19.6.3 Garbage Collection

    +

    20.6.3 Garbage Collection

    Garbage collection is a feature of the new SCM interface, and it is automatically included @@ -491,7 +491,7 @@ is exactly like described in Object ownership and %newobject in the SWIG manual. All typemaps use an $owner var, and the guile module replaces $owner with 0 or 1 depending on feature:new.

    -

    19.7 Exception Handling

    +

    20.7 Exception Handling

    @@ -517,7 +517,7 @@ mapping: The default when not specified here is to use "swig-error". See Lib/exception.i for details. -

    19.8 Procedure documentation

    +

    20.8 Procedure documentation

    If invoked with the command-line option -procdoc @@ -553,7 +553,7 @@ like this: typemap argument doc. See Lib/guile/typemaps.i for details. -

    19.9 Procedures with setters

    +

    20.9 Procedures with setters

    For global variables, SWIG creates a single wrapper procedure @@ -581,7 +581,7 @@ struct members, the procedures (struct-member-get pointer) and (struct-member-set pointer value) are not generated. -

    19.10 GOOPS Proxy Classes

    +

    20.10 GOOPS Proxy Classes

    SWIG can also generate classes and generic functions for use with @@ -730,7 +730,7 @@ Notice that <Foo> is used before it is defined. The fix is to just put th %import "foo.h" before the %inline block.

    -

    19.10.1 Naming Issues

    +

    20.10.1 Naming Issues

    As you can see in the example above, there are potential naming conflicts. The default exported @@ -769,7 +769,7 @@ guile-modules. For example,

    TODO: Renaming class name prefixes?

    -

    19.10.2 Linking

    +

    20.10.2 Linking

    The guile-modules generated above all need to be linked together. GOOPS support requires diff --git a/Doc/Manual/Introduction.html b/Doc/Manual/Introduction.html index 491204d1d..099454cf0 100644 --- a/Doc/Manual/Introduction.html +++ b/Doc/Manual/Introduction.html @@ -414,7 +414,8 @@ SWIG_LINK_LIBRARIES(example ${PYTHON_LIBRARIES})

    The above example will generate native build files such as makefiles, nmake files and Visual Studio projects -which will invoke SWIG and compile the generated C++ files into _example.so (UNIX) or _example.dll (Windows). +which will invoke SWIG and compile the generated C++ files into _example.so (UNIX) or _example.pyd (Windows). +For other target languages on Windows a dll, instead of a .pyd file, is usually generated.

    2.7 Hands off code generation

    diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 164fc21e7..c5ff1f906 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -5,7 +5,7 @@ -

    20 SWIG and Java

    +

    21 SWIG and Java

      @@ -154,7 +154,7 @@ It covers most SWIG features, but certain low-level details are covered in less

      -

      20.1 Overview

      +

      21.1 Overview

      @@ -189,7 +189,7 @@ Various customisation tips and techniques using SWIG directives are covered. The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.

      -

      20.2 Preliminaries

      +

      21.2 Preliminaries

      @@ -205,7 +205,7 @@ Run make -k check from the SWIG root directory after installing SWIG on The Java module requires your system to support shared libraries and dynamic loading. This is the commonly used method to load JNI code so your system will more than likely support this.

      -

      20.2.1 Running SWIG

      +

      21.2.1 Running SWIG

      @@ -258,7 +258,7 @@ The following sections have further practical examples and details on how you mi compiling and using the generated files.

      -

      20.2.2 Additional Commandline Options

      +

      21.2.2 Additional Commandline Options

      @@ -295,7 +295,7 @@ swig -java -help Their use will become clearer by the time you have finished reading this section on SWIG and Java.

      -

      20.2.3 Getting the right header files

      +

      21.2.3 Getting the right header files

      @@ -310,7 +310,7 @@ They are usually in directories like this:

      The exact location may vary on your machine, but the above locations are typical.

      -

      20.2.4 Compiling a dynamic module

      +

      21.2.4 Compiling a dynamic module

      @@ -346,16 +346,16 @@ The name of the shared library output file is important. If the name of your SWIG module is "example", the name of the corresponding shared library file should be "libexample.so" (or equivalent depending on your machine, see Dynamic linking problems for more information). The name of the module is specified using the %module directive or -module command line option.

      -

      20.2.5 Using your module

      +

      21.2.5 Using your module

      To load your shared native library module in Java, simply use Java's System.loadLibrary method in a Java class:

      -// main.java
+// runme.java
 
-public class main {
+public class runme {
   static {
     System.loadLibrary("example");
   }
@@ -372,7 +372,7 @@ Compile all the Java files and run:
 
 
       $ javac *.java
-$ java main
+$ java runme
 24
 $
 
      
@@ -381,7 +381,7 @@ $
 If it doesn't work have a look at the following section which discusses problems loading the shared library.
 
      
 
-
      20.2.6 Dynamic linking problems
      
+
      21.2.6 Dynamic linking problems
      
 
 
 
      
@@ -394,12 +394,12 @@ You may get an exception similar to this:
 
      
 
 
      -$ java main
+$ java runme
 Exception in thread "main" java.lang.UnsatisfiedLinkError: no example in java.library.path
         at java.lang.ClassLoader.loadLibrary(ClassLoader.java:1312)
         at java.lang.Runtime.loadLibrary0(Runtime.java:749)
         at java.lang.System.loadLibrary(System.java:820)
-        at main.<clinit>(main.java:5)
+        at runme.<clinit>(runme.java:5)
 
      
 
 
      
@@ -426,7 +426,7 @@ The following exception is indicative of this:
 
      
 
 
      -$ java main
+$ java runme
 Exception in thread "main" java.lang.UnsatisfiedLinkError: libexample.so: undefined
 symbol: fact
         at java.lang.ClassLoader$NativeLibrary.load(Native Method)
@@ -434,7 +434,7 @@ symbol: fact
         at java.lang.ClassLoader.loadLibrary(ClassLoader.java, Compiled Code)
         at java.lang.Runtime.loadLibrary0(Runtime.java, Compiled Code)
         at java.lang.System.loadLibrary(System.java, Compiled Code)
-        at main.<clinit>(main.java:5)
+        at runme.<clinit>(runme.java:5)
 $
 
      
 
@@ -455,7 +455,7 @@ The following section also contains some C++ specific linking problems and solut
 
      
 
 
-
      20.2.7 Compilation problems and compiling with C++
      
+
      21.2.7 Compilation problems and compiling with C++
      
 
 
 
      
@@ -508,7 +508,7 @@ Finally make sure the version of JDK header files matches the version of Java th
 
      
 
 
-
      20.2.8 Building on Windows
      
+
      21.2.8 Building on Windows
      
 
 
 
      
@@ -517,7 +517,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine.
 This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers.  
 In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.
      
 
-
      20.2.8.1 Running SWIG from Visual Studio
      
+
      21.2.8.1 Running SWIG from Visual Studio
      
 
 
 
      
@@ -556,7 +556,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa
 If the library fails to load have a look at Dynamic linking problems.
 
      
 
-
      20.2.8.2 Using NMAKE
      
+
      21.2.8.2 Using NMAKE
      
 
 
 
      
@@ -615,7 +615,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -
 
      
 
 
-
      20.3 A tour of basic C/C++ wrapping
      
+
      21.3 A tour of basic C/C++ wrapping
      
 
 
 
      
@@ -625,7 +625,7 @@ variables are wrapped with JavaBean type getters and setters and so forth.
 This section briefly covers the essential aspects of this wrapping.
 
      
 
-
      20.3.1 Modules, packages and generated Java classes
      
+
      21.3.1 Modules, packages and generated Java classes
      
 
 
 
      
@@ -659,7 +659,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i
 
 SWIG won't create the directory, so make sure it exists beforehand.
 
-
      20.3.2 Functions
      
+
      21.3.2 Functions
      
 
 
 
      
@@ -693,7 +693,7 @@ System.out.println(example.fact(4));
      -

      20.3.3 Global variables

      +

      21.3.3 Global variables

      @@ -780,7 +780,7 @@ extern char *path; // Read-only (due to %immutable)

    -

    20.3.4 Constants

    +

    21.3.4 Constants

    @@ -920,7 +920,7 @@ Or if you decide this practice isn't so bad and your own class implements ex

    -

    20.3.5 Enumerations

    +

    21.3.5 Enumerations

    @@ -934,7 +934,7 @@ The final two approaches use simple integers for each enum item. Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.

    -

    20.3.5.1 Anonymous enums

    +

    21.3.5.1 Anonymous enums

    @@ -997,7 +997,7 @@ As in the case of constants, you can access them through either the module class

    -

    20.3.5.2 Typesafe enums

    +

    21.3.5.2 Typesafe enums

    @@ -1090,7 +1090,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit The following section details proper Java enum generation.

    -

    20.3.5.3 Proper Java enums

    +

    21.3.5.3 Proper Java enums

    @@ -1143,7 +1143,7 @@ The additional support methods need not be generated if none of the enum items h Simpler Java enums for enums without initializers section.

    -

    20.3.5.4 Type unsafe enums

    +

    21.3.5.4 Type unsafe enums

    @@ -1191,7 +1191,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.

    -

    20.3.5.5 Simple enums

    +

    21.3.5.5 Simple enums

    @@ -1210,7 +1210,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach. The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.

    -

    20.3.6 Pointers

    +

    21.3.6 Pointers

    @@ -1298,7 +1298,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return a NULL pointer if the conversion can't be performed.

    -

    20.3.7 Structures

    +

    21.3.7 Structures

    @@ -1466,7 +1466,7 @@ x.setA(3); // Modify x.a - this is the same as b.f.a -

    20.3.8 C++ classes

    +

    21.3.8 C++ classes

    @@ -1529,7 +1529,7 @@ int bar = Spam.getBar(); -

    20.3.9 C++ inheritance

    +

    21.3.9 C++ inheritance

    @@ -1590,7 +1590,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance A warning is given when multiple inheritance is detected and only the first base class is used.

    -

    20.3.10 Pointers, references, arrays and pass by value

    +

    21.3.10 Pointers, references, arrays and pass by value

    @@ -1645,7 +1645,7 @@ to hold the result and a pointer is returned (Java will release this memory when the returned object's finalizer is run by the garbage collector).

    -

    20.3.10.1 Null pointers

    +

    21.3.10.1 Null pointers

    @@ -1669,7 +1669,7 @@ For spam1 and spam4 above the Java null gets translat The converse also occurs, that is, NULL pointers are translated into null Java objects when returned from a C/C++ function.

    -

    20.3.11 C++ overloaded functions

    +

    21.3.11 C++ overloaded functions

    @@ -1784,7 +1784,7 @@ void spam(unsigned short); // Ignored -

    20.3.12 C++ default arguments

    +

    21.3.12 C++ default arguments

    @@ -1827,7 +1827,7 @@ Further details on default arguments and how to restore this approach are given

    -

    20.3.13 C++ namespaces

    +

    21.3.13 C++ namespaces

    @@ -1887,7 +1887,7 @@ symbols separate, consider wrapping them as separate SWIG modules. Each SWIG module can be placed into a separate package.

    -

    20.3.14 C++ templates

    +

    21.3.14 C++ templates

    @@ -1936,7 +1936,7 @@ Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter.

    -

    20.3.15 C++ Smart Pointers

    +

    21.3.15 C++ Smart Pointers

    @@ -2020,7 +2020,7 @@ Foo f = p.__deref__(); // Returns underlying Foo * -

    20.4 Further details on the generated Java classes

    +

    21.4 Further details on the generated Java classes

    @@ -2035,7 +2035,7 @@ Finally enum classes are covered. First, the crucial intermediary JNI class is considered.

    -

    20.4.1 The intermediary JNI class

    +

    21.4.1 The intermediary JNI class

    @@ -2155,7 +2155,7 @@ If name is the same as modulename then the module class name g from modulename to modulenameModule.

    -

    20.4.1.1 The intermediary JNI class pragmas

    +

    21.4.1.1 The intermediary JNI class pragmas

    @@ -2234,7 +2234,7 @@ For example, let's change the intermediary JNI class access to public. All the methods in the intermediary JNI class will then be callable outside of the package as the method modifiers are public by default.

    -

    20.4.2 The Java module class

    +

    21.4.2 The Java module class

    @@ -2265,7 +2265,7 @@ example.egg(new Foo()); The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a Foo can be passed to the egg function, whereas any long can be passed to the egg function in the intermediary JNI class.

    -

    20.4.2.1 The Java module class pragmas

    +

    21.4.2.1 The Java module class pragmas

    @@ -2316,7 +2316,7 @@ See The intermediary JNI class pragmas section fo

    -

    20.4.3 Java proxy classes

    +

    21.4.3 Java proxy classes

    @@ -2392,7 +2392,7 @@ int y = f.spam(5, new Foo()); -

    20.4.3.1 Memory management

    +

    21.4.3.1 Memory management

    @@ -2554,7 +2554,7 @@ and

    -

    20.4.3.2 Inheritance

    +

    21.4.3.2 Inheritance

    @@ -2670,7 +2670,7 @@ However, true cross language polymorphism can be achieved using the 20.4.3.3 Proxy classes and garbage collection +

    21.4.3.3 Proxy classes and garbage collection

    @@ -2753,7 +2753,7 @@ The section on Java typemaps details how to specify See the How to Handle Java Finalization's Memory-Retention Issues article for alternative approaches to managing memory by avoiding finalizers altogether.

    -

    20.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    +

    21.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    @@ -2857,7 +2857,11 @@ and therefore there is no possibility of premature garbage collection. In practi

    The premature garbage collection prevention parameter for proxy classes is generated by default whenever proxy classes are passed by value, reference or with a pointer. -The additional parameters do impose a slight performance overhead and the parameter generation can be suppressed globally with the -nopgcpp commandline option. +The implementation for this extra parameter generation requires the "jtype" typemap to contain long and the "jstype" typemap to contain the name of a proxy class. +

    + +

    +The additional parameter does impose a slight performance overhead and the parameter generation can be suppressed globally with the -nopgcpp commandline option. More selective suppression is possible with the 'nopgcpp' attribute in the "jtype" Java typemap. The attribute is a flag and so should be set to "1" to enable the suppression, or it can be omitted or set to "0" to disable. For example: @@ -2871,7 +2875,7 @@ For example: Compatibility note: The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.

    -

    20.4.3.5 Single threaded applications and thread safety

    +

    21.4.3.5 Single threaded applications and thread safety

    @@ -2959,7 +2963,7 @@ for (int i=0; i<100000; i++) { -

    20.4.4 Type wrapper classes

    +

    21.4.4 Type wrapper classes

    @@ -3046,7 +3050,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... } -

    20.4.5 Enum classes

    +

    21.4.5 Enum classes

    @@ -3055,7 +3059,7 @@ The Enumerations section discussed these but omitted The following sub-sections detail the various types of enum classes that can be generated.

    -

    20.4.5.1 Typesafe enum classes

    +

    21.4.5.1 Typesafe enum classes

    @@ -3139,7 +3143,7 @@ The swigValue method is used for marshalling in the other direction. The toString method is overridden so that the enum name is available.

    -

    20.4.5.2 Proper Java enum classes

    +

    21.4.5.2 Proper Java enum classes

    @@ -3217,7 +3221,7 @@ These needn't be generated if the enum being wrapped does not have any initializ Simpler Java enums for enums without initializers section describes how typemaps can be used to achieve this.

    -

    20.4.5.3 Type unsafe enum classes

    +

    21.4.5.3 Type unsafe enum classes

    @@ -3248,7 +3252,7 @@ public final class Beverage { -

    20.5 Cross language polymorphism using directors

    +

    21.5 Cross language polymorphism using directors

    @@ -3270,7 +3274,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.

    -

    20.5.1 Enabling directors

    +

    21.5.1 Enabling directors

    @@ -3341,7 +3345,7 @@ public: -

    20.5.2 Director classes

    +

    21.5.2 Director classes

    @@ -3368,7 +3372,7 @@ If the correct implementation is in Java, the Java API is used to call the metho

    -

    20.5.3 Overhead and code bloat

    +

    21.5.3 Overhead and code bloat

    @@ -3386,7 +3390,7 @@ This situation can be optimized by selectively enabling director methods (using

    -

    20.5.4 Simple directors example

    +

    21.5.4 Simple directors example

    @@ -3451,7 +3455,7 @@ DirectorDerived::upcall_method() invoked. -

    20.5.5 Director threading issues

    +

    21.5.5 Director threading issues

    @@ -3471,7 +3475,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern -

    20.6 Accessing protected members

    +

    21.6 Accessing protected members

    @@ -3567,7 +3571,7 @@ class MyProtectedBase extends ProtectedBase -

    20.7 Common customization features

    +

    21.7 Common customization features

    @@ -3579,7 +3583,7 @@ be awkward. This section describes some common SWIG features that are used to improve the interface to existing C/C++ code.

    -

    20.7.1 C/C++ helper functions

    +

    21.7.1 C/C++ helper functions

    @@ -3645,7 +3649,7 @@ hard to implement. It is possible to improve on this using Java code, typemaps, customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.

    -

    20.7.2 Class extension with %extend

    +

    21.7.2 Class extension with %extend

    @@ -3708,7 +3712,7 @@ Vector(2,3,4) in any way---the extensions only show up in the Java interface.

    -

    20.7.3 Exception handling with %exception and %javaexception

    +

    21.7.3 Exception handling with %exception and %javaexception

    @@ -3756,7 +3760,7 @@ will produce a familiar looking Java exception: Exception in thread "main" java.lang.OutOfMemoryError: Not enough memory at exampleJNI.malloc(Native Method) at example.malloc(example.java:16) - at main.main(main.java:112) + at runme.main(runme.java:112) @@ -3816,7 +3820,9 @@ public: In the example above, java.lang.Exception is a checked exception class and so ought to be declared in the throws clause of getitem. Classes can be specified for adding to the throws clause using %javaexception(classes) instead of %exception, where classes is a string containing one or more comma separated Java classes. -The %nojavaexception feature is the equivalent to %noexception and clears previously declared exception handlers. +The %clearjavaexception feature is the equivalent to %clearexception and clears previously declared exception handlers. +The %nojavaexception feature is the equivalent to %noexception and disables the exception handler. +See Clearing features for the difference on disabling and clearing features.

    @@ -3865,7 +3871,7 @@ to raise exceptions. See the SWIG Library ch The typemap example Handling C++ exception specifications as Java exceptions provides further exception handling capabilities.

    -

    20.7.4 Method access with %javamethodmodifiers

    +

    21.7.4 Method access with %javamethodmodifiers

    @@ -3891,7 +3897,7 @@ protected static void protect_me() {

    -

    20.8 Tips and techniques

    +

    21.8 Tips and techniques

    @@ -3901,7 +3907,7 @@ strings and arrays. This chapter discusses the common techniques for solving these problems.

    -

    20.8.1 Input and output parameters using primitive pointers and references

    +

    21.8.1 Input and output parameters using primitive pointers and references

    @@ -4075,7 +4081,7 @@ void foo(Bar *OUTPUT); will not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

    -

    20.8.2 Simple pointers

    +

    21.8.2 Simple pointers

    @@ -4141,7 +4147,7 @@ System.out.println("3 + 4 = " + result); See the SWIG Library chapter for further details.

    -

    20.8.3 Wrapping C arrays with Java arrays

    +

    21.8.3 Wrapping C arrays with Java arrays

    @@ -4208,7 +4214,7 @@ Please be aware that the typemaps in this library are not efficient as all the e There is an alternative approach using the SWIG array library and this is covered in the next section.

    -

    20.8.4 Unbounded C Arrays

    +

    21.8.4 Unbounded C Arrays

    @@ -4353,7 +4359,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

    -

    20.8.5 Overriding new and delete to allocate from Java heap

    +

    21.8.5 Overriding new and delete to allocate from Java heap

    @@ -4470,7 +4476,7 @@ model and use these functions in place of malloc and free in your own code.

    -

    20.9 Java typemaps

    +

    21.9 Java typemaps

    @@ -4491,7 +4497,7 @@ Before proceeding, it should be stressed that typemaps are not a required part of using SWIG---the default wrapping behavior is enough in most cases. Typemaps are only used if you want to change some aspect of the generated code. -

    20.9.1 Default primitive type mappings

    +

    21.9.1 Default primitive type mappings

    @@ -4643,7 +4649,7 @@ However, the mappings allow the full range of values for each C type from Java.

    -

    20.9.2 Default typemaps for non-primitive types

    +

    21.9.2 Default typemaps for non-primitive types

    @@ -4658,7 +4664,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit The Java type is either the proxy class or type wrapper class.

    -

    20.9.3 Sixty four bit JVMs

    +

    21.9.3 Sixty four bit JVMs

    @@ -4671,7 +4677,7 @@ Unfortunately it won't of course hold true for JNI code.

    -

    20.9.4 What is a typemap?

    +

    21.9.4 What is a typemap?

    @@ -4794,7 +4800,7 @@ int c = example.count('e',"Hello World"); -

    20.9.5 Typemaps for mapping C/C++ types to Java types

    +

    21.9.5 Typemaps for mapping C/C++ types to Java types

    @@ -5054,7 +5060,7 @@ These are listed below: -

    20.9.6 Java typemap attributes

    +

    21.9.6 Java typemap attributes

    @@ -5100,7 +5106,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes. Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a this call. In Java the this call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a Date marshalling example showing 'pre', 'post' and 'pgcppname' attributes in action.

    -

    20.9.7 Java special variables

    +

    21.9.7 Java special variables

    @@ -5243,7 +5249,7 @@ This special variable expands to the intermediary class name. Usually this is th unless the jniclassname attribute is specified in the %module directive.

    -

    20.9.8 Typemaps for both C and C++ compilation

    +

    21.9.8 Typemaps for both C and C++ compilation

    @@ -5280,7 +5286,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps

    -

    20.9.9 Java code typemaps

    +

    21.9.9 Java code typemaps

    @@ -5476,7 +5482,7 @@ For the typemap to be used in all type wrapper classes, all the different types Again this is the same that is in "java.swg", barring the method modifier for getCPtr.

    -

    20.9.10 Director specific typemaps

    +

    21.9.10 Director specific typemaps

    @@ -5701,7 +5707,7 @@ The basic strategy here is to provide a default package typemap for the majority -

    20.10 Typemap Examples

    +

    21.10 Typemap Examples

    @@ -5711,7 +5717,7 @@ the SWIG library.

    -

    20.10.1 Simpler Java enums for enums without initializers

    +

    21.10.1 Simpler Java enums for enums without initializers

    @@ -5790,7 +5796,7 @@ This would be done by using the original versions of these typemaps in "enums.sw

    -

    20.10.2 Handling C++ exception specifications as Java exceptions

    +

    21.10.2 Handling C++ exception specifications as Java exceptions

    @@ -5915,7 +5921,7 @@ We could alternatively have used %rename to rename what() into

    -

    20.10.3 NaN Exception - exception handling for a particular type

    +

    21.10.3 NaN Exception - exception handling for a particular type

    @@ -6070,7 +6076,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.

    -

    20.10.4 Converting Java String arrays to char **

    +

    21.10.4 Converting Java String arrays to char **

    @@ -6164,9 +6170,9 @@ When this module is compiled, our wrapped C functions can be used by the followi 

    -// File main.java
+// File runme.java
 
-public class main {
+public class runme {
 
   static {
     try {
@@ -6192,7 +6198,7 @@ When compiled and run we get:
 
    
 
 
    -$ java main
+$ java runme
 argv[0] = Cat
 argv[1] = Dog
 argv[2] = Cow
@@ -6214,7 +6220,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify
 what Java types to use.
 
    
 
-
    20.10.5 Expanding a Java object to multiple arguments
    
+
    21.10.5 Expanding a Java object to multiple arguments
    
 
 
 
    
@@ -6296,7 +6302,7 @@ example.foo(new String[]{"red", "green", "blue", "white"});
 
    
 
 
-
    20.10.6 Using typemaps to return arguments
    
+
    21.10.6 Using typemaps to return arguments
    
 
 
 
    
@@ -6383,9 +6389,9 @@ The following Java program demonstrates this:
 
    
 
 
    -// File: main.java
+// File: runme.java
 
-public class main {
+public class runme {
 
   static {
     try {
@@ -6410,11 +6416,11 @@ When compiled and run we get:
 
    
 
 
    -$ java main
+$ java runme
 1 12.0  340.0
 
    
 
-
    20.10.7 Adding Java downcasts to polymorphic return types
    
+
    21.10.7 Adding Java downcasts to polymorphic return types
    
 
 
 
    
@@ -6470,7 +6476,7 @@ We get:
 
     Ambulance started
 java.lang.ClassCastException
-        at main.main(main.java:16)
+        at runme.main(runme.java:16)
 
    
 
 
    
@@ -6620,7 +6626,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a
 Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.
 
    
 
-
    20.10.8 Adding an equals method to the Java classes
    
+
    21.10.8 Adding an equals method to the Java classes
    
 
 
 
    
@@ -6664,7 +6670,7 @@ System.out.println("foo1? " + foo1.equals(foo2));
 
    
 
 
-
    20.10.9 Void pointers and a common Java base class
    
+
    21.10.9 Void pointers and a common Java base class
    
 
 
 
    
@@ -6723,7 +6729,7 @@ This example contains some useful functionality which you may want in your code.
     
  •  It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer.
 
 
-
    20.10.10 Struct pointer to pointer
    
+
    21.10.10 Struct pointer to pointer
    
 
 
 
    
@@ -6903,7 +6909,7 @@ The C functional interface has been completely morphed into an object-oriented i
 the Butler class would behave much like any pure Java class and feel more natural to Java users.
 
    
 
-
    20.10.11 Memory management when returning references to member variables
    
+
    21.10.11 Memory management when returning references to member variables
    
 
 
 
    
@@ -7026,7 +7032,7 @@ public class Bike {
 Note the addReference call.
 
    
 
-
    20.10.12 Memory management for objects passed to the C++ layer
    
+
    21.10.12 Memory management for objects passed to the C++ layer
    
 
 
 
    
@@ -7142,7 +7148,7 @@ The 'javacode' typemap simply adds in the specified code into the Java proxy cla
    • -

    20.10.13 Date marshalling using the javain typemap and associated attributes

    +

    21.10.13 Date marshalling using the javain typemap and associated attributes

    @@ -7319,7 +7325,7 @@ A few things to note: -

    20.11 Living with Java Directors

    +

    21.11 Living with Java Directors

    @@ -7500,10 +7506,10 @@ public abstract class UserVisibleFoo extends Foo {

    • -

    20.12 Odds and ends

    +

    21.12 Odds and ends

    -

    20.12.1 JavaDoc comments

    +

    21.12.1 JavaDoc comments

    @@ -7559,7 +7565,7 @@ public class Barmy { -

    20.12.2 Functional interface without proxy classes

    +

    21.12.2 Functional interface without proxy classes

    @@ -7620,7 +7626,7 @@ All destructors have to be called manually for example the delete_Foo(foo) -

    20.12.3 Using your own JNI functions

    +

    21.12.3 Using your own JNI functions

    @@ -7670,7 +7676,7 @@ This directive is only really useful if you want to mix your own hand crafted JN

    -

    20.12.4 Performance concerns and hints

    +

    21.12.4 Performance concerns and hints

    @@ -7691,7 +7697,7 @@ However, you will have to be careful about memory management and make sure that This method normally calls the C++ destructor or free() for C code.

    -

    20.12.5 Debugging

    +

    21.12.5 Debugging

    @@ -7713,7 +7719,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh

    -

    20.13 Examples

    +

    21.13 Examples

    diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html index 586e1ecab..7293f31fe 100644 --- a/Doc/Manual/Library.html +++ b/Doc/Manual/Library.html @@ -14,7 +14,7 @@

  • C Arrays and Pointers @@ -316,7 +316,7 @@ In this example, the function int_to_uint() would be used to cast type Note: When working with simple pointers, typemaps can often be used to provide more seamless operation.

    -

    8.2.2 carrays.i

    +

    8.2.2 carrays.i

    @@ -419,7 +419,9 @@ delete_doubleArray(a) # Destroy array +

    %array_class(type,name) +

    diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html index ca2d0414e..53cddab83 100644 --- a/Doc/Manual/Lisp.html +++ b/Doc/Manual/Lisp.html @@ -6,7 +6,7 @@ -

    21 SWIG and Common Lisp

    +

    22 SWIG and Common Lisp

      @@ -41,7 +41,7 @@ Lisp, Common Foreign Function Interface(CFFI), CLisp and UFFI foreign function interfaces.

      -

      21.1 Allegro Common Lisp

      +

      22.1 Allegro Common Lisp

      @@ -50,7 +50,7 @@ here

      -

      21.2 Common Foreign Function Interface(CFFI)

      +

      22.2 Common Foreign Function Interface(CFFI)

      @@ -77,7 +77,7 @@ swig -cffi -module module-name file-name files and the various things which you can do with them.

      -

      21.2.1 Additional Commandline Options

      +

      22.2.1 Additional Commandline Options

      @@ -118,7 +118,7 @@ swig -cffi -help -

      21.2.2 Generating CFFI bindings

      +

      22.2.2 Generating CFFI bindings

      As we mentioned earlier the ideal way to use SWIG is to use interface @@ -392,7 +392,7 @@ The feature intern_function ensures that all C names are
    -

    21.2.3 Generating CFFI bindings for C++ code

    +

    22.2.3 Generating CFFI bindings for C++ code

    This feature to SWIG (for CFFI) is very new and still far from @@ -568,7 +568,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI module feel free to contact us on the SWIG mailing list, and also please add a "[CFFI]" tag in the subject line. -

    21.2.4 Inserting user code into generated files

    +

    22.2.4 Inserting user code into generated files

    @@ -583,7 +583,7 @@ using the SWIG %insert(section) %{ ...code... %} directive: 

     %module example
 
-%insert("runtime") %{
+%{
 #include "header.h"
 %}
 
@@ -604,11 +604,11 @@ generated lisp interface file:
 
 
    
 Note that the block %{ ... %} is effectively a shortcut for
-%insert("runtime") %{ ... %}.
+%insert("header") %{ ... %}.
 
    
 
 
-
    21.3 CLISP
    
+
    22.3 CLISP
    
 
 
 
    
@@ -638,7 +638,7 @@ swig -clisp -module module-name   file-name
     interface file for the CLISP module. The CLISP module tries to
     produce code which is both human readable and easily modifyable.
 
    
-
    21.3.1 Additional Commandline Options 
    
+
    22.3.1 Additional Commandline Options 
    
 
 
 
    
@@ -671,7 +671,7 @@ and global variables will be created otherwise only definitions for
    
 
 
 
-
    21.3.2 Details on CLISP bindings
    
+
    22.3.2 Details on CLISP bindings
    
 
 
 
    
@@ -795,7 +795,7 @@ struct bar {
    -

    21.4 UFFI

    +

    22.4 UFFI

    diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index 4ebf02349..e66c1c7f3 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -6,7 +6,7 @@ -

    22 SWIG and Lua

    +

    23 SWIG and Lua

    -
  • Details on the Lua binding +
  • Typemaps +
  • Writing typemaps + +
  • Customization of your Bindings + +
  • Details on the Lua binding + @@ -52,13 +67,13 @@

    Lua is an extension programming language designed to support general procedural programming with data description facilities. It also offers good support for object-oriented programming, functional programming, and data-driven programming. Lua is intended to be used as a powerful, light-weight configuration language for any program that needs one. Lua is implemented as a library, written in clean C (that is, in the common subset of ANSI C and C++). Its also a really tiny language, less than 6000 lines of code, which compiles to <100 kilobytes of binary code. It can be found at http://www.lua.org

    -

    22.1 Preliminaries

    +

    23.1 Preliminaries

    The current SWIG implementation is designed to work with Lua 5.0.x and Lua 5.1.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. ((Currently SWIG generated code has only been tested on Windows with MingW, though given the nature of Lua, is should not have problems on other OS's)). It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms).

    -

    22.2 Running SWIG

    +

    23.2 Running SWIG

    @@ -90,7 +105,7 @@ This creates a C/C++ source file example_wrap.c or example_wrap.cxx

    The name of the wrapper file is derived from the name of the input file. For example, if the input file is example.i, the name of the wrapper file is example_wrap.c. To change this, you can use the -o option. The wrappered module will export one function "int luaopen_example(lua_State* L)" which must be called to register the module with the Lua interpreter. The name "luaopen_example" depends upon the name of the module.

    -

    22.2.1 Compiling and Linking and Interpreter

    +

    23.2.1 Compiling and Linking and Interpreter

    @@ -137,7 +152,7 @@ $ gcc -c example.c -o example.o $ gcc -I/usr/include/lua -L/usr/lib/lua min.o example_wrap.o example.o -o my_lua -

    22.2.2 Compiling a dynamic module

    +

    23.2.2 Compiling a dynamic module

    @@ -205,7 +220,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib -

    22.2.3 Using your module

    +

    23.2.3 Using your module

    @@ -223,19 +238,19 @@ $ ./my_lua > -

    22.3 A tour of basic C/C++ wrapping

    +

    23.3 A tour of basic C/C++ wrapping

    By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.

    -

    22.3.1 Modules

    +

    23.3.1 Modules

    The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.

    -

    22.3.2 Functions

    +

    23.3.2 Functions

    @@ -273,7 +288,7 @@ It is also possible to rename the module with an assignment. 24 -

    22.3.3 Global variables

    +

    23.3.3 Global variables

    @@ -347,7 +362,7 @@ nil 3.142 -

    22.3.4 Constants and enums

    +

    23.3.4 Constants and enums

    @@ -370,7 +385,7 @@ example.SUNDAY=0

    Constants are not guaranteed to remain constant in Lua. The name of the constant could be accidentally reassigned to refer to some other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

    -

    22.3.5 Pointers

    +

    23.3.5 Pointers

    @@ -408,7 +423,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor nil -

    22.3.6 Structures

    +

    23.3.6 Structures

    @@ -494,7 +509,7 @@ Because the pointer points inside the structure, you can modify the contents and > x.a = 3 -- Modifies the same structure -

    22.3.7 C++ classes

    +

    23.3.7 C++ classes

    @@ -555,7 +570,7 @@ It is not (currently) possible to access static members of an instance: -- does NOT work -

    22.3.8 C++ inheritance

    +

    23.3.8 C++ inheritance

    @@ -580,7 +595,7 @@ then the function spam() accepts a Foo pointer or a pointer to any clas

    It is safe to use multiple inheritance with SWIG.

    -

    22.3.9 Pointers, references, values, and arrays

    +

    23.3.9 Pointers, references, values, and arrays

    @@ -611,7 +626,7 @@ Foo spam7();

    then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.

    -

    22.3.10 C++ overloaded functions

    +

    23.3.10 C++ overloaded functions

    @@ -697,7 +712,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin

    Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.

    -

    22.3.11 C++ operators

    +

    23.3.11 C++ operators

    @@ -809,7 +824,7 @@ It is also possible to overload the operator[], but currently this cann }; -

    22.3.12 Class extension with %extend

    +

    23.3.12 Class extension with %extend

    @@ -864,7 +879,7 @@ true

    Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).

    -

    22.3.13 C++ templates

    +

    23.3.13 C++ templates

    @@ -899,7 +914,7 @@ In Lua:

    Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.

    -

    22.3.14 C++ Smart Pointers

    +

    23.3.14 C++ Smart Pointers

    @@ -951,7 +966,7 @@ If you ever need to access the underlying pointer returned by operator->( > f = p:__deref__() -- Returns underlying Foo * -

    22.3.15 C++ Exceptions

    +

    23.3.15 C++ Exceptions

    @@ -1003,8 +1018,9 @@ stack traceback:

    -SWIG is able to throw numeric types, enums, chars, char*'s and std::string's without problem. -However its not so simple for to throw objects. +SWIG is able to throw numeric types, enums, chars, char*'s and std::string's without problem. It has also written typemaps for std::exception and its derived classes, which convert the exception into and error string.

    +

    +However its not so simple for to throw other types of objects. Thrown objects are not valid outside the 'catch' block. Therefore they cannot be returned to the interpreter. The obvious ways to overcome this would be to either return a copy of the object, or so convert the object to a string and @@ -1038,10 +1054,6 @@ To get a more useful behaviour out of SWIG you must either: provide a way to con throw objects which can be copied.

    -SWIG has typemaps for std::exception and its children already written, so a function which throws any of these will -automatically have its exception converted into an error string. -

    -

    If you have your own class which you want output as a string you will need to add a typemap something like this: 

    @@ -1098,7 +1110,271 @@ add exception specification to functions or globally (respectively).
 
    
 
 
-
    22.3.16 Writing your own custom wrappers
    
+
    23.4 Typemaps
    
+
+
+
    This section explains what typemaps are and the usage of them. The default wrappering behaviour of SWIG is enough in most cases. However sometimes SWIG may need a little additional assistance to know which typemap to apply to provide the best wrappering. This section will be explaining how to use typemaps to best effect
    
+
+
    23.4.1 What is a typemap?
    
+
+
+
    A typemap is nothing more than a code generation rule that is attached to a specific C datatype. For example, to convert integers from Lua to C, you might define a typemap like this:
    
+
+
    %module example
+
+%typemap(in) int {
+	$1 = (int) lua_tonumber(L,$input);
+	printf("Received an integer : %d\n",$1);
+}
+%inline %{
+extern int fact(int n);
+%}
+
    
+
+
    Note: you shouldn't use this typemap, as SWIG already has a typemap for this task. This is purely for example.
    
+
+
    Typemaps are always associated with some specific aspect of code generation. In this case, the "in" method refers to the conversion of input arguments to C/C++. The datatype int is the datatype to which the typemap will be applied. The supplied C code is used to convert values. In this code a number of special variable prefaced by a $ are used. The $1 variable is placeholder for a local variable of type int. The $input is the index on the Lua stack for the value to be used.
    
+
+
    When this example is compiled into a Lua module, it operates as follows:
    
+
+
    > require "example"
+> print(example.fact(6))
+Received an integer : 6
+720
+
    
+
+
    23.4.2 Using typemaps
    
+
+
+
    There are many ready written typemaps built into SWIG for all common types (int, float, short, long, char*, enum and more), which SWIG uses automatically, with no effort required on your part.
    
+
+
    However for more complex functions which use input/output parameters or arrays, you will need to make use of <typemaps.i>, which contains typemaps for these situations. For example, consider these functions:
    
+
+
    void add(int x, int y, int *result) {
+   *result = x + y;
+}
+
+int sub(int *x1, int *y1) {
+   return *x1-*y1;
+}
+
+void swap(int *sx, int *sy) {
+   int t=*sx;
+   *sx=*sy;
+   *sy=t;
+}
+
    
+
+
    It is clear to the programmer, that 'result' is an output parameter, 'x1' and 'y1' are input parameters and 'sx' and 'sy' are input/output parameters. However is not apparent to SWIG, so SWIG must to informed about which kind they are, so it can wrapper accordingly.
    
+
+
    One means would be to rename the argument name to help SWIG, eg void add(int x, int y, int *OUTPUT), however it is easier to use the %apply to achieve the same result, as shown below.
    
+
+
    %include <typemaps.i>
+%apply int* OUTPUT {int *result}; // int *result is output
+%apply int* INPUT {int *x1, int *y1}; // int *x1 and int *y1 are input
+%apply int* INOUT {int *sx, int *sy}; // int *sx and int *sy are input and output
+
+void add(int x, int y, int *result);
+int sub(int *x1, int *y1);
+void swap(int *sx, int *sy);
+
    
+
+
    When wrapped, it gives the following results:
    
+
+
    > require "example"
+> print(example.add(1,2))
+3
+> print(demo.sub(1,2))
+-1
+> a,b=1,2
+> c,d=demo.swap(a,b)
+> print(a,b,c,d)
+1       2       2       1
+
    
+
+
    Notice, that 'result' is not required in the arguments to call the function, as it an output parameter only.  For 'sx' and 'sy' they must be passed in (as they are input), but the original value is not modified (Lua does not have a pass by reference feature). The modified results are then returned as two return values. All INPUT/OUTPUT/INOUT arguments will behave in a similar manner.
    
+
+
    Note: C++ references must be handled exactly the same way. However SWIG will automatically wrap a const int&  as an input parameter (since that it obviously input).
    
+
+
    23.4.3 Typemaps and arrays
    
+
+
+
    Arrays present a challenge for SWIG, because like pointers SWIG does not know whether these are input or output values, nor
+does SWIG have any indication of how large an array should be. However with the proper guidance SWIG can easily wrapper
+arrays for convenient usage.
    
+
+
    Given the functions:
    
+
    extern void sort_int(int* arr, int len);
+extern void sort_double(double* arr, int len);
+
    
+
+
    There are basically two ways that SWIG can deal with this. The first way, uses the <carrays.i> library
+to create an array in C/C++ then this can be filled within Lua and passed into the function. It works, but its a bit tedious.
+More details can be found in the carrays.i documention.
    
+
+
    The second and more intuitive way, would be to pass a Lua table directly into the function, and have SWIG automatically convert between Lua-table and C-array. Within the <typemaps.i> file there are typemaps ready written to perform this task. To use them is again a matter of using %appy in the correct manner.
    
+
+
    The wrapper file below, shows both the use of carrays as well as the use of the typemap to wrap arrays. 
    
+
+
    // using the C-array
+%include <carrays.i>
+// this declares a batch of function for manipulating C integer arrays
+%array_functions(int,int)
+
+extern void sort_int(int* arr, int len); // the function to wrap
+
+// using typemaps
+%include <typemaps.i>
+%apply (double *INOUT,int) {(double* arr,int len)};
+
+extern void sort_double(double* arr, int len); // the function to wrap
+
    
+
+
    Once wrappered, the functions can both be called, though with different ease of use:
    
+
+
    require "example"
+ARRAY_SIZE=10
+
+-- passing a C array to the sort_int()
+arr=example.new_int(ARRAY_SIZE) -- create the array
+for i=0,ARRAY_SIZE-1 do -- index 0..9 (just like C)
+    example.int_setitem(arr,i,math.random(1000))
+end
+example.sort_int(arr,ARRAY_SIZE)  -- call the function
+example.delete_int(arr) -- must delete the allocated memory
+
+-- use a typemap to call with a Lua-table
+-- one item of note: the typemap creates a copy, rather than edit-in-place
+t={} -- a Lua table
+for i=1,ARRAY_SIZE do -- index 1..10 (Lua style)
+    t[i]=math.random(1000)/10
+end
+t=example.sort_double(t) -- replace t with the result
+
    
+
+
    Obviously the first version could be made less tedious by writing a Lua function to perform the conversion from a table 
+to a C-array. The %luacode directive is good for this. See SWIG\Examples\lua\arrays for an example of this.
    
+
+
    Warning: in C indexes start at ZERO, in Lua indexes start at ONE. SWIG expects C-arrays to be filled for 0..N-1
+and Lua tables to be 1..N, (the indexing follows the norm for the language). In the typemap when it converts the table to an array it quietly changes the indexing accordingly. Take note of this behaviour if you have a C function which returns indexes.
    
+
+
    Note: SWIG also can support arrays of pointers in a similar manner.
    
+
+
    23.4.4 Typemaps and pointer-pointer functions
    
+
+
+
    Several C++ libraries use a pointer-pointer functions to create its objects. These functions require a pointer to a pointer which is then filled with the pointer to the new object. Microsoft's COM and DirectX as well as many other libraries have this kind of function. An example is given below:
    
+
+
    struct iMath;    // some structure
+int Create_Math(iMath** pptr); // its creator (assume it mallocs)
+
    
+
+
    Which would be used with the following C code:
    
+
+
    iMath* ptr;
+int ok;
+ok=Create_Math(&ptr);
+// do things with ptr
+//...
+free(ptr); // dispose of iMath
+
    
+
+
    SWIG has a ready written typemap to deal with such a kind of function in <typemaps.i>. It provides the correct wrappering as well as setting the flag to inform Lua that the object in question should be garbage collected. Therefore the code is simply:
    
+
+
    %include <typemaps.i>
+%apply SWIGTYPE** OUTPUT{iMath **pptr }; // tell SWIG its an output
+
+struct iMath;    // some structure
+int Create_Math(iMath** pptr); // its creator (assume it mallocs)
+
    
+
+
    The usage is as follows:
    
+
+
    ok,ptr=Create_Math() -- ptr is a iMath* which is returned with the int (ok)
+ptr=nil -- the iMath* will be GC'ed as normal
+
    
+
+
    23.5 Writing typemaps
    
+
+
+
    This section describes how you can modify SWIG's default wrapping behavior for various C/C++ datatypes using the %typemap directive. This is an advanced topic that assumes familiarity with the Lua C API as well as the material in the "Typemaps" chapter.
    
+
+
    Before proceeding, it should be stressed that writing typemaps is rarely needed unless you want to change some aspect of the wrappering, or to achieve an effect which in not available with the default bindings.
    
+
+
    Before proceeding, you should read the previous section on using typemaps, as well as read the ready written typemaps found in luatypemaps.swg and typemaps.i. These are both well documented and fairly easy to read. You should not attempt to write your own typemaps until you have read and can understand both of these files (they may well also give you a idea to base your worn on).
    
+
+
    23.5.1 Typemaps you can write
    
+
+
+
    There are many different types of typemap that can be written, the full list can be found in the "Typemaps" chapter. However the following are the most commonly used ones.
    
+
+
      
+
    • in this is for input arguments to functions
      • 
+
    • out this is for return types from functions
      • 
+
    • argout this is for a function argument which is actually returning something
      • 
+
    • typecheck this is used to determine which overloaded function should be called 
+(the syntax for the typecheck is different from the typemap, see typemaps for details).
      • 
+
    
+
+
    23.5.2 SWIG's Lua-C API
    
+
+
+
    This section explains the SWIG specific Lua-C API. It does not cover the main Lua-C api, as this is well documented and not worth covering.
    
+
+
    int SWIG_ConvertPtr(lua_State* L,int index,void** ptr,swig_type_info *type,int flags);
    
+
+
    
+This is the standard function used for converting a Lua userdata to a void*. It takes the value at the given index in the Lua state and converts it to a userdata. It will then provide the neccesary type checks, confirming that the pointer is compatible with the type given in 'type'. Then finally setting '*ptr' to the pointer.
+If flags is set to SWIG_POINTER_DISOWN, this is will clear any ownership flag set on the object.
    
+The returns a value which can be checked with the macro SWIG_IsOK()
+
    
+
+
    void SWIG_NewPointerObj(lua_State* L,void* ptr,swig_type_info *type,int own);
    
+
+
    
+This is the opposite of SWIG_ConvertPtr, as it pushes a new userdata which wrappers the pointer 'ptr' of type 'type'.
+The parameter 'own' specifies if the object is owned be Lua and if it is 1 then Lua will GC the object when the userdata is disposed of.
+
    
+
+
    void* SWIG_MustGetPtr(lua_State* L,int index,swig_type_info *type,int flags,int argnum,const char* func_name);
    
+
+
    
+This function is a version of SWIG_ConvertPtr(), except that it will either work, or it will trigger a lua_error() with a text error message. This function is rarely used, and may be deprecated in the future.
+
    
+
+
    SWIG_fail
    
+
+
    
+This macro, when called within the context of a SWIG wrappered function, will jump to the error handler code. This will call any cleanup code (freeing any temp variables) and then triggers a lua_error.
    
+A common use for this code is:
    +if (!SWIG_IsOK(SWIG_ConvertPtr( .....)){
+ lua_pushstring(L,"something bad happened");
+ SWIG_fail;
+}
    
+
+
    SWIG_fail_arg(char* func_name,int argnum,char* type)
    
+
+
    
+This macro, when called within the context of a SWIG wrappered function, will display the error message and jump to the error handler code. The error message is of the form 
+
    +"Error in func_name (arg argnum), expected 'type' got 'whatever the type was'"
+
    
+
+
    SWIG_fail_ptr(const char* fn_name,int argnum,swig_type_info* type);
    
+
+
    
+Similar to SWIG_fail_arg, except that it will display the swig_type_info information instead.
    
+
+
    23.6 Customization of your Bindings
    
+
+
+
    
+This section covers adding of some small extra bits to your module to add the last finishing touches.
+
    
+
+
+
+
    23.6.1 Writing your own custom wrappers
    
 
 
 
    
@@ -1117,7 +1393,7 @@ int native_function(lua_State*L) // my native code
 The %native directive in the above example, tells SWIG that there is a function int native_function(lua_State*L); which is to be added into the module under the name 'my_func'. SWIG will not add any wrappering for this function, beyond adding it into the function table. How you write your code is entirely up to you.
 
    
 
-
    22.3.17 Adding additional Lua code
    
+
    23.6.2 Adding additional Lua code
    
 
 
 
    
@@ -1155,7 +1431,7 @@ Good uses for this feature is adding of new code, or writing helper functions to
 See Examples/lua/arrays for an example of this code.
 
    
 
-
    22.4 Details on the Lua binding
    
+
    23.7 Details on the Lua binding
    
 
 
 
    
@@ -1166,7 +1442,7 @@ See Examples/lua/arrays for an example of this code.
  
 
    
 
-
    22.4.1 Binding global data into the module.
    
+
    23.7.1 Binding global data into the module.
    
 
 
 
    
@@ -1226,7 +1502,7 @@ end
 
    
 That way when you call 'a=example.Foo', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code 'example.Foo=10', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.
 
    
-
    22.4.2 Userdata and Metatables
    
+
    23.7.2 Userdata and Metatables
    
 
 
 
    
@@ -1306,7 +1582,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrappered classes/s
 
    
 Note: Operator overloads are basically done in the same way, by adding functions such as '__add' & '__call' to the classes metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.
 
    
-
    22.4.3 Memory management
    
+
    23.7.3 Memory management
    
 
 
 
    
diff --git a/Doc/Manual/Makefile b/Doc/Manual/Makefile
index 1923c2c48..4c907791b 100644
--- a/Doc/Manual/Makefile
+++ b/Doc/Manual/Makefile
@@ -18,15 +18,19 @@ HTMLDOC_OPTIONS = "--book --toclevels 4 --no-numbered --toctitle \"Table of Cont
 
 all: maketoc check generate
 
-maketoc:
+maketoc: CCache.html
 	python maketoc.py
 
+CCache.html: ../../CCache/ccache.yo
+	yodl2html -o CCache.html ../../CCache/ccache.yo
+
 # Use htmltidy to warn about some HTML errors. Note that it is not used to clean/tidy the HTML,
 # it is just used as a primitive HTML checker.
+# CCache.html is generated by yodl2html and has a few insignificant problems, so we don't put it through tidy
 check:
 	  tidy -errors --gnu-emacs yes -quiet index.html
 	  tidy -errors --gnu-emacs yes -quiet Sections.html
-	  all=`sed '/^#/d' chapters`; for a in $$all; do tidy -errors --gnu-emacs yes -quiet $$a; done;
+	  all=`sed '/^#/d' chapters | grep -v CCache.html`; for a in $$all; do tidy -errors --gnu-emacs yes -quiet $$a; done;
 
 generate: swightml.book swigpdf.book
 	htmldoc --batch swightml.book || true
@@ -45,11 +49,14 @@ swightml.book:
 	echo "Sections.html" >> swightml.book
 	cat chapters >> swightml.book
 
-clean:
+clean: clean-baks
 	rm -f swightml.book
 	rm -f swigpdf.book
+	rm -f CCache.html
 	rm -f SWIGDocumentation.html
 	rm -f SWIGDocumentation.pdf
+
+clean-baks:
 	rm -f *.bak
 
 test:
diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html
index ff70fc143..c4e485202 100644
--- a/Doc/Manual/Modula3.html
+++ b/Doc/Manual/Modula3.html
@@ -5,7 +5,7 @@
 
 
 
-
    23 SWIG and Modula-3
    
+
    24 SWIG and Modula-3
    
 
 
    
 
      
@@ -57,7 +57,7 @@ especially
 typemaps.
 
      
 
-
      23.1 Overview
      
+
      24.1 Overview
      
 
 
 
      
@@ -90,7 +90,7 @@ So the introduction got a bit longer than it should ...  ;-)
 
      
 
 
-
      23.1.1 Why not scripting ?
      
+
      24.1.1 Why not scripting ?
      
 
 
 
      
@@ -126,7 +126,7 @@ are not advantages of the language itself
 but can be provided by function libraries.
 
      
 
-
      23.1.2 Why Modula-3 ?
      
+
      24.1.2 Why Modula-3 ?
      
 
 
 
      
@@ -166,7 +166,7 @@ it's statically typed, too.
 
      
 
 
-
      23.1.3 Why C / C++ ?
      
+
      24.1.3 Why C / C++ ?
      
 
 
 
      
@@ -179,7 +179,7 @@ Even more fortunately even non-C libraries may provide C header files.
 This is where SWIG becomes helpful.
 
      
 
-
      23.1.4 Why SWIG ?
      
+
      24.1.4 Why SWIG ?
      
 
 
 
      
@@ -252,10 +252,10 @@ integrate Modula-3 code into a C / C++ project.
 
      
 
 
-
      23.2 Conception
      
+
      24.2 Conception
      
 
 
-
      23.2.1 Interfaces to C libraries
      
+
      24.2.1 Interfaces to C libraries
      
 
 
 
      
@@ -404,7 +404,7 @@ and the principal type must be renamed (%typemap).
 
      
 
 
-
      23.2.2 Interfaces to C++ libraries
      
+
      24.2.2 Interfaces to C++ libraries
      
 
 
 
      
@@ -505,10 +505,10 @@ There is no C++ library I wrote a SWIG interface for,
 so I'm not sure if this is possible or sensible, yet.
 
      
 
-
      23.3 Preliminaries
      
+
      24.3 Preliminaries
      
 
 
-
      23.3.1 Compilers
      
+
      24.3.1 Compilers
      
 
 
 
      
@@ -522,7 +522,7 @@ For testing examples I use Critical Mass cm3.
 
      
 
 
-
      23.3.2 Additional Commandline Options
      
+
      24.3.2 Additional Commandline Options
      
 
 
 
      
@@ -599,10 +599,10 @@ Instead generate templates for some basic typemaps.
 
 
 
-
      23.4 Modula-3 typemaps
      
+
      24.4 Modula-3 typemaps
      
 
 
-
      23.4.1 Inputs and outputs
      
+
      24.4.1 Inputs and outputs
      
 
 
 
      
@@ -818,7 +818,7 @@ consist of the following parts:
 
 
 
-
      23.4.2 Subranges, Enumerations, Sets
      
+
      24.4.2 Subranges, Enumerations, Sets
      
 
 
 
      
@@ -860,8 +860,8 @@ that split the task up into converting
 the C bit patterns (integer or bit set)
 into Modula-3 bit patterns (integer or bit set)
 and change the type as requested.
-See the corresponding
-example.
+See the corresponding example in the 
+Examples/modula3/enum/example.i file.
 This is quite messy and not satisfying.
 So the best what you can currently do is
 to rewrite constant definitions manually.
@@ -870,20 +870,20 @@ that I'd like to automate.
 
      
 
 
-
      23.4.3 Objects
      
+
      24.4.3 Objects
      
 
 
 
      
 Declarations of C++ classes are mapped to OBJECT types
 while it is tried to retain the access hierarchy
 "public - protected - private" using partial revelation.
-Though the
-implementation
+Though the example in 
+Examples/modula3/class/example.i
 is not really useful, yet.
 
      
 
 
-
      23.4.4 Imports
      
+
      24.4.4 Imports
      
 
 
 
      
@@ -918,7 +918,7 @@ IMPORT M3toC;
    -

    23.4.5 Exceptions

    +

    24.4.5 Exceptions

    @@ -942,7 +942,7 @@ you should declare %typemap("m3wrapinconv:throws") blah * %{OSError.E%}.

    -

    23.4.6 Example

    +

    24.4.6 Example

    @@ -989,10 +989,10 @@ where almost everything is generated by a typemap: -

    23.5 More hints to the generator

    +

    24.5 More hints to the generator

    -

    23.5.1 Features

    +

    24.5.1 Features

    @@ -1029,7 +1029,7 @@ where almost everything is generated by a typemap:
    -

    23.5.2 Pragmas

    +

    24.5.2 Pragmas

    @@ -1052,7 +1052,7 @@ where almost everything is generated by a typemap:
    -

    23.6 Remarks

    +

    24.6 Remarks

      diff --git a/Doc/Manual/Modules.html b/Doc/Manual/Modules.html index 8971324fb..5ac66dc2e 100644 --- a/Doc/Manual/Modules.html +++ b/Doc/Manual/Modules.html @@ -50,41 +50,90 @@ scripting language runtime as you would do for the single module case.

      A bit more complex is the case in which modules need to share information. -For example, when one module extends the class of the another by deriving from +For example, when one module extends the class of another by deriving from it: 

      -%module base
-
-%inline %{
+// File: base.h
 class base {
 public:
-       int foo(void);
+  int foo();
 };
-%}
        -
      -%module derived
 
-%import "base.i"
+
      +// File: base_module.i
+%module base_module
+
+%{
+#include "base.h"
+%}
+%include "base.h"
+
      
+ 
+
+
      +// File: derived_module.i
+%module derived_module
+
+%import "base_module.i"
 
 %inline %{
 class derived : public base {
 public:
-       int bar(void);
+  int bar();
 };
 %}
 
      
 
-
      To create the wrapper properly, module derived needs to know the
-base class and that it's interface is covered in another module. The
-line %import "base.i" lets SWIG know exactly that. The common mistake here is
-to %import the .h file instead of the .i, which sadly won't do the trick. Another issue
-to take care of is that multiple dependent wrappers should not be linked/loaded
+
      To create the wrapper properly, module derived_module needs to know about the
+base class and that its interface is covered in another module. The
+line %import "base_module.i" lets SWIG know exactly that. Oftentimes
+the .h file is passed to %import instead of the .i, 
+which unfortunately doesn't work for all language modules. For example, Python requires the
+name of module that the base class exists in so that the proxy classes can fully inherit the
+base class's methods. Typically you will get a warning when the module name is missing, eg:
+
      
+
+
       
      +derived_module.i:8: Warning(401): Base class 'base' ignored - unknown module name for base. Either import 
+the appropriate module interface file or specify the name of the module in the %import directive.
+
      
+
+
      
+It is sometimes desirable to import the header file rather than the interface file and overcome
+the above warning. 
+For example in the case of the imported interface being quite large, it may be desirable to
+simplify matters and just import a small header file of dependent types.
+This can be done by specifying the optional module attribute in the %import directive.
+The derived_module.i file shown above could be replaced with the following:
+
+
      +// File: derived_module.i
+%module derived_module
+
+%import(module="base_module") "base.h"
+
+%inline %{
+class derived : public base {
+public:
+  int bar();
+};
+
      
+
+
      
+Note that "base_module" is the module name and is the same as that specified in %module
+in base_module.i as well as the %import in derived_module.i.
+
      
+
+
      
+Another issue
+to beware of is that multiple dependent wrappers should not be linked/loaded
 in parallel from multiple threads as SWIG provides no locking - for more on that
-issue, read on.
      
+issue, read on.
+
      
 
 
      15.2 The SWIG runtime code
      
 
diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html
index 699168322..9413bb010 100644
--- a/Doc/Manual/Mzscheme.html
+++ b/Doc/Manual/Mzscheme.html
@@ -8,7 +8,7 @@
 
 
 
-
      24 SWIG and MzScheme
      
+
      25 SWIG and MzScheme
      
 
 
      
 
        
@@ -22,7 +22,7 @@
 
        
 This section contains information on SWIG's support of MzScheme.
 
-
        24.1 Creating native MzScheme structures
        
+
        25.1 Creating native MzScheme structures
        
 
 
 
        
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index 79ede443f..6dbf24c11 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -6,7 +6,7 @@
 
   
                    
-
        25 SWIG and Ocaml
        
+
        26 SWIG and Ocaml
        
 
 
        
 
          
@@ -80,7 +80,7 @@ If you're not familiar with the Objective Caml language, you can visit
 The Ocaml Website.
 
          
 
-
          25.1 Preliminaries
          
+
          26.1 Preliminaries
          
 
 
 
          
@@ -99,7 +99,7 @@ file Examples/Makefile illustrate how to compile and link SWIG modules that
 will be loaded dynamically.  This has only been tested on Linux so far.
 
          
 
-
          25.1.1 Running SWIG
          
+
          26.1.1 Running SWIG
          
 
 
 
          
@@ -122,7 +122,7 @@ you will compile the file  example_wrap.c with ocamlc or
 the resulting .ml and .mli files as well, and do the final link with -custom
 (not needed for native link). 
          
                
-
          25.1.2 Compiling the code
          
+
          26.1.2 Compiling the code
          
 
 
 
          
@@ -158,7 +158,7 @@ the user more freedom with respect to custom typing.
      -

      25.1.3 The camlp4 module

      +

      26.1.3 The camlp4 module

      @@ -234,7 +234,7 @@ let b = C_string (getenv "PATH") -

      25.1.4 Using your module

      +

      26.1.4 Using your module

      @@ -248,7 +248,7 @@ When linking any ocaml bytecode with your module, use the -custom option is not needed when you build native code.

      -

      25.1.5 Compilation problems and compiling with C++

      +

      26.1.5 Compilation problems and compiling with C++

      @@ -259,7 +259,7 @@ liberal with pointer types may not compile under the C++ compiler. Most code meant to be compiled as C++ will not have problems.

      -

      25.2 The low-level Ocaml/C interface

      +

      26.2 The low-level Ocaml/C interface

      @@ -360,7 +360,7 @@ is that you must append them to the return list with swig_result = caml_list_a signature for a function that uses value in this way.

      -

      25.2.1 The generated module

      +

      26.2.1 The generated module

      @@ -394,7 +394,7 @@ it describes the output SWIG will generate for class definitions. -

      25.2.2 Enums

      +

      26.2.2 Enums

      @@ -457,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a -

      25.2.2.1 Enum typing in Ocaml

      +

      26.2.2.1 Enum typing in Ocaml

      @@ -470,10 +470,10 @@ functions imported from different modules. You must convert values to master values using the swig_val function before sharing them with another module.

      -

      25.2.3 Arrays

      +

      26.2.3 Arrays

      -

      25.2.3.1 Simple types of bounded arrays

      +

      26.2.3.1 Simple types of bounded arrays

      @@ -494,7 +494,7 @@ arrays of simple types with known bounds in your code, but this only works for arrays whose bounds are completely specified.

      -

      25.2.3.2 Complex and unbounded arrays

      +

      26.2.3.2 Complex and unbounded arrays

      @@ -507,7 +507,7 @@ SWIG can't predict which of these methods will be used in the array, so you have to specify it for yourself in the form of a typemap.

      -

      25.2.3.3 Using an object

      +

      26.2.3.3 Using an object

      @@ -521,7 +521,7 @@ Consider writing an object when the ending condition of your array is complex, such as using a required sentinel, etc.

      -

      25.2.3.4 Example typemap for a function taking float * and int

      +

      26.2.3.4 Example typemap for a function taking float * and int

      @@ -572,7 +572,7 @@ void printfloats( float *tab, int len ); -

      25.2.4 C++ Classes

      +

      26.2.4 C++ Classes

      @@ -615,7 +615,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the returned value for the same object.

      -

      25.2.4.1 STL vector and string Example

      +

      26.2.4.1 STL vector and string Example

      @@ -695,7 +695,7 @@ baz # -

      25.2.4.2 C++ Class Example

      +

      26.2.4.2 C++ Class Example

      @@ -725,7 +725,7 @@ public: }; -

      25.2.4.3 Compiling the example

      +

      26.2.4.3 Compiling the example

      @@ -743,7 +743,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
      -

      25.2.4.4 Sample Session

      +

      26.2.4.4 Sample Session

      @@ -770,10 +770,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.  
 
      
 
-
      25.2.5 Director Classes
      
+
      26.2.5 Director Classes
      
 
 
-
      25.2.5.1 Director Introduction
      
+
      26.2.5.1 Director Introduction
      
 
 
 
      
@@ -800,7 +800,7 @@ class foo {
 };
      -

      25.2.5.2 Overriding Methods in Ocaml

      +

      26.2.5.2 Overriding Methods in Ocaml

      @@ -828,7 +828,7 @@ In this example, I'll examine the objective caml code involved in providing an overloaded class. This example is contained in Examples/ocaml/shapes.

      -

      25.2.5.3 Director Usage Example

      +

      26.2.5.3 Director Usage Example

      @@ -887,7 +887,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the program in C++.

      -

      25.2.5.4 Creating director objects

      +

      26.2.5.4 Creating director objects

      @@ -928,7 +928,7 @@ object from causing a core dump, as long as the object is destroyed properly.

      -

      25.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      +

      26.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      @@ -939,7 +939,7 @@ well as a function return value in the same way you provide function arguments, and to receive arguments the same way you normally receive function returns.

      -

      25.2.5.6 directorin typemap

      +

      26.2.5.6 directorin typemap

      @@ -950,7 +950,7 @@ code receives when you are called. In general, a simple directorin typ can use the same body as a simple out typemap.

      -

      25.2.5.7 directorout typemap

      +

      26.2.5.7 directorout typemap

      @@ -961,7 +961,7 @@ for the same type, except when there are special requirements for object ownership, etc.

      -

      25.2.5.8 directorargout typemap

      +

      26.2.5.8 directorargout typemap

      @@ -978,7 +978,7 @@ In the event that you don't specify all of the necessary values, integral values will read zero, and struct or object returns have undefined results.

      -

      25.2.6 Exceptions

      +

      26.2.6 Exceptions

      diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index 97e1be17c..7409d78f1 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -8,7 +8,7 @@ -

      26 SWIG and Octave

      +

      27 SWIG and Octave

        @@ -54,14 +54,14 @@ More information can be found at www.octave.org< Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).

        -

        26.1 Preliminaries

        +

        27.1 Preliminaries

        The current SWIG implemention is based on Octave 2.9.12. Support for other versions (in particular the recent 3.0) has not been tested, nor has support for any OS other than Linux.

        -

        26.2 Running SWIG

        +

        27.2 Running SWIG

        @@ -89,7 +89,7 @@ This creates a C/C++ source file example_wrap.cxx. The generated C++ so The swig command line has a number of options you can use, like to redirect it's output. Use swig --help to learn about these.

        -

        26.2.1 Compiling a dynamic module

        +

        27.2.1 Compiling a dynamic module

        @@ -116,7 +116,7 @@ $ mkoctfile example_wrap.cxx example.c 

        octave:1> example
        -

        26.2.2 Using your module

        +

        27.2.2 Using your module

        @@ -134,10 +134,10 @@ octave:4> example.cvar.Foo=4; octave:5> example.cvar.Foo ans = 4

      -

      26.3 A tour of basic C/C++ wrapping

      +

      27.3 A tour of basic C/C++ wrapping

      -

      26.3.1 Modules

      +

      27.3.1 Modules

      @@ -179,7 +179,7 @@ One can also rename it by simple assignment, e.g., octave:1> some_vars = cvar; -

      26.3.2 Functions

      +

      27.3.2 Functions

      @@ -196,7 +196,7 @@ int fact(int n); 

      octave:1> example.fact(4)
 24
      -

      26.3.3 Global variables

      +

      27.3.3 Global variables

      @@ -249,7 +249,7 @@ octave:2> example.PI=3.142; octave:3> example.PI ans = 3.1420 -

      26.3.4 Constants and enums

      +

      27.3.4 Constants and enums

      @@ -271,7 +271,7 @@ example.SCONST="Hello World" example.SUNDAY=0 .... -

      26.3.5 Pointers

      +

      27.3.5 Pointers

      @@ -318,7 +318,7 @@ octave:2> f=example.fopen("not there","r"); error: value on right hand side of assignment is undefined error: evaluating assignment expression near line 2, column 2 -

      26.3.6 Structures and C++ classes

      +

      27.3.6 Structures and C++ classes

      @@ -453,7 +453,7 @@ ans = 1 Depending on the ownership setting of a swig_ref, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.

      -

      26.3.7 C++ inheritance

      +

      27.3.7 C++ inheritance

      @@ -462,7 +462,7 @@ This information contains the full class hierarchy. When an indexing operation ( the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the swig_ref.

      -

      26.3.8 C++ overloaded functions

      +

      27.3.8 C++ overloaded functions

      @@ -472,7 +472,7 @@ The dispatch function selects which overload to call (if any) based on the passe typecheck typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.

      -

      26.3.9 C++ operators

      +

      27.3.9 C++ operators

      @@ -572,7 +572,7 @@ On the C++ side, the default mappings are as follows: %rename(__brace) *::operator[]; -

      26.3.10 Class extension with %extend

      +

      27.3.10 Class extension with %extend

      @@ -602,7 +602,7 @@ octave:3> printf("%s\n",a); octave:4> a.__str() 4 -

      26.3.11 C++ templates

      +

      27.3.11 C++ templates

      @@ -679,14 +679,14 @@ ans = -

      26.3.12 C++ Smart Pointers

      +

      27.3.12 C++ Smart Pointers

      C++ smart pointers are fully supported as in other modules.

      -

      26.3.13 Directors (calling Octave from C++ code)

      +

      27.3.13 Directors (calling Octave from C++ code)

      @@ -766,14 +766,14 @@ c-side routine called octave-side routine called -

      26.3.14 Threads

      +

      27.3.14 Threads

      The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.

      -

      26.3.15 Memory management

      +

      27.3.15 Memory management

      @@ -807,14 +807,14 @@ The %newobject directive may be used to control this behavior for pointers retur In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/subclass()'ing).

      -

      26.3.16 STL support

      +

      27.3.16 STL support

      This is some skeleton support for various STL containers.

      -

      26.3.17 Matrix typemaps

      +

      27.3.17 Matrix typemaps

      diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html index b7cdaf0e5..1dc8e7d2f 100644 --- a/Doc/Manual/Perl5.html +++ b/Doc/Manual/Perl5.html @@ -6,7 +6,7 @@ -

      27 SWIG and Perl5

      +

      28 SWIG and Perl5

        @@ -87,7 +87,7 @@ later. Earlier versions are problematic and SWIG generated extensions may not compile or run correctly.

        -

        27.1 Overview

        +

        28.1 Overview

        @@ -108,7 +108,7 @@ described. Advanced customization features, typemaps, and other options are found near the end of the chapter.

        -

        27.2 Preliminaries

        +

        28.2 Preliminaries

        @@ -133,7 +133,7 @@ To build the module, you will need to compile the file example_wrap.c and link it with the rest of your program.

        -

        27.2.1 Getting the right header files

        +

        28.2.1 Getting the right header files

        @@ -165,7 +165,7 @@ loaded, an easy way to find out is to run Perl itself.

      -

      27.2.2 Compiling a dynamic module

      +

      28.2.2 Compiling a dynamic module

      @@ -198,7 +198,7 @@ the target should be named `example.so', `example.sl', or the appropriate dynamic module name on your system.

      -

      27.2.3 Building a dynamic module with MakeMaker

      +

      28.2.3 Building a dynamic module with MakeMaker

      @@ -232,7 +232,7 @@ the preferred approach to compilation. More information about MakeMaker can be found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen, and Randal Schwartz.

      -

      27.2.4 Building a static version of Perl

      +

      28.2.4 Building a static version of Perl

      @@ -301,7 +301,7 @@ added to it. Depending on your machine, you may need to link with additional libraries such as -lsocket, -lnsl, -ldl, etc.

      -

      27.2.5 Using the module

      +

      28.2.5 Using the module

      @@ -456,7 +456,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      27.2.6 Compilation problems and compiling with C++

      +

      28.2.6 Compilation problems and compiling with C++

      @@ -599,7 +599,7 @@ have to find the macro that conflicts and add an #undef into the .i file. Pleas any conflicting macros you find to swig-user mailing list.

      -

      27.2.7 Compiling for 64-bit platforms

      +

      28.2.7 Compiling for 64-bit platforms

      @@ -626,7 +626,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

      -

      27.3 Building Perl Extensions under Windows

      +

      28.3 Building Perl Extensions under Windows

      @@ -637,7 +637,7 @@ section assumes you are using SWIG with Microsoft Visual C++ although the procedure may be similar with other compilers.

      -

      27.3.1 Running SWIG from Developer Studio

      +

      28.3.1 Running SWIG from Developer Studio

      @@ -700,7 +700,7 @@ print "$a\n"; -

      27.3.2 Using other compilers

      +

      28.3.2 Using other compilers

      @@ -708,7 +708,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows. For general hints and suggestions refer to the Windows chapter.

      -

      27.4 The low-level interface

      +

      28.4 The low-level interface

      @@ -718,7 +718,7 @@ can be used to control your application. However, it is also used to construct more user-friendly proxy classes as described in the next section.

      -

      27.4.1 Functions

      +

      28.4.1 Functions

      @@ -741,7 +741,7 @@ use example; $a = &example::fact(2); -

      27.4.2 Global variables

      +

      28.4.2 Global variables

      @@ -811,7 +811,7 @@ extern char *path; // Declared later in the input -

      27.4.3 Constants

      +

      28.4.3 Constants

      @@ -838,7 +838,7 @@ $example::FOO = 2; # Error -

      27.4.4 Pointers

      +

      28.4.4 Pointers

      @@ -947,7 +947,7 @@ as XS and xsubpp. Given the advancement of the SWIG typesystem and the SWIG and XS, this is no longer supported.

      -

      27.4.5 Structures

      +

      28.4.5 Structures

      @@ -1081,7 +1081,7 @@ void Bar_f_set(Bar *b, Foo *val) { -

      27.4.6 C++ classes

      +

      28.4.6 C++ classes

      @@ -1146,7 +1146,7 @@ provides direct access to C++ objects. A higher level interface using Perl prox can be built using these low-level accessors. This is described shortly.

      -

      27.4.7 C++ classes and type-checking

      +

      28.4.7 C++ classes and type-checking

      @@ -1182,7 +1182,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece multiple inheritance is used).

      -

      27.4.8 C++ overloaded functions

      +

      28.4.8 C++ overloaded functions

      @@ -1226,7 +1226,7 @@ example::Spam_foo_d($s,3.14); Please refer to the "SWIG Basics" chapter for more information.

      -

      27.4.9 Operators

      +

      28.4.9 Operators

      @@ -1253,7 +1253,7 @@ The following C++ operators are currently supported by the Perl module:

    • operator or
      • -

      27.4.10 Modules and packages

      +

      28.4.10 Modules and packages

      @@ -1348,7 +1348,7 @@ print Foo::fact(4),"\n"; # Call a function in package FooBar --> -

      27.5 Input and output parameters

      +

      28.5 Input and output parameters

      @@ -1567,7 +1567,7 @@ print "$c\n"; Note: The REFERENCE feature is only currently supported for numeric types (integers and floating point).

      -

      27.6 Exception handling

      +

      28.6 Exception handling

      @@ -1732,7 +1732,7 @@ This is still supported, but it is deprecated. The newer %exception di functionality, but it has additional capabilities that make it more powerful.

      -

      27.7 Remapping datatypes with typemaps

      +

      28.7 Remapping datatypes with typemaps

      @@ -1749,7 +1749,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Perl interface.

      -

      27.7.1 A simple typemap example

      +

      28.7.1 A simple typemap example

      @@ -1853,7 +1853,7 @@ example::count("e","Hello World"); -

      27.7.2 Perl5 typemaps

      +

      28.7.2 Perl5 typemaps

      @@ -1958,7 +1958,7 @@ Return of C++ member data (all languages). Check value of input parameter. -

      27.7.3 Typemap variables

      +

      28.7.3 Typemap variables

      @@ -2029,7 +2029,7 @@ properly assigned. The Perl name of the wrapper function being created. -

      27.7.4 Useful functions

      +

      28.7.4 Useful functions

      @@ -2098,7 +2098,7 @@ int sv_isa(SV *, char *0; -

      27.8 Typemap Examples

      +

      28.8 Typemap Examples

      @@ -2107,7 +2107,7 @@ might look at the files "perl5.swg" and "typemaps.i" in the SWIG library.

      -

      27.8.1 Converting a Perl5 array to a char **

      +

      28.8.1 Converting a Perl5 array to a char **

      @@ -2199,7 +2199,7 @@ print @$b,"\n"; # Print it out -

      27.8.2 Return values

      +

      28.8.2 Return values

      @@ -2228,7 +2228,7 @@ can be done using the EXTEND() macro as in : } -

      27.8.3 Returning values from arguments

      +

      28.8.3 Returning values from arguments

      @@ -2282,7 +2282,7 @@ print "multout(7,13) = @r\n"; ($x,$y) = multout(7,13); -

      27.8.4 Accessing array structure members

      +

      28.8.4 Accessing array structure members

      @@ -2345,7 +2345,7 @@ the "in" typemap in the previous section would be used to convert an to copy the converted array into a C data structure.

      -

      27.8.5 Turning Perl references into C pointers

      +

      28.8.5 Turning Perl references into C pointers

      @@ -2410,7 +2410,7 @@ print "$c\n"; -

      27.8.6 Pointer handling

      +

      28.8.6 Pointer handling

      @@ -2489,7 +2489,7 @@ For example: -

      27.9 Proxy classes

      +

      28.9 Proxy classes

      @@ -2505,7 +2505,7 @@ to the underlying code. This section describes the implementation details of the proxy interface.

      -

      27.9.1 Preliminaries

      +

      28.9.1 Preliminaries

      @@ -2527,7 +2527,7 @@ SWIG creates a collection of high-level Perl wrappers. In your scripts, you wil high level wrappers. The wrappers, in turn, interact with the low-level procedural module.

      -

      27.9.2 Structure and class wrappers

      +

      28.9.2 Structure and class wrappers

      @@ -2653,7 +2653,7 @@ $v->DESTROY(); -

      27.9.3 Object Ownership

      +

      28.9.3 Object Ownership

      @@ -2740,7 +2740,7 @@ counting, garbage collection, or advanced features one might find in sophisticated languages.

      -

      27.9.4 Nested Objects

      +

      28.9.4 Nested Objects

      @@ -2793,7 +2793,7 @@ $p->{f}->{x} = 0.0; %${$p->{v}} = ( x=>0, y=>0, z=>0); -

      27.9.5 Proxy Functions

      +

      28.9.5 Proxy Functions

      @@ -2827,7 +2827,7 @@ This function replaces the original function, but operates in an identical manner.

      -

      27.9.6 Inheritance

      +

      28.9.6 Inheritance

      @@ -2903,7 +2903,7 @@ particular, inheritance of data members is extremely tricky (and I'm not even sure if it really works).

      -

      27.9.7 Modifying the proxy methods

      +

      28.9.7 Modifying the proxy methods

      @@ -2931,7 +2931,7 @@ public: }; -

      27.10 Adding additional Perl code

      +

      28.10 Adding additional Perl code

      diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index 6b654fde5..d56edcb5f 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -7,14 +7,13 @@ -

      28 SWIG and PHP

      +

      29 SWIG and PHP

      • Generating PHP Extensions
      • Basic PHP interface @@ -43,21 +42,24 @@ Caution: This chapter (and module!) is still under construction

        +

        +SWIG supports generating wrappers for PHP5. Support for PHP4 has been removed +as of SWIG 1.3.37. The PHP developers are no longer making new PHP4 releases, +and won't even be patching critical security issues after 2008-08-08, so it +doesn't make much sense for SWIG to continue to support PHP4 at this point. +If you need to continue to use PHP4, stick with SWIG 1.3.36. +

        +

        In this chapter, we discuss SWIG's support of PHP. The PHP module -was extensively rewritten in release 1.3.26, and although it is -significantly more functional, it still does not implement all the +was extensively rewritten in release 1.3.26, and support for generating +OO wrappers for PHP5 was added in 1.3.30. The PHP module works fairly +well, but currently does not implement all the features available in some of the other languages.

        -The examples and test cases have been developed with PHP4. Release -1.3.30 added support for generating PHP5 class wrappers for C++ -libraries. -

        - -

        -In order to use this module, you will need to have a copy of the PHP4 or PHP5 +In order to use this module, you will need to have a copy of the PHP5 include files to compile the SWIG generated files. If you installed PHP from a binary package, you may need to install a "php-dev" or "php-devel" package for these to be installed. You can find out where these files are @@ -67,7 +69,7 @@ your extension into php directly, you will need the complete PHP source tree available.

        -

        28.1 Generating PHP Extensions

        +

        29.1 Generating PHP Extensions

        @@ -88,7 +90,7 @@ you wish to statically link the extension into the php interpreter. The third file, example.php can be included by PHP scripts. It attempts to dynamically load the extension and contains extra php code specified -in the interface file. If wrapping C++ code for PHP5, it will +in the interface file. If wrapping C++ code with PHP classes, it will also contain PHP5 class wrappers.

        @@ -100,7 +102,8 @@ more detail in section 27.2.6.

        The usual (and recommended) way is to build the extension as a separate -dynamically loaded module. You can then specify that this be loaded +dynamically loaded module (which is supported by all modern operating +systems). You can then specify that this be loaded automatically in php.ini or load it explicitly for any script which needs it.

        @@ -110,17 +113,16 @@ It is also possible to rebuild PHP from source so that your module is statically linked into the php executable/library. This is a lot more work, and also requires a full rebuild of PHP to update your module, and it doesn't play nicely with package system. We don't recommend -this approach, but if you really want to do this, the -phpfull -command line argument to swig may be of use - see below for details. +this approach, or provide explicit support for it.

        -

        28.1.1 Building a loadable extension

        +

        29.1.1 Building a loadable extension

        To build your module as a dynamically loadable extension, use compilation commands like these (if you aren't using GCC, the commands will be different, -and there may be so variation between platforms - these commands should at +and there may be some variation between platforms - these commands should at least work for Linux though):

        @@ -129,135 +131,7 @@ least work for Linux though): gcc -shared example_wrap.o -o example.so
      -

      -There is a deprecated -make command line argument to swig which will -generate an additional file makefile which can usually build the -extension (at least on some UNIX platforms), but the Makefile generated isn't -very flexible, and the commands required are trivial so it is simpler to just -add them to your Makefile or other build system directly. We recommend that -you don't use -make and it's likely to be removed at some point. -

      - -

      28.1.2 Building extensions into PHP

      - - -

      -Note that we don't recommend this approach - it's cleaner and simpler to -use dynamically loadable modules, which are supported by all modern OSes. -Support for this may be discontinued entirely in the future. -

      - -

      -It is possible to rebuild PHP itself with your module statically linked -in. To do this, you can use the -phpfull command line option to -swig. Using this option will generate three additional files. The first -extra file, config.m4 contains the m4 and shell code needed to -enable the extension as part of the PHP build process. The second -extra file, Makefile.in contains the information needed to -build the final Makefile after substitutions. The third and final -extra file, CREDITS should contain the credits for the -extension. -

      - -

      -To build with phpize, after you have run swig you will need to run the -'phpize' command (installed as part of php) in the same -directory. This re-creates the php build environment in that -directory. It also creates a configure file which includes the shell -code from the config.m4 that was generated by SWIG, this configure -script will accept a command line argument to enable the extension to -be run (by default the command line argument is --enable-modulename, -however you can edit the config.m4 file before running phpize to -accept --with-modulename. You can also add extra tests in config.m4 to -check that a correct library version is installed or correct header -files are included, etc, but you must edit this file before running -phpize.) You can also get SWIG to generate simple extra tests for -libraries and header files for you. -

      - -
      -	swig -php -phpfull
-
      - -

      -If you depend on source files not generated by SWIG, before generating -the configure file, you may need to edit the Makefile.in -file. This contains the names of the source files to compile (just the -wrapper file by default) and any additional libraries needed to be -linked in. If there are extra C files to compile, you will need to add -them to the Makefile.in, or add the names of libraries if they are -needed. In simple cases SWIG is pretty good at generating a complete -Makefile.in and config.m4 which need no further editing. -

      - -

      -You then run the configure script with the command line argument needed -to enable the extension. Then run make, which builds the extension. -The extension object file will be left in the modules sub directory, you can -move it to wherever it is convenient to call from your php script. -

      - -

      -When using -phpfull, swig also accepts the following -additional optional arguments: -

      -
        -
      • -withincs "<incs>" Adds include files to the config.m4 file. -
      • -withlibs "<libs>" Links with the specified libraries. -
      • -withc "<files>" Compiles and links the additional specified C files. -
      • -withcxx "<files>" Compiles and links the additional specified C++ files. -
      - -

      -After running swig with the -phpfull switch, you will be left with a shockingly -similar set of files to the previous build process. However you will then need -to move these files to a subdirectory within the php source tree, this subdirectory you will need to create under the ext directory, with the name of the extension (e.g. mkdir php-4.0.6/ext/modulename). -

      - -

      -After moving the files into this directory, you will need to run the 'buildall' -script in the php source directory. This rebuilds the configure script -and includes the extra command line arguments from the module you have added. -

      - -

      -Before running the generated configure file, you may need to edit the -Makefile.in. This contains the names of the source files to compile ( -just the wrapper file by default) and any additional libraries needed to -link in. If there are extra C files to compile you will need to add them -to the Makefile, or add the names of libraries if they are needed. -In most cases Makefile.in will be complete, especially if you -make use of -withlibs and -withincs -

      - -
      -	swig -php -phpfull -withlibs "xapian omquery" --withincs "om.h"
-
      - -

      -Will include in the config.m4 and Makefile.in search for -libxapian.a or libxapian.so and search for -libomquery.a or libomquery.so as well as a -search for om.h. -

      - -

      -You then need to run the configure command and pass the necessary command -line arguments to enable your module (by default this is --enable-modulename, -but this can be changed by editing the config.m4 file in the modules directory -before running the buildall script. In addition, extra tests can be added to -the config.m4 file to ensure the correct libraries and header files are -installed.) -

      - -

      -Once configure has completed, you can run make to build php. If this all -compiles correctly, you should end up with a php executable/library -which contains your new module. You can test it with a php script which -does not have the 'dl' command as used above. -

      - -

      28.1.3 Using PHP Extensions

      +

      29.1.2 Using PHP Extensions

      @@ -288,7 +162,7 @@ attempts to do the dl() call for you: include("example.php"); -

      28.2 Basic PHP interface

      +

      29.2 Basic PHP interface

      @@ -298,7 +172,7 @@ possible for names of symbols in one extension module to clash with other symbols unless care is taken to %rename them.

      -

      28.2.1 Constants

      +

      29.2.1 Constants

      @@ -423,7 +297,7 @@ both point to the same value, without the case test taking place. ( Apologies, this paragraph needs rewriting to make some sense. )

      -

      28.2.2 Global Variables

      +

      29.2.2 Global Variables

      @@ -472,7 +346,7 @@ undefined. At this time SWIG does not support custom accessor methods.

      -

      28.2.3 Functions

      +

      29.2.3 Functions

      @@ -525,7 +399,7 @@ print $s; # The value of $s was not changed. --> -

      28.2.4 Overloading

      +

      29.2.4 Overloading

      @@ -539,7 +413,7 @@ Overloaded Functions and Methods. -

      28.2.5 Pointers and References

      +

      29.2.5 Pointers and References

      @@ -713,24 +587,13 @@ PHP in a number of ways: by using unset on an existing variable, or assigning NULL to a variable.

      -

      28.2.6 Structures and C++ classes

      +

      29.2.6 Structures and C++ classes

      -SWIG defaults to wrapping C++ structs and classes with PHP classes. This -requires SWIG to generate different code for PHP4 and PHP5, so you must -specify which you want using -php4 or -php5 (currently --php generates PHP4 class wrappers for compatibility with -SWIG 1.3.29 and earlier, but this may change in the future). -

      - -

      -PHP4 classes are implemented entirely using the Zend C API so -no additional php code is generated. For PHP5, a PHP wrapper +SWIG defaults to wrapping C++ structs and classes with PHP classes +unless "-noproxy" is specified. For PHP5, a PHP wrapper class is generated which calls a set of flat functions wrapping the C++ class. -In many cases the PHP4 and PHP5 wrappers will behave the same way, -but the PHP5 ones make use of better PHP5's better OO functionality -where appropriate.

      @@ -754,7 +617,7 @@ struct Complex {

      -Would be used in the following way from either PHP4 or PHP5: +Would be used in the following way from PHP5: 

      @@ -783,7 +646,7 @@ Would be used in the following way from either PHP4 or PHP5:
 Member variables and methods are accessed using the -> operator.
 
      
 
-
      28.2.6.1 Using -noproxy
      
+
      29.2.6.1 Using -noproxy
      
 
 
 
      
@@ -809,7 +672,7 @@ Complex_im_set($obj,$d);
 Complex_im_get($obj);
      -

      28.2.6.2 Constructors and Destructors

      +

      29.2.6.2 Constructors and Destructors

      @@ -850,13 +713,13 @@ the programmer can either reassign the variable or call unset($v)

      -

      28.2.6.3 Static Member Variables

      +

      29.2.6.3 Static Member Variables

      -Static member variables are not supported in PHP4, and it does not -appear to be possible to intercept accesses to static member variables -in PHP5. Therefore, static member variables are +Static member variables in C++ are not wrapped as such in PHP +as it does not appear to be possible to intercept accesses to such variables. +Therefore, static member variables are wrapped using a class function with the same name, which returns the current value of the class variable. For example

      @@ -893,7 +756,7 @@ Ko::threats(10); echo "There has now been " . Ko::threats() . " threats\n"; -

      28.2.6.4 Static Member Functions

      +

      29.2.6.4 Static Member Functions

      @@ -915,12 +778,12 @@ Ko::threats(); -

      28.2.7 PHP Pragmas, Startup and Shutdown code

      +

      29.2.7 PHP Pragmas, Startup and Shutdown code

      Note: Currently pragmas for PHP need to be specified using -%pragma(php4) but also apply for PHP5! This is just a historical +%pragma(php) but also apply for PHP5! This is just a historical oddity because SWIG's PHP support predates PHP5.

      @@ -932,7 +795,7 @@ object. 
       %module example
-%pragma(php4) code="
+%pragma(php) code="
 # This code is inserted into example.php
 echo \"example.php execution\\n\";
 "
@@ -954,7 +817,7 @@ the example.php file.
 
 
       %module example
-%pragma(php4) code="
+%pragma(php) code="
 include \"include.php\";
 "
 %pragma(php) include="include.php"   // equivalent.
@@ -968,7 +831,7 @@ phpinfo() function.
 
 
       %module example;
-%pragma(php4) phpinfo="
+%pragma(php) phpinfo="
   zend_printf("An example of PHP support through SWIG\n");
   php_info_print_table_start();
   php_info_print_table_header(2, \"Directive\", \"Value\");
diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html
index 3e39d4062..a47d07865 100644
--- a/Doc/Manual/Pike.html
+++ b/Doc/Manual/Pike.html
@@ -6,7 +6,7 @@
 
 
 
-
      29 SWIG and Pike
      
+
      30 SWIG and Pike
      
 
 
      
 
        
@@ -46,10 +46,10 @@ least, make sure you read the "SWIG Basics"
 chapter.
        
 
        
 
-
        29.1 Preliminaries
        
+
        30.1 Preliminaries
        
 
 
-
        29.1.1 Running SWIG
        
+
        30.1.1 Running SWIG
        
 
 
 
        
@@ -94,7 +94,7 @@ can use the -o option:
 
        
   
        $ swig -pike -o pseudonym.c example.i
        
 
        
-
        29.1.2 Getting the right header files
        
+
        30.1.2 Getting the right header files
        
 
 
 
        
@@ -114,7 +114,7 @@ You're looking for files with the names global.h, program.h
 and so on.
 
        
 
-
        29.1.3 Using your module
        
+
        30.1.3 Using your module
        
 
 
 
        
@@ -129,10 +129,10 @@ Pike v7.4 release 10 running Hilfe v3.5 (Incremental Pike Frontend)
 (1) Result: 24
 
      
 
-
      29.2 Basic C/C++ Mapping
      
+
      30.2 Basic C/C++ Mapping
      
 
 
-
      29.2.1 Modules
      
+
      30.2.1 Modules
      
 
 
 
      
@@ -143,7 +143,7 @@ concerned), SWIG's %module directive doesn't really have any
 significance.
 
      
 
-
      29.2.2 Functions
      
+
      30.2.2 Functions
      
 
 
 
      
@@ -168,7 +168,7 @@ exactly as you'd expect it to:
 (1) Result: 24
 
      
 
-
      29.2.3 Global variables
      
+
      30.2.3 Global variables
      
 
 
 
      
@@ -197,7 +197,7 @@ will result in two functions, Foo_get() and Foo_set():
 (3) Result: 3.141590
      -

      29.2.4 Constants and enumerated types

      +

      30.2.4 Constants and enumerated types

      @@ -205,7 +205,7 @@ Enumerated types in C/C++ declarations are wrapped as Pike constants, not as Pike enums.

      -

      29.2.5 Constructors and Destructors

      +

      30.2.5 Constructors and Destructors

      @@ -213,7 +213,7 @@ Constructors are wrapped as create() methods, and destructors are wrapped as destroy() methods, for Pike classes.

      -

      29.2.6 Static Members

      +

      30.2.6 Static Members

      diff --git a/Doc/Manual/Preprocessor.html b/Doc/Manual/Preprocessor.html index a454c8124..5afa59243 100644 --- a/Doc/Manual/Preprocessor.html +++ b/Doc/Manual/Preprocessor.html @@ -81,7 +81,7 @@ Such information generally includes type declarations (e.g., typedef) a C++ classes that might be used as base-classes for class declarations in the interface. The use of %import is also important when SWIG is used to generate extensions as a collection of related modules. This is an advanced topic and is described -in a later chapter. +in later in the Working with Modules chapter.

      @@ -107,7 +107,10 @@ SWIGWIN Defined when running SWIG under Windows SWIG_VERSION Hexadecimal number containing SWIG version, such as 0x010311 (corresponding to SWIG-1.3.11). +SWIGALLEGROCL Defined when using Allegro CL +SWIGCFFI Defined when using CFFI SWIGCHICKEN Defined when using CHICKEN +SWIGCLISP Defined when using CLISP SWIGCSHARP Defined when using C# SWIGGUILE Defined when using Guile SWIGJAVA Defined when using Java @@ -115,17 +118,15 @@ SWIGLUA Defined when using Lua SWIGMODULA3 Defined when using Modula-3 SWIGMZSCHEME Defined when using Mzscheme SWIGOCAML Defined when using Ocaml +SWIGOCTAVE Defined when using Octave SWIGPERL Defined when using Perl -SWIGPERL5 Defined when using Perl5 SWIGPHP Defined when using PHP -SWIGPHP4 Defined when using PHP4 -SWIGPHP5 Defined when using PHP5 SWIGPIKE Defined when using Pike SWIGPYTHON Defined when using Python +SWIGR Defined when using R SWIGRUBY Defined when using Ruby SWIGSEXP Defined when using S-expressions SWIGTCL Defined when using Tcl -SWIGTCL8 Defined when using Tcl8.0 SWIGXML Defined when using XML diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html index 62b72fabf..f4867b69d 100644 --- a/Doc/Manual/Python.html +++ b/Doc/Manual/Python.html @@ -6,7 +6,7 @@ -

      30 SWIG and Python

      +

      31 SWIG and Python

      -
    • Cross language polymorphism +
    • Cross language polymorphism
    • Python Packages +
    • Python 3 Support +
      • @@ -113,9 +119,9 @@

      This chapter describes SWIG's support of Python. SWIG is compatible -with most recent Python versions including Python 2.2 as well as older -versions dating back to Python 1.5.2. For the best results, consider using Python -2.0 or newer. +with most recent Python versions including Python 3.0 and Python 2.6, +as well as older versions dating back to Python 2.0. For the best results, +consider using Python 2.3 or newer.

      @@ -125,7 +131,7 @@ very least, make sure you read the "SWIG Basics" chapter.

      -

      30.1 Overview

      +

      31.1 Overview

      @@ -152,10 +158,10 @@ described followed by a discussion of low-level implementation details.

      -

      30.2 Preliminaries

      +

      31.2 Preliminaries

      -

      30.2.1 Running SWIG

      +

      31.2.1 Running SWIG

      @@ -253,7 +259,7 @@ The following sections have further practical examples and details on how you might go about compiling and using the generated files.

      -

      30.2.2 Using distutils

      +

      31.2.2 Using distutils

      @@ -345,7 +351,7 @@ This same approach works on all platforms if the appropriate compiler is install can even build extensions to the standard Windows Python using MingGW)

      -

      30.2.3 Hand compiling a dynamic module

      +

      31.2.3 Hand compiling a dynamic module

      @@ -393,7 +399,7 @@ module actually consists of two files; socket.py and

      -

      30.2.4 Static linking

      +

      31.2.4 Static linking

      @@ -472,7 +478,7 @@ If using static linking, you might want to rely on a different approach (perhaps using distutils).

      -

      30.2.5 Using your module

      +

      31.2.5 Using your module

      @@ -629,7 +635,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      30.2.6 Compilation of C++ extensions

      +

      31.2.6 Compilation of C++ extensions

      @@ -728,7 +734,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

      -

      30.2.7 Compiling for 64-bit platforms

      +

      31.2.7 Compiling for 64-bit platforms

      @@ -765,7 +771,7 @@ and -m64 allow you to choose the desired binary format for your python extension.

      -

      30.2.8 Building Python Extensions under Windows

      +

      31.2.8 Building Python Extensions under Windows

      @@ -874,7 +880,7 @@ SWIG Wiki.

      -

      30.3 A tour of basic C/C++ wrapping

      +

      31.3 A tour of basic C/C++ wrapping

      @@ -883,7 +889,7 @@ to your C/C++ code. Functions are wrapped as functions, classes are wrapped as This section briefly covers the essential aspects of this wrapping.

      -

      30.3.1 Modules

      +

      31.3.1 Modules

      @@ -896,7 +902,7 @@ module name, make sure you don't use the same name as a built-in Python command or standard module name.

      -

      30.3.2 Functions

      +

      31.3.2 Functions

      @@ -920,7 +926,7 @@ like you think it does: >>> -

      30.3.3 Global variables

      +

      31.3.3 Global variables

      @@ -1058,7 +1064,7 @@ that starts with a leading underscore. SWIG does not create cvar if there are no global variables in a module.

      -

      30.3.4 Constants and enums

      +

      31.3.4 Constants and enums

      @@ -1098,7 +1104,7 @@ other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

      -

      30.3.5 Pointers

      +

      31.3.5 Pointers

      @@ -1239,7 +1245,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      30.3.6 Structures

      +

      31.3.6 Structures

      @@ -1428,7 +1434,7 @@ everything works just like you would expect. For example: -

      30.3.7 C++ classes

      +

      31.3.7 C++ classes

      @@ -1517,7 +1523,7 @@ they are accessed through cvar like this: -

      30.3.8 C++ inheritance

      +

      31.3.8 C++ inheritance

      @@ -1572,7 +1578,7 @@ then the function spam() accepts Foo * or a pointer to any cla It is safe to use multiple inheritance with SWIG.

      -

      30.3.9 Pointers, references, values, and arrays

      +

      31.3.9 Pointers, references, values, and arrays

      @@ -1633,7 +1639,7 @@ treated as a returning value, and it will follow the same allocation/deallocation process.

      -

      30.3.10 C++ overloaded functions

      +

      31.3.10 C++ overloaded functions

      @@ -1756,7 +1762,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      30.3.11 C++ operators

      +

      31.3.11 C++ operators

      @@ -1845,7 +1851,7 @@ Also, be aware that certain operators don't map cleanly to Python. For instance overloaded assignment operators don't map to Python semantics and will be ignored.

      -

      30.3.12 C++ namespaces

      +

      31.3.12 C++ namespaces

      @@ -1912,7 +1918,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      30.3.13 C++ templates

      +

      31.3.13 C++ templates

      @@ -1966,7 +1972,7 @@ Some more complicated examples will appear later.

      -

      30.3.14 C++ Smart Pointers

      +

      31.3.14 C++ Smart Pointers

      @@ -2051,7 +2057,7 @@ simply use the __deref__() method. For example: -

      30.3.15 C++ Reference Counted Objects (ref/unref)

      +

      31.3.15 C++ Reference Counted Objects (ref/unref)

      @@ -2213,7 +2219,7 @@ python releases the proxy instance.

      -

      30.4 Further details on the Python class interface

      +

      31.4 Further details on the Python class interface

      @@ -2226,7 +2232,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      30.4.1 Proxy classes

      +

      31.4.1 Proxy classes

      @@ -2315,7 +2321,7 @@ you can attach new Python methods to the class and you can even inherit from it by Python built-in types until Python 2.2).

      -

      30.4.2 Memory management

      +

      31.4.2 Memory management

      @@ -2507,7 +2513,7 @@ It is also possible to deal with situations like this using typemaps--an advanced topic discussed later.

      -

      30.4.3 Python 2.2 and classic classes

      +

      31.4.3 Python 2.2 and classic classes

      @@ -2544,7 +2550,7 @@ class itself. In Python-2.1 and earlier, they have to be accessed as a global function or through an instance (see the earlier section).

      -

      30.5 Cross language polymorphism

      +

      31.5 Cross language polymorphism

      @@ -2578,7 +2584,7 @@ proxy classes, director classes, and C wrapper functions takes care of all the cross-language method routing transparently.

      -

      30.5.1 Enabling directors

      +

      31.5.1 Enabling directors

      @@ -2671,7 +2677,7 @@ class MyFoo(mymodule.Foo): -

      30.5.2 Director classes

      +

      31.5.2 Director classes

      @@ -2753,7 +2759,7 @@ so there is no need for the extra overhead involved with routing the calls through Python.

      -

      30.5.3 Ownership and object destruction

      +

      31.5.3 Ownership and object destruction

      @@ -2820,7 +2826,7 @@ deleting all the Foo pointers it contains at some point. Note that no hard references to the Foo objects remain in Python.

      -

      30.5.4 Exception unrolling

      +

      31.5.4 Exception unrolling

      @@ -2879,7 +2885,7 @@ Swig::DirectorMethodException is thrown, Python will register the exception as soon as the C wrapper function returns.

      -

      30.5.5 Overhead and code bloat

      +

      31.5.5 Overhead and code bloat

      @@ -2913,7 +2919,7 @@ directive) for only those methods that are likely to be extended in Python.

      -

      30.5.6 Typemaps

      +

      31.5.6 Typemaps

      @@ -2927,7 +2933,7 @@ need to be supported.

      -

      30.5.7 Miscellaneous

      +

      31.5.7 Miscellaneous

      @@ -2974,7 +2980,7 @@ methods that return const references.

      -

      30.6 Common customization features

      +

      31.6 Common customization features

      @@ -2987,7 +2993,7 @@ This section describes some common SWIG features that are used to improve your the interface to an extension module.

      -

      30.6.1 C/C++ helper functions

      +

      31.6.1 C/C++ helper functions

      @@ -3068,7 +3074,7 @@ hard to implement. It is possible to clean this up using Python code, typemaps, customization features as covered in later sections.

      -

      30.6.2 Adding additional Python code

      +

      31.6.2 Adding additional Python code

      @@ -3217,7 +3223,7 @@ public: -

      30.6.3 Class extension with %extend

      +

      31.6.3 Class extension with %extend

      @@ -3306,7 +3312,7 @@ Vector(12,14,16) in any way---the extensions only show up in the Python interface.

      -

      30.6.4 Exception handling with %exception

      +

      31.6.4 Exception handling with %exception

      @@ -3432,7 +3438,7 @@ The language-independent exception.i library file can also be used to raise exceptions. See the SWIG Library chapter.

      -

      30.7 Tips and techniques

      +

      31.7 Tips and techniques

      @@ -3442,7 +3448,7 @@ strings, binary data, and arrays. This chapter discusses the common techniques solving these problems.

      -

      30.7.1 Input and output parameters

      +

      31.7.1 Input and output parameters

      @@ -3655,7 +3661,7 @@ void foo(Bar *OUTPUT); may not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

      -

      30.7.2 Simple pointers

      +

      31.7.2 Simple pointers

      @@ -3724,7 +3730,7 @@ If you replace %pointer_functions() by %pointer_class(type,name)SWIG Library chapter for further details.

      -

      30.7.3 Unbounded C Arrays

      +

      31.7.3 Unbounded C Arrays

      @@ -3786,7 +3792,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

      -

      30.7.4 String handling

      +

      31.7.4 String handling

      @@ -3855,16 +3861,16 @@ If you need to return binary data, you might use the also be used to extra binary data from arbitrary pointers.

      -

      30.7.5 Arrays

      +

      31.7.5 Arrays

      -

      30.7.6 String arrays

      +

      31.7.6 String arrays

      -

      30.7.7 STL wrappers

      +

      31.7.7 STL wrappers

      -

      30.8 Typemaps

      +

      31.8 Typemaps

      @@ -3881,7 +3887,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Python interface or if you want to elevate your guru status.

      -

      30.8.1 What is a typemap?

      +

      31.8.1 What is a typemap?

      @@ -3997,7 +4003,7 @@ parameter is omitted): -

      30.8.2 Python typemaps

      +

      31.8.2 Python typemaps

      @@ -4038,7 +4044,7 @@ a look at the SWIG library version 1.3.20 or so.

      -

      30.8.3 Typemap variables

      +

      31.8.3 Typemap variables

      @@ -4109,7 +4115,7 @@ properly assigned. The Python name of the wrapper function being created. -

      30.8.4 Useful Python Functions

      +

      31.8.4 Useful Python Functions

      @@ -4237,7 +4243,7 @@ write me -

      30.9 Typemap Examples

      +

      31.9 Typemap Examples

      @@ -4246,7 +4252,7 @@ might look at the files "python.swg" and "typemaps.i" in the SWIG library.

      -

      30.9.1 Converting Python list to a char **

      +

      31.9.1 Converting Python list to a char **

      @@ -4326,7 +4332,7 @@ memory allocation is used to allocate memory for the array, the the C function.

      -

      30.9.2 Expanding a Python object into multiple arguments

      +

      31.9.2 Expanding a Python object into multiple arguments

      @@ -4405,7 +4411,7 @@ to supply the argument count. This is automatically set by the typemap code. F -

      30.9.3 Using typemaps to return arguments

      +

      31.9.3 Using typemaps to return arguments

      @@ -4494,7 +4500,7 @@ function can now be used as follows: >>> -

      30.9.4 Mapping Python tuples into small arrays

      +

      31.9.4 Mapping Python tuples into small arrays

      @@ -4543,7 +4549,7 @@ array, such an approach would not be recommended for huge arrays, but for small structures, this approach works fine.

      -

      30.9.5 Mapping sequences to C arrays

      +

      31.9.5 Mapping sequences to C arrays

      @@ -4632,7 +4638,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) { -

      30.9.6 Pointer handling

      +

      31.9.6 Pointer handling

      @@ -4729,7 +4735,7 @@ class object (if applicable). -

      30.10 Docstring Features

      +

      31.10 Docstring Features

      @@ -4757,7 +4763,7 @@ of your users much simpler.

      -

      30.10.1 Module docstring

      +

      31.10.1 Module docstring

      @@ -4791,7 +4797,7 @@ layout of controls on a panel, etc. to be loaded from an XML file." -

      30.10.2 %feature("autodoc")

      +

      31.10.2 %feature("autodoc")

      @@ -4818,7 +4824,7 @@ names, default values if any, and return type if any. There are also three options for autodoc controlled by the value given to the feature, described below. -

      30.10.2.1 %feature("autodoc", "0")

      +

      31.10.2.1 %feature("autodoc", "0")

      @@ -4847,7 +4853,7 @@ def function_name(*args, **kwargs): -

      30.10.2.2 %feature("autodoc", "1")

      +

      31.10.2.2 %feature("autodoc", "1")

      @@ -4872,7 +4878,7 @@ def function_name(*args, **kwargs): -

      30.10.2.3 %feature("autodoc", "docstring")

      +

      31.10.2.3 %feature("autodoc", "docstring")

      @@ -4891,7 +4897,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT); -

      30.10.3 %feature("docstring")

      +

      31.10.3 %feature("docstring")

      @@ -4923,13 +4929,13 @@ with more than one line. -

      30.11 Python Packages

      +

      31.11 Python Packages

      Using the package option of the %module directive allows you to specify what Python package that the module will be -living in when installed. +living in when installed.

      @@ -4950,6 +4956,256 @@ and also in base class declarations, etc. if the package name is different than its own.

      +

      31.12 Python 3 Support

      + + +

      +SWIG is able to support Python 3.0. The wrapper code generated by +SWIG can be compiled with both Python 2.x or 3.0. Further more, by +passing the -py3 command line option to SWIG, wrapper code +with some Python 3 specific features can be generated (see below +subsections for details of these features). The -py3 option also +disables some incompatible features for Python 3, such as +-classic. + +

      +There is a list of known-to-be-broken features in Python 3: +

      +
        +
      • No more support for FILE* typemaps, because PyFile_AsFile has been dropped + in Python 3.
        • +
      • The -apply command line option is removed and generating + code using apply() is no longer supported.
        • +
      + +

      +The following are Python 3.0 new features that are currently supported by +SWIG. +

      + +

      31.12.1 Function annotation

      + + +

      +The -py3 option will enable function annotation support. When used +SWIG is able to generate proxy method definitions like this: +

      + +
      +  def foo(self, bar : "int" = 0) -> "void" : ...
+
      + +

      +Also, even if without passing SWIG the -py3 option, the parameter list +still could be generated: +

      + +
      +  def foo(self, bar = 0): ...
+
      + +

      +But for overloaded function or method, the parameter list would fallback to +*args or self, *args, and **kwargs may be append +depend on whether you enabled the keyword argument. This fallback is due to +all overloaded functions share the same function in SWIG generated proxy class. +

      + +

      +For detailed usage of function annotation, see PEP 3107. +

      + +

      31.12.2 Buffer interface

      + + +

      +Buffer protocols were revised in Python 3. SWIG also gains a series of +new typemaps to support buffer interfaces. These typemap macros are +defined in pybuffer.i, which must be included in order to use them. +By using these typemaps, your wrapped function will be able to +accept any Python object that exposes a suitable buffer interface. +

      + +

      +For example, the get_path() function puts the path string +into the memory pointed to by its argument: +

      + +
      +void get_path(char *s);
+
      + +

      +Then you can write a typemap like this: (the following example is +applied to both Python 3.0 and 2.6, since the bytearray type +is backported to 2.6. +

      + + +
      +%include <pybuffer.i>
+%pybuffer_mutable_string(char *str);
+void get_path(char *s);
+
      + +

      +And then on the Python side the wrapped get_path could be used in this +way: +

      + +
      +>>> p = bytearray(10)
+>>> get_path(p)
+>>> print(p)
+bytearray(b'/Foo/Bar/\x00')
+
      + +

      +The macros defined in pybuffer.i are similar to those in +cstring.i: +

      + +

      +%pybuffer_mutable_binary(parm, size_parm) +

      + +
      + +

      +The macro can be used to generate a typemap which maps a buffer of an +object to a pointer provided by parm and a size argument +provided by size_parm. For example: +

      + +
      +%pybuffer_mutable_binary(char *str, size_t size);
+...
+int snprintf(char *str, size_t size, const char *format, ...);
+
      + +

      +In Python: +

      + +
      +>>> buf = bytearray(6)
+>>> snprintf(buf, "Hello world!")
+>>> print(buf)
+bytearray(b'Hello\x00')
+>>> 
+
      + +
      + +

      +%pybuffer_mutable_string(parm) +

      + +
      + +

      +This typemap macro requires the buffer to be a zero terminated string, +and maps the pointer of the buffer to parm. For example: +

      + +
      +%pybuffer_mutable_string(char *str);
+...
+size_t make_upper(char *str);
+
      + +

      +In Python: +

      + +
      +>>> buf = bytearray(b'foo\x00')
+>>> make_upper(buf)
+>>> print(buf)
+bytearray(b'FOO\x00')
+>>>
+
      + +

      +Both %pybuffer_mutable_binary and %pybuffer_mutable_string +require the provided buffer to be mutable, eg. they can accept a +bytearray type but can't accept an immutable byte +type. +

      + +
      + +

      +%pybuffer_binary(parm, size_parm) +

      + +
      + +

      +This macro maps an object's buffer to a pointer parm and a +size size_parm. It is similar to +%pybuffer_mutable_binary, except the +%pybuffer_binary an accept both mutable and immutable +buffers. As a result, the wrapped function should not modify the buffer. +

      + +
      + +

      +%pybuffer_string(parm) +

      + +
      + +

      +This macro maps an object's buffer as a string pointer parm. +It is similar to %pybuffer_mutable_string but the buffer +could be both mutable and immutable. And your function should not +modify the buffer. +

      + +
      + + +

      31.12.3 Abstract base classes

      + + +

      +By including pyabc.i and using the -py3 command +line option when calling SWIG, the proxy classes of the STL containers +will automatically gain an appropriate abstract base class. For +example, the following SWIG interface: +

      + +
      +%include <pyabc.i>
+%include <std_map.i>
+%include <std_list.i>
+
+namespace std {
+  %template(Mapii) map<int, int>;
+  %template(IntList) list<int>;
+}
+
      + +

      +will generate a Python proxy class Mapii inheriting from +collections.MutableMap and a proxy class IntList +inheriting from collections.MutableSequence. +

      + +

      +pyabc.i also provides a macro %pythonabc that could be +used to define an abstract base class for your own C++ class: +

      + +
      +%pythonabc(MySet, collections.MutableSet);
+
      + +

      +For details of abstract base class, please see PEP 3119. +

      diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html index 3b37d53a0..0ed43fc52 100644 --- a/Doc/Manual/R.html +++ b/Doc/Manual/R.html @@ -6,7 +6,7 @@ -

      33 SWIG and R

      +

      34 SWIG and R

        @@ -33,7 +33,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux with gcc. The R bindings also work on Microsoft Windows using Visual C++.

        -

        33.1 Bugs

        +

        34.1 Bugs

        @@ -45,7 +45,7 @@ Currently the following features are not implemented or broken:

      • C Array wrappings
      -

      33.2 Using R and SWIG

      +

      34.2 Using R and SWIG

      @@ -99,7 +99,7 @@ Without it, inheritance of wrapped objects may fail. These two files can be loaded in any order

      -

      33.3 Precompiling large R files

      +

      34.3 Precompiling large R files

      In cases where the R file is large, one make save a lot of loading @@ -117,7 +117,7 @@ will save a large amount of loading time. -

      33.4 General policy

      +

      34.4 General policy

      @@ -126,7 +126,7 @@ wrapping over the underlying functions and rely on the R type system to provide R syntax.

      -

      33.5 Language conventions

      +

      34.5 Language conventions

      @@ -135,7 +135,7 @@ and [ are overloaded to allow for R syntax (one based indices and slices)

      -

      33.6 C++ classes

      +

      34.6 C++ classes

      @@ -147,7 +147,7 @@ keep track of the pointer object which removes the necessity for a lot of the proxy class baggage you see in other languages.

      -

      33.7 Enumerations

      +

      34.7 Enumerations

      diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html index 9cd83d494..2070db0c0 100644 --- a/Doc/Manual/Ruby.html +++ b/Doc/Manual/Ruby.html @@ -26,7 +26,7 @@ -

      31 SWIG and Ruby

      +

      32 SWIG and Ruby

        @@ -167,7 +167,7 @@ -

        31.1 Preliminaries

        +

        32.1 Preliminaries

        SWIG 1.3 is known to work with Ruby versions 1.6 and later. @@ -190,7 +190,7 @@ of Ruby.

        -

        31.1.1 Running SWIG

        +

        32.1.1 Running SWIG

        To build a Ruby module, run SWIG using the -ruby @@ -244,7 +244,7 @@ to compile this file and link it with the rest of your program.

        -

        31.1.2 Getting the right header files

        +

        32.1.2 Getting the right header files

        In order to compile the wrapper code, the compiler needs the ruby.h @@ -288,7 +288,7 @@ installed, you can run Ruby to find out. For example:

        -

        31.1.3 Compiling a dynamic module

        +

        32.1.3 Compiling a dynamic module

        Ruby extension modules are typically compiled into shared @@ -443,7 +443,7 @@ manual pages for your compiler and linker to determine the correct set of options. You might also check the SWIG Wiki for additional information.

        -

        31.1.4 Using your module

        +

        32.1.4 Using your module

        Ruby module names must be capitalized, @@ -498,7 +498,7 @@ begins with:

        -

        31.1.5 Static linking

        +

        32.1.5 Static linking

        An alternative approach to dynamic linking is to rebuild the @@ -519,7 +519,7 @@ finally rebuilding Ruby.

        -

        31.1.6 Compilation of C++ extensions

        +

        32.1.6 Compilation of C++ extensions

        On most machines, C++ extension modules should be linked @@ -571,7 +571,7 @@ extension, e.g.

        -

        31.2 Building Ruby Extensions under Windows 95/NT

        +

        32.2 Building Ruby Extensions under Windows 95/NT

        Building a SWIG extension to Ruby under Windows 95/NT is @@ -610,7 +610,7 @@ files.

        -

        31.2.1 Running SWIG from Developer Studio

        +

        32.2.1 Running SWIG from Developer Studio

        If you are developing your application within Microsoft @@ -752,7 +752,7 @@ directory, then run the Ruby script from the DOS/Command prompt:

        -

        31.3 The Ruby-to-C/C++ Mapping

        +

        32.3 The Ruby-to-C/C++ Mapping

        This section describes the basics of how SWIG maps C or C++ @@ -762,7 +762,7 @@ declarations in your SWIG interface files to Ruby constructs.

        -

        31.3.1 Modules

        +

        32.3.1 Modules

        The SWIG %module directive specifies @@ -931,7 +931,7 @@ Ruby's built-in names.

        -

        31.3.2 Functions

        +

        32.3.2 Functions

        Global functions are wrapped as Ruby module methods. For @@ -994,7 +994,7 @@ module that can be used like so:

        -

        31.3.3 Variable Linking

        +

        32.3.3 Variable Linking

        C/C++ global variables are wrapped as a pair of singleton @@ -1094,7 +1094,7 @@ effect until it is explicitly disabled using %mutable. -

        31.3.4 Constants

        +

        32.3.4 Constants

        C/C++ constants are wrapped as module constants initialized @@ -1138,7 +1138,7 @@ constant values, e.g.

        -

        31.3.5 Pointers

        +

        32.3.5 Pointers

        "Opaque" pointers to arbitrary C/C++ types (i.e. types that @@ -1190,7 +1190,7 @@ the Ruby nil object.

        -

        31.3.6 Structures

        +

        32.3.6 Structures

        C/C++ structs are wrapped as Ruby classes, with accessor @@ -1365,7 +1365,7 @@ pointers. For example,

        -

        31.3.7 C++ classes

        +

        32.3.7 C++ classes

        Like structs, C++ classes are wrapped by creating a new Ruby @@ -1451,7 +1451,7 @@ class. -

        31.3.8 C++ Inheritance

        +

        32.3.8 C++ Inheritance

        The SWIG type-checker is fully aware of C++ inheritance. @@ -1682,7 +1682,7 @@ Typing").

        -

        31.3.9 C++ Overloaded Functions

        +

        32.3.9 C++ Overloaded Functions

        C++ overloaded functions, methods, and constructors are @@ -1878,7 +1878,7 @@ and C++" chapter for more information about overloading.

        -

        31.3.10 C++ Operators

        +

        32.3.10 C++ Operators

        For the most part, overloaded operators are handled @@ -1959,7 +1959,7 @@ on operator overloading.

        -

        31.3.11 C++ namespaces

        +

        32.3.11 C++ namespaces

        SWIG is aware of C++ namespaces, but namespace names do not @@ -2035,7 +2035,7 @@ identical symbol names, well, then you get what you deserve.

        -

        31.3.12 C++ templates

        +

        32.3.12 C++ templates

        C++ templates don't present a huge problem for SWIG. However, @@ -2079,7 +2079,7 @@ directive. For example:

        -

        31.3.13 C++ Standard Template Library (STL)

        +

        32.3.13 C++ Standard Template Library (STL)

        On a related note, the standard SWIG library contains a @@ -2332,7 +2332,7 @@ chapter.

        -

        31.3.14 C++ STL Functors

        +

        32.3.14 C++ STL Functors

        Some containers in the STL allow you to modify their default @@ -2532,7 +2532,7 @@ b
        -

        31.3.15 C++ STL Iterators

        +

        32.3.15 C++ STL Iterators

        The STL is well known for the use of iterators.  There @@ -2743,7 +2743,7 @@ i
        -

        31.3.16 C++ Smart Pointers

        +

        32.3.16 C++ Smart Pointers

        In certain C++ programs, it is common to use classes that @@ -2868,7 +2868,7 @@ method. For example:

        -

        31.3.17 Cross-Language Polymorphism

        +

        32.3.17 Cross-Language Polymorphism

        SWIG's Ruby module supports cross-language polymorphism @@ -2881,7 +2881,7 @@ using this feature with Ruby.

        -

        31.3.17.1 Exception Unrolling

        +

        32.3.17.1 Exception Unrolling

        Whenever a C++ director class routes one of its virtual @@ -2919,7 +2919,7 @@ caught here and a C++ exception is raised in its place.

        -

        31.4 Naming

        +

        32.4 Naming

        Ruby has several common naming conventions. Constants are @@ -3015,7 +3015,7 @@ planned to become the default option in future releases.

        -

        31.4.1 Defining Aliases

        +

        32.4.1 Defining Aliases

        It's a fairly common practice in the Ruby built-ins and @@ -3107,7 +3107,7 @@ Features") for more details).

        -

        31.4.2 Predicate Methods

        +

        32.4.2 Predicate Methods

        Ruby methods that return a boolean value and end in a @@ -3196,7 +3196,7 @@ Features") for more details).

        -

        31.4.3 Bang Methods

        +

        32.4.3 Bang Methods

        Ruby methods that modify an object in-place and end in an @@ -3260,7 +3260,7 @@ Features") for more details).

        -

        31.4.4 Getters and Setters

        +

        32.4.4 Getters and Setters

        Often times a C++ library will expose properties through @@ -3330,7 +3330,7 @@ methods to be exposed in Ruby as value and value=. -

        31.5 Input and output parameters

        +

        32.5 Input and output parameters

        A common problem in some C programs is handling parameters @@ -3581,10 +3581,10 @@ of %apply

        -

        31.6 Exception handling

        +

        32.6 Exception handling

        -

        31.6.1 Using the %exception directive

        +

        32.6.1 Using the %exception directive

        The SWIG %exception directive can be @@ -3679,7 +3679,7 @@ Features for more examples.

        -

        31.6.2 Handling Ruby Blocks

        +

        32.6.2 Handling Ruby Blocks

        One of the highlights of Ruby and most of its standard library @@ -3860,7 +3860,7 @@ RUBY_YIELD_SELF );

        For more information on typemaps, see Typemaps.

        -

        31.6.3 Raising exceptions

        +

        32.6.3 Raising exceptions

        There are three ways to raise exceptions from C++ code to @@ -4621,7 +4621,7 @@ the built-in Ruby exception types.

        -

        31.6.4 Exception classes

        +

        32.6.4 Exception classes

        Starting with SWIG 1.3.28, the Ruby module supports the %exceptionclass @@ -4679,7 +4679,7 @@ providing for a more natural integration between C++ code and Ruby code.

        -

        31.7 Typemaps

        +

        32.7 Typemaps

        This section describes how you can modify SWIG's default @@ -4702,7 +4702,7 @@ of the primitive C-Ruby interface.

        -

        31.7.1 What is a typemap?

        +

        32.7.1 What is a typemap?

        A typemap is nothing more than a code generation rule that is @@ -4964,7 +4964,7 @@ to be used as follows (notice how the length parameter is omitted):

        -

        31.7.2 Typemap scope

        +

        32.7.2 Typemap scope

        Once defined, a typemap remains in effect for all of the @@ -5012,7 +5012,7 @@ where the class itself is defined. For example:

        -

        31.7.3 Copying a typemap

        +

        32.7.3 Copying a typemap

        A typemap is copied by using assignment. For example:

        @@ -5114,7 +5114,7 @@ rules as for -

        31.7.4 Deleting a typemap

        +

        32.7.4 Deleting a typemap

        A typemap can be deleted by simply defining no code. For @@ -5166,7 +5166,7 @@ typemaps immediately after the clear operation.

        -

        31.7.5 Placement of typemaps

        +

        32.7.5 Placement of typemaps

        Typemap declarations can be declared in the global scope, @@ -5250,7 +5250,7 @@ string -

        31.7.6 Ruby typemaps

        +

        32.7.6 Ruby typemaps

        The following list details all of the typemap methods that @@ -5260,7 +5260,7 @@ can be used by the Ruby module:

        -

        31.7.6.1  "in" typemap

        +

        32.7.6.1  "in" typemap

        Converts Ruby objects to input @@ -5503,7 +5503,7 @@ arguments to be specified. For example:

        -

        31.7.6.2 "typecheck" typemap

        +

        32.7.6.2 "typecheck" typemap

        The "typecheck" typemap is used to support overloaded @@ -5544,7 +5544,7 @@ on "Typemaps and Overloading."

        -

        31.7.6.3  "out" typemap

        +

        32.7.6.3  "out" typemap

        Converts return value of a C function @@ -5776,7 +5776,7 @@ version of the C datatype matched by the typemap. -

        31.7.6.4 "arginit" typemap

        +

        32.7.6.4 "arginit" typemap

        The "arginit" typemap is used to set the initial value of a @@ -5801,7 +5801,7 @@ applications. For example:

        -

        31.7.6.5 "default" typemap

        +

        32.7.6.5 "default" typemap

        The "default" typemap is used to turn an argument into a @@ -5843,7 +5843,7 @@ default argument wrapping.

        -

        31.7.6.6 "check" typemap

        +

        32.7.6.6 "check" typemap

        The "check" typemap is used to supply value checking code @@ -5867,7 +5867,7 @@ arguments have been converted. For example:

        -

        31.7.6.7 "argout" typemap

        +

        32.7.6.7 "argout" typemap

        The "argout" typemap is used to return values from arguments. @@ -6025,7 +6025,7 @@ some function like SWIG_Ruby_AppendOutput.

        -

        31.7.6.8 "freearg" typemap

        +

        32.7.6.8 "freearg" typemap

        The "freearg" typemap is used to cleanup argument data. It is @@ -6061,7 +6061,7 @@ abort prematurely.

        -

        31.7.6.9 "newfree" typemap

        +

        32.7.6.9 "newfree" typemap

        The "newfree" typemap is used in conjunction with the %newobject @@ -6092,7 +6092,7 @@ ownership and %newobject for further details.

        -

        31.7.6.10 "memberin" typemap

        +

        32.7.6.10 "memberin" typemap

        The "memberin" typemap is used to copy data from an @@ -6125,7 +6125,7 @@ other objects.

        -

        31.7.6.11 "varin" typemap

        +

        32.7.6.11 "varin" typemap

        The "varin" typemap is used to convert objects in the target @@ -6136,7 +6136,7 @@ This is implementation specific.

        -

        31.7.6.12 "varout" typemap

        +

        32.7.6.12 "varout" typemap

        The "varout" typemap is used to convert a C/C++ object to an @@ -6147,7 +6147,7 @@ This is implementation specific.

        -

        31.7.6.13 "throws" typemap

        +

        32.7.6.13 "throws" typemap

        The "throws" typemap is only used when SWIG parses a C++ @@ -6206,7 +6206,7 @@ handling with %exception section.

        -

        31.7.6.14 directorin typemap

        +

        32.7.6.14 directorin typemap

        Converts C++ objects in director @@ -6460,7 +6460,7 @@ referring to the class itself. -

        31.7.6.15 directorout typemap

        +

        32.7.6.15 directorout typemap

        Converts Ruby objects in director @@ -6720,7 +6720,7 @@ exception.
        -

        31.7.6.16 directorargout typemap

        +

        32.7.6.16 directorargout typemap

        Output argument processing in director @@ -6960,7 +6960,7 @@ referring to the instance of the class itself -

        31.7.6.17 ret typemap

        +

        32.7.6.17 ret typemap

        Cleanup of function return values @@ -6970,7 +6970,7 @@ referring to the instance of the class itself -

        31.7.6.18 globalin typemap

        +

        32.7.6.18 globalin typemap

        Setting of C global variables @@ -6980,7 +6980,7 @@ referring to the instance of the class itself -

        31.7.7 Typemap variables

        +

        32.7.7 Typemap variables

        @@ -7090,7 +7090,7 @@ being created.

      -

      31.7.8 Useful Functions

      +

      32.7.8 Useful Functions

      When you write a typemap, you usually have to work directly @@ -7114,7 +7114,7 @@ across multiple languages.

      -

      31.7.8.1 C Datatypes to Ruby Objects

      +

      32.7.8.1 C Datatypes to Ruby Objects

      @@ -7170,7 +7170,7 @@ SWIG_From_float(float) -

      31.7.8.2 Ruby Objects to C Datatypes

      +

      32.7.8.2 Ruby Objects to C Datatypes

      Here, while the Ruby versions return the value directly, the SWIG @@ -7259,7 +7259,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      31.7.8.3 Macros for VALUE

      +

      32.7.8.3 Macros for VALUE

      RSTRING_LEN(str)

      @@ -7322,7 +7322,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      31.7.8.4 Exceptions

      +

      32.7.8.4 Exceptions

      void rb_raise(VALUE exception, const char *fmt, @@ -7489,7 +7489,7 @@ arguments are interpreted as with printf().

      -

      31.7.8.5 Iterators

      +

      32.7.8.5 Iterators

      void rb_iter_break()

      @@ -7591,7 +7591,7 @@ VALUE), VALUE value)

      -

      31.7.9 Typemap Examples

      +

      32.7.9 Typemap Examples

      This section includes a few examples of typemaps. For more @@ -7602,7 +7602,7 @@ directory.

      -

      31.7.10 Converting a Ruby array to a char **

      +

      32.7.10 Converting a Ruby array to a char **

      A common problem in many C programs is the processing of @@ -7657,7 +7657,7 @@ after the execution of the C function.

      -

      31.7.11 Collecting arguments in a hash

      +

      32.7.11 Collecting arguments in a hash

      Ruby's solution to the "keyword arguments" capability of some @@ -7936,7 +7936,7 @@ directory of the SWIG distribution.

      -

      31.7.12 Pointer handling

      +

      32.7.12 Pointer handling

      Occasionally, it might be necessary to convert pointer values @@ -8035,7 +8035,7 @@ For example:

      -

      31.7.12.1 Ruby Datatype Wrapping

      +

      32.7.12.1 Ruby Datatype Wrapping

      VALUE Data_Wrap_Struct(VALUE class, void @@ -8086,7 +8086,7 @@ and assigns that pointer to ptr.

      -

      31.7.13 Example: STL Vector to Ruby Array

      +

      32.7.13 Example: STL Vector to Ruby Array

      Another use for macros and type maps is to create a Ruby array @@ -8195,7 +8195,7 @@ the C++ Standard Template Library.
      -

      31.8 Docstring Features

      +

      32.8 Docstring Features

      @@ -8256,7 +8256,7 @@ generate ri documentation from a c wrap file, you could do:

      -

      31.8.1 Module docstring

      +

      32.8.1 Module docstring

      @@ -8307,7 +8307,7 @@ macro. For example: -

      31.8.2 %feature("autodoc")

      +

      32.8.2 %feature("autodoc")

      Since SWIG does know everything about the function it wraps, @@ -8336,7 +8336,7 @@ feature, described below. -

      31.8.2.1 %feature("autodoc", "0")

      +

      32.8.2.1 %feature("autodoc", "0")

      @@ -8384,7 +8384,7 @@ Then Ruby code like this will be generated: -

      31.8.2.2 %feature("autodoc", "1")

      +

      32.8.2.2 %feature("autodoc", "1")

      @@ -8416,7 +8416,7 @@ this: -

      31.8.2.3 %feature("autodoc", "2")

      +

      32.8.2.3 %feature("autodoc", "2")

      @@ -8432,7 +8432,7 @@ this: -

      31.8.2.4 %feature("autodoc", "3")

      +

      32.8.2.4 %feature("autodoc", "3")

      @@ -8460,7 +8460,7 @@ this: -

      31.8.2.5 %feature("autodoc", "docstring")

      +

      32.8.2.5 %feature("autodoc", "docstring")

      @@ -8488,7 +8488,7 @@ generated string. For example: -

      31.8.3 %feature("docstring")

      +

      32.8.3 %feature("docstring")

      @@ -8503,10 +8503,10 @@ docstring and they are output together.

      -

      31.9 Advanced Topics

      +

      32.9 Advanced Topics

      -

      31.9.1 Operator overloading

      +

      32.9.1 Operator overloading

      SWIG allows operator overloading with, by using the %extend @@ -9523,7 +9523,7 @@ parses the expression a != b as !(a == b). -

      31.9.2 Creating Multi-Module Packages

      +

      32.9.2 Creating Multi-Module Packages

      The chapter on Working @@ -9704,7 +9704,7 @@ initialized:

      -

      31.9.3 Specifying Mixin Modules

      +

      32.9.3 Specifying Mixin Modules

      The Ruby language doesn't support multiple inheritance, but @@ -9802,7 +9802,7 @@ Features") for more details).

      -

      31.10 Memory Management

      +

      32.10 Memory Management

      One of the most common issues in generating SWIG bindings for @@ -9849,7 +9849,7 @@ understanding of how the underlying library manages memory.

      -

      31.10.1 Mark and Sweep Garbage Collector

      +

      32.10.1 Mark and Sweep Garbage Collector

      Ruby uses a mark and sweep garbage collector. When the garbage @@ -9897,7 +9897,7 @@ this memory.

      -

      31.10.2 Object Ownership

      +

      32.10.2 Object Ownership

      As described above, memory management depends on clearly @@ -10124,7 +10124,7 @@ classes is:

      -

      31.10.3 Object Tracking

      +

      32.10.3 Object Tracking

      The remaining parts of this section will use the class library @@ -10338,7 +10338,7 @@ methods.

      -

      31.10.4 Mark Functions

      +

      32.10.4 Mark Functions

      With a bit more testing, we see that our class library still @@ -10456,7 +10456,7 @@ test suite.

      -

      31.10.5 Free Functions

      +

      32.10.5 Free Functions

      By default, SWIG creates a "free" function that is called when @@ -10567,7 +10567,7 @@ existing Ruby object to the destroyed C++ object and raise an exception.

      -
      %module example

      %{
      #include "example.h"
      %}

      /* Specify that ownership is transferred to the zoo
      	when calling add_animal */
      %apply SWIGTYPE *DISOWN { Animal* animal };

      /* Track objects */
      %trackobjects;

      /* Specify the mark function */
      %freefunc Zoo "free_Zoo";

      %include "example.h"

      %header %{
       static void free_Zoo(void* ptr) {
       Zoo* zoo = (Zoo*) ptr;

       /* Loop over each animal */
       int count = zoo->get_num_animals();

       for(int i = 0; i < count; ++i) {
       /* Get an animal */
       Animal* animal = zoo->get_animal(i);

       /* Unlink the Ruby object from the C++ object */
       SWIG_RubyUnlinkObjects(animal);

       /* Now remove the tracking for this animal */
       SWIG_RubyRemoveTracking(animal);
       }

       /* Now call SWIG_RemoveMapping for the zoo */
       SWIG_RemoveMapping(ptr);
       
       /* Now free the zoo which will free the animals it contains */
       delete zoo;
       }
      %}
      +
      %module example

      %{
      #include "example.h"
      %}

      /* Specify that ownership is transferred to the zoo
      	when calling add_animal */
      %apply SWIGTYPE *DISOWN { Animal* animal };

      /* Track objects */
      %trackobjects;

      /* Specify the mark function */
      %freefunc Zoo "free_Zoo";

      %include "example.h"

      %header %{
       static void free_Zoo(void* ptr) {
       Zoo* zoo = (Zoo*) ptr;

       /* Loop over each animal */
       int count = zoo->get_num_animals();

       for(int i = 0; i < count; ++i) {
       /* Get an animal */
       Animal* animal = zoo->get_animal(i);

       /* Unlink the Ruby object from the C++ object */
       SWIG_RubyUnlinkObjects(animal);

       /* Now remove the tracking for this animal */
       SWIG_RubyRemoveTracking(animal);
       }

       /* Now call SWIG_RubyRemoveTracking for the zoo */
       SWIG_RubyRemoveTracking(ptr);
       
       /* Now free the zoo which will free the animals it contains */
       delete zoo;
       }
      %}
      @@ -10611,7 +10611,7 @@ been freed, and thus raises a runtime exception.

      -

      31.10.6 Embedded Ruby and the C++ Stack

      +

      32.10.6 Embedded Ruby and the C++ Stack

      As has been said, the Ruby GC runs and marks objects before diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html index c22d81c07..d52f0441c 100644 --- a/Doc/Manual/SWIG.html +++ b/Doc/Manual/SWIG.html @@ -53,7 +53,7 @@

    • Character strings and structures
    • Array members
    • Structure data members -
    • C constructors and destructors +
    • C constructors and destructors
    • Adding member functions to C structures
    • Nested structures
    • Other things to note about structure wrapping @@ -120,8 +120,7 @@ can be obtained by typing swig -help or swig -mzscheme Generate Mzscheme wrappers -ocaml Generate Ocaml wrappers -perl Generate Perl wrappers --php4 Generate PHP4 wrappers --php5 Generate PHP5 wrappers +-php Generate PHP wrappers -pike Generate Pike wrappers -python Generate Python wrappers -r Generate R (aka GNU S) wrappers @@ -140,6 +139,7 @@ can be obtained by typing swig -help or swig -lfile Include a SWIG library file. -module name Set the name of the SWIG module -o outfile Name of output file +-outcurrentdir Set default output dir to current dir instead of input file's path -outdir dir Set language specific files output directory -swiglib Show location of SWIG library -version Show SWIG version number @@ -224,7 +224,7 @@ The C/C++ output file created by SWIG often contains everything that is needed to construct a extension module for the target scripting language. SWIG is not a stub compiler nor is it usually necessary to edit the output file (and if you look at the output, -you probably won't want to). To build the final extension module, the +you probably won't want to). To build the final extension module, the SWIG output file is compiled and linked with the rest of your C/C++ program to create a shared library.

      @@ -232,7 +232,7 @@ program to create a shared library.

      Many target languages will also generate proxy class files in the target language. The default output directory for these language -specific files is the same directory as the generated C/C++ file. This can +specific files is the same directory as the generated C/C++ file. This can be modified using the -outdir option. For example:

      @@ -247,6 +247,17 @@ cppfiles/example_wrap.cpp pyfiles/example.py
      • +

      +If the -outcurrentdir option is used (without -o) +then SWIG behaves like a typical C/C++ +compiler and the default output directory is then the current directory. Without +this option the default output directory is the path to the input file. +If -o and +-outcurrentdir are used together, -outcurrentdir is effectively ignored +as the output directory for the language files is the same directory as the +generated C/C++ file if not overidden with -outdir. +

      +

      5.1.3 Comments

      @@ -2219,13 +2230,13 @@ void Foo_w_set(FOO *f, WORD value) {

      -Compatibility Note: SWIG-1.3.11 and earlier releases transformed all non-primitive member datatypes -to pointers. Starting in SWIG-1.3.12, this transformation only occurs if a datatype is known to be a structure, -class, or union. This is unlikely to break existing code. However, if you need to tell SWIG that an undeclared +Compatibility Note: SWIG-1.3.11 and earlier releases transformed all non-primitive member datatypes +to pointers. Starting in SWIG-1.3.12, this transformation only occurs if a datatype is known to be a structure, +class, or union. This is unlikely to break existing code. However, if you need to tell SWIG that an undeclared datatype is really a struct, simply use a forward struct declaration such as "struct Foo;".

      -

      5.5.5 C constructors and destructors

      +

      5.5.5 C constructors and destructors

      @@ -2282,7 +2293,7 @@ struct Bar { // Default constructor generated. Since ignoring the implicit or default destructors most of the times produce memory leaks, SWIG will always try to generate them. If needed, however, you can selectively disable the generation of the -default/implicit destructor by using %nodefaultdtor +default/implicit destructor by using %nodefaultdtor

      @@ -2726,11 +2737,16 @@ the module upon loading.

      Code is inserted into the appropriate code section by using one -of the following code insertion directives: +of the code insertion directives listed below. The order of the sections in +the wrapper file is as shown: 

      +%begin %{
+   ... code in begin section ...
+%}
+
 %runtime %{
    ... code in runtime section ...
 %}
@@ -2751,10 +2767,12 @@ of the following code insertion directives:
 
 
      
 The bare %{ ... %} directive is a shortcut that is the same as
-%header %{ ... %}.
+%header %{ ... %}. 
 
      
 
 
      
+The %begin section is effectively empty as it just contains the SWIG banner by default. 
+This section is provided as a way for users to insert code at the top of the wrapper file before any other code is generated.
 Everything in a code insertion block is copied verbatim into the output file and is 
 not parsed by SWIG.   Most SWIG input files have at least one such block to include header
 files and support C code.  Additional code blocks may be placed anywhere in a
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 5406f44ea..789efc129 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
      SWIG-1.3 Development Documentation
      
 
-Last update : SWIG-1.3.37 (in progress)
+Last update : SWIG-1.3.40 (in progress)
 
 
      Sections
      
 
@@ -35,6 +35,7 @@ to help!).
 
    • Variable length arguments
      • 
 
    • Warning messages
      • 
 
    • Working with Modules
      • 
+
    • Using SWIG with ccache
      • 
 
 
 
      Language Module Documentation
      
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index e837a5b17..b36395cab 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -6,7 +6,7 @@
 
 
 
-
      32 SWIG and Tcl
      
+
      33 SWIG and Tcl
      
 
 
      
 
        
@@ -82,7 +82,7 @@ Tcl 8.0 or a later release.   Earlier releases of SWIG supported Tcl 7.x, but
 this is no longer supported.
 
        
 
-
        32.1 Preliminaries
        
+
        33.1 Preliminaries
        
 
 
 
        
@@ -108,7 +108,7 @@ build a Tcl extension module.  To finish building the module, you
 need to compile this file and link it with the rest of your program.
 
        
 
-
        32.1.1 Getting the right header files
        
+
        33.1.1 Getting the right header files
        
 
 
 
        
@@ -126,7 +126,7 @@ this is the case, you should probably make a symbolic link so that tcl.h
 
-
        32.1.2 Compiling a dynamic module
        
+
        33.1.2 Compiling a dynamic module
        
 
 
 
        
@@ -161,7 +161,7 @@ The name of the module is specified using the %module directive or the
  -module command line option.
 
        
 
-
        32.1.3 Static linking
        
+
        33.1.3 Static linking
        
 
 
 
        
@@ -227,7 +227,7 @@ minimal in most situations (and quite frankly not worth the extra
 hassle in the opinion of this author). 
 
        
 
-
        32.1.4 Using your module
        
+
        33.1.4 Using your module
        
 
 
 
        
@@ -355,7 +355,7 @@ to the default system configuration (this requires root access and you will need
 the man pages). 
 
        
 
-
        32.1.5 Compilation of C++ extensions
        
+
        33.1.5 Compilation of C++ extensions
        
 
 
 
        
@@ -438,7 +438,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 
        
 
-
        32.1.6 Compiling for 64-bit platforms
        
+
        33.1.6 Compiling for 64-bit platforms
        
 
 
 
        
@@ -465,7 +465,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 
        
 
-
        32.1.7 Setting a package prefix
        
+
        33.1.7 Setting a package prefix
        
 
 
 
        
@@ -484,7 +484,7 @@ option will append the prefix to the name when creating a command and
 call it "Foo_bar".
 
        
 
-
        32.1.8 Using namespaces
        
+
        33.1.8 Using namespaces
        
 
 
 
        
@@ -506,7 +506,7 @@ When the -namespace option is used, objects in the module
 are always accessed with the namespace name such as Foo::bar.
 
        
 
-
        32.2 Building Tcl/Tk Extensions under Windows 95/NT
        
+
        33.2 Building Tcl/Tk Extensions under Windows 95/NT
        
 
 
 
        
@@ -517,7 +517,7 @@ covers the process of using SWIG with Microsoft Visual C++.
 although the procedure may be similar with other compilers.
 
        
 
-
        32.2.1 Running SWIG from Developer Studio
        
+
        33.2.1 Running SWIG from Developer Studio
        
 
 
 
        
@@ -575,7 +575,7 @@ MSDOS > tclsh80
 %
      -

      32.2.2 Using NMAKE

      +

      33.2.2 Using NMAKE

      @@ -638,7 +638,7 @@ to get you started. With a little practice, you'll be making lots of Tcl extensions.

      -

      32.3 A tour of basic C/C++ wrapping

      +

      33.3 A tour of basic C/C++ wrapping

      @@ -649,7 +649,7 @@ classes. This section briefly covers the essential aspects of this wrapping.

      -

      32.3.1 Modules

      +

      33.3.1 Modules

      @@ -683,7 +683,7 @@ To fix this, supply an extra argument to load like this:

      -

      32.3.2 Functions

      +

      33.3.2 Functions

      @@ -708,7 +708,7 @@ like you think it does: %

      -

      32.3.3 Global variables

      +

      33.3.3 Global variables

      @@ -788,7 +788,7 @@ extern char *path; // Read-only (due to %immutable) -

      32.3.4 Constants and enums

      +

      33.3.4 Constants and enums

      @@ -872,7 +872,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l conversion. This allows the global statement to be omitted.

      -

      32.3.5 Pointers

      +

      33.3.5 Pointers

      @@ -968,7 +968,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      32.3.6 Structures

      +

      33.3.6 Structures

      @@ -1250,7 +1250,7 @@ Note: Tcl only destroys the underlying object if it has ownership. See the memory management section that appears shortly.

      -

      32.3.7 C++ classes

      +

      33.3.7 C++ classes

      @@ -1317,7 +1317,7 @@ In Tcl, the static member is accessed as follows: -

      32.3.8 C++ inheritance

      +

      33.3.8 C++ inheritance

      @@ -1366,7 +1366,7 @@ For instance: It is safe to use multiple inheritance with SWIG.

      -

      32.3.9 Pointers, references, values, and arrays

      +

      33.3.9 Pointers, references, values, and arrays

      @@ -1420,7 +1420,7 @@ to hold the result and a pointer is returned (Tcl will release this memory when the return value is garbage collected).

      -

      32.3.10 C++ overloaded functions

      +

      33.3.10 C++ overloaded functions

      @@ -1543,7 +1543,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      32.3.11 C++ operators

      +

      33.3.11 C++ operators

      @@ -1645,7 +1645,7 @@ There are ways to make this operator appear as part of the class using the % Keep reading.

      -

      32.3.12 C++ namespaces

      +

      33.3.12 C++ namespaces

      @@ -1709,7 +1709,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      32.3.13 C++ templates

      +

      33.3.13 C++ templates

      @@ -1761,7 +1761,7 @@ More details can be found in the SWIG and C++ -

      32.3.14 C++ Smart Pointers

      +

      33.3.14 C++ Smart Pointers

      @@ -1845,7 +1845,7 @@ simply use the __deref__() method. For example: -

      32.4 Further details on the Tcl class interface

      +

      33.4 Further details on the Tcl class interface

      @@ -1858,7 +1858,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      32.4.1 Proxy classes

      +

      33.4.1 Proxy classes

      @@ -1923,7 +1923,7 @@ function. This allows objects to be encapsulated objects that look a lot like as shown in the last section.

      -

      32.4.2 Memory management

      +

      33.4.2 Memory management

      @@ -2111,7 +2111,7 @@ typemaps--an advanced topic discussed later.

      -

      32.5 Input and output parameters

      +

      33.5 Input and output parameters

      @@ -2299,7 +2299,7 @@ set c [lindex $dim 1] -

      32.6 Exception handling

      +

      33.6 Exception handling

      @@ -2433,7 +2433,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex See the chapter on "Customization Features" for more examples.

      -

      32.7 Typemaps

      +

      33.7 Typemaps

      @@ -2450,7 +2450,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Tcl interface.

      -

      32.7.1 What is a typemap?

      +

      33.7.1 What is a typemap?

      @@ -2567,7 +2567,7 @@ parameter is omitted): -

      32.7.2 Tcl typemaps

      +

      33.7.2 Tcl typemaps

      @@ -2705,7 +2705,7 @@ Initialize an argument to a value before any conversions occur. Examples of these methods will appear shortly.

      -

      32.7.3 Typemap variables

      +

      33.7.3 Typemap variables

      @@ -2776,7 +2776,7 @@ properly assigned. The Tcl name of the wrapper function being created. -

      32.7.4 Converting a Tcl list to a char **

      +

      33.7.4 Converting a Tcl list to a char **

      @@ -2838,7 +2838,7 @@ argv[2] = Larry 3 -

      32.7.5 Returning values in arguments

      +

      33.7.5 Returning values in arguments

      @@ -2880,7 +2880,7 @@ result, a Tcl function using these typemaps will work like this : % -

      32.7.6 Useful functions

      +

      33.7.6 Useful functions

      @@ -2957,7 +2957,7 @@ int Tcl_IsShared(Tcl_Obj *obj); -

      32.7.7 Standard typemaps

      +

      33.7.7 Standard typemaps

      @@ -3041,7 +3041,7 @@ work) -

      32.7.8 Pointer handling

      +

      33.7.8 Pointer handling

      @@ -3117,7 +3117,7 @@ For example: -

      32.8 Turning a SWIG module into a Tcl Package.

      +

      33.8 Turning a SWIG module into a Tcl Package.

      @@ -3189,7 +3189,7 @@ As a final note, most SWIG examples do not yet use the to use the load command instead.

      -

      32.9 Building new kinds of Tcl interfaces (in Tcl)

      +

      33.9 Building new kinds of Tcl interfaces (in Tcl)

      @@ -3288,7 +3288,7 @@ danger of blowing something up (although it is easily accomplished with an out of bounds array access).

      -

      32.9.1 Proxy classes

      +

      33.9.1 Proxy classes

      diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html index 8f3035dc8..777184069 100644 --- a/Doc/Manual/Typemaps.html +++ b/Doc/Manual/Typemaps.html @@ -75,6 +75,7 @@

    • More about %apply and %clear
    • Reducing wrapper code size
    • Passing data between typemaps +
    • C++ "this" pointer
    • Where to go for more information? @@ -3899,7 +3900,66 @@ sure that the typemaps sharing information have exactly the same types and names

      -

      10.15 Where to go for more information?

      +

      10.15 C++ "this" pointer

      + + +

      +All the rules discussed for Typemaps apply to C++ as well as C. +However in addition C++ passes an extra parameter into every +non-static class method -- the this pointer. Occasionally it can be +useful to apply a typemap to this pointer (for example to check +and make sure this is non-null before deferencing). +Actually, C also has an the equivalent of the this pointer which is used +when accessing variables in a C struct. +

      +

      +In order to customise the this pointer handling, target a variable named self in your typemaps. +self is the name SWIG uses to refer to the extra parameter in wrapped functions. +

      +

      +For example, if wrapping for Java generation: +

      + +
      +
      +%typemap(check) SWIGTYPE *self %{
+if (!$1) {
+  SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "swigCPtr null");
+  return $null;
+}
+%}
+
      +
      + +

      +In the above case, the $1 variable is expanded into the argument +name that SWIG is using as the this pointer. + +SWIG will then insert the check code before the actual C++ class method +is called, and will raise an exception rather than crash +the Java virtual machine. + +The generated code will look something like: +

      + +
      +
      +  if (!arg1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException,
+      "invalid native object; delete() likely already called");
+    return ;
+  }
+  (arg1)->wrappedFunction(...);
+
      +
      + +

      +Note that if you have a parameter named self then it +will also match the typemap. One work around is to create an interface file that wraps +the method, but give the argument a name other than self. +

      + +

      10.16 Where to go for more information?

      diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html index 0b3cb37e9..95af1ec6b 100644 --- a/Doc/Manual/Warnings.html +++ b/Doc/Manual/Warnings.html @@ -558,7 +558,7 @@ example.i(4): Syntax error in input.

        -
      • 870. Warning for classname: Base baseclass ignored. Multiple inheritance is not supported in Php4. (Php). +
      • 870. Warning for classname: Base baseclass ignored. Multiple inheritance is not supported in PHP.
      • 871. Unrecognized pragma pragma. (Php).
      diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html index 8a718ffad..bc8c8fa51 100644 --- a/Doc/Manual/Windows.html +++ b/Doc/Manual/Windows.html @@ -281,7 +281,7 @@ Execute the steps in the order shown and don't use spaces in path names. In fact
    • - Copy the followig to the MSYS install folder (C:\msys\1.0 is default): + Copy the following to the MSYS install folder (C:\msys\1.0 is default):
      • msys-automake-1.8.2.tar.bz2
      • msys-autoconf-2.59.tar.bz2
        • diff --git a/Doc/Manual/chapters b/Doc/Manual/chapters index 840709d89..bf180f1b4 100644 --- a/Doc/Manual/chapters +++ b/Doc/Manual/chapters @@ -13,8 +13,8 @@ Contract.html Varargs.html Warnings.html Modules.html +CCache.html Allegrocl.html -C.html CSharp.html Chicken.html Guile.html diff --git a/Doc/Manual/swig16.png b/Doc/Manual/swig16.png old mode 100755 new mode 100644 diff --git a/Doc/README b/Doc/README index 110428199..f7a493933 100644 --- a/Doc/README +++ b/Doc/README @@ -2,4 +2,5 @@ Doc/Manual - Latest version of the SWIG user manual Doc/Devel - Developer documentation concerning SWIG internals. (not necessarily up to date) - \ No newline at end of file +Open the index.html file in each of these directories with a web browser. + diff --git a/Examples/GIFPlot/Java/full/README b/Examples/GIFPlot/Java/full/README index f536864de..93463ea30 100644 --- a/Examples/GIFPlot/Java/full/README +++ b/Examples/GIFPlot/Java/full/README @@ -1,8 +1,8 @@ This example runs the entire gifplot.h header file through SWIG without -any changes. The program 'main.java' does something a little more -interesting. After doing a make, run it using 'java main'. You'll have to go +any changes. The program 'runme.java' does something a little more +interesting. After doing a make, run it using 'java runme'. You'll have to go look at the header file to get a complete listing of the functions. -Note the differences in the main.java files between this example and the +Note the differences in the runme.java files between this example and the 'full' example. This example does not use shadow classes. diff --git a/Examples/GIFPlot/Java/full/main.java b/Examples/GIFPlot/Java/full/runme.java similarity index 99% rename from Examples/GIFPlot/Java/full/main.java rename to Examples/GIFPlot/Java/full/runme.java index 8fb65c86d..c47c1e672 100644 --- a/Examples/GIFPlot/Java/full/main.java +++ b/Examples/GIFPlot/Java/full/runme.java @@ -1,7 +1,7 @@ // Plot a 3D function import java.lang.Math; -public class main { +public class runme { static { try { diff --git a/Examples/GIFPlot/Java/shadow/Makefile b/Examples/GIFPlot/Java/shadow/Makefile index e513b9b5a..8062c2700 100644 --- a/Examples/GIFPlot/Java/shadow/Makefile +++ b/Examples/GIFPlot/Java/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -10,7 +11,7 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java javac *.java clean:: diff --git a/Examples/GIFPlot/Java/shadow/README b/Examples/GIFPlot/Java/shadow/README index 4adbde306..b06c5a8f1 100644 --- a/Examples/GIFPlot/Java/shadow/README +++ b/Examples/GIFPlot/Java/shadow/README @@ -1,5 +1,5 @@ This example uses the file in ../../Interface/gifplot.i to build -an interface with shadow classes. After doing a make, run the program main, ie: 'java main'. +an interface with shadow classes. After doing a make, run the program runme, ie: 'java runme'. -Note the differences in the main.java files between this example and the +Note the differences in the runme.java files between this example and the 'full' example. This example uses the shadow classes. diff --git a/Examples/GIFPlot/Java/shadow/main.java b/Examples/GIFPlot/Java/shadow/runme.java similarity index 99% rename from Examples/GIFPlot/Java/shadow/main.java rename to Examples/GIFPlot/Java/shadow/runme.java index fbcf6e792..91db03898 100644 --- a/Examples/GIFPlot/Java/shadow/main.java +++ b/Examples/GIFPlot/Java/shadow/runme.java @@ -2,7 +2,7 @@ import java.lang.Math; -public class main { +public class runme { static { try { diff --git a/Examples/GIFPlot/Java/simple/README b/Examples/GIFPlot/Java/simple/README index 1fb8453f0..13ff49611 100644 --- a/Examples/GIFPlot/Java/simple/README +++ b/Examples/GIFPlot/Java/simple/README @@ -1,5 +1,5 @@ This is a very minimalistic example in which just a few functions and constants from library are wrapped and used to draw some simple -shapes. After doing a make, run the java program, ie 'java main'. +shapes. After doing a make, run the java program, ie 'java runme'. diff --git a/Examples/GIFPlot/Java/simple/main.java b/Examples/GIFPlot/Java/simple/runme.java similarity index 98% rename from Examples/GIFPlot/Java/simple/main.java rename to Examples/GIFPlot/Java/simple/runme.java index b165a4baa..2d8d2bb48 100644 --- a/Examples/GIFPlot/Java/simple/main.java +++ b/Examples/GIFPlot/Java/simple/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/GIFPlot/Lib/color.c b/Examples/GIFPlot/Lib/color.c index a4eaf285e..7d79baca9 100644 --- a/Examples/GIFPlot/Lib/color.c +++ b/Examples/GIFPlot/Lib/color.c @@ -132,7 +132,10 @@ int ColorMap_write(ColorMap *cm, char *filename) { f = fopen(filename,"w"); - fwrite(cm->cmap,768,1,f); + if (fwrite(cm->cmap,768,1,f) != 1) { + fclose(f); + return -1; + } fclose(f); return 0; } diff --git a/Examples/GIFPlot/Lib/gif.c b/Examples/GIFPlot/Lib/gif.c index a0cfca1d5..7953e5ce9 100644 --- a/Examples/GIFPlot/Lib/gif.c +++ b/Examples/GIFPlot/Lib/gif.c @@ -268,7 +268,7 @@ static int maxmaxcode = 1 << GP_BITS; /* NEVER generate this */ static count_int *htab; static unsigned short *codetab; -static GIFOutBufSize; +static int GIFOutBufSize; /* static count_int htab [HSIZE]; static unsigned short codetab [HSIZE]; */ @@ -656,7 +656,11 @@ int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename) { fclose(file); return -1; } - fwrite(buffer,nbytes,1,file); + if (fwrite(buffer,nbytes,1,file) != 1) { + free(buffer); + fclose(file); + return -1; + } fclose(file); free(buffer); return 0; diff --git a/Examples/GIFPlot/Perl5/shadow/Makefile b/Examples/GIFPlot/Perl5/shadow/Makefile index c5cb7aec4..c39eac52c 100644 --- a/Examples/GIFPlot/Perl5/shadow/Makefile +++ b/Examples/GIFPlot/Perl5/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot -lm INCLUDES = -I../../Include @@ -10,12 +11,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static + TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static clean:: $(MAKE) -f $(TOP)/Makefile perl5_clean diff --git a/Examples/GIFPlot/Php4/check.list b/Examples/GIFPlot/Php/check.list similarity index 100% rename from Examples/GIFPlot/Php4/check.list rename to Examples/GIFPlot/Php/check.list diff --git a/Examples/GIFPlot/Php4/full/Makefile b/Examples/GIFPlot/Php/full/Makefile similarity index 81% rename from Examples/GIFPlot/Php4/full/Makefile rename to Examples/GIFPlot/Php/full/Makefile index 3aa632b99..e33e7a730 100644 --- a/Examples/GIFPlot/Php4/full/Makefile +++ b/Examples/GIFPlot/Php/full/Makefile @@ -10,10 +10,10 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4 + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f *.gif rm -f php_gifplot.h diff --git a/Examples/GIFPlot/Php4/full/README b/Examples/GIFPlot/Php/full/README similarity index 100% rename from Examples/GIFPlot/Php4/full/README rename to Examples/GIFPlot/Php/full/README diff --git a/Examples/GIFPlot/Php4/full/cmap b/Examples/GIFPlot/Php/full/cmap similarity index 100% rename from Examples/GIFPlot/Php4/full/cmap rename to Examples/GIFPlot/Php/full/cmap diff --git a/Examples/GIFPlot/Php4/full/gifplot.i b/Examples/GIFPlot/Php/full/gifplot.i similarity index 100% rename from Examples/GIFPlot/Php4/full/gifplot.i rename to Examples/GIFPlot/Php/full/gifplot.i diff --git a/Examples/GIFPlot/Php4/full/runme.php4 b/Examples/GIFPlot/Php/full/runme.php similarity index 100% rename from Examples/GIFPlot/Php4/full/runme.php4 rename to Examples/GIFPlot/Php/full/runme.php diff --git a/Examples/GIFPlot/Php4/shadow/Makefile b/Examples/GIFPlot/Php/shadow/Makefile similarity index 80% rename from Examples/GIFPlot/Php4/shadow/Makefile rename to Examples/GIFPlot/Php/shadow/Makefile index 5627e53a0..df8ee30c0 100644 --- a/Examples/GIFPlot/Php4/shadow/Makefile +++ b/Examples/GIFPlot/Php/shadow/Makefile @@ -10,10 +10,10 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4 + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f *.gif check: all diff --git a/Examples/GIFPlot/Php4/shadow/README b/Examples/GIFPlot/Php/shadow/README similarity index 100% rename from Examples/GIFPlot/Php4/shadow/README rename to Examples/GIFPlot/Php/shadow/README diff --git a/Examples/GIFPlot/Php4/shadow/cmap b/Examples/GIFPlot/Php/shadow/cmap similarity index 100% rename from Examples/GIFPlot/Php4/shadow/cmap rename to Examples/GIFPlot/Php/shadow/cmap diff --git a/Examples/GIFPlot/Php4/shadow/runme.php4 b/Examples/GIFPlot/Php/shadow/runme.php similarity index 100% rename from Examples/GIFPlot/Php4/shadow/runme.php4 rename to Examples/GIFPlot/Php/shadow/runme.php diff --git a/Examples/GIFPlot/Php4/simple/Makefile b/Examples/GIFPlot/Php/simple/Makefile similarity index 80% rename from Examples/GIFPlot/Php4/simple/Makefile rename to Examples/GIFPlot/Php/simple/Makefile index 6903bec0b..e60b641fa 100644 --- a/Examples/GIFPlot/Php4/simple/Makefile +++ b/Examples/GIFPlot/Php/simple/Makefile @@ -10,10 +10,10 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4 + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f *.gif rm -f php_simple.h diff --git a/Examples/GIFPlot/Php4/simple/README b/Examples/GIFPlot/Php/simple/README similarity index 100% rename from Examples/GIFPlot/Php4/simple/README rename to Examples/GIFPlot/Php/simple/README diff --git a/Examples/GIFPlot/Php4/simple/runme.php4 b/Examples/GIFPlot/Php/simple/runme.php similarity index 100% rename from Examples/GIFPlot/Php4/simple/runme.php4 rename to Examples/GIFPlot/Php/simple/runme.php diff --git a/Examples/GIFPlot/Php4/simple/simple.i b/Examples/GIFPlot/Php/simple/simple.i similarity index 100% rename from Examples/GIFPlot/Php4/simple/simple.i rename to Examples/GIFPlot/Php/simple/simple.i diff --git a/Examples/GIFPlot/Python/full/Makefile b/Examples/GIFPlot/Python/full/Makefile index ae927b72b..83a7c864b 100644 --- a/Examples/GIFPlot/Python/full/Makefile +++ b/Examples/GIFPlot/Python/full/Makefile @@ -1,5 +1,5 @@ TOP = ../../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SWIGOPT = -I../../Include SRCS = TARGET = gifplot @@ -23,3 +23,4 @@ clean:: rm -f *.gif check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/shadow/Makefile b/Examples/GIFPlot/Python/shadow/Makefile index 1f5014895..3ae9a9897 100644 --- a/Examples/GIFPlot/Python/shadow/Makefile +++ b/Examples/GIFPlot/Python/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIG = $(TOP)/../preinst-swig +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -10,12 +11,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypython' INTERFACE='$(INTERFACE)' python_static + TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static clean:: $(MAKE) -f $(TOP)/Makefile python_clean @@ -23,3 +24,4 @@ clean:: rm -f *.gif check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/simple/Makefile b/Examples/GIFPlot/Python/simple/Makefile index 5eb0344e8..9fc9a6c72 100644 --- a/Examples/GIFPlot/Python/simple/Makefile +++ b/Examples/GIFPlot/Python/simple/Makefile @@ -1,5 +1,5 @@ TOP = ../../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SWIGOPT = SRCS = TARGET = simple @@ -23,3 +23,4 @@ clean:: rm -f *.gif check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Ruby/shadow/Makefile b/Examples/GIFPlot/Ruby/shadow/Makefile index ea382ea88..8cbea2a57 100644 --- a/Examples/GIFPlot/Ruby/shadow/Makefile +++ b/Examples/GIFPlot/Ruby/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -10,12 +11,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static + TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static clean:: $(MAKE) -f $(TOP)/Makefile ruby_clean diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c47bb6a7b..63ca787d6 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -12,11 +12,11 @@ # certain packages have been installed. Set the prefixes # accordingly. # -# 2. To use this makefile, simply set SRCS, INTERFACE, INCLUDES, LIBS, -# TARGET, and do a +# 2. To use this makefile, set required varibles, eg SRCS, INTERFACE, +# INTERFACEDIR, INCLUDES, LIBS, TARGET, and do a # $(MAKE) -f Makefile.template.in SRCS='$(SRCS)' \ # INCLUDES='$(INCLUDES) LIBS='$(LIBS)' INTERFACE='$(INTERFACE)' \ -# TARGET='$(TARGET)' method +# INTERFACEDIR='$(INTERFACEDIR)' TARGET='$(TARGET)' method # # 'method' describes what is being built. #--------------------------------------------------------------- @@ -31,6 +31,8 @@ SRCS = INCLUDES = LIBS = INTERFACE = +INTERFACEDIR = +INTERFACEPATH = $(INTERFACEDIR)$(INTERFACE) SWIGOPT = SWIG = swig @@ -96,6 +98,8 @@ TK_OPTS = -ltk -ltcl @LIBS@ # Extra Tcl specific dynamic linking options TCL_DLNK = @TCLDYNAMICLINKING@ TCL_SO = @TCL_SO@ +TCLLDSHARED = @TCLLDSHARED@ +TCLCXXSHARED = @TCLCXXSHARED@ # ----------------------------------------------------------- # Build a new version of the tclsh shell @@ -103,12 +107,12 @@ TCL_SO = @TCL_SO@ tclsh: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACEPATH) $(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) tclsh_cpp: $(SRCS) - $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE) + $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACEPATH) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) @@ -117,13 +121,13 @@ tclsh_cpp: $(SRCS) # ----------------------------------------------------------- wish: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACEPATH) $(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) wish_cpp: $(SRCS) - $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE) + $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACEPATH) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) @@ -132,18 +136,18 @@ wish_cpp: $(SRCS) # ----------------------------------------------------------- tcl: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(TCLLDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------- # Build a Tcl7.5 dynamic loadable module for C++ # ----------------------------------------------------------- tcl_cpp: $(SRCS) - $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) + $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------------- # Cleaning the Tcl examples @@ -173,7 +177,7 @@ PERL5_CCFLAGS = @PERL5CCFLAGS@ # ---------------------------------------------------------------- perl5: $(SRCS) - $(SWIG) -perl5 $(SWIGOPT) $(INTERFACE) + $(SWIG) -perl5 $(SWIGOPT) $(INTERFACEPATH) $(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -182,7 +186,7 @@ perl5: $(SRCS) # ---------------------------------------------------------------- perl5_cpp: $(SRCS) - $(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -200,11 +204,11 @@ perl5_xs: $(SRCS) PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS) perl5_static: $(SRCS) - $(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) -Dbool=char $(SRCS) $(ISRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) perl5_static_cpp: $(SRCS) - $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) # ----------------------------------------------------------------- @@ -221,19 +225,39 @@ perl5_clean: ################################################################## # Make sure these locate your Python installation -PYTHON_INCLUDE= $(DEFS) @PYINCLUDE@ -PYTHON_LIB = @PYLIB@ +ifeq (,$(PY3)) + PYTHON_INCLUDE= $(DEFS) @PYINCLUDE@ + PYTHON_LIB = @PYLIB@ + PYTHON = @PYTHON@ +else + PYTHON_INCLUDE= $(DEFS) @PY3INCLUDE@ + PYTHON_LIB = @PY3LIB@ + PYTHON = @PYTHON3@ +endif -# Extra Python specific dynamic linking options -PYTHON_DLNK = @PYTHONDYNAMICLINKING@ +# Extra Python specific linking options +ifeq (,$(PY3)) + PYTHON_DLNK = @PYTHONDYNAMICLINKING@ + PYTHON_LINK = @PYLINK@ +else + PYTHON_DLNK = @PYTHON3DYNAMICLINKING@ + PYTHON_LINK = @PY3LINK@ +endif PYTHON_SO = @PYTHON_SO@ +# SWIG option for Python +ifeq (,$(PY3)) + SWIGPYTHON = $(SWIG) -python +else + SWIGPYTHON = $(SWIG) -python -py3 +endif + # ---------------------------------------------------------------- # Build a C dynamically loadable module # ---------------------------------------------------------------- python: $(SRCS) - $(SWIG) -python $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) @@ -242,7 +266,7 @@ python: $(SRCS) # ----------------------------------------------------------------- python_cpp: $(SRCS) - $(SWIG) -c++ -python $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) -c++ $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) @@ -255,18 +279,37 @@ python_cpp: $(SRCS) #TKINTER = -L/usr/X11R6.3/lib -L/usr/local/compat/lib -ltk4.0 -ltcl7.4 -lX11 TKINTER = -PYTHON_LIBOPTS = @PYLINK@ @LIBS@ $(TKINTER) $(SYSLIBS) +PYTHON_LIBOPTS = $(PYTHON_LINK) @LIBS@ $(TKINTER) $(SYSLIBS) python_static: $(SRCS) - $(SWIG) -python -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) python_static_cpp: $(SRCS) - $(SWIG) -c++ -python -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) -c++ -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) +# ----------------------------------------------------------------- +# Running a Python example +# ----------------------------------------------------------------- + +ifeq (,$(PY3)) + PYSCRIPT = runme.py +else + PYSCRIPT = runme3.py +endif + +PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'` + +python_run: $(PYSCRIPT) + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT) >/dev/null + +runme3.py: runme.py + cp $< $@ + $(PY2TO3) -w $@ >/dev/null 2>&1 + # ----------------------------------------------------------------- # Cleaning the python examples # ----------------------------------------------------------------- @@ -275,6 +318,8 @@ python_clean: rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@ + if [ -f runme.py ]; then (rm -f runme3.py runme3.py.bak;) fi; + ################################################################## ##### OCTAVE ###### @@ -293,7 +338,7 @@ OCTAVE_SO = @OCTAVE_SO@ # ---------------------------------------------------------------- octave: $(SRCS) - $(SWIG) -octave $(SWIGOPT) $(INTERFACE) + $(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDES) $(OCTAVE_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) @@ -303,7 +348,7 @@ octave: $(SRCS) # ----------------------------------------------------------------- octave_cpp: $(SRCS) - $(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACEPATH) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CXXSHARED) -g $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) @@ -330,12 +375,12 @@ GUILE_LIBPREFIX = lib # Build a dynamically loaded module with passive linkage and the scm interface #------------------------------------------------------------------ guile: $(SRCS) - $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_cpp: $(SRCS) - $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -346,12 +391,12 @@ guile_externalhdr: # Build a dynamically loaded module with passive linkage and the gh interface #------------------------------------------------------------------ guile_gh: $(SRCS) - $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_gh_cpp: $(SRCS) - $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -360,12 +405,12 @@ guile_gh_cpp: $(SRCS) # ----------------------------------------------------------------- guile_passive: $(SRCS) - $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_passive_cpp: $(SRCS) - $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -376,24 +421,24 @@ guile_passive_cpp: $(SRCS) GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS) guile_static: $(SRCS) - $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_static_cpp: $(SRCS) - $(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple: $(SRCS) - $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple_cpp: $(SRCS) - $(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile @@ -428,7 +473,7 @@ JAVACFLAGS = @JAVACFLAGS@ # ---------------------------------------------------------------- java: $(SRCS) - $(SWIG) -java $(SWIGOPT) $(INTERFACE) + $(SWIG) -java $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVALDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) @@ -437,7 +482,7 @@ java: $(SRCS) # ---------------------------------------------------------------- java_cpp: $(SRCS) - $(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -java -c++ $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) @@ -446,7 +491,7 @@ java_cpp: $(SRCS) # ----------------------------------------------------------------- java_clean: - rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v main.java` + rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v runme.java` rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@JAVASO@ @@ -461,12 +506,12 @@ MODULA3_INCLUDE= @MODULA3INC@ # ---------------------------------------------------------------- modula3: $(SRCS) - $(SWIG) -modula3 $(SWIGOPT) $(INTERFACE) + $(SWIG) -modula3 $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) \ # $(OBJS) $(IOBJS) $(LIBS) modula3_cpp: $(SRCS) - $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACEPATH) # ----------------------------------------------------------------- # Cleaning the modula3 examples @@ -481,7 +526,7 @@ modula3_clean: ##### MZSCHEME ###### ################################################################## -MZC = test -n "@MZC@" && @MZC@ +MZC = @MZC@ MZDYNOBJ = @MZDYNOBJ@ MZSCHEME_SO = @MZSCHEME_SO@ @@ -490,13 +535,13 @@ MZSCHEME_SO = @MZSCHEME_SO@ # ---------------------------------------------------------------- mzscheme: $(SRCS) - $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACE) - $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS) - $(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) + $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACEPATH) + $(COMPILETOOL) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS) + $(COMPILETOOL) $(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) mzscheme_cpp: $(SRCS) - $(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACE) - $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) + $(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACEPATH) + $(COMPILETOOL) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS) # ----------------------------------------------------------------- @@ -518,6 +563,7 @@ OCAMLFIND=@OCAMLFIND@ OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE) NOLINK ?= false OCAMLPP= -pp "camlp4o ./swigp4.cmo" +OCAMLP4WHERE=`$(COMPILETOOL) camlp4 -where` OCAMLCORE=\ rm -rf swig.mli swig.ml swigp4.ml && \ $(SWIG) -ocaml -co swig.mli 2>/dev/null && \ @@ -525,12 +571,12 @@ OCAMLCORE=\ $(SWIG) -ocaml -co swigp4.ml 2>/dev/null && \ $(OCC) -c swig.mli && \ $(OCC) -c swig.ml && \ - $(OCC) -I `camlp4 -where` -pp "camlp4o pa_extend.cmo q_MLast.cmo" \ + $(OCC) -I $(OCAMLP4WHERE) -pp "camlp4o pa_extend.cmo q_MLast.cmo" \ -c swigp4.ml ocaml_static: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.ml) @@ -544,7 +590,7 @@ ocaml_static: $(SRCS) ocaml_dynamic: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(CXXSHARED) $(CFLAGS) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(LIBS) @@ -563,7 +609,7 @@ ocaml_dynamic: $(SRCS) ocaml_static_toplevel: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.ml) @@ -571,14 +617,14 @@ ocaml_static_toplevel: $(SRCS) $(OCC) $(OCAMLPP) -c $(PROGFILE) $(NOLINK) || $(OCAMLMKTOP) \ swig.cmo \ - -I `camlp4 -where` camlp4o.cma swigp4.cmo \ + -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo \ -g -ccopt -g -cclib -g -custom -o $(TARGET)_top \ $(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" ocaml_static_cpp: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) @@ -595,7 +641,7 @@ ocaml_static_cpp: $(SRCS) ocaml_static_cpp_toplevel: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) @@ -605,7 +651,7 @@ ocaml_static_cpp_toplevel: $(SRCS) $(OCC) $(OCAMLPP) -c $(PROGFILE) $(NOLINK) || $(OCAMLMKTOP) \ swig.cmo \ - -I `camlp4 -where` camlp4o.cma swigp4.cmo \ + -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo \ -g -ccopt -g -cclib -g -custom -o $(TARGET)_top \ $(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \ @@ -613,7 +659,7 @@ ocaml_static_cpp_toplevel: $(SRCS) ocaml_dynamic_cpp: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) -ccopt -fPIC @@ -654,7 +700,7 @@ RUBY_DLNK = @RUBYDYNAMICLINKING@ # ---------------------------------------------------------------- ruby: $(SRCS) - $(SWIG) -ruby $(SWIGOPT) $(INTERFACE) + $(SWIG) -ruby $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(RUBY_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -663,7 +709,7 @@ ruby: $(SRCS) # ----------------------------------------------------------------- ruby_cpp: $(SRCS) - $(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(RUBY_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -677,12 +723,12 @@ ruby_cpp: $(SRCS) RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS) ruby_static: $(SRCS) - $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(RUBY_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) ruby_cpp_static: $(SRCS) - $(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) @@ -701,41 +747,41 @@ ruby_clean: ################################################################## # ------------------------------------------------------------------- -# Build a PHP4 dynamically loadable module (C) +# Build a PHP dynamically loadable module (C) # ------------------------------------------------------------------- -PHP4_INCLUDE = @PHP4INC@ -PHP4_SO = @PHP4_SO@ +PHP_INCLUDE = @PHPINC@ +PHP_SO = @PHP_SO@ -php4: $(SRCS) - $(SWIG) -php5 $(SWIGOPT) $(INTERFACE) - $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) +php: $(SRCS) + $(SWIG) -php $(SWIGOPT) $(INTERFACEPATH) + $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP_INCLUDE) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO) # -------------------------------------------------------------------- -# Build a PHP4 dynamically loadable module (C++) +# Build a PHP dynamically loadable module (C++) # -------------------------------------------------------------------- -php4_cpp: $(SRCS) - $(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACE) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) +php_cpp: $(SRCS) + $(SWIG) -php -cppext cxx -c++ $(SWIGOPT) $(INTERFACEPATH) + $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP_INCLUDE) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO) # ----------------------------------------------------------------- -# Running a PHP4 example +# Running a PHP example # ----------------------------------------------------------------- -PHP4=@PHP4@ -SCRIPT ?= runme.php4 +PHP=@PHP@ +PHPSCRIPT ?= runme.php -php4_run: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(SCRIPT) +php_run: + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHPSCRIPT) # ----------------------------------------------------------------- -# Cleaning the PHP4 examples +# Cleaning the PHP examples # ----------------------------------------------------------------- -php4_clean: +php_clean: rm -f *_wrap* *~ .~* example.php php_example.h rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ @@ -755,7 +801,7 @@ PIKE_DLNK = @PIKEDYNAMICLINKING@ # ---------------------------------------------------------------- pike: $(SRCS) - $(SWIG) -pike $(SWIGOPT) $(INTERFACE) + $(SWIG) -pike $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PIKE_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -764,7 +810,7 @@ pike: $(SRCS) # ----------------------------------------------------------------- pike_cpp: $(SRCS) - $(SWIG) -c++ -pike $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -pike $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PIKE_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -778,12 +824,12 @@ pike_cpp: $(SRCS) PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS) pike_static: $(SRCS) - $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) pike_cpp_static: $(SRCS) - $(SWIG) -c++ -pike -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) @@ -825,7 +871,7 @@ CHICKEN_COMPILED_MAIN_OBJECT = $(CHICKEN_COMPILED_MAIN:.c=.@OBJEXT@) # This is the old way to build chicken, but it does not work correctly with exceptions chicken_direct: $(SRCS) - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -dynamic -feature chicken-compile-shared \ -output-file $(CHICKEN_COMPILED_SCHEME) @@ -835,7 +881,7 @@ chicken_direct: $(SRCS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(LIBPREFIX)$(TARGET)$(SO) chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS) - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -dynamic -feature chicken-compile-shared \ -output-file $(CHICKEN_COMPILED_SCHEME) @@ -850,7 +896,7 @@ chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS) # The following two targets are also used by the test suite chicken_static: $(SRCS) $(CHICKSRCS) - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -output-file $(CHICKEN_COMPILED_SCHEME) $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ @@ -862,7 +908,7 @@ chicken_static: $(SRCS) $(CHICKSRCS) $(OBJS) $(IOBJS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(TARGET) chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -output-file $(CHICKEN_COMPILED_SCHEME) $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ @@ -878,11 +924,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) # ---------------------------------------------------------------- chicken: - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) chicken_cpp: - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) chicken_externalhdr: @@ -910,7 +956,7 @@ CSHARPSO = @CSHARPSO@ # ---------------------------------------------------------------- csharp: $(SRCS) - $(SWIG) -csharp $(SWIGOPT) $(INTERFACE) + $(SWIG) -csharp $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) @@ -919,7 +965,7 @@ csharp: $(SRCS) # ---------------------------------------------------------------- csharp_cpp: $(SRCS) - $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) @@ -959,7 +1005,7 @@ LUA_INTERP = ../lua.c # ---------------------------------------------------------------- lua: $(SRCS) - $(SWIG) -lua $(SWIGOPT) $(INTERFACE) + $(SWIG) -lua $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LUA_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) @@ -968,7 +1014,7 @@ lua: $(SRCS) # ----------------------------------------------------------------- lua_cpp: $(SRCS) - $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(LUA_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) @@ -977,12 +1023,12 @@ lua_cpp: $(SRCS) # ----------------------------------------------------------------- lua_static: $(SRCS) - $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACE) + $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) lua_static_cpp: $(SRCS) - $(SWIG) -c++ -lua -module example $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -lua -module example $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) @@ -1000,12 +1046,12 @@ lua_clean: ################################################################## allegrocl: $(SRCS) - $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACE) + $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) allegrocl_cpp: $(SRCS) - $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1019,10 +1065,10 @@ allegrocl_clean: ################################################################## clisp: $(SRCS) - $(SWIG) -clisp $(SWIGOPT) $(INTERFACE) + $(SWIG) -clisp $(SWIGOPT) $(INTERFACEPATH) clisp_cpp: $(SRCS) - $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACEPATH) clisp_clean: rm -f *_wrap* *~ .~* @@ -1034,12 +1080,12 @@ clisp_clean: ################################################################## cffi: $(SRCS) - $(SWIG) -cffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) cffi_cpp: $(SRCS) - $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1053,12 +1099,12 @@ cffi_clean: ################################################################## uffi: $(SRCS) - $(SWIG) -uffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) uffi_cpp: $(SRCS) - $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACEPATH) # $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) # $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1076,11 +1122,11 @@ RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #Need to use _wrap.cpp for R build system a RRSRC = $(INTERFACE:.i=.R) r: $(SRCS) - $(SWIG) -r $(SWIGOPT) $(INTERFACE) + $(SWIG) -r $(SWIGOPT) $(INTERFACEPATH) +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) r_cpp: $(CXXSRCS) - $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE) + $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH) +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) r_clean: @@ -1103,12 +1149,12 @@ CXX_LDSHARED = @CXX_LDSHARED@ C_SO = @C_SO@ c: $(SRCS) - $(SWIG) -c $(SWIGOPT) $(INTERFACE) + $(SWIG) -c $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_cpp: $(SRCS) - $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) diff --git a/Examples/csharp/arrays/Makefile b/Examples/csharp/arrays/Makefile new file mode 100644 index 000000000..b3446d895 --- /dev/null +++ b/Examples/csharp/arrays/Makefile @@ -0,0 +1,20 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SRCS = example.c +TARGET = example +INTERFACE = example.i +SWIGOPT = +CSHARPSRCS = *.cs +CSHARPFLAGS= -nologo -unsafe -out:runme.exe + +all:: csharp + +csharp:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp + $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile + +clean:: + $(MAKE) -f $(TOP)/Makefile csharp_clean + +check: all diff --git a/Examples/csharp/arrays/example.c b/Examples/csharp/arrays/example.c new file mode 100644 index 000000000..2498e1f4e --- /dev/null +++ b/Examples/csharp/arrays/example.c @@ -0,0 +1,22 @@ +/* File : example.c */ + +#include "example.h" + +/* copy the contents of the first array to the second */ +void myArrayCopy( int* sourceArray, int* targetArray, int nitems ) { + int i; + for ( i = 0; i < nitems; i++ ) { + targetArray[ i ] = sourceArray[ i ]; + } +} + +/* swap the contents of the two arrays */ +void myArraySwap( int* array1, int* array2, int nitems ) { + int i, temp; + for ( i = 0; i < nitems; i++ ) { + temp = array1[ i ]; + array1[ i ] = array2[ i ]; + array2[ i ] = temp; + } +} + diff --git a/Examples/csharp/arrays/example.h b/Examples/csharp/arrays/example.h new file mode 100644 index 000000000..113b92c1b --- /dev/null +++ b/Examples/csharp/arrays/example.h @@ -0,0 +1,4 @@ + +void myArrayCopy( int *sourceArray, int* targetArray, int nitems ); +void myArraySwap( int* array1, int* array2, int nitems ); + diff --git a/Examples/csharp/arrays/example.i b/Examples/csharp/arrays/example.i new file mode 100644 index 000000000..488565a74 --- /dev/null +++ b/Examples/csharp/arrays/example.i @@ -0,0 +1,45 @@ +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} +%include "arrays_csharp.i" + +%apply int INPUT[] { int* sourceArray } +%apply int OUTPUT[] { int* targetArray } + +%apply int INOUT[] { int* array1 } +%apply int INOUT[] { int* array2 } + +%include "example.h" + +%clear int* sourceArray; +%clear int* targetArray; + +%clear int* array1; +%clear int* array2; + + +// Below replicates the above array handling but this time using the pinned (fixed) array typemaps +%csmethodmodifiers "public unsafe"; + +%apply int FIXED[] { int* sourceArray } +%apply int FIXED[] { int* targetArray } + +%inline %{ +void myArrayCopyUsingFixedArrays( int *sourceArray, int* targetArray, int nitems ) { + myArrayCopy(sourceArray, targetArray, nitems); +} +%} + +%apply int FIXED[] { int* array1 } +%apply int FIXED[] { int* array2 } + +%inline %{ +void myArraySwapUsingFixedArrays( int* array1, int* array2, int nitems ) { + myArraySwap(array1, array2, nitems); +} +%} + + diff --git a/Examples/csharp/arrays/runme.cs b/Examples/csharp/arrays/runme.cs new file mode 100644 index 000000000..c2b8a6bdd --- /dev/null +++ b/Examples/csharp/arrays/runme.cs @@ -0,0 +1,43 @@ +using System; + +public class runme +{ + static void Main() + { + int[] source = { 1, 2, 3 }; + int[] target = new int[ source.Length ]; + + example.myArrayCopy( source, target, target.Length ); + + Console.WriteLine( "Contents of copy target array using default marshaling" ); + PrintArray( target ); + + target = new int[ source.Length ]; + + example.myArrayCopyUsingFixedArrays( source, target, target.Length ); + Console.WriteLine( "Contents of copy target array using fixed arrays" ); + PrintArray( target ); + + target = new int[] { 4, 5, 6 }; + example.myArraySwap( source, target, target.Length ); + Console.WriteLine( "Contents of arrays after swapping using default marshaling" ); + PrintArray( source ); + PrintArray( target ); + + source = new int[] { 1, 2, 3 }; + target = new int[] { 4, 5, 6 }; + + example.myArraySwapUsingFixedArrays( source, target, target.Length ); + Console.WriteLine( "Contents of arrays after swapping using fixed arrays" ); + PrintArray( source ); + PrintArray( target ); + } + + static void PrintArray( int[] a ) + { + foreach ( int i in a ) + Console.Write( "{0} ", i ); + Console.WriteLine(); + } +} + diff --git a/Examples/csharp/check.list b/Examples/csharp/check.list index c4d92402b..5454d8531 100644 --- a/Examples/csharp/check.list +++ b/Examples/csharp/check.list @@ -1,4 +1,5 @@ # see top-level Makefile.in +arrays callback class enum diff --git a/Examples/guile/matrix/matrix.scm b/Examples/guile/matrix/matrix.scm old mode 100755 new mode 100644 diff --git a/Examples/java/callback/main.java b/Examples/java/callback/runme.java similarity index 98% rename from Examples/java/callback/main.java rename to Examples/java/callback/runme.java index 4800f8cc9..4090f0ac3 100644 --- a/Examples/java/callback/main.java +++ b/Examples/java/callback/runme.java @@ -1,4 +1,4 @@ -public class main +public class runme { static { try { diff --git a/Examples/java/class/index.html b/Examples/java/class/index.html index e9db7e94a..cf9130c62 100644 --- a/Examples/java/class/index.html +++ b/Examples/java/class/index.html @@ -88,7 +88,7 @@ Note: when creating a C++ extension, you must run SWIG with the -c++ op

        A sample Java program

        -Click here to see a Java program that calls the C++ functions from Java. +Click here to see a Java program that calls the C++ functions from Java.

        Key points

        diff --git a/Examples/java/class/main.java b/Examples/java/class/runme.java similarity index 99% rename from Examples/java/class/main.java rename to Examples/java/class/runme.java index 8ef35db6d..e1ea0d71c 100644 --- a/Examples/java/class/main.java +++ b/Examples/java/class/runme.java @@ -1,7 +1,7 @@ // This example illustrates how C++ classes can be used from Java using SWIG. // The Java class gets mapped onto the C++ class and behaves as if it is a Java class. -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/java/constants/index.html b/Examples/java/constants/index.html index 8367d0571..9f1e95a03 100644 --- a/Examples/java/constants/index.html +++ b/Examples/java/constants/index.html @@ -20,7 +20,7 @@ to see a SWIG interface with some constant declarations in it. Click here for the section on constants in the SWIG and Java documentation.

        -Click here to see a Java program that prints out the values +Click here to see a Java program that prints out the values of the constants contained in the above file.

        Key points

          diff --git a/Examples/java/constants/main.java b/Examples/java/constants/runme.java similarity index 98% rename from Examples/java/constants/main.java rename to Examples/java/constants/runme.java index 7130c3d70..2c67d86aa 100644 --- a/Examples/java/constants/main.java +++ b/Examples/java/constants/runme.java @@ -1,6 +1,6 @@ import java.lang.reflect.*; -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/java/enum/index.html b/Examples/java/enum/index.html index 52c06c5d1..20daf2691 100644 --- a/Examples/java/enum/index.html +++ b/Examples/java/enum/index.html @@ -21,7 +21,7 @@ See the documentation for the other approaches for wrapping enums.
          diff --git a/Examples/java/enum/main.java b/Examples/java/enum/runme.java similarity index 98% rename from Examples/java/enum/main.java rename to Examples/java/enum/runme.java index 8646e0087..56e49af91 100644 --- a/Examples/java/enum/main.java +++ b/Examples/java/enum/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/java/extend/main.java b/Examples/java/extend/runme.java similarity index 99% rename from Examples/java/extend/main.java rename to Examples/java/extend/runme.java index ee3a94ed0..629bb14a6 100644 --- a/Examples/java/extend/main.java +++ b/Examples/java/extend/runme.java @@ -17,7 +17,7 @@ class CEO extends Manager { } -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/java/funcptr/index.html b/Examples/java/funcptr/index.html index 0ad2be1cf..56d3baa18 100644 --- a/Examples/java/funcptr/index.html +++ b/Examples/java/funcptr/index.html @@ -66,7 +66,7 @@ Here are some files that illustrate this with a simple example:
        • example.c
        • example.h
        • example.i (SWIG interface) -
        • main.java (Sample program) +
        • runme.java (Sample program)

        Notes

        diff --git a/Examples/java/funcptr/main.java b/Examples/java/funcptr/runme.java similarity index 98% rename from Examples/java/funcptr/main.java rename to Examples/java/funcptr/runme.java index cf81f92b4..cd34c1b65 100644 --- a/Examples/java/funcptr/main.java +++ b/Examples/java/funcptr/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/java/index.html b/Examples/java/index.html index d98f9a393..007e14dbc 100644 --- a/Examples/java/index.html +++ b/Examples/java/index.html @@ -30,7 +30,7 @@ certain C declarations are turned into constants.

        Running the examples

        Please see the Windows page in the main manual for information on using the examples on Windows.

        -On Unix most of the examples work by making the Makefile before executing the program main.java. The Makefile will output the swig generated JNI c code as well as the Java wrapper classes. Additionally the JNI c/c++ code is compiled into the shared object (dynamic link library) which is needed for dynamic linking to the native code. The Makefiles also compile the Java files using javac. +On Unix most of the examples work by making the Makefile before executing the program runme.java. The Makefile will output the swig generated JNI c code as well as the Java wrapper classes. Additionally the JNI c/c++ code is compiled into the shared object (dynamic link library) which is needed for dynamic linking to the native code. The Makefiles also compile the Java files using javac.

        Ensure that the dynamic link library file is in the appropriate path before executing the Java program. For example in Unix, libexample.so must be in the LD_LIBRARY_PATH.

        @@ -39,7 +39,7 @@ A Unix example: 

         $ make
 $ export LD_LIBRARY_PATH=. #ksh 
-$ java main
+$ java runme

        diff --git a/Examples/java/multimap/main.java b/Examples/java/multimap/runme.java similarity index 97% rename from Examples/java/multimap/main.java rename to Examples/java/multimap/runme.java index 331ac6b89..738330e77 100644 --- a/Examples/java/multimap/main.java +++ b/Examples/java/multimap/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/java/native/index.html b/Examples/java/native/index.html index 7ecf129ce..1ca51c1e9 100644 --- a/Examples/java/native/index.html +++ b/Examples/java/native/index.html @@ -18,7 +18,7 @@ This example compares wrapping a c global function using the manual way and the

        • example.i. Interface file comparing code wrapped by SWIG and wrapped manually. -
        • main.java. Sample Java program showing calls to both manually wrapped and SWIG wrapped c functions. +
        • runme.java. Sample Java program showing calls to both manually wrapped and SWIG wrapped c functions.

        Notes

        diff --git a/Examples/java/native/main.java b/Examples/java/native/runme.java similarity index 96% rename from Examples/java/native/main.java rename to Examples/java/native/runme.java index f4760bb3d..e9a18b21a 100644 --- a/Examples/java/native/main.java +++ b/Examples/java/native/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/java/pointer/index.html b/Examples/java/pointer/index.html index c30d549e6..e20fe3328 100644 --- a/Examples/java/pointer/index.html +++ b/Examples/java/pointer/index.html @@ -144,7 +144,7 @@ extraction.

        Notes

        diff --git a/Examples/java/pointer/main.java b/Examples/java/pointer/runme.java similarity index 98% rename from Examples/java/pointer/main.java rename to Examples/java/pointer/runme.java index e96e02eaa..f32f980f9 100644 --- a/Examples/java/pointer/main.java +++ b/Examples/java/pointer/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/java/reference/index.html b/Examples/java/reference/index.html index 64b129cbb..33c80c50f 100644 --- a/Examples/java/reference/index.html +++ b/Examples/java/reference/index.html @@ -121,7 +121,7 @@ Click here to see a SWIG interface file with these addit

        Sample Java program

        -Click here to see a Java program that manipulates some C++ references. +Click here to see a Java program that manipulates some C++ references.

        Notes:

        diff --git a/Examples/java/reference/main.java b/Examples/java/reference/runme.java similarity index 99% rename from Examples/java/reference/main.java rename to Examples/java/reference/runme.java index 4fd354761..6a2d9bf70 100644 --- a/Examples/java/reference/main.java +++ b/Examples/java/reference/runme.java @@ -1,6 +1,6 @@ // This example illustrates the manipulation of C++ references in Java. -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/java/simple/index.html b/Examples/java/simple/index.html index a363327fe..9729e6dd8 100644 --- a/Examples/java/simple/index.html +++ b/Examples/java/simple/index.html @@ -65,15 +65,15 @@ to create the extension libexample.so (unix).

        Using the extension

        -Click here to see a program that calls our C functions from Java. +Click here to see a program that calls our C functions from Java.

        -Compile the java files example.java and main.java -to create the class files example.class and main.class before running main in the JVM. Ensure that the libexample.so file is in your LD_LIBRARY_PATH before running. For example: +Compile the java files example.java and runme.java +to create the class files example.class and runme.class before running runme in the JVM. Ensure that the libexample.so file is in your LD_LIBRARY_PATH before running. For example: 

         export LD_LIBRARY_PATH=. #ksh 
 javac *.java
-java main
+java runme
        diff --git a/Examples/java/simple/main.java b/Examples/java/simple/runme.java similarity index 97% rename from Examples/java/simple/main.java rename to Examples/java/simple/runme.java index 6d224a4dc..92880e8f9 100644 --- a/Examples/java/simple/main.java +++ b/Examples/java/simple/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/java/template/index.html b/Examples/java/template/index.html index 1aebd4c2a..f4408e568 100644 --- a/Examples/java/template/index.html +++ b/Examples/java/template/index.html @@ -85,7 +85,7 @@ Note that SWIG parses the templated function max and templated class A sample Java program -Click here to see a Java program that calls the C++ functions from Java. +Click here to see a Java program that calls the C++ functions from Java.

        Notes

        Use templated classes just like you would any other SWIG generated Java class. Use the classnames specified by the %template directive. diff --git a/Examples/java/template/main.java b/Examples/java/template/runme.java similarity index 98% rename from Examples/java/template/main.java rename to Examples/java/template/runme.java index 9129fcf2a..5d1097bba 100644 --- a/Examples/java/template/main.java +++ b/Examples/java/template/runme.java @@ -1,6 +1,6 @@ // This example illustrates how C++ templates can be used from Java. -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/java/typemap/index.html b/Examples/java/typemap/index.html index 486aa8e79..5dd591941 100644 --- a/Examples/java/typemap/index.html +++ b/Examples/java/typemap/index.html @@ -16,7 +16,7 @@ This example shows how typemaps can be used to modify the default behaviour of t

        Notes

        diff --git a/Examples/java/typemap/main.java b/Examples/java/typemap/runme.java similarity index 96% rename from Examples/java/typemap/main.java rename to Examples/java/typemap/runme.java index bd9a4e1b6..fcbcc3067 100644 --- a/Examples/java/typemap/main.java +++ b/Examples/java/typemap/runme.java @@ -1,5 +1,5 @@ -public class main { +public class runme { static { try { diff --git a/Examples/java/variables/index.html b/Examples/java/variables/index.html index 05aaa2d6e..07b19d4e7 100644 --- a/Examples/java/variables/index.html +++ b/Examples/java/variables/index.html @@ -38,7 +38,7 @@ example.set_foo(12.3); -Click here to see the example program that updates and prints +Click here to see the example program that updates and prints out the values of the variables using this technique.

        Key points

        diff --git a/Examples/java/variables/main.java b/Examples/java/variables/runme.java similarity index 99% rename from Examples/java/variables/main.java rename to Examples/java/variables/runme.java index 92745db99..361a30fa6 100644 --- a/Examples/java/variables/main.java +++ b/Examples/java/variables/runme.java @@ -2,7 +2,7 @@ import java.lang.reflect.*; -public class main { +public class runme { static { try { System.loadLibrary("example"); diff --git a/Examples/lua/embed3/embed3.cpp b/Examples/lua/embed3/embed3.cpp index c2424f9af..e5e0e0a7d 100644 --- a/Examples/lua/embed3/embed3.cpp +++ b/Examples/lua/embed3/embed3.cpp @@ -26,7 +26,12 @@ extern "C" { #include #include } - + +/* The SWIG external runtime is generated by using. +swig -lua -externalruntime swigluarun.h +It contains useful function used by SWIG in its wrappering +SWIG_TypeQuery() SWIG_NewPointerObj() +*/ #include "swigluarun.h" // the SWIG external runtime /* the SWIG wrappered library */ diff --git a/Examples/perl5/class/example.dsp b/Examples/perl5/class/example.dsp index bbdedc094..b5ccd1928 100644 --- a/Examples/perl5/class/example.dsp +++ b/Examples/perl5/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/bar.dsp b/Examples/perl5/import/bar.dsp index 682c21757..64786b8f6 100644 --- a/Examples/perl5/import/bar.dsp +++ b/Examples/perl5/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/base.dsp b/Examples/perl5/import/base.dsp index 7a0ea8027..920891cbf 100644 --- a/Examples/perl5/import/base.dsp +++ b/Examples/perl5/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/foo.dsp b/Examples/perl5/import/foo.dsp index 755560165..d519a5316 100644 --- a/Examples/perl5/import/foo.dsp +++ b/Examples/perl5/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/spam.dsp b/Examples/perl5/import/spam.dsp index ed41de36b..e5c8046eb 100644 --- a/Examples/perl5/import/spam.dsp +++ b/Examples/perl5/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/multimap/example.dsp b/Examples/perl5/multimap/example.dsp index 2d295763b..be8a0070e 100644 --- a/Examples/perl5/multimap/example.dsp +++ b/Examples/perl5/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/simple/example.dsp b/Examples/perl5/simple/example.dsp index 2d295763b..be8a0070e 100644 --- a/Examples/perl5/simple/example.dsp +++ b/Examples/perl5/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 $(InputPath) # End Custom Build diff --git a/Examples/php4/check.list b/Examples/php/check.list similarity index 100% rename from Examples/php4/check.list rename to Examples/php/check.list diff --git a/Examples/php4/enum/Makefile b/Examples/php/class/Makefile similarity index 71% rename from Examples/php4/enum/Makefile rename to Examples/php/class/Makefile index 39c4d2f23..252a72660 100644 --- a/Examples/php4/enum/Makefile +++ b/Examples/php/class/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/class/example.cxx b/Examples/php/class/example.cxx similarity index 100% rename from Examples/php4/class/example.cxx rename to Examples/php/class/example.cxx diff --git a/Examples/php4/class/example.h b/Examples/php/class/example.h similarity index 100% rename from Examples/php4/class/example.h rename to Examples/php/class/example.h diff --git a/Examples/php4/class/example.i b/Examples/php/class/example.i similarity index 100% rename from Examples/php4/class/example.i rename to Examples/php/class/example.i diff --git a/Examples/php4/class/runme.php4 b/Examples/php/class/runme.php similarity index 100% rename from Examples/php4/class/runme.php4 rename to Examples/php/class/runme.php diff --git a/Examples/php4/constants/Makefile b/Examples/php/constants/Makefile similarity index 70% rename from Examples/php4/constants/Makefile rename to Examples/php/constants/Makefile index aed110eb2..23e2675d7 100644 --- a/Examples/php4/constants/Makefile +++ b/Examples/php/constants/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/constants/example.i b/Examples/php/constants/example.i similarity index 100% rename from Examples/php4/constants/example.i rename to Examples/php/constants/example.i diff --git a/Examples/php4/constants/runme.php4 b/Examples/php/constants/runme.php similarity index 100% rename from Examples/php4/constants/runme.php4 rename to Examples/php/constants/runme.php diff --git a/Examples/php4/simple/Makefile b/Examples/php/cpointer/Makefile similarity index 71% rename from Examples/php4/simple/Makefile rename to Examples/php/cpointer/Makefile index caeec2d73..0862ce5ec 100644 --- a/Examples/php4/simple/Makefile +++ b/Examples/php/cpointer/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/cpointer/example.c b/Examples/php/cpointer/example.c similarity index 100% rename from Examples/php4/cpointer/example.c rename to Examples/php/cpointer/example.c diff --git a/Examples/php4/cpointer/example.i b/Examples/php/cpointer/example.i similarity index 100% rename from Examples/php4/cpointer/example.i rename to Examples/php/cpointer/example.i diff --git a/Examples/php4/cpointer/runme.php4 b/Examples/php/cpointer/runme.php similarity index 100% rename from Examples/php4/cpointer/runme.php4 rename to Examples/php/cpointer/runme.php diff --git a/Examples/php4/proxy/Makefile b/Examples/php/disown/Makefile similarity index 70% rename from Examples/php4/proxy/Makefile rename to Examples/php/disown/Makefile index ef3acc773..1bc0beaab 100644 --- a/Examples/php4/proxy/Makefile +++ b/Examples/php/disown/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/disown/example.cxx b/Examples/php/disown/example.cxx similarity index 100% rename from Examples/php4/disown/example.cxx rename to Examples/php/disown/example.cxx diff --git a/Examples/php4/disown/example.h b/Examples/php/disown/example.h similarity index 100% rename from Examples/php4/disown/example.h rename to Examples/php/disown/example.h diff --git a/Examples/php4/disown/example.i b/Examples/php/disown/example.i similarity index 100% rename from Examples/php4/disown/example.i rename to Examples/php/disown/example.i diff --git a/Examples/php4/disown/runme.php4 b/Examples/php/disown/runme.php similarity index 100% rename from Examples/php4/disown/runme.php4 rename to Examples/php/disown/runme.php diff --git a/Examples/php4/reference/Makefile b/Examples/php/enum/Makefile similarity index 71% rename from Examples/php4/reference/Makefile rename to Examples/php/enum/Makefile index 39c4d2f23..252a72660 100644 --- a/Examples/php4/reference/Makefile +++ b/Examples/php/enum/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/enum/example.cxx b/Examples/php/enum/example.cxx similarity index 100% rename from Examples/php4/enum/example.cxx rename to Examples/php/enum/example.cxx diff --git a/Examples/php4/enum/example.h b/Examples/php/enum/example.h similarity index 100% rename from Examples/php4/enum/example.h rename to Examples/php/enum/example.h diff --git a/Examples/php4/enum/example.i b/Examples/php/enum/example.i similarity index 100% rename from Examples/php4/enum/example.i rename to Examples/php/enum/example.i diff --git a/Examples/php4/enum/runme.php4 b/Examples/php/enum/runme.php similarity index 100% rename from Examples/php4/enum/runme.php4 rename to Examples/php/enum/runme.php diff --git a/Examples/php4/cpointer/Makefile b/Examples/php/funcptr/Makefile similarity index 71% rename from Examples/php4/cpointer/Makefile rename to Examples/php/funcptr/Makefile index caeec2d73..0862ce5ec 100644 --- a/Examples/php4/cpointer/Makefile +++ b/Examples/php/funcptr/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/funcptr/example.c b/Examples/php/funcptr/example.c similarity index 100% rename from Examples/php4/funcptr/example.c rename to Examples/php/funcptr/example.c diff --git a/Examples/php4/funcptr/example.h b/Examples/php/funcptr/example.h similarity index 100% rename from Examples/php4/funcptr/example.h rename to Examples/php/funcptr/example.h diff --git a/Examples/php4/funcptr/example.i b/Examples/php/funcptr/example.i similarity index 100% rename from Examples/php4/funcptr/example.i rename to Examples/php/funcptr/example.i diff --git a/Examples/php4/funcptr/runme.php4 b/Examples/php/funcptr/runme.php similarity index 100% rename from Examples/php4/funcptr/runme.php4 rename to Examples/php/funcptr/runme.php diff --git a/Examples/php4/overloading/Makefile b/Examples/php/overloading/Makefile similarity index 70% rename from Examples/php4/overloading/Makefile rename to Examples/php/overloading/Makefile index ef3acc773..1bc0beaab 100644 --- a/Examples/php4/overloading/Makefile +++ b/Examples/php/overloading/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/overloading/example.cxx b/Examples/php/overloading/example.cxx similarity index 78% rename from Examples/php4/overloading/example.cxx rename to Examples/php/overloading/example.cxx index fc7aff195..2f684f05c 100644 --- a/Examples/php4/overloading/example.cxx +++ b/Examples/php/overloading/example.cxx @@ -34,22 +34,22 @@ double Square::perimeter(void) { return 4*width; } -char *overloaded(int i) { +const char *overloaded(int i) { return "Overloaded with int"; } -char *overloaded(double d) { +const char *overloaded(double d) { return "Overloaded with double"; } -char *overloaded(const char * str) { +const char *overloaded(const char * str) { return "Overloaded with char *"; } -char *overloaded( const Circle& ) { +const char *overloaded( const Circle& ) { return "Overloaded with Circle"; } -char *overloaded( const Shape& ) { +const char *overloaded( const Shape& ) { return "Overloaded with Shape"; } diff --git a/Examples/php4/overloading/example.h b/Examples/php/overloading/example.h similarity index 77% rename from Examples/php4/overloading/example.h rename to Examples/php/overloading/example.h index 39ccc1cb1..01d71dd70 100644 --- a/Examples/php4/overloading/example.h +++ b/Examples/php/overloading/example.h @@ -38,9 +38,9 @@ public: virtual double perimeter(void); }; -char *overloaded( int i ); -char *overloaded( double d ); -char *overloaded( const char * str ); -char *overloaded( const Circle& ); -char *overloaded( const Shape& ); +const char *overloaded( int i ); +const char *overloaded( double d ); +const char *overloaded( const char * str ); +const char *overloaded( const Circle& ); +const char *overloaded( const Shape& ); diff --git a/Examples/php4/overloading/example.i b/Examples/php/overloading/example.i similarity index 100% rename from Examples/php4/overloading/example.i rename to Examples/php/overloading/example.i diff --git a/Examples/php4/overloading/runme.php4 b/Examples/php/overloading/runme.php similarity index 100% rename from Examples/php4/overloading/runme.php4 rename to Examples/php/overloading/runme.php diff --git a/Examples/php4/funcptr/Makefile b/Examples/php/pointer/Makefile similarity index 71% rename from Examples/php4/funcptr/Makefile rename to Examples/php/pointer/Makefile index caeec2d73..0862ce5ec 100644 --- a/Examples/php4/funcptr/Makefile +++ b/Examples/php/pointer/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/pointer/example.c b/Examples/php/pointer/example.c similarity index 100% rename from Examples/php4/pointer/example.c rename to Examples/php/pointer/example.c diff --git a/Examples/php4/pointer/example.i b/Examples/php/pointer/example.i similarity index 100% rename from Examples/php4/pointer/example.i rename to Examples/php/pointer/example.i diff --git a/Examples/php4/pointer/runme.php4 b/Examples/php/pointer/runme.php similarity index 100% rename from Examples/php4/pointer/runme.php4 rename to Examples/php/pointer/runme.php diff --git a/Examples/php4/pragmas/Makefile b/Examples/php/pragmas/Makefile similarity index 70% rename from Examples/php4/pragmas/Makefile rename to Examples/php/pragmas/Makefile index aed110eb2..23e2675d7 100644 --- a/Examples/php4/pragmas/Makefile +++ b/Examples/php/pragmas/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/pragmas/example.i b/Examples/php/pragmas/example.i similarity index 70% rename from Examples/php4/pragmas/example.i rename to Examples/php/pragmas/example.i index 289d4ec99..c7e8bf303 100644 --- a/Examples/php4/pragmas/example.i +++ b/Examples/php/pragmas/example.i @@ -21,11 +21,11 @@ zend_printf("This was %%rshutdown\n"); } -%pragma(php4) include="include.php"; +%pragma(php) include="include.php"; -%pragma(php4) code=" +%pragma(php) code=" # This code is inserted into example.php -echo \"this was php4 code\\n\"; +echo \"this was php code\\n\"; " -%pragma(php4) phpinfo="php_info_print_table_start();" +%pragma(php) phpinfo="php_info_print_table_start();" diff --git a/Examples/php4/pragmas/include.php b/Examples/php/pragmas/include.php similarity index 100% rename from Examples/php4/pragmas/include.php rename to Examples/php/pragmas/include.php diff --git a/Examples/php4/pragmas/runme.php4 b/Examples/php/pragmas/runme.php similarity index 100% rename from Examples/php4/pragmas/runme.php4 rename to Examples/php/pragmas/runme.php diff --git a/Examples/php4/sync/Makefile b/Examples/php/proxy/Makefile similarity index 70% rename from Examples/php4/sync/Makefile rename to Examples/php/proxy/Makefile index ef3acc773..1bc0beaab 100644 --- a/Examples/php4/sync/Makefile +++ b/Examples/php/proxy/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/proxy/example.cxx b/Examples/php/proxy/example.cxx similarity index 100% rename from Examples/php4/proxy/example.cxx rename to Examples/php/proxy/example.cxx diff --git a/Examples/php4/proxy/example.h b/Examples/php/proxy/example.h similarity index 100% rename from Examples/php4/proxy/example.h rename to Examples/php/proxy/example.h diff --git a/Examples/php4/proxy/example.i b/Examples/php/proxy/example.i similarity index 100% rename from Examples/php4/proxy/example.i rename to Examples/php/proxy/example.i diff --git a/Examples/php4/proxy/runme.php4 b/Examples/php/proxy/runme.php similarity index 100% rename from Examples/php4/proxy/runme.php4 rename to Examples/php/proxy/runme.php diff --git a/Examples/php4/class/Makefile b/Examples/php/reference/Makefile similarity index 71% rename from Examples/php4/class/Makefile rename to Examples/php/reference/Makefile index 39c4d2f23..252a72660 100644 --- a/Examples/php4/class/Makefile +++ b/Examples/php/reference/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/reference/example.cxx b/Examples/php/reference/example.cxx similarity index 100% rename from Examples/php4/reference/example.cxx rename to Examples/php/reference/example.cxx diff --git a/Examples/php4/reference/example.h b/Examples/php/reference/example.h similarity index 100% rename from Examples/php4/reference/example.h rename to Examples/php/reference/example.h diff --git a/Examples/php4/reference/example.i b/Examples/php/reference/example.i similarity index 100% rename from Examples/php4/reference/example.i rename to Examples/php/reference/example.i diff --git a/Examples/php4/reference/runme-proxy.php4 b/Examples/php/reference/runme-proxy.php4 similarity index 100% rename from Examples/php4/reference/runme-proxy.php4 rename to Examples/php/reference/runme-proxy.php4 diff --git a/Examples/php4/reference/runme.php4 b/Examples/php/reference/runme.php similarity index 100% rename from Examples/php4/reference/runme.php4 rename to Examples/php/reference/runme.php diff --git a/Examples/php4/pointer/Makefile b/Examples/php/simple/Makefile similarity index 71% rename from Examples/php4/pointer/Makefile rename to Examples/php/simple/Makefile index caeec2d73..0862ce5ec 100644 --- a/Examples/php4/pointer/Makefile +++ b/Examples/php/simple/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/simple/example.c b/Examples/php/simple/example.c similarity index 100% rename from Examples/php4/simple/example.c rename to Examples/php/simple/example.c diff --git a/Examples/php4/simple/example.i b/Examples/php/simple/example.i similarity index 100% rename from Examples/php4/simple/example.i rename to Examples/php/simple/example.i diff --git a/Examples/php4/simple/runme.php4 b/Examples/php/simple/runme.php similarity index 100% rename from Examples/php4/simple/runme.php4 rename to Examples/php/simple/runme.php diff --git a/Examples/php4/disown/Makefile b/Examples/php/sync/Makefile similarity index 70% rename from Examples/php4/disown/Makefile rename to Examples/php/sync/Makefile index ef3acc773..1bc0beaab 100644 --- a/Examples/php4/disown/Makefile +++ b/Examples/php/sync/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4_cpp + php_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/sync/example.cxx b/Examples/php/sync/example.cxx similarity index 91% rename from Examples/php4/sync/example.cxx rename to Examples/php/sync/example.cxx index 47378924b..31ed2021b 100644 --- a/Examples/php4/sync/example.cxx +++ b/Examples/php/sync/example.cxx @@ -2,7 +2,7 @@ #include int x = 42; -char *s = "Test"; +char *s = (char *)"Test"; void Sync::printer(void) { diff --git a/Examples/php4/sync/example.h b/Examples/php/sync/example.h similarity index 100% rename from Examples/php4/sync/example.h rename to Examples/php/sync/example.h diff --git a/Examples/php4/sync/example.i b/Examples/php/sync/example.i similarity index 100% rename from Examples/php4/sync/example.i rename to Examples/php/sync/example.i diff --git a/Examples/php4/sync/runme.php4 b/Examples/php/sync/runme.php similarity index 100% rename from Examples/php4/sync/runme.php4 rename to Examples/php/sync/runme.php diff --git a/Examples/php4/value/Makefile b/Examples/php/value/Makefile similarity index 71% rename from Examples/php4/value/Makefile rename to Examples/php/value/Makefile index cc383ea3f..9e69d00a4 100644 --- a/Examples/php4/value/Makefile +++ b/Examples/php/value/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 + php static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean + $(MAKE) -f $(TOP)/Makefile php_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php4_run + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/value/example.c b/Examples/php/value/example.c similarity index 100% rename from Examples/php4/value/example.c rename to Examples/php/value/example.c diff --git a/Examples/php4/value/example.h b/Examples/php/value/example.h similarity index 100% rename from Examples/php4/value/example.h rename to Examples/php/value/example.h diff --git a/Examples/php4/value/example.i b/Examples/php/value/example.i similarity index 100% rename from Examples/php4/value/example.i rename to Examples/php/value/example.i diff --git a/Examples/php4/value/runme.php4 b/Examples/php/value/runme.php similarity index 100% rename from Examples/php4/value/runme.php4 rename to Examples/php/value/runme.php diff --git a/Examples/php/variables/Makefile b/Examples/php/variables/Makefile new file mode 100644 index 000000000..0862ce5ec --- /dev/null +++ b/Examples/php/variables/Makefile @@ -0,0 +1,24 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SRCS = example.c +TARGET = example +INTERFACE = example.i +LIBS = +SWIGOPT = + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ + php + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ + php_static + +clean:: + $(MAKE) -f $(TOP)/Makefile php_clean + rm -f $(TARGET).php + +check: all + $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php4/variables/example.c b/Examples/php/variables/example.c similarity index 100% rename from Examples/php4/variables/example.c rename to Examples/php/variables/example.c diff --git a/Examples/php4/variables/example.h b/Examples/php/variables/example.h similarity index 100% rename from Examples/php4/variables/example.h rename to Examples/php/variables/example.h diff --git a/Examples/php4/variables/example.i b/Examples/php/variables/example.i similarity index 100% rename from Examples/php4/variables/example.i rename to Examples/php/variables/example.i diff --git a/Examples/php4/variables/runme.php4 b/Examples/php/variables/runme.php similarity index 100% rename from Examples/php4/variables/runme.php4 rename to Examples/php/variables/runme.php diff --git a/Examples/php4/variables/runme.php4.old b/Examples/php/variables/runme.php4.old similarity index 100% rename from Examples/php4/variables/runme.php4.old rename to Examples/php/variables/runme.php4.old diff --git a/Examples/php4/reference/BUILD-proxy.sh b/Examples/php4/reference/BUILD-proxy.sh deleted file mode 100755 index b1c8c71a4..000000000 --- a/Examples/php4/reference/BUILD-proxy.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh -e - -${SWIG:=swig} -php4 -make -c++ -withcxx example.cxx example.i -make -php -d extension_dir=. runme-proxy.php4 diff --git a/Examples/php4/variables/Makefile b/Examples/php4/variables/Makefile deleted file mode 100644 index caeec2d73..000000000 --- a/Examples/php4/variables/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -SRCS = example.c -TARGET = example -INTERFACE = example.i -LIBS = -SWIGOPT = - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php4 - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ - php4_static - -clean:: - $(MAKE) -f $(TOP)/Makefile php4_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/pike/class/Makefile b/Examples/pike/class/Makefile old mode 100755 new mode 100644 diff --git a/Examples/pike/class/example.cxx b/Examples/pike/class/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/pike/class/example.h b/Examples/pike/class/example.h old mode 100755 new mode 100644 diff --git a/Examples/pike/class/example.i b/Examples/pike/class/example.i old mode 100755 new mode 100644 diff --git a/Examples/pike/constants/Makefile b/Examples/pike/constants/Makefile old mode 100755 new mode 100644 diff --git a/Examples/pike/constants/example.i b/Examples/pike/constants/example.i old mode 100755 new mode 100644 diff --git a/Examples/pike/overload/example.cxx b/Examples/pike/overload/example.cxx old mode 100755 new mode 100644 diff --git a/Examples/pike/overload/example.h b/Examples/pike/overload/example.h old mode 100755 new mode 100644 diff --git a/Examples/pike/template/Makefile b/Examples/pike/template/Makefile old mode 100755 new mode 100644 diff --git a/Examples/pike/template/example.h b/Examples/pike/template/example.h old mode 100755 new mode 100644 diff --git a/Examples/pike/template/example.i b/Examples/pike/template/example.i old mode 100755 new mode 100644 diff --git a/Examples/python/callback/Makefile b/Examples/python/callback/Makefile index ad36d7d7e..a29276e58 100644 --- a/Examples/python/callback/Makefile +++ b/Examples/python/callback/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/class/Makefile b/Examples/python/class/Makefile index f331b8203..74625b992 100644 --- a/Examples/python/class/Makefile +++ b/Examples/python/class/Makefile @@ -18,3 +18,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/class/example.dsp b/Examples/python/class/example.dsp index dccba46b0..fd7bf8c06 100644 --- a/Examples/python/class/example.dsp +++ b/Examples/python/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/class/example.i b/Examples/python/class/example.i index 0bf3285ca..75700b305 100644 --- a/Examples/python/class/example.i +++ b/Examples/python/class/example.i @@ -5,10 +5,6 @@ #include "example.h" %} -%typemap(in) double { - /* hello */ -} - /* Let's just grab the original header file here */ %include "example.h" diff --git a/Examples/python/constants/Makefile b/Examples/python/constants/Makefile index 01d0f943a..1420b4e0b 100644 --- a/Examples/python/constants/Makefile +++ b/Examples/python/constants/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/contract/Makefile b/Examples/python/contract/Makefile index c7b476995..77fe94b1a 100644 --- a/Examples/python/contract/Makefile +++ b/Examples/python/contract/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/contract/example.dsp b/Examples/python/contract/example.dsp index 7a32f4dc1..32845e0e8 100644 --- a/Examples/python/contract/example.dsp +++ b/Examples/python/contract/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -python $(InputPath) + ..\..\..\swig.exe -python $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -python $(InputPath) + ..\..\..\swig.exe -python $(InputPath) # End Custom Build diff --git a/Examples/python/docstrings/Makefile b/Examples/python/docstrings/Makefile index 74ab112a1..f25450cac 100644 --- a/Examples/python/docstrings/Makefile +++ b/Examples/python/docstrings/Makefile @@ -21,3 +21,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/enum/Makefile b/Examples/python/enum/Makefile index f331b8203..74625b992 100644 --- a/Examples/python/enum/Makefile +++ b/Examples/python/enum/Makefile @@ -18,3 +18,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/exception/Makefile b/Examples/python/exception/Makefile index 17c4f30b7..7dbdde944 100644 --- a/Examples/python/exception/Makefile +++ b/Examples/python/exception/Makefile @@ -18,3 +18,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/exceptproxy/Makefile b/Examples/python/exceptproxy/Makefile index a4f334311..ba5c79827 100644 --- a/Examples/python/exceptproxy/Makefile +++ b/Examples/python/exceptproxy/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/extend/Makefile b/Examples/python/extend/Makefile index ad36d7d7e..a29276e58 100644 --- a/Examples/python/extend/Makefile +++ b/Examples/python/extend/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/funcptr/Makefile b/Examples/python/funcptr/Makefile index 4a1e1bb71..0f4a1e077 100644 --- a/Examples/python/funcptr/Makefile +++ b/Examples/python/funcptr/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/funcptr2/Makefile b/Examples/python/funcptr2/Makefile index 4a1e1bb71..0f4a1e077 100644 --- a/Examples/python/funcptr2/Makefile +++ b/Examples/python/funcptr2/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/functor/Makefile b/Examples/python/functor/Makefile index c45536529..fe389757a 100644 --- a/Examples/python/functor/Makefile +++ b/Examples/python/functor/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/import/Makefile b/Examples/python/import/Makefile index e00e81864..74d4f88cf 100644 --- a/Examples/python/import/Makefile +++ b/Examples/python/import/Makefile @@ -19,3 +19,4 @@ clean:: @rm -f foo.py bar.py spam.py base.py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/import/bar.dsp b/Examples/python/import/bar.dsp index edb45811b..17b05cc39 100644 --- a/Examples/python/import/bar.dsp +++ b/Examples/python/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import/base.dsp b/Examples/python/import/base.dsp index 0ddb65157..2bc9736d1 100644 --- a/Examples/python/import/base.dsp +++ b/Examples/python/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import/foo.dsp b/Examples/python/import/foo.dsp index 86e11699f..9a92c4b85 100644 --- a/Examples/python/import/foo.dsp +++ b/Examples/python/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import/spam.dsp b/Examples/python/import/spam.dsp index 7245f7a7c..0a6595bfe 100644 --- a/Examples/python/import/spam.dsp +++ b/Examples/python/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import_template/Makefile b/Examples/python/import_template/Makefile index fa49f3145..ee47e994d 100644 --- a/Examples/python/import_template/Makefile +++ b/Examples/python/import_template/Makefile @@ -19,3 +19,4 @@ clean:: @rm -f foo.py bar.py spam.py base.py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/libffi/Makefile b/Examples/python/libffi/Makefile index 8c7edfa65..fafb7de09 100644 --- a/Examples/python/libffi/Makefile +++ b/Examples/python/libffi/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/multimap/Makefile b/Examples/python/multimap/Makefile index 4a1e1bb71..0f4a1e077 100644 --- a/Examples/python/multimap/Makefile +++ b/Examples/python/multimap/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/multimap/example.dsp b/Examples/python/multimap/example.dsp index 7a32f4dc1..32845e0e8 100644 --- a/Examples/python/multimap/example.dsp +++ b/Examples/python/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -python $(InputPath) + ..\..\..\swig.exe -python $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -python $(InputPath) + ..\..\..\swig.exe -python $(InputPath) # End Custom Build diff --git a/Examples/python/multimap/example.i b/Examples/python/multimap/example.i index 163d7cc8e..f1c4d9990 100644 --- a/Examples/python/multimap/example.i +++ b/Examples/python/multimap/example.i @@ -27,11 +27,24 @@ extern int gcd(int x, int y); $2 = (char **) malloc(($1+1)*sizeof(char *)); for (i = 0; i < $1; i++) { PyObject *s = PyList_GetItem($input,i); - if (!PyString_Check(s)) { +%#if PY_VERSION_HEX >= 0x03000000 + if (!PyUnicode_Check(s)) +%#else + if (!PyString_Check(s)) +%#endif + { free($2); SWIG_exception(SWIG_ValueError, "List items must be strings"); } +%#if PY_VERSION_HEX >= 0x03000000 + { + int l; + $2[i] = PyUnicode_AsStringAndSize(s, &l); + } +%#else $2[i] = PyString_AsString(s); +%#endif + } $2[i] = 0; } @@ -39,12 +52,21 @@ extern int gcd(int x, int y); extern int gcdmain(int argc, char *argv[]); %typemap(in) (char *bytes, int len) { + +%#if PY_VERSION_HEX >= 0x03000000 + if (!PyUnicode_Check($input)) { + PyErr_SetString(PyExc_ValueError,"Expected a string"); + return NULL; + } + $1 = PyUnicode_AsStringAndSize($input, &$2); +%#else if (!PyString_Check($input)) { PyErr_SetString(PyExc_ValueError,"Expected a string"); return NULL; } $1 = PyString_AsString($input); $2 = PyString_Size($input); +%#endif } extern int count(char *bytes, int len, char c); @@ -56,9 +78,15 @@ extern int count(char *bytes, int len, char c); so that we don't violate it's mutability */ %typemap(in) (char *str, int len) { +%#if PY_VERSION_HEX >= 0x03000000 + $2 = PyUnicode_GetSize($input); + $1 = (char *) malloc($2+1); + memmove($1,PyUnicode_AsString($input),$2); +%#else $2 = PyString_Size($input); $1 = (char *) malloc($2+1); memmove($1,PyString_AsString($input),$2); +%#endif } /* Return the mutated string as a new object. The t_output_helper @@ -67,7 +95,11 @@ extern int count(char *bytes, int len, char c); %typemap(argout) (char *str, int len) { PyObject *o; +%#if PY_VERSION_HEX >= 0x03000000 + o = PyUnicode_FromStringAndSize($1,$2); +%#else o = PyString_FromStringAndSize($1,$2); +%#endif $result = t_output_helper($result,o); free($1); } diff --git a/Examples/python/operator/Makefile b/Examples/python/operator/Makefile index c45536529..fe389757a 100644 --- a/Examples/python/operator/Makefile +++ b/Examples/python/operator/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/pointer/Makefile b/Examples/python/pointer/Makefile index 4a1e1bb71..0f4a1e077 100644 --- a/Examples/python/pointer/Makefile +++ b/Examples/python/pointer/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/reference/Makefile b/Examples/python/reference/Makefile index f331b8203..74625b992 100644 --- a/Examples/python/reference/Makefile +++ b/Examples/python/reference/Makefile @@ -18,3 +18,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/simple/Makefile b/Examples/python/simple/Makefile index 4a1e1bb71..0f4a1e077 100644 --- a/Examples/python/simple/Makefile +++ b/Examples/python/simple/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/simple/example.dsp b/Examples/python/simple/example.dsp index 7a32f4dc1..32845e0e8 100644 --- a/Examples/python/simple/example.dsp +++ b/Examples/python/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -python $(InputPath) + ..\..\..\swig.exe -python $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig -python $(InputPath) + ..\..\..\swig.exe -python $(InputPath) # End Custom Build diff --git a/Examples/python/smartptr/Makefile b/Examples/python/smartptr/Makefile index 58d139643..f73802a6b 100644 --- a/Examples/python/smartptr/Makefile +++ b/Examples/python/smartptr/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/std_map/Makefile b/Examples/python/std_map/Makefile index 2d4c1b4a3..5d13da764 100644 --- a/Examples/python/std_map/Makefile +++ b/Examples/python/std_map/Makefile @@ -22,3 +22,4 @@ run: python runme.py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/std_map/example.i b/Examples/python/std_map/example.i index 36354a882..6a7af7108 100644 --- a/Examples/python/std_map/example.i +++ b/Examples/python/std_map/example.i @@ -23,5 +23,5 @@ namespace std { %template(halfi) half_map; -%template() std::pair; -%template(pymap) std::map; +%template() std::pair; +%template(pymap) std::map; diff --git a/Examples/python/std_vector/Makefile b/Examples/python/std_vector/Makefile index a4f334311..ba5c79827 100644 --- a/Examples/python/std_vector/Makefile +++ b/Examples/python/std_vector/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/swigrun/Makefile b/Examples/python/swigrun/Makefile index 53bf701c9..2142be5bb 100644 --- a/Examples/python/swigrun/Makefile +++ b/Examples/python/swigrun/Makefile @@ -22,3 +22,4 @@ clean:: check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/template/Makefile b/Examples/python/template/Makefile index a4f334311..ba5c79827 100644 --- a/Examples/python/template/Makefile +++ b/Examples/python/template/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/varargs/Makefile b/Examples/python/varargs/Makefile index 01d0f943a..1420b4e0b 100644 --- a/Examples/python/varargs/Makefile +++ b/Examples/python/varargs/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/variables/Makefile b/Examples/python/variables/Makefile index 4a1e1bb71..0f4a1e077 100644 --- a/Examples/python/variables/Makefile +++ b/Examples/python/variables/Makefile @@ -17,3 +17,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/weave/Makefile b/Examples/python/weave/Makefile index 822779bd1..88f95c095 100644 --- a/Examples/python/weave/Makefile +++ b/Examples/python/weave/Makefile @@ -19,3 +19,4 @@ clean:: rm -f $(TARGET).py check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/r/class/example.dsp b/Examples/r/class/example.dsp index 682b156fb..b831989cc 100644 --- a/Examples/r/class/example.dsp +++ b/Examples/r/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig -c++ -r -o example_wrap.cpp $(InputPath) + ..\..\..\swig.exe -c++ -r -o example_wrap.cpp $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig -c++ -r -o example_wrap.cpp $(InputPath) + ..\..\..\swig.exe -c++ -r -o example_wrap.cpp $(InputPath) # End Custom Build diff --git a/Examples/r/simple/example.dsp b/Examples/r/simple/example.dsp index aaa5ef8e0..356815d19 100644 --- a/Examples/r/simple/example.dsp +++ b/Examples/r/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig -r $(InputPath) + ..\..\..\swig.exe -r $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig -r $(InputPath) + ..\..\..\swig.exe -r $(InputPath) # End Custom Build diff --git a/Examples/ruby/class/example.dsp b/Examples/ruby/class/example.dsp index 9a26322ec..2adab787a 100644 --- a/Examples/ruby/class/example.dsp +++ b/Examples/ruby/class/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/free_function/example.dsp b/Examples/ruby/free_function/example.dsp index 9a26322ec..2adab787a 100644 --- a/Examples/ruby/free_function/example.dsp +++ b/Examples/ruby/free_function/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/free_function/example.i b/Examples/ruby/free_function/example.i index 5ab29bd58..a446b3f99 100644 --- a/Examples/ruby/free_function/example.i +++ b/Examples/ruby/free_function/example.i @@ -20,7 +20,7 @@ static void free_Zoo(void* ptr) { Zoo* zoo = (Zoo*) ptr; - /* Loop over each object and call SWIG_RemoveMapping */ + /* Loop over each object and call SWIG_RubyRemoveTracking */ int count = zoo->get_num_animals(); for(int i = 0; i < count; ++i) { @@ -32,7 +32,7 @@ SWIG_RubyRemoveTracking(animal); } - /* Now call SWIG_RemoveMapping for the zoo */ + /* Now call SWIG_RubyRemoveTracking for the zoo */ SWIG_RubyRemoveTracking(ptr); /* Now free the zoo which will free the animals it contains */ diff --git a/Examples/ruby/hashargs/Makefile b/Examples/ruby/hashargs/Makefile old mode 100755 new mode 100644 diff --git a/Examples/ruby/hashargs/example.i b/Examples/ruby/hashargs/example.i old mode 100755 new mode 100644 diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp index dd09ca021..29d9abf2f 100644 --- a/Examples/ruby/import/bar.dsp +++ b/Examples/ruby/import/bar.dsp @@ -120,7 +120,7 @@ InputName=bar echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=bar echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp index 2bd4fa243..174afef3e 100644 --- a/Examples/ruby/import/base.dsp +++ b/Examples/ruby/import/base.dsp @@ -120,7 +120,7 @@ InputName=base echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=base echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp index 2a764bbd7..7f4754915 100644 --- a/Examples/ruby/import/foo.dsp +++ b/Examples/ruby/import/foo.dsp @@ -120,7 +120,7 @@ InputName=foo echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=foo echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp index d2d7158bb..72729f290 100644 --- a/Examples/ruby/import/spam.dsp +++ b/Examples/ruby/import/spam.dsp @@ -120,7 +120,7 @@ InputName=spam echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=spam echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/mark_function/example.dsp b/Examples/ruby/mark_function/example.dsp index 9a26322ec..2adab787a 100644 --- a/Examples/ruby/mark_function/example.dsp +++ b/Examples/ruby/mark_function/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/multimap/example.dsp b/Examples/ruby/multimap/example.dsp index ccb99d44d..4888299f5 100644 --- a/Examples/ruby/multimap/example.dsp +++ b/Examples/ruby/multimap/example.dsp @@ -124,7 +124,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -ruby $(InputPath) + ..\..\..\swig.exe -ruby $(InputPath) # End Custom Build @@ -139,7 +139,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -ruby $(InputPath) + ..\..\..\swig.exe -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/simple/example.dsp b/Examples/ruby/simple/example.dsp index ccb99d44d..4888299f5 100644 --- a/Examples/ruby/simple/example.dsp +++ b/Examples/ruby/simple/example.dsp @@ -124,7 +124,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -ruby $(InputPath) + ..\..\..\swig.exe -ruby $(InputPath) # End Custom Build @@ -139,7 +139,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig -ruby $(InputPath) + ..\..\..\swig.exe -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/std_vector/runme.rb b/Examples/ruby/std_vector/runme.rb index 1529d38c6..851190536 100644 --- a/Examples/ruby/std_vector/runme.rb +++ b/Examples/ruby/std_vector/runme.rb @@ -9,7 +9,7 @@ puts Example::average([1,2,3,4]) # ... or a wrapped std::vector v = Example::IntVector.new(4) -0.upto(v.length-1) { |i| v[i] = i+1 } +0.upto(v.size-1) { |i| v[i] = i+1 } puts Example::average(v) @@ -17,7 +17,7 @@ puts Example::average(v) # Call it with a Ruby array... w = Example::half([1.0, 1.5, 2.0, 2.5, 3.0]) -0.upto(w.length-1) { |i| print w[i],"; " } +0.upto(w.size-1) { |i| print w[i],"; " } puts # ... or a wrapped std::vector @@ -25,12 +25,12 @@ puts v = Example::DoubleVector.new [1,2,3,4].each { |i| v.push(i) } w = Example::half(v) -0.upto(w.length-1) { |i| print w[i],"; " } +0.upto(w.size-1) { |i| print w[i],"; " } puts # now halve a wrapped std::vector in place Example::halve_in_place(v) -0.upto(v.length-1) { |i| print v[i],"; " } +0.upto(v.size-1) { |i| print v[i],"; " } puts diff --git a/Examples/tcl/class/example.dsp b/Examples/tcl/class/example.dsp index bf6149407..0ff54829f 100644 --- a/Examples/tcl/class/example.dsp +++ b/Examples/tcl/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/contract/example.dsp b/Examples/tcl/contract/example.dsp index 296cb313b..c1568f2c5 100644 --- a/Examples/tcl/contract/example.dsp +++ b/Examples/tcl/contract/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/bar.dsp b/Examples/tcl/import/bar.dsp index 35b4e608b..d22b6a6fa 100644 --- a/Examples/tcl/import/bar.dsp +++ b/Examples/tcl/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/base.dsp b/Examples/tcl/import/base.dsp index 74870ccb0..b27bbfdb6 100644 --- a/Examples/tcl/import/base.dsp +++ b/Examples/tcl/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/foo.dsp b/Examples/tcl/import/foo.dsp index ac7f09f06..4d3765bd7 100644 --- a/Examples/tcl/import/foo.dsp +++ b/Examples/tcl/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/spam.dsp b/Examples/tcl/import/spam.dsp index db9ade0a3..5674c4373 100644 --- a/Examples/tcl/import/spam.dsp +++ b/Examples/tcl/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/multimap/example.dsp b/Examples/tcl/multimap/example.dsp index 296cb313b..c1568f2c5 100644 --- a/Examples/tcl/multimap/example.dsp +++ b/Examples/tcl/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/simple/example.dsp b/Examples/tcl/simple/example.dsp index 296cb313b..c1568f2c5 100644 --- a/Examples/tcl/simple/example.dsp +++ b/Examples/tcl/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/test-suite/abstract_virtual.i b/Examples/test-suite/abstract_virtual.i index e2d8054bb..2e4d105b1 100644 --- a/Examples/test-suite/abstract_virtual.i +++ b/Examples/test-suite/abstract_virtual.i @@ -2,10 +2,10 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) D; /* C#, Java, Php4 multiple inheritance */ + SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, Java, PHP multiple inheritance */ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) E; /* C#, Java, Php4 multiple inheritance */ + SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */ %inline %{ #if defined(_MSC_VER) diff --git a/Examples/test-suite/allegrocl/Makefile.in b/Examples/test-suite/allegrocl/Makefile.in index 394d2d524..df7193389 100644 --- a/Examples/test-suite/allegrocl/Makefile.in +++ b/Examples/test-suite/allegrocl/Makefile.in @@ -9,116 +9,75 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ + +# these cpp tests generate warnings/errors when compiling +# the wrapper .cxx file. +CPP_TEST_BROKEN_CXX = +# the error is wrap:action code generated by swig. \ +# error: can't convert [std::string] 'b' to 'bool' \ +# might just need a bool overload op for std::string. \ + global_vars \ +# same as w/ global_vars but with more errors in cxx file \ + naturalvar \ + # these cpp tests aren't working. Fix 'em # need to further separate these into tests requiring # std libraries, or the $ldestructor problem. CPP_TEST_BROKEN_ACL = \ - array_member \ - char_strings \ - class_ignore \ - constant_pointers \ contract \ + allprotected \ +# 'throws' typemap entries. \ cplusplus_throw \ - cpp_basic \ - cpp_enum \ - cpp_typedef \ - default_constructor \ +# 'throws' typemap entries. \ default_args \ +# missing typemaps. suspect module support needed \ dynamic_cast \ - enum_thorough \ extend_variable \ - global_vars \ - import_nomodule \ - kind \ - li_carrays \ +# cdata.i support needed \ li_cdata \ - li_windows \ - namespace_class \ - namespace_spaces \ - naturalvar \ +# warning generated. otherwise all good. \ operator_overload \ - overload_simple \ - register_par \ +# std_common.i support \ sizet \ - smart_pointer_extend \ - smart_pointer_namespace \ - template \ - template_classes \ +# std_vector.i support. \ template_default \ - template_default_inherit \ - template_enum \ - template_explicit \ - template_extend_overload \ - template_ns \ - template_ns4 \ - template_ns_enum \ - template_rename \ - template_retvalue \ - template_static \ - template_tbase_template \ - template_typedef \ - template_typedef_cplx \ - template_typedef_cplx2 \ - template_typedef_cplx3 \ - template_typedef_cplx4 \ - template_typedef_cplx5 \ - template_typedef_ns \ - template_typedef_rec \ - threads \ - typedef_array_member \ - typedef_sizet \ +# *** line 31. can't copy typemap?? \ typemap_namespace \ - union_scope \ - using_pointers \ - valuewrapper_opaque \ - varargs \ - virtual_poly \ - voidtest \ - wrapmacro # these aren't working due to longlong support. (low hanging fruit) CPP_TEST_BROKEN_LONGLONG = \ arrays_dimensionless \ arrays_global \ arrays_global_twodim \ - li_stdint \ li_typemaps \ + li_windows \ long_long_apply \ - mixed_types \ primitive_ref \ reference_global_vars \ template_default_arg # These are currently unsupported. CPP_TEST_CASES_ACL_UNSUPPORTED = \ +# contract support \ aggregate \ +# directors support \ + apply_signed_char \ +# contract support \ contract \ - director_abstract \ - director_basic \ - director_constructor \ - director_detect \ - director_default \ - director_enum \ director_exception \ - director_frob \ - director_finalizer \ - director_nested \ director_protected \ - director_redefined \ - director_unroll \ - director_using \ - director_wombat \ exception_order \ +# 'throws' typemap support \ extern_throws \ - throw_exception + throw_exception \ + using_pointers \ C_TEST_CASES_ACL_BROKEN = \ - arrays \ - enums \ - extern_declaration \ - immutable \ - integers \ +# 'cdate.i' module support \ li_cdata \ +# adding an existing type defnition... \ + typedef_struct \ +# swigrun.swg support. \ typemap_subst C_TEST_BROKEN_LONGLONG = \ @@ -128,12 +87,10 @@ C_TEST_BROKEN_LONGLONG = \ # std lib support hasn't been done yet. SKIP_CPP_STD_CASES = Yes -C_TEST_CASES = - -CPP_TEST_CASES = - include $(srcdir)/../common.mk +# SWIGOPT += -debug-module 4 + # Rules for the different types of tests %.cpptest: $(setup) @@ -157,9 +114,8 @@ run_testcase = \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(ALLEGROCLBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \ fi; -# Clean: (does nothing, we dont generate extra allegrocl code) %.clean: - + @rm -f $*.cl clean: $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile allegrocl_clean diff --git a/Examples/test-suite/allowexcept.i b/Examples/test-suite/allowexcept.i index 14b19b33d..37b01cd75 100644 --- a/Examples/test-suite/allowexcept.i +++ b/Examples/test-suite/allowexcept.i @@ -26,14 +26,26 @@ UVW Bar::static_member_variable; struct XYZ { }; +// The operator& trick doesn't work for SWIG/PHP because the generated code +// takes the address of the variable in the code in the "vinit" section. +#ifdef SWIGPHP %{ struct XYZ { void foo() {} private: XYZ& operator=(const XYZ& other); // prevent assignment used in normally generated set method - XYZ* operator&(); // prevent dereferencing used in normally generated get method }; %} +#else +%{ +struct XYZ { + void foo() {} +private: + XYZ& operator=(const XYZ& other); // prevent assignment used in normally generated set method + XYZ* operator&(); // prevent dereferencing used in normally generated get method +}; +%} +#endif #if defined(SWIGUTL) %exception { /* diff --git a/Examples/test-suite/python/argcargvtest.i b/Examples/test-suite/argcargvtest.i similarity index 100% rename from Examples/test-suite/python/argcargvtest.i rename to Examples/test-suite/argcargvtest.i diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 1108ff337..45a4ff915 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -21,6 +21,8 @@ CPP_TEST_CASES = cast_operator \ include $(srcdir)/../common.mk +INTERFACEDIR = ../../ + # Rules for the different types of tests %.cpptest: $(setup) diff --git a/Examples/test-suite/python/callback.i b/Examples/test-suite/callback.i similarity index 100% rename from Examples/test-suite/python/callback.i rename to Examples/test-suite/callback.i diff --git a/Examples/test-suite/char_strings.i b/Examples/test-suite/char_strings.i index b06eba773..12e4b5aa2 100644 --- a/Examples/test-suite/char_strings.i +++ b/Examples/test-suite/char_strings.i @@ -9,6 +9,12 @@ below. %warnfilter(SWIGWARN_TYPEMAP_VARIN_UNDEF) global_char_array1; // Unable to set variable of type char[] %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK_MSG) global_const_char; // Setting a const char * variable may leak memory. +#ifdef SWIG_ALLEGRO_CL +%{ +#include +%} +#endif + %{ #define OTHERLAND_MSG "Little message from the safe world." #define CPLUSPLUS_MSG "A message from the deep dark world of C++, where anything is possible." diff --git a/Examples/test-suite/chicken/Makefile.in b/Examples/test-suite/chicken/Makefile.in index ef6d7056c..764518880 100644 --- a/Examples/test-suite/chicken/Makefile.in +++ b/Examples/test-suite/chicken/Makefile.in @@ -19,7 +19,7 @@ SKIP_CPP_STD_CASES = Yes CPP_TEST_CASES += li_std_string -EXTRA_TEST_CASES += ext_test.externaltest +EXTRA_TEST_CASES += chicken_ext_test.externaltest include $(srcdir)/../common.mk diff --git a/Examples/test-suite/chicken/ext_test_runme.ss b/Examples/test-suite/chicken/chicken_ext_test_runme.ss similarity index 57% rename from Examples/test-suite/chicken/ext_test_runme.ss rename to Examples/test-suite/chicken/chicken_ext_test_runme.ss index ea3eaa487..65fa4e085 100644 --- a/Examples/test-suite/chicken/ext_test_runme.ss +++ b/Examples/test-suite/chicken/chicken_ext_test_runme.ss @@ -1,4 +1,4 @@ -(load "ext_test.so") +(load "chicken_ext_test.so") (define a (test-create)) diff --git a/Examples/test-suite/chicken/ext_test.i b/Examples/test-suite/chicken_ext_test.i similarity index 94% rename from Examples/test-suite/chicken/ext_test.i rename to Examples/test-suite/chicken_ext_test.i index e8f5930df..b4f726cc7 100644 --- a/Examples/test-suite/chicken/ext_test.i +++ b/Examples/test-suite/chicken_ext_test.i @@ -1,4 +1,4 @@ -%module ext_test +%module chicken_ext_test /* just use the imports_a.h header... for this test we only need a class */ %{ diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 0a3a0858a..afcb87159 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -59,11 +59,12 @@ CXXSRCS = CSRCS = TARGETPREFIX = TARGETSUFFIX = -SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) -DSWIG_NOEXTRA_QUALIFICATION -INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +SWIGOPT = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) LIBS = -L. LIBPREFIX = lib ACTION = check +INTERFACEDIR = ../ # # Please keep test cases in alphabetical order. @@ -76,8 +77,9 @@ CPP_TEST_BROKEN += \ cpp_broken \ exception_partial_info \ extend_variable \ + li_std_vector_ptr \ namespace_union \ - nested_comment \ + nested_struct \ overload_complicated \ template_default_pointer \ template_expr @@ -164,6 +166,7 @@ CPP_TEST_CASES += \ director_overload \ director_primitives \ director_protected \ + director_protected_overloaded \ director_redefined \ director_thread \ director_unroll \ @@ -191,6 +194,7 @@ CPP_TEST_CASES += \ fragments \ friends \ fvirtual \ + global_namespace \ global_ns_arg \ global_vars \ grouping \ @@ -202,6 +206,7 @@ CPP_TEST_CASES += \ inherit_target_language \ inherit_void_arg \ inline_initializer \ + insert_directive \ keyword_rename \ kind \ langobj \ @@ -233,10 +238,12 @@ CPP_TEST_CASES += \ namespace_typemap \ namespace_virtual_method \ naturalvar \ + nested_comment \ newobject1 \ null_pointer \ operator_overload \ operator_overload_break \ + operbool \ ordering \ overload_copy \ overload_extend \ @@ -259,6 +266,7 @@ CPP_TEST_CASES += \ rename3 \ rename4 \ rename_scope \ + rename_strip_encoder \ restrict_cplusplus \ return_const_value \ return_value_scope \ @@ -403,6 +411,7 @@ CPP_STD_TEST_CASES += \ template_typedef_fnc \ template_type_namespace \ template_opaque +# li_std_list ifndef SKIP_CPP_STD_CASES @@ -439,11 +448,13 @@ C_TEST_CASES += \ overload_extendc \ preproc \ ret_by_value \ + simple_array \ sizeof_pointer \ sneaky1 \ struct_rename \ typedef_struct \ typemap_subst \ + union_parameter \ unions @@ -489,14 +500,14 @@ swig_and_compile_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_c = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT) swig_and_compile_multi_cpp = \ @@ -504,7 +515,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ done @@ -516,7 +527,7 @@ swig_and_compile_external = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_runtime = \ diff --git a/Examples/test-suite/python/complextest.i b/Examples/test-suite/complextest.i similarity index 100% rename from Examples/test-suite/python/complextest.i rename to Examples/test-suite/complextest.i diff --git a/Examples/test-suite/contract.i b/Examples/test-suite/contract.i index 6ee0a353c..b979ef19e 100644 --- a/Examples/test-suite/contract.i +++ b/Examples/test-suite/contract.i @@ -3,7 +3,7 @@ %warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, Php4 multiple inheritance */ + SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, PHP multiple inheritance */ #ifdef SWIGCSHARP %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override @@ -201,3 +201,33 @@ struct E { }; %} + +// Namespace + +%{ +namespace myNames { + +class myClass +{ + public: + myClass(int i) {} +}; + +} +%} + +namespace myNames { + +%contract myClass::myClass( int i ) { +require: + i > 0; +} + +class myClass +{ + public: + myClass(int i) {} +}; + +} + diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in index 5fd576ed8..5fb547f3f 100644 --- a/Examples/test-suite/csharp/Makefile.in +++ b/Examples/test-suite/csharp/Makefile.in @@ -21,12 +21,17 @@ CPP_TEST_CASES = \ enum_thorough_typesafe \ exception_partial_info -CUSTOM_TEST_CASES = intermediary_classname +CUSTOM_TEST_CASES = \ + csharp_lib_arrays \ + intermediary_classname include $(srcdir)/../common.mk # Overridden variables here SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL) +INTERFACEDIR = ../../ + +CSHARPFLAGSSPECIAL = # Rules for the different types of tests %.cpptest: @@ -47,6 +52,8 @@ SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL) # Rules for custom tests intermediary_classname.customtest: $(MAKE) intermediary_classname.cpptest SWIGOPTSPECIAL="-dllimport intermediary_classname" +csharp_lib_arrays.customtest: + $(MAKE) csharp_lib_arrays.cpptest CSHARPFLAGSSPECIAL="-unsafe" # Makes a directory for the testcase if it does not exist setup = \ @@ -65,14 +72,14 @@ setup = \ run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \ - CSHARPFLAGS='-nologo -out:$*_runme.exe' \ + CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \ CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` \ $*$(CSHARPPATHSEPARATOR)*.cs' csharp_compile && \ env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; ) \ else ( \ cd $* && \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \ - CSHARPFLAGS='-nologo -t:module -out:$*.netmodule' \ + CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \ CSHARPSRCS='*.cs' csharp_compile; ); \ fi; diff --git a/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs b/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs new file mode 100644 index 000000000..9f3ea6b88 --- /dev/null +++ b/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs @@ -0,0 +1,70 @@ +using System; +using csharp_lib_arraysNamespace; + +public class runme +{ + static void Main() + { + { + int[] source = { 1, 2, 3, 4, 5 }; + int[] target = new int[ source.Length ]; + + csharp_lib_arrays.myArrayCopy( source, target, target.Length ); + CompareArrays(source, target); + } + + { + int[] source = { 1, 2, 3, 4, 5 }; + int[] target = new int[ source.Length ]; + + csharp_lib_arrays.myArrayCopyUsingFixedArrays( source, target, target.Length ); + CompareArrays(source, target); + } + + { + int[] source = { 1, 2, 3, 4, 5 }; + int[] target = new int[] { 6, 7, 8, 9, 10 }; + + csharp_lib_arrays.myArraySwap( source, target, target.Length ); + + for (int i=0; i myEnumerator = dv.GetEnumerator(); + while ( myEnumerator.MoveNext() ) { + if (myEnumerator.Current != 77.7) + throw new Exception("Repeat (2) test failed"); + } + } +#endif } { @@ -516,6 +533,13 @@ public class li_std_vector_runme { li_std_vector.halve_in_place(dvec); } + // Dispose() + { + using (StructVector vs = new StructVector() { new Struct(0.0), new Struct(11.1) } ) + using (DoubleVector vd = new DoubleVector() { 0.0, 11.1 } ) { + } + } + // More wrapped methods { RealVector v0 = li_std_vector.vecreal(new RealVector()); diff --git a/Examples/test-suite/csharp_lib_arrays.i b/Examples/test-suite/csharp_lib_arrays.i new file mode 100644 index 000000000..d07d43737 --- /dev/null +++ b/Examples/test-suite/csharp_lib_arrays.i @@ -0,0 +1,61 @@ +%module csharp_lib_arrays + +%include "arrays_csharp.i" + +%apply int INPUT[] { int* sourceArray } +%apply int OUTPUT[] { int* targetArray } + +%apply int INOUT[] { int* array1 } +%apply int INOUT[] { int* array2 } + +%inline %{ +/* copy the contents of the first array to the second */ +void myArrayCopy( int* sourceArray, int* targetArray, int nitems ) { + int i; + for ( i = 0; i < nitems; i++ ) { + targetArray[ i ] = sourceArray[ i ]; + } +} + +/* swap the contents of the two arrays */ +void myArraySwap( int* array1, int* array2, int nitems ) { + int i, temp; + for ( i = 0; i < nitems; i++ ) { + temp = array1[ i ]; + array1[ i ] = array2[ i ]; + array2[ i ] = temp; + } +} +%} + + +%clear int* sourceArray; +%clear int* targetArray; + +%clear int* array1; +%clear int* array2; + + +// Below replicates the above array handling but this time using the pinned (fixed) array typemaps +%csmethodmodifiers myArrayCopyUsingFixedArrays "public unsafe"; +%csmethodmodifiers myArraySwapUsingFixedArrays "public unsafe"; + +%apply int FIXED[] { int* sourceArray } +%apply int FIXED[] { int* targetArray } + +%inline %{ +void myArrayCopyUsingFixedArrays( int *sourceArray, int* targetArray, int nitems ) { + myArrayCopy(sourceArray, targetArray, nitems); +} +%} + +%apply int FIXED[] { int* array1 } +%apply int FIXED[] { int* array2 } + +%inline %{ +void myArraySwapUsingFixedArrays( int* array1, int* array2, int nitems ) { + myArraySwap(array1, array2, nitems); +} +%} + + diff --git a/Examples/test-suite/csharp_prepost.i b/Examples/test-suite/csharp_prepost.i index 9c2cedc83..0c35c1833 100644 --- a/Examples/test-suite/csharp_prepost.i +++ b/Examples/test-suite/csharp_prepost.i @@ -1,6 +1,6 @@ %module csharp_prepost -// Test the pre, post and cshin attributes for csin typemaps +// Test the pre, post, terminate and cshin attributes for csin typemaps %include "std_vector.i" @@ -88,3 +88,102 @@ public: }; %} + + +// test Date marshalling with pre post and terminate typemap attributes (Documented in CSharp.html) +%typemap(cstype) const CDate& "System.DateTime" +%typemap(csin, + pre=" CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);" + ) const CDate & + "$csclassname.getCPtr(temp$csinput)" + +%typemap(cstype) CDate& "out System.DateTime" +%typemap(csin, + pre=" CDate temp$csinput = new CDate();", + post=" $csinput = new System.DateTime(temp$csinput.getYear()," + " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", + cshin="out $csinput" + ) CDate & + "$csclassname.getCPtr(temp$csinput)" + + +%inline %{ +class CDate { +public: + CDate(); + CDate(int year, int month, int day); + int getYear(); + int getMonth(); + int getDay(); +private: + int m_year; + int m_month; + int m_day; +}; +struct Action { + int doSomething(const CDate &dateIn, CDate &dateOut); + Action(const CDate &dateIn, CDate& dateOut); +}; +%} + +%{ +Action::Action(const CDate &dateIn, CDate& dateOut) {dateOut = dateIn;} +int Action::doSomething(const CDate &dateIn, CDate &dateOut) { dateOut = dateIn; return 0; } +CDate::CDate() : m_year(0), m_month(0), m_day(0) {} +CDate::CDate(int year, int month, int day) : m_year(year), m_month(month), m_day(day) {} +int CDate::getYear() { return m_year; } +int CDate::getMonth() { return m_month; } +int CDate::getDay() { return m_day; } +%} + +%typemap(cstype, out="System.DateTime") CDate * "ref System.DateTime" + +%typemap(csin, + pre=" CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);", + post=" $csinput = new System.DateTime(temp$csinput.getYear()," + " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", + cshin="ref $csinput" + ) CDate * + "$csclassname.getCPtr(temp$csinput)" + +%inline %{ +void addYears(CDate *pDate, int years) { + *pDate = CDate(pDate->getYear() + years, pDate->getMonth(), pDate->getDay()); +} +%} + +%typemap(csin, + pre=" using (CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day)) {", + post=" $csinput = new System.DateTime(temp$csinput.getYear()," + " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", + terminator=" } // terminate temp$csinput using block", + cshin="ref $csinput" + ) CDate * + "$csclassname.getCPtr(temp$csinput)" + +%inline %{ +void subtractYears(CDate *pDate, int years) { + *pDate = CDate(pDate->getYear() - years, pDate->getMonth(), pDate->getDay()); +} +%} + +%typemap(csvarin, excode=SWIGEXCODE2) CDate * %{ + /* csvarin typemap code */ + set { + CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day); + $imcall;$excode + } %} + +%typemap(csvarout, excode=SWIGEXCODE2) CDate * %{ + /* csvarout typemap code */ + get { + IntPtr cPtr = $imcall; + CDate tempDate = (cPtr == IntPtr.Zero) ? null : new CDate(cPtr, $owner);$excode + return new System.DateTime(tempDate.getYear(), tempDate.getMonth(), tempDate.getDay(), + 0, 0, 0); + } %} + +%inline %{ +CDate ImportantDate = CDate(1999, 12, 31); +%} + diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i index 71600e55a..ff22c7834 100644 --- a/Examples/test-suite/default_constructor.i +++ b/Examples/test-suite/default_constructor.i @@ -5,11 +5,11 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) EB; /* C#, Java, Php4 multiple inheritance */ + SWIGWARN_PHP_MULTIPLE_INHERITANCE) EB; /* C#, Java, PHP multiple inheritance */ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) AD; /* C#, Java, Php4 multiple inheritance */ + SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, Java, PHP multiple inheritance */ %warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */ diff --git a/Examples/test-suite/director_basic.i b/Examples/test-suite/director_basic.i index 986a1706f..12cb0db65 100644 --- a/Examples/test-suite/director_basic.i +++ b/Examples/test-suite/director_basic.i @@ -112,12 +112,14 @@ public: return vmethod(b); } - static MyClass *get_self(MyClass *c) { return c; } - + + static Bar * call_pmethod(MyClass *myclass, Bar *b) { + return myclass->pmethod(b); + } }; template diff --git a/Examples/test-suite/director_classic.i b/Examples/test-suite/director_classic.i old mode 100755 new mode 100644 diff --git a/Examples/test-suite/director_ignore.i b/Examples/test-suite/director_ignore.i old mode 100755 new mode 100644 diff --git a/Examples/test-suite/python/director_profile.i b/Examples/test-suite/director_profile.i similarity index 100% rename from Examples/test-suite/python/director_profile.i rename to Examples/test-suite/director_profile.i diff --git a/Examples/test-suite/director_protected_overloaded.i b/Examples/test-suite/director_protected_overloaded.i new file mode 100644 index 000000000..a9f786fc7 --- /dev/null +++ b/Examples/test-suite/director_protected_overloaded.i @@ -0,0 +1,21 @@ +%module(directors="1",dirprot="1") director_protected_overloaded + +%director IDataObserver; +%director DerivedDataObserver; + +// protected overloaded methods +%inline %{ + class IDataObserver + { + public: + virtual ~IDataObserver(){} + + protected: + virtual void notoverloaded() = 0; + virtual void isoverloaded() = 0; + virtual void isoverloaded(int i) = 0; + virtual void isoverloaded(int i, double d) = 0; + }; + class DerivedDataObserver : public IDataObserver { + }; +%} diff --git a/Examples/test-suite/python/director_stl.i b/Examples/test-suite/director_stl.i similarity index 100% rename from Examples/test-suite/python/director_stl.i rename to Examples/test-suite/director_stl.i diff --git a/Examples/test-suite/director_thread.i b/Examples/test-suite/director_thread.i index 4f4e55cfe..2732eb907 100644 --- a/Examples/test-suite/director_thread.i +++ b/Examples/test-suite/director_thread.i @@ -13,6 +13,7 @@ #include #else #include +#include #include #endif @@ -27,6 +28,8 @@ extern "C" { void* working(void* t); pthread_t thread; #endif + static int thread_terminate = 0; + } %} @@ -51,6 +54,15 @@ extern "C" { virtual ~Foo() { } + void stop() { + thread_terminate = 1; + %#ifdef _WIN32 + /*TODO(bhy) what to do for win32? */ + %#else + pthread_join(thread, NULL); + %#endif + } + void run() { %#ifdef _WIN32 _beginthreadex(NULL,0,working,this,0,&thread_id); @@ -75,10 +87,15 @@ extern "C" { #endif { Foo* f = static_cast(t); - while (1) { + while ( ! thread_terminate ) { MilliSecondSleep(50); f->do_foo(); } +#ifdef _WIN32 + /* TODO(bhy) what's the corresponding of pthread_exit in win32? */ +#else + pthread_exit(0); +#endif return 0; } } diff --git a/Examples/test-suite/evil_diamond.i b/Examples/test-suite/evil_diamond.i index 33353e32e..7b2e9152f 100644 --- a/Examples/test-suite/evil_diamond.i +++ b/Examples/test-suite/evil_diamond.i @@ -6,7 +6,7 @@ %warnfilter(SWIGWARN_RUBY_WRONG_NAME, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance %inline %{ diff --git a/Examples/test-suite/evil_diamond_ns.i b/Examples/test-suite/evil_diamond_ns.i index 78a764ccc..515044007 100644 --- a/Examples/test-suite/evil_diamond_ns.i +++ b/Examples/test-suite/evil_diamond_ns.i @@ -6,7 +6,7 @@ %warnfilter(SWIGWARN_RUBY_WRONG_NAME, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Blah::spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) Blah::spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance %inline %{ namespace Blah { diff --git a/Examples/test-suite/evil_diamond_prop.i b/Examples/test-suite/evil_diamond_prop.i index e9fc24f4d..804ea66b4 100644 --- a/Examples/test-suite/evil_diamond_prop.i +++ b/Examples/test-suite/evil_diamond_prop.i @@ -6,7 +6,7 @@ %warnfilter(SWIGWARN_RUBY_WRONG_NAME, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance %inline %{ diff --git a/Examples/test-suite/features.i b/Examples/test-suite/features.i index 2db51ae6b..2ccbe725a 100644 --- a/Examples/test-suite/features.i +++ b/Examples/test-suite/features.i @@ -162,3 +162,20 @@ namespace Space { } %} +// Test 8 conversion operators +%rename(opbool) operator bool; +%rename(opuint) operator unsigned int; + +%exception ConversionOperators::ConversionOperators() "$action /* ConversionOperators::ConversionOperators() */"; +%exception ConversionOperators::~ConversionOperators() "$action /* ConversionOperators::~ConversionOperators() */"; +%exception ConversionOperators::operator bool "$action /* ConversionOperators::operator bool */"; +%exception ConversionOperators::operator unsigned int "$action /* ConversionOperators::unsigned int*/"; + +%inline %{ + class ConversionOperators { + public: + operator bool() { return false; } + operator unsigned int() { return 0; } + }; +%} + diff --git a/Examples/test-suite/global_namespace.i b/Examples/test-suite/global_namespace.i new file mode 100644 index 000000000..02139f6c4 --- /dev/null +++ b/Examples/test-suite/global_namespace.i @@ -0,0 +1,60 @@ +%module global_namespace + +// classes +%inline %{ +class Klass1 {}; +class Klass2 {}; +class Klass3 {}; +class Klass4 {}; +class Klass5 {}; +class Klass6 {}; +class Klass7 {}; + +struct KlassMethods { + static void methodA(::Klass1 v, const ::Klass2 cv, const ::Klass3 *cp, ::Klass4 *p, const ::Klass5 &cr, ::Klass6 &r, Klass7*& pr) {} + static void methodB( Klass1 v, const Klass2 cv, const Klass3 *cp, Klass4 *p, const Klass5 &cr, Klass6 &r, Klass7*& pr) {} +}; +%} + +%inline %{ +namespace Space { +class XYZ1 {}; +class XYZ2 {}; +class XYZ3 {}; +class XYZ4 {}; +class XYZ5 {}; +class XYZ6 {}; +class XYZ7 {}; +} + +struct XYZMethods { + static void methodA(::Space::XYZ1 v, const ::Space::XYZ2 cv, const ::Space::XYZ3 *cp, ::Space::XYZ4 *p, const ::Space::XYZ5 &cr, ::Space::XYZ6 &r, Space::XYZ7*& pr) {} + static void methodB( Space::XYZ1 v, const Space::XYZ2 cv, const Space::XYZ3 *cp, Space::XYZ4 *p, const Space::XYZ5 &cr, Space::XYZ6 &r, Space::XYZ7*& pr) {} +}; +%} + +//enums +%inline %{ +enum AnEnum1 { anenum1 }; +enum AnEnum2 { anenum2 }; +enum AnEnum3 { anenum3 }; + +struct AnEnumMethods { + static void methodA(::AnEnum1 v, const ::AnEnum2 cv, const ::AnEnum3 &cr) {} + static void methodB( AnEnum1 v, const AnEnum2 cv, const AnEnum3 &cr) {} +}; +%} + +%inline %{ +namespace Space { +enum TheEnum1 { theenum1 }; +enum TheEnum2 { theenum2 }; +enum TheEnum3 { theenum3 }; + +struct TheEnumMethods { + static void methodA(::Space::TheEnum1 v, const ::Space::TheEnum2 cv, const ::Space::TheEnum3 &cr) {} + static void methodB( Space::TheEnum1 v, const Space::TheEnum2 cv, const Space::TheEnum3 &cr) {} +}; +} +%} + diff --git a/Examples/test-suite/guile/Makefile.in b/Examples/test-suite/guile/Makefile.in index 97f30e3b2..25d40674d 100644 --- a/Examples/test-suite/guile/Makefile.in +++ b/Examples/test-suite/guile/Makefile.in @@ -36,7 +36,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $$SWIGOPT" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ SWIGOPT=" -noruntime "; \ done diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilescm/Makefile.in index 04de236db..eb53f020e 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilescm/Makefile.in @@ -2,7 +2,7 @@ # Makefile for guile test-suite (with SCM API) ####################################################################### -EXTRA_TEST_CASES += ext_test.externaltest +EXTRA_TEST_CASES += guilescm_ext_test.externaltest include ../guile/Makefile @@ -31,7 +31,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $$SWIGOPT" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ done diff --git a/Examples/test-suite/guilescm/ext_test_runme.scm b/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm similarity index 82% rename from Examples/test-suite/guilescm/ext_test_runme.scm rename to Examples/test-suite/guilescm/guilescm_ext_test_runme.scm index 67add849e..ff3df064b 100644 --- a/Examples/test-suite/guilescm/ext_test_runme.scm +++ b/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm @@ -1,4 +1,4 @@ -(dynamic-call "scm_init_ext_test_module" (dynamic-link "./libext_test.so")) +(dynamic-call "scm_init_guilescm_ext_test_module" (dynamic-link "./libguilescm_ext_test.so")) ; This is a test for SF Bug 1573892 ; If IsPointer is called before TypeQuery, the test-is-pointer will fail diff --git a/Examples/test-suite/guilescm/ext_test.i b/Examples/test-suite/guilescm_ext_test.i similarity index 93% rename from Examples/test-suite/guilescm/ext_test.i rename to Examples/test-suite/guilescm_ext_test.i index 8b117bb5a..fd5655d4f 100644 --- a/Examples/test-suite/guilescm/ext_test.i +++ b/Examples/test-suite/guilescm_ext_test.i @@ -1,4 +1,4 @@ -%module ext_test +%module guilescm_ext_test /* just use the imports_a.h header... for this test we only need a class */ %{ diff --git a/Examples/test-suite/python/iadd.h b/Examples/test-suite/iadd.i similarity index 79% rename from Examples/test-suite/python/iadd.h rename to Examples/test-suite/iadd.i index 367eda26f..514bd3e4f 100644 --- a/Examples/test-suite/python/iadd.h +++ b/Examples/test-suite/iadd.i @@ -1,3 +1,12 @@ +%module iadd + +%include attribute.i +class Foo; +%attribute_ref(test::Foo, test::A& , AsA); +%attribute_ref(test::Foo, long, AsLong); + + +%inline %{ struct B { int x; B(const int x) : x(x) {} @@ -45,3 +54,5 @@ private: long *_n; }; } + +%} diff --git a/Examples/test-suite/ignore_template_constructor.i b/Examples/test-suite/ignore_template_constructor.i index 5225d5183..ffd541986 100644 --- a/Examples/test-suite/ignore_template_constructor.i +++ b/Examples/test-suite/ignore_template_constructor.i @@ -37,3 +37,9 @@ public: #endif %template(VectFlow) std::vector; + +%inline %{ +std::vector inandout(std::vector v) { + return v; +} +%} diff --git a/Examples/test-suite/octave/implicittest.i b/Examples/test-suite/implicittest.i similarity index 100% rename from Examples/test-suite/octave/implicittest.i rename to Examples/test-suite/implicittest.i diff --git a/Examples/test-suite/import_nomodule.i b/Examples/test-suite/import_nomodule.i index 5d5115360..a1ba9ad7a 100644 --- a/Examples/test-suite/import_nomodule.i +++ b/Examples/test-suite/import_nomodule.i @@ -3,6 +3,9 @@ #include "import_nomodule.h" %} +// For Python +%warnfilter(SWIGWARN_TYPE_UNDEFINED_CLASS) Bar; // Base class 'Foo' ignored - unknown module name for base. Either import the appropriate module interface file or specify the name of the module in the %import directive. + %import "import_nomodule.h" #if !defined(SWIGJAVA) && !defined(SWIGRUBY) && !defined(SWIGCSHARP) diff --git a/Examples/test-suite/imports_b.i b/Examples/test-suite/imports_b.i index afc573a39..81e84cddd 100644 --- a/Examples/test-suite/imports_b.i +++ b/Examples/test-suite/imports_b.i @@ -34,9 +34,14 @@ */ #if 0 -%import "imports_a.i" + %import "imports_a.i" #else -%import(module="imports_a") "imports_a.h" +# if 0 + // Test Warning 401 (Python only) + %import "imports_a.h" +# else + %import(module="imports_a") "imports_a.h" +# endif #endif %include "imports_b.h" diff --git a/Examples/test-suite/python/inout.i b/Examples/test-suite/inout.i similarity index 100% rename from Examples/test-suite/python/inout.i rename to Examples/test-suite/inout.i diff --git a/Examples/test-suite/python/inplaceadd.i b/Examples/test-suite/inplaceadd.i similarity index 100% rename from Examples/test-suite/python/inplaceadd.i rename to Examples/test-suite/inplaceadd.i diff --git a/Examples/test-suite/python/input.i b/Examples/test-suite/input.i similarity index 100% rename from Examples/test-suite/python/input.i rename to Examples/test-suite/input.i diff --git a/Examples/test-suite/insert_directive.i b/Examples/test-suite/insert_directive.i new file mode 100644 index 000000000..8ad966a99 --- /dev/null +++ b/Examples/test-suite/insert_directive.i @@ -0,0 +1,38 @@ +%module insert_directive + +// check %insert and the order of each insert section is correct + +%begin %{ +// %inserted code %begin +int inserted_begin(int i) { return i; } +%} + +%runtime %{ +// %inserted code %runtime +int inserted_runtime(int i) { return inserted_begin(i); } +%} + +%{ +// %inserted code %header +int inserted_header1(int i) { return inserted_runtime(i); } +%} + +%header %{ +// %inserted code %header +int inserted_header2(int i) { return inserted_header1(i); } +%} + +%{ +// %inserted code %header +int inserted_header3(int i) { return inserted_header2(i); } +%} + +%wrapper %{ +// %inserted code %wrapper +int inserted_wrapper(int i) { return inserted_header3(i); } +%} + +%init %{ +// %inserted code %init +int inserted_init_value = inserted_wrapper(0); +%} diff --git a/Examples/test-suite/intermediary_classname.i b/Examples/test-suite/intermediary_classname.i index 0f90f9cdd..94858a5fb 100644 --- a/Examples/test-suite/intermediary_classname.i +++ b/Examples/test-suite/intermediary_classname.i @@ -18,6 +18,7 @@ "new $javaclassname($jniinput, false)/*javadirectorin*/" %typemap(out, throws="IllegalAccessException/*out Base&*/") Base& { // XYZ& typemap out + $result = 0; // remove unused variable warning } %inline %{ diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index ace8dee86..03c10d498 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -32,11 +32,13 @@ CPP_TEST_CASES = \ java_throws \ java_typemaps_proxy \ java_typemaps_typewrapper +# li_boost_intrusive_ptr include $(srcdir)/../common.mk # Overridden variables here SWIGOPT += -package $* +INTERFACEDIR = ../../ # Rules for the different types of tests %.cpptest: @@ -72,7 +74,7 @@ run_testcase = \ (cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java) && \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(COMPILETOOL) $(JAVAC) -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ - env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*\_runme;) \ + env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*_runme;) \ fi; # Clean: remove testcase directories diff --git a/Examples/test-suite/java/allprotected_runme.java b/Examples/test-suite/java/allprotected_runme.java old mode 100755 new mode 100644 diff --git a/Examples/test-suite/java/director_basic_runme.java b/Examples/test-suite/java/director_basic_runme.java index eafe20bec..16a46aa35 100644 --- a/Examples/test-suite/java/director_basic_runme.java +++ b/Examples/test-suite/java/director_basic_runme.java @@ -14,28 +14,43 @@ public class director_basic_runme { public static void main(String argv[]) { - director_basic_MyFoo a = new director_basic_MyFoo(); + director_basic_MyFoo a = new director_basic_MyFoo(); - if (!a.ping().equals("director_basic_MyFoo::ping()")) { - throw new RuntimeException ( "a.ping()" ); - } + if (!a.ping().equals("director_basic_MyFoo::ping()")) { + throw new RuntimeException ( "a.ping()" ); + } - if (!a.pong().equals("Foo::pong();director_basic_MyFoo::ping()")) { - throw new RuntimeException ( "a.pong()" ); - } + if (!a.pong().equals("Foo::pong();director_basic_MyFoo::ping()")) { + throw new RuntimeException ( "a.pong()" ); + } - Foo b = new Foo(); + Foo b = new Foo(); - if (!b.ping().equals("Foo::ping()")) { - throw new RuntimeException ( "b.ping()" ); - } + if (!b.ping().equals("Foo::ping()")) { + throw new RuntimeException ( "b.ping()" ); + } - if (!b.pong().equals("Foo::pong();Foo::ping()")) { - throw new RuntimeException ( "b.pong()" ); - } + if (!b.pong().equals("Foo::pong();Foo::ping()")) { + throw new RuntimeException ( "b.pong()" ); + } - A1 a1 = new A1(1, false); - a1.delete(); + A1 a1 = new A1(1, false); + a1.delete(); + + { + MyOverriddenClass my = new MyOverriddenClass(); + + my.expectNull = true; + if (MyClass.call_pmethod(my, null) != null) + throw new RuntimeException("null pointer marshalling problem"); + + Bar myBar = new Bar(); + my.expectNull = false; + Bar myNewBar = MyClass.call_pmethod(my, myBar); + if (myNewBar == null) + throw new RuntimeException("non-null pointer marshalling problem"); + myNewBar.setX(10); + } } } @@ -45,3 +60,13 @@ class director_basic_MyFoo extends Foo { } } +class MyOverriddenClass extends MyClass { + public boolean expectNull = false; + public boolean nonNullReceived = false; + public Bar pmethod(Bar b) { + if ( expectNull && (b != null) ) + throw new RuntimeException("null not received as expected"); + return b; + } +} + diff --git a/Examples/test-suite/java/director_classic_runme.java b/Examples/test-suite/java/director_classic_runme.java old mode 100755 new mode 100644 diff --git a/Examples/test-suite/java/director_ignore_runme.java b/Examples/test-suite/java/director_ignore_runme.java old mode 100755 new mode 100644 diff --git a/Examples/test-suite/java/global_namespace_runme.java b/Examples/test-suite/java/global_namespace_runme.java new file mode 100644 index 000000000..faab7d4ba --- /dev/null +++ b/Examples/test-suite/java/global_namespace_runme.java @@ -0,0 +1,25 @@ +import global_namespace.*; + +public class global_namespace_runme { + + static { + try { + System.loadLibrary("global_namespace"); + } catch (UnsatisfiedLinkError e) { + System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); + System.exit(1); + } + } + + public static void main(String argv[]) { + + KlassMethods.methodA(new Klass1(), new Klass2(), new Klass3(), new Klass4(), new Klass5(), new Klass6(), new Klass7()); + KlassMethods.methodB(new Klass1(), new Klass2(), new Klass3(), new Klass4(), new Klass5(), new Klass6(), new Klass7()); + + XYZMethods.methodA(new XYZ1(), new XYZ2(), new XYZ3(), new XYZ4(), new XYZ5(), new XYZ6(), new XYZ7()); + XYZMethods.methodB(new XYZ1(), new XYZ2(), new XYZ3(), new XYZ4(), new XYZ5(), new XYZ6(), new XYZ7()); + + TheEnumMethods.methodA(TheEnum1.theenum1, TheEnum2.theenum2, TheEnum3.theenum3); + TheEnumMethods.methodA(TheEnum1.theenum1, TheEnum2.theenum2, TheEnum3.theenum3); + } +} diff --git a/Examples/test-suite/java/java_throws_runme.java b/Examples/test-suite/java/java_throws_runme.java index 3538aa6d4..6a73ea563 100644 --- a/Examples/test-suite/java/java_throws_runme.java +++ b/Examples/test-suite/java/java_throws_runme.java @@ -94,5 +94,20 @@ public class java_throws_runme { if (!pass) throw new RuntimeException("Test 7 failed"); + + // Test %nojavaexception + NoExceptTest net = new NoExceptTest(); + + pass = false; + try { + net.exceptionPlease(); + pass = true; + } + catch (MyException e) {} + + if (!pass) + throw new RuntimeException("Test 8 failed"); + + net.noExceptionPlease(); } } diff --git a/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java b/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java new file mode 100644 index 000000000..f40c28e9e --- /dev/null +++ b/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java @@ -0,0 +1,701 @@ +import li_boost_intrusive_ptr.*; + +public class li_boost_intrusive_ptr_runme { + static { + try { + System.loadLibrary("li_boost_intrusive_ptr"); + } catch (UnsatisfiedLinkError e) { + System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); + System.exit(1); + } + } + + // Debugging flag + public final static boolean debug = false; + + public static void main(String argv[]) + { + if (debug) + System.out.println("Started"); + + li_boost_intrusive_ptr.setDebug_shared(debug); + + // Change loop count to run for a long time to monitor memory + final int loopCount = 5000; //5000; + for (int i=0; iFindClass("java_throws/MyException"); + if (excep) + jenv->ThrowNew(excep, "exception message"); + return $null; +} +%} + +%nojavaexception *::noExceptionPlease(); +%nojavaexception NoExceptTest::NoExceptTest(); + +// Need to handle the checked exception in NoExceptTest.delete() +%typemap(javafinalize) SWIGTYPE %{ + protected void finalize() { + try { + delete(); + } catch (MyException e) { + throw new RuntimeException(e); + } + } +%} + +%inline %{ +struct NoExceptTest { + unsigned int noExceptionPlease() { return 123; } + unsigned int exceptionPlease() { return 456; } + ~NoExceptTest() {} +}; +%} + +// Turn global exceptions off (for the implicit destructors/constructors) +%nojavaexception; + diff --git a/Examples/test-suite/li_attribute.i b/Examples/test-suite/li_attribute.i index 5b4379ebf..4f9497afb 100644 --- a/Examples/test-suite/li_attribute.i +++ b/Examples/test-suite/li_attribute.i @@ -93,9 +93,11 @@ struct MyFoo; // %attribute2 does not work with templates %template(Param_i) Param; +// class/struct attribute with get/set methods using return/pass by reference %attribute2(MyClass, MyFoo, Foo, GetFoo, SetFoo); %inline %{ struct MyFoo { + MyFoo() : x(-1) {} int x; }; class MyClass { @@ -106,3 +108,32 @@ struct MyFoo; // %attribute2 does not work with templates }; %} + +// class/struct attribute with get/set methods using return/pass by value +%attributeval(MyClassVal, MyFoo, ReadWriteFoo, GetFoo, SetFoo); +%attributeval(MyClassVal, MyFoo, ReadOnlyFoo, GetFoo); +%inline %{ + class MyClassVal { + MyFoo foo; + public: + MyFoo GetFoo() { return foo; } + void SetFoo(MyFoo other) { foo = other; } + }; +%} + + +// string attribute with get/set methods using return/pass by value +%include +%attributestring(MyStringyClass, std::string, ReadWriteString, GetString, SetString); +%attributestring(MyStringyClass, std::string, ReadOnlyString, GetString); +%inline %{ + class MyStringyClass { + std::string str; + public: + MyStringyClass(const std::string &val) : str(val) {} + std::string GetString() { return str; } + void SetString(std::string other) { str = other; } + }; +%} + + diff --git a/Examples/test-suite/li_boost_intrusive_ptr.i b/Examples/test-suite/li_boost_intrusive_ptr.i new file mode 100644 index 000000000..7c37e6843 --- /dev/null +++ b/Examples/test-suite/li_boost_intrusive_ptr.i @@ -0,0 +1,494 @@ +// This tests intrusive_ptr is working okay. It also checks that there are no memory leaks in the +// class that intrusive_ptr is pointing via a counting mechanism in the constructors and destructor of Klass. +// In order to test that there are no leaks of the intrusive_ptr class itself (as it is created on the heap) +// the runtime tests can be run for a long time to monitor memory leaks using memory monitor tools +// like 'top'. There is a wrapper for intrusive_ptr in intrusive_ptr_wrapper.h which enables one to +// count the instances of intrusive_ptr. Uncomment the INTRUSIVE_PTR_WRAPPER macro to turn this on. +// +// Also note the debug_shared flag which can be set from the target language. + +%module li_boost_intrusive_ptr + +%warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK); + +%inline %{ +#include "boost/shared_ptr.hpp" +#include "boost/intrusive_ptr.hpp" +#include + +// Uncomment macro below to turn on intrusive_ptr memory leak checking as described above +//#define INTRUSIVE_PTR_WRAPPER + +#ifdef INTRUSIVE_PTR_WRAPPER +# include "intrusive_ptr_wrapper.h" +# include "shared_ptr_wrapper.h" +#endif +%} + +%{ +#ifndef INTRUSIVE_PTR_WRAPPER +# define SwigBoost boost +#endif +%} + +%include "std_string.i" +#ifndef INTRUSIVE_PTR_WRAPPER +# define SWIG_INTRUSIVE_PTR_NAMESPACE SwigBoost +# define SWIG_SHARED_PTR_NAMESPACE SwigBoost +#endif + +#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) +#define INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED +#endif + +#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) + +%include +SWIG_INTRUSIVE_PTR(Klass, Space::Klass) +SWIG_INTRUSIVE_PTR_NO_WRAP(KlassWithoutRefCount, Space::KlassWithoutRefCount) +SWIG_INTRUSIVE_PTR_DERIVED(KlassDerived, Space::KlassWithoutRefCount, Space::KlassDerived) +SWIG_INTRUSIVE_PTR_DERIVED(KlassDerivedDerived, Space::KlassDerived, Space::KlassDerivedDerived) + +//For the use_count shared_ptr functions +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & ($*1_ltype tempnull) %{ + $1 = $input ? *($&1_ltype)&$input : &tempnull; +%} +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass.getCPtr($javainput)" + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & ($*1_ltype tempnull) %{ + $1 = $input ? *($&1_ltype)&$input : &tempnull; +%} +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived.getCPtr($javainput)" + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & ($*1_ltype tempnull) %{ + $1 = $input ? *($&1_ltype)&$input : &tempnull; +%} +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived.getCPtr($javainput)" + +#endif + +// TODO: +// const intrusive_ptr +// std::vector +// Add in generic %extend for the Upcast function for derived classes +// Remove proxy upcast method - implement %feature("shadow") ??? which replaces the proxy method + +%exception { + if (debug_shared) { + cout << "++++++" << endl << flush; + cout << "calling $name" << endl << flush; + } + $action + if (debug_shared) { + cout << "------" << endl << flush; + } +} + +%ignore IgnoredRefCountingBase; +%ignore *::operator=; +%ignore intrusive_ptr_add_ref; +%ignore intrusive_ptr_release; +%newobject pointerownertest(); +%newobject smartpointerpointerownertest(); + +%inline %{ +#include +using namespace std; + +static bool debug_shared = false; + +namespace Space { + +struct Klass { + Klass() : value("EMPTY"), count(0) { if (debug_shared) cout << "Klass() [" << value << "]" << endl << flush; increment(); } + + Klass(const std::string &val) : value(val), count(0) { if (debug_shared) cout << "Klass(string) [" << value << "]" << endl << flush; increment(); } + + virtual ~Klass() { if (debug_shared) cout << "~Klass() [" << value << "]" << endl << flush; decrement(); } + virtual std::string getValue() const { return value; } + void append(const std::string &s) { value += s; } + Klass(const Klass &other) : value(other.value), count(0) { if (debug_shared) cout << "Klass(const Klass&) [" << value << "]" << endl << flush; increment(); } + + Klass &operator=(const Klass &other) { value = other.value; return *this; } + + void addref(void) const { ++count; } + void release(void) const { if (--count == 0) delete this; } + int use_count(void) const { return count; } + static long getTotal_count() { return total_count; } + +private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx Klass::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx Klass::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; + std::string value; + int array[1024]; + mutable boost::detail::atomic_count count; +}; + +struct KlassWithoutRefCount { + KlassWithoutRefCount() : value("EMPTY") { if (debug_shared) cout << "KlassWithoutRefCount() [" << value << "]" << endl << flush; increment(); } + + KlassWithoutRefCount(const std::string &val) : value(val) { if (debug_shared) cout << "KlassWithoutRefCount(string) [" << value << "]" << endl << flush; increment(); } + + virtual ~KlassWithoutRefCount() { if (debug_shared) cout << "~KlassWithoutRefCount() [" << value << "]" << endl << flush; decrement(); } + virtual std::string getValue() const { return value; } + void append(const std::string &s) { value += s; } + KlassWithoutRefCount(const KlassWithoutRefCount &other) : value(other.value) { if (debug_shared) cout << "KlassWithoutRefCount(const KlassWithoutRefCount&) [" << value << "]" << endl << flush; increment(); } + std::string getSpecialValueFromUnwrappableClass() { return "this class cannot be wrapped by intrusive_ptrs but we can still use it"; } + KlassWithoutRefCount &operator=(const KlassWithoutRefCount &other) { value = other.value; return *this; } + static long getTotal_count() { return total_count; } + +private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassWithoutRefCount::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassWithoutRefCount::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; + std::string value; + int array[1024]; +}; + +struct IgnoredRefCountingBase { + IgnoredRefCountingBase() : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase()" << endl << flush; increment(); } + + IgnoredRefCountingBase(const IgnoredRefCountingBase &other) : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase(const IgnoredRefCountingBase&)" << endl << flush; increment(); } + + IgnoredRefCountingBase &operator=(const IgnoredRefCountingBase& other) { + return *this; + } + + virtual ~IgnoredRefCountingBase() { if (debug_shared) cout << "~IgnoredRefCountingBase()" << endl << flush; decrement(); } + + void addref(void) const { ++count; } + void release(void) const { if (--count == 0) delete this; } + int use_count(void) const { return count; } + static long getTotal_count() { return total_count; } + + private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx IgnoredRefCountingBase::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx IgnoredRefCountingBase::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; + double d; + double e; + mutable boost::detail::atomic_count count; +}; + +long getTotal_IgnoredRefCountingBase_count() { + return IgnoredRefCountingBase::getTotal_count(); +} + +// For most compilers, this use of multiple inheritance results in different derived and base class +// pointer values ... for some more challenging tests :) +struct KlassDerived : IgnoredRefCountingBase, KlassWithoutRefCount { + KlassDerived() : KlassWithoutRefCount() { if (debug_shared) cout << "KlassDerived()" << endl << flush; increment(); } + KlassDerived(const std::string &val) : KlassWithoutRefCount(val) { if (debug_shared) cout << "KlassDerived(string) [" << val << "]" << endl << flush; increment(); } + KlassDerived(const KlassDerived &other) : KlassWithoutRefCount(other) { if (debug_shared) cout << "KlassDerived(const KlassDerived&))" << endl << flush; increment(); } + virtual ~KlassDerived() { if (debug_shared) cout << "~KlassDerived()" << endl << flush; decrement(); } + virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-Derived"; } + int use_count(void) const { return IgnoredRefCountingBase::use_count(); } + static long getTotal_count() { return total_count; } + + private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerived::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerived::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; +}; +struct KlassDerivedDerived : KlassDerived { + KlassDerivedDerived() : KlassDerived() { if (debug_shared) cout << "KlassDerivedDerived()" << endl << flush; increment(); } + KlassDerivedDerived(const std::string &val) : KlassDerived(val) { if (debug_shared) cout << "KlassDerivedDerived(string) [" << val << "]" << endl << flush; increment(); } + KlassDerivedDerived(const KlassDerived &other) : KlassDerived(other) { if (debug_shared) cout << "KlassDerivedDerived(const KlassDerivedDerived&))" << endl << flush; increment(); } + virtual ~KlassDerivedDerived() { if (debug_shared) cout << "~KlassDerivedDerived()" << endl << flush; decrement(); } + virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-DerivedDerived"; } + static long getTotal_count() { return total_count; } + + private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerivedDerived::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerivedDerived::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; +}; +KlassDerived* derivedpointertest(KlassDerived* kd) { + if (kd) + kd->append(" derivedpointertest"); + return kd; +} +KlassDerived derivedvaluetest(KlassDerived kd) { + kd.append(" derivedvaluetest"); + return kd; +} +KlassDerived& derivedreftest(KlassDerived& kd) { + kd.append(" derivedreftest"); + return kd; +} +SwigBoost::intrusive_ptr derivedsmartptrtest(SwigBoost::intrusive_ptr kd) { + if (kd) + kd->append(" derivedsmartptrtest"); + return kd; +} +SwigBoost::intrusive_ptr* derivedsmartptrpointertest(SwigBoost::intrusive_ptr* kd) { + if (kd && *kd) + (*kd)->append(" derivedsmartptrpointertest"); + return kd; +} +SwigBoost::intrusive_ptr* derivedsmartptrreftest(SwigBoost::intrusive_ptr* kd) { + if (kd && *kd) + (*kd)->append(" derivedsmartptrreftest"); + return kd; +} +SwigBoost::intrusive_ptr*& derivedsmartptrpointerreftest(SwigBoost::intrusive_ptr*& kd) { + if (kd && *kd) + (*kd)->append(" derivedsmartptrpointerreftest"); + return kd; +} + +SwigBoost::intrusive_ptr factorycreate() { + return SwigBoost::intrusive_ptr(new Klass("factorycreate")); +} +// smart pointer +SwigBoost::intrusive_ptr smartpointertest(SwigBoost::intrusive_ptr k) { + if (k) + k->append(" smartpointertest"); + return SwigBoost::intrusive_ptr(k); +} +SwigBoost::intrusive_ptr* smartpointerpointertest(SwigBoost::intrusive_ptr* k) { + if (k && *k) + (*k)->append(" smartpointerpointertest"); + return k; +} +SwigBoost::intrusive_ptr& smartpointerreftest(SwigBoost::intrusive_ptr& k) { + if (k) + k->append(" smartpointerreftest"); + return k; +} +SwigBoost::intrusive_ptr*& smartpointerpointerreftest(SwigBoost::intrusive_ptr*& k) { + if (k && *k) + (*k)->append(" smartpointerpointerreftest"); + return k; +} +// const +SwigBoost::intrusive_ptr constsmartpointertest(SwigBoost::intrusive_ptr k) { + return SwigBoost::intrusive_ptr(k); +} +SwigBoost::intrusive_ptr* constsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { + return k; +} +SwigBoost::intrusive_ptr& constsmartpointerreftest(SwigBoost::intrusive_ptr& k) { + return k; +} +// plain pointer +Klass valuetest(Klass k) { + k.append(" valuetest"); + return k; +} +Klass *pointertest(Klass *k) { + if (k) + k->append(" pointertest"); + return k; +} +Klass& reftest(Klass& k) { + k.append(" reftest"); + return k; +} +Klass*& pointerreftest(Klass*& k) { + k->append(" pointerreftest"); + return k; +} +// null +std::string nullsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { + if (k && *k) + return "not null"; + else if (!k) + return "null smartpointer pointer"; + else if (!*k) + return "null pointer"; + else + return "also not null"; +} +// $owner +Klass *pointerownertest() { + return new Klass("pointerownertest"); +} +SwigBoost::intrusive_ptr* smartpointerpointerownertest() { + return new SwigBoost::intrusive_ptr(new Klass("smartpointerpointerownertest")); +} + +const SwigBoost::intrusive_ptr& ref_1() { + static SwigBoost::intrusive_ptr sptr; + return sptr; +} + +// overloading tests +std::string overload_rawbyval(int i) { return "int"; } +std::string overload_rawbyval(Klass k) { return "rawbyval"; } + +std::string overload_rawbyref(int i) { return "int"; } +std::string overload_rawbyref(Klass &k) { return "rawbyref"; } + +std::string overload_rawbyptr(int i) { return "int"; } +std::string overload_rawbyptr(Klass *k) { return "rawbyptr"; } + +std::string overload_rawbyptrref(int i) { return "int"; } +std::string overload_rawbyptrref(Klass *&k) { return "rawbyptrref"; } + + + +std::string overload_smartbyval(int i) { return "int"; } +std::string overload_smartbyval(SwigBoost::intrusive_ptr k) { return "smartbyval"; } + +std::string overload_smartbyref(int i) { return "int"; } +std::string overload_smartbyref(SwigBoost::intrusive_ptr &k) { return "smartbyref"; } + +std::string overload_smartbyptr(int i) { return "int"; } +std::string overload_smartbyptr(SwigBoost::intrusive_ptr *k) { return "smartbyptr"; } + +std::string overload_smartbyptrref(int i) { return "int"; } +std::string overload_smartbyptrref(SwigBoost::intrusive_ptr *&k) { return "smartbyptrref"; } + +} // namespace Space + +%} +%{ + boost::detail::atomic_count Space::Klass::total_count(0); + boost::detail::atomic_count Space::KlassWithoutRefCount::total_count(0); + boost::detail::atomic_count Space::IgnoredRefCountingBase::total_count(0); + boost::detail::atomic_count Space::KlassDerived::total_count(0); + boost::detail::atomic_count Space::KlassDerivedDerived::total_count(0); +%} + +// Member variables + +%inline %{ +struct MemberVariables { + MemberVariables() : SmartMemberPointer(new SwigBoost::intrusive_ptr()), SmartMemberReference(*(new SwigBoost::intrusive_ptr())), MemberPointer(0), MemberReference(MemberValue) {} + virtual ~MemberVariables() { + delete SmartMemberPointer; + delete &SmartMemberReference; + } + SwigBoost::intrusive_ptr SmartMemberValue; + SwigBoost::intrusive_ptr * SmartMemberPointer; + SwigBoost::intrusive_ptr & SmartMemberReference; + Space::Klass MemberValue; + Space::Klass * MemberPointer; + Space::Klass & MemberReference; +}; + +// Global variables +SwigBoost::intrusive_ptr GlobalSmartValue; +Space::Klass GlobalValue; +Space::Klass * GlobalPointer = 0; +Space::Klass & GlobalReference = GlobalValue; + +%} + +#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) + +// Note: %template after the intrusive_ptr typemaps +SWIG_INTRUSIVE_PTR(BaseIntDouble, Base) +// Note: cannot use Base in the macro below because of the comma in the type, +// so we use a typedef instead. Alternatively use %arg(Base). %arg is defined in swigmacros.swg. +SWIG_INTRUSIVE_PTR_DERIVED(PairIntDouble, BaseIntDouble_t, Pair) + +#endif + +// Templates +%inline %{ +template struct Base { + Space::Klass klassBase; + T1 baseVal1; + T2 baseVal2; + Base(T1 t1, T2 t2) : baseVal1(t1*2), baseVal2(t2*2) {} + virtual std::string getValue() const { return "Base<>"; }; + mutable int count; + void addref(void) const { count++; } + void release(void) const { if (--count == 0) delete this; } + int use_count(void) const { return count; } +}; +typedef Base BaseIntDouble_t; +%} + +%template(BaseIntDouble) Base; + +%inline %{ +template struct Pair : Base { + Space::Klass klassPair; + T1 val1; + T2 val2; + Pair(T1 t1, T2 t2) : Base(t1, t2), val1(t1), val2(t2) {} + virtual std::string getValue() const { return "Pair<>"; }; +}; + +Pair pair_id2(Pair p) { return p; } +SwigBoost::intrusive_ptr< Pair > pair_id1(SwigBoost::intrusive_ptr< Pair > p) { return p; } + +template void intrusive_ptr_add_ref(const T* r) { r->addref(); } + +template void intrusive_ptr_release(const T* r) { r->release(); } + +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +%} + +%template(PairIntDouble) Pair; + +// For counting the instances of intrusive_ptr (all of which are created on the heap) +// intrusive_ptr_wrapper_count() gives overall count +%inline %{ +namespace SwigBoost { + const int NOT_COUNTING = -123456; + int intrusive_ptr_wrapper_count() { + #ifdef INTRUSIVE_PTR_WRAPPER + return SwigBoost::IntrusivePtrWrapper::getTotalCount(); + #else + return NOT_COUNTING; + #endif + } + #ifdef INTRUSIVE_PTR_WRAPPER + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "Klass: " + (*t)->getValue(); + else + return "Klass: NULL"; + } + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "Klass: " + (*t)->getValue(); + else + return "Klass: NULL"; + } + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "KlassDerived: " + (*t)->getValue(); + else + return "KlassDerived: NULL"; + } + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "KlassDerived: " + (*t)->getValue(); + else + return "KlassDerived: NULL"; + } + #endif +} +%} + diff --git a/Examples/test-suite/li_boost_shared_ptr.i b/Examples/test-suite/li_boost_shared_ptr.i index a6225410b..f992a3c08 100644 --- a/Examples/test-suite/li_boost_shared_ptr.i +++ b/Examples/test-suite/li_boost_shared_ptr.i @@ -43,6 +43,14 @@ %include SWIG_SHARED_PTR(Klass, Space::Klass) SWIG_SHARED_PTR_DERIVED(KlassDerived, Space::Klass, Space::KlassDerived) +SWIG_SHARED_PTR_DERIVED(Klass2ndDerived, Space::Klass, Space::Klass2ndDerived) +SWIG_SHARED_PTR_DERIVED(Klass3rdDerived, Space::Klass2ndDerived, Space::Klass3rdDerived) + +// TEMP for python +%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass3rdDerived > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass >) { + *newmemory = SWIG_CAST_NEW_MEMORY; + return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass3rdDerived > *)$from); +} #endif @@ -101,7 +109,13 @@ private: }; SwigExamples::CriticalSection Space::Klass::critical_section; -struct IgnoredMultipleInheritBase { virtual ~IgnoredMultipleInheritBase() {} double d; double e;}; +struct IgnoredMultipleInheritBase { + IgnoredMultipleInheritBase() : d(0.0), e(0.0) {} + virtual ~IgnoredMultipleInheritBase() {} + double d; + double e; + virtual void AVirtualMethod() {} +}; // For most compilers, this use of multiple inheritance results in different derived and base class // pointer values ... for some more challenging tests :) @@ -142,7 +156,21 @@ SwigBoost::shared_ptr*& derivedsmartptrpointerreftest(SwigBoost::s return kd; } +// 3 classes in inheritance chain test +struct Klass2ndDerived : Klass { + Klass2ndDerived() : Klass() {} + Klass2ndDerived(const std::string &val) : Klass(val) {} +}; +struct Klass3rdDerived : IgnoredMultipleInheritBase, Klass2ndDerived { + Klass3rdDerived() : Klass2ndDerived() {} + Klass3rdDerived(const std::string &val) : Klass2ndDerived(val) {} + virtual ~Klass3rdDerived() {} + virtual std::string getValue() const { return Klass2ndDerived::getValue() + "-3rdDerived"; } +}; +std::string test3rdupcast( SwigBoost::shared_ptr< Klass > k) { + return k->getValue(); +} @@ -217,8 +245,14 @@ SwigBoost::shared_ptr* smartpointerpointerownertest() { return new SwigBoost::shared_ptr(new Klass("smartpointerpointerownertest")); } -// Provide overloads for Klass and KlassDerived as some language modules, eg Python, create an extra reference in +// Provide overloads for Klass and derived classes as some language modules, eg Python, create an extra reference in // the marshalling if an upcast to a base class is required. +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} long use_count(const SwigBoost::shared_ptr& sptr) { return sptr.use_count(); } diff --git a/Examples/test-suite/li_cstring.i b/Examples/test-suite/li_cstring.i index fd92ac7d3..28e8049e8 100644 --- a/Examples/test-suite/li_cstring.i +++ b/Examples/test-suite/li_cstring.i @@ -4,7 +4,7 @@ #ifndef SWIG_CSTRING_UNIMPL -%cstring_input_binary(char *in, int n); +%cstring_input_binary(char *str_in, int n); %cstring_bounded_output(char *out1, 512); %cstring_chunk_output(char *out2, 64); %cstring_bounded_mutable(char *out3, 512); @@ -22,13 +22,13 @@ %inline %{ -int count(char *in, int n, char c) { +int count(char *str_in, int n, char c) { int r = 0; while (n > 0) { - if (*in == c) { + if (*str_in == c) { r++; } - in++; + str_in++; --n; } return r; diff --git a/Examples/test-suite/li_cwstring.i b/Examples/test-suite/li_cwstring.i index dc9a1c4b9..769dcce12 100644 --- a/Examples/test-suite/li_cwstring.i +++ b/Examples/test-suite/li_cwstring.i @@ -4,7 +4,7 @@ #ifndef SWIG_CWSTRING_UNIMPL -%cwstring_input_binary(wchar_t *in, int n); +%cwstring_input_binary(wchar_t *str_in, int n); %cwstring_bounded_output(wchar_t *out1, 512); %cwstring_chunk_output(wchar_t *out2, 64); %cwstring_bounded_mutable(wchar_t *out3, 512); @@ -22,13 +22,13 @@ %inline %{ -int count(wchar_t *in, int n, wchar_t c) { +int count(wchar_t *str_in, int n, wchar_t c) { int r = 0; while (n > 0) { - if (*in == c) { + if (*str_in == c) { r++; } - in++; + str_in++; --n; } return r; diff --git a/Examples/test-suite/python/li_std_carray.i b/Examples/test-suite/li_std_carray.i similarity index 100% rename from Examples/test-suite/python/li_std_carray.i rename to Examples/test-suite/li_std_carray.i diff --git a/Examples/test-suite/ruby/li_std_functors.i b/Examples/test-suite/li_std_functors.i similarity index 100% rename from Examples/test-suite/ruby/li_std_functors.i rename to Examples/test-suite/li_std_functors.i diff --git a/Examples/test-suite/perl5/li_std_list.i b/Examples/test-suite/li_std_list.i similarity index 100% rename from Examples/test-suite/perl5/li_std_list.i rename to Examples/test-suite/li_std_list.i diff --git a/Examples/test-suite/li_std_map.i b/Examples/test-suite/li_std_map.i index edcb05641..27c1b1a70 100644 --- a/Examples/test-suite/li_std_map.i +++ b/Examples/test-suite/li_std_map.i @@ -10,7 +10,7 @@ * * For example: * swig::LANGUAGE_OBJ is GC_VALUE in Ruby - * swig::LANGUAGE_OBJ is PyObject_ptr in python + * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python * * */ @@ -47,8 +47,15 @@ namespace std %template(pairiiAc) pair >; +#ifdef SWIGRUBY %template() pair< swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ >; %template(LanguageMap) map< swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ >; +#endif + +#ifdef SWIGPYTHON + %template() pair; + %template(pymap) map; +#endif } diff --git a/Examples/test-suite/octave/li_std_pair.i b/Examples/test-suite/li_std_pair_extra.i similarity index 99% rename from Examples/test-suite/octave/li_std_pair.i rename to Examples/test-suite/li_std_pair_extra.i index 886bf1a4b..4e3b3a571 100644 --- a/Examples/test-suite/octave/li_std_pair.i +++ b/Examples/test-suite/li_std_pair_extra.i @@ -1,4 +1,4 @@ -%module li_std_pair +%module li_std_pair_extra // // activate the automatic comparison methods generation (==,!=,...) diff --git a/Examples/test-suite/ruby/li_std_pair_lang_object.i b/Examples/test-suite/li_std_pair_lang_object.i similarity index 100% rename from Examples/test-suite/ruby/li_std_pair_lang_object.i rename to Examples/test-suite/li_std_pair_lang_object.i diff --git a/Examples/test-suite/ruby/li_std_queue.i b/Examples/test-suite/li_std_queue.i similarity index 100% rename from Examples/test-suite/ruby/li_std_queue.i rename to Examples/test-suite/li_std_queue.i diff --git a/Examples/test-suite/li_std_set.i b/Examples/test-suite/li_std_set.i index c2cdc2ebe..8c335b24c 100644 --- a/Examples/test-suite/li_std_set.i +++ b/Examples/test-suite/li_std_set.i @@ -10,7 +10,7 @@ * * For example: * swig::LANGUAGE_OBJ is GC_VALUE in Ruby - * swig::LANGUAGE_OBJ is PyObject_ptr in python + * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python * * */ @@ -31,4 +31,10 @@ +#if defined(SWIGRUBY) %template(LanguageSet) std::set; +#endif + +#if defined(SWIGPYTHON) +%template(pyset) std::set; +#endif diff --git a/Examples/test-suite/ruby/li_std_stack.i b/Examples/test-suite/li_std_stack.i similarity index 100% rename from Examples/test-suite/ruby/li_std_stack.i rename to Examples/test-suite/li_std_stack.i diff --git a/Examples/test-suite/python/li_std_string.i b/Examples/test-suite/li_std_string_extra.i similarity index 93% rename from Examples/test-suite/python/li_std_string.i rename to Examples/test-suite/li_std_string_extra.i index 822d713c4..aa758532a 100644 --- a/Examples/test-suite/python/li_std_string.i +++ b/Examples/test-suite/li_std_string_extra.i @@ -1,4 +1,4 @@ -%module li_std_string +%module li_std_string_extra %naturalvar A; @@ -51,5 +51,5 @@ std::basic_string,std::allocator > test_value_ %} -%include ../li_std_string.i +%include "li_std_string.i" diff --git a/Examples/test-suite/li_std_vector.i b/Examples/test-suite/li_std_vector.i index 587ea2217..c6e2ea9ad 100644 --- a/Examples/test-suite/li_std_vector.i +++ b/Examples/test-suite/li_std_vector.i @@ -85,8 +85,10 @@ SWIG_STD_VECTOR_SPECIALIZE(SWIGTYPE_p_int, const int *) %template(StructureConstPtrVector) std::vector; #endif +#if !defined(SWIGR) %template(IntPtrVector) std::vector; %template(IntConstPtrVector) std::vector; +#endif %template(StructVector) std::vector; %template(StructPtrVector) std::vector; %template(StructConstPtrVector) std::vector; diff --git a/Examples/test-suite/python/li_std_vector.i b/Examples/test-suite/li_std_vector_extra.i similarity index 85% rename from Examples/test-suite/python/li_std_vector.i rename to Examples/test-suite/li_std_vector_extra.i index 06dafce59..9c2497f7c 100644 --- a/Examples/test-suite/python/li_std_vector.i +++ b/Examples/test-suite/li_std_vector_extra.i @@ -1,4 +1,4 @@ -%module li_std_vector +%module li_std_vector_extra %warnfilter(509) overloaded1; %warnfilter(509) overloaded2; @@ -123,11 +123,17 @@ std::vector vecStr(std::vector v) { %pointer_class(int,PtrInt) %array_functions(int,ArrInt) +%inline %{ + int *makeIntPtr(int v) { return new int(v); } + double *makeDoublePtr(double v) { return new double(v); } + int extractInt(int *p) { return *p; } +%} -%template(pyvector) std::vector; +%template(pyvector) std::vector; namespace std { - %template(ConstIntVector) vector; + %template(ConstShortVector) vector; +// %template(ConstIntVector) vector; // interferes with vector... see new testcase li_std_vector_ptr } %inline %{ diff --git a/Examples/test-suite/li_std_vector_ptr.i b/Examples/test-suite/li_std_vector_ptr.i new file mode 100644 index 000000000..688cbdd54 --- /dev/null +++ b/Examples/test-suite/li_std_vector_ptr.i @@ -0,0 +1,29 @@ +%module li_std_vector_ptr + +%include "std_vector.i" + +%template(IntPtrVector) std::vector; + +%inline %{ +#include +using namespace std; +int* makeIntPtr(int v) { + return new int(v); +} +double* makeDoublePtr(double v) { + return new double(v); +} + +#if 1 +int** makeIntPtrPtr(int* v) { + return new int*(v); +} +#endif + +void displayVector(std::vector vpi) { + cout << "displayVector..." << endl; + for (int i=0; i; - %inline { /* silently rename the parameter names in csharp/java */ #ifdef SWIGR double foo(double inparam, double out) { return 1.0; } #else - double foo(double in, double out) { return 1.0; } + double foo(double abstract, double out) { return 1.0; } #endif double bar(double native, bool boolean) { return 1.0; } } diff --git a/Examples/test-suite/namespace_typemap.i b/Examples/test-suite/namespace_typemap.i index e4e0af905..984b93a6f 100644 --- a/Examples/test-suite/namespace_typemap.i +++ b/Examples/test-suite/namespace_typemap.i @@ -75,7 +75,7 @@ namespace test { class string_class; #ifdef SWIGPYTHON %typemap(in) string_class * { - $1 = new string_class(PyString_AsString($input)); + $1 = new string_class(SWIG_Python_str_AsChar($input)); } %typemap(freearg) string_class * { delete $1; diff --git a/Examples/test-suite/nested_comment.i b/Examples/test-suite/nested_comment.i index 16f1b7af2..ea365a6fe 100644 --- a/Examples/test-suite/nested_comment.i +++ b/Examples/test-suite/nested_comment.i @@ -18,24 +18,17 @@ in rlgc models */ char *name; } n ; } s2; - %} -// bug #491476 +// comment in nested struct %inline %{ -struct { -struct { -int a; -} a, b; -} a; - -%} - -// bug #909387 -%inline %{ -struct foo { - struct happy; // no warning - struct sad { int x; }; // warning - happy *good(); // produces good code - sad *bad(); // produces bad code +struct a +{ + struct { + /*struct*/ + struct { + int b; + } c; + } d; }; +%} diff --git a/Examples/test-suite/nested_structs.i b/Examples/test-suite/nested_structs.i new file mode 100644 index 000000000..4b13ff69d --- /dev/null +++ b/Examples/test-suite/nested_structs.i @@ -0,0 +1,22 @@ +%module nested_structs + +// bug #491476 +%inline %{ +struct { +struct { +int a; +} a, b; +} a; + +%} + +// bug #909387 +%inline %{ +struct foo { + struct happy; // no warning + struct sad { int x; }; // warning + happy *good(); // produces good code + sad *bad(); // produces bad code +}; +%} + diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in index 6f0b65489..0e6235f94 100644 --- a/Examples/test-suite/ocaml/Makefile.in +++ b/Examples/test-suite/ocaml/Makefile.in @@ -16,7 +16,7 @@ run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -a \ -f $(top_srcdir)/Examples/test-suite/$*.list ] ; then ( \ $(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ - $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& ./runme) ; \ + $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& $(RUNTOOL) ./runme) ; \ elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme $(srcdir)/$(*).cmo $(srcdir)/$(*)_runme.cmo $(srcdir)/$(*)_wrap.o && \ diff --git a/Examples/test-suite/octave/Makefile.in b/Examples/test-suite/octave/Makefile.in index 534da55c4..b12cf500a 100644 --- a/Examples/test-suite/octave/Makefile.in +++ b/Examples/test-suite/octave/Makefile.in @@ -10,7 +10,9 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ CPP_TEST_CASES += \ - cell_deref + li_std_pair_extra \ + li_std_string_extra \ + octave_cell_deref CPP_TEST_BROKEN += \ implicittest \ diff --git a/Examples/test-suite/octave/li_attribute_runme.m b/Examples/test-suite/octave/li_attribute_runme.m index c66e27c5b..548e733ed 100644 --- a/Examples/test-suite/octave/li_attribute_runme.m +++ b/Examples/test-suite/octave/li_attribute_runme.m @@ -10,7 +10,6 @@ if (aa.a != 3) error("aa.a = %i",aa.a) endif - if (aa.b != 2) error(aa.b) endif @@ -19,8 +18,6 @@ if (aa.b != 5) error endif - - if (aa.d != aa.b) error endif @@ -39,14 +36,13 @@ if (pi.value != 3) error endif - b = li_attribute.B(aa); if (b.a.c != 3) error endif - +# class/struct attribute with get/set methods using return/pass by reference myFoo = li_attribute.MyFoo(); myFoo.x = 8; myClass = li_attribute.MyClass(); @@ -55,3 +51,35 @@ if (myClass.Foo.x != 8) error endif +# class/struct attribute with get/set methods using return/pass by value +myClassVal = li_attribute.MyClassVal(); +if (myClassVal.ReadWriteFoo.x != -1) + error +endif +if (myClassVal.ReadOnlyFoo.x != -1) + error +endif +myClassVal.ReadWriteFoo = myFoo; +if (myClassVal.ReadWriteFoo.x != 8) + error +endif +if (myClassVal.ReadOnlyFoo.x != 8) + error +endif + +# string attribute with get/set methods using return/pass by value +myStringyClass = li_attribute.MyStringyClass("initial string"); +if (myStringyClass.ReadWriteString != "initial string") + error +endif +if (myStringyClass.ReadOnlyString != "initial string") + error +endif +myStringyClass.ReadWriteString = "changed string"; +if (myStringyClass.ReadWriteString != "changed string") + error +endif +if (myStringyClass.ReadOnlyString != "changed string") + error +endif + diff --git a/Examples/test-suite/octave/li_std_pair_extra_runme.m b/Examples/test-suite/octave/li_std_pair_extra_runme.m new file mode 100644 index 000000000..0f9e9a23d --- /dev/null +++ b/Examples/test-suite/octave/li_std_pair_extra_runme.m @@ -0,0 +1,69 @@ +li_std_pair_extra + +p = {1,2}; +p1 = li_std_pair_extra.p_inout(p); +assert(all(cell2mat(p1)==[2,1])); +p2 = li_std_pair_extra.p_inoutd(p1); +assert(all(cell2mat(p2)==[1,2])); + +d1 = li_std_pair_extra.d_inout(2); +assert(d1==4); + +[i,d2] = li_std_pair_extra.d_inout2(2); +assert(all([i,d2]==[1,4])); + +[i,p] = li_std_pair_extra.p_inout2(p); +assert(i==1&&all([cell2mat(p)]==[2,1])); +[p3,p4] = li_std_pair_extra.p_inout3(p1,p1); +assert(all(cell2mat(p3)==[2,1])); +assert(all(cell2mat(p4)==[2,1])); + +psi = li_std_pair_extra.SIPair("hello",1); +assert(psi=={"hello",1}); +pci = li_std_pair_extra.CIPair(complex(1,2),1); +assert(pci.first==complex(1,2)&&pci.second==1); + + +psi = li_std_pair_extra.SIPair("hi",1); +assert(psi.first=="hi"&&psi.second==1); + +psii = li_std_pair_extra.SIIPair(psi,1); +assert(psii.first.first=="hi"); +assert(psii.first.second==1); +assert(psii.second==1); + +a = li_std_pair_extra.A(); +b = li_std_pair_extra.B(); + +pab = li_std_pair_extra.ABPair(a,b); + +pab.first = a; +pab.first.val = 2; + +assert(pab.first.val == 2); + +pci = li_std_pair_extra.CIntPair(1,0); +assert(pci.first==1&&pci.second==0); + +a = li_std_pair_extra.A(5); +p1 = li_std_pair_extra.pairP1(1,a); +p2 = li_std_pair_extra.pairP2(a,1); +p3 = li_std_pair_extra.pairP3(a,a); + +assert(a.val == li_std_pair_extra.p_identa(p1){2}.val); + +p = li_std_pair_extra.IntPair(1,10); +assert(p.first==1&&p.second==10); +p.first = 1; +assert(p.first==1); + +p = li_std_pair_extra.paircA1(1,a); +assert(p.first==1); +assert(swig_this(p.second)==swig_this(a)); + +p = li_std_pair_extra.paircA2(1,a); +assert(p.first==1); +assert(swig_this(p.second)==swig_this(a)); +#pp = li_std_pair_extra.pairiiA(1,p); # conversion pb re const of pairA1/A2 +pp = li_std_pair_extra.pairiiA(1,{1,A()}); + diff --git a/Examples/test-suite/octave/li_std_pair_runme.m b/Examples/test-suite/octave/li_std_pair_runme.m deleted file mode 100644 index 83e9fe5b5..000000000 --- a/Examples/test-suite/octave/li_std_pair_runme.m +++ /dev/null @@ -1,69 +0,0 @@ -li_std_pair - -p = {1,2}; -p1 = li_std_pair.p_inout(p); -assert(all(cell2mat(p1)==[2,1])); -p2 = li_std_pair.p_inoutd(p1); -assert(all(cell2mat(p2)==[1,2])); - -d1 = li_std_pair.d_inout(2); -assert(d1==4); - -[i,d2] = li_std_pair.d_inout2(2); -assert(all([i,d2]==[1,4])); - -[i,p] = li_std_pair.p_inout2(p); -assert(i==1&&all([cell2mat(p)]==[2,1])); -[p3,p4] = li_std_pair.p_inout3(p1,p1); -assert(all(cell2mat(p3)==[2,1])); -assert(all(cell2mat(p4)==[2,1])); - -psi = li_std_pair.SIPair("hello",1); -assert(psi=={"hello",1}); -pci = li_std_pair.CIPair(complex(1,2),1); -assert(pci.first==complex(1,2)&&pci.second==1); - - -psi = li_std_pair.SIPair("hi",1); -assert(psi.first=="hi"&&psi.second==1); - -psii = li_std_pair.SIIPair(psi,1); -assert(psii.first.first=="hi"); -assert(psii.first.second==1); -assert(psii.second==1); - -a = li_std_pair.A(); -b = li_std_pair.B(); - -pab = li_std_pair.ABPair(a,b); - -pab.first = a; -pab.first.val = 2; - -assert(pab.first.val == 2); - -pci = li_std_pair.CIntPair(1,0); -assert(pci.first==1&&pci.second==0); - -a = li_std_pair.A(5); -p1 = li_std_pair.pairP1(1,a); -p2 = li_std_pair.pairP2(a,1); -p3 = li_std_pair.pairP3(a,a); - -assert(a.val == li_std_pair.p_identa(p1){2}.val); - -p = li_std_pair.IntPair(1,10); -assert(p.first==1&&p.second==10); -p.first = 1; -assert(p.first==1); - -p = li_std_pair.paircA1(1,a); -assert(p.first==1); -assert(swig_this(p.second)==swig_this(a)); - -p = li_std_pair.paircA2(1,a); -assert(p.first==1); -assert(swig_this(p.second)==swig_this(a)); -#pp = li_std_pair.pairiiA(1,p); # conversion pb re const of pairA1/A2 -pp = li_std_pair.pairiiA(1,{1,A()}); - diff --git a/Examples/test-suite/octave/li_std_string.i b/Examples/test-suite/octave/li_std_string.i deleted file mode 100644 index 822d713c4..000000000 --- a/Examples/test-suite/octave/li_std_string.i +++ /dev/null @@ -1,55 +0,0 @@ -%module li_std_string - -%naturalvar A; - - -%include -%include - - -%inline %{ - -struct A : std::string -{ - A(const std::string& s) : std::string(s) - { - } -}; - -struct B -{ - B(const std::string& s) : cname(0), name(s), a(s) - { - } - - char *cname; - std::string name; - A a; - -}; - - -const char* test_ccvalue(const char* x) { - return x; -} - -char* test_cvalue(char* x) { - return x; -} - -std::basic_string test_value_basic1(std::basic_string x) { - return x; -} - -std::basic_string > test_value_basic2(std::basic_string > x) { - return x; -} - -std::basic_string,std::allocator > test_value_basic3(std::basic_string,std::allocator > x) { - return x; -} - -%} - -%include ../li_std_string.i - diff --git a/Examples/test-suite/octave/li_std_string_extra_runme.m b/Examples/test-suite/octave/li_std_string_extra_runme.m new file mode 100644 index 000000000..8d506af8a --- /dev/null +++ b/Examples/test-suite/octave/li_std_string_extra_runme.m @@ -0,0 +1,162 @@ +li_std_string_extra + +x="hello"; + + + +if (li_std_string_extra.test_ccvalue(x) != x) + error("bad string mapping") +endif + +if (li_std_string_extra.test_cvalue(x) != x) + error("bad string mapping") +endif + +if (li_std_string_extra.test_value(x) != x) + error("bad string mapping: %s, %s", x, li_std_string_extra.test_value(x)) +endif + +if (li_std_string_extra.test_const_reference(x) != x) + error("bad string mapping") +endif + + +s = li_std_string_extra.string("he"); +#s += "ll" +#s.append("ll") +s = s + "llo"; + +if (s != x) + error("bad string mapping: %s, %s", s, x); +endif + +#if (s(1:4) != x(1:4)) +# error("bad string mapping") +#endif + +if (li_std_string_extra.test_value(s) != x) + error("bad string mapping") +endif + +if (li_std_string_extra.test_const_reference(s) != x) + error("bad string mapping") +endif + +a = li_std_string_extra.A(s); + +if (li_std_string_extra.test_value(a) != x) + error("bad string mapping") +endif + +if (li_std_string_extra.test_const_reference(a) != x) + error("bad string mapping") +endif + +b = li_std_string_extra.string(" world"); + +s = a + b; +if (a + b != "hello world") + error("bad string mapping: %s", a + b) +endif + +if (a + " world" != "hello world") + error("bad string mapping") +endif + +#if ("hello" + b != "hello world") +# error("bad string mapping") +#endif + +c = (li_std_string_extra.string("hello") + b); +if (c.find_last_of("l") != 9) + error("bad string mapping") +endif + +s = "hello world"; + +b = li_std_string_extra.B("hi"); + +b.name = li_std_string_extra.string("hello"); +if (b.name != "hello") + error("bad string mapping") +endif + + +b.a = li_std_string_extra.A("hello"); +if (b.a != "hello") + error("bad string mapping") +endif + + +if (li_std_string_extra.test_value_basic1(x) != x) + error("bad string mapping") +endif + +if (li_std_string_extra.test_value_basic2(x) != x) + error("bad string mapping") +endif + + +if (li_std_string_extra.test_value_basic3(x) != x) + error("bad string mapping") +endif + +# Global variables +s = "initial string"; +if (li_std_string_extra.cvar.GlobalString2 != "global string 2") + error("GlobalString2 test 1") +endif +li_std_string_extra.cvar.GlobalString2 = s; +if (li_std_string_extra.cvar.GlobalString2 != s) + error("GlobalString2 test 2") +endif +if (li_std_string_extra.cvar.ConstGlobalString != "const global string") + error("ConstGlobalString test") +endif + +# Member variables +myStructure = li_std_string_extra.Structure(); +if (myStructure.MemberString2 != "member string 2") + error("MemberString2 test 1") +endif +myStructure.MemberString2 = s; +if (myStructure.MemberString2 != s) + error("MemberString2 test 2") +endif +if (myStructure.ConstMemberString != "const member string") + error("ConstMemberString test") +endif + +if (li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2") + error("StaticMemberString2 test 1") +endif +li_std_string_extra.cvar.Structure_StaticMemberString2 = s; +if (li_std_string_extra.cvar.Structure_StaticMemberString2 != s) + error("StaticMemberString2 test 2") +endif +if (li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string") + error("ConstStaticMemberString test") +endif + + +if (li_std_string_extra.test_reference_input("hello") != "hello") + error +endif +s = li_std_string_extra.test_reference_inout("hello"); +if (s != "hellohello") + error +endif + + +if (li_std_string_extra.stdstring_empty() != "") + error +endif + + +if (li_std_string_extra.c_empty() != "") + error +endif + +#if (li_std_string_extra.c_null() != None) +# error +#endif diff --git a/Examples/test-suite/octave/li_std_string_runme.m b/Examples/test-suite/octave/li_std_string_runme.m deleted file mode 100644 index fa0e260e0..000000000 --- a/Examples/test-suite/octave/li_std_string_runme.m +++ /dev/null @@ -1,162 +0,0 @@ -li_std_string - -x="hello"; - - - -if (li_std_string.test_ccvalue(x) != x) - error("bad string mapping") -endif - -if (li_std_string.test_cvalue(x) != x) - error("bad string mapping") -endif - -if (li_std_string.test_value(x) != x) - error("bad string mapping: %s, %s", x, li_std_string.test_value(x)) -endif - -if (li_std_string.test_const_reference(x) != x) - error("bad string mapping") -endif - - -s = li_std_string.string("he"); -#s += "ll" -#s.append('o') -s = s + "llo"; - -if (s != x) - error("bad string mapping: %s, %s", s, x); -endif - -if (s[1:4] != x[1:4]) - error("bad string mapping") -endif - -if (li_std_string.test_value(s) != x) - error("bad string mapping") -endif - -if (li_std_string.test_const_reference(s) != x) - error("bad string mapping") -endif - -a = li_std_string.A(s); - -if (li_std_string.test_value(a) != x) - error("bad string mapping") -endif - -if (li_std_string.test_const_reference(a) != x) - error("bad string mapping") -endif - -b = li_std_string.string(" world"); - -s = a + b; -if (a + b != "hello world") - error("bad string mapping: %s", a + b) -endif - -if (a + " world" != "hello world") - error("bad string mapping") -endif - -if ("hello" + b != "hello world") - error("bad string mapping") -endif - -c = ("hello" + b) -if (c.find_last_of("l") != 9) - error("bad string mapping") -endif - -s = "hello world"; - -b = li_std_string.B("hi"); - -b.name = li_std_string.string("hello"); -if (b.name != "hello") - error("bad string mapping") -endif - - -b.a = li_std_string.A("hello"); -if (b.a != "hello") - error("bad string mapping") -endif - - -if (li_std_string.test_value_basic1(x) != x) - error("bad string mapping") -endif - -if (li_std_string.test_value_basic2(x) != x) - error("bad string mapping") -endif - - -if (li_std_string.test_value_basic3(x) != x) - error("bad string mapping") -endif - -# Global variables -s = "initial string"; -if (li_std_string.cvar.GlobalString2 != "global string 2") - error("GlobalString2 test 1") -endif -li_std_string.cvar.GlobalString2 = s; -if (li_std_string.cvar.GlobalString2 != s) - error("GlobalString2 test 2") -endif -if (li_std_string.cvar.ConstGlobalString != "const global string") - error("ConstGlobalString test") -endif - -# Member variables -myStructure = li_std_string.Structure(); -if (myStructure.MemberString2 != "member string 2") - error("MemberString2 test 1") -endif -myStructure.MemberString2 = s; -if (myStructure.MemberString2 != s) - error("MemberString2 test 2") -endif -if (myStructure.ConstMemberString != "const member string") - error("ConstMemberString test") -endif - -if (li_std_string.cvar.Structure_StaticMemberString2 != "static member string 2") - error("StaticMemberString2 test 1") -endif -li_std_string.cvar.Structure_StaticMemberString2 = s; -if (li_std_string.cvar.Structure_StaticMemberString2 != s) - error("StaticMemberString2 test 2") -endif -if (li_std_string.cvar.Structure_ConstStaticMemberString != "const static member string") - error("ConstStaticMemberString test") -endif - - -if (li_std_string.test_reference_input("hello") != "hello") - error -endif -s = li_std_string.test_reference_inout("hello"); -if (s != "hellohello") - error -endif - - -if (li_std_string.stdstring_empty() != "") - error -endif - - -if (li_std_string.c_empty() != "") - error -endif - -if (li_std_string.c_null() != None) - error -endif diff --git a/Examples/test-suite/octave/cell_deref_runme.m b/Examples/test-suite/octave/octave_cell_deref_runme.m similarity index 85% rename from Examples/test-suite/octave/cell_deref_runme.m rename to Examples/test-suite/octave/octave_cell_deref_runme.m index 1c370fe85..5a98c0a3b 100644 --- a/Examples/test-suite/octave/cell_deref_runme.m +++ b/Examples/test-suite/octave/octave_cell_deref_runme.m @@ -1,4 +1,4 @@ -cell_deref; +octave_cell_deref; assert(func("hello")); assert(func({"hello"})); diff --git a/Examples/test-suite/octave/cell_deref.i b/Examples/test-suite/octave_cell_deref.i similarity index 86% rename from Examples/test-suite/octave/cell_deref.i rename to Examples/test-suite/octave_cell_deref.i index fddcd80ec..2e92ec4de 100644 --- a/Examples/test-suite/octave/cell_deref.i +++ b/Examples/test-suite/octave_cell_deref.i @@ -1,4 +1,4 @@ -%module cell_deref +%module octave_cell_deref %inline { bool func(const char* s) { diff --git a/Examples/test-suite/operator_overload.i b/Examples/test-suite/operator_overload.i index b2748f9b4..b62bf5179 100644 --- a/Examples/test-suite/operator_overload.i +++ b/Examples/test-suite/operator_overload.i @@ -71,6 +71,12 @@ see bottom for a set of possible tests %rename(OrOperator) operator ||; #endif +#ifdef SWIG_ALLEGRO_CL +%{ +#include +%} +#endif + %rename(IntCast) operator int(); %rename(DoubleCast) operator double(); diff --git a/Examples/test-suite/operbool.i b/Examples/test-suite/operbool.i new file mode 100644 index 000000000..793c0174e --- /dev/null +++ b/Examples/test-suite/operbool.i @@ -0,0 +1,12 @@ +%module operbool + +%rename(operbool) operator bool(); + +%inline %{ + class Test { + public: + operator bool() { + return false; + } + }; +%} diff --git a/Examples/test-suite/packageoption.h b/Examples/test-suite/packageoption.h index a7ef499aa..82f29d1c7 100644 --- a/Examples/test-suite/packageoption.h +++ b/Examples/test-suite/packageoption.h @@ -1,5 +1,6 @@ -class A -{ - public: - int testInt() { return 2;} +struct Base { + virtual int vmethod() { return 1; } + int basemethod() { return 1; } + virtual ~Base() {} }; + diff --git a/Examples/test-suite/packageoption.list b/Examples/test-suite/packageoption.list index 4bdabeccf..da125c2a3 100644 --- a/Examples/test-suite/packageoption.list +++ b/Examples/test-suite/packageoption.list @@ -1,2 +1,3 @@ packageoption_a packageoption_b +packageoption_c diff --git a/Examples/test-suite/packageoption_a.i b/Examples/test-suite/packageoption_a.i index e95091b0d..b28278282 100644 --- a/Examples/test-suite/packageoption_a.i +++ b/Examples/test-suite/packageoption_a.i @@ -1,4 +1,4 @@ -%module(package="C") "packageoption_a"; +%module(package="CommonPackage") "packageoption_a"; %inline %{ class A @@ -6,5 +6,11 @@ class A public: int testInt() { return 2;} }; - %} + +%{ +#include "packageoption.h" +%} + +%include "packageoption.h" + diff --git a/Examples/test-suite/packageoption_b.i b/Examples/test-suite/packageoption_b.i index 466853cc0..40a44be14 100644 --- a/Examples/test-suite/packageoption_b.i +++ b/Examples/test-suite/packageoption_b.i @@ -1,4 +1,4 @@ -%module(package="C") "packageoption_b"; +%module(package="CommonPackage") "packageoption_b"; %inline %{ class B diff --git a/Examples/test-suite/packageoption_c.i b/Examples/test-suite/packageoption_c.i new file mode 100644 index 000000000..f43e47002 --- /dev/null +++ b/Examples/test-suite/packageoption_c.i @@ -0,0 +1,13 @@ +%module(package="PackageC") "packageoption_c"; + +%import "packageoption_a.i" + +%inline %{ +#include "packageoption.h" + +struct Derived : Base { + virtual int vmethod() { return 2; } + virtual ~Derived() {} +}; + +%} diff --git a/Examples/test-suite/perl5/char_strings_runme.pl b/Examples/test-suite/perl5/char_strings_runme.pl index 51c227bb9..c4573737e 100644 --- a/Examples/test-suite/perl5/char_strings_runme.pl +++ b/Examples/test-suite/perl5/char_strings_runme.pl @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 5; BEGIN { use_ok('char_strings') } require_ok('char_strings'); @@ -10,3 +10,6 @@ is(char_strings::CharPingPong($val1), "100", 'cstr1'); my $val2 = "greetings"; is(char_strings::CharPingPong($val2), "greetings", 'cstr2'); +# SF#2564192 +"this is a test" =~ /(\w+)$/; +is(char_strings::CharPingPong($1), "test", "handles Magical"); diff --git a/Examples/test-suite/perl5/li_typemaps_runme.pl b/Examples/test-suite/perl5/li_typemaps_runme.pl index c149284ae..c182cdbb1 100644 --- a/Examples/test-suite/perl5/li_typemaps_runme.pl +++ b/Examples/test-suite/perl5/li_typemaps_runme.pl @@ -37,24 +37,29 @@ batch('ulong', 0, 1, 12, 0xffffffff); batch('uchar', 0, 1, 12, 0xff); batch('schar', -0x80, 0, 1, 12, 0x7f); -# IEEE 754 machine, please! -batch('float', - -(2 - 2 ** -23) * 2 ** 127, - -1, -2 ** -149, 0, 2 ** -149, 1, - (2 - 2 ** -23) * 2 ** 127, - 'nan'); -{ local $TODO = "shouldn't some Inf <=> float work?"; - # I'm going to guess that it could work reasonably as - # NV Inf => float Inf - # float Inf => NV NaN - # but this needs some thought. - batch('float', 'inf'); +{ + use Math::BigInt qw(); + # the pack dance is to get plain old NVs out of the + # Math::BigInt objects. + my $inf = unpack 'd', pack 'd', Math::BigInt->binf(); + my $nan = unpack 'd', pack 'd', Math::BigInt->bnan(); + batch('float', + -(2 - 2 ** -23) * 2 ** 127, + -1, -2 ** -149, 0, 2 ** -149, 1, + (2 - 2 ** -23) * 2 ** 127, + $nan); + { local $TODO = "float typemaps don't pass infinity"; + # it seems as though SWIG is unwilling to pass infinity around + # because that value always fails bounds checking. I think that + # is a bug. + batch('float', $inf); + } + batch('double', + -(2 - 2 ** -53) ** 1023, + -1, -2 ** -1074, 0, 2 ** 1074, + (2 - 2 ** -53) ** 1023, + $nan, $inf); } -batch('double', - -(2 - 2 ** -53) ** 1023, - -1, -2 ** -1074, 0, 2 ** 1074, - (2 - 2 ** -53) ** 1023, - 'nan', 'inf'); batch('longlong', -1, 0, 1, 12); batch('ulonglong', 0, 1, 12); SKIP: { diff --git a/Examples/test-suite/perl5/packageoption_runme.pl b/Examples/test-suite/perl5/packageoption_runme.pl index debea78e1..d94a7a1fd 100644 --- a/Examples/test-suite/perl5/packageoption_runme.pl +++ b/Examples/test-suite/perl5/packageoption_runme.pl @@ -14,11 +14,11 @@ sub ok_not ($;$) { ok($test, $name); } -my $a = C::A->new(); +my $a = CommonPackage::A->new(); -isa_ok($a, 'C::A'); +isa_ok($a, 'CommonPackage::A'); -my $b = C::B->new(); +my $b = CommonPackage::B->new(); -isa_ok($b, 'C::B'); +isa_ok($b, 'CommonPackage::B'); diff --git a/Examples/test-suite/php4/Makefile.in b/Examples/test-suite/php/Makefile.in similarity index 69% rename from Examples/test-suite/php4/Makefile.in rename to Examples/test-suite/php/Makefile.in index 2e14ef9a2..b8aeaaa11 100644 --- a/Examples/test-suite/php4/Makefile.in +++ b/Examples/test-suite/php/Makefile.in @@ -1,13 +1,16 @@ ####################################################################### -# Makefile for php4 test-suite +# Makefile for php test-suite ####################################################################### -LANGUAGE = php4 -SCRIPTSUFFIX = _runme.php4 +LANGUAGE = php +SCRIPTSUFFIX = _runme.php srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +#CPP_TEST_CASES += \ +# php_namewarn_rename \ + include $(srcdir)/../common.mk # Overridden variables here @@ -22,19 +25,19 @@ makectests: @bash -ec 'for test in $(C_TEST_CASES) ; do $($(MAKE)) clean && $(MAKE) $${test}.cpptest; done' runcpptests: - @bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done' + @bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done' runctests: - @bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done' + @bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done' runtests: runcpptests runctests -# write out tests without a _runme.php4 +# write out tests without a _runme.php missingcpptests: - @bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done' + @bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done' missingctests: - @bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done' + @bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done' missingtests: missingcpptests missingctests @@ -55,10 +58,10 @@ missingtests: missingcpptests missingctests +$(run_testcase) # Runs the testcase. A testcase is only run if -# a file is found which has _runme.php4 appended after the testcase name. +# a file is found which has _runme.php appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ - $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \ + $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run;) \ fi; # Clean: remove the generated .php file @@ -66,4 +69,4 @@ run_testcase = \ @rm -f $*.php; clean: - $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php4_clean + $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php_clean diff --git a/Examples/test-suite/php4/abstract_inherit_ok_runme.php4 b/Examples/test-suite/php/abstract_inherit_ok_runme.php similarity index 88% rename from Examples/test-suite/php4/abstract_inherit_ok_runme.php4 rename to Examples/test-suite/php/abstract_inherit_ok_runme.php index 1182e4cec..c2d86499b 100644 --- a/Examples/test-suite/php4/abstract_inherit_ok_runme.php4 +++ b/Examples/test-suite/php/abstract_inherit_ok_runme.php @@ -1,6 +1,6 @@ diff --git a/Examples/test-suite/php4/arrays_global_twodim_runme.php4 b/Examples/test-suite/php/arrays_global_twodim_runme.php similarity index 97% rename from Examples/test-suite/php4/arrays_global_twodim_runme.php4 rename to Examples/test-suite/php/arrays_global_twodim_runme.php index 352ad2568..d9b62de0d 100644 --- a/Examples/test-suite/php4/arrays_global_twodim_runme.php4 +++ b/Examples/test-suite/php/arrays_global_twodim_runme.php @@ -1,7 +1,7 @@ /dev/null 2>&1 + + # Runs the testcase. A testcase is only run if -# a file is found which has _runme.py appended after the testcase name. +# a file is found which has _runme.py (or _runme3.py for Python 3) appended after the testcase name. + +run_python = env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) + +py2_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY2SCRIPTSUFFIX) +py3_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY3SCRIPTSUFFIX) + +ifeq (,$(PY3)) run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \ + $(run_python);)\ fi; +else +run_testcase = \ + if [ -f $(py2_runme) ]; then ( \ + $(MAKE) -f $(srcdir)/Makefile $(py3_runme) && \ + $(run_python);) \ + elif [ -f $(py3_runme) ]; then ( \ + $(run_python);) \ + fi; +endif # Clean: remove the generated .py file %.clean: @rm -f hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py @rm -f $*.py; + @#We only remove the _runme3.py if it is generated by 2to3 from a _runme.py. + @if [ -f $(py2_runme) ]; then (rm -f $(py3_runme) $(py3_runme).bak;) fi; clean: $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile python_clean @@ -101,14 +153,15 @@ cvsignore: @echo clientdata_prop_b.py @echo imports_a.py @echo imports_b.py - @echo mod_a.py mod_b.py + @echo mod_a.py mod_b.py @echo hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py @echo template_typedef_import.py +hugemod_runme = hugemod$(SCRIPTPREFIX) hugemod: - perl hugemod.pl + perl hugemod.pl $(hugemod_runme) $(MAKE) hugemod_a.cpptest $(MAKE) hugemod_b.cpptest - time $(PYTHON) hugemod_runme.py - time $(PYTHON) hugemod_runme.py + sh -c "time $(PYTHON) $(hugemod_runme)" + sh -c "time $(PYTHON) $(hugemod_runme)" diff --git a/Examples/test-suite/python/README b/Examples/test-suite/python/README index b86ec5289..71db759b5 100644 --- a/Examples/test-suite/python/README +++ b/Examples/test-suite/python/README @@ -1,4 +1,8 @@ See ../README for common README file. -Any testcases which have _runme.py appended after the testcase name will be detected and run. +Any testcases which have _runme.py (or _runme3.py for Python 3) appended after the testcase name will be detected and run. +If you intend to write a testcase for both Python 2.x and 3.x, do *not* directly put the _runme3.py in this directory. Just write Python 2.x's _runme.py testcase and it will be automatically converted to Python 3 code during test. + +You can run make with PY3=y to run test case with Python 3.x, eg. + $ make voidtest.cpptest PY3=y diff --git a/Examples/test-suite/python/contract_runme.py b/Examples/test-suite/python/contract_runme.py index 9ded5bb5b..905bf1196 100644 --- a/Examples/test-suite/python/contract_runme.py +++ b/Examples/test-suite/python/contract_runme.py @@ -133,3 +133,11 @@ try: except: pass +#Namespace +my = contract.myClass(1) +try: + my = contract.myClass(0) + print "Failed! constructor preassertion" +except: + pass + diff --git a/Examples/test-suite/python/cpp_namespace_runme.py b/Examples/test-suite/python/cpp_namespace_runme.py index 3108b4f47..a454774f5 100644 --- a/Examples/test-suite/python/cpp_namespace_runme.py +++ b/Examples/test-suite/python/cpp_namespace_runme.py @@ -3,20 +3,20 @@ import cpp_namespace n = cpp_namespace.fact(4) if n != 24: - raise "Bad return value!" + raise RuntimeError("Bad return value!") if cpp_namespace.cvar.Foo != 42: - raise "Bad variable value!" + raise RuntimeError("Bad variable value!") t = cpp_namespace.Test() if t.method() != "Test::method": - raise "Bad method return value!" + raise RuntimeError("Bad method return value!") if cpp_namespace.do_method(t) != "Test::method": - raise "Bad return value!" + raise RuntimeError("Bad return value!") if cpp_namespace.do_method2(t) != "Test::method": - raise "Bad return value!" + raise RuntimeError("Bad return value!") cpp_namespace.weird("hello", 4) @@ -28,18 +28,18 @@ t4 = cpp_namespace.Test4() t5 = cpp_namespace.Test5() if cpp_namespace.foo3(42) != 42: - raise "Bad return value!" + raise RuntimeError("Bad return value!") if cpp_namespace.do_method3(t2,40) != "Test2::method": - raise "Bad return value!" + raise RuntimeError("Bad return value!") if cpp_namespace.do_method3(t3,40) != "Test3::method": - raise "Bad return value!" + raise RuntimeError("Bad return value!") if cpp_namespace.do_method3(t4,40) != "Test4::method": - raise "Bad return value!" + raise RuntimeError("Bad return value!") if cpp_namespace.do_method3(t5,40) != "Test5::method": - raise "Bad return value!" + raise RuntimeError("Bad return value!") diff --git a/Examples/test-suite/python/cpp_static_runme.py b/Examples/test-suite/python/cpp_static_runme.py new file mode 100644 index 000000000..ef8623359 --- /dev/null +++ b/Examples/test-suite/python/cpp_static_runme.py @@ -0,0 +1,7 @@ +#!/usr/bin/evn python +from cpp_static import * +StaticFunctionTest.static_func() +StaticFunctionTest.static_func_2(1) +StaticFunctionTest.static_func_3(1,2) +StaticMemberTest.static_int = 10 +assert StaticMemberTest.static_int == 10 diff --git a/Examples/test-suite/python/director_classic_runme.py b/Examples/test-suite/python/director_classic_runme.py index 878905679..7e18a9a61 100644 --- a/Examples/test-suite/python/director_classic_runme.py +++ b/Examples/test-suite/python/director_classic_runme.py @@ -1,56 +1,56 @@ from director_classic import * class TargetLangPerson(Person): - def __init__(self): - Person.__init__(self) - def id(self): - identifier = "TargetLangPerson" - return identifier + def __init__(self): + Person.__init__(self) + def id(self): + identifier = "TargetLangPerson" + return identifier class TargetLangChild(Child): - def __init__(self): - Child.__init__(self) - def id(self): - identifier = "TargetLangChild" - return identifier + def __init__(self): + Child.__init__(self) + def id(self): + identifier = "TargetLangChild" + return identifier class TargetLangGrandChild(GrandChild): - def __init__(self): - GrandChild.__init__(self) - def id(self): - identifier = "TargetLangGrandChild" - return identifier + def __init__(self): + GrandChild.__init__(self) + def id(self): + identifier = "TargetLangGrandChild" + return identifier # Semis - don't override id() in target language class TargetLangSemiPerson(Person): - def __init__(self): - Person.__init__(self) + def __init__(self): + Person.__init__(self) # No id() override class TargetLangSemiChild(Child): - def __init__(self): - Child.__init__(self) + def __init__(self): + Child.__init__(self) # No id() override class TargetLangSemiGrandChild(GrandChild): - def __init__(self): - GrandChild.__init__(self) + def __init__(self): + GrandChild.__init__(self) # No id() override # Orphans - don't override id() in C++ class TargetLangOrphanPerson(OrphanPerson): - def __init__(self): - OrphanPerson.__init__(self) - def id(self): - identifier = "TargetLangOrphanPerson" - return identifier + def __init__(self): + OrphanPerson.__init__(self) + def id(self): + identifier = "TargetLangOrphanPerson" + return identifier class TargetLangOrphanChild(OrphanChild): - def __init__(self): - Child.__init__(self) - def id(self): - identifier = "TargetLangOrphanChild" - return identifier + def __init__(self): + Child.__init__(self) + def id(self): + identifier = "TargetLangOrphanChild" + return identifier def check(person, expected): @@ -61,7 +61,7 @@ def check(person, expected): if (debug): print(ret) if (ret != expected): - raise ("Failed. Received: " + ret + " Expected: " + expected) + raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected) # Polymorphic call from C++ caller = Caller() @@ -70,7 +70,7 @@ def check(person, expected): if (debug): print(ret) if (ret != expected): - raise ("Failed. Received: " + ret + " Expected: " + expected) + raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected) # Polymorphic call of object created in target language and passed to C++ and back again baseclass = caller.baseClass() @@ -78,7 +78,7 @@ def check(person, expected): if (debug): print(ret) if (ret != expected): - raise ("Failed. Received: " + ret + " Expected: " + expected) + raise RuntimeError("Failed. Received: " + str(ret)+ " Expected: " + expected) caller.resetCallback() if (debug): diff --git a/Examples/test-suite/python/director_exception_runme.py b/Examples/test-suite/python/director_exception_runme.py index 7c9e69250..ef7a044f1 100644 --- a/Examples/test-suite/python/director_exception_runme.py +++ b/Examples/test-suite/python/director_exception_runme.py @@ -1,5 +1,8 @@ from director_exception import * -from exceptions import * + +class MyException(Exception): + def __init__(self, a, b): + self.msg = a + b class MyFoo(Foo): def ping(self): @@ -7,39 +10,62 @@ class MyFoo(Foo): class MyFoo2(Foo): def ping(self): - return true + return True pass # error: should return a string -ok = 0 +class MyFoo3(Foo): + def ping(self): + raise MyException("foo", "bar") +# Check that the NotImplementedError raised by MyFoo.ping() is returned by +# MyFoo.pong(). +ok = 0 a = MyFoo() b = launder(a) - try: b.pong() except NotImplementedError, e: - ok = 1 + if str(e) == "MyFoo::ping() EXCEPTION": + ok = 1 + else: + print "Unexpected error message: %s" % str(e) except: pass - if not ok: raise RuntimeError -ok = 0 +# Check that the director returns the appropriate TypeError if the return type +# is wrong. +ok = 0 a = MyFoo2() b = launder(a) - try: b.pong() -except: - ok = 1 - - +except TypeError, e: + if str(e) == "Swig director type mismatch in output value of type 'std::string'": + ok = 1 + else: + print "Unexpected error message: %s" % str(e) if not ok: raise RuntimeError +# Check that the director can return an exception which requires two arguments +# to the constructor, without mangling it. +ok = 0 +a = MyFoo3() +b = launder(a) +try: + b.pong() +except MyException, e: + if e.msg == 'foobar': + ok = 1 + else: + print "Unexpected error message: %s" % str(e) +if not ok: + raise RuntimeError + try: raise Exception2() except Exception2: diff --git a/Examples/test-suite/python/director_thread_runme.py b/Examples/test-suite/python/director_thread_runme.py index e66817e17..15a12ab80 100644 --- a/Examples/test-suite/python/director_thread_runme.py +++ b/Examples/test-suite/python/director_thread_runme.py @@ -14,3 +14,5 @@ d.run() if d.val >= 0: print d.val raise RuntimeError + +d.stop() diff --git a/Examples/test-suite/python/file_test_runme.py b/Examples/test-suite/python/file_test_runme.py index 64154c619..de4e2669e 100644 --- a/Examples/test-suite/python/file_test_runme.py +++ b/Examples/test-suite/python/file_test_runme.py @@ -1,7 +1,8 @@ import sys import file_test -file_test.nfile(sys.stdout) +if sys.version_info < (3,0): + file_test.nfile(sys.stdout) cstdout = file_test.GetStdOut() diff --git a/Examples/test-suite/python/hugemod.pl b/Examples/test-suite/python/hugemod.pl index 15c4ce41b..5420926e4 100644 --- a/Examples/test-suite/python/hugemod.pl +++ b/Examples/test-suite/python/hugemod.pl @@ -2,8 +2,12 @@ use strict; +my $modsize = 399; #adjust it so you can have a smaller or bigger hugemod + +my $runme = shift @ARGV; + open HEADER, ">hugemod.h" or die "error"; -open TEST, ">hugemod_runme.py" or die "error"; +open TEST, ">$runme" or die "error"; open I1, ">hugemod_a.i" or die "error"; open I2, ">hugemod_b.i" or die "error"; @@ -21,7 +25,7 @@ print I2 "\%inline \%{\n"; my $i; -for ($i = 0; $i < 6000; $i++) { +for ($i = 0; $i < $modsize; $i++) { my $t = $i * 4; print HEADER "class type$i { public: int a; };\n"; print I2 "class dtype$i : public type$i { public: int b; };\n"; diff --git a/Examples/test-suite/python/iadd.i b/Examples/test-suite/python/iadd.i deleted file mode 100644 index 76604c027..000000000 --- a/Examples/test-suite/python/iadd.i +++ /dev/null @@ -1,12 +0,0 @@ -%module iadd - -%include attribute.i -%{ -#include "iadd.h" -%} -class Foo; -%attribute_ref(test::Foo, test::A& , AsA); -%attribute_ref(test::Foo, long, AsLong); - - -%include "iadd.h" diff --git a/Examples/test-suite/python/implicittest.i b/Examples/test-suite/python/implicittest.i deleted file mode 100644 index 91205aafa..000000000 --- a/Examples/test-suite/python/implicittest.i +++ /dev/null @@ -1,68 +0,0 @@ -%module(naturalvar="1") implicittest - -%implicitconv; - -%inline -{ - struct B { }; -} - -%inline -{ - struct A - { - int ii; - A(int i) { ii = 1; } - A(double d) { ii = 2; } - A(const B& b) { ii = 3; } - explicit A(char *s) { ii = 4; } - - int get() const { return ii; } - - }; - - int get(const A& a) { return a.ii; } - - template - struct A_T - { - int ii; - A_T(int i) { ii = 1; } - A_T(double d) { ii = 2; } - A_T(const B& b) { ii = 3; } - explicit A_T(char *s) { ii = 4; } - - int get() const { return ii; } - - }; -} - -%inline -{ - struct Foo - { - int ii; - Foo(){ ii = 0;} - Foo(int){ ii = 1;} - Foo(double){ ii = 2;} - explicit Foo(char *s){ii = 3;} - Foo(const Foo& f){ ii = f.ii;} - - }; - - struct Bar - { - int ii; - Foo f; - Bar() {ii = -1;} - Bar(const Foo& ff){ ii = ff.ii;} - }; - - - int get_b(const Bar&b) { return b.ii; } - - Foo foo; - -} - -%template(A_int) A_T; diff --git a/Examples/test-suite/python/li_attribute_runme.py b/Examples/test-suite/python/li_attribute_runme.py index 5eeec299b..db40b9b2a 100644 --- a/Examples/test-suite/python/li_attribute_runme.py +++ b/Examples/test-suite/python/li_attribute_runme.py @@ -1,3 +1,5 @@ +# Ported to C# li_attribute_runme.cs + import li_attribute aa = li_attribute.A(1,2,3) @@ -9,7 +11,6 @@ if aa.a != 3: print aa.a raise RuntimeError - if aa.b != 2: print aa.b raise RuntimeError @@ -17,8 +18,6 @@ aa.b = 5 if aa.b != 5: raise RuntimeError - - if aa.d != aa.b: raise RuntimeError @@ -36,17 +35,40 @@ pi.value=3 if pi.value != 3: raise RuntimeError - b = li_attribute.B(aa) if b.a.c != 3: raise RuntimeError - -myFoo = li_attribute.MyFoo +# class/struct attribute with get/set methods using return/pass by reference +myFoo = li_attribute.MyFoo() myFoo.x = 8 -myClass = li_attribute.MyClass +myClass = li_attribute.MyClass() myClass.Foo = myFoo if myClass.Foo.x != 8: raise RuntimeError +# class/struct attribute with get/set methods using return/pass by value +myClassVal = li_attribute.MyClassVal() +if myClassVal.ReadWriteFoo.x != -1: + raise RuntimeError +if myClassVal.ReadOnlyFoo.x != -1: + raise RuntimeError +myClassVal.ReadWriteFoo = myFoo +if myClassVal.ReadWriteFoo.x != 8: + raise RuntimeError +if myClassVal.ReadOnlyFoo.x != 8: + raise RuntimeError + +# string attribute with get/set methods using return/pass by value +myStringyClass = li_attribute.MyStringyClass("initial string") +if myStringyClass.ReadWriteString != "initial string": + raise RuntimeError +if myStringyClass.ReadOnlyString != "initial string": + raise RuntimeError +myStringyClass.ReadWriteString = "changed string" +if myStringyClass.ReadWriteString != "changed string": + raise RuntimeError +if myStringyClass.ReadOnlyString != "changed string": + raise RuntimeError + diff --git a/Examples/test-suite/python/li_boost_shared_ptr_runme.py b/Examples/test-suite/python/li_boost_shared_ptr_runme.py index 5f6cbd211..f967def14 100644 --- a/Examples/test-suite/python/li_boost_shared_ptr_runme.py +++ b/Examples/test-suite/python/li_boost_shared_ptr_runme.py @@ -304,6 +304,15 @@ class li_boost_shared_ptr_runme: self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr") self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref") + # 3rd derived class + k = li_boost_shared_ptr.Klass3rdDerived("me oh my") + val = k.getValue() + self.verifyValue("me oh my-3rdDerived", val) + self.verifyCount(1, k) + val = li_boost_shared_ptr.test3rdupcast(k) + self.verifyValue("me oh my-3rdDerived", val) + self.verifyCount(1, k) + # //////////////////////////////// Member variables //////////////////////////////////////// # smart pointer by value m = li_boost_shared_ptr.MemberVariables() diff --git a/Examples/test-suite/python/li_std_map.i b/Examples/test-suite/python/li_std_map.i deleted file mode 100644 index a8ba4f2e2..000000000 --- a/Examples/test-suite/python/li_std_map.i +++ /dev/null @@ -1,58 +0,0 @@ -%module("templatereduce") li_std_map - -%include std_pair.i -%include std_map.i -%include std_multimap.i - -%inline %{ -struct A{ - int val; - - A(int v = 0): val(v) - { - } - -}; -%} - -namespace std -{ - %template(pairii) pair; - %template(pairAA) pair; - %template(pairA) pair; - %template(mapA) map; - %template(mmapA) multimap; - - %template(paircA1) pair; - %template(paircA2) pair; - %template(pairiiA) pair >; - %template(pairiiAc) pair >; - - - %template() pair; - %template(pymap) map; - -} - - - -%inline -{ -std::pair -p_identa(std::pair p) { - return p; -} - -std::map m_identa(const std::map& v) -{ - return v; -} - -} - - - -namespace std -{ -%template(mapii) map; -} diff --git a/Examples/test-suite/python/li_std_pair.i b/Examples/test-suite/python/li_std_pair.i deleted file mode 100644 index 886bf1a4b..000000000 --- a/Examples/test-suite/python/li_std_pair.i +++ /dev/null @@ -1,210 +0,0 @@ -%module li_std_pair - -// -// activate the automatic comparison methods generation (==,!=,...) -// - -%{ -#include // for std::swap -%} - - -%include std_pair.i -%include std_string.i -%include std_complex.i - -%inline -%{ - struct A - { - int val; - - A(int v = 0): val(v) - { - } - - }; - struct B - { - }; -%} - -%std_comp_methods(std::pair); - -namespace std { - %template(CIntPair) pair; - %template() pair; - %template(ShortPair) pair; - - %template(IntPair) pair; - %extend pair - { - %template(pair) pair; - } - - - - %template(SIPair) pair; - %template(CIPair) pair, int>; - %template(SIIPair) pair, int>; - %template(AIntPair) pair; - - %template(CCIntPair) pair >; - - %template(ABPair) pair; - %template(IntAPair) pair; - - %template(pairP1) pair; - %template(pairP2) pair; - %template(pairP3) pair; - %template(pairP4) pair; - %template(pairP5) pair; - %template(pairP6) pair; - -} -%std_comp_methods(std::pair, int>); - -%apply std::pair *INOUT {std::pair *INOUT2}; - -%inline %{ - -/* Test the "out" typemap for pair */ -std::pair makeIntPair(int a, int b) { - return std::make_pair(a, b); -} - -/** - * There is no "out" typemap for a pointer to a pair, so - * this should return a wrapped instance of a std::pair - * instead of the native "array" type for the target language. - */ -std::pair * makeIntPairPtr(int a, int b) { - static std::pair p = std::make_pair(a, b); - return &p; -} - -/** - * There is no "out" typemap for a non-const reference to a pair, so - * this should return a wrapped instance of a std::pair instead of - * the native "array" type for the target language. - */ -std::pair& makeIntPairRef(int a, int b) { - static std::pair p = std::make_pair(a, b); - return p; -} - -/** - * There is no "out" typemap for a const reference to a pair, so - * this should return a wrapped instance of a std::pair - * instead of the native "array" type for the target language. - */ -const std::pair & makeIntPairConstRef(int a, int b) { - static std::pair p = std::make_pair(a, b); - return p; -} - -/* Test the "in" typemap for pair */ -int product1(std::pair p) { - return p.first*p.second; -} - -/* Test the "in" typemap for const pair& */ -int product2(const std::pair& p) { - return p.first*p.second; -} - -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - - -std::pair -p_identa(const std::pair& p) { - return p; -} - -void -d_inout(double *INOUT) { - *INOUT += *INOUT; -} - -void -d_inout(int *INOUT) { - *INOUT += *INOUT; -} - -int -d_inout2(double *INOUT) { - *INOUT += *INOUT; - return 1; -} - -void -p_inout(std::pair *INOUT) { - std::swap(INOUT->first, INOUT->second); -} - -int -p_inout2(std::pair *INOUT) { - std::swap(INOUT->first, INOUT->second); - return 1; -} - -void - p_inout3(std::pair *INOUT, std::pair *INOUT2) { - std::swap(*INOUT, *INOUT2); -} - -void -p_inoutd(std::pair *INOUT) { - std::swap(INOUT->first, INOUT->second); -} - -std::string - s_ident(const std::string& s) { - return s; -} - -#if 0 -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - -/* Test the "in" typemap for const pair* */ -std::pair - p_ident(std::pair p, const std::pair& q) { - return q; -} - -/* Test the "in" typemap for const pair* */ -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - - -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - - - -#endif -%} - - -namespace std -{ - %template(paircA1) pair; - %template(paircA2) pair; - %template(pairiiA) pair >; -} - diff --git a/Examples/test-suite/python/li_std_pair_extra_runme.py b/Examples/test-suite/python/li_std_pair_extra_runme.py new file mode 100644 index 000000000..dc6e31b76 --- /dev/null +++ b/Examples/test-suite/python/li_std_pair_extra_runme.py @@ -0,0 +1,59 @@ +import li_std_pair_extra + +p = (1,2) +p1 = li_std_pair_extra.p_inout(p) +p2 = li_std_pair_extra.p_inoutd(p1) + +d1 = li_std_pair_extra.d_inout(2) + +i,d2 = li_std_pair_extra.d_inout2(2) + +i,p = li_std_pair_extra.p_inout2(p) +p3,p4 = li_std_pair_extra.p_inout3(p1,p1) + +psi = li_std_pair_extra.SIPair("hello",1) +pci = li_std_pair_extra.CIPair(1,1) + + +#psi.first = "hi" + + +psi = li_std_pair_extra.SIPair("hi",1) +if psi != ("hi",1): + raise RuntimeError + +psii = li_std_pair_extra.SIIPair(psi,1) + +a = li_std_pair_extra.A() +b = li_std_pair_extra.B() + +pab = li_std_pair_extra.ABPair(a,b); + +pab.first = a +pab.first.val = 2 + +if pab.first.val != 2: + raise RuntimeError + + +pci = li_std_pair_extra.CIntPair(1,0) + +a = li_std_pair_extra.A(5) +p1 = li_std_pair_extra.pairP1(1,a.this) +p2 = li_std_pair_extra.pairP2(a,1) +p3 = li_std_pair_extra.pairP3(a,a) + + +if a.val != li_std_pair_extra.p_identa(p1.this)[1].val: + raise RuntimeError + +p = li_std_pair_extra.IntPair(1,10) +p.first = 1 + +p = li_std_pair_extra.paircA1(1,a) +p.first +p.second + +p = li_std_pair_extra.paircA2(1,a) +pp = li_std_pair_extra.pairiiA(1,p) + diff --git a/Examples/test-suite/python/li_std_pair_runme.py b/Examples/test-suite/python/li_std_pair_runme.py deleted file mode 100644 index b301f0d24..000000000 --- a/Examples/test-suite/python/li_std_pair_runme.py +++ /dev/null @@ -1,59 +0,0 @@ -import li_std_pair - -p = (1,2) -p1 = li_std_pair.p_inout(p) -p2 = li_std_pair.p_inoutd(p1) - -d1 = li_std_pair.d_inout(2) - -i,d2 = li_std_pair.d_inout2(2) - -i,p = li_std_pair.p_inout2(p) -p3,p4 = li_std_pair.p_inout3(p1,p1) - -psi = li_std_pair.SIPair("hello",1) -pci = li_std_pair.CIPair(1,1) - - -#psi.first = "hi" - - -psi = li_std_pair.SIPair("hi",1) -if psi != ("hi",1): - raise RuntimeError - -psii = li_std_pair.SIIPair(psi,1) - -a = li_std_pair.A() -b = li_std_pair.B() - -pab = li_std_pair.ABPair(a,b); - -pab.first = a -pab.first.val = 2 - -if pab.first.val != 2: - raise RuntimeError - - -pci = li_std_pair.CIntPair(1,0) - -a = li_std_pair.A(5) -p1 = li_std_pair.pairP1(1,a.this) -p2 = li_std_pair.pairP2(a,1) -p3 = li_std_pair.pairP3(a,a) - - -if a.val != li_std_pair.p_identa(p1.this)[1].val: - raise RuntimeError - -p = li_std_pair.IntPair(1,10) -p.first = 1 - -p = li_std_pair.paircA1(1,a) -p.first -p.second - -p = li_std_pair.paircA2(1,a) -pp = li_std_pair.pairiiA(1,p) - diff --git a/Examples/test-suite/python/li_std_set.i b/Examples/test-suite/python/li_std_set.i deleted file mode 100644 index f0fddb058..000000000 --- a/Examples/test-suite/python/li_std_set.i +++ /dev/null @@ -1,17 +0,0 @@ -%module li_std_set - -%include -%include -%include -%include - -%template(set_string) std::set; -%template(set_int) std::multiset; - - -%template(v_int) std::vector; - - - - -%template(pyset) std::set; diff --git a/Examples/test-suite/python/li_std_stream.i b/Examples/test-suite/python/li_std_stream.i deleted file mode 100644 index 0a999ddbf..000000000 --- a/Examples/test-suite/python/li_std_stream.i +++ /dev/null @@ -1,59 +0,0 @@ -%module li_std_stream - -%inline %{ - struct A; -%} - -%include -%include - - - -%callback(1) A::bar; - -%inline %{ - - struct B { - virtual ~B() - { - } - - }; - - struct A : B - { - void __add__(int a) - { - } - - void __add__(double a) - { - } - - static int bar(int a){ - return a; - } - - static int foo(int a, int (*pf)(int a)) - { - return pf(a); - } - - - std::ostream& __rlshift__(std::ostream& out) - { - out << "A class"; - return out; - } - }; -%} - -%extend std::basic_ostream{ - std::basic_ostream& - operator<<(const A& a) - { - *self << "A class"; - return *self; - } -} - diff --git a/Examples/test-suite/python/li_std_string_runme.py b/Examples/test-suite/python/li_std_string_extra_runme.py similarity index 54% rename from Examples/test-suite/python/li_std_string_runme.py rename to Examples/test-suite/python/li_std_string_extra_runme.py index c0dae1e25..cef5921b0 100644 --- a/Examples/test-suite/python/li_std_string_runme.py +++ b/Examples/test-suite/python/li_std_string_extra_runme.py @@ -1,24 +1,24 @@ -import li_std_string +import li_std_string_extra x="hello" -if li_std_string.test_ccvalue(x) != x: +if li_std_string_extra.test_ccvalue(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string.test_cvalue(x) != x: +if li_std_string_extra.test_cvalue(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string.test_value(x) != x: - print x, li_std_string.test_value(x) +if li_std_string_extra.test_value(x) != x: + print x, li_std_string_extra.test_value(x) raise RuntimeError, "bad string mapping" -if li_std_string.test_const_reference(x) != x: +if li_std_string_extra.test_const_reference(x) != x: raise RuntimeError, "bad string mapping" -s = li_std_string.string("he") +s = li_std_string_extra.string("he") #s += "ll" #s.append('o') s = s + "llo" @@ -30,21 +30,21 @@ if s != x: if s[1:4] != x[1:4]: raise RuntimeError, "bad string mapping" -if li_std_string.test_value(s) != x: +if li_std_string_extra.test_value(s) != x: raise RuntimeError, "bad string mapping" -if li_std_string.test_const_reference(s) != x: +if li_std_string_extra.test_const_reference(s) != x: raise RuntimeError, "bad string mapping" -a = li_std_string.A(s) +a = li_std_string_extra.A(s) -if li_std_string.test_value(a) != x: +if li_std_string_extra.test_value(a) != x: raise RuntimeError, "bad string mapping" -if li_std_string.test_const_reference(a) != x: +if li_std_string_extra.test_const_reference(a) != x: raise RuntimeError, "bad string mapping" -b = li_std_string.string(" world") +b = li_std_string_extra.string(" world") s = a + b if a + b != "hello world": @@ -63,40 +63,40 @@ if c.find_last_of("l") != 9: s = "hello world" -b = li_std_string.B("hi") +b = li_std_string_extra.B("hi") -b.name = li_std_string.string("hello") +b.name = li_std_string_extra.string("hello") if b.name != "hello": raise RuntimeError, "bad string mapping" -b.a = li_std_string.A("hello") +b.a = li_std_string_extra.A("hello") if b.a != "hello": raise RuntimeError, "bad string mapping" -if li_std_string.test_value_basic1(x) != x: +if li_std_string_extra.test_value_basic1(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string.test_value_basic2(x) != x: +if li_std_string_extra.test_value_basic2(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string.test_value_basic3(x) != x: +if li_std_string_extra.test_value_basic3(x) != x: raise RuntimeError, "bad string mapping" # Global variables s = "initial string" -if li_std_string.cvar.GlobalString2 != "global string 2": +if li_std_string_extra.cvar.GlobalString2 != "global string 2": raise RuntimeError, "GlobalString2 test 1" -li_std_string.cvar.GlobalString2 = s -if li_std_string.cvar.GlobalString2 != s: +li_std_string_extra.cvar.GlobalString2 = s +if li_std_string_extra.cvar.GlobalString2 != s: raise RuntimeError, "GlobalString2 test 2" -if li_std_string.cvar.ConstGlobalString != "const global string": +if li_std_string_extra.cvar.ConstGlobalString != "const global string": raise RuntimeError, "ConstGlobalString test" # Member variables -myStructure = li_std_string.Structure() +myStructure = li_std_string_extra.Structure() if myStructure.MemberString2 != "member string 2": raise RuntimeError, "MemberString2 test 1" myStructure.MemberString2 = s @@ -105,28 +105,28 @@ if myStructure.MemberString2 != s: if myStructure.ConstMemberString != "const member string": raise RuntimeError, "ConstMemberString test" -if li_std_string.cvar.Structure_StaticMemberString2 != "static member string 2": +if li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2": raise RuntimeError, "StaticMemberString2 test 1" -li_std_string.cvar.Structure_StaticMemberString2 = s -if li_std_string.cvar.Structure_StaticMemberString2 != s: +li_std_string_extra.cvar.Structure_StaticMemberString2 = s +if li_std_string_extra.cvar.Structure_StaticMemberString2 != s: raise RuntimeError, "StaticMemberString2 test 2" -if li_std_string.cvar.Structure_ConstStaticMemberString != "const static member string": +if li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string": raise RuntimeError, "ConstStaticMemberString test" -if li_std_string.test_reference_input("hello") != "hello": +if li_std_string_extra.test_reference_input("hello") != "hello": raise RuntimeError -s = li_std_string.test_reference_inout("hello") +s = li_std_string_extra.test_reference_inout("hello") if s != "hellohello": raise RuntimeError -if li_std_string.stdstring_empty() != "": +if li_std_string_extra.stdstring_empty() != "": raise RuntimeError -if li_std_string.c_empty() != "": +if li_std_string_extra.c_empty() != "": raise RuntimeError -if li_std_string.c_null() != None: +if li_std_string_extra.c_null() != None: raise RuntimeError diff --git a/Examples/test-suite/python/li_std_vector_runme.py b/Examples/test-suite/python/li_std_vector_extra_runme.py similarity index 84% rename from Examples/test-suite/python/li_std_vector_runme.py rename to Examples/test-suite/python/li_std_vector_extra_runme.py index a0d96d4aa..776eacfb3 100644 --- a/Examples/test-suite/python/li_std_vector_runme.py +++ b/Examples/test-suite/python/li_std_vector_extra_runme.py @@ -1,4 +1,4 @@ -from li_std_vector import * +from li_std_vector_extra import * iv = IntVector(4) for i in range(0,4): @@ -133,3 +133,24 @@ if overloaded3(None) != "vector *": if overloaded3(100) != "int": raise RuntimeError + +# vector pointer checks +ip = makeIntPtr(11) +dp = makeDoublePtr(33.3) +error = 0 +try: + vi = IntPtrVector((ip, dp)) # check vector does not accept double * element + error = 1 +except: + pass + +if error: + raise RuntimeError + +vi = IntPtrVector((ip, makeIntPtr(22))) +if extractInt(vi[0]) != 11: + raise RuntimeError + +if extractInt(vi[1]) != 22: + raise RuntimeError + diff --git a/Examples/test-suite/python/li_std_vector_ptr_runme.py b/Examples/test-suite/python/li_std_vector_ptr_runme.py new file mode 100644 index 000000000..c5f72fde4 --- /dev/null +++ b/Examples/test-suite/python/li_std_vector_ptr_runme.py @@ -0,0 +1,8 @@ +from li_std_vector_ptr import * + +ip1 = makeIntPtr(11) +ip2 = makeIntPtr(22) + +vi = IntPtrVector((ip1, ip2)) +displayVector(vi) + diff --git a/Examples/test-suite/python/li_std_wstring.i b/Examples/test-suite/python/li_std_wstring.i deleted file mode 100644 index c809e11ec..000000000 --- a/Examples/test-suite/python/li_std_wstring.i +++ /dev/null @@ -1,89 +0,0 @@ -%module li_std_wstring -%include -%include - - -%inline %{ - -struct A : std::wstring -{ - A(const std::wstring& s) : std::wstring(s) - { - } -}; - -struct B -{ - B(const std::wstring& s) : cname(0), name(s), a(s) - { - } - - char *cname; - std::wstring name; - A a; - -}; - - -wchar_t test_wcvalue(wchar_t x) { - return x; -} - -const wchar_t* test_ccvalue(const wchar_t* x) { - return x; -} - -wchar_t* test_cvalue(wchar_t* x) { - return x; -} - - -std::wstring test_value(std::wstring x) { - return x; -} - -const std::wstring& test_const_reference(const std::wstring &x) { - return x; -} - -void test_pointer(std::wstring *x) { -} - -std::wstring *test_pointer_out() { - static std::wstring x = L"x"; - return &x; -} - -void test_const_pointer(const std::wstring *x) { -} - -const std::wstring *test_const_pointer_out() { - static std::wstring x = L"x"; - return &x; -} - -void test_reference(std::wstring &x) { -} - -std::wstring& test_reference_out() { - static std::wstring x = L"x"; - return x; -} - -#if defined(_MSC_VER) - #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) -#endif - -void test_throw() throw(std::wstring){ - static std::wstring x = L"x"; - - throw x; -} - -#if defined(_MSC_VER) - #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) -#endif - -%} - - diff --git a/Examples/test-suite/python/operbool_runme.py b/Examples/test-suite/python/operbool_runme.py new file mode 100644 index 000000000..4218b5dd4 --- /dev/null +++ b/Examples/test-suite/python/operbool_runme.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import operbool +assert not operbool.Test() + diff --git a/Examples/test-suite/python/python_abstractbase_runme3.py b/Examples/test-suite/python/python_abstractbase_runme3.py new file mode 100644 index 000000000..e34777558 --- /dev/null +++ b/Examples/test-suite/python/python_abstractbase_runme3.py @@ -0,0 +1,8 @@ +from python_abstractbase import * +from collections import * +assert issubclass(Mapii, MutableMapping) +assert issubclass(Multimapii, MutableMapping) +assert issubclass(IntSet, MutableSet) +assert issubclass(IntMultiset, MutableSet) +assert issubclass(IntVector, MutableSequence) +assert issubclass(IntList, MutableSequence) diff --git a/Examples/test-suite/python/python_append_runme.py b/Examples/test-suite/python/python_append_runme.py new file mode 100644 index 000000000..c8e6b2640 --- /dev/null +++ b/Examples/test-suite/python/python_append_runme.py @@ -0,0 +1,4 @@ +from python_append import * +t=Test() +t.func() +t.static_func() diff --git a/Examples/test-suite/python/kwargs_runme.py b/Examples/test-suite/python/python_kwargs_runme.py similarity index 97% rename from Examples/test-suite/python/kwargs_runme.py rename to Examples/test-suite/python/python_kwargs_runme.py index 91812929d..fb6e191dd 100644 --- a/Examples/test-suite/python/kwargs_runme.py +++ b/Examples/test-suite/python/python_kwargs_runme.py @@ -1,4 +1,4 @@ -from kwargs import * +from python_kwargs import * class MyFoo(Foo): def __init__(self, a , b = 0): diff --git a/Examples/test-suite/python/nondynamic_runme.py b/Examples/test-suite/python/python_nondynamic_runme.py similarity index 67% rename from Examples/test-suite/python/nondynamic_runme.py rename to Examples/test-suite/python/python_nondynamic_runme.py index 18230616d..27755db9c 100644 --- a/Examples/test-suite/python/nondynamic_runme.py +++ b/Examples/test-suite/python/python_nondynamic_runme.py @@ -1,6 +1,6 @@ -import nondynamic +import python_nondynamic -aa = nondynamic.A() +aa = python_nondynamic.A() aa.a = 1 aa.b = 2 @@ -14,10 +14,10 @@ if not err: raise RuntimeError, "A is not static" -class B(nondynamic.A): +class B(python_nondynamic.A): c = 4 def __init__(self): - nondynamic.A.__init__(self) + python_nondynamic.A.__init__(self) pass pass @@ -35,5 +35,5 @@ if not err: raise RuntimeError, "B is not static" -cc = nondynamic.C() +cc = python_nondynamic.C() cc.d = 3 diff --git a/Examples/test-suite/python/overload_simple_cast_runme.py b/Examples/test-suite/python/python_overload_simple_cast_runme.py similarity index 98% rename from Examples/test-suite/python/overload_simple_cast_runme.py rename to Examples/test-suite/python/python_overload_simple_cast_runme.py index 87e6e5d43..1b3a5482c 100644 --- a/Examples/test-suite/python/overload_simple_cast_runme.py +++ b/Examples/test-suite/python/python_overload_simple_cast_runme.py @@ -1,4 +1,4 @@ -from overload_simple_cast import * +from python_overload_simple_cast import * class Ai: def __init__(self,x): diff --git a/Examples/test-suite/python/python_pybuf_runme3.py b/Examples/test-suite/python/python_pybuf_runme3.py new file mode 100644 index 000000000..152aecdc0 --- /dev/null +++ b/Examples/test-suite/python/python_pybuf_runme3.py @@ -0,0 +1,42 @@ +#run: +# python python_pybuf_runme3.py benchmark +#for the benchmark, other wise the test case will be run +import python_pybuf +import sys +if len(sys.argv)>=2 and sys.argv[1]=="benchmark": + #run the benchmark + import time + k=1000000 #number of times to excute the functions + + t=time.time() + a = bytearray(b'hello world') + for i in range(k): + pybuf.title1(a) + print("Time used by bytearray:",time.time()-t) + + t=time.time() + b = 'hello world' + for i in range(k): + pybuf.title2(b) + print("Time used by string:",time.time()-t) +else: + #run the test case + buf1 = bytearray(10) + buf2 = bytearray(50) + + pybuf.func1(buf1) + assert buf1 == b'a'*10 + + pybuf.func2(buf2) + assert buf2.startswith(b"Hello world!\x00") + + count = pybuf.func3(buf2) + assert count==10 #number of alpha and number in 'Hello world!' + + length = pybuf.func4(buf2) + assert length==12 + + buf3 = bytearray(b"hello") + pybuf.title1(buf3) + assert buf3==b'Hello' + diff --git a/Examples/test-suite/python/rename_strip_encoder_runme.py b/Examples/test-suite/python/rename_strip_encoder_runme.py new file mode 100644 index 000000000..64be611d6 --- /dev/null +++ b/Examples/test-suite/python/rename_strip_encoder_runme.py @@ -0,0 +1,6 @@ +from rename_strip_encoder import * + +s = SomeWidget() +a = AnotherWidget() +a.DoSomething() + diff --git a/Examples/test-suite/python/std_containers.i b/Examples/test-suite/python/std_containers.i deleted file mode 100644 index a1d39e7ab..000000000 --- a/Examples/test-suite/python/std_containers.i +++ /dev/null @@ -1,199 +0,0 @@ -%module std_containers - -%{ -#include -%} -%include std_vector.i -%include std_string.i -%include std_deque.i -%include std_list.i -%include std_set.i -%include std_multiset.i -%include std_pair.i -%include std_map.i -%include std_multimap.i -%include std_complex.i - -%template() std::vector; -%template() std::pair; -%template() std::pair; - -%template() std::vector< std::vector > ; -%template(ccube) std::vector< std::vector< std::vector > >; - -%inline -{ - typedef - std::vector > > - ccube; - - ccube cident(const ccube& c) - { - return c; - } - - struct C - { - }; -} - - -%template(map_si) std::map; -%template(pair_iC) std::pair; -%template(map_iC) std::map; -%template(mmap_si) std::multimap; -%template(set_i) std::set; -%template(multiset_i) std::multiset; -%template(list_i) std::list; -%template(deque_i) std::deque; - -%template(vector_b) std::vector; -%template(vector_i) std::vector; -%template(vector_c) std::vector >; -%template(vector_ui) std::vector; - -%template(bmatrix) std::vector >; -%template(imatrix) std::vector >; -%template(cmatrix) std::vector > >; - -%apply std::vector *INOUT {std::vector *INOUT2}; - -%inline -{ - typedef std::vector > imatrix; - imatrix midenti(const imatrix& v) - { - return v; - } - - typedef std::vector > bmatrix; - bmatrix midentb(const bmatrix& v) - { - return v; - } - - std::map mapidentc(const std::map& v) - { - return v; - } - - std::map mapidenti(const std::map& v) - { - return v; - } - - std::map mapident(const std::map& v) - { - return v; - } - - std::multimap mapident(const std::multimap& v) - { - return v; - } - - std::vector vident(const std::vector& v) - { - return v; - } - - std::set sident(const std::set& v) - { - return v; - } - - std::vector videntu(const std::vector& v) - { - return v; - } - - - int get_elem(const std::vector& v, int index) - { - return v[index]; - } - - std::pair pident(const std::pair& p) - { - return p; - } - - void - v_inout(std::vector *INOUT) { - *INOUT = *INOUT; - } - - void - v_inout2(std::vector *INOUT, std::vector *INOUT2) { - std::swap(*INOUT, *INOUT2); - } - -} - - -%{ - - template struct Param - { - }; -%} - - -template struct Param -{ -}; - - -%template(Param_c) Param >; -%inline -{ - int hello(Param > c) - { - return 0; - } -} - -%inline -{ - struct A - { - A(int aa = 0) : a(aa) - { - } - int a; - }; -} - -%template() std::pair; -%template(pair_iA) std::pair; -%template(vector_piA) std::vector >; - - -%inline { - std::pair ident(std::pair a, const std::pair& b) - { - return std::pair(); - } - - - std::vector > pia_vident(std::vector > a ) - { - return a; - } - - struct Foo - { - Foo(int i) { - } - }; - -} - - -%std_nodefconst_type(Foo); - -%template(vector_Foo) std::vector; -%template(deque_Foo) std::deque; -%template(list_Foo) std::list; - - diff --git a/Examples/test-suite/python/swigobject_runme.py b/Examples/test-suite/python/swigobject_runme.py index 7f629e1d5..a906108e3 100644 --- a/Examples/test-suite/python/swigobject_runme.py +++ b/Examples/test-suite/python/swigobject_runme.py @@ -12,11 +12,17 @@ if a1.this != a2.this: lthis = long(a.this) -xstr1 = "0x%x" % (lthis,) +# match pointer value, but deal with leading zeros on 8/16 bit systems and different C++ compilers interpretation of %p +xstr1 = "%016X" % (lthis,) +xstr1 = str.lstrip(xstr1, '0') xstr2 = pointer_str(a) +xstr2 = str.replace(xstr2, "0x", "") +xstr2 = str.replace(xstr2, "0X", "") +xstr2 = str.lstrip(xstr2, '0') +xstr2 = str.upper(xstr2) if xstr1 != xstr2: - print xstr1, xstr2 + print xstr1, xstr2 raise RuntimeError s = str(a.this) diff --git a/Examples/test-suite/python/tag_no_clash_with_variable_runme.i b/Examples/test-suite/python/tag_no_clash_with_variable_runme.i deleted file mode 100644 index 0f8fdafed..000000000 --- a/Examples/test-suite/python/tag_no_clash_with_variable_runme.i +++ /dev/null @@ -1,3 +0,0 @@ -import enum_tag_no_clash_with_variable - -error_action = error_action diff --git a/Examples/test-suite/python/template_typedef_cplx2_runme.py b/Examples/test-suite/python/template_typedef_cplx2_runme.py index 030fe02d8..04c599329 100644 --- a/Examples/test-suite/python/template_typedef_cplx2_runme.py +++ b/Examples/test-suite/python/template_typedef_cplx2_runme.py @@ -1,4 +1,3 @@ -import string from template_typedef_cplx2 import * # @@ -13,7 +12,7 @@ except: raise RuntimeError s = '%s' % d -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print d, "is not an ArithUnaryFunction" raise RuntimeError @@ -25,7 +24,7 @@ except: raise RuntimeError s = '%s' % e -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print e, "is not an ArithUnaryFunction" raise RuntimeError @@ -42,7 +41,7 @@ except: raise RuntimeError s = '%s' % c -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print c, "is not an ArithUnaryFunction" raise RuntimeError @@ -54,7 +53,7 @@ except: raise RuntimeError s = '%s' % f -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print f, "is not an ArithUnaryFunction" raise RuntimeError @@ -70,7 +69,7 @@ except: raise RuntimeError s = '%s' % g -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print g, "is not an ArithUnaryFunction" raise RuntimeError @@ -83,7 +82,7 @@ except: raise RuntimeError s = '%s' % h -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print h, "is not an ArithUnaryFunction" raise RuntimeError diff --git a/Examples/test-suite/python/template_typedef_cplx_runme.py b/Examples/test-suite/python/template_typedef_cplx_runme.py index 99ffcb9aa..2cd9c8348 100644 --- a/Examples/test-suite/python/template_typedef_cplx_runme.py +++ b/Examples/test-suite/python/template_typedef_cplx_runme.py @@ -1,4 +1,3 @@ -import string from template_typedef_cplx import * # @@ -13,7 +12,7 @@ except: raise RuntimeError s = '%s' % d -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print d, "is not an ArithUnaryFunction" raise RuntimeError @@ -25,7 +24,7 @@ except: raise RuntimeError s = '%s' % e -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print e, "is not an ArithUnaryFunction" raise RuntimeError @@ -42,7 +41,7 @@ except: raise RuntimeError s = '%s' % c -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print c, "is not an ArithUnaryFunction" raise RuntimeError @@ -54,7 +53,7 @@ except: raise RuntimeError s = '%s' % f -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print f, "is not an ArithUnaryFunction" raise RuntimeError @@ -70,7 +69,7 @@ except: raise RuntimeError s = '%s' % g -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print g, "is not an ArithUnaryFunction" raise RuntimeError @@ -83,6 +82,6 @@ except: raise RuntimeError s = '%s' % h -if string.find(s, 'ArithUnaryFunction') == -1: +if str.find(s, 'ArithUnaryFunction') == -1: print h, "is not an ArithUnaryFunction" raise RuntimeError diff --git a/Examples/test-suite/python/vector.i b/Examples/test-suite/python/vector.i deleted file mode 100644 index 04c961cda..000000000 --- a/Examples/test-suite/python/vector.i +++ /dev/null @@ -1,51 +0,0 @@ -%module vector -%{ -#include -%} - -%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) - public: - typedef size_t size_type; - typedef CTYPE value_type; - size_type size() const; - vector(); - %extend { - static std::vector *Repeat(const value_type& value, int count) /*throw (std::out_of_range)*/ { -// if (count < 0) -// throw std::out_of_range("count"); - return new std::vector(count, value); - } - } -%enddef - -namespace std { - // primary (unspecialized) class template for std::vector - // does not require operator== to be defined - template class vector { - SWIG_STD_VECTOR_MINIMUM(T, T) - }; -} - -%define SWIG_STD_VECTOR_SPECIALIZE(CSTYPE, CTYPE...) -namespace std { - template<> class vector { - SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE) - }; -} -%enddef - -SWIG_STD_VECTOR_SPECIALIZE(float, float) - -%inline %{ -typedef float Real; -%} - -#if 1 -//fails -namespace std { - %template(RealVector) vector; -} -#else -//works -%template(RealVector) std::vector; -#endif diff --git a/Examples/test-suite/python_abstractbase.i b/Examples/test-suite/python_abstractbase.i new file mode 100644 index 000000000..f72688237 --- /dev/null +++ b/Examples/test-suite/python_abstractbase.i @@ -0,0 +1,18 @@ +%module python_abstractbase +%include +%include +%include +%include +%include +%include +%include + +namespace std +{ + %template(Mapii) map; + %template(Multimapii) multimap; + %template(IntSet) set; + %template(IntMultiset) multiset; + %template(IntVector) vector; + %template(IntList) list; +} diff --git a/Examples/test-suite/python_append.i b/Examples/test-suite/python_append.i new file mode 100644 index 000000000..2dc9cb970 --- /dev/null +++ b/Examples/test-suite/python_append.i @@ -0,0 +1,32 @@ +/* +Testcase to test %pythonprepend and %pythonappend +*/ + +%module python_append + +%pythonappend Test::func %{ + pass +%} + +%pythonprepend Test::func %{ + pass +%} + +%pythonappend Test::static_func %{ +pass +%} + +%pythonprepend Test::static_func { + pass +} + +%inline %{ + +class Test { +public: + static void static_func() {}; + void func() {}; +}; + +%} + diff --git a/Examples/test-suite/python/autodoc.i b/Examples/test-suite/python_autodoc.i similarity index 97% rename from Examples/test-suite/python/autodoc.i rename to Examples/test-suite/python_autodoc.i index c22cc02f0..c363e4384 100644 --- a/Examples/test-suite/python/autodoc.i +++ b/Examples/test-suite/python_autodoc.i @@ -1,4 +1,4 @@ -%module(docstring="hello") autodoc +%module(docstring="hello") python_autodoc %feature("autodoc"); diff --git a/Examples/test-suite/python/kwargs.i b/Examples/test-suite/python_kwargs.i similarity index 98% rename from Examples/test-suite/python/kwargs.i rename to Examples/test-suite/python_kwargs.i index 83713d8c2..28089bbf1 100644 --- a/Examples/test-suite/python/kwargs.i +++ b/Examples/test-suite/python_kwargs.i @@ -1,4 +1,4 @@ -%module kwargs +%module python_kwargs %nocopyctor; %kwargs; diff --git a/Examples/test-suite/python/nondynamic.i b/Examples/test-suite/python_nondynamic.i similarity index 96% rename from Examples/test-suite/python/nondynamic.i rename to Examples/test-suite/python_nondynamic.i index 2acc9bf8b..26c69644d 100644 --- a/Examples/test-suite/python/nondynamic.i +++ b/Examples/test-suite/python_nondynamic.i @@ -1,4 +1,4 @@ -%module nondynamic +%module python_nondynamic /* Use the %pythonnondynamic directuve to make the wrapped class a diff --git a/Examples/test-suite/python/overload_simple_cast.i b/Examples/test-suite/python_overload_simple_cast.i similarity index 58% rename from Examples/test-suite/python/overload_simple_cast.i rename to Examples/test-suite/python_overload_simple_cast.i index d274722c0..e7f58d788 100644 --- a/Examples/test-suite/python/overload_simple_cast.i +++ b/Examples/test-suite/python_overload_simple_cast.i @@ -1,4 +1,4 @@ // Simple tests of overloaded functions -%module("castmode") overload_simple_cast +%module("castmode") python_overload_simple_cast %include overload_simple.i diff --git a/Examples/test-suite/python_pybuf.i b/Examples/test-suite/python_pybuf.i new file mode 100644 index 000000000..8e1302582 --- /dev/null +++ b/Examples/test-suite/python_pybuf.i @@ -0,0 +1,64 @@ +%module python_pybuf +%include +%include +/*functions for the test case*/ +%pybuffer_mutable_binary(char *buf1, int len); +%pybuffer_mutable_string(char *buf2); +%pybuffer_binary(const char *buf3, int len); +%pybuffer_string(const char *buf4); + +%inline %{ + void func1(char *buf1, int len) + { + int i; + for (i=0; i %include diff --git a/Examples/test-suite/ruby/naming.i b/Examples/test-suite/ruby_naming.i similarity index 98% rename from Examples/test-suite/ruby/naming.i rename to Examples/test-suite/ruby_naming.i index 75500ae34..d8ef50ad3 100644 --- a/Examples/test-suite/ruby/naming.i +++ b/Examples/test-suite/ruby_naming.i @@ -1,4 +1,4 @@ -%module naming +%module ruby_naming %predicate predicateMethod(); %bang bangMethod(); diff --git a/Examples/test-suite/ruby/track_objects.i b/Examples/test-suite/ruby_track_objects.i similarity index 98% rename from Examples/test-suite/ruby/track_objects.i rename to Examples/test-suite/ruby_track_objects.i index 0a50e1fad..f4bbb37e7 100644 --- a/Examples/test-suite/ruby/track_objects.i +++ b/Examples/test-suite/ruby_track_objects.i @@ -1,4 +1,4 @@ -%module track_objects +%module ruby_track_objects %include typemaps.i diff --git a/Examples/test-suite/ruby/track_objects_directors.i b/Examples/test-suite/ruby_track_objects_directors.i similarity index 88% rename from Examples/test-suite/ruby/track_objects_directors.i rename to Examples/test-suite/ruby_track_objects_directors.i index adac8ae4d..131209828 100644 --- a/Examples/test-suite/ruby/track_objects_directors.i +++ b/Examples/test-suite/ruby_track_objects_directors.i @@ -1,4 +1,4 @@ -%module(directors="1") track_objects_directors +%module(directors="1") ruby_track_objects_directors %{ #include diff --git a/Examples/test-suite/r/simple_array.i b/Examples/test-suite/simple_array.i similarity index 100% rename from Examples/test-suite/r/simple_array.i rename to Examples/test-suite/simple_array.i diff --git a/Examples/test-suite/python/simutry.i b/Examples/test-suite/simutry.i similarity index 100% rename from Examples/test-suite/python/simutry.i rename to Examples/test-suite/simutry.i diff --git a/Examples/test-suite/ruby/stl_new.i b/Examples/test-suite/stl_new.i similarity index 100% rename from Examples/test-suite/ruby/stl_new.i rename to Examples/test-suite/stl_new.i diff --git a/Examples/test-suite/swig_examples_lock.h b/Examples/test-suite/swig_examples_lock.h index 7710f9361..feef26d0f 100644 --- a/Examples/test-suite/swig_examples_lock.h +++ b/Examples/test-suite/swig_examples_lock.h @@ -1,10 +1,10 @@ -namespace SwigExamples { - # if defined(_WIN32) || defined(__WIN32__) #include +namespace SwigExamples { + class CriticalSection { public: CriticalSection() { @@ -27,9 +27,18 @@ private: CriticalSection &critical_section; }; +} + #else #include +#ifndef PTHREAD_MUTEX_RECURSIVE_NP + // For Cygwin and possibly other OSs: _NP is "non-portable" + #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE +#endif + +namespace SwigExamples { + class CriticalSection { public: CriticalSection() { @@ -55,7 +64,7 @@ private: CriticalSection &critical_section; }; -#endif - } +#endif + diff --git a/Examples/test-suite/python/swigobject.i b/Examples/test-suite/swigobject.i similarity index 81% rename from Examples/test-suite/python/swigobject.i rename to Examples/test-suite/swigobject.i index 2e77969b9..2ec064509 100644 --- a/Examples/test-suite/python/swigobject.i +++ b/Examples/test-suite/swigobject.i @@ -10,7 +10,7 @@ const char* pointer_str(A *a){ static char result[1024]; - sprintf(result,"0x%lx", (unsigned long)(void *)a); + sprintf(result,"%p", a); return result; } diff --git a/Examples/test-suite/tcl/Makefile.in b/Examples/test-suite/tcl/Makefile.in index e26d77582..7c4b7ed61 100644 --- a/Examples/test-suite/tcl/Makefile.in +++ b/Examples/test-suite/tcl/Makefile.in @@ -11,15 +11,12 @@ top_builddir = @top_builddir@ CPP_TEST_CASES += \ primitive_types \ - li_cdata \ li_cstring \ li_cwstring C_TEST_CASES += \ - li_cdata \ li_cstring \ - li_cwstring \ - union + li_cwstring include $(srcdir)/../common.mk diff --git a/Examples/test-suite/tcl/union_runme.tcl b/Examples/test-suite/tcl/union_parameter_runme.tcl old mode 100755 new mode 100644 similarity index 92% rename from Examples/test-suite/tcl/union_runme.tcl rename to Examples/test-suite/tcl/union_parameter_runme.tcl index 2c47ecef3..fb3e092b8 --- a/Examples/test-suite/tcl/union_runme.tcl +++ b/Examples/test-suite/tcl/union_parameter_runme.tcl @@ -1,4 +1,4 @@ -if [ catch { load ./union[info sharedlibextension] unions} err_msg ] { +if [ catch { load ./union_parameter[info sharedlibextension] union_parameter} err_msg ] { puts stderr "Could not load shared object:\n$err_msg" } diff --git a/Examples/test-suite/template_inherit_abstract.i b/Examples/test-suite/template_inherit_abstract.i index f676b3b3e..2f83433a5 100644 --- a/Examples/test-suite/template_inherit_abstract.i +++ b/Examples/test-suite/template_inherit_abstract.i @@ -4,7 +4,7 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) oss::Module; /* C#, Java, Php4 multiple inheritance */ + SWIGWARN_PHP_MULTIPLE_INHERITANCE) oss::Module; /* C#, Java, PHP multiple inheritance */ %inline %{ @@ -56,7 +56,7 @@ namespace oss %inline %{ namespace oss { -#ifdef SWIGCSHARP +#if defined(SWIG) && defined(SWIGCSHARP) %ignore HModule::get(); // Work around for lack of multiple inheritance support - base ModuleBase is ignored. #endif struct test : HModule diff --git a/Examples/test-suite/python/template_matrix.i b/Examples/test-suite/template_matrix.i similarity index 100% rename from Examples/test-suite/python/template_matrix.i rename to Examples/test-suite/template_matrix.i diff --git a/Examples/test-suite/template_typedef_funcptr.i b/Examples/test-suite/template_typedef_funcptr.i index 0175c7516..cec43e7c8 100644 --- a/Examples/test-suite/template_typedef_funcptr.i +++ b/Examples/test-suite/template_typedef_funcptr.i @@ -2,6 +2,10 @@ //Bug #1832613 +#if !defined(SWIGR) +// R Swig fails on this test. Because it tries to return a nil SEXP in +// an error + %include %inline %{ @@ -46,3 +50,4 @@ typedef MCContractPtr* ContractPtrPtr; // Plain pointers were also causing problems... %template(MCContractFactory2) ContractFactory; +#endif diff --git a/Examples/test-suite/typemap_namespace.i b/Examples/test-suite/typemap_namespace.i index 5375c43b6..b3fa1a733 100644 --- a/Examples/test-suite/typemap_namespace.i +++ b/Examples/test-suite/typemap_namespace.i @@ -27,7 +27,7 @@ namespace Foo { %typemap(javaout) Str1 * = char *; #endif %typemap(in) Str1 * = char *; -#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP)) +#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP) || defined(SWIGMZSCHEME) || defined(SWIGOCAML)) %typemap(freearg) Str1 * = char *; #endif %typemap(typecheck) Str1 * = char *; diff --git a/Examples/test-suite/types_directive.i b/Examples/test-suite/types_directive.i index 44312263d..26cb6aeeb 100644 --- a/Examples/test-suite/types_directive.i +++ b/Examples/test-suite/types_directive.i @@ -1,5 +1,13 @@ %module types_directive +#if defined(SWIGR) +// Avoid conflict with Date class in R +#define Date DateSwig +%inline %{ +#define Date DateSwig +%} +#endif + %ignore Time2::operator Date *; %inline %{ diff --git a/Examples/test-suite/tcl/union.i b/Examples/test-suite/union_parameter.i similarity index 97% rename from Examples/test-suite/tcl/union.i rename to Examples/test-suite/union_parameter.i index d8ac62bfb..bb010d3fa 100644 --- a/Examples/test-suite/tcl/union.i +++ b/Examples/test-suite/union_parameter.i @@ -1,4 +1,4 @@ -%module unions +%module union_parameter %inline %{ diff --git a/Examples/test-suite/using_composition.i b/Examples/test-suite/using_composition.i index 7bb6add2a..bd0f712b5 100644 --- a/Examples/test-suite/using_composition.i +++ b/Examples/test-suite/using_composition.i @@ -2,13 +2,13 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; // C#, Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; // C#, Java, PHP multiple inheritance %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar2; // C#, Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar2; // C#, Java, PHP multiple inheritance %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar3; // C#, Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar3; // C#, Java, PHP multiple inheritance #ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah; #endif diff --git a/Examples/test-suite/using_extend.i b/Examples/test-suite/using_extend.i index 414ceedb4..e14cc28e8 100644 --- a/Examples/test-suite/using_extend.i +++ b/Examples/test-suite/using_extend.i @@ -2,7 +2,7 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; // C#, Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; // C#, Java, PHP multiple inheritance #ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah; #endif diff --git a/Examples/test-suite/using_namespace.i b/Examples/test-suite/using_namespace.i index 1989b6a0d..799c7cfb5 100644 --- a/Examples/test-suite/using_namespace.i +++ b/Examples/test-suite/using_namespace.i @@ -5,7 +5,7 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Hi; // C#, Java, Php4 multiple inheritance + SWIGWARN_PHP_MULTIPLE_INHERITANCE) Hi; // C#, Java, PHP multiple inheritance %inline %{ namespace hello diff --git a/Lib/allegrocl/allegrocl.swg b/Lib/allegrocl/allegrocl.swg index 0ae8ed76c..4479f6ac2 100644 --- a/Lib/allegrocl/allegrocl.swg +++ b/Lib/allegrocl/allegrocl.swg @@ -26,37 +26,76 @@ %typemap(lout) SWIGTYPE "(cl::let* ((address $body)\n (new-inst (cl::make-instance '$lclass :foreign-address address)))\n (cl::unless (cl::zerop address)\n (excl:schedule-finalization new-inst #'$ldestructor))\n (cl::setq ACL_ffresult new-inst))"; -%typemap(lisptype) bool "cl:boolean"; -%typemap(lisptype) char "cl:character"; -%typemap(lisptype) unsigned char "cl:integer"; -%typemap(lisptype) signed char "cl:integer"; +%typemap(lisptype) bool, const bool "cl:boolean"; +%typemap(lisptype) char, const char "cl:character"; +%typemap(lisptype) unsigned char, const unsigned char "cl:integer"; +%typemap(lisptype) signed char, const signed char "cl:integer"; -%typemap(ffitype) bool ":int"; -%typemap(ffitype) char ":char"; -%typemap(ffitype) unsigned char ":unsigned-char"; -%typemap(ffitype) signed char ":char"; -%typemap(ffitype) short, signed short ":short"; -%typemap(ffitype) unsigned short ":unsigned-short"; -%typemap(ffitype) int, signed int ":int"; -%typemap(ffitype) unsigned int ":unsigned-int"; -%typemap(ffitype) long, signed long ":long"; -%typemap(ffitype) unsigned long ":unsigned-long"; -%typemap(ffitype) float ":float"; -%typemap(ffitype) double ":double"; -%typemap(ffitype) char * "(* :char)"; +%typemap(ffitype) bool, const bool ":int"; +%typemap(ffitype) char, const char, + signed char, const signed char ":char"; +%typemap(ffitype) unsigned char, const unsigned char ":unsigned-char"; +%typemap(ffitype) short, const short, + signed short, const signed short ":short"; +%typemap(ffitype) unsigned short, const unsigned short ":unsigned-short"; +%typemap(ffitype) int, const int, signed int, const signed int ":int"; +%typemap(ffitype) unsigned int, const unsigned int ":unsigned-int"; +%typemap(ffitype) long, const long, signed long, const signed long ":long"; +%typemap(ffitype) unsigned long, const unsigned long ":unsigned-long"; +%typemap(ffitype) float, const float ":float"; +%typemap(ffitype) double, const double ":double"; +%typemap(ffitype) char *, const char *, signed char *, + const signed char *, signed char &, + const signed char & "(* :char)"; +%typemap(ffitype) unsigned char *, const unsigned char *, + unsigned char &, const unsigned char & "(* :unsigned-char)"; +%typemap(ffitype) short *, const short *, short &, + const short & "(* :short)"; +%typemap(ffitype) unsigned short *, const unsigned short *, + unsigned short &, const unsigned short & "(* :unsigned-short)"; +%typemap(ffitype) int *, const int *, int &, const int & "(* :int)"; +%typemap(ffitype) unsigned int *, const unsigned int *, + unsigned int &, const unsigned int & "(* :unsigned-int)"; %typemap(ffitype) void * "(* :void)"; %typemap(ffitype) void ":void"; %typemap(ffitype) enum SWIGTYPE ":int"; %typemap(ffitype) SWIGTYPE & "(* :void)"; -%typemap(ctype) bool "int"; +/* const typemaps +idea: marshall all primitive c types to their respective lisp types +to maintain const corretness. For pointers/references, all bets +are off if you try to modify them. + +idea: add a constant-p slot to the base foreign-pointer class. For +constant pointer/references check this value when setting (around method?) +and error if a setf operation is performed on the address of this object. + +*/ + +/* +%exception %{ + try { + $action + } catch (...) { + return $null; + } +%} + +*/ + +// %typemap(throws) SWIGTYPE { +// (void)$1; +// SWIG_fail; +// } + +%typemap(ctype) bool, const bool "int"; %typemap(ctype) char, unsigned char, signed char, short, signed short, unsigned short, int, signed int, unsigned int, long, signed long, unsigned long, float, double, long double, char *, void *, void, - enum SWIGTYPE, SWIGTYPE *, - SWIGTYPE[ANY], SWIGTYPE & "$1_ltype"; + enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[], + SWIGTYPE[ANY], SWIGTYPE &, const SWIGTYPE "$1_ltype"; %typemap(ctype) SWIGTYPE "$&1_type"; %typemap(in) bool "$1 = (bool)$input;"; @@ -65,7 +104,7 @@ int, signed int, unsigned int, long, signed long, unsigned long, float, double, long double, char *, void *, void, - enum SWIGTYPE, SWIGTYPE *, + enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[], SWIGTYPE[ANY], SWIGTYPE & "$1 = $input;"; %typemap(in) SWIGTYPE "$1 = *$input;"; @@ -122,7 +161,8 @@ SWIG_TYPECHECK_STRING_ARRAY 1140 long, signed long, unsigned long, enum SWIGTYPE { $1 = 1; }; %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, - SWIGTYPE[ANY], SWIGTYPE { $1 = 1; }; + SWIGTYPE[], SWIGTYPE[ANY], + SWIGTYPE { $1 = 1; }; /* This maps C/C++ types to Lisp classes for overload dispatch */ @@ -147,7 +187,7 @@ SWIG_TYPECHECK_STRING_ARRAY 1140 enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[ANY], SWIGTYPE & "$result = $1;"; #ifdef __cplusplus -%typemap(out) SWIGTYPE "$result = new $1_type($1);"; +%typemap(out) SWIGTYPE "$result = new $1_ltype($1);"; #else %typemap(out) SWIGTYPE { $result = ($&1_ltype) malloc(sizeof($1_type)); @@ -243,12 +283,15 @@ $body)" %rename(__funcall__) *::operator(); %rename(__aref__) *::operator[]; + +%rename(__bool__) *::operator bool(); +%rename(__bool__) *::operator bool() const; #endif %insert("lisphead") %{ ;; $Id$ -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) ;; avoid compiling ef-templates at runtime (excl:find-external-format :fat) @@ -296,15 +339,30 @@ $body)" sym)))) (cl::defun full-name (id type arity class) - (cl::case type - (:getter (cl::format nil "~@[~A_~]~A" class id)) - (:constructor (cl::format nil "new_~A~@[~A~]" id arity)) - (:destructor (cl::format nil "delete_~A" id)) - (:type (cl::format nil "ff_~A" id)) - (:slot id) - (:ff-operator (cl::format nil "ffi_~A" id)) - (otherwise (cl::format nil "~@[~A_~]~A~@[~A~]" - class id arity)))) + ; We need some kind of a hack here to handle template classes + ; and other synonym types right. We need the original name. + (let*( (sym (read-symbol-from-string + (if (eq *swig-identifier-converter* 'identifier-convert-lispify) + (string-lispify id) + id))) + (sym-class (find-class sym nil)) + (id (cond ( (not sym-class) + id ) + ( (and sym-class + (not (eq (class-name sym-class) + sym))) + (class-name sym-class) ) + ( t + id ))) ) + (cl::case type + (:getter (cl::format nil "~@[~A_~]~A" class id)) + (:constructor (cl::format nil "new_~A~@[~A~]" id arity)) + (:destructor (cl::format nil "delete_~A" id)) + (:type (cl::format nil "ff_~A" id)) + (:slot id) + (:ff-operator (cl::format nil "ffi_~A" id)) + (otherwise (cl::format nil "~@[~A_~]~A~@[~A~]" + class id arity))))) (cl::defun identifier-convert-null (id &key type class arity) (cl::if (cl::eq type :setter) @@ -312,6 +370,27 @@ $body)" id :type :getter :class class :arity arity)) (read-symbol-from-string (full-name id type arity class)))) +(cl::defun string-lispify (str) + (cl::let ( (cname (excl::replace-regexp str "_" "-")) + (lastcase :other) + newcase char res ) + (cl::dotimes (n (cl::length cname)) + (cl::setf char (cl::schar cname n)) + (excl::if* (cl::alpha-char-p char) + then + (cl::setf newcase (cl::if (cl::upper-case-p char) :upper :lower)) + (cl::when (cl::and (cl::eq lastcase :lower) + (cl::eq newcase :upper)) + ;; case change... add a dash + (cl::push #\- res) + (cl::setf newcase :other)) + (cl::push (cl::char-downcase char) res) + (cl::setf lastcase newcase) + else + (cl::push char res) + (cl::setf lastcase :other))) + (cl::coerce (cl::nreverse res) 'string))) + (cl::defun identifier-convert-lispify (cname &key type class arity) (cl::assert (cl::stringp cname)) (cl::when (cl::eq type :setter) @@ -321,31 +400,7 @@ $body)" (cl::setq cname (full-name cname type arity class)) (cl::if (cl::eq type :constant) (cl::setf cname (cl::format nil "*~A*" cname))) - (cl::setf cname (excl::replace-regexp cname "_" "-")) - (cl::let ((lastcase :other) - newcase char res) - (cl::dotimes (n (cl::length cname)) - (cl::setf char (cl::schar cname n)) - (excl::if* (cl::alpha-char-p char) - then - (cl::setf newcase (cl::if (cl::upper-case-p char) :upper :lower)) - - (cl::when (cl::or (cl::and (cl::eq lastcase :upper) - (cl::eq newcase :lower)) - (cl::and (cl::eq lastcase :lower) - (cl::eq newcase :upper))) - ;; case change... add a dash - (cl::push #\- res) - (cl::setf newcase :other)) - - (cl::push (cl::char-downcase char) res) - - (cl::setf lastcase newcase) - - else - (cl::push char res) - (cl::setf lastcase :other))) - (read-symbol-from-string (cl::coerce (cl::nreverse res) 'string)))) + (read-symbol-from-string (string-lispify cname))) (cl::defun id-convert-and-export (name &rest kwargs) (cl::multiple-value-bind (symbol package) @@ -363,7 +418,7 @@ $body)" (defswig2 swig-defconstant (string value) (cl::let ((symbol (id-convert-and-export string :type :constant))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (cl::defconstant ,symbol ,value)))) (cl::defun maybe-reorder-args (funcname arglist) @@ -409,7 +464,7 @@ $body)" ) (cl::when (swig-anyvarargs-p ffargs) (cl::setq ffargs '())) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (excl::compiler-let ((*record-xref-info* nil)) (ff:def-foreign-call (,mangle ,mangled-name) ,ffargs ,@kwargs)) (cl::macrolet ((swig-ff-call (&rest args) @@ -435,7 +490,7 @@ $body)" ffargs (cl::loop for (nil name nil . ffi) in ffargs collect `(,name ,@ffi))))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (excl::compiler-let ((*record-xref-info* nil)) (ff:def-foreign-call (,mangle ,mangled-name) ,ffargs ,@kwargs)) (cl::macrolet ((swig-ff-call (&rest args) @@ -447,7 +502,7 @@ $body)" (defswig1 swig-dispatcher ((name &key (type :operator) class arities)) (cl::let ((symbol (id-convert-and-export name :type type :class class))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (cl::defun ,symbol (&rest args) (cl::case (cl::length args) ,@(cl::loop for arity in arities @@ -460,14 +515,14 @@ $body)" (defswig2 swig-def-foreign-stub (name) (cl::let ((lsymbol (id-convert-and-export name :type :class)) (symbol (id-convert-and-export name :type :type))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (ff:def-foreign-type ,symbol (:class )) (cl::defclass ,lsymbol (ff:foreign-pointer) ())))) (defswig2 swig-def-foreign-class (name supers &rest rest) (cl::let ((lsymbol (id-convert-and-export name :type :class)) (symbol (id-convert-and-export name :type :type))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (ff:def-foreign-type ,symbol ,@rest) (cl::defclass ,lsymbol ,supers ((foreign-type :initform ',symbol :initarg :foreign-type @@ -475,11 +530,11 @@ $body)" (defswig2 swig-def-foreign-type (name &rest rest) (cl::let ((symbol (id-convert-and-export name :type :type))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (ff:def-foreign-type ,symbol ,@rest)))) (defswig2 swig-def-synonym-type (synonym of ff-synonym) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (cl::setf (cl::find-class ',synonym) (cl::find-class ',of)) (ff:def-foreign-type ,ff-synonym (:struct )))) @@ -499,24 +554,24 @@ $body)" (parent-strings (cl::mapcar #'package-name-for-namespace parent-namespaces)) (string (package-name-for-namespace namespace))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (cl::defpackage ,string (:use :swig :ff #+ignore '(:common-lisp :ff :excl) ,@parent-strings ,*swig-module-name*) (:import-from :cl :* :nil :t))))) (cl::defmacro swig-in-package (namespace) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (cl::in-package ,(package-name-for-namespace namespace)))) (defswig2 swig-defvar (name mangled-name &key type (ftype :unsigned-natural)) (cl::let ((symbol (id-convert-and-export name :type type))) - `(cl::eval-when (compile load eval) + `(cl::eval-when (:compile-toplevel :load-toplevel :execute) (ff:def-foreign-variable (,symbol ,mangled-name) :type ,ftype)))) ) ;; eval-when -(cl::eval-when (compile eval) +(cl::eval-when (:compile-toplevel :execute) (cl::flet ((starts-with-p (str prefix) (cl::and (cl::>= (cl::length str) (cl::length prefix)) (cl::string= str prefix :end1 (cl::length prefix))))) @@ -527,7 +582,7 @@ $body)" %} - +typedef void *__SWIGACL_FwdReference; %{ @@ -539,6 +594,8 @@ $body)" #define EXPORT EXTERN SWIGEXPORT +typedef void *__SWIGACL_FwdReference; + #include #include %} diff --git a/Lib/allegrocl/inout_typemaps.i b/Lib/allegrocl/inout_typemaps.i old mode 100755 new mode 100644 diff --git a/Lib/allegrocl/longlongs.i b/Lib/allegrocl/longlongs.i old mode 100755 new mode 100644 diff --git a/Lib/allegrocl/std_list.i b/Lib/allegrocl/std_list.i old mode 100755 new mode 100644 diff --git a/Lib/allegrocl/std_string.i b/Lib/allegrocl/std_string.i old mode 100755 new mode 100644 diff --git a/Lib/allkw.swg b/Lib/allkw.swg index dec6c7c03..2a2fe18d8 100644 --- a/Lib/allkw.swg +++ b/Lib/allkw.swg @@ -19,7 +19,7 @@ %include %include %include -%include +%include %include %include %include diff --git a/Lib/cdata.i b/Lib/cdata.i index a9e74ed8a..67601f737 100644 --- a/Lib/cdata.i +++ b/Lib/cdata.i @@ -29,6 +29,11 @@ typedef struct SWIGCDATA { $result = C_string(&string_space, $1.len, $1.data); } %typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); +#elif SWIGPHP +%typemap(out) SWIGCDATA { + ZVAL_STRINGL($result, $1.data, $1.len, 1); +} +%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); #else %echo "cdata.i module not supported." #endif @@ -76,7 +81,3 @@ SWIGCDATA cdata_##NAME(TYPE *ptr, int nelements); /* Memory move function */ void memmove(void *data, const void *indata, int inlen); - - - - diff --git a/Lib/chicken/chicken.swg b/Lib/chicken/chicken.swg index d8b71874e..a8d1b5a57 100644 --- a/Lib/chicken/chicken.swg +++ b/Lib/chicken/chicken.swg @@ -10,6 +10,7 @@ /* chicken.h has to appear first. */ %insert(runtime) %{ +#include #include %} diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg index bd7242407..8703ea65a 100644 --- a/Lib/chicken/chickenrun.swg +++ b/Lib/chicken/chickenrun.swg @@ -7,6 +7,7 @@ * ----------------------------------------------------------------------------- */ #include +#include #include #include #include diff --git a/Lib/csharp/arrays_csharp.i b/Lib/csharp/arrays_csharp.i new file mode 100644 index 000000000..ea22da584 --- /dev/null +++ b/Lib/csharp/arrays_csharp.i @@ -0,0 +1,140 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * arrays_csharp.i + * + * This file contains a two approaches to marshaling arrays. The first uses + * default p/invoke marshaling and the second uses pinning of the arrays. + * + * Default marshaling approach + * ---------------------------- + * Array typemaps using default p/invoke marshaling. The data is copied to a separately + * allocated buffer when passing over the managed-native boundary. + * + * There are separate typemaps for in, out and inout arrays to enable avoiding + * unnecessary copying. + * + * Example usage: + * + * %include "arrays_csharp.i" + * %apply int INPUT[] { int* sourceArray } + * %apply int OUTPUT[] { int* targetArray } + * void myArrayCopy( int* sourceArray, int* targetArray, int nitems ); + * + * %apply int INOUT[] { int* array1, int *array2 } + * void myArraySwap( int* array1, int* array2, int nitems ); + * + * If handling large arrays you should consider using the pinning array typemaps + * described next. + * + * Pinning approach + * ---------------- + * Array typemaps using pinning. These typemaps pin the managed array given + * as parameter and pass a pointer to it to the c/c++ side. This is very + * efficient as no copying is done (unlike in the default array marshaling), + * but it makes garbage collection more difficult. When considering using + * these typemaps, think carefully whether you have callbacks that may cause + * the control to re-enter the managed side from within the call (and produce + * garbage for the gc) or whether other threads may produce enough garbage to + * trigger gc while the call is being executed. In those cases it may be + * wiser to use the default marshaling typemaps. + * + * Please note that when using fixed arrays, you have to mark your corresponding + * module class method unsafe using + * %csmethodmodifiers "public unsafe" + * (the visibility of the method is up to you). + * + * Example usage: + * + * %include "arrays_csharp.i" + * %apply int FIXED[] { int* sourceArray, int *targetArray } + * %csmethodmodifiers myArrayCopy "public unsafe"; + * void myArrayCopy( int *sourceArray, int* targetArray, int nitems ); + * + * ----------------------------------------------------------------------------- */ + +%define CSHARP_ARRAYS( CTYPE, CSTYPE ) + +// input only arrays + +%typemap(ctype) CTYPE INPUT[] "CTYPE*" +%typemap(cstype) CTYPE INPUT[] "CSTYPE[]" +%typemap(imtype, inattributes="[In, MarshalAs(UnmanagedType.LPArray)]") CTYPE INPUT[] "CSTYPE[]" +%typemap(csin) CTYPE INPUT[] "$csinput" + +%typemap(in) CTYPE INPUT[] "$1 = $input;" +%typemap(freearg) CTYPE INPUT[] "" +%typemap(argout) CTYPE INPUT[] "" + +// output only arrays + +%typemap(ctype) CTYPE OUTPUT[] "CTYPE*" +%typemap(cstype) CTYPE OUTPUT[] "CSTYPE[]" +%typemap(imtype, inattributes="[Out, MarshalAs(UnmanagedType.LPArray)]") CTYPE OUTPUT[] "CSTYPE[]" +%typemap(csin) CTYPE OUTPUT[] "$csinput" + +%typemap(in) CTYPE OUTPUT[] "$1 = $input;" +%typemap(freearg) CTYPE OUTPUT[] "" +%typemap(argout) CTYPE OUTPUT[] "" + +// inout arrays + +%typemap(ctype) CTYPE INOUT[] "CTYPE*" +%typemap(cstype) CTYPE INOUT[] "CSTYPE[]" +%typemap(imtype, inattributes="[In, Out, MarshalAs(UnmanagedType.LPArray)]") CTYPE INOUT[] "CSTYPE[]" +%typemap(csin) CTYPE INOUT[] "$csinput" + +%typemap(in) CTYPE INOUT[] "$1 = $input;" +%typemap(freearg) CTYPE INOUT[] "" +%typemap(argout) CTYPE INOUT[] "" + +%enddef // CSHARP_ARRAYS + +CSHARP_ARRAYS(signed char, sbyte) +CSHARP_ARRAYS(unsigned char, byte) +CSHARP_ARRAYS(short, short) +CSHARP_ARRAYS(unsigned short, ushort) +CSHARP_ARRAYS(int, int) +CSHARP_ARRAYS(unsigned int, uint) +// FIXME - on Unix 64 bit, long is 8 bytes but is 4 bytes on Windows 64 bit. +// How can this be handled sensibly? +// See e.g. http://www.xml.com/ldd/chapter/book/ch10.html +CSHARP_ARRAYS(long, int) +CSHARP_ARRAYS(unsigned long, uint) +CSHARP_ARRAYS(long long, long) +CSHARP_ARRAYS(unsigned long long, ulong) +CSHARP_ARRAYS(float, float) +CSHARP_ARRAYS(double, double) + + +%define CSHARP_ARRAYS_FIXED( CTYPE, CSTYPE ) + +%typemap(ctype) CTYPE FIXED[] "CTYPE*" +%typemap(imtype) CTYPE FIXED[] "IntPtr" +%typemap(cstype) CTYPE FIXED[] "CSTYPE[]" +%typemap(csin, + pre= " fixed ( CSTYPE* swig_ptrTo_$csinput = $csinput ) {", + terminator=" }") + CTYPE FIXED[] "(IntPtr)swig_ptrTo_$csinput" + +%typemap(in) CTYPE FIXED[] "$1 = $input;" +%typemap(freearg) CTYPE FIXED[] "" +%typemap(argout) CTYPE FIXED[] "" + + +%enddef // CSHARP_ARRAYS_FIXED + +CSHARP_ARRAYS_FIXED(signed char, sbyte) +CSHARP_ARRAYS_FIXED(unsigned char, byte) +CSHARP_ARRAYS_FIXED(short, short) +CSHARP_ARRAYS_FIXED(unsigned short, ushort) +CSHARP_ARRAYS_FIXED(int, int) +CSHARP_ARRAYS_FIXED(unsigned int, uint) +CSHARP_ARRAYS_FIXED(long, int) +CSHARP_ARRAYS_FIXED(unsigned long, uint) +CSHARP_ARRAYS_FIXED(long long, long) +CSHARP_ARRAYS_FIXED(unsigned long long, ulong) +CSHARP_ARRAYS_FIXED(float, float) +CSHARP_ARRAYS_FIXED(double, double) + diff --git a/Lib/csharp/boost_shared_ptr.i b/Lib/csharp/boost_shared_ptr.i index 47fbaba1d..2cb687356 100644 --- a/Lib/csharp/boost_shared_ptr.i +++ b/Lib/csharp/boost_shared_ptr.i @@ -33,7 +33,7 @@ // plain reference %typemap(in, canthrow=1) CONST TYPE & %{ $1 = ($1_ltype)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0); - if(!$1) { + if (!$1) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0); return $null; } %} @@ -199,22 +199,26 @@ %typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE { lock(this) { - if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwnBase) { - swigCMemOwnBase = false; - $imcall; + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwnBase) { + swigCMemOwnBase = false; + $imcall; + } + swigCPtr = new HandleRef(null, IntPtr.Zero); } - swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); } } %typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE { lock(this) { - if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $imcall; + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $imcall; + } + swigCPtr = new HandleRef(null, IntPtr.Zero); } - swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); base.Dispose(); } diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg index 35e5c26d7..94f76a3ad 100644 --- a/Lib/csharp/csharp.swg +++ b/Lib/csharp/csharp.swg @@ -396,7 +396,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { SWIG_UnpackData($input, (void *)&$1, sizeof($1)); %} %typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input; - if(!$1) { + if (!$1) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0); return $null; } %} @@ -428,7 +428,8 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { %typemap(directorin) SWIGTYPE & %{ $input = ($1_ltype) &$1; %} -%typemap(csdirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "new $csclassname($iminput, false)" +%typemap(csdirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*) "($iminput == IntPtr.Zero) ? null : new $csclassname($iminput, false)" +%typemap(csdirectorin) SWIGTYPE & "new $csclassname($iminput, false)" %typemap(csdirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "$csclassname.getCPtr($cscall).Handle" /* Default array handling */ @@ -884,22 +885,26 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { %typemap(csdestruct, methodname="Dispose", methodmodifiers="public") SWIGTYPE { lock(this) { - if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { - swigCMemOwn = false; - $imcall; + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + $imcall; + } + swigCPtr = new HandleRef(null, IntPtr.Zero); } - swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); } } %typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") SWIGTYPE { lock(this) { - if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { - swigCMemOwn = false; - $imcall; + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + $imcall; + } + swigCPtr = new HandleRef(null, IntPtr.Zero); } - swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); base.Dispose(); } diff --git a/Lib/csharp/std_vector.i b/Lib/csharp/std_vector.i old mode 100755 new mode 100644 index a04831f75..f4ad88bae --- a/Lib/csharp/std_vector.i +++ b/Lib/csharp/std_vector.i @@ -6,15 +6,22 @@ * * SWIG typemaps for std::vector * C# implementation - * The C# wrapper is made to look and feel like a typesafe C# System.Collections.ArrayList - * All the methods in IList are defined, but we don't derive from IList as this is a typesafe collection. - * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents! + * The C# wrapper is made to look and feel like a C# System.Collections.Generic.List<> collection. + * For .NET 1 compatibility, define SWIG_DOTNET_1 when compiling the C# code; then the C# wrapper is + * made to look and feel like a typesafe C# System.Collections.ArrayList. All the methods in IList + * are defined, but we don't derive from IList as this is a typesafe collection and the C++ operator== + * must always be defined for the collection type (which it isn't). * * Very often the C# generated code will not compile as the C++ template type is not the same as the C# * proxy type, so use the SWIG_STD_VECTOR_SPECIALIZE or SWIG_STD_VECTOR_SPECIALIZE_MINIMUM macro, eg * * SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(Klass, SomeNamespace::Klass) * %template(VectKlass) std::vector; + * + * Note that IEnumerable<> is implemented in the proxy class which is useful for using LINQ with + * C++ std::vector wrappers. + * + * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents! * ----------------------------------------------------------------------------- */ // Warning: Use the typemaps here in the expectation that the macros they are in will change name. @@ -24,8 +31,8 @@ // MACRO for use within the std::vector class body // CSTYPE and CTYPE respectively correspond to the types in the cstype and ctype typemaps -%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) -%typemap(csinterfaces) std::vector "IDisposable, System.Collections.IEnumerable"; +%define SWIG_STD_VECTOR_MINIMUM_INTERNAL(CONST_REFERENCE_TYPE, CSTYPE, CTYPE...) +%typemap(csinterfaces) std::vector "IDisposable, System.Collections.IEnumerable\n#if !SWIG_DOTNET_1\n , System.Collections.Generic.IEnumerable\n#endif\n"; %typemap(cscode) std::vector %{ public $csclassname(System.Collections.ICollection c) : this() { if (c == null) @@ -79,15 +86,30 @@ } } - public void CopyTo(System.Array array) { +#if SWIG_DOTNET_1 + public void CopyTo(System.Array array) +#else + public void CopyTo(CSTYPE[] array) +#endif + { CopyTo(0, array, 0, this.Count); } - public void CopyTo(System.Array array, int arrayIndex) { +#if SWIG_DOTNET_1 + public void CopyTo(System.Array array, int arrayIndex) +#else + public void CopyTo(CSTYPE[] array, int arrayIndex) +#endif + { CopyTo(0, array, arrayIndex, this.Count); } - public void CopyTo(int index, System.Array array, int arrayIndex, int count) { +#if SWIG_DOTNET_1 + public void CopyTo(int index, System.Array array, int arrayIndex, int count) +#else + public void CopyTo(int index, CSTYPE[] array, int arrayIndex, int count) +#endif + { if (array == null) throw new ArgumentNullException("array"); if (index < 0) @@ -97,14 +119,19 @@ if (count < 0) throw new ArgumentOutOfRangeException("count", "Value is less than zero"); if (array.Rank > 1) - throw new ArgumentException("Multi dimensional array."); + throw new ArgumentException("Multi dimensional array.", "array"); if (index+count > this.Count || arrayIndex+count > array.Length) throw new ArgumentException("Number of elements to copy is too large."); for (int i=0; i System.Collections.Generic.IEnumerable.GetEnumerator() { + return new $csclassnameEnumerator(this); + } +#endif + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { return new $csclassnameEnumerator(this); } @@ -118,7 +145,11 @@ /// whenever the collection is modified. This has been done for changes in the size of the /// collection but not when one of the elements of the collection is modified as it is a bit /// tricky to detect unmanaged code that modifies the collection under our feet. - public sealed class $csclassnameEnumerator : System.Collections.IEnumerator { + public sealed class $csclassnameEnumerator : System.Collections.IEnumerator +#if !SWIG_DOTNET_1 + , System.Collections.Generic.IEnumerator +#endif + { private $csclassname collectionRef; private int currentIndex; private object currentObject; @@ -170,13 +201,20 @@ throw new InvalidOperationException("Collection modified."); } } + +#if !SWIG_DOTNET_1 + public void Dispose() { + currentIndex = -1; + currentObject = null; + } +#endif } %} public: typedef size_t size_type; typedef CTYPE value_type; - typedef const value_type& const_reference; + typedef CONST_REFERENCE_TYPE const_reference; %rename(Clear) clear; void clear(); %rename(Add) push_back; @@ -286,8 +324,14 @@ } %enddef +%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) +SWIG_STD_VECTOR_MINIMUM_INTERNAL(const value_type&, CSTYPE, CTYPE) +%enddef + + // Extra methods added to the collection class if operator== is defined for the class being wrapped // CSTYPE and CTYPE respectively correspond to the types in the cstype and ctype typemaps +// The class will then implement IList<>, which adds extra functionality %define SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CSTYPE, CTYPE...) %extend { bool Contains(const value_type& value) { @@ -307,10 +351,13 @@ index = (int)(self->rend() - 1 - rit); return index; } - void Remove(const value_type& value) { + bool Remove(const value_type& value) { std::vector::iterator it = std::find(self->begin(), self->end(), value); - if (it != self->end()) + if (it != self->end()) { self->erase(it); + return true; + } + return false; } } %enddef @@ -334,7 +381,6 @@ namespace std { } %enddef - %{ #include #include @@ -361,11 +407,15 @@ namespace std { template class vector { SWIG_STD_VECTOR_MINIMUM(T, const T*) }; + // bool is a bit different in the C++ standard + template<> class vector { + SWIG_STD_VECTOR_MINIMUM_INTERNAL(bool, bool, bool) + SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(bool, bool) + }; } // template specializations for std::vector // these provide extra collections methods as operator== is defined -SWIG_STD_VECTOR_SPECIALIZE(bool, bool) SWIG_STD_VECTOR_SPECIALIZE(char, char) SWIG_STD_VECTOR_SPECIALIZE(sbyte, signed char) SWIG_STD_VECTOR_SPECIALIZE(byte, unsigned char) @@ -381,4 +431,3 @@ SWIG_STD_VECTOR_SPECIALIZE(float, float) SWIG_STD_VECTOR_SPECIALIZE(double, double) SWIG_STD_VECTOR_SPECIALIZE(string, std::string) // also requires a %include - diff --git a/Lib/csharp/std_wstring.i b/Lib/csharp/std_wstring.i old mode 100755 new mode 100644 diff --git a/Lib/csharp/wchar.i b/Lib/csharp/wchar.i old mode 100755 new mode 100644 diff --git a/Lib/intrusive_ptr.i b/Lib/intrusive_ptr.i new file mode 100644 index 000000000..7a686cfc5 --- /dev/null +++ b/Lib/intrusive_ptr.i @@ -0,0 +1,96 @@ +// Allow for different namespaces for shared_ptr / intrusive_ptr - they could be boost or std or std::tr1 +// For example for std::tr1, use: +// #define SWIG_SHARED_PTR_NAMESPACE std +// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1 +// #define SWIG_INTRUSIVE_PTR_NAMESPACE boost +// #define SWIG_INTRUSIVE_PTR_SUBNAMESPACE + +#if !defined(SWIG_INTRUSIVE_PTR_NAMESPACE) +# define SWIG_INTRUSIVE_PTR_NAMESPACE boost +#endif + +#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) +# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE::SWIG_INTRUSIVE_PTR_SUBNAMESPACE +#else +# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE +#endif + +namespace SWIG_INTRUSIVE_PTR_NAMESPACE { +#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) + namespace SWIG_INTRUSIVE_PTR_SUBNAMESPACE { +#endif + template class intrusive_ptr { + }; +#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) + } +#endif +} + +%fragment("SWIG_intrusive_deleter", "header") { +template struct SWIG_intrusive_deleter +{ + void operator()(T * p) + { + if(p) intrusive_ptr_release(p); + } +}; +} + +%fragment("SWIG_null_deleter", "header") { +struct SWIG_null_deleter { + void operator() (void const *) const { + } +}; +%#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter() +%#define SWIG_NO_NULL_DELETER_1 +} + +// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types +// For plain classes, do not use for derived classes +%define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...) +SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, , TYPE) +SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) +%enddef + +// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types +// For derived classes +%define SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...) +SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, , TYPE) +SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) +%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >) %{ + *newmemory = SWIG_CAST_NEW_MEMORY; + return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *)$from); + %} +%extend TYPE { + static SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { + return swigSharedPtrUpcast; + } +} +%enddef + +// Extra user macro for including classes in intrusive_ptr typemaps for both const and non-const pointer types +// This caters for classes which cannot be wrapped by intrusive_ptrs but are still part of the class hierarchy +// For plain classes, do not use for derived classes +%define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...) +SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, , TYPE) +SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, const, TYPE) +%enddef + +// Extra user macro for including classes in intrusive_ptr typemaps for both const and non-const pointer types +// This caters for classes which cannot be wrapped by intrusive_ptrs but are still part of the class hierarchy +// For derived classes +%define SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE...) +SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, , TYPE) +SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, const, TYPE) +%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >) %{ + *newmemory = SWIG_CAST_NEW_MEMORY; + return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *)$from); +%} +%extend TYPE { + static SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { + return swigSharedPtrUpcast; + } +} +%enddef + + diff --git a/Lib/java/boost_intrusive_ptr.i b/Lib/java/boost_intrusive_ptr.i new file mode 100644 index 000000000..48f6c317b --- /dev/null +++ b/Lib/java/boost_intrusive_ptr.i @@ -0,0 +1,460 @@ +%include + +%define SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) + +%naturalvar TYPE; +%naturalvar SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; + +// destructor mods +%feature("unref") TYPE "(void)arg1; delete smartarg1;" + + +%typemap(in) CONST TYPE ($&1_type argp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain value + argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; + if (!argp) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); + return $null; + } + $1 = *argp; +%} +%typemap(out, fragment="SWIG_intrusive_deleter") CONST TYPE %{ + //plain value(out) + $1_ltype* resultp = new $1_ltype(($1_ltype &)$1); + intrusive_ptr_add_ref(resultp); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(resultp, SWIG_intrusive_deleter< CONST TYPE >()); +%} + +%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain pointer + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; + $1 = (TYPE *)(smartarg ? smartarg->get() : 0); +%} +%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE * %{ + //plain pointer(out) + #if ($owner) + if ($1) { + intrusive_ptr_add_ref($1); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + #else + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; + #endif +%} + +%typemap(in) CONST TYPE & (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain reference + $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + if(!$1) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); + return $null; + } +%} +%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE & %{ + //plain reference(out) + #if ($owner) + if ($1) { + intrusive_ptr_add_ref($1); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + #else + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; + #endif +%} + +%typemap(in) CONST TYPE *& ($*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain pointer by reference + temp = ((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + $1 = &temp; +%} +%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE *& %{ + // plain pointer by reference(out) + #if ($owner) + if (*$1) { + intrusive_ptr_add_ref(*$1); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1, SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + #else + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_0); + #endif +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > ($&1_type argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by value + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + if (smartarg) { + $1 = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + } +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{ + if ($1) { + intrusive_ptr_add_ref(result.get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(result.get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } +%} + +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ + // shared_ptr by value + smartarg = *($&1_ltype*)&$input; + if (smartarg) $1 = *smartarg; +%} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ + *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by reference + if ( $input ) { + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + $1 = &temp; + } else { + $1 = &tempnull; + } +%} +%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ + delete &($1); + if ($self) { + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * temp = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); + $1 = *temp; + } +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ + if (*$1) { + intrusive_ptr_add_ref($1->get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by pointer + if ( $input ) { + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + $1 = &temp; + } else { + $1 = &tempnull; + } +%} +%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ + delete $1; + if ($self) $1 = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ + if ($1 && *$1) { + intrusive_ptr_add_ref($1->get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + if ($owner) delete $1; +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& (SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > temp, $*1_ltype tempp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by pointer reference + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + if ($input) { + temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + } + tempp = &temp; + $1 = &tempp; +%} +%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ + if ($self) $1 = *$input; +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ + if (*$1 && **$1) { + intrusive_ptr_add_ref((*$1)->get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >((*$1)->get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } +%} + +// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug +%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} +%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} + + +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "PROXYCLASS" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "PROXYCLASS.getCPtr($javainput)" + +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } +%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } + + +%typemap(javaout) CONST TYPE { + return new PROXYCLASS($jnicall, true); + } +%typemap(javaout) CONST TYPE & { + return new PROXYCLASS($jnicall, true); + } +%typemap(javaout) CONST TYPE * { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } +%typemap(javaout) CONST TYPE *& { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } + +// Base proxy classes +%typemap(javabody) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnBase; + + protected $javaclassname(long cPtr, boolean cMemoryOwn) { + swigCMemOwnBase = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +// Derived proxy classes +%typemap(javabody_derived) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnDerived; + + protected $javaclassname(long cPtr, boolean cMemoryOwn) { + super($imclassname.$javaclassname_SWIGSharedPtrUpcast(cPtr), true); + swigCMemOwnDerived = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { + if(swigCPtr != 0 && swigCMemOwnBase) { + swigCMemOwnBase = false; + $jnicall; + } + swigCPtr = 0; + } + +%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { + if(swigCPtr != 0 && swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $jnicall; + } + swigCPtr = 0; + super.delete(); + } + +// CONST version needed ???? also for C# +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" + + +%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; +%template() SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; +%enddef + + +///////////////////////////////////////////////////////////////////// + + +%include + +%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, CONST, TYPE...) + +%naturalvar TYPE; +%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; + +// destructor mods +%feature("unref") TYPE "(void)arg1; delete smartarg1;" + + +// plain value +%typemap(in) CONST TYPE ($&1_type argp = 0) %{ + argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; + if (!argp) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); + return $null; + } + $1 = *argp; %} +%typemap(out) CONST TYPE +%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %} + +// plain pointer +%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; + $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{ + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0; +%} + +// plain reference +%typemap(in) CONST TYPE & %{ + $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + if (!$1) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); + return $null; + } %} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & +%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %} + +// plain pointer by reference +%typemap(in) CONST TYPE *& ($*1_ltype temp = 0) +%{ temp = ((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + $1 = &temp; %} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE *& +%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %} + +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ + // shared_ptr by value + smartarg = *($&1_ltype*)&$input; + if (smartarg) $1 = *smartarg; +%} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ + *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; +%} + +// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug +%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} +%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} + + +%typemap (jni) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong" +%typemap (jtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long" +%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS" +%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS.getCPtr($javainput)" +%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } + +%typemap(javaout) CONST TYPE { + return new PROXYCLASS($jnicall, true); + } +%typemap(javaout) CONST TYPE & { + return new PROXYCLASS($jnicall, true); + } +%typemap(javaout) CONST TYPE * { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } +%typemap(javaout) CONST TYPE *& { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); + } + +// Base proxy classes +%typemap(javabody) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnBase; + + protected $javaclassname(long cPtr, boolean cMemoryOwn) { + swigCMemOwnBase = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +// Derived proxy classes +%typemap(javabody_derived) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnDerived; + + protected $javaclassname(long cPtr, boolean cMemoryOwn) { + super($imclassname.$javaclassname_SWIGSharedPtrUpcast(cPtr), true); + swigCMemOwnDerived = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { + if (swigCPtr != 0) { + if (swigCMemOwnBase) { + swigCMemOwnBase = false; + $jnicall; + } + swigCPtr = 0; + } + } + +%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { + if (swigCPtr != 0) { + if (swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $jnicall; + } + swigCPtr = 0; + } + super.delete(); + } + +// CONST version needed ???? also for C# +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" + + +%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; +%enddef + diff --git a/Lib/java/boost_shared_ptr.i b/Lib/java/boost_shared_ptr.i index 1f555bf85..75762f84f 100644 --- a/Lib/java/boost_shared_ptr.i +++ b/Lib/java/boost_shared_ptr.i @@ -33,7 +33,7 @@ // plain reference %typemap(in) CONST TYPE & %{ $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - if(!$1) { + if (!$1) { SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); return $null; } %} @@ -166,19 +166,23 @@ %} %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { - if(swigCPtr != 0 && swigCMemOwnBase) { - swigCMemOwnBase = false; - $jnicall; + if (swigCPtr != 0) { + if (swigCMemOwnBase) { + swigCMemOwnBase = false; + $jnicall; + } + swigCPtr = 0; } - swigCPtr = 0; } %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { - if(swigCPtr != 0 && swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $jnicall; + if (swigCPtr != 0) { + if (swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $jnicall; + } + swigCPtr = 0; } - swigCPtr = 0; super.delete(); } diff --git a/Lib/java/java.swg b/Lib/java/java.swg index b7c5607c3..bd2357a86 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -364,7 +364,7 @@ } %typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } -%typemap(out, noblock=1) char * { if($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } +%typemap(out, noblock=1) char * { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } %typemap(javadirectorin) char * "$jniinput" %typemap(javadirectorout) char * "$javacall" @@ -378,7 +378,7 @@ $1 = &temp; } %typemap(freearg, noblock=1) char *& { if ($1 && *$1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)*$1); } -%typemap(out, noblock=1) char *& { if(*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); } +%typemap(out, noblock=1) char *& { if (*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); } %typemap(out) void "" %typemap(javadirectorin) void "$jniinput" @@ -597,7 +597,7 @@ /* Generic pointers and references */ %typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %} %typemap(in) SWIGTYPE & %{ $1 = *($&1_ltype)&$input; - if(!$1) { + if (!$1) { SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); return $null; } %} @@ -620,7 +620,8 @@ %typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE & %{ *($&1_ltype)&$input = ($1_ltype) &$1; %} -%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "new $javaclassname($jniinput, false)" +%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*) "($jniinput == 0) ? null : new $javaclassname($jniinput, false)" +%typemap(javadirectorin) SWIGTYPE & "new $javaclassname($jniinput, false)" %typemap(javadirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "$javaclassname.getCPtr($javacall)" /* Default array handling */ @@ -655,7 +656,7 @@ %typemap(argout) char[ANY], char[] "" %typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } -%typemap(out, noblock=1) char[ANY], char[] { if($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } +%typemap(out, noblock=1) char[ANY], char[] { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } %typemap(javadirectorin) char[ANY], char[] "$jniinput" %typemap(javadirectorout) char[ANY], char[] "$javacall" @@ -1147,19 +1148,23 @@ SWIG_PROXY_CONSTRUCTOR(true, false, TYPENAME) SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE) %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE { - if(swigCPtr != 0 && swigCMemOwn) { - swigCMemOwn = false; - $jnicall; + if (swigCPtr != 0) { + if (swigCMemOwn) { + swigCMemOwn = false; + $jnicall; + } + swigCPtr = 0; } - swigCPtr = 0; } %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE { - if(swigCPtr != 0 && swigCMemOwn) { - swigCMemOwn = false; - $jnicall; + if (swigCPtr != 0) { + if (swigCMemOwn) { + swigCMemOwn = false; + $jnicall; + } + swigCPtr = 0; } - swigCPtr = 0; super.delete(); } @@ -1190,7 +1195,8 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE) #define %javaenum(wrapapproach) %feature("java:enum","wrapapproach") #define %javamethodmodifiers %feature("java:methodmodifiers") #define %javaexception(exceptionclasses) %feature("except",throws=exceptionclasses) -#define %nojavaexception %feature("except","",throws="") +#define %nojavaexception %feature("except","0",throws="") +#define %clearjavaexception %feature("except","",throws="") %pragma(java) jniclassclassmodifiers="class" %pragma(java) moduleclassmodifiers="public class" diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index 4aa0c84b5..fc4c4e267 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -34,7 +34,7 @@ %insert(runtime) %{ /* Fix for jlong on some versions of gcc on Windows */ -#if defined(__GNUC__) && !defined(__INTELC__) +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) typedef long long __int64; #endif diff --git a/Lib/java/std_vector.i b/Lib/java/std_vector.i index 92fa25ac2..29439606b 100644 --- a/Lib/java/std_vector.i +++ b/Lib/java/std_vector.i @@ -46,6 +46,40 @@ namespace std { } } }; + + // bool specialization + template<> class vector { + public: + typedef size_t size_type; + typedef bool value_type; + typedef bool const_reference; + vector(); + vector(size_type n); + size_type size() const; + size_type capacity() const; + void reserve(size_type n); + %rename(isEmpty) empty; + bool empty() const; + void clear(); + %rename(add) push_back; + void push_back(const value_type& x); + %extend { + const_reference get(int i) throw (std::out_of_range) { + int size = int(self->size()); + if (i>=0 && isize()); + if (i>=0 && i=0),"number must not be negative") +$1 = ($type)lua_tonumber(L, $input);%} %typemap(out) int,short,long, unsigned int,unsigned short,unsigned long, @@ -41,15 +45,20 @@ %typemap(in,checkfn="lua_isnumber") const int&($basetype temp) %{ temp=($basetype)lua_tonumber(L,$input); $1=&temp;%} -%typemap(out) const int& +%typemap(in,checkfn="lua_isnumber") const unsigned int&($basetype temp) +%{SWIG_contract_assert((lua_tonumber(L,$input)>=0),"number must not be negative") +temp=($basetype)lua_tonumber(L,$input); $1=&temp;%} + +%typemap(out) const int&, const unsigned int& %{ lua_pushnumber(L, (lua_Number) *$1); SWIG_arg++;%} // for the other numbers we can just use an apply statement to cover them -%apply const int & {const short&,const long&, - const unsigned int&,const unsigned short&,const unsigned long&, - const signed char&,const unsigned char&, +%apply const int & {const short&,const long&,const signed char&, const float&,const double&}; +%apply const unsigned int & {const unsigned short&,const unsigned long&, + const unsigned char&}; + /* enums have to be handled slightly differently VC++ .net will not allow a cast from lua_Number(double) to enum directly. */ diff --git a/Lib/ocaml/std_deque.i b/Lib/ocaml/std_deque.i index 44815ebda..baadb4e53 100644 --- a/Lib/ocaml/std_deque.i +++ b/Lib/ocaml/std_deque.i @@ -28,4 +28,4 @@ } }; -%include <_std_deque.i> +%include diff --git a/Lib/octave/carrays.i b/Lib/octave/carrays.i index 454762aa1..014de37ff 100644 --- a/Lib/octave/carrays.i +++ b/Lib/octave/carrays.i @@ -1,5 +1,5 @@ %define %array_class(TYPE,NAME) - %array_class_wrap(TYPE,NAME,__paren,__paren_asgn) + %array_class_wrap(TYPE,NAME,__paren__,__paren_asgn__) %enddef %include diff --git a/Lib/octave/octcontainer.swg b/Lib/octave/octcontainer.swg index bb1122a7b..afc3ed147 100644 --- a/Lib/octave/octcontainer.swg +++ b/Lib/octave/octcontainer.swg @@ -204,7 +204,7 @@ namespace swig operator T () const { - // swig::PyObject_var item = OctSequence_GetItem(_seq, _index); + // swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, _index); octave_value item; // * todo try { return swig::as(item, true); @@ -410,7 +410,7 @@ namespace swig { int s = size(); for (int i = 0; i < s; ++i) { - // swig::PyObject_var item = OctSequence_GetItem(_seq, i); + // swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, i); octave_value item; // * todo if (!swig::check(item)) { if (set_err) { @@ -453,7 +453,7 @@ namespace swig $result = Cell(tmpc); } - %fragment("PyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="OctSequence_Cont") {} + %fragment("SwigPyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="OctSequence_Cont") {} %typemap(out,fragment="OctPairBoolOutputIterator") std::pair, std::pair { @@ -513,11 +513,11 @@ namespace swig return x; } - value_type __paren(difference_type i) throw (std::out_of_range) { + value_type __paren__(difference_type i) throw (std::out_of_range) { return *(swig::cgetpos(self, i)); } - void __paren_asgn(difference_type i, value_type x) throw (std::out_of_range) { + void __paren_asgn__(difference_type i, value_type x) throw (std::out_of_range) { *(swig::getpos(self,i)) = x; } diff --git a/Lib/octave/octopers.swg b/Lib/octave/octopers.swg index a9ccf44b8..c38e64d8c 100644 --- a/Lib/octave/octopers.swg +++ b/Lib/octave/octopers.swg @@ -6,68 +6,68 @@ // operators supported in Octave, and the methods they are routed to -// __brace a{args} -// __brace_asgn a{args} = rhs -// __paren a(args) -// __paren_asgn a(args) = rhs -// __str generates string rep +// __brace__ a{args} +// __brace_asgn__ a{args} = rhs +// __paren__ a(args) +// __paren_asgn__ a(args) = rhs +// __str__ generates string rep -// __not !a -// __uplus +a -// __uminus -a -// __transpose a.' -// __hermitian a' -// __incr a++ -// __decr a-- -// __add a + b -// __sub a - b -// __mul a * b -// __div a / b -// __pow a ^ b -// __ldiv a \ b -// __lshift a << b -// __rshift a >> b -// __lt a < b -// __le a <= b -// __eq a == b -// __ge a >= b -// __gt a > b -// __ne a != b -// __el_mul a .* b -// __el_div a ./ b -// __el_pow a .^ b -// __el_ldiv a .\ b -// __el_and a & b -// __el_or a | b +// __not__ !a +// __uplus__ +a +// __uminus__ -a +// __transpose__ a.' +// __hermitian__ a' +// __incr__ a++ +// __decr__ a-- +// __add__ a + b +// __sub__ a - b +// __mul__ a * b +// __div__ a / b +// __pow__ a ^ b +// __ldiv__ a \ b +// __lshift__ a << b +// __rshift__ a >> b +// __lt__ a < b +// __le__ a <= b +// __eq__ a == b +// __ge__ a >= b +// __gt__ a > b +// __ne__ a != b +// __el_mul__ a .* b +// __el_div__ a ./ b +// __el_pow__ a .^ b +// __el_ldiv__ a .\ b +// __el_and__ a & b +// __el_or__ a | b // operators supported in C++, and the methods that route to them -%rename(__add) *::operator+; -%rename(__add) *::operator+(); -%rename(__add) *::operator+() const; -%rename(__sub) *::operator-; -%rename(__uminus) *::operator-(); -%rename(__uminus) *::operator-() const; -%rename(__mul) *::operator*; -%rename(__div) *::operator/; -%rename(__mod) *::operator%; -%rename(__lshift) *::operator<<; -%rename(__rshift) *::operator>>; -%rename(__el_and) *::operator&&; -%rename(__el_or) *::operator||; -%rename(__xor) *::operator^; -%rename(__invert) *::operator~; -%rename(__lt) *::operator<; -%rename(__le) *::operator<=; -%rename(__gt) *::operator>; -%rename(__ge) *::operator>=; -%rename(__eq) *::operator==; -%rename(__ne) *::operator!=; -%rename(__not) *::operator!; -%rename(__incr) *::operator++; -%rename(__decr) *::operator--; -%rename(__paren) *::operator(); -%rename(__brace) *::operator[]; +%rename(__add__) *::operator+; +%rename(__add__) *::operator+(); +%rename(__add__) *::operator+() const; +%rename(__sub__) *::operator-; +%rename(__uminus__) *::operator-(); +%rename(__uminus__) *::operator-() const; +%rename(__mul__) *::operator*; +%rename(__div__) *::operator/; +%rename(__mod__) *::operator%; +%rename(__lshift__) *::operator<<; +%rename(__rshift__) *::operator>>; +%rename(__el_and__) *::operator&&; +%rename(__el_or__) *::operator||; +%rename(__xor__) *::operator^; +%rename(__invert__) *::operator~; +%rename(__lt__) *::operator<; +%rename(__le__) *::operator<=; +%rename(__gt__) *::operator>; +%rename(__ge__) *::operator>=; +%rename(__eq__) *::operator==; +%rename(__ne__) *::operator!=; +%rename(__not__) *::operator!; +%rename(__incr__) *::operator++; +%rename(__decr__) *::operator--; +%rename(__paren__) *::operator(); +%rename(__brace__) *::operator[]; // Ignored inplace operators %ignoreoperator(PLUSEQ) operator+=; diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index 07aa47cb5..c48310e27 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -589,7 +589,7 @@ namespace Swig { // index operator else { if (ops[skip] == '(' || ops[skip] == '{') { - const char *op_name = ops[skip] == '(' ? "__paren" : "__brace"; + const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__"; octave_value_list args; args.append(*idx_it++); ++skip; @@ -628,7 +628,7 @@ namespace Swig { } else if (ops[skip] == '(' || ops[skip] == '{') { - const char *op_name = ops[skip] == '(' ? "__paren_asgn" : "__brace_asgn"; + const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__"; member_value_pair *m = find_member(op_name, false); if (m) { octave_value_list args; @@ -666,40 +666,27 @@ namespace Swig { virtual bool is_string() const { octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); - return !!nc_this->find_member("__str", false); + return !!nc_this->find_member("__str__", false); } virtual std::string string_value(bool force = false) const { octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); - member_value_pair *m = nc_this->find_member("__str", false); + member_value_pair *m = nc_this->find_member("__str__", false); if (!m) { - error("__str method not defined"); + error("__str__ method not defined"); return std::string(); } octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1); if (outarg.length() < 1 || !outarg(0).is_string()) { - error("__str method did not return a string"); + error("__str__ method did not return a string"); return std::string(); } return outarg(0).string_value(); } - /* virtual Octave_map map_value() const { - octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); - member_value_pair *m = nc_this->find_member("__str", false); - if (!m) { - error("__map method not defined"); - return std::string(); - } - octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1); - if (outarg.length() < 1 || !outarg(0).is_map()) { - error("__map method did not return a string"); - return std::string(); - } - return outarg(0).map_value(); + return Octave_map(); } - */ virtual string_vector map_keys() const { member_map tmp; @@ -713,6 +700,35 @@ namespace Swig { return keys; } + virtual bool save_ascii (std::ostream& os) { + return true; + } + + virtual bool load_ascii (std::istream& is) { + return true; + } + + virtual bool save_binary (std::ostream& os, bool& save_as_floats) { + return true; + } + + virtual bool load_binary (std::istream& is, bool swap, + oct_mach_info::float_format fmt) { + return true; + } + +#if defined (HAVE_HDF5) + virtual bool + save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { + return true; + } + + virtual bool + load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { + return true; + } +#endif + virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const { return string_value(); } @@ -737,7 +753,7 @@ namespace Swig { assert(ost); octave_value ret; - if (ost->dispatch_unary_op(std::string("__") + op_name, ret)) + if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret)) return ret; std::string symbol = "op_" + ost->swig_type_name() + "_" + op_name; octave_value_list args; @@ -754,7 +770,7 @@ namespace Swig { octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs); octave_value ret; - if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name, rhs, ret)) + if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret)) return ret; std::string symbol; @@ -876,9 +892,35 @@ namespace Swig { virtual std::string string_value(bool force = false) const { return ptr->string_value(force); } + virtual Octave_map map_value() const + { return ptr->map_value(); } + virtual string_vector map_keys() const { return ptr->map_keys(); } + virtual bool save_ascii (std::ostream& os) + { return ptr->save_ascii(os); } + + virtual bool load_ascii (std::istream& is) + { return ptr->load_ascii(is); } + + virtual bool save_binary (std::ostream& os, bool& save_as_floats) + { return ptr->save_binary(os, save_as_floats); } + + virtual bool load_binary (std::istream& is, bool swap, + oct_mach_info::float_format fmt) + { return ptr->load_binary(is, swap, fmt); } + +#if defined (HAVE_HDF5) + virtual bool + save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) + { return ptr->save_hdf5(loc_id, name, save_as_floats); } + + virtual bool + load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) + { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); } +#endif + virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const { return ptr->convert_to_str(pad, force, type); } @@ -927,6 +969,37 @@ namespace Swig { void print(std::ostream &os, bool pr_as_read_syntax = false) const { os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size() << std::endl; } + + + virtual bool save_ascii (std::ostream& os) { + return true; + } + + virtual bool load_ascii (std::istream& is) { + return true; + } + + virtual bool save_binary (std::ostream& os, bool& save_as_floats) { + return true; + } + + virtual bool load_binary (std::istream& is, bool swap, + oct_mach_info::float_format fmt) { + return true; + } + +#if defined (HAVE_HDF5) + virtual bool + save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { + return true; + } + + virtual bool + load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { + return true; + } +#endif + private: DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index dd68ca4c1..82a17285a 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -3,6 +3,7 @@ #include #include #include +#include %} %insert(runtime) "swigrun.swg"; diff --git a/Lib/octave/octstdcommon.swg b/Lib/octave/octstdcommon.swg index e69c7e629..96923f40a 100644 --- a/Lib/octave/octstdcommon.swg +++ b/Lib/octave/octstdcommon.swg @@ -42,7 +42,7 @@ namespace swig { struct traits_asptr { static int asptr(const octave_value& obj, Type **val) { Type *p; - int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0; + int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); if (SWIG_IsOK(res)) { if (val) *val = p; } diff --git a/Lib/octave/std_basic_string.i b/Lib/octave/std_basic_string.i index f2dac405a..9fc0b0730 100644 --- a/Lib/octave/std_basic_string.i +++ b/Lib/octave/std_basic_string.i @@ -1,5 +1,6 @@ #if !defined(SWIG_STD_STRING) #define SWIG_STD_BASIC_STRING +#define SWIG_STD_MODERN_STL %include @@ -9,39 +10,22 @@ %fragment(SWIG_AsPtr_frag(std::basic_string),"header", fragment="SWIG_AsCharPtrAndSize") { SWIGINTERN int -SWIG_AsPtr(std::basic_string)(PyObject* obj, std::string **val) +SWIG_AsPtr(std::basic_string)(octave_value obj, std::string **val) { - static swig_type_info* string_info = - SWIG_TypeQuery("std::basic_string *"); - std::string *vptr; - if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) { - if (val) *val = vptr; - return SWIG_OLDOBJ; - } else { - PyErr_Clear(); - char* buf = 0 ; size_t size = 0; int alloc = 0; - if (SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) { - if (buf) { - if (val) *val = new std::string(buf, size - 1); - if (alloc == SWIG_NEWOBJ) %delete_array(buf); - return SWIG_NEWOBJ; - } - } else { - PyErr_Clear(); - } - if (val) { - SWIG_PYTHON_THREAD_BEGIN_BLOCK; - PyErr_SetString(PyExc_TypeError,"a string is expected"); - SWIG_PYTHON_THREAD_END_BLOCK; - } - return 0; + if (obj.is_string()) { + if (val) + *val = new std::string(obj.string_value()); + return SWIG_NEWOBJ; } -} + if (val) + error("a string is expected"); + return 0; +} } %fragment(SWIG_From_frag(std::basic_string),"header", fragment="SWIG_FromCharPtrAndSize") { -SWIGINTERNINLINE PyObject* +SWIGINTERNINLINE octave_value SWIG_From(std::basic_string)(const std::string& s) { return SWIG_FromCharPtrAndSize(s.data(), s.size()); diff --git a/Lib/octave/std_carray.i b/Lib/octave/std_carray.i index 1477479da..9e2338a61 100644 --- a/Lib/octave/std_carray.i +++ b/Lib/octave/std_carray.i @@ -17,7 +17,7 @@ namespace swig { %extend std::carray { %fragment(SWIG_Traits_frag(std::carray<_Type, _Size >), "header", - fragment="PySwigIterator_T", + fragment="SwigPyIterator_T", fragment=SWIG_Traits_frag(_Type), fragment="StdCarrayTraits") { namespace swig { @@ -36,7 +36,7 @@ namespace swig { %typemap(out,noblock=1) iterator, const_iterator { $result = SWIG_NewPointerObj(swig::make_output_iterator((const $type &)$1), - swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN); + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); } inline size_t __len__() const { return self->size(); } @@ -46,7 +46,7 @@ namespace swig { inline void __setitem__(size_t i, const _Type& v) { (*self)[i] = v; } - swig::PySwigIterator* __iter__(PyObject **PYTHON_SELF) { + swig::SwigPyIterator* __iter__(PyObject **PYTHON_SELF) { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } } diff --git a/Lib/octave/std_map.i b/Lib/octave/std_map.i index a54e5f753..20003df58 100644 --- a/Lib/octave/std_map.i +++ b/Lib/octave/std_map.i @@ -22,7 +22,7 @@ /* int res = SWIG_ERROR; if (PyDict_Check(obj)) { - PyObject_var items = PyObject_CallMethod(obj,(char *)"items",NULL); + SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); res = traits_asptr_stdseq, std::pair >::asptr(items, val); } else { map_type *p; @@ -58,8 +58,8 @@ } PyObject *obj = PyDict_New(); for (const_iterator i= map.begin(); i!= map.end(); ++i) { - swig::PyObject_var key = swig::from(i->first); - swig::PyObject_var val = swig::from(i->second); + swig::SwigVar_PyObject key = swig::from(i->first); + swig::SwigVar_PyObject val = swig::from(i->second); PyDict_SetItem(obj, key, val); } return obj; @@ -92,10 +92,10 @@ }; template - struct OctMapIterator_T : PySwigIteratorClosed_T + struct OctMapIterator_T : SwigPyIteratorClosed_T { OctMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, octave_value seq) - : PySwigIteratorClosed_T(curr, first, last, seq) + : SwigPyIteratorClosed_T(curr, first, last, seq) { } }; @@ -112,7 +112,7 @@ }; template - inline PySwigIterator* + inline SwigPyIterator* make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, octave_value seq = octave_value()) { return new OctMapKeyIterator_T(current, begin, end, seq); @@ -130,7 +130,7 @@ template - inline PySwigIterator* + inline SwigPyIterator* make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, octave_value seq = 0) { return new OctMapValueIterator_T(current, begin, end, seq); diff --git a/Lib/perl5/noembed.h b/Lib/perl5/noembed.h index a29de61f5..55c3752aa 100644 --- a/Lib/perl5/noembed.h +++ b/Lib/perl5/noembed.h @@ -91,3 +91,9 @@ #ifdef open #undef open #endif +#ifdef readdir + #undef readdir +#endif +#ifdef bind + #undef bind +#endif diff --git a/Lib/perl5/perlrun.swg b/Lib/perl5/perlrun.swg index 54d098d9b..6fb2968f0 100644 --- a/Lib/perl5/perlrun.swg +++ b/Lib/perl5/perlrun.swg @@ -205,13 +205,32 @@ SWIG_Perl_TypeProxyName(const swig_type_info *type) { } } +/* Identical to SWIG_TypeCheck, except for strcmp comparison */ SWIGRUNTIME swig_cast_info * SWIG_TypeProxyCheck(const char *c, swig_type_info *ty) { - SWIG_TypeCheck_Template(( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) - || (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0))), ty); + if (ty) { + swig_cast_info *iter = ty->cast; + while (iter) { + if ( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) || + (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0)) ) { + if (iter == ty->cast) + return iter; + /* Move iter to the top of the linked list */ + iter->prev->next = iter->next; + if (iter->next) + iter->next->prev = iter->prev; + iter->next = ty->cast; + iter->prev = 0; + if (ty->cast) ty->cast->prev = iter; + ty->cast = iter; + return iter; + } + iter = iter->next; + } + } + return 0; } - /* Function for getting a pointer value */ SWIGRUNTIME int diff --git a/Lib/perl5/perlstrings.swg b/Lib/perl5/perlstrings.swg index 2083f0bba..242a9c967 100644 --- a/Lib/perl5/perlstrings.swg +++ b/Lib/perl5/perlstrings.swg @@ -6,6 +6,11 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc) { + if (SvMAGICAL(obj)) { + SV *tmp = sv_newmortal(); + SvSetSV(tmp, obj); + obj = tmp; + } if (SvPOK(obj)) { STRLEN len = 0; char *cstr = SvPV(obj, len); diff --git a/Lib/perl5/perltypemaps.swg b/Lib/perl5/perltypemaps.swg index c17e410b9..a59f84689 100644 --- a/Lib/perl5/perltypemaps.swg +++ b/Lib/perl5/perltypemaps.swg @@ -43,6 +43,7 @@ /* Perl types */ #define SWIG_Object SV * +#define VOID_Object sv_newmortal() /* Perl $shadow flag */ #define %newpointer_flags $shadow diff --git a/Lib/perl5/std_vector.i b/Lib/perl5/std_vector.i index b1f722d4b..7c4f72919 100644 --- a/Lib/perl5/std_vector.i +++ b/Lib/perl5/std_vector.i @@ -105,9 +105,9 @@ namespace std { } } %typemap(out) vector { - int len = $1.size(); + size_t len = $1.size(); SV **svs = new SV*[len]; - for (unsigned int i=0; i // Php4 initialization routine. +%include // PHP initialization routine. %include // Global variables. %include @@ -73,6 +73,13 @@ $1 = ($1_ltype) Z_STRVAL_PP($input); } +%typemap(in) (char *STRING, int LENGTH) +{ + convert_to_string_ex($input); + $1 = ($1_ltype) Z_STRVAL_PP($input); + $2 = ($2_ltype) Z_STRLEN_PP($input); +} + /* Object passed by value. Convert to a pointer */ %typemap(in) SWIGTYPE ($&1_ltype tmp) { @@ -103,6 +110,7 @@ SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor"); } } + %typemap(argout) SWIGTYPE *, SWIGTYPE [], SWIGTYPE&; @@ -197,15 +205,15 @@ %typemap(out) SWIGTYPE *, SWIGTYPE [], SWIGTYPE & -{ - SWIG_SetPointerZval(return_value, (void *)$1, $1_descriptor, $owner); -} +%{ + SWIG_SetPointerZval(return_value, (void *)$1, $1_descriptor, $owner); +%} %typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC { - swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1); - SWIG_SetPointerZval(return_value, (void *)$1, ty, $owner); + swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1); + SWIG_SetPointerZval(return_value, (void *)$1, ty, $owner); } %typemap(out) SWIGTYPE @@ -217,7 +225,7 @@ #else { $&1_ltype resultobj = ($&1_ltype) emalloc(sizeof($1_type)); - memmove(resultobj, &$1, sizeof($1_type)); + memcpy(resultobj, &$1, sizeof($1_type)); SWIG_SetPointerZval(return_value, (void *)resultobj, $&1_descriptor, 1); } #endif @@ -226,7 +234,9 @@ %typemap(out) char [ANY] { - RETVAL_STRINGL($1,$1_dim0,1); + int len = 0; + while (len < $1_dim0 && $1[len]) ++len; + RETVAL_STRINGL($1, len, 1); } // This typecheck does hard checking for proper argument type. If you want @@ -257,19 +267,24 @@ %php_typecheck(double,SWIG_TYPECHECK_BOOL,IS_DOUBLE) %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE - " /* typecheck SWIGTYPE */ " +{ + void *tmp; + _v = (SWIG_ConvertPtr(*$input, (void **)&tmp, $&1_descriptor, 0) >= 0); +} %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE [], SWIGTYPE & { void *tmp; - _v = (SWIG_ConvertPtr( *$input, (void**)&tmp, $1_descriptor, 0) >= 0); + _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, $1_descriptor, 0) >= 0); } %typecheck(SWIG_TYPECHECK_VOIDPTR) void * - " /* typecheck void * */ " - +{ + void *tmp; + _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, 0, 0) >= 0); +} /* Exception handling */ @@ -295,4 +310,4 @@ /* php keywords */ -%include +%include diff --git a/Lib/php4/php4init.swg b/Lib/php/phpinit.swg similarity index 100% rename from Lib/php4/php4init.swg rename to Lib/php/phpinit.swg diff --git a/Lib/php4/php4kw.swg b/Lib/php/phpkw.swg similarity index 99% rename from Lib/php4/php4kw.swg rename to Lib/php/phpkw.swg index a6b519445..3d1a62511 100644 --- a/Lib/php4/php4kw.swg +++ b/Lib/php/phpkw.swg @@ -2,7 +2,7 @@ * See the LICENSE file for information on copyright, usage and redistribution * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * php4kw.swg + * phpkw.swg * * The 'keywords' in PHP are global, ie, the following names are fine * when used as class methods. @@ -67,7 +67,7 @@ PHPKW(include_once); PHPKW(isset); PHPKW(list); PHPKW(new); -PHPKW(old_function); /* No longer reserved in PHP5 */ +// PHPKW(old_function); /* No longer reserved in PHP5 */ PHPKW(or); PHPKW(print); PHPKW(require); diff --git a/Lib/php4/phppointers.i b/Lib/php/phppointers.i similarity index 100% rename from Lib/php4/phppointers.i rename to Lib/php/phppointers.i diff --git a/Lib/php4/php4run.swg b/Lib/php/phprun.swg similarity index 96% rename from Lib/php4/php4run.swg rename to Lib/php/phprun.swg index d38452764..5196b95b4 100644 --- a/Lib/php4/php4run.swg +++ b/Lib/php/phprun.swg @@ -2,9 +2,9 @@ * See the LICENSE file for information on copyright, usage and redistribution * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * php4run.swg + * phprun.swg * - * PHP4 runtime library + * PHP runtime library * ----------------------------------------------------------------------------- */ #ifdef __cplusplus @@ -70,8 +70,8 @@ static int default_error_code = E_ERROR; if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else /* Standard SWIG API */ -#define SWIG_GetModule(clientdata) SWIG_Php4_GetModule() -#define SWIG_SetModule(clientdata, pointer) SWIG_Php4_SetModule(pointer) +#define SWIG_GetModule(clientdata) SWIG_Php_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer) /* used to wrap returned objects in so we know whether they are newobject and need freeing, or not */ @@ -199,7 +199,7 @@ SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC } static char const_name[] = "swig_runtime_data_type_pointer"; -static swig_module_info *SWIG_Php4_GetModule() { +static swig_module_info *SWIG_Php_GetModule() { zval *pointer; swig_module_info *ret = 0; @@ -216,7 +216,7 @@ static swig_module_info *SWIG_Php4_GetModule() { return ret; } -static void SWIG_Php4_SetModule(swig_module_info *pointer) { +static void SWIG_Php_SetModule(swig_module_info *pointer) { TSRMLS_FETCH(); REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, 0); } diff --git a/Lib/php4/std_common.i b/Lib/php/std_common.i similarity index 100% rename from Lib/php4/std_common.i rename to Lib/php/std_common.i diff --git a/Lib/php4/std_deque.i b/Lib/php/std_deque.i similarity index 100% rename from Lib/php4/std_deque.i rename to Lib/php/std_deque.i diff --git a/Lib/php4/std_map.i b/Lib/php/std_map.i similarity index 97% rename from Lib/php4/std_map.i rename to Lib/php/std_map.i index c35f21dc7..c6721806b 100644 --- a/Lib/php4/std_map.i +++ b/Lib/php/std_map.i @@ -30,6 +30,7 @@ namespace std { map(const map &); unsigned int size() const; + %rename(is_empty) empty; bool empty() const; void clear(); %extend { @@ -69,6 +70,7 @@ namespace std { map(const map &); unsigned int size() const; + %rename(is_empty) empty; bool empty() const; void clear(); %extend { @@ -105,6 +107,7 @@ namespace std { map(const map &); unsigned int size() const; + %rename(is_empty) empty; bool empty() const; void clear(); %extend { @@ -142,6 +145,7 @@ namespace std { map(const map &); unsigned int size() const; + %rename(is_empty) empty; bool empty() const; void clear(); %extend { diff --git a/Lib/php4/std_pair.i b/Lib/php/std_pair.i similarity index 100% rename from Lib/php4/std_pair.i rename to Lib/php/std_pair.i diff --git a/Lib/php4/std_string.i b/Lib/php/std_string.i similarity index 100% rename from Lib/php4/std_string.i rename to Lib/php/std_string.i diff --git a/Lib/php4/std_vector.i b/Lib/php/std_vector.i similarity index 98% rename from Lib/php4/std_vector.i rename to Lib/php/std_vector.i index fe084aca4..b54181618 100644 --- a/Lib/php4/std_vector.i +++ b/Lib/php/std_vector.i @@ -48,6 +48,7 @@ namespace std { public: vector(unsigned int size = 0); unsigned int size() const; + %rename(is_empty) empty; bool empty() const; void clear(); %rename(push) push_back; @@ -86,6 +87,7 @@ namespace std { public: vector(unsigned int size = 0); unsigned int size() const; + %rename(is_empty) empty; bool empty() const; void clear(); %rename(push) push_back; diff --git a/Lib/php4/stl.i b/Lib/php/stl.i similarity index 100% rename from Lib/php4/stl.i rename to Lib/php/stl.i diff --git a/Lib/php4/typemaps.i b/Lib/php/typemaps.i similarity index 62% rename from Lib/php4/typemaps.i rename to Lib/php/typemaps.i index c388fdf96..7af301d0d 100644 --- a/Lib/php4/typemaps.i +++ b/Lib/php/typemaps.i @@ -4,7 +4,7 @@ * * typemaps.i. * - * SWIG Typemap library for PHP4. + * SWIG Typemap library for PHP. * * This library provides standard typemaps for modifying SWIG's behavior. * With enough entries in this file, I hope that very few people actually @@ -96,16 +96,96 @@ int_typemap(unsigned short); int_typemap(unsigned long); int_typemap(unsigned char); +int_typemap(long long); +%typemap(argout,fragment="t_output_helper") long long *OUTPUT +{ + zval *o; + MAKE_STD_ZVAL(o); + if ((long long)LONG_MIN <= temp$argnum && temp$argnum <= (long long)LONG_MAX) { + ZVAL_LONG(o, temp$argnum); + } else { + char temp[256]; + sprintf(temp, "%lld", temp$argnum); + ZVAL_STRING(o, temp, 1); + } + t_output_helper( &$result, o ); +} +%typemap(in) TYPE *REFERENCE (long long lvalue) +%{ + // FIXME won't work for values which don't fit in a long... + convert_to_long_ex($input); + lvalue = (long long) (*$input)->value.lval; + $1 = &lvalue; +%} +%typemap(argout) long long *REFERENCE +%{ + if ((long long)LONG_MIN <= lvalue$argnum && lvalue$argnum <= (long long)LONG_MAX) { + (*$arg)->value.lval = (long)(lvalue$argnum); + (*$arg)->type = IS_LONG; + } else { + char temp[256]; + sprintf(temp, "%lld", lvalue$argnum); + ZVAL_STRING((*$arg), temp, 1); + } +%} +int_typemap(unsigned long long); +%typemap(argout,fragment="t_output_helper") unsigned long long *OUTPUT +{ + zval *o; + MAKE_STD_ZVAL(o); + if (temp$argnum <= (unsigned long long)LONG_MAX) { + ZVAL_LONG(o, temp$argnum); + } else { + char temp[256]; + sprintf(temp, "%llu", temp$argnum); + ZVAL_STRING(o, temp, 1); + } + t_output_helper( &$result, o ); +} +%typemap(in) TYPE *REFERENCE (unsigned long long lvalue) +%{ + // FIXME won't work for values which don't fit in a long... + convert_to_long_ex($input); + lvalue = (unsigned long long) (*$input)->value.lval; + $1 = &lvalue; +%} +%typemap(argout) unsigned long long *REFERENCE +%{ + if (lvalue$argnum <= (unsigned long long)LONG_MAX) { + (*$arg)->value.lval = (long)(lvalue$argnum); + (*$arg)->type = IS_LONG; + } else { + char temp[256]; + sprintf(temp, "%llu", lvalue$argnum); + ZVAL_STRING((*$arg), temp, 1); + } +%} + %typemap(in) float *INOUT = float *INPUT; %typemap(in) double *INOUT = double *INPUT; %typemap(in) int *INOUT = int *INPUT; %typemap(in) short *INOUT = short *INPUT; %typemap(in) long *INOUT = long *INPUT; +%typemap(in) long long *INOUT = long long *INPUT; %typemap(in) unsigned *INOUT = unsigned *INPUT; %typemap(in) unsigned short *INOUT = unsigned short *INPUT; %typemap(in) unsigned long *INOUT = unsigned long *INPUT; %typemap(in) unsigned char *INOUT = unsigned char *INPUT; +%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT; + +%typemap(in) float &INOUT = float *INPUT; +%typemap(in) double &INOUT = double *INPUT; + +%typemap(in) int &INOUT = int *INPUT; +%typemap(in) short &INOUT = short *INPUT; +%typemap(in) long &INOUT = long *INPUT; +%typemap(in) long long &INOUT = long long *INPUT; +%typemap(in) unsigned &INOUT = unsigned *INPUT; +%typemap(in) unsigned short &INOUT = unsigned short *INPUT; +%typemap(in) unsigned long &INOUT = unsigned long *INPUT; +%typemap(in) unsigned char &INOUT = unsigned char *INPUT; +%typemap(in) unsigned long long &INOUT = unsigned long long *INPUT; %typemap(argout) float *INOUT = float *OUTPUT; %typemap(argout) double *INOUT= double *OUTPUT; @@ -113,9 +193,23 @@ int_typemap(unsigned char); %typemap(argout) int *INOUT = int *OUTPUT; %typemap(argout) short *INOUT = short *OUTPUT; %typemap(argout) long *INOUT= long *OUTPUT; +%typemap(argout) long long *INOUT= long long *OUTPUT; %typemap(argout) unsigned short *INOUT= unsigned short *OUTPUT; %typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT; %typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT; +%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT; + +%typemap(argout) float &INOUT = float *OUTPUT; +%typemap(argout) double &INOUT= double *OUTPUT; + +%typemap(argout) int &INOUT = int *OUTPUT; +%typemap(argout) short &INOUT = short *OUTPUT; +%typemap(argout) long &INOUT= long *OUTPUT; +%typemap(argout) long long &INOUT= long long *OUTPUT; +%typemap(argout) unsigned short &INOUT= unsigned short *OUTPUT; +%typemap(argout) unsigned long &INOUT = unsigned long *OUTPUT; +%typemap(argout) unsigned char &INOUT = unsigned char *OUTPUT; +%typemap(argout) unsigned long long &INOUT = unsigned long long *OUTPUT; %typemap(in) char INPUT[ANY] ( char temp[$1_dim0] ) %{ diff --git a/Lib/php4/utils.i b/Lib/php/utils.i similarity index 86% rename from Lib/php4/utils.i rename to Lib/php/utils.i index f7241187c..facf54196 100644 --- a/Lib/php4/utils.i +++ b/Lib/php/utils.i @@ -24,19 +24,23 @@ %enddef %define CONVERT_STRING_IN(lvar,t,invar) - convert_to_string_ex(invar); - lvar = (t) Z_STRVAL_PP(invar); + if ((*invar)->type==IS_NULL) { + lvar = (t) 0; + } else { + convert_to_string_ex(invar); + lvar = (t) Z_STRVAL_PP(invar); + } %enddef %define %pass_by_val( TYPE, CONVERT_IN ) -%typemap(in) TYPE +%typemap(in) TYPE, const TYPE & %{ CONVERT_IN($1,$1_ltype,$input); %} %enddef %fragment("t_output_helper","header") %{ -void +static void t_output_helper( zval **target, zval *o) { if ( (*target)->type == IS_ARRAY ) { /* it's already an array, just append */ diff --git a/Lib/python/boost_shared_ptr.i b/Lib/python/boost_shared_ptr.i index 2e34290ac..b4c0b5b83 100644 --- a/Lib/python/boost_shared_ptr.i +++ b/Lib/python/boost_shared_ptr.i @@ -1,5 +1,11 @@ %include +// Set SHARED_PTR_DISOWN to $disown if required, for example +// #define SHARED_PTR_DISOWN $disown +#if !defined(SHARED_PTR_DISOWN) +#define SHARED_PTR_DISOWN 0 +#endif + %define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %naturalvar TYPE; @@ -51,10 +57,10 @@ } // plain pointer -// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance +// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance %typemap(in) CONST TYPE * (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) { int newmem = 0; - res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); if (!SWIG_IsOK(res)) { %argument_fail(res, "$type", $symname, $argnum); } @@ -139,10 +145,10 @@ } // plain pointer by reference -// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance +// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance %typemap(in) CONST TYPE *& (void *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { int newmem = 0; - res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); if (!SWIG_IsOK(res)) { %argument_fail(res, "$type", $symname, $argnum); } diff --git a/Lib/python/director.swg b/Lib/python/director.swg index 176ee3336..836d107ce 100644 --- a/Lib/python/director.swg +++ b/Lib/python/director.swg @@ -107,7 +107,7 @@ namespace Swig { /* memory handler */ struct GCItem { - virtual ~GCItem() = 0; + virtual ~GCItem() {} virtual int get_own() const { @@ -115,10 +115,6 @@ namespace Swig { } }; - GCItem::~GCItem() - { - } - struct GCItem_var { GCItem_var(GCItem *item = 0) : _item(item) @@ -212,10 +208,7 @@ namespace Swig { swig_msg += msg; } if (!PyErr_Occurred()) { - swig_msg.insert(0, ": "); PyErr_SetString(error, getMessage()); - } else { - SWIG_Python_AddErrorMsg(getMessage()); } SWIG_PYTHON_THREAD_END_BLOCK; } diff --git a/Lib/python/file.i b/Lib/python/file.i index c0e7d5ea9..294ab9178 100644 --- a/Lib/python/file.i +++ b/Lib/python/file.i @@ -20,11 +20,13 @@ SWIG_AsValFilePtr(PyObject *obj, FILE **val) { if ((SWIG_ConvertPtr(obj, &vptr, desc, 0)) == SWIG_OK) { if (val) *val = (FILE *)vptr; return SWIG_OK; - } + } +%#if PY_VERSION_HEX < 0x03000000 if (PyFile_Check(obj)) { if (val) *val = PyFile_AsFile(obj); return SWIG_OK; } +%#endif return SWIG_TypeError; } } diff --git a/Lib/python/pyabc.i b/Lib/python/pyabc.i new file mode 100644 index 000000000..3da06b5a9 --- /dev/null +++ b/Lib/python/pyabc.i @@ -0,0 +1,10 @@ +%define %pythonabc(Type, Abc) + %feature("python:abc", #Abc) Type; +%enddef +%pythoncode {import collections}; +%pythonabc(std::vector, collections.MutableSequence); +%pythonabc(std::list, collections.MutableSequence); +%pythonabc(std::map, collections.MutableMapping); +%pythonabc(std::multimap, collections.MutableMapping); +%pythonabc(std::set, collections.MutableSet); +%pythonabc(std::multiset, collections.MutableSet); diff --git a/Lib/python/pyapi.swg b/Lib/python/pyapi.swg index 1d5148dbf..d980f9263 100644 --- a/Lib/python/pyapi.swg +++ b/Lib/python/pyapi.swg @@ -27,6 +27,20 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; + +/* ----------------------------------------------------------------------------- + * Wrapper of PyInstanceMethod_New() used in Python 3 + * It is exported to the generated module, used for -fastproxy + * ----------------------------------------------------------------------------- */ +SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func) +{ +#if PY_VERSION_HEX >= 0x03000000 + return PyInstanceMethod_New(func); +#else + return NULL; +#endif +} + #ifdef __cplusplus #if 0 { /* cc-mode */ diff --git a/Lib/python/pybuffer.i b/Lib/python/pybuffer.i new file mode 100644 index 000000000..121cd709f --- /dev/null +++ b/Lib/python/pybuffer.i @@ -0,0 +1,107 @@ +/* Implementing buffer protocol typemaps */ + +/* %pybuffer_mutable_binary(TYPEMAP, SIZE) + * + * Macro for functions accept mutable buffer pointer with a size. + * This can be used for both input and output. For example: + * + * %pybuffer_mutable_binary(char *buff, int size); + * void foo(char *buff, int size) { + * for(int i=0; i; + std::vector; or as a member variable: struct A { - PyObject_ptr obj; + SwigPtr_PyObject obj; A(PyObject *o) : _obj(o) { } }; or as a input/output value - PyObject_ptr func(PyObject_ptr obj) { - PyObject_ptr out = PyString_FromFormat("hello %s", PyObject_AsString(obj)); + SwigPtr_PyObject func(SwigPtr_PyObject obj) { + SwigPtr_PyObject out = PyString_FromFormat("hello %s", PyObject_AsString(obj)); Py_DECREF(out); return out; } just remember to pair the object creation with the proper DECREF, - the same as with plain PyObject *ptr, since PyObject_ptr always add + the same as with plain PyObject *ptr, since SwigPtr_PyObject always add one reference at construction. - PyObject_ptr is 'visible' at the wrapped side, so you can do: + SwigPtr_PyObject is 'visible' at the wrapped side, so you can do: - %template(pyvector) std::vector; + %template(pyvector) std::vector; and all the proper typemaps will be used. */ namespace swig { - %ignore PyObject_ptr; - struct PyObject_ptr {}; - %apply PyObject * {PyObject_ptr}; - %apply PyObject * const& {PyObject_ptr const&}; + %ignore SwigPtr_PyObject; + struct SwigPtr_PyObject {}; + %apply PyObject * {SwigPtr_PyObject}; + %apply PyObject * const& {SwigPtr_PyObject const&}; /* For output */ - %typemap(out,noblock=1) PyObject_ptr { + %typemap(out,noblock=1) SwigPtr_PyObject { $result = (PyObject *)$1; Py_INCREF($result); } - %typemap(out,noblock=1) PyObject_ptr const & { + %typemap(out,noblock=1) SwigPtr_PyObject const & { $result = (PyObject *)*$1; Py_INCREF($result); } @@ -58,28 +58,28 @@ namespace swig { %{ namespace swig { - class PyObject_ptr { + class SwigPtr_PyObject { protected: PyObject *_obj; public: - PyObject_ptr() :_obj(0) + SwigPtr_PyObject() :_obj(0) { } - PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj) + SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj) { Py_XINCREF(_obj); } - PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj) + SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj) { if (initial_ref) { Py_XINCREF(_obj); } } - PyObject_ptr & operator=(const PyObject_ptr& item) + SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) { Py_XINCREF(item._obj); Py_XDECREF(_obj); @@ -87,7 +87,7 @@ namespace swig { return *this; } - ~PyObject_ptr() + ~SwigPtr_PyObject() { Py_XDECREF(_obj); } @@ -106,33 +106,33 @@ namespace swig { %} /* - PyObject_var is used to manage 'in the scope' PyObject * variables, + SwigVar_PyObject is used to manage 'in the scope' PyObject * variables, as in int func () { - PyObject_var obj = PyString_FromString("hello"); + SwigVar_PyObject obj = PyString_FromString("hello"); } ie, 'obj' is created and destructed in the same scope from a python object that carries at least one reference value. - PyObject_var just take care of applying the proper Py_DECREF. + SwigVar_PyObject just take care of applying the proper Py_DECREF. Hence, this class is purely internal and not visible at the wrapped side. */ namespace swig { - %ignore PyObject_var; - struct PyObject_var {}; - %apply PyObject * {PyObject_var}; - %apply PyObject * const& {PyObject_var const&}; + %ignore SwigVar_PyObject; + struct SwigVar_PyObject {}; + %apply PyObject * {SwigVar_PyObject}; + %apply PyObject * const& {SwigVar_PyObject const&}; } %{ namespace swig { - struct PyObject_var : PyObject_ptr { - PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { } + struct SwigVar_PyObject : SwigPtr_PyObject { + SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { } - PyObject_var & operator = (PyObject* obj) + SwigVar_PyObject & operator = (PyObject* obj) { Py_XDECREF(_obj); _obj = obj; diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index ed0eb7f0b..6fd1d56f9 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -36,15 +36,15 @@ %include -%fragment(SWIG_Traits_frag(swig::PyObject_ptr),"header",fragment="StdTraits") { +%fragment(SWIG_Traits_frag(swig::SwigPtr_PyObject),"header",fragment="StdTraits") { namespace swig { - template <> struct traits { + template <> struct traits { typedef value_category category; - static const char* type_name() { return "PyObject_ptr"; } + static const char* type_name() { return "SwigPtr_PyObject"; } }; - template <> struct traits_from { - typedef PyObject_ptr value_type; + template <> struct traits_from { + typedef SwigPtr_PyObject value_type; static PyObject *from(const value_type& val) { PyObject *obj = static_cast(val); Py_XINCREF(obj); @@ -53,14 +53,14 @@ namespace swig { }; template <> - struct traits_check { - static bool check(PyObject_ptr) { + struct traits_check { + static bool check(SwigPtr_PyObject) { return true; } }; - template <> struct traits_asval { - typedef PyObject_ptr value_type; + template <> struct traits_asval { + typedef SwigPtr_PyObject value_type; static int asval(PyObject *obj, value_type *val) { if (val) *val = obj; return SWIG_OK; @@ -69,15 +69,15 @@ namespace swig { } } -%fragment(SWIG_Traits_frag(swig::PyObject_var),"header",fragment="StdTraits") { +%fragment(SWIG_Traits_frag(swig::SwigVar_PyObject),"header",fragment="StdTraits") { namespace swig { - template <> struct traits { + template <> struct traits { typedef value_category category; - static const char* type_name() { return "PyObject_var"; } + static const char* type_name() { return "SwigVar_PyObject"; } }; - template <> struct traits_from { - typedef PyObject_var value_type; + template <> struct traits_from { + typedef SwigVar_PyObject value_type; static PyObject *from(const value_type& val) { PyObject *obj = static_cast(val); Py_XINCREF(obj); @@ -86,14 +86,14 @@ namespace swig { }; template <> - struct traits_check { - static bool check(PyObject_var) { + struct traits_check { + static bool check(SwigVar_PyObject) { return true; } }; - template <> struct traits_asval { - typedef PyObject_var value_type; + template <> struct traits_asval { + typedef SwigVar_PyObject value_type; static int asval(PyObject *obj, value_type *val) { if (val) *val = obj; return SWIG_OK; @@ -102,7 +102,7 @@ namespace swig { } } -%fragment("PySequence_Base","header") +%fragment("SwigPySequence_Base","header") { %#include @@ -115,27 +115,38 @@ namespace std { { bool res; SWIG_PYTHON_THREAD_BEGIN_BLOCK; - res = PyObject_Compare(v, w) < 0; + res = PyObject_RichCompareBool(v, w, Py_LT) ? true : false; + /* This may fall into a case of inconsistent + eg. ObjA > ObjX > ObjB + but ObjA < ObjB + */ + if( PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_TypeError) ) + { + /* Objects can't be compared, this mostly occured in Python 3.0 */ + /* Compare their ptr directly for a workaround */ + res = (v < w); + PyErr_Clear(); + } SWIG_PYTHON_THREAD_END_BLOCK; return res; } }; template <> - struct less : public binary_function + struct less : public binary_function { bool - operator()(const swig::PyObject_ptr& v, const swig::PyObject_ptr& w) const + operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const { return std::less()(v, w); } }; template <> - struct less : public binary_function + struct less : public binary_function { bool - operator()(const swig::PyObject_var& v, const swig::PyObject_var& w) const + operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const { return std::less()(v, w); } @@ -277,24 +288,24 @@ namespace swig { } } -%fragment("PySequence_Cont","header", +%fragment("SwigPySequence_Cont","header", fragment="StdTraits", - fragment="PySequence_Base", - fragment="PySwigIterator_T") + fragment="SwigPySequence_Base", + fragment="SwigPyIterator_T") { namespace swig { template - struct PySequence_Ref + struct SwigPySequence_Ref { - PySequence_Ref(PyObject* seq, int index) + SwigPySequence_Ref(PyObject* seq, int index) : _seq(seq), _index(index) { } operator T () const { - swig::PyObject_var item = PySequence_GetItem(_seq, _index); + swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index); try { return swig::as(item, true); } catch (std::exception& e) { @@ -309,7 +320,7 @@ namespace swig } } - PySequence_Ref& operator=(const T& v) + SwigPySequence_Ref& operator=(const T& v) { PySequence_SetItem(_seq, _index, swig::from(v)); return *this; @@ -321,18 +332,18 @@ namespace swig }; template - struct PySequence_ArrowProxy + struct SwigPySequence_ArrowProxy { - PySequence_ArrowProxy(const T& x): m_value(x) {} + SwigPySequence_ArrowProxy(const T& x): m_value(x) {} const T* operator->() const { return &m_value; } operator const T*() const { return &m_value; } T m_value; }; template - struct PySequence_InputIterator + struct SwigPySequence_InputIterator { - typedef PySequence_InputIterator self; + typedef SwigPySequence_InputIterator self; typedef std::random_access_iterator_tag iterator_category; typedef Reference reference; @@ -340,11 +351,11 @@ namespace swig typedef T* pointer; typedef int difference_type; - PySequence_InputIterator() + SwigPySequence_InputIterator() { } - PySequence_InputIterator(PyObject* seq, int index) + SwigPySequence_InputIterator(PyObject* seq, int index) : _seq(seq), _index(index) { } @@ -354,9 +365,9 @@ namespace swig return reference(_seq, _index); } - PySequence_ArrowProxy + SwigPySequence_ArrowProxy operator->() const { - return PySequence_ArrowProxy(operator*()); + return SwigPySequence_ArrowProxy(operator*()); } bool operator==(const self& ri) const @@ -425,19 +436,19 @@ namespace swig }; template - struct PySequence_Cont + struct SwigPySequence_Cont { - typedef PySequence_Ref reference; - typedef const PySequence_Ref const_reference; + typedef SwigPySequence_Ref reference; + typedef const SwigPySequence_Ref const_reference; typedef T value_type; typedef T* pointer; typedef int difference_type; typedef int size_type; typedef const pointer const_pointer; - typedef PySequence_InputIterator iterator; - typedef PySequence_InputIterator const_iterator; + typedef SwigPySequence_InputIterator iterator; + typedef SwigPySequence_InputIterator const_iterator; - PySequence_Cont(PyObject* seq) : _seq(0) + SwigPySequence_Cont(PyObject* seq) : _seq(0) { if (!PySequence_Check(seq)) { throw std::invalid_argument("a sequence is expected"); @@ -446,7 +457,7 @@ namespace swig Py_INCREF(_seq); } - ~PySequence_Cont() + ~SwigPySequence_Cont() { Py_XDECREF(_seq); } @@ -495,7 +506,7 @@ namespace swig { int s = size(); for (int i = 0; i < s; ++i) { - swig::PyObject_var item = PySequence_GetItem(_seq, i); + swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i); if (!swig::check(item)) { if (set_err) { char msg[1024]; @@ -522,40 +533,40 @@ namespace swig class const_iterator; class const_reverse_iterator; - %typemap(out,noblock=1,fragment="PySequence_Cont") + %typemap(out,noblock=1,fragment="SwigPySequence_Cont") iterator, reverse_iterator, const_iterator, const_reverse_iterator { $result = SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &)), - swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN); + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); } - %typemap(out,noblock=1,fragment="PySequence_Cont") + %typemap(out,noblock=1,fragment="SwigPySequence_Cont") std::pair, std::pair { $result = PyTuple_New(2); PyTuple_SetItem($result,0,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first), - swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN)); + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN)); PyTuple_SetItem($result,1,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).second), - swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN)); + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN)); } - %fragment("PyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="PySequence_Cont") {} + %fragment("SwigPyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="SwigPySequence_Cont") {} - %typemap(out,noblock=1,fragment="PyPairBoolOutputIterator") + %typemap(out,noblock=1,fragment="SwigPyPairBoolOutputIterator") std::pair, std::pair { $result = PyTuple_New(2); PyTuple_SetItem($result,0,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first), - swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN)); + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN)); PyTuple_SetItem($result,1,SWIG_From(bool)(%static_cast($1,const $type &).second)); } - %typemap(in,noblock=1,fragment="PySequence_Cont") - iterator(swig::PySwigIterator *iter = 0, int res), - reverse_iterator(swig::PySwigIterator *iter = 0, int res), - const_iterator(swig::PySwigIterator *iter = 0, int res), - const_reverse_iterator(swig::PySwigIterator *iter = 0, int res) { - res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0); + %typemap(in,noblock=1,fragment="SwigPySequence_Cont") + iterator(swig::SwigPyIterator *iter = 0, int res), + reverse_iterator(swig::SwigPyIterator *iter = 0, int res), + const_iterator(swig::SwigPyIterator *iter = 0, int res), + const_reverse_iterator(swig::SwigPyIterator *iter = 0, int res) { + res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0); if (!SWIG_IsOK(res) || !iter) { %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); } else { - swig::PySwigIterator_T<$type > *iter_t = dynamic_cast *>(iter); + swig::SwigPyIterator_T<$type > *iter_t = dynamic_cast *>(iter); if (iter_t) { $1 = iter_t->get_current(); } else { @@ -564,18 +575,18 @@ namespace swig } } - %typecheck(%checkcode(ITERATOR),noblock=1,fragment="PySequence_Cont") + %typecheck(%checkcode(ITERATOR),noblock=1,fragment="SwigPySequence_Cont") iterator, reverse_iterator, const_iterator, const_reverse_iterator { - swig::PySwigIterator *iter = 0; - int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0); - $1 = (SWIG_IsOK(res) && iter && (dynamic_cast *>(iter) != 0)); + swig::SwigPyIterator *iter = 0; + int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0); + $1 = (SWIG_IsOK(res) && iter && (dynamic_cast *>(iter) != 0)); } - %fragment("PySequence_Cont"); + %fragment("SwigPySequence_Cont"); %newobject iterator(PyObject **PYTHON_SELF); %extend { - swig::PySwigIterator* iterator(PyObject **PYTHON_SELF) { + swig::SwigPyIterator* iterator(PyObject **PYTHON_SELF) { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } @@ -597,6 +608,11 @@ namespace swig return !(self->empty()); } + /* Alias for Python 3 compatibility */ + bool __bool__() const { + return !(self->empty()); + } + size_type __len__() const { return self->size(); } @@ -607,7 +623,7 @@ namespace swig %swig_sequence_iterator(%arg(Sequence)) %swig_container_methods(%arg(Sequence)) - %fragment("PySequence_Base"); + %fragment("SwigPySequence_Base"); %extend { value_type pop() throw (std::out_of_range) { @@ -618,6 +634,14 @@ namespace swig return x; } + /* typemap for slice object support */ + %typemap(in) PySliceObject* { + $1 = (PySliceObject *) $input; + } + %typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) PySliceObject* { + $1 = PySlice_Check($input); + } + Sequence* __getslice__(difference_type i, difference_type j) throw (std::out_of_range) { return swig::getslice(self, i, j); } @@ -634,6 +658,43 @@ namespace swig void __delitem__(difference_type i) throw (std::out_of_range) { self->erase(swig::getpos(self,i)); } + + + /* Overloaded methods for Python 3 compatibility + * (Also useful in Python 2.x) + */ + Sequence* __getitem__(PySliceObject *slice) throw (std::out_of_range) { + Py_ssize_t i, j, step; + if( !PySlice_Check(slice) ) { + SWIG_Error(SWIG_TypeError, "Slice object expected."); + return NULL; + } + PySlice_GetIndices(slice, self->size(), &i, &j, &step); + return swig::getslice(self, i, j); + } + + void __setitem__(PySliceObject *slice, const Sequence& v) + throw (std::out_of_range, std::invalid_argument) { + Py_ssize_t i, j, step; + if( !PySlice_Check(slice) ) { + SWIG_Error(SWIG_TypeError, "Slice object expected."); + return; + } + PySlice_GetIndices(slice, self->size(), &i, &j, &step); + swig::setslice(self, i, j, v); + } + + void __delitem__(PySliceObject *slice) + throw (std::out_of_range) { + Py_ssize_t i, j, step; + if( !PySlice_Check(slice) ) { + SWIG_Error(SWIG_TypeError, "Slice object expected."); + return; + } + PySlice_GetIndices(slice, self->size(), &i, &j, &step); + swig::delslice(self, i,j); + } + } %enddef @@ -679,16 +740,16 @@ namespace swig %fragment("StdSequenceTraits","header", fragment="StdTraits", - fragment="PySequence_Cont") + fragment="SwigPySequence_Cont") { namespace swig { - template + template inline void - assign(const PySeq& pyseq, Seq* seq) { - // seq->assign(pyseq.begin(), pyseq.end()); // not used as not always implemented - typedef typename PySeq::value_type value_type; - typename PySeq::const_iterator it = pyseq.begin(); - for (;it != pyseq.end(); ++it) { + assign(const SwigPySeq& swigpyseq, Seq* seq) { + // seq->assign(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented + typedef typename SwigPySeq::value_type value_type; + typename SwigPySeq::const_iterator it = swigpyseq.begin(); + for (;it != swigpyseq.end(); ++it) { seq->insert(seq->end(),(value_type)(*it)); } } @@ -708,14 +769,14 @@ namespace swig { } } else if (PySequence_Check(obj)) { try { - PySequence_Cont pyseq(obj); + SwigPySequence_Cont swigpyseq(obj); if (seq) { sequence *pseq = new sequence(); - assign(pyseq, pseq); + assign(swigpyseq, pseq); *seq = pseq; return SWIG_NEWOBJ; } else { - return pyseq.check() ? SWIG_OK : SWIG_ERROR; + return swigpyseq.check() ? SWIG_OK : SWIG_ERROR; } } catch (std::exception& e) { if (seq) { diff --git a/Lib/python/pyerrors.swg b/Lib/python/pyerrors.swg index e287e2fc8..fe7313554 100644 --- a/Lib/python/pyerrors.swg +++ b/Lib/python/pyerrors.swg @@ -55,15 +55,16 @@ SWIG_Python_AddErrorMsg(const char* mesg) if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback); if (value) { + char *tmp; PyObject *old_str = PyObject_Str(value); PyErr_Clear(); Py_XINCREF(type); - PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); + + PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg); + SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); Py_DECREF(value); } else { PyErr_SetString(PyExc_RuntimeError, mesg); } } - - diff --git a/Lib/python/pyhead.swg b/Lib/python/pyhead.swg index 7839511bc..732d4689e 100644 --- a/Lib/python/pyhead.swg +++ b/Lib/python/pyhead.swg @@ -1,3 +1,64 @@ +/* Compatibility marcos for Python 3 */ +#if PY_VERSION_HEX >= 0x03000000 + +#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type) +#define PyInt_Check(x) PyLong_Check(x) +#define PyInt_AsLong(x) PyLong_AsLong(x) +#define PyInt_FromLong(x) PyLong_FromLong(x) +#define PyString_Format(fmt, args) PyUnicode_Format(fmt, args) + +#endif + +#ifndef Py_TYPE +# define Py_TYPE(op) ((op)->ob_type) +#endif + +/* SWIG APIs for compatibility of both Python 2 & 3 */ + +#if PY_VERSION_HEX >= 0x03000000 +# define SWIG_Python_str_FromFormat PyUnicode_FromFormat +#else +# define SWIG_Python_str_FromFormat PyString_FromFormat +#endif + + +/* Warning: This function will allocate a new string in Python 3, + * so please call SWIG_Python_str_DelForPy3(x) to free the space. + */ +SWIGINTERN char* +SWIG_Python_str_AsChar(PyObject *str) +{ +#if PY_VERSION_HEX >= 0x03000000 + char *cstr; + char *newstr; + int len; + str = PyUnicode_AsUTF8String(str); + PyBytes_AsStringAndSize(str, &cstr, &len); + newstr = (char *) malloc(len+1); + memcpy(newstr, cstr, len+1); + Py_XDECREF(str); + return newstr; +#else + return PyString_AsString(str); +#endif +} + +#if PY_VERSION_HEX >= 0x03000000 +# define SWIG_Python_str_DelForPy3(x) free( (void*) (x) ) +#else +# define SWIG_Python_str_DelForPy3(x) +#endif + + +SWIGINTERN PyObject* +SWIG_Python_str_FromChar(const char *c) +{ +#if PY_VERSION_HEX >= 0x03000000 + return PyUnicode_FromString(c); +#else + return PyString_FromString(c); +#endif +} /* Add PyOS_snprintf for old Pythons */ #if PY_VERSION_HEX < 0x02020000 @@ -44,6 +105,7 @@ PyString_FromFormat(const char *fmt, ...) { # define PyObject_GenericGetAttr 0 # endif #endif + /* Py_NotImplemented is defined in 2.1 and up. */ #if PY_VERSION_HEX < 0x02010000 # ifndef Py_NotImplemented @@ -51,7 +113,6 @@ PyString_FromFormat(const char *fmt, ...) { # endif #endif - /* A crude PyString_AsStringAndSize implementation for old Pythons */ #if PY_VERSION_HEX < 0x02010000 # ifndef PyString_AsStringAndSize @@ -66,7 +127,6 @@ PyString_FromFormat(const char *fmt, ...) { # endif #endif - /* PyBool_FromLong for old Pythons */ #if PY_VERSION_HEX < 0x02030000 static diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg index e6109b7bd..286e7fb68 100644 --- a/Lib/python/pyinit.swg +++ b/Lib/python/pyinit.swg @@ -33,26 +33,58 @@ typedef struct swig_varlinkobject { SWIGINTERN PyObject * swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) { +#if PY_VERSION_HEX >= 0x03000000 + return PyUnicode_InternFromString(""); +#else return PyString_FromString(""); +#endif } SWIGINTERN PyObject * swig_varlink_str(swig_varlinkobject *v) { +#if PY_VERSION_HEX >= 0x03000000 + PyObject *str = PyUnicode_InternFromString("("); + PyObject *tail; + PyObject *joined; + swig_globalvar *var; + for (var = v->vars; var; var=var->next) { + tail = PyUnicode_FromString(var->name); + joined = PyUnicode_Concat(str, tail); + Py_DecRef(str); + Py_DecRef(tail); + str = joined; + if (var->next) { + tail = PyUnicode_InternFromString(", "); + joined = PyUnicode_Concat(str, tail); + Py_DecRef(str); + Py_DecRef(tail); + str = joined; + } + } + tail = PyUnicode_InternFromString(")"); + joined = PyUnicode_Concat(str, tail); + Py_DecRef(str); + Py_DecRef(tail); + str = joined; +#else PyObject *str = PyString_FromString("("); - swig_globalvar *var; + swig_globalvar *var; for (var = v->vars; var; var=var->next) { PyString_ConcatAndDel(&str,PyString_FromString(var->name)); if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", ")); } PyString_ConcatAndDel(&str,PyString_FromString(")")); +#endif return str; } SWIGINTERN int swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { + char *tmp; PyObject *str = swig_varlink_str(v); fprintf(fp,"Swig global variables "); - fprintf(fp,"%s\n", PyString_AsString(str)); + fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str)); + SWIG_Python_str_DelForPy3(tmp); Py_DECREF(str); return 0; } @@ -110,8 +142,13 @@ swig_varlink_type(void) { if (!type_init) { const PyTypeObject tmp = { + /* PyObject header changed in Python 3 */ +#if PY_VERSION_HEX >= 0x03000000 + PyVarObject_HEAD_INIT(&PyType_Type, 0) +#else PyObject_HEAD_INIT(NULL) 0, /* Number of items in variable part (ob_size) */ +#endif (char *)"swigvarlink", /* Type name (tp_name) */ sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */ 0, /* Itemsize (tp_itemsize) */ @@ -147,7 +184,10 @@ swig_varlink_type(void) { #endif }; varlink_type = tmp; + /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */ +#if PY_VERSION_HEX < 0x03000000 varlink_type.ob_type = &PyType_Type; +#endif type_init = 1; } return &varlink_type; @@ -272,13 +312,37 @@ SWIG_Python_FixMethods(PyMethodDef *methods, #ifdef __cplusplus extern "C" #endif -SWIGEXPORT void SWIG_init(void) { - PyObject *m, *d; - + +SWIGEXPORT +#if PY_VERSION_HEX >= 0x03000000 + PyObject* +#else + void +#endif +SWIG_init(void) { + PyObject *m, *d; +#if PY_VERSION_HEX >= 0x03000000 + static struct PyModuleDef SWIG_module = { + PyModuleDef_HEAD_INIT, + (char *) SWIG_name, + NULL, + -1, + SwigMethods, + NULL, + NULL, + NULL, + NULL + }; +#endif + /* Fix SwigMethods to carry the callback ptrs when needed */ SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial); - + +#if PY_VERSION_HEX >= 0x03000000 + m = PyModule_Create(&SWIG_module); +#else m = Py_InitModule((char *) SWIG_name, SwigMethods); +#endif d = PyModule_GetDict(m); SWIG_InitializeModule(0); diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg index 38f1791a9..9cd795d7c 100644 --- a/Lib/python/pyiterators.swg +++ b/Lib/python/pyiterators.swg @@ -6,56 +6,56 @@ * * Implement a python 'output' iterator for Python 2.2 or higher. * - * Users can derive form the PySwigIterator to implement their + * Users can derive form the SwigPyIterator to implement their * own iterators. As an example (real one since we use it for STL/STD - * containers), the template PySwigIterator_T does the + * containers), the template SwigPyIterator_T does the * implementation for genereic C++ iterators. * ----------------------------------------------------------------------------- */ %include -%fragment("PySwigIterator","header") { +%fragment("SwigPyIterator","header") { namespace swig { struct stop_iteration { }; - struct PySwigIterator { + struct SwigPyIterator { private: - PyObject_ptr _seq; + SwigPtr_PyObject _seq; protected: - PySwigIterator(PyObject *seq) : _seq(seq) + SwigPyIterator(PyObject *seq) : _seq(seq) { } public: - virtual ~PySwigIterator() {} + virtual ~SwigPyIterator() {} // Access iterator method, required by Python virtual PyObject *value() const = 0; // Forward iterator method, required by Python - virtual PySwigIterator *incr(size_t n = 1) = 0; + virtual SwigPyIterator *incr(size_t n = 1) = 0; // Backward iterator method, very common in C++, but not required in Python - virtual PySwigIterator *decr(size_t /*n*/ = 1) + virtual SwigPyIterator *decr(size_t /*n*/ = 1) { throw stop_iteration(); } // Random access iterator methods, but not required in Python - virtual ptrdiff_t distance(const PySwigIterator &/*x*/) const + virtual ptrdiff_t distance(const SwigPyIterator &/*x*/) const { throw std::invalid_argument("operation not supported"); } - virtual bool equal (const PySwigIterator &/*x*/) const + virtual bool equal (const SwigPyIterator &/*x*/) const { throw std::invalid_argument("operation not supported"); } // C++ common/needed methods - virtual PySwigIterator *copy() const = 0; + virtual SwigPyIterator *copy() const = 0; PyObject *next() { @@ -66,6 +66,12 @@ namespace swig { return obj; } + /* Make an alias for Python 3.x */ + PyObject *__next__() + { + return next(); + } + PyObject *previous() { SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads @@ -75,42 +81,42 @@ namespace swig { return obj; } - PySwigIterator *advance(ptrdiff_t n) + SwigPyIterator *advance(ptrdiff_t n) { return (n > 0) ? incr(n) : decr(-n); } - bool operator == (const PySwigIterator& x) const + bool operator == (const SwigPyIterator& x) const { return equal(x); } - bool operator != (const PySwigIterator& x) const + bool operator != (const SwigPyIterator& x) const { return ! operator==(x); } - PySwigIterator& operator += (ptrdiff_t n) + SwigPyIterator& operator += (ptrdiff_t n) { return *advance(n); } - PySwigIterator& operator -= (ptrdiff_t n) + SwigPyIterator& operator -= (ptrdiff_t n) { return *advance(-n); } - PySwigIterator* operator + (ptrdiff_t n) const + SwigPyIterator* operator + (ptrdiff_t n) const { return copy()->advance(n); } - PySwigIterator* operator - (ptrdiff_t n) const + SwigPyIterator* operator - (ptrdiff_t n) const { return copy()->advance(-n); } - ptrdiff_t operator - (const PySwigIterator& x) const + ptrdiff_t operator - (const SwigPyIterator& x) const { return x.distance(*this); } @@ -119,7 +125,7 @@ namespace swig { static int init = 0; static swig_type_info* desc = 0; if (!init) { - desc = SWIG_TypeQuery("swig::PySwigIterator *"); + desc = SWIG_TypeQuery("swig::SwigPyIterator *"); init = 1; } return desc; @@ -128,18 +134,18 @@ namespace swig { } } -%fragment("PySwigIterator_T","header",fragment="PySwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") { +%fragment("SwigPyIterator_T","header",fragment="SwigPyIterator",fragment="StdTraits",fragment="StdIteratorTraits") { namespace swig { template - class PySwigIterator_T : public PySwigIterator + class SwigPyIterator_T : public SwigPyIterator { public: typedef OutIterator out_iterator; typedef typename std::iterator_traits::value_type value_type; - typedef PySwigIterator_T self_type; + typedef SwigPyIterator_T self_type; - PySwigIterator_T(out_iterator curr, PyObject *seq) - : PySwigIterator(seq), current(curr) + SwigPyIterator_T(out_iterator curr, PyObject *seq) + : SwigPyIterator(seq), current(curr) { } @@ -149,7 +155,7 @@ namespace swig { } - bool equal (const PySwigIterator &iter) const + bool equal (const SwigPyIterator &iter) const { const self_type *iters = dynamic_cast(&iter); if (iters) { @@ -159,7 +165,7 @@ namespace swig { } } - ptrdiff_t distance(const PySwigIterator &iter) const + ptrdiff_t distance(const SwigPyIterator &iter) const { const self_type *iters = dynamic_cast(&iter); if (iters) { @@ -187,17 +193,17 @@ namespace swig { template::value_type, typename FromOper = from_oper > - class PySwigIteratorOpen_T : public PySwigIterator_T + class SwigPyIteratorOpen_T : public SwigPyIterator_T { public: FromOper from; typedef OutIterator out_iterator; typedef ValueType value_type; - typedef PySwigIterator_T base; - typedef PySwigIteratorOpen_T self_type; + typedef SwigPyIterator_T base; + typedef SwigPyIteratorOpen_T self_type; - PySwigIteratorOpen_T(out_iterator curr, PyObject *seq) - : PySwigIterator_T(curr, seq) + SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq) + : SwigPyIterator_T(curr, seq) { } @@ -205,12 +211,12 @@ namespace swig { return from(static_cast(*(base::current))); } - PySwigIterator *copy() const + SwigPyIterator *copy() const { return new self_type(*this); } - PySwigIterator *incr(size_t n = 1) + SwigPyIterator *incr(size_t n = 1) { while (n--) { ++base::current; @@ -218,7 +224,7 @@ namespace swig { return this; } - PySwigIterator *decr(size_t n = 1) + SwigPyIterator *decr(size_t n = 1) { while (n--) { --base::current; @@ -230,17 +236,17 @@ namespace swig { template::value_type, typename FromOper = from_oper > - class PySwigIteratorClosed_T : public PySwigIterator_T + class SwigPyIteratorClosed_T : public SwigPyIterator_T { public: FromOper from; typedef OutIterator out_iterator; typedef ValueType value_type; - typedef PySwigIterator_T base; - typedef PySwigIteratorClosed_T self_type; + typedef SwigPyIterator_T base; + typedef SwigPyIteratorClosed_T self_type; - PySwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) - : PySwigIterator_T(curr, seq), begin(first), end(last) + SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) + : SwigPyIterator_T(curr, seq), begin(first), end(last) { } @@ -252,12 +258,12 @@ namespace swig { } } - PySwigIterator *copy() const + SwigPyIterator *copy() const { return new self_type(*this); } - PySwigIterator *incr(size_t n = 1) + SwigPyIterator *incr(size_t n = 1) { while (n--) { if (base::current == end) { @@ -269,7 +275,7 @@ namespace swig { return this; } - PySwigIterator *decr(size_t n = 1) + SwigPyIterator *decr(size_t n = 1) { while (n--) { if (base::current == begin) { @@ -287,23 +293,23 @@ namespace swig { }; template - inline PySwigIterator* + inline SwigPyIterator* make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0) { - return new PySwigIteratorClosed_T(current, begin, end, seq); + return new SwigPyIteratorClosed_T(current, begin, end, seq); } template - inline PySwigIterator* + inline SwigPyIterator* make_output_iterator(const OutIter& current, PyObject *seq = 0) { - return new PySwigIteratorOpen_T(current, seq); + return new SwigPyIteratorOpen_T(current, seq); } } } -%fragment("PySwigIterator"); +%fragment("SwigPyIterator"); namespace swig { /* @@ -321,65 +327,67 @@ namespace swig /* Mark methods that return new objects */ - %newobject PySwigIterator::copy; - %newobject PySwigIterator::operator + (ptrdiff_t n) const; - %newobject PySwigIterator::operator - (ptrdiff_t n) const; + %newobject SwigPyIterator::copy; + %newobject SwigPyIterator::operator + (ptrdiff_t n) const; + %newobject SwigPyIterator::operator - (ptrdiff_t n) const; - %nodirector PySwigIterator; - %extend PySwigIterator { + %nodirector SwigPyIterator; + %extend SwigPyIterator { %pythoncode {def __iter__(self): return self} } - %catches(swig::stop_iteration) PySwigIterator::value() const; - %catches(swig::stop_iteration) PySwigIterator::incr(size_t n = 1); - %catches(swig::stop_iteration) PySwigIterator::decr(size_t n = 1); - %catches(std::invalid_argument) PySwigIterator::distance(const PySwigIterator &x) const; - %catches(std::invalid_argument) PySwigIterator::equal (const PySwigIterator &x) const; - %catches(swig::stop_iteration) PySwigIterator::next(); - %catches(swig::stop_iteration) PySwigIterator::previous(); - %catches(swig::stop_iteration) PySwigIterator::advance(ptrdiff_t n); - %catches(swig::stop_iteration) PySwigIterator::operator += (ptrdiff_t n); - %catches(swig::stop_iteration) PySwigIterator::operator -= (ptrdiff_t n); - %catches(swig::stop_iteration) PySwigIterator::operator + (ptrdiff_t n) const; - %catches(swig::stop_iteration) PySwigIterator::operator - (ptrdiff_t n) const; + %catches(swig::stop_iteration) SwigPyIterator::value() const; + %catches(swig::stop_iteration) SwigPyIterator::incr(size_t n = 1); + %catches(swig::stop_iteration) SwigPyIterator::decr(size_t n = 1); + %catches(std::invalid_argument) SwigPyIterator::distance(const SwigPyIterator &x) const; + %catches(std::invalid_argument) SwigPyIterator::equal (const SwigPyIterator &x) const; + %catches(swig::stop_iteration) SwigPyIterator::__next__(); + %catches(swig::stop_iteration) SwigPyIterator::next(); + %catches(swig::stop_iteration) SwigPyIterator::previous(); + %catches(swig::stop_iteration) SwigPyIterator::advance(ptrdiff_t n); + %catches(swig::stop_iteration) SwigPyIterator::operator += (ptrdiff_t n); + %catches(swig::stop_iteration) SwigPyIterator::operator -= (ptrdiff_t n); + %catches(swig::stop_iteration) SwigPyIterator::operator + (ptrdiff_t n) const; + %catches(swig::stop_iteration) SwigPyIterator::operator - (ptrdiff_t n) const; - struct PySwigIterator + struct SwigPyIterator { protected: - PySwigIterator(PyObject *seq); + SwigPyIterator(PyObject *seq); public: - virtual ~PySwigIterator(); + virtual ~SwigPyIterator(); // Access iterator method, required by Python virtual PyObject *value() const = 0; // Forward iterator method, required by Python - virtual PySwigIterator *incr(size_t n = 1) = 0; + virtual SwigPyIterator *incr(size_t n = 1) = 0; // Backward iterator method, very common in C++, but not required in Python - virtual PySwigIterator *decr(size_t n = 1); + virtual SwigPyIterator *decr(size_t n = 1); // Random access iterator methods, but not required in Python - virtual ptrdiff_t distance(const PySwigIterator &x) const; + virtual ptrdiff_t distance(const SwigPyIterator &x) const; - virtual bool equal (const PySwigIterator &x) const; + virtual bool equal (const SwigPyIterator &x) const; // C++ common/needed methods - virtual PySwigIterator *copy() const = 0; + virtual SwigPyIterator *copy() const = 0; PyObject *next(); + PyObject *__next__(); PyObject *previous(); - PySwigIterator *advance(ptrdiff_t n); + SwigPyIterator *advance(ptrdiff_t n); - bool operator == (const PySwigIterator& x) const; - bool operator != (const PySwigIterator& x) const; - PySwigIterator& operator += (ptrdiff_t n); - PySwigIterator& operator -= (ptrdiff_t n); - PySwigIterator* operator + (ptrdiff_t n) const; - PySwigIterator* operator - (ptrdiff_t n) const; - ptrdiff_t operator - (const PySwigIterator& x) const; + bool operator == (const SwigPyIterator& x) const; + bool operator != (const SwigPyIterator& x) const; + SwigPyIterator& operator += (ptrdiff_t n); + SwigPyIterator& operator -= (ptrdiff_t n); + SwigPyIterator* operator + (ptrdiff_t n) const; + SwigPyIterator* operator - (ptrdiff_t n) const; + ptrdiff_t operator - (const SwigPyIterator& x) const; }; } diff --git a/Lib/python/pyname_compat.i b/Lib/python/pyname_compat.i new file mode 100644 index 000000000..cdda38f80 --- /dev/null +++ b/Lib/python/pyname_compat.i @@ -0,0 +1,88 @@ +/* +* From SWIG 1.3.37 we deprecated all SWIG symbols that start with Py, +* since they are inappropriate and discouraged in Python documentation +* (from http://www.python.org/doc/2.5.2/api/includes.html): +* +* "All user visible names defined by Python.h (except those defined by the included +* standard headers) have one of the prefixes "Py" or "_Py". Names beginning with +* "_Py" are for internal use by the Python implementation and should not be used +* by extension writers. Structure member names do not have a reserved prefix. +* +* Important: user code should never define names that begin with "Py" or "_Py". +* This confuses the reader, and jeopardizes the portability of the user code to +* future Python versions, which may define additional names beginning with one +* of these prefixes." +* +* This file defined macros to provide backward compatibility for these deprecated +* symbols. In the case you have these symbols in your interface file, you can simply +* include this file at begining of it. +* +* However, this file may be removed in future release of SWIG, so using this file to +* keep these inappropriate names in your SWIG interface file is also not recommanded. +* Instead, we provide a simple tool for converting your interface files to +* the new naming convention. You can download the tool here: +* https://swig.svn.sourceforge.net/svnroot/swig/trunk/Tools/pyname_patch.py +*/ + +%fragment("PySequence_Base", "header", fragment="SwigPySequence_Base") {} +%fragment("PySequence_Cont", "header", fragment="SwigPySequence_Cont") {} +%fragment("PySwigIterator_T", "header", fragment="SwigPyIterator_T") {} +%fragment("PyPairBoolOutputIterator", "header", fragment="SwigPyPairBoolOutputIterator") {} +%fragment("PySwigIterator", "header", fragment="SwigPyIterator") {} +%fragment("PySwigIterator_T", "header", fragment="SwigPyIterator_T") {} + +%inline %{ +#define PyMapIterator_T SwigPyMapIterator_T +#define PyMapKeyIterator_T SwigPyMapKeyIterator_T +#define PyMapValueIterator_T SwigPyMapValueITerator_T +#define PyObject_ptr SwigPtr_PyObject +#define PyObject_var SwigVar_PyObject +#define PyOper SwigPyOper +#define PySeq SwigPySeq +#define PySequence_ArrowProxy SwigPySequence_ArrowProxy +#define PySequence_Cont SwigPySequence_Cont +#define PySequence_InputIterator SwigPySequence_InputIterator +#define PySequence_Ref SwigPySequence_Ref +#define PySwigClientData SwigPyClientData +#define PySwigClientData_Del SwigPyClientData_Del +#define PySwigClientData_New SwigPyClientData_New +#define PySwigIterator SwigPyIterator +#define PySwigIteratorClosed_T SwigPyIteratorClosed_T +#define PySwigIteratorOpen_T SwigPyIteratorOpen_T +#define PySwigIterator_T SwigPyIterator_T +#define PySwigObject SwigPyObject +#define PySwigObject_Check SwigPyObject_Check +#define PySwigObject_GetDesc SwigPyObject_GetDesc +#define PySwigObject_New SwigPyObject_New +#define PySwigObject_acquire SwigPyObject_acquire +#define PySwigObject_append SwigPyObject_append +#define PySwigObject_as_number SwigPyObject_as_number +#define PySwigObject_compare SwigPyObject_compare +#define PySwigObject_dealloc SwigPyObject_dealloc +#define PySwigObject_disown SwigPyObject_disown +#define PySwigObject_format SwigPyObject_format +#define PySwigObject_getattr SwigPyObject_getattr +#define PySwigObject_hex SwigPyObject_hex +#define PySwigObject_long SwigPyObject_long +#define PySwigObject_next SwigPyObject_next +#define PySwigObject_oct SwigPyObject_oct +#define PySwigObject_own SwigPyObject_own +#define PySwigObject_print SwigPyObject_print +#define PySwigObject_repr SwigPyObject_repr +#define PySwigObject_richcompare SwigPyObject_richcompare +#define PySwigObject_str SwigPyObject_str +#define PySwigObject_type SwigPyObject_type +#define PySwigPacked SwigPyPacked +#define PySwigPacked_Check SwigPyPacked_Check +#define PySwigPacked_New SwigPyPacked_New +#define PySwigPacked_UnpackData SwigPyPacked_UnpackData +#define PySwigPacked_compare SwigPyPacked_compare +#define PySwigPacked_dealloc SwigPyPacked_dealloc +#define PySwigPacked_print SwigPyPacked_print +#define PySwigPacked_repr SwigPyPacked_repr +#define PySwigPacked_str SwigPyPacked_str +#define PySwigPacked_type SwigPyPacked_type +#define pyseq swigpyseq +#define pyswigobject_type swigpyobject_type +#define pyswigpacked_type swigpypacked_type +%} diff --git a/Lib/python/pyopers.swg b/Lib/python/pyopers.swg index 76f1e6789..30775b84e 100644 --- a/Lib/python/pyopers.swg +++ b/Lib/python/pyopers.swg @@ -33,6 +33,12 @@ /* Special cases */ %rename(__invert__) *::operator~; %rename(__call__) *::operator(); + +%feature("shadow") *::operator bool %{ +def __nonzero__(self): + return $action(self) +__bool__ = __nonzero__ +%}; %rename(__nonzero__) *::operator bool; /* Ignored operators */ @@ -84,7 +90,7 @@ */ -#define %pyinplaceoper(PyOper, Oper) %delobject Oper; %newobject Oper; %rename(PyOper) Oper +#define %pyinplaceoper(SwigPyOper, Oper) %delobject Oper; %newobject Oper; %rename(SwigPyOper) Oper %pyinplaceoper(__iadd__ , *::operator +=); %pyinplaceoper(__isub__ , *::operator -=); diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index 844a66bec..5a1b1230e 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -42,7 +42,7 @@ #define SWIG_GetModule(clientdata) SWIG_Python_GetModule() #define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer) -#define SWIG_NewClientData(obj) PySwigClientData_New(obj) +#define SWIG_NewClientData(obj) SwigPyClientData_New(obj) #define SWIG_SetErrorObj SWIG_Python_SetErrorObj #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg @@ -238,7 +238,7 @@ SWIG_Py_Void(void) return none; } -/* PySwigClientData */ +/* SwigPyClientData */ typedef struct { PyObject *klass; @@ -247,30 +247,30 @@ typedef struct { PyObject *destroy; int delargs; int implicitconv; -} PySwigClientData; +} SwigPyClientData; SWIGRUNTIMEINLINE int SWIG_Python_CheckImplicit(swig_type_info *ty) { - PySwigClientData *data = (PySwigClientData *)ty->clientdata; + SwigPyClientData *data = (SwigPyClientData *)ty->clientdata; return data ? data->implicitconv : 0; } SWIGRUNTIMEINLINE PyObject * SWIG_Python_ExceptionType(swig_type_info *desc) { - PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0; + SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0; PyObject *klass = data ? data->klass : 0; return (klass ? klass : PyExc_RuntimeError); } -SWIGRUNTIME PySwigClientData * -PySwigClientData_New(PyObject* obj) +SWIGRUNTIME SwigPyClientData * +SwigPyClientData_New(PyObject* obj) { if (!obj) { return 0; } else { - PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData)); + SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData)); /* the klass element */ data->klass = obj; Py_INCREF(data->klass); @@ -318,14 +318,14 @@ PySwigClientData_New(PyObject* obj) } SWIGRUNTIME void -PySwigClientData_Del(PySwigClientData* data) +SwigPyClientData_Del(SwigPyClientData* data) { Py_XDECREF(data->newraw); Py_XDECREF(data->newargs); Py_XDECREF(data->destroy); } -/* =============== PySwigObject =====================*/ +/* =============== SwigPyObject =====================*/ typedef struct { PyObject_HEAD @@ -333,24 +333,28 @@ typedef struct { swig_type_info *ty; int own; PyObject *next; -} PySwigObject; +} SwigPyObject; SWIGRUNTIME PyObject * -PySwigObject_long(PySwigObject *v) +SwigPyObject_long(SwigPyObject *v) { return PyLong_FromVoidPtr(v->ptr); } SWIGRUNTIME PyObject * -PySwigObject_format(const char* fmt, PySwigObject *v) +SwigPyObject_format(const char* fmt, SwigPyObject *v) { PyObject *res = NULL; PyObject *args = PyTuple_New(1); if (args) { - if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) { - PyObject *ofmt = PyString_FromString(fmt); + if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) { + PyObject *ofmt = SWIG_Python_str_FromChar(fmt); if (ofmt) { +#if PY_VERSION_HEX >= 0x03000000 + res = PyUnicode_Format(ofmt,args); +#else res = PyString_Format(ofmt,args); +#endif Py_DECREF(ofmt); } Py_DECREF(args); @@ -360,49 +364,59 @@ PySwigObject_format(const char* fmt, PySwigObject *v) } SWIGRUNTIME PyObject * -PySwigObject_oct(PySwigObject *v) +SwigPyObject_oct(SwigPyObject *v) { - return PySwigObject_format("%o",v); + return SwigPyObject_format("%o",v); } SWIGRUNTIME PyObject * -PySwigObject_hex(PySwigObject *v) +SwigPyObject_hex(SwigPyObject *v) { - return PySwigObject_format("%x",v); + return SwigPyObject_format("%x",v); } SWIGRUNTIME PyObject * #ifdef METH_NOARGS -PySwigObject_repr(PySwigObject *v) +SwigPyObject_repr(SwigPyObject *v) #else -PySwigObject_repr(PySwigObject *v, PyObject *args) +SwigPyObject_repr(SwigPyObject *v, PyObject *args) #endif { const char *name = SWIG_TypePrettyName(v->ty); - PyObject *hex = PySwigObject_hex(v); - PyObject *repr = PyString_FromFormat("", name, PyString_AsString(hex)); + PyObject *hex = SwigPyObject_hex(v); + PyObject *repr = SWIG_Python_str_FromFormat("", name, hex); Py_DECREF(hex); if (v->next) { #ifdef METH_NOARGS - PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next); + PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next); #else - PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args); + PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args); #endif +#if PY_VERSION_HEX >= 0x03000000 + PyObject *joined = PyUnicode_Concat(repr, nrep); + Py_DecRef(repr); + Py_DecRef(nrep); + repr = joined; +#else PyString_ConcatAndDel(&repr,nrep); +#endif } return repr; } SWIGRUNTIME int -PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) +SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { + char *str; #ifdef METH_NOARGS - PyObject *repr = PySwigObject_repr(v); + PyObject *repr = SwigPyObject_repr(v); #else - PyObject *repr = PySwigObject_repr(v, NULL); + PyObject *repr = SwigPyObject_repr(v, NULL); #endif if (repr) { - fputs(PyString_AsString(repr), fp); + str = SWIG_Python_str_AsChar(repr); + fputs(str, fp); + SWIG_Python_str_DelForPy3(str); Py_DECREF(repr); return 0; } else { @@ -411,53 +425,71 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) } SWIGRUNTIME PyObject * -PySwigObject_str(PySwigObject *v) +SwigPyObject_str(SwigPyObject *v) { char result[SWIG_BUFFER_SIZE]; return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ? - PyString_FromString(result) : 0; + SWIG_Python_str_FromChar(result) : 0; } SWIGRUNTIME int -PySwigObject_compare(PySwigObject *v, PySwigObject *w) +SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w) { void *i = v->ptr; void *j = w->ptr; return (i < j) ? -1 : ((i > j) ? 1 : 0); } +/* Added for Python 3.x, whould it also useful for Python 2.x? */ +SWIGRUNTIME PyObject* +SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op) +{ + PyObject* res; + if( op != Py_EQ && op != Py_NE ) { + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; + } + if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ) + res = Py_True; + else + res = Py_False; + Py_INCREF(res); + return res; +} + + SWIGRUNTIME PyTypeObject* _PySwigObject_type(void); SWIGRUNTIME PyTypeObject* -PySwigObject_type(void) { +SwigPyObject_type(void) { static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type(); return type; } SWIGRUNTIMEINLINE int -PySwigObject_Check(PyObject *op) { - return ((op)->ob_type == PySwigObject_type()) - || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0); +SwigPyObject_Check(PyObject *op) { + return (Py_TYPE(op) == SwigPyObject_type()) + || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0); } SWIGRUNTIME PyObject * -PySwigObject_New(void *ptr, swig_type_info *ty, int own); +SwigPyObject_New(void *ptr, swig_type_info *ty, int own); SWIGRUNTIME void -PySwigObject_dealloc(PyObject *v) +SwigPyObject_dealloc(PyObject *v) { - PySwigObject *sobj = (PySwigObject *) v; + SwigPyObject *sobj = (SwigPyObject *) v; PyObject *next = sobj->next; if (sobj->own == SWIG_POINTER_OWN) { swig_type_info *ty = sobj->ty; - PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; + SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; PyObject *destroy = data ? data->destroy : 0; if (destroy) { /* destroy is always a VARARGS method */ PyObject *res; if (data->delargs) { /* we need to create a temporal object to carry the destroy operation */ - PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0); + PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); res = SWIG_Python_CallFunctor(destroy, tmp); Py_DECREF(tmp); } else { @@ -479,15 +511,15 @@ PySwigObject_dealloc(PyObject *v) } SWIGRUNTIME PyObject* -PySwigObject_append(PyObject* v, PyObject* next) +SwigPyObject_append(PyObject* v, PyObject* next) { - PySwigObject *sobj = (PySwigObject *) v; + SwigPyObject *sobj = (SwigPyObject *) v; #ifndef METH_O PyObject *tmp = 0; if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL; next = tmp; #endif - if (!PySwigObject_Check(next)) { + if (!SwigPyObject_Check(next)) { return NULL; } sobj->next = next; @@ -497,12 +529,12 @@ PySwigObject_append(PyObject* v, PyObject* next) SWIGRUNTIME PyObject* #ifdef METH_NOARGS -PySwigObject_next(PyObject* v) +SwigPyObject_next(PyObject* v) #else -PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) #endif { - PySwigObject *sobj = (PySwigObject *) v; + SwigPyObject *sobj = (SwigPyObject *) v; if (sobj->next) { Py_INCREF(sobj->next); return sobj->next; @@ -513,30 +545,30 @@ PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) SWIGINTERN PyObject* #ifdef METH_NOARGS -PySwigObject_disown(PyObject *v) +SwigPyObject_disown(PyObject *v) #else -PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) #endif { - PySwigObject *sobj = (PySwigObject *)v; + SwigPyObject *sobj = (SwigPyObject *)v; sobj->own = 0; return SWIG_Py_Void(); } SWIGINTERN PyObject* #ifdef METH_NOARGS -PySwigObject_acquire(PyObject *v) +SwigPyObject_acquire(PyObject *v) #else -PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) #endif { - PySwigObject *sobj = (PySwigObject *)v; + SwigPyObject *sobj = (SwigPyObject *)v; sobj->own = SWIG_POINTER_OWN; return SWIG_Py_Void(); } SWIGINTERN PyObject* -PySwigObject_own(PyObject *v, PyObject *args) +SwigPyObject_own(PyObject *v, PyObject *args) { PyObject *val = 0; #if (PY_VERSION_HEX < 0x02020000) @@ -549,20 +581,20 @@ PySwigObject_own(PyObject *v, PyObject *args) } else { - PySwigObject *sobj = (PySwigObject *)v; + SwigPyObject *sobj = (SwigPyObject *)v; PyObject *obj = PyBool_FromLong(sobj->own); if (val) { #ifdef METH_NOARGS if (PyObject_IsTrue(val)) { - PySwigObject_acquire(v); + SwigPyObject_acquire(v); } else { - PySwigObject_disown(v); + SwigPyObject_disown(v); } #else if (PyObject_IsTrue(val)) { - PySwigObject_acquire(v,args); + SwigPyObject_acquire(v,args); } else { - PySwigObject_disown(v,args); + SwigPyObject_disown(v,args); } #endif } @@ -573,30 +605,30 @@ PySwigObject_own(PyObject *v, PyObject *args) #ifdef METH_O static PyMethodDef swigobject_methods[] = { - {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, - {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, - {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, - {(char *)"append", (PyCFunction)PySwigObject_append, METH_O, (char *)"appends another 'this' object"}, - {(char *)"next", (PyCFunction)PySwigObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, - {(char *)"__repr__",(PyCFunction)PySwigObject_repr, METH_NOARGS, (char *)"returns object representation"}, + {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"own", (PyCFunction)SwigPyObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, + {(char *)"append", (PyCFunction)SwigPyObject_append, METH_O, (char *)"appends another 'this' object"}, + {(char *)"next", (PyCFunction)SwigPyObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, + {(char *)"__repr__",(PyCFunction)SwigPyObject_repr, METH_NOARGS, (char *)"returns object representation"}, {0, 0, 0, 0} }; #else static PyMethodDef swigobject_methods[] = { - {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_VARARGS, (char *)"releases ownership of the pointer"}, - {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS, (char *)"aquires ownership of the pointer"}, - {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, - {(char *)"append", (PyCFunction)PySwigObject_append, METH_VARARGS, (char *)"appends another 'this' object"}, - {(char *)"next", (PyCFunction)PySwigObject_next, METH_VARARGS, (char *)"returns the next 'this' object"}, - {(char *)"__repr__",(PyCFunction)PySwigObject_repr, METH_VARARGS, (char *)"returns object representation"}, + {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_VARARGS, (char *)"releases ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"own", (PyCFunction)SwigPyObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, + {(char *)"append", (PyCFunction)SwigPyObject_append, METH_VARARGS, (char *)"appends another 'this' object"}, + {(char *)"next", (PyCFunction)SwigPyObject_next, METH_VARARGS, (char *)"returns the next 'this' object"}, + {(char *)"__repr__",(PyCFunction)SwigPyObject_repr, METH_VARARGS, (char *)"returns object representation"}, {0, 0, 0, 0} }; #endif #if PY_VERSION_HEX < 0x02020000 SWIGINTERN PyObject * -PySwigObject_getattr(PySwigObject *sobj,char *name) +SwigPyObject_getattr(SwigPyObject *sobj,char *name) { return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name); } @@ -606,11 +638,14 @@ SWIGRUNTIME PyTypeObject* _PySwigObject_type(void) { static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer"; - static PyNumberMethods PySwigObject_as_number = { + static PyNumberMethods SwigPyObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ (binaryfunc)0, /*nb_multiply*/ + /* nb_divide removed in Python 3 */ +#if PY_VERSION_HEX < 0x03000000 (binaryfunc)0, /*nb_divide*/ +#endif (binaryfunc)0, /*nb_remainder*/ (binaryfunc)0, /*nb_divmod*/ (ternaryfunc)0,/*nb_power*/ @@ -624,13 +659,23 @@ _PySwigObject_type(void) { 0, /*nb_and*/ 0, /*nb_xor*/ 0, /*nb_or*/ - (coercion)0, /*nb_coerce*/ - (unaryfunc)PySwigObject_long, /*nb_int*/ - (unaryfunc)PySwigObject_long, /*nb_long*/ +#if PY_VERSION_HEX < 0x03000000 + 0, /*nb_coerce*/ +#endif + (unaryfunc)SwigPyObject_long, /*nb_int*/ +#if PY_VERSION_HEX < 0x03000000 + (unaryfunc)SwigPyObject_long, /*nb_long*/ +#else + 0, /*nb_reserved*/ +#endif (unaryfunc)0, /*nb_float*/ - (unaryfunc)PySwigObject_oct, /*nb_oct*/ - (unaryfunc)PySwigObject_hex, /*nb_hex*/ -#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ +#if PY_VERSION_HEX < 0x03000000 + (unaryfunc)SwigPyObject_oct, /*nb_oct*/ + (unaryfunc)SwigPyObject_hex, /*nb_hex*/ +#endif +#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */ +#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */ #elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ @@ -639,32 +684,41 @@ _PySwigObject_type(void) { #endif }; - static PyTypeObject pyswigobject_type; + static PyTypeObject swigpyobject_type; static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { + /* PyOjbect header changed in Python 3 */ +#if PY_VERSION_HEX >= 0x03000000 + PyVarObject_HEAD_INIT(&PyType_Type, 0) +#else PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - (char *)"PySwigObject", /* tp_name */ - sizeof(PySwigObject), /* tp_basicsize */ +#endif + (char *)"SwigPyObject", /* tp_name */ + sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor)PySwigObject_dealloc, /* tp_dealloc */ - (printfunc)PySwigObject_print, /* tp_print */ + (destructor)SwigPyObject_dealloc, /* tp_dealloc */ + (printfunc)SwigPyObject_print, /* tp_print */ #if PY_VERSION_HEX < 0x02020000 - (getattrfunc)PySwigObject_getattr, /* tp_getattr */ + (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ #else (getattrfunc)0, /* tp_getattr */ #endif (setattrfunc)0, /* tp_setattr */ - (cmpfunc)PySwigObject_compare, /* tp_compare */ - (reprfunc)PySwigObject_repr, /* tp_repr */ - &PySwigObject_as_number, /* tp_as_number */ +#if PY_VERSION_HEX >= 0x03000000 + 0, /* tp_reserved in 3.0.1 */ +#else + (cmpfunc)SwigPyObject_compare, /* tp_compare */ +#endif + (reprfunc)SwigPyObject_repr, /* tp_repr */ + &SwigPyObject_as_number, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ (hashfunc)0, /* tp_hash */ (ternaryfunc)0, /* tp_call */ - (reprfunc)PySwigObject_str, /* tp_str */ + (reprfunc)SwigPyObject_str, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -672,7 +726,7 @@ _PySwigObject_type(void) { swigobject_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ - 0, /* tp_richcompare */ + (richcmpfunc)SwigPyObject_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ #if PY_VERSION_HEX >= 0x02020000 0, /* tp_iter */ @@ -689,11 +743,11 @@ _PySwigObject_type(void) { 0, /* tp_alloc */ 0, /* tp_new */ 0, /* tp_free */ - 0, /* tp_is_gc */ + 0, /* tp_is_gc */ 0, /* tp_bases */ 0, /* tp_mro */ 0, /* tp_cache */ - 0, /* tp_subclasses */ + 0, /* tp_subclasses */ 0, /* tp_weaklist */ #endif #if PY_VERSION_HEX >= 0x02030000 @@ -703,17 +757,20 @@ _PySwigObject_type(void) { 0,0,0,0 /* tp_alloc -> tp_next */ #endif }; - pyswigobject_type = tmp; - pyswigobject_type.ob_type = &PyType_Type; + swigpyobject_type = tmp; + /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */ +#if PY_VERSION_HEX < 0x03000000 + swigpyobject_type.ob_type = &PyType_Type; +#endif type_init = 1; } - return &pyswigobject_type; + return &swigpyobject_type; } SWIGRUNTIME PyObject * -PySwigObject_New(void *ptr, swig_type_info *ty, int own) +SwigPyObject_New(void *ptr, swig_type_info *ty, int own) { - PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type()); + SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type()); if (sobj) { sobj->ptr = ptr; sobj->ty = ty; @@ -732,10 +789,10 @@ typedef struct { void *pack; swig_type_info *ty; size_t size; -} PySwigPacked; +} SwigPyPacked; SWIGRUNTIME int -PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags)) +SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { char result[SWIG_BUFFER_SIZE]; fputs("pack, v->size, 0, sizeof(result))) { - return PyString_FromFormat("", result, v->ty->name); + return SWIG_Python_str_FromFormat("", result, v->ty->name); } else { - return PyString_FromFormat("", v->ty->name); + return SWIG_Python_str_FromFormat("", v->ty->name); } } SWIGRUNTIME PyObject * -PySwigPacked_str(PySwigPacked *v) +SwigPyPacked_str(SwigPyPacked *v) { char result[SWIG_BUFFER_SIZE]; if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){ - return PyString_FromFormat("%s%s", result, v->ty->name); + return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name); } else { - return PyString_FromString(v->ty->name); + return SWIG_Python_str_FromChar(v->ty->name); } } SWIGRUNTIME int -PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w) +SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w) { size_t i = v->size; size_t j = w->size; @@ -782,22 +839,22 @@ PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w) SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void); SWIGRUNTIME PyTypeObject* -PySwigPacked_type(void) { +SwigPyPacked_type(void) { static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type(); return type; } SWIGRUNTIMEINLINE int -PySwigPacked_Check(PyObject *op) { +SwigPyPacked_Check(PyObject *op) { return ((op)->ob_type == _PySwigPacked_type()) - || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0); + || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0); } SWIGRUNTIME void -PySwigPacked_dealloc(PyObject *v) +SwigPyPacked_dealloc(PyObject *v) { - if (PySwigPacked_Check(v)) { - PySwigPacked *sobj = (PySwigPacked *) v; + if (SwigPyPacked_Check(v)) { + SwigPyPacked *sobj = (SwigPyPacked *) v; free(sobj->pack); } PyObject_DEL(v); @@ -806,28 +863,37 @@ PySwigPacked_dealloc(PyObject *v) SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void) { static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer"; - static PyTypeObject pyswigpacked_type; + static PyTypeObject swigpypacked_type; static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { + /* PyObject header changed in Python 3 */ +#if PY_VERSION_HEX>=0x03000000 + PyVarObject_HEAD_INIT(&PyType_Type, 0) +#else PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - (char *)"PySwigPacked", /* tp_name */ - sizeof(PySwigPacked), /* tp_basicsize */ + 0, /* ob_size */ +#endif + (char *)"SwigPyPacked", /* tp_name */ + sizeof(SwigPyPacked), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor)PySwigPacked_dealloc, /* tp_dealloc */ - (printfunc)PySwigPacked_print, /* tp_print */ + (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ + (printfunc)SwigPyPacked_print, /* tp_print */ (getattrfunc)0, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ - (cmpfunc)PySwigPacked_compare, /* tp_compare */ - (reprfunc)PySwigPacked_repr, /* tp_repr */ - 0, /* tp_as_number */ +#if PY_VERSION_HEX>=0x03000000 + 0, /* tp_reserved in 3.0.1 */ +#else + (cmpfunc)SwigPyPacked_compare, /* tp_compare */ +#endif + (reprfunc)SwigPyPacked_repr, /* tp_repr */ + 0, /* tp_as_number */ 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)0, /* tp_hash */ - (ternaryfunc)0, /* tp_call */ - (reprfunc)PySwigPacked_str, /* tp_str */ + 0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)SwigPyPacked_str, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -866,17 +932,20 @@ _PySwigPacked_type(void) { 0,0,0,0 /* tp_alloc -> tp_next */ #endif }; - pyswigpacked_type = tmp; - pyswigpacked_type.ob_type = &PyType_Type; + swigpypacked_type = tmp; + /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */ +#if PY_VERSION_HEX < 0x03000000 + swigpypacked_type.ob_type = &PyType_Type; +#endif type_init = 1; } - return &pyswigpacked_type; + return &swigpypacked_type; } SWIGRUNTIME PyObject * -PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty) +SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty) { - PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type()); + SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type()); if (sobj) { void *pack = malloc(size); if (pack) { @@ -893,10 +962,10 @@ PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty) } SWIGRUNTIME swig_type_info * -PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size) +SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size) { - if (PySwigPacked_Check(obj)) { - PySwigPacked *sobj = (PySwigPacked *)obj; + if (SwigPyPacked_Check(obj)) { + SwigPyPacked *sobj = (SwigPyPacked *)obj; if (sobj->size != size) return 0; memcpy(ptr, sobj->pack, size); return sobj->ty; @@ -912,7 +981,7 @@ PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size) SWIGRUNTIMEINLINE PyObject * _SWIG_This(void) { - return PyString_FromString("this"); + return SWIG_Python_str_FromChar("this"); } SWIGRUNTIME PyObject * @@ -924,11 +993,16 @@ SWIG_This(void) /* #define SWIG_PYTHON_SLOW_GETSET_THIS */ -SWIGRUNTIME PySwigObject * +/* TODO: I don't know how to implement the fast getset in Python 3 right now */ +#if PY_VERSION_HEX>=0x03000000 +#define SWIG_PYTHON_SLOW_GETSET_THIS +#endif + +SWIGRUNTIME SwigPyObject * SWIG_Python_GetSwigThis(PyObject *pyobj) { - if (PySwigObject_Check(pyobj)) { - return (PySwigObject *) pyobj; + if (SwigPyObject_Check(pyobj)) { + return (SwigPyObject *) pyobj; } else { PyObject *obj = 0; #if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000)) @@ -964,12 +1038,12 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) return 0; } #endif - if (obj && !PySwigObject_Check(obj)) { + if (obj && !SwigPyObject_Check(obj)) { /* a PyObject is called 'this', try to get the 'real this' - PySwigObject from it */ + SwigPyObject from it */ return SWIG_Python_GetSwigThis(obj); } - return (PySwigObject *)obj; + return (SwigPyObject *)obj; } } @@ -978,7 +1052,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) SWIGRUNTIME int SWIG_Python_AcquirePtr(PyObject *obj, int own) { if (own == SWIG_POINTER_OWN) { - PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); + SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj); if (sobj) { int oldown = sobj->own; sobj->own = own; @@ -997,7 +1071,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int if (ptr) *ptr = 0; return SWIG_OK; } else { - PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); + SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj); if (own) *own = 0; while (sobj) { @@ -1011,7 +1085,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } else { swig_cast_info *tc = SWIG_TypeCheck(to->name,ty); if (!tc) { - sobj = (PySwigObject *)sobj->next; + sobj = (SwigPyObject *)sobj->next; } else { if (ptr) { int newmemory = 0; @@ -1040,7 +1114,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } else { int res = SWIG_ERROR; if (flags & SWIG_POINTER_IMPLICIT_CONV) { - PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; + SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; if (data && !data->implicitconv) { PyObject *klass = data->klass; if (klass) { @@ -1053,7 +1127,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int impconv = 0; } if (impconv) { - PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv); + SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv); if (iobj) { void *vptr; res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0); @@ -1115,7 +1189,7 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) { SWIGRUNTIME int SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) { - swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz); + swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz); if (!to) return SWIG_ERROR; if (ty) { if (to != ty) { @@ -1137,7 +1211,7 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t */ SWIGRUNTIME PyObject* -SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this) +SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) { #if (PY_VERSION_HEX >= 0x02020000) PyObject *inst = 0; @@ -1161,10 +1235,16 @@ SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this) #endif } } else { +#if PY_VERSION_HEX >= 0x03000000 + inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); + PyObject_SetAttr(inst, SWIG_This(), swig_this); + Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; +#else PyObject *dict = PyDict_New(); PyDict_SetItem(dict, SWIG_This(), swig_this); inst = PyInstance_NewRaw(data->newargs, dict); Py_DECREF(dict); +#endif } return inst; #else @@ -1227,9 +1307,9 @@ SWIG_Python_InitShadowInstance(PyObject *args) { if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) { return NULL; } else { - PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]); + SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]); if (sthis) { - PySwigObject_append((PyObject*) sthis, obj[1]); + SwigPyObject_append((PyObject*) sthis, obj[1]); } else { SWIG_Python_SetSwigThis(obj[0], obj[1]); } @@ -1245,8 +1325,8 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) { return SWIG_Py_Void(); } else { int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0; - PyObject *robj = PySwigObject_New(ptr, type, own); - PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0; + PyObject *robj = SwigPyObject_New(ptr, type, own); + SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0; if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) { PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj); if (inst) { @@ -1262,7 +1342,7 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) { SWIGRUNTIMEINLINE PyObject * SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { - return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void(); + return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void(); } /* -----------------------------------------------------------------------------* @@ -1333,8 +1413,8 @@ SWIG_Python_DestroyModule(void *vptr) for (i =0; i < swig_module->size; ++i) { swig_type_info *ty = types[i]; if (ty->owndata) { - PySwigClientData *data = (PySwigClientData *) ty->clientdata; - if (data) PySwigClientData_Del(data); + SwigPyClientData *data = (SwigPyClientData *) ty->clientdata; + if (data) SwigPyClientData_Del(data); } } Py_DECREF(SWIG_This()); @@ -1344,8 +1424,13 @@ SWIGRUNTIME void SWIG_Python_SetModule(swig_module_info *swig_module) { static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */ +#if PY_VERSION_HEX >= 0x03000000 + /* Add a dummy module object into sys.modules */ + PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION); +#else PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table); +#endif PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); if (pointer && module) { PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); @@ -1365,7 +1450,7 @@ SWIGRUNTIME swig_type_info * SWIG_Python_TypeQuery(const char *type) { PyObject *cache = SWIG_Python_TypeCache(); - PyObject *key = PyString_FromString(type); + PyObject *key = SWIG_Python_str_FromChar(type); PyObject *obj = PyDict_GetItem(cache, key); swig_type_info *descriptor; if (obj) { @@ -1392,21 +1477,23 @@ SWIG_Python_TypeQuery(const char *type) SWIGRUNTIME int SWIG_Python_AddErrMesg(const char* mesg, int infront) -{ +{ if (PyErr_Occurred()) { PyObject *type = 0; PyObject *value = 0; PyObject *traceback = 0; PyErr_Fetch(&type, &value, &traceback); if (value) { + char *tmp; PyObject *old_str = PyObject_Str(value); Py_XINCREF(type); PyErr_Clear(); if (infront) { - PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str)); + PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str)); } else { - PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); + PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg); } + SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); } return 1; @@ -1429,9 +1516,9 @@ SWIG_Python_ArgFail(int argnum) } SWIGRUNTIMEINLINE const char * -PySwigObject_GetDesc(PyObject *self) +SwigPyObject_GetDesc(PyObject *self) { - PySwigObject *v = (PySwigObject *)self; + SwigPyObject *v = (SwigPyObject *)self; swig_type_info *ty = v ? v->ty : 0; return ty ? ty->str : (char*)""; } @@ -1441,10 +1528,10 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) { if (type) { #if defined(SWIG_COBJECT_TYPES) - if (obj && PySwigObject_Check(obj)) { - const char *otype = (const char *) PySwigObject_GetDesc(obj); + if (obj && SwigPyObject_Check(obj)) { + const char *otype = (const char *) SwigPyObject_GetDesc(obj); if (otype) { - PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received", + PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received", type, otype); return; } @@ -1454,10 +1541,11 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) const char *otype = (obj ? obj->ob_type->tp_name : 0); if (otype) { PyObject *str = PyObject_Str(obj); - const char *cstr = str ? PyString_AsString(str) : 0; + const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0; if (cstr) { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", type, otype, cstr); + SWIG_Python_str_DelForPy3(cstr); } else { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); @@ -1479,10 +1567,12 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) void *result; if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { PyErr_Clear(); - if (flags & SWIG_POINTER_EXCEPTION) { +#if SWIG_POINTER_EXCEPTION + if (flags) { SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); SWIG_Python_ArgFail(argnum); } +#endif } return result; } diff --git a/Lib/python/pystdcommon.swg b/Lib/python/pystdcommon.swg index 48b1fdcd5..7e9720cc0 100644 --- a/Lib/python/pystdcommon.swg +++ b/Lib/python/pystdcommon.swg @@ -46,7 +46,7 @@ namespace swig { struct traits_asptr { static int asptr(PyObject *obj, Type **val) { Type *p; - int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0; + int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); if (SWIG_IsOK(res)) { if (val) *val = p; } diff --git a/Lib/python/pystrings.swg b/Lib/python/pystrings.swg index d4d60c42b..1983037a5 100644 --- a/Lib/python/pystrings.swg +++ b/Lib/python/pystrings.swg @@ -5,10 +5,28 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) { - if (PyString_Check(obj)) { +%#if PY_VERSION_HEX>=0x03000000 + if (PyUnicode_Check(obj)) +%#else + if (PyString_Check(obj)) +%#endif + { char *cstr; Py_ssize_t len; +%#if PY_VERSION_HEX>=0x03000000 + if (!alloc && cptr) { + /* We can't allow converting without allocation, since the internal + representation of string in Python 3 is UCS-2/UCS-4 but we require + a UTF-8 representation. + TODO(bhy) More detailed explanation */ + return SWIG_RuntimeError; + } + obj = PyUnicode_AsUTF8String(obj); + PyBytes_AsStringAndSize(obj, &cstr, &len); + if(alloc) *alloc = SWIG_NEWOBJ; +%#else PyString_AsStringAndSize(obj, &cstr, &len); - if (cptr) { +%#endif + if (cptr) { if (alloc) { /* In python the user should not be able to modify the inner @@ -33,10 +51,16 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) *alloc = SWIG_OLDOBJ; } } else { - *cptr = PyString_AsString(obj); + %#if PY_VERSION_HEX>=0x03000000 + assert(0); /* Should never reach here in Python 3 */ + %#endif + *cptr = SWIG_Python_str_AsChar(obj); } } if (psize) *psize = len + 1; +%#if PY_VERSION_HEX>=0x03000000 + Py_XDECREF(obj); +%#endif return SWIG_OK; } else { swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); @@ -64,7 +88,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size) return pchar_descriptor ? SWIG_NewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void(); } else { +%#if PY_VERSION_HEX >= 0x03000000 + return PyUnicode_FromStringAndSize(carray, %numeric_cast(size,int)); +%#else return PyString_FromStringAndSize(carray, %numeric_cast(size,int)); +%#endif } } else { return SWIG_Py_Void(); diff --git a/Lib/python/pytypemaps.swg b/Lib/python/pytypemaps.swg index 2d0aa576c..e8df069ef 100644 --- a/Lib/python/pytypemaps.swg +++ b/Lib/python/pytypemaps.swg @@ -88,7 +88,7 @@ if ($result) { PyObject *robj = PyObject_CallMethod($result, (char *)"__deref__", NULL); if (robj && !PyErr_Occurred()) { - PySwigObject_append((PyObject *) SWIG_Python_GetSwigThis($result), + SwigPyObject_append((PyObject *) SWIG_Python_GetSwigThis($result), (PyObject *) SWIG_Python_GetSwigThis(robj)); Py_DECREF(robj); } diff --git a/Lib/python/pywstrings.swg b/Lib/python/pywstrings.swg index 8254bf8f7..7c36f248d 100644 --- a/Lib/python/pywstrings.swg +++ b/Lib/python/pywstrings.swg @@ -8,14 +8,16 @@ SWIG_AsWCharPtrAndSize(PyObject *obj, wchar_t **cptr, size_t *psize, int *alloc) { PyObject *tmp = 0; int isunicode = PyUnicode_Check(obj); +%#if PY_VERSION_HEX < 0x03000000 if (!isunicode && PyString_Check(obj)) { if (cptr) { obj = tmp = PyUnicode_FromObject(obj); } isunicode = 1; } +%#endif if (isunicode) { - int len = PyUnicode_GetSize(obj); + Py_ssize_t len = PyUnicode_GetSize(obj); if (cptr) { *cptr = %new_array(len + 1, wchar_t); PyUnicode_AsWideChar((PyUnicodeObject *)obj, *cptr, len); diff --git a/Lib/python/std_carray.i b/Lib/python/std_carray.i index 2e40757f2..680d67115 100644 --- a/Lib/python/std_carray.i +++ b/Lib/python/std_carray.i @@ -17,7 +17,7 @@ namespace swig { %extend std::carray { %fragment(SWIG_Traits_frag(std::carray<_Type, _Size >), "header", - fragment="PySwigIterator_T", + fragment="SwigPyIterator_T", fragment=SWIG_Traits_frag(_Type), fragment="StdCarrayTraits") { namespace swig { @@ -36,7 +36,7 @@ namespace swig { %typemap(out,noblock=1) iterator, const_iterator { $result = SWIG_NewPointerObj(swig::make_output_iterator((const $type &)$1), - swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN); + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); } inline size_t __len__() const { return self->size(); } @@ -46,7 +46,7 @@ namespace swig { inline void __setitem__(size_t i, const _Type& v) { (*self)[i] = v; } - swig::PySwigIterator* __iter__(PyObject **PYTHON_SELF) { + swig::SwigPyIterator* __iter__(PyObject **PYTHON_SELF) { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } } diff --git a/Lib/python/std_map.i b/Lib/python/std_map.i index 12dc23ccf..c93ffe61b 100644 --- a/Lib/python/std_map.i +++ b/Lib/python/std_map.i @@ -5,12 +5,12 @@ %fragment("StdMapTraits","header",fragment="StdSequenceTraits") { namespace swig { - template + template inline void - assign(const PySeq& pyseq, std::map *map) { + assign(const SwigPySeq& swigpyseq, std::map *map) { typedef typename std::map::value_type value_type; - typename PySeq::const_iterator it = pyseq.begin(); - for (;it != pyseq.end(); ++it) { + typename SwigPySeq::const_iterator it = swigpyseq.begin(); + for (;it != swigpyseq.end(); ++it) { map->insert(value_type(it->first, it->second)); } } @@ -21,7 +21,11 @@ static int asptr(PyObject *obj, map_type **val) { int res = SWIG_ERROR; if (PyDict_Check(obj)) { - PyObject_var items = PyObject_CallMethod(obj,(char *)"items",NULL); + SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); +%#if PY_VERSION_HEX >= 0x03000000 + /* In Python 3.x the ".items()" method return a dict_items object */ + items = PySequence_Fast(items, ".items() havn't returned a sequence!"); +%#endif res = traits_asptr_stdseq, std::pair >::asptr(items, val); } else { map_type *p; @@ -54,8 +58,8 @@ } PyObject *obj = PyDict_New(); for (const_iterator i= map.begin(); i!= map.end(); ++i) { - swig::PyObject_var key = swig::from(i->first); - swig::PyObject_var val = swig::from(i->second); + swig::SwigVar_PyObject key = swig::from(i->first); + swig::SwigVar_PyObject val = swig::from(i->second); PyDict_SetItem(obj, key, val); } return obj; @@ -86,10 +90,10 @@ }; template - struct PyMapIterator_T : PySwigIteratorClosed_T + struct SwigPyMapIterator_T : SwigPyIteratorClosed_T { - PyMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) - : PySwigIteratorClosed_T(curr, first, last, seq) + SwigPyMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) + : SwigPyIteratorClosed_T(curr, first, last, seq) { } }; @@ -97,37 +101,37 @@ template > - struct PyMapKeyIterator_T : PyMapIterator_T + struct SwigPyMapKeyIterator_T : SwigPyMapIterator_T { - PyMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) - : PyMapIterator_T(curr, first, last, seq) + SwigPyMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) + : SwigPyMapIterator_T(curr, first, last, seq) { } }; template - inline PySwigIterator* + inline SwigPyIterator* make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0) { - return new PyMapKeyIterator_T(current, begin, end, seq); + return new SwigPyMapKeyIterator_T(current, begin, end, seq); } template > - struct PyMapValueIterator_T : PyMapIterator_T + struct SwigPyMapValueITerator_T : SwigPyMapIterator_T { - PyMapValueIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) - : PyMapIterator_T(curr, first, last, seq) + SwigPyMapValueITerator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) + : SwigPyMapIterator_T(curr, first, last, seq) { } }; template - inline PySwigIterator* + inline SwigPyIterator* make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0) { - return new PyMapValueIterator_T(current, begin, end, seq); + return new SwigPyMapValueITerator_T(current, begin, end, seq); } } } @@ -218,12 +222,12 @@ } %newobject key_iterator(PyObject **PYTHON_SELF); - swig::PySwigIterator* key_iterator(PyObject **PYTHON_SELF) { + swig::SwigPyIterator* key_iterator(PyObject **PYTHON_SELF) { return swig::make_output_key_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } %newobject value_iterator(PyObject **PYTHON_SELF); - swig::PySwigIterator* value_iterator(PyObject **PYTHON_SELF) { + swig::SwigPyIterator* value_iterator(PyObject **PYTHON_SELF) { return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } diff --git a/Lib/python/std_multimap.i b/Lib/python/std_multimap.i index f923af06b..58336bc4b 100644 --- a/Lib/python/std_multimap.i +++ b/Lib/python/std_multimap.i @@ -6,12 +6,12 @@ %fragment("StdMultimapTraits","header",fragment="StdSequenceTraits") { namespace swig { - template + template inline void - assign(const PySeq& pyseq, std::multimap *multimap) { + assign(const SwigPySeq& swigpyseq, std::multimap *multimap) { typedef typename std::multimap::value_type value_type; - typename PySeq::const_iterator it = pyseq.begin(); - for (;it != pyseq.end(); ++it) { + typename SwigPySeq::const_iterator it = swigpyseq.begin(); + for (;it != swigpyseq.end(); ++it) { multimap->insert(value_type(it->first, it->second)); } } @@ -22,7 +22,7 @@ static int asptr(PyObject *obj, std::multimap **val) { int res = SWIG_ERROR; if (PyDict_Check(obj)) { - PyObject_var items = PyObject_CallMethod(obj,(char *)"items",NULL); + SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); return traits_asptr_stdseq, std::pair >::asptr(items, val); } else { multimap_type *p; @@ -55,8 +55,8 @@ } PyObject *obj = PyDict_New(); for (const_iterator i= multimap.begin(); i!= multimap.end(); ++i) { - swig::PyObject_var key = swig::from(i->first); - swig::PyObject_var val = swig::from(i->second); + swig::SwigVar_PyObject key = swig::from(i->first); + swig::SwigVar_PyObject val = swig::from(i->second); PyDict_SetItem(obj, key, val); } return obj; diff --git a/Lib/python/std_multiset.i b/Lib/python/std_multiset.i index 35a689026..ac430334c 100644 --- a/Lib/python/std_multiset.i +++ b/Lib/python/std_multiset.i @@ -7,13 +7,13 @@ %fragment("StdMultisetTraits","header",fragment="StdSequenceTraits") %{ namespace swig { - template + template inline void - assign(const PySeq& pyseq, std::multiset* seq) { - // seq->insert(pyseq.begin(), pyseq.end()); // not used as not always implemented - typedef typename PySeq::value_type value_type; - typename PySeq::const_iterator it = pyseq.begin(); - for (;it != pyseq.end(); ++it) { + assign(const SwigPySeq& swigpyseq, std::multiset* seq) { + // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented + typedef typename SwigPySeq::value_type value_type; + typename SwigPySeq::const_iterator it = swigpyseq.begin(); + for (;it != swigpyseq.end(); ++it) { seq->insert(seq->end(),(value_type)(*it)); } } diff --git a/Lib/python/std_pair.i b/Lib/python/std_pair.i index 673e85eef..bc8ccaade 100644 --- a/Lib/python/std_pair.i +++ b/Lib/python/std_pair.i @@ -42,8 +42,8 @@ } } else if (PySequence_Check(obj)) { if (PySequence_Size(obj) == 2) { - swig::PyObject_var first = PySequence_GetItem(obj,0); - swig::PyObject_var second = PySequence_GetItem(obj,1); + swig::SwigVar_PyObject first = PySequence_GetItem(obj,0); + swig::SwigVar_PyObject second = PySequence_GetItem(obj,1); res = get_pair(first, second, val); } } else { @@ -92,8 +92,8 @@ } } else if (PySequence_Check(obj)) { if (PySequence_Size(obj) == 2) { - swig::PyObject_var first = PySequence_GetItem(obj,0); - swig::PyObject_var second = PySequence_GetItem(obj,1); + swig::SwigVar_PyObject first = PySequence_GetItem(obj,0); + swig::SwigVar_PyObject second = PySequence_GetItem(obj,1); res = get_pair(first, second, val); } } else { diff --git a/Lib/python/std_set.i b/Lib/python/std_set.i index 94ef667e2..59f69cdc9 100644 --- a/Lib/python/std_set.i +++ b/Lib/python/std_set.i @@ -5,13 +5,13 @@ %fragment("StdSetTraits","header",fragment="StdSequenceTraits") %{ namespace swig { - template + template inline void - assign(const PySeq& pyseq, std::set* seq) { - // seq->insert(pyseq.begin(), pyseq.end()); // not used as not always implemented - typedef typename PySeq::value_type value_type; - typename PySeq::const_iterator it = pyseq.begin(); - for (;it != pyseq.end(); ++it) { + assign(const SwigPySeq& swigpyseq, std::set* seq) { + // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented + typedef typename SwigPySeq::value_type value_type; + typename SwigPySeq::const_iterator it = swigpyseq.begin(); + for (;it != swigpyseq.end(); ++it) { seq->insert(seq->end(),(value_type)(*it)); } } diff --git a/Lib/r/r.swg b/Lib/r/r.swg index 0ab7e11a0..7fd6d761f 100644 --- a/Lib/r/r.swg +++ b/Lib/r/r.swg @@ -55,13 +55,62 @@ SWIG_InitializeModule(0); %typemap(out) void ""; -%typemap(in) int *, int[ANY] %{ - $1 = INTEGER($input); +%typemap(in) int *, int[ANY], + signed int *, signed int[ANY], + unsigned int *, unsigned int[ANY], + short *, short[ANY], + signed short *, signed short[ANY], + unsigned short *, unsigned short[ANY], + long *, long[ANY], + signed long *, signed long[ANY], + unsigned long *, unsigned long[ANY], + long long *, long long[ANY], + signed long long *, signed long long[ANY], + unsigned long long *, unsigned long long[ANY] + +{ +{ int _rswigi; + int _rswiglen = LENGTH($input); + $1 = %static_cast(calloc(sizeof($1_basetype), _rswiglen), $1_ltype); + for (_rswigi=0; _rswigi< _rswiglen; _rswigi++) { + $1[_rswigi] = INTEGER($input)[_rswigi]; + } +} +} + +%typemap(in) float *, float[ANY], + double *, double[ANY] + +{ +{ int _rswigi; + int _rswiglen = LENGTH($input); + $1 = %static_cast(calloc(sizeof($1_basetype), _rswiglen), $1_ltype); + for (_rswigi=0; _rswigi<_rswiglen; _rswigi++) { + $1[_rswigi] = REAL($input)[_rswigi]; + } +} +} + +%typemap(freearg,noblock=1) int *, int[ANY], + signed int *, signed int[ANY], + unsigned int *, unsigned int[ANY], + short *, short[ANY], + signed short *, signed short[ANY], + unsigned short *, unsigned short[ANY], + long *, long[ANY], + signed long *, signed long[ANY], + unsigned long *, unsigned long[ANY], + long long *, long long[ANY], + signed long long *, signed long long[ANY], + unsigned long long *, unsigned long long[ANY], + float *, float[ANY], + double *, double[ANY] +%{ + free($1); %} -%typemap(in) double *, double[ANY] %{ - $1 = REAL($input); -%} + + /* Shoul dwe recycle to make the length correct. And warn if length() > the dimension. @@ -77,9 +126,9 @@ SWIG_InitializeModule(0); %} -%typemap(scheck) int %{ +%typemap(scheck) int, long %{ if(length($input) > 1) { - Rf_warning("using only the first element of $input") + warning("using only the first element of $input") } %} @@ -91,8 +140,6 @@ SWIG_InitializeModule(0); %include %include -%apply int[ANY] { enum SWIGTYPE[ANY] }; - %typemap(in,noblock=1) enum SWIGTYPE[ANY] { $1 = %reinterpret_cast(INTEGER($input), $1_ltype); } @@ -157,11 +204,12 @@ $1 = %static_cast(CHAR(STRING_ELT($input, 0))[0],$1_ltype); } -%typemap(in,noblock=1) int { +%typemap(in,noblock=1) int, long +{ $1 = %static_cast(INTEGER($input)[0], $1_ltype); } -%typemap(out,noblock=1) int +%typemap(out,noblock=1) int, long "$result = Rf_ScalarInteger($1);"; @@ -172,18 +220,16 @@ $1 = %static_cast(CHAR(STRING_ELT($input, 0))[0],$1_ltype); %typemap(out,noblock=1) bool "$result = Rf_ScalarLogical($1);"; -%typemap(in,noblock=1) unsigned int, - unsigned long, +%typemap(in,noblock=1) float, - double, - long + double { $1 = %static_cast(REAL($input)[0], $1_ltype); } - -%typemap(out,noblock=1) unsigned int * - "$result = ScalarReal(*($1));"; +/* Why is this here ? */ +/* %typemap(out,noblock=1) unsigned int * + "$result = ScalarReal(*($1));"; */ %Rruntime %{ setMethod('[', "ExternalReference", diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg index b5375c213..32946c7b5 100644 --- a/Lib/r/rrun.swg +++ b/Lib/r/rrun.swg @@ -16,8 +16,6 @@ extern "C" { #include #include -#define SWIGR 1 - #if R_VERSION >= R_Version(2,6,0) #define VMAXTYPE void * #else diff --git a/Lib/r/rstdcommon.swg b/Lib/r/rstdcommon.swg index 223203773..56cbe2cdd 100644 --- a/Lib/r/rstdcommon.swg +++ b/Lib/r/rstdcommon.swg @@ -40,7 +40,7 @@ namespace swig { struct traits_asptr { static int asptr(SWIG_Object obj, Type **val) { Type *p; - int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0; + int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); if (SWIG_IsOK(res)) { if (val) *val = p; } diff --git a/Lib/r/rtype.swg b/Lib/r/rtype.swg index 9206b5e3e..d388d1eae 100644 --- a/Lib/r/rtype.swg +++ b/Lib/r/rtype.swg @@ -3,17 +3,23 @@ for use in class representations. */ -%typemap("rtype") int, int *, int & "numeric"; +%typemap("rtype") int, int *, int & "integer"; %apply int {size_t} %apply int {std::size_t} %apply int {ptrdiff_t} %apply int {std::ptrdiff_t} +%apply int {signed int} +%apply int {unsigned int} +%apply int {short} +%apply int {unsigned short} + +%typemap("rtype") long, long *, long & "integer"; +%apply long {long long} +%apply long {signed long long} +%apply long {unsigned long long} +%apply long {signed long} +%apply long {unsigned long} -%typemap("rtype") long, long * "numeric"; -%typemap("rtype") unsigned long, - unsigned long * "numeric"; -%typemap("rtype") unsigned int, - unsigned int * "numeric"; %typemap("rtype") double, double*, double & "numeric"; %typemap("rtype") float, float *, float & "numeric"; %typemap("rtype") char *, char ** "character"; @@ -35,15 +41,14 @@ INTSXP. */ +/* Force coercion of integer, since by default R sets all constants to + numeric, which means that you can't directly call a function with an + integer using an R numercal literal */ %typemap(scoercein) int, int *, int & - %{ $input = as($input, "integer"); %} -%typemap(scoercein) ptrdiff_t, ptrdiff_t *, ptrdiff_t & - %{ $input = as($input, "integer"); %} -%typemap(scoercein) unsigned long, unsigned long *, unsigned long & - %{ $input = as($input, "integer"); %} -%typemap(scoercein) unsigned int, unsigned int *, unsigned int & - %{ $input = as($input, "integer"); %} + %{ $input = as.integer($input); %} +%typemap(scoercein) long, long *, long & + %{ $input = as.integer($input); %} %typemap(scoercein) double, double *, double & %{ %} %typemap(scoercein) float, float *, float & @@ -87,45 +92,16 @@ %typemap(scoercein) bool, bool *, bool & "$input = as.logical($input) "; -/* %typemap(scoercein) int, int *, int &, int[ANY], - size_t, - std::size_t, - size_t &, - std::size_t & + long, + long *, + long &, + long[ANY] "$input = as.integer($input) "; - -%typemap(scoercein) unsigned int, - unsigned long, - double, - float, - long, - long long, - unsigned int[], - unsigned long[], - double[], - float[], - long[], - long long[], - unsigned int[ANY], - unsigned long[ANY], - double[ANY], - float[ANY], - long[ANY], - long long[ANY], - unsigned int *, - unsigned long *, - double*, - float*, - long*, - long long * -%{ $input = as.numeric($input) %} -*/ - %typemap(scoercein) char *, string, std::string, string &, std::string & %{ $input = as($input, "character") %} @@ -153,31 +129,38 @@ string &, std::string & %typemap(scoerceout) char, char *, char &, - unsigned int, - unsigned int &, - unsigned long, - unsigned long &, double, double &, float, float &, - long, - long &, - long long, - long long &, int, int &, + long, + long &, bool, bool &, string, std::string, string &, std::string &, - size_t, - std::size_t, - size_t &, - std::size_t &, - void + void, + signed int, + signed int &, + unsigned int, + unsigned int &, + short, + short &, + unsigned short, + unsigned short &, + long long, + signed long long, + signed long long &, + unsigned long long, + unsigned long long &, + signed long, + signed long &, + unsigned long, + unsigned long & %{ %} diff --git a/Lib/ruby/file.i b/Lib/ruby/file.i index 54ed0a609..d64937ed1 100644 --- a/Lib/ruby/file.i +++ b/Lib/ruby/file.i @@ -3,7 +3,14 @@ #ifdef __cplusplus extern "C" { #endif + +// Ruby 1.9 changed the file name of this header +#ifdef HAVE_RUBY_IO_H +#include "ruby/io.h" +#else #include "rubyio.h" +#endif + #ifdef __cplusplus } #endif diff --git a/Lib/ruby/rubyhead.swg b/Lib/ruby/rubyhead.swg index 8e6e2e7d0..d17fdbaae 100644 --- a/Lib/ruby/rubyhead.swg +++ b/Lib/ruby/rubyhead.swg @@ -7,6 +7,9 @@ #ifdef read # undef read #endif +#ifdef bind +# undef bind +#endif /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */ diff --git a/Lib/ruby/rubywstrings.swg b/Lib/ruby/rubywstrings.swg index 0cf9d7ed9..862928c95 100644 --- a/Lib/ruby/rubywstrings.swg +++ b/Lib/ruby/rubywstrings.swg @@ -29,7 +29,7 @@ SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc) // } // } // if (ok) { -// int len = PyUnicode_GetSize(obj); +// Py_ssize_t len = PyUnicode_GetSize(obj); // rb_notimplement(); // if (cptr) { // *cptr = %new_array(len + 1, wchar_t); diff --git a/Lib/shared_ptr.i b/Lib/shared_ptr.i index 0ccce64bf..709791502 100644 --- a/Lib/shared_ptr.i +++ b/Lib/shared_ptr.i @@ -1,4 +1,8 @@ // shared_ptr namespaces could be boost or std or std::tr1 +// For example for std::tr1, use: +// #define SWIG_SHARED_PTR_NAMESPACE std +// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1 + #if !defined(SWIG_SHARED_PTR_NAMESPACE) # define SWIG_SHARED_PTR_NAMESPACE boost #endif @@ -44,12 +48,12 @@ SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) %define SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...) SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, , TYPE) SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) -%types(SWIG_SHARED_PTR_NAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_NAMESPACE::shared_ptr< BASECLASSTYPE >) %{ +%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >) %{ *newmemory = SWIG_CAST_NEW_MEMORY; - return (void *) new SWIG_SHARED_PTR_NAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_NAMESPACE::shared_ptr< TYPE > *)$from); - %} + return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *)$from); +%} %extend TYPE { - static SWIG_SHARED_PTR_NAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_NAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { + static SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { return swigSharedPtrUpcast; } } diff --git a/Lib/swig.swg b/Lib/swig.swg index 6f40a8fe9..77308e080 100644 --- a/Lib/swig.swg +++ b/Lib/swig.swg @@ -25,10 +25,11 @@ /* Code insertion directives such as %wrapper %{ ... %} */ -#define %init %insert("init") -#define %wrapper %insert("wrapper") -#define %header %insert("header") +#define %begin %insert("begin") #define %runtime %insert("runtime") +#define %header %insert("header") +#define %wrapper %insert("wrapper") +#define %init %insert("init") /* Class extension */ @@ -423,13 +424,21 @@ namespace std { /* Character array handling */ %typemap(memberin) char [ANY] { - if ($input) strncpy((char *)$1, (const char *)$input, $1_dim0); - else $1[0] = 0; + if($input) { + strncpy((char*)$1, (const char *)$input, $1_dim0-1); + $1[$1_dim0-1] = 0; + } else { + $1[0] = 0; + } } %typemap(globalin) char [ANY] { - if ($input) strncpy((char *)$1, (const char *)$input, $1_dim0); - else $1[0] = 0; + if($input) { + strncpy((char*)$1, (const char *)$input, $1_dim0-1); + $1[$1_dim0-1] = 0; + } else { + $1[0] = 0; + } } %typemap(memberin) char [] { @@ -459,26 +468,26 @@ namespace std { /* memberin/globalin typemap for double arrays. */ %typemap(memberin) SWIGTYPE [ANY][ANY] { - $basetype (*inp)[$dim1] = ($basetype (*)[$dim1])($input); - $basetype (*dest)[$dim1] = ($basetype (*)[$dim1])($1); + $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input); + $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1); size_t ii = 0; - for (; ii < $dim0; ++ii) { + for (; ii < $1_dim0; ++ii) { $basetype *ip = inp[ii]; $basetype *dp = dest[ii]; size_t jj = 0; - for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; + for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj]; } } %typemap(globalin) SWIGTYPE [ANY][ANY] { - $basetype (*inp)[$dim1] = ($basetype (*)[$dim1])($input); - $basetype (*dest)[$dim1] = ($basetype (*)[$dim1])($1); + $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input); + $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1); size_t ii = 0; - for (; ii < $dim0; ++ii) { + for (; ii < $1_dim0; ++ii) { $basetype *ip = inp[ii]; $basetype *dp = dest[ii]; size_t jj = 0; - for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; + for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj]; } } @@ -625,6 +634,10 @@ namespace std { * arg1 = *inarg1; // Assignment from a pointer * arg1 = Vector(1,2,3); // Assignment from a value * + * The class offers a strong guarantee of exception safety. + * With regards to the implementation, the private SwigMovePointer nested class is + * a simple smart pointer with move semantics, much like std::auto_ptr. + * * This wrapping technique was suggested by William Fulton and is henceforth * known as the "Fulton Transform" :-). */ @@ -632,18 +645,21 @@ namespace std { #ifdef __cplusplus %insert("runtime") %{ #ifdef __cplusplus +/* SwigValueWrapper is described in swig.swg */ template class SwigValueWrapper { - T *tt; + struct SwigMovePointer { + T *ptr; + SwigMovePointer(T *p) : ptr(p) { } + ~SwigMovePointer() { delete ptr; } + SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); public: - SwigValueWrapper() : tt(0) { } - SwigValueWrapper(const SwigValueWrapper& rhs) : tt(new T(*rhs.tt)) { } - SwigValueWrapper(const T& t) : tt(new T(t)) { } - ~SwigValueWrapper() { delete tt; } - SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; } - operator T&() const { return *tt; } - T *operator&() { return tt; } -private: - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; } + operator T&() const { return *pointer.ptr; } + T *operator&() { return pointer.ptr; } };%} /* diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index 9ee676a2b..a8e9ad74c 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- * swigrun.swg * - * This file contains generic CAPI SWIG runtime support for pointer + * This file contains generic C API SWIG runtime support for pointer * type checking. * ----------------------------------------------------------------------------- */ @@ -20,11 +20,11 @@ /* You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for - creating a static or dynamic library from the swig runtime code. - In 99.9% of the cases, swig just needs to declare them as 'static'. + creating a static or dynamic library from the SWIG runtime code. + In 99.9% of the cases, SWIG just needs to declare them as 'static'. - But only do this if is strictly necessary, ie, if you have problems - with your compiler or so. + But only do this if strictly necessary, ie, if you have problems + with your compiler or suchlike. */ #ifndef SWIGRUNTIME @@ -51,14 +51,14 @@ /* Flags/methods for returning states. - The swig conversion methods, as ConvertPtr, return and integer + The SWIG conversion methods, as ConvertPtr, return and integer that tells if the conversion was successful or not. And if not, an error code can be returned (see swigerrors.swg for the codes). Use the following macros/flags to set or process the returning states. - In old swig versions, you usually write code as: + In old versions of SWIG, code such as the following was usually written: if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { // success code @@ -66,7 +66,7 @@ //fail code } - Now you can be more explicit as: + Now you can be more explicit: int res = SWIG_ConvertPtr(obj,vptr,ty.flags); if (SWIG_IsOK(res)) { @@ -75,7 +75,7 @@ // fail code } - that seems to be the same, but now you can also do + which is the same really, but now you can also do Type *ptr; int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); @@ -93,7 +93,7 @@ I.e., now SWIG_ConvertPtr can return new objects and you can identify the case and take care of the deallocation. Of course that - requires also to SWIG_ConvertPtr to return new result values, as + also requires SWIG_ConvertPtr to return new result values, such as int SWIG_ConvertPtr(obj, ptr,...) { if () { @@ -111,7 +111,7 @@ Of course, returning the plain '0(success)/-1(fail)' still works, but you can be more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the - swig errors code. + SWIG errors code. Finally, if the SWIG_CASTRANK_MODE is enabled, the result code allows to return the 'cast rank', for example, if you have this @@ -125,9 +125,8 @@ fooi(1) // cast rank '0' just use the SWIG_AddCast()/SWIG_CheckState() +*/ - - */ #define SWIG_OK (0) #define SWIG_ERROR (-1) #define SWIG_IsOK(r) (r >= 0) @@ -152,7 +151,6 @@ #define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) #define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) - /* Cast-Rank Mode */ #if defined(SWIG_CASTRANK_MODE) # ifndef SWIG_TypeRank @@ -175,8 +173,6 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) { #endif - - #include #ifdef __cplusplus @@ -273,40 +269,58 @@ SWIG_TypeCompare(const char *nb, const char *tb) { } -/* think of this as a c++ template<> or a scheme macro */ -#define SWIG_TypeCheck_Template(comparison, ty) \ - if (ty) { \ - swig_cast_info *iter = ty->cast; \ - while (iter) { \ - if (comparison) { \ - if (iter == ty->cast) return iter; \ - /* Move iter to the top of the linked list */ \ - iter->prev->next = iter->next; \ - if (iter->next) \ - iter->next->prev = iter->prev; \ - iter->next = ty->cast; \ - iter->prev = 0; \ - if (ty->cast) ty->cast->prev = iter; \ - ty->cast = iter; \ - return iter; \ - } \ - iter = iter->next; \ - } \ - } \ - return 0 - /* Check the typename */ SWIGRUNTIME swig_cast_info * SWIG_TypeCheck(const char *c, swig_type_info *ty) { - SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); + if (ty) { + swig_cast_info *iter = ty->cast; + while (iter) { + if (strcmp(iter->type->name, c) == 0) { + if (iter == ty->cast) + return iter; + /* Move iter to the top of the linked list */ + iter->prev->next = iter->next; + if (iter->next) + iter->next->prev = iter->prev; + iter->next = ty->cast; + iter->prev = 0; + if (ty->cast) ty->cast->prev = iter; + ty->cast = iter; + return iter; + } + iter = iter->next; + } + } + return 0; } -/* Same as previous function, except strcmp is replaced with a pointer comparison */ +/* + Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison +*/ SWIGRUNTIME swig_cast_info * -SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { - SWIG_TypeCheck_Template(iter->type == from, into); +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) { + if (ty) { + swig_cast_info *iter = ty->cast; + while (iter) { + if (iter->type == from) { + if (iter == ty->cast) + return iter; + /* Move iter to the top of the linked list */ + iter->prev->next = iter->next; + if (iter->next) + iter->next->prev = iter->prev; + iter->next = ty->cast; + iter->prev = 0; + if (ty->cast) ty->cast->prev = iter; + ty->cast = iter; + return iter; + } + iter = iter->next; + } + } + return 0; } /* diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg index f6335be82..4bc6315b7 100644 --- a/Lib/typemaps/attribute.swg +++ b/Lib/typemaps/attribute.swg @@ -11,7 +11,7 @@ The following macros convert a pair of set/get methods into a "native" attribute. - Use %attribute when you have a pair of get/set methods + Use %attribute when you have a pair of get/set methods to a primitive type like in: %attribute(A, int, a, get_a, set_a); @@ -27,8 +27,8 @@ %attribute(A, int, c, get_c); - Use %attributeref when you have const/non-const reference - access methods, like in: + Use %attributeref when you have const/non-const reference access methods + for primitive types or class/structs, like in: %attributeref(A, int, b); @@ -99,6 +99,40 @@ where %arg() 'normalizes' the type to be understood as a single argument, otherwise the macro will get confused by the comma. + + The %attributeval is the same as %attribute, but should be used when the type + is a class/struct (ie a non-primitive type) and when the get and set methods + return/pass by value. The following is very similar to the above example, but + note that the access is by value rather than reference. + + %attributeval(MyClassVal, MyFoo, ReadWriteFoo, GetFoo, SetFoo); + %attributeval(MyClassVal, MyFoo, ReadOnlyFoo, GetFoo); + %inline %{ + class MyClassVal { + MyFoo foo; + public: + MyFoo GetFoo() { return foo; } + void SetFoo(MyFoo other) { foo = other; } + }; + %} + + The %attributestring is the same as %attributeval, but should be used for string + class types, which are unusual as they are a class on the C++ side, but normally an + immutable/primitive type in the target language. Example usage for std::string: + + %include + %attributestring(MyStringyClass, std::string, ReadWriteString, GetString, SetString); + %attributestring(MyStringyClass, std::string, ReadOnlyString, GetString); + %inline %{ + class MyStringyClass { + std::string str; + public: + MyStringyClass(const std::string &val) : str(val) {} + std::string GetString() { return str; } + void SetString(std::string other) { str = other; } + }; + %} + */ // @@ -203,3 +237,50 @@ #endif %enddef + +%define %attributeval(Class, AttributeType, AttributeName, GetMethod, SetMethod...) + %{ + #define %mangle(Class) ##_## AttributeName ## _get(self_) new AttributeType(self_->GetMethod()) + %} + #if #SetMethod != "" + %{ + #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) self_->SetMethod(*val_) + %} + #if #SetMethod != #AttributeName + %ignore Class::SetMethod; + #endif + #else + %immutable Class::AttributeName; + #endif + %ignore Class::GetMethod(); + %ignore Class::GetMethod() const; + %newobject Class::AttributeName; + %extend Class { + AttributeType AttributeName; + } +%enddef + + +%define %attributestring(Class, AttributeType, AttributeName, GetMethod, SetMethod...) + %{ + #define %mangle(Class) ##_## AttributeName ## _get(self_) *new AttributeType(self_->GetMethod()) + %} + #if #SetMethod != "" + %{ + #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) self_->SetMethod(val_) + %} + #if #SetMethod != #AttributeName + %ignore Class::SetMethod; + #endif + #else + %immutable Class::AttributeName; + #endif + %ignore Class::GetMethod(); + %ignore Class::GetMethod() const; + %newobject Class::AttributeName; + %typemap(newfree) const AttributeType &AttributeName "delete $1;// my newfree override" + %extend Class { + AttributeType AttributeName; + } +%enddef + diff --git a/Lib/typemaps/swigtype.swg b/Lib/typemaps/swigtype.swg index f5c88a717..15f2f9b41 100644 --- a/Lib/typemaps/swigtype.swg +++ b/Lib/typemaps/swigtype.swg @@ -124,7 +124,7 @@ %typemap(memberin) SWIGTYPE [ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii]; + for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = $input[ii]; } else { %variable_nullref("$type","$name"); } @@ -133,7 +133,7 @@ %typemap(globalin) SWIGTYPE [ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii]; + for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = $input[ii]; } else { %variable_nullref("$type","$name"); } @@ -146,7 +146,7 @@ %variable_fail(res, "$type", "$name"); } else if (inp) { size_t ii = 0; - for (; ii < (size_t)$dim0; ++ii) $1[ii] = inp[ii]; + for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = inp[ii]; } else { %variable_nullref("$type", "$name"); } @@ -158,10 +158,10 @@ %typemap(memberin) SWIGTYPE [ANY][ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$dim0; ++ii) { + for (; ii < (size_t)$1_dim0; ++ii) { if ($input[ii]) { size_t jj = 0; - for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj]; + for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj]; } else { %variable_nullref("$type","$name"); } @@ -174,10 +174,10 @@ %typemap(globalin) SWIGTYPE [ANY][ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$dim0; ++ii) { + for (; ii < (size_t)$1_dim0; ++ii) { if ($input[ii]) { size_t jj = 0; - for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj]; + for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj]; } else { %variable_nullref("$type","$name"); } @@ -188,16 +188,16 @@ } %typemap(varin) SWIGTYPE [ANY][ANY] { - $basetype (*inp)[$dim1] = 0; + $basetype (*inp)[$1_dim1] = 0; int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { %variable_fail(res, "$type", "$name"); } else if (inp) { size_t ii = 0; - for (; ii < (size_t)$dim0; ++ii) { + for (; ii < (size_t)$1_dim0; ++ii) { if (inp[ii]) { size_t jj = 0; - for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = inp[ii][jj]; + for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = inp[ii][jj]; } else { %variable_nullref("$type", "$name"); } diff --git a/Makefile.in b/Makefile.in index dd3867f0d..b56272b11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,6 +2,8 @@ # $Id$ ####################################################################### +.PHONY: ccache source swig + prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ @@ -14,23 +16,39 @@ datarootdir = @datarootdir@ SHELL = /bin/sh SWIG_LIB = @swig_lib@ BIN_DIR = @bindir@ +ENABLE_CCACHE = @ENABLE_CCACHE@ TARGET_NOEXE= swig TARGET = $(TARGET_NOEXE)@EXEEXT@ SOURCE = Source +CCACHE = CCache DOCS = Doc/Manual -swig: libfiles source +swig: libfiles source ccache source: @cd $(SOURCE) && $(MAKE) +ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE)) + libfiles: $(srcdir)/Lib/swigwarn.swg # Files required just for the tarball maintainer: libfiles @cd $(SOURCE) && $(MAKE) CParse/parser.h -.PHONY: source libfiles maintainer +##################################################################### +# Documentation +##################################################################### + +docs: docs-main docs-ccache + +docs-main: + @echo making docs + @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) all clean-baks + +docs-ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) docs) ##################################################################### # All the languages SWIG speaks (when it wants to) @@ -44,7 +62,7 @@ skip-guilescm = test -n "@SKIP_GUILESCM@" skip-guile = test -n "@SKIP_GUILE@" skip-mzscheme = test -n "@SKIP_MZSCHEME@" skip-ruby = test -n "@SKIP_RUBY@" -skip-php4 = test -n "@SKIP_PHP4@" +skip-php = test -n "@SKIP_PHP@" skip-ocaml = test -n "@SKIP_OCAML@" skip-octave = test -n "@SKIP_OCTAVE@" skip-pike = test -n "@SKIP_PIKE@" @@ -67,6 +85,7 @@ skip-gcj = test -n "@SKIP_GCJ@" ##################################################################### ACTION = check +NOSKIP = chk-set-swiglib = SWIG_LIB=@ROOT_DIR@/Lib chk-set-swig = SWIG=@ROOT_DIR@/$(TARGET) @@ -85,7 +104,7 @@ check-aliveness: @$(skip-ruby) || ./$(TARGET) -ruby -help @$(skip-ocaml) || ./$(TARGET) -ocaml -help @$(skip-octave) || ./$(TARGET) -octave -help - @$(skip-php4) || ./$(TARGET) -php4 -help + @$(skip-php) || ./$(TARGET) -php -help @$(skip-pike) || ./$(TARGET) -pike -help @$(skip-chicken) || ./$(TARGET) -chicken -help @$(skip-csharp) || ./$(TARGET) -csharp -help @@ -94,6 +113,9 @@ check-aliveness: @$(skip-r) || ./$(TARGET) -r -help @$(skip-c) || ./$(TARGET) -c -help +check-ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) check) + # Checks examples for compilation (does not run them) check-examples: \ check-tcl-examples \ @@ -105,7 +127,7 @@ check-examples: \ check-ruby-examples \ check-ocaml-examples \ check-octave-examples \ - check-php4-examples \ + check-php-examples \ check-pike-examples \ check-chicken-examples \ check-csharp-examples \ @@ -115,7 +137,7 @@ check-examples: \ check-clisp-examples \ check-uffi-examples \ check-cffi-examples \ - check-r-examples \ + check-r-examples \ check-c-examples tcl_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/tcl/check.list) @@ -127,7 +149,7 @@ mzscheme_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/mzscheme/check.list ruby_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/ruby/check.list) ocaml_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/ocaml/check.list) octave_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/octave/check.list) -php4_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/php4/check.list) +php_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/php/check.list) pike_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/pike/check.list) chicken_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/chicken/check.list) csharp_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/csharp/check.list) @@ -180,13 +202,13 @@ check-gifplot: \ check-ruby-gifplot \ check-ocaml-gifplot \ check-octave-gifplot \ - check-php4-gifplot \ + check-php-gifplot \ check-pike-gifplot \ check-chicken-gifplot \ # check-lua-gifplot \ # check-csharp-gifplot \ -# check-modula3-gifplot \ -# check-c-gifplot +# check-modula3-gifplot \ +# check-c-gifplot check-%-gifplot: gifplot-library @if test -z "$(skip-$*)"; then \ @@ -223,7 +245,7 @@ check-test-suite: \ check-ruby-test-suite \ check-ocaml-test-suite \ check-octave-test-suite \ - check-php4-test-suite \ + check-php-test-suite \ check-pike-test-suite \ check-csharp-test-suite \ check-modula3-test-suite \ @@ -233,7 +255,7 @@ check-test-suite: \ check-uffi-test-suite \ check-cffi-test-suite \ check-chicken-test-suite \ - check-r-test-suite \ + check-r-test-suite \ check-c-test-suite check-%-test-suite: @@ -243,7 +265,7 @@ check-%-test-suite: fi @passed=true; \ dir="Examples/test-suite/$*"; \ - if $(skip-$*); then \ + if $(skip-$*) -a "$(NOSKIP)" != "1"; then \ echo skipping $* test-suite $(ACTION); \ elif [ ! -d $$dir ]; then \ echo warning: cannot $(ACTION) $* test-suite "(no dir $$dir)";\ @@ -256,12 +278,12 @@ check-%-test-suite: # Partial test-suite check - it only invokes SWIG, ie no compilation and no runtime testing partialcheck-test-suite: - @$(MAKE) -k -s check-test-suite ACTION=partialcheck + @$(MAKE) -k -s check-test-suite ACTION=partialcheck NOSKIP=1 partialcheck-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck + @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck NOSKIP=1 -check: check-aliveness check-examples check-gifplot check-test-suite +check: check-aliveness check-ccache check-examples check-gifplot check-test-suite # Run known-to-be-broken as well as not broken testcases in the test-suite all-test-suite: \ @@ -275,7 +297,7 @@ all-test-suite: \ all-ruby-test-suite \ all-ocaml-test-suite \ all-octave-test-suite \ - all-php4-test-suite \ + all-php-test-suite \ all-pike-test-suite \ all-csharp-test-suite \ all-modula3-test-suite \ @@ -285,7 +307,7 @@ all-test-suite: \ all-uffi-test-suite \ all-cffi-test-suite \ all-chicken-test-suite \ - all-r-test-suite \ + all-r-test-suite \ all-c-test-suite all-%-test-suite: @@ -303,7 +325,7 @@ broken-test-suite: \ broken-ruby-test-suite \ broken-ocaml-test-suite \ broken-octave-test-suite \ - broken-php4-test-suite \ + broken-php-test-suite \ broken-pike-test-suite \ broken-csharp-test-suite \ broken-modula3-test-suite \ @@ -313,8 +335,8 @@ broken-test-suite: \ broken-uffi-test-suite \ broken-cffi-test-suite \ broken-chicken-test-suite \ - broken-r-test-suite \ - broken-c-test-suite + broken-r-test-suite \ + broken-c-test-suite broken-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=broken @@ -325,7 +347,7 @@ broken-%-test-suite: clean: clean-objects clean-libfiles clean-examples clean-gifplot clean-test-suite clean-docs -clean-objects: clean-source +clean-objects: clean-source clean-ccache clean-source: @echo cleaning Source @@ -342,20 +364,28 @@ clean-gifplot: @$(MAKE) -k -s check-gifplot ACTION=clean clean-test-suite: - @$(MAKE) -k -s check-test-suite ACTION=clean + @$(MAKE) -k -s check-test-suite ACTION=clean NOSKIP=1 clean-%-examples: @$(MAKE) -k -s check-$*-examples ACTION=clean clean-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=clean + @$(MAKE) -k -s check-$*-test-suite ACTION=clean NOSKIP=1 clean-%-gifplot: @$(MAKE) -k -s check-$*-gifplot ACTION=clean -clean-docs: +clean-ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s clean) + +clean-docs: clean-docs-main clean-docs-ccache + +clean-docs-main: @echo cleaning Docs - @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) -s clean + @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) clean + +clean-docs-ccache: + @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) clean-docs) maintainer-clean: clean-libfiles @cd $(SOURCE) && $(MAKE) maintainer-clean @@ -366,7 +396,7 @@ maintainer-clean: clean-libfiles DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool -distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite clean-docs distclean-dead +distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite clean-docs distclean-dead distclean-ccache distclean-objects: distclean-source @@ -377,39 +407,10 @@ distclean-source: distclean-test-suite: @echo distcleaning Examples/test-suite - @$(MAKE) -k -s noskip-test-suite ACTION=distclean + @$(MAKE) -k -s check-test-suite ACTION=distclean NOSKIP=1 -noskip-test-suite: \ - noskip-tcl-test-suite \ - noskip-perl5-test-suite \ - noskip-python-test-suite \ - noskip-java-test-suite \ - noskip-guilescm-test-suite \ - noskip-guile-test-suite \ - noskip-mzscheme-test-suite \ - noskip-ruby-test-suite \ - noskip-ocaml-test-suite \ - noskip-octave-test-suite \ - noskip-php4-test-suite \ - noskip-pike-test-suite \ - noskip-csharp-test-suite \ - noskip-lua-test-suite \ - noskip-allegrocl-test-suite \ - noskip-clisp-test-suite \ - noskip-uffi-test-suite \ - noskip-cffi-test-suite \ - noskip-chicken-test-suite \ - noskip-r-test-suite \ - noskip-c-test-suite - -noskip-%-test-suite: - dir="Examples/test-suite/$*"; \ - if [ ! -d $$dir ]; then \ - echo warning: cannot $(ACTION) $* test-suite "(no dir $$dir)";\ - else \ - echo $(ACTION)ing $$dir; \ - (cd $$dir && $(MAKE) -k -s $(ACTION)) \ - fi; +distclean-ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s distclean) distclean-dead: rm -f $(DISTCLEAN-DEAD) @@ -439,7 +440,7 @@ MKINSTDIRS = @abs_srcdir@/Tools/config/install-sh -m 0755 -d # Use standard autoconf approach to transform executable name using --program-prefix and --program-suffix transform = @program_transform_name@ -install: install-main install-lib +install: install-main install-lib install-ccache @echo "Installation complete" install-main: @@ -448,7 +449,7 @@ install-main: @echo "Installing $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@" @$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@ -lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php4 ocaml octave \ +lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php ocaml octave \ pike chicken csharp modula3 allegrocl clisp lua cffi uffi r c lib-modules = std @@ -483,12 +484,15 @@ install-lib: fi) ; \ done +install-ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) install) + ##################################################################### # TARGETS: uninstall & friends ##################################################################### -uninstall: uninstall-main uninstall-lib +uninstall: uninstall-main uninstall-lib uninstall-ccache @echo "Uninstall complete" uninstall-main: @@ -499,6 +503,9 @@ uninstall-lib: @echo "Uninstalling the SWIG library" rm -rf $(DESTDIR)$(SWIG_LIB)/ +uninstall-ccache: + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) uninstall) + ############################################################################ # DIST and other maintenance ############################################################################ diff --git a/README b/README index 2898130b0..3df9e506a 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 1.3.36 (24 June 2008) +Version: 1.3.40 (in progress) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, @@ -91,6 +91,27 @@ A SWIG FAQ and other hints can be found on the SWIG Wiki: What's New? =========== +SWIG-1.3.39 summary: +- Some new small feature enhancements. +- Improved C# std::vector wrappers. +- Bug fixes: mainly Python, but also Perl, MzScheme, CFFI, Allegrocl + and Ruby + +SWIG-1.3.38 summary: +- Output directory regression fix and other minor bug fixes + +SWIG-1.3.37 summary: +- Python 3 support added +- SWIG now ships with a version of ccache that can be used with SWIG. + This enables the files generated by SWIG to be cached so that repeated + use of SWIG on unchanged input files speeds up builds quite considerably. +- PHP 4 support removed and PHP support improved in general +- Improved C# array support +- Numerous Allegro CL improvements +- Bug fixes/enhancements for Python, PHP, Java, C#, Chicken, Allegro CL, + CFFI, Ruby, Tcl, Perl, R, Lua. +- Other minor generic bug fixes and enhancements + SWIG-1.3.36 summary: - Enhancement to directors to wrap all protected members - Optimisation feature for objects returned by value diff --git a/Source/CParse/cparse.h b/Source/CParse/cparse.h index 06a901c0d..9be41c60e 100644 --- a/Source/CParse/cparse.h +++ b/Source/CParse/cparse.h @@ -34,16 +34,18 @@ extern "C" { extern void scanner_ignore_typedef(void); extern void scanner_last_id(int); extern void scanner_clear_rename(void); - extern void scanner_set_location(String_or_char *, int line); + extern void scanner_set_location(String *file, int line); + extern void scanner_set_main_input_file(String *file); + extern String *scanner_get_main_input_file(); extern void Swig_cparse_follow_locators(int); extern void start_inline(char *, int); extern String *scanner_ccode; - extern int yylex(); + extern int yylex(void); /* parser.y */ extern SwigType *Swig_cparse_type(String *); extern Node *Swig_cparse(File *); - extern Hash *Swig_cparse_features(); + extern Hash *Swig_cparse_features(void); extern void SWIG_cparse_set_compact_default_args(int defargs); extern int SWIG_cparse_template_reduce(int treduce); diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index 032c71f7e..8734c7d0e 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -22,7 +22,10 @@ char cvsroot_cscanner_c[] = "$Id$"; static Scanner *scan = 0; /* Global string containing C code. Used by the parser to grab code blocks */ -DOHString *scanner_ccode = 0; +String *scanner_ccode = 0; + +/* The main file being parsed */ +static String *main_input_file = 0; /* Error reporting/location information */ int cparse_line = 1; @@ -261,10 +264,8 @@ int yylook(void) { while (1) { if ((tok = Scanner_token(scan)) == 0) return 0; - if (tok == SWIG_TOKEN_ERROR) { - Swig_error(Scanner_file(scan), Scanner_errline(scan), Scanner_errmsg(scan)); - continue; - } + if (tok == SWIG_TOKEN_ERROR) + return 0; cparse_start_line = Scanner_start_line(scan); cparse_line = Scanner_line(scan); cparse_file = Scanner_file(scan); @@ -441,7 +442,7 @@ int yylook(void) { static int check_typedef = 0; -void scanner_set_location(String_or_char *file, int line) { +void scanner_set_location(String *file, int line) { Scanner_set_location(scan,file,line-1); } @@ -467,6 +468,14 @@ void scanner_next_token(int tok) { next_token = tok; } +void scanner_set_main_input_file(String *file) { + main_input_file = file; +} + +String *scanner_get_main_input_file() { + return main_input_file; +} + /* ---------------------------------------------------------------------------- * int yylex() * @@ -690,10 +699,22 @@ int yylex(void) { termtoken = SWIG_TOKEN_LPAREN; termvalue = "("; break; - } else if (nexttok == SWIG_TOKEN_SEMI) { + } else if (nexttok == SWIG_TOKEN_CODEBLOCK) { + termtoken = SWIG_TOKEN_CODEBLOCK; + termvalue = Char(Scanner_text(scan)); + break; + } else if (nexttok == SWIG_TOKEN_LBRACE) { + termtoken = SWIG_TOKEN_LBRACE; + termvalue = "{"; + break; + } else if (nexttok == SWIG_TOKEN_SEMI) { termtoken = SWIG_TOKEN_SEMI; termvalue = ";"; break; + } else if (nexttok == SWIG_TOKEN_STRING) { + termtoken = SWIG_TOKEN_STRING; + termvalue = Swig_copy_string(Char(Scanner_text(scan))); + break; } else if (nexttok == SWIG_TOKEN_ID) { if (needspace) { Append(s," "); @@ -859,8 +880,14 @@ int yylex(void) { return (INLINE); if (strcmp(yytext, "%typemap") == 0) return (TYPEMAP); - if (strcmp(yytext, "%feature") == 0) + if (strcmp(yytext, "%feature") == 0) { + /* The rename_active indicates we don't need the information of the + * following function's return type. This applied for %rename, so do + * %feature. + */ + rename_active = 1; return (FEATURE); + } if (strcmp(yytext, "%except") == 0) return (EXCEPT); if (strcmp(yytext, "%importfile") == 0) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 58e0c0c41..0babfbbb8 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -66,7 +66,7 @@ static void yyerror (const char *e) { (void)e; } -static Node *new_node(const String_or_char *tag) { +static Node *new_node(const_String_or_char_ptr tag) { Node *n = NewHash(); set_nodeType(n,tag); Setfile(n,cparse_file); @@ -203,7 +203,7 @@ static String *yyrename = 0; static String *resolve_node_scope(String *cname); -Hash *Swig_cparse_features() { +Hash *Swig_cparse_features(void) { static Hash *features_hash = 0; if (!features_hash) features_hash = NewHash(); return features_hash; @@ -1002,6 +1002,68 @@ static void add_nested(Nested *n) { } } +/* Strips C-style and C++-style comments from string in-place. */ +static void strip_comments(char *string) { + int state = 0; /* + * 0 - not in comment + * 1 - in c-style comment + * 2 - in c++-style comment + * 3 - in string + * 4 - after reading / not in comments + * 5 - after reading * in c-style comments + * 6 - after reading \ in strings + */ + char * c = string; + while (*c) { + switch (state) { + case 0: + if (*c == '\"') + state = 3; + else if (*c == '/') + state = 4; + break; + case 1: + if (*c == '*') + state = 5; + *c = ' '; + break; + case 2: + if (*c == '\n') + state = 0; + else + *c = ' '; + break; + case 3: + if (*c == '\"') + state = 0; + else if (*c == '\\') + state = 6; + break; + case 4: + if (*c == '/') { + *(c-1) = ' '; + *c = ' '; + state = 2; + } else if (*c == '*') { + *(c-1) = ' '; + *c = ' '; + state = 1; + } else + state = 0; + break; + case 5: + if (*c == '/') + state = 0; + *c = ' '; + break; + case 6: + state = 3; + break; + } + ++c; + } +} + /* Dump all of the nested class declarations to the inline processor * However. We need to do a few name replacements and other munging * first. This function must be called before closing a class! */ @@ -1053,6 +1115,9 @@ static Node *dump_nested(const char *parent) { ret = retx; */ + /* Strip comments - further code may break in presence of comments. */ + strip_comments(Char(n->code)); + /* Make all SWIG created typedef structs/unions/classes unnamed else redefinition errors occur - nasty hack alert.*/ @@ -1360,7 +1425,7 @@ static void default_arguments(Node *n) { * Used by the parser to mark subtypes with extra information. * ----------------------------------------------------------------------------- */ -static void tag_nodes(Node *n, const String_or_char *attrname, DOH *value) { +static void tag_nodes(Node *n, const_String_or_char_ptr attrname, DOH *value) { while (n) { Setattr(n, attrname, value); tag_nodes(firstChild(n), attrname, value); @@ -1886,14 +1951,19 @@ fragment_directive: FRAGMENT LPAREN fname COMMA kwargs RPAREN HBLOCK { ; /* ------------------------------------------------------------ - %includefile "filename" [ declarations ] - %importfile "filename" [ declarations ] + %includefile "filename" [option1="xyz", ...] [ declarations ] + %importfile "filename" [option1="xyz", ...] [ declarations ] ------------------------------------------------------------ */ include_directive: includetype options string LBRACKET { $1.filename = Copy(cparse_file); $1.line = cparse_line; scanner_set_location(NewString($3),1); + if ($2) { + String *maininput = Getattr($2, "maininput"); + if (maininput) + scanner_set_main_input_file(NewString(maininput)); + } } interface RBRACKET { String *mname = 0; $$ = $6; @@ -2290,21 +2360,25 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr String *val = $7 ? NewString($7) : NewString("1"); new_feature($3, val, 0, $5.id, $5.type, $5.parms, $6.qualifier); $$ = 0; + scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum RPAREN declarator cpp_const SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, 0, $7.id, $7.type, $7.parms, $8.qualifier); $$ = 0; + scanner_clear_rename(); } | FEATURE LPAREN idstring featattr RPAREN declarator cpp_const stringbracesemi { String *val = $8 ? NewString($8) : NewString("1"); new_feature($3, val, $4, $6.id, $6.type, $6.parms, $7.qualifier); $$ = 0; + scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN declarator cpp_const SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, $6, $8.id, $8.type, $8.parms, $9.qualifier); $$ = 0; + scanner_clear_rename(); } /* Global feature */ @@ -2312,21 +2386,25 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr String *val = $5 ? NewString($5) : NewString("1"); new_feature($3, val, 0, 0, 0, 0, 0); $$ = 0; + scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum RPAREN SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, 0, 0, 0, 0, 0); $$ = 0; + scanner_clear_rename(); } | FEATURE LPAREN idstring featattr RPAREN stringbracesemi { String *val = $6 ? NewString($6) : NewString("1"); new_feature($3, val, $4, 0, 0, 0, 0); $$ = 0; + scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, $6, 0, 0, 0, 0); $$ = 0; + scanner_clear_rename(); } ; @@ -3152,15 +3230,15 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { List *bases = 0; Node *scope = 0; - $$ = new_node("class"); - Setline($$,cparse_start_line); - Setattr($$,"kind",$2); + $$ = new_node("class"); + Setline($$,cparse_start_line); + Setattr($$,"kind",$2); if ($4) { - Setattr($$,"baselist", Getattr($4,"public")); - Setattr($$,"protectedbaselist", Getattr($4,"protected")); - Setattr($$,"privatebaselist", Getattr($4,"private")); + Setattr($$,"baselist", Getattr($4,"public")); + Setattr($$,"protectedbaselist", Getattr($4,"protected")); + Setattr($$,"privatebaselist", Getattr($4,"private")); } - Setattr($$,"allows_typedef","1"); + Setattr($$,"allows_typedef","1"); /* preserve the current scope */ prev_symtab = Swig_symbol_current(); @@ -3189,10 +3267,10 @@ cpp_class_decl : nscope_inner = 0; } } - Setattr($$,"name",$3); + Setattr($$,"name",$3); Delete(class_rename); - class_rename = make_name($$,$3,0); + class_rename = make_name($$,$3,0); Classprefix = NewString($3); /* Deal with inheritance */ if ($4) { @@ -3256,12 +3334,12 @@ cpp_class_decl : } else { max_class_levels *= 2; } - class_decl = realloc(class_decl, sizeof(Node*) * max_class_levels); + class_decl = (Node**) realloc(class_decl, sizeof(Node*) * max_class_levels); if (!class_decl) { Swig_error(cparse_file, cparse_line, "realloc() failed\n"); } } - class_decl[class_level++] = $$; + class_decl[class_level++] = $$; inclass = 1; } cpp_members RBRACE cpp_opt_declarators { Node *p; @@ -3384,14 +3462,14 @@ cpp_class_decl : | storage_class cpptype LBRACE { String *unnamed; unnamed = make_unnamed(); - $$ = new_node("class"); - Setline($$,cparse_start_line); - Setattr($$,"kind",$2); - Setattr($$,"storage",$1); - Setattr($$,"unnamed",unnamed); - Setattr($$,"allows_typedef","1"); + $$ = new_node("class"); + Setline($$,cparse_start_line); + Setattr($$,"kind",$2); + Setattr($$,"storage",$1); + Setattr($$,"unnamed",unnamed); + Setattr($$,"allows_typedef","1"); Delete(class_rename); - class_rename = make_name($$,0,0); + class_rename = make_name($$,0,0); if (strcmp($2,"class") == 0) { cplus_mode = CPLUS_PRIVATE; } else { @@ -3405,12 +3483,12 @@ cpp_class_decl : } else { max_class_levels *= 2; } - class_decl = realloc(class_decl, sizeof(Node*) * max_class_levels); + class_decl = (Node**) realloc(class_decl, sizeof(Node*) * max_class_levels); if (!class_decl) { Swig_error(cparse_file, cparse_line, "realloc() failed\n"); } } - class_decl[class_level++] = $$; + class_decl[class_level++] = $$; inclass = 1; Classprefix = NewStringEmpty(); Delete(Namespaceprefix); @@ -5414,7 +5492,18 @@ valexpr : exprnum { $$ = $1; } | LPAREN expr RPAREN expr %prec CAST { $$ = $4; if ($4.type != T_STRING) { - $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $4.val); + switch ($2.type) { + case T_FLOAT: + case T_DOUBLE: + case T_LONGDOUBLE: + case T_FLTCPLX: + case T_DBLCPLX: + $$.val = NewStringf("(%s)%s", $2.val, $4.val); /* SwigType_str and decimal points don't mix! */ + break; + default: + $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $4.val); + break; + } } } | LPAREN expr pointer RPAREN expr %prec CAST { diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index 8142125a7..14886605f 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -15,7 +15,7 @@ char cvsroot_templ_c[] = "$Id$"; static int template_debug = 0; -String *baselists[3]; +const char *baselists[3]; void SwigType_template_init() { baselists[0] = "baselist"; @@ -167,18 +167,21 @@ static int cparse_template_expand(Node *n, String *tname, String *rname, String add_parms(Getattr(n, "throws"), cpatchlist, typelist); } else if (Equal(nodeType, "destructor")) { String *name = Getattr(n, "name"); - if (name && strchr(Char(name), '<')) { - Append(patchlist, Getattr(n, "name")); - } else { - Append(name, templateargs); + if (name) { + if (strchr(Char(name), '<')) + Append(patchlist, Getattr(n, "name")); + else + Append(name, templateargs); } name = Getattr(n, "sym:name"); - if (name && strchr(Char(name), '<')) { - String *sn = Copy(tname); - Setattr(n, "sym:name", sn); - Delete(sn); - } else { - Replace(name, tname, rname, DOH_REPLACE_ANY); + if (name) { + if (strchr(Char(name), '<')) { + String *sn = Copy(tname); + Setattr(n, "sym:name", sn); + Delete(sn); + } else { + Replace(name, tname, rname, DOH_REPLACE_ANY); + } } /* Setattr(n,"sym:name",name); */ Append(cpatchlist, Getattr(n, "code")); diff --git a/Source/DOH/README b/Source/DOH/README index 1e948105c..9a42e8b8b 100644 --- a/Source/DOH/README +++ b/Source/DOH/README @@ -92,12 +92,12 @@ DohEncoding(name, fn) Register a format encoding for Printf Currently Available datatypes ------------------------------ -NewString(char *initial) Strings -NewHash() Hash -NewList() List -NewVoid(void *ptr, void (*del)(void *)) Void -NewFile(char *file, char *mode) File -NewCallable(DOH *(*func)(DOH *, DOH *)) Callable object +NewString(char *initial) Strings +NewHash() Hash +NewList() List +NewVoid(void *ptr, void (*del)(void *)) Void +NewFile(char *filename, char *mode, List *newfiles) File +NewCallable(DOH *(*func)(DOH *, DOH *)) Callable object Odds and ends: diff --git a/Source/DOH/base.c b/Source/DOH/base.c index dcb0140e0..15827f328 100644 --- a/Source/DOH/base.c +++ b/Source/DOH/base.c @@ -827,7 +827,7 @@ void DohSetfile(DOH *ho, DOH *file) { /* ----------------------------------------------------------------------------- * DohGetFile() * ----------------------------------------------------------------------------- */ -DOH *DohGetfile(DOH *ho) { +DOH *DohGetfile(const DOH *ho) { DohBase *h = (DohBase *) ho; DohObjInfo *objinfo; if (!h) @@ -854,7 +854,7 @@ void DohSetline(DOH *ho, int l) { /* ----------------------------------------------------------------------------- * DohGetLine() * ----------------------------------------------------------------------------- */ -int DohGetline(DOH *ho) { +int DohGetline(const DOH *ho) { DohBase *h = (DohBase *) ho; DohObjInfo *objinfo; if (!h) diff --git a/Source/DOH/doh.h b/Source/DOH/doh.h index 7ab244fab..766e12a34 100644 --- a/Source/DOH/doh.h +++ b/Source/DOH/doh.h @@ -144,6 +144,9 @@ typedef void DOH; #define DOHString_or_char DOH #define DOHObj_or_char DOH +typedef const DOHString_or_char * const_String_or_char_ptr; +typedef const DOHString_or_char * DOHconst_String_or_char_ptr; + #define DOH_BEGIN -1 #define DOH_END -2 #define DOH_CUR -3 @@ -234,9 +237,9 @@ extern DohIterator DohNext(DohIterator x); /* Positional */ -extern int DohGetline(DOH *obj); +extern int DohGetline(const DOH *obj); extern void DohSetline(DOH *obj, int line); -extern DOH *DohGetfile(DOH *obj); +extern DOH *DohGetfile(const DOH *obj); extern void DohSetfile(DOH *obj, DOH *file); /* String Methods */ @@ -271,7 +274,7 @@ extern int DohGetmark(DOH *obj); * Strings. * ----------------------------------------------------------------------------- */ -extern DOHString *DohNewStringEmpty(); +extern DOHString *DohNewStringEmpty(void); extern DOHString *DohNewString(const DOH *c); extern DOHString *DohNewStringWithSize(const DOH *c, int len); extern DOHString *DohNewStringf(const DOH *fmt, ...); @@ -297,7 +300,7 @@ extern char *DohStrchr(const DOHString_or_char *s1, int ch); * Files * ----------------------------------------------------------------------------- */ -extern DOHFile *DohNewFile(DOH *file, const char *mode); +extern DOHFile *DohNewFile(DOH *filename, const char *mode, DOHList *outfiles); extern DOHFile *DohNewFileFromFile(FILE *f); extern DOHFile *DohNewFileFromFd(int fd); extern void DohFileErrorDisplay(DOHString * filename); @@ -309,14 +312,14 @@ extern int DohCopyto(DOHFile * input, DOHFile * output); * List * ----------------------------------------------------------------------------- */ -extern DOHList *DohNewList(); +extern DOHList *DohNewList(void); extern void DohSortList(DOH *lo, int (*cmp) (const DOH *, const DOH *)); /* ----------------------------------------------------------------------------- * Hash * ----------------------------------------------------------------------------- */ -extern DOHHash *DohNewHash(); +extern DOHHash *DohNewHash(void); /* ----------------------------------------------------------------------------- * Void diff --git a/Source/DOH/file.c b/Source/DOH/file.c index 8c53978ee..65c2336a4 100644 --- a/Source/DOH/file.c +++ b/Source/DOH/file.c @@ -228,15 +228,16 @@ static DohObjInfo DohFileType = { * NewFile() * * Create a new file from a given filename and mode. + * If newfiles is non-zero, the filename is added to the list of new files. * ----------------------------------------------------------------------------- */ -DOH *DohNewFile(DOH *fn, const char *mode) { +DOH *DohNewFile(DOH *filename, const char *mode, DOHList *newfiles) { DohFile *f; FILE *file; - char *filename; + char *filen; - filename = Char(fn); - file = fopen(filename, mode); + filen = Char(filename); + file = fopen(filen, mode); if (!file) return 0; @@ -245,6 +246,8 @@ DOH *DohNewFile(DOH *fn, const char *mode) { fclose(file); return 0; } + if (newfiles) + Append(newfiles, filename); f->filep = file; f->fd = 0; f->closeondel = 1; diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 62aef10f2..045de8b5b 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -535,7 +535,7 @@ DohObjInfo DohHashType = { * Create a new hash table. * ----------------------------------------------------------------------------- */ -DOH *DohNewHash() { +DOH *DohNewHash(void) { Hash *h; int i; h = (Hash *) DohMalloc(sizeof(Hash)); diff --git a/Source/DOH/list.c b/Source/DOH/list.c index a45731de1..7a1786299 100644 --- a/Source/DOH/list.c +++ b/Source/DOH/list.c @@ -345,7 +345,7 @@ DohObjInfo DohListType = { #define MAXLISTITEMS 8 -DOH *DohNewList() { +DOH *DohNewList(void) { List *l; int i; l = (List *) DohMalloc(sizeof(List)); diff --git a/Source/DOH/string.c b/Source/DOH/string.c index 1498d717a..141cd58e8 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -1056,7 +1056,7 @@ DOHString *DohNewString(const DOH *so) { * NewStringEmpty() - Create a new string * ----------------------------------------------------------------------------- */ -DOHString *DohNewStringEmpty() { +DOHString *DohNewStringEmpty(void) { int max = INIT_MAXSIZE; String *str = (String *) DohMalloc(sizeof(String)); str->hashkey = 0; diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index 72e394c98..ebcd2fe7c 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -49,6 +49,7 @@ #define WARN_DEPRECATED_NOEXTERN 122 #define WARN_DEPRECATED_NODEFAULT 123 #define WARN_DEPRECATED_TYPEMAP_LANG 124 +#define WARN_DEPRECATED_INPUT_FILE 125 /* -- Preprocessor -- */ @@ -247,15 +248,21 @@ /* please leave 850-869 free for Modula 3 */ -#define WARN_PHP4_MULTIPLE_INHERITANCE 870 -#define WARN_PHP4_UNKNOWN_PRAGMA 871 +/* These are needed for backward compatibility, but you don't need to add + * PHP4 versions of new warnings since existing user interface files can't + * be using them. + */ +#define WARN_PHP_MULTIPLE_INHERITANCE 870 +#define WARN_PHP_UNKNOWN_PRAGMA 871 -/* please leave 870-889 free for Php */ +#define WARN_PHP_MULTIPLE_INHERITANCE 870 +#define WARN_PHP_UNKNOWN_PRAGMA 871 -#define WARN_C_TYPEMAP_CTYPE_UNDEF 890 +/* please leave 870-889 free for PHP */ /* please leave 890-909 free for C */ +#define WARN_C_TYPEMAP_CTYPE_UNDEF 890 /* Feel free to claim any number in this space that's not currently being used. Just make sure you add an entry here */ diff --git a/Source/Makefile.am b/Source/Makefile.am index c44f22931..a5f4a0c39 100644 --- a/Source/Makefile.am +++ b/Source/Makefile.am @@ -38,11 +38,11 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/allegrocl.cxx \ Modules/allocate.cxx \ Modules/browser.cxx \ + Modules/c.cxx \ Modules/cffi.cxx \ Modules/chicken.cxx \ Modules/clisp.cxx \ Modules/contract.cxx \ - Modules/c.cxx \ Modules/csharp.cxx \ Modules/directors.cxx \ Modules/emit.cxx \ @@ -58,7 +58,7 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/octave.cxx \ Modules/overload.cxx \ Modules/perl5.cxx \ - Modules/php4.cxx \ + Modules/php.cxx \ Modules/pike.cxx \ Modules/python.cxx \ Modules/r.cxx \ diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index a968e506c..878e30a67 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -21,7 +21,8 @@ char cvsroot_allegrocl_cxx[] = "$Id$"; static File *f_cl = 0; String *f_clhead = NewString(""); String *f_clwrap = NewString("(swig-in-package ())\n\n"); -static File *f_cxx; +static File *f_begin; +static File *f_runtime; static File *f_cxx_header = 0; static File *f_cxx_wrapper = 0; @@ -34,6 +35,8 @@ static bool CWrap = true; // generate wrapper file for C code by default. most c static bool Generate_Wrapper = false; static bool unique_swig_package = false; +static SwigType *fwdref_ffi_type = NewString("__SWIGACL_FwdReference"); + static String *current_namespace = NewString(""); static String *current_package = NewString(""); static Hash *defined_namespace_packages = NewHash(); @@ -168,6 +171,7 @@ static String *namespace_of(String *str) { void add_linked_type(Node *n) { #ifdef ALLEGROCL_CLASS_DEBUG Printf(stderr, "Adding linked node of type: %s(%s) %s(%x)\n\n", nodeType(n), Getattr(n, "storage"), Getattr(n, "name"), n); + // Swig_print_node(n); #endif if (!first_linked_type) { first_linked_type = n; @@ -297,7 +301,8 @@ void add_forward_referenced_type(Node *n, int overwrite = 0) { } } -void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, String *name = 0, String *ns = current_namespace) { +void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, + String *name = 0, String *ns = current_namespace) { String *val; String *ns_list = listify_namespace(ns); @@ -321,22 +326,34 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, String /* For typedefs of the form: - typedef __xxx { ... } xxx; + typedef struct __xxx { ... } xxx; + behavior differs between C mode and C++ mode. + + C Mode: add_defined_foreign_type will be called once via classHandler - to define the type for 'struct __xxx', and once via typedefHandler - to associate xxx with 'struct __xxx'. + to define the type for 'struct __xxx' and add the mapping from + 'struct __xxx' -> 'xxx' - We create the following type to identifier mappings: + It will also be called once via typedefHandler to add the + mapping 'xxx' -> 'xxx' - struct __xxx -> (swig-insert-id "xxx") via classHand - xxx -> (swig-insert-id "xxx") via typedefHand + C++ Mode: + add_defined_foreign_type will be called once via classHandler + to define the type for 'xxx'. it also adds the mapping from + 'xxx' -> 'xxx' and also for 'struct xxx' -> 'xxx' - and all references to this typedef'd struct will appear in - generated code as 'xxx'. For non-typedef'd structs, the - classHand mapping will be + In typedefHandler, we again try to add the mapping from + 'xxx' -> 'xxx', which already exists. This second mapping + is ignored. - struct __xxx -> (swig-insert-id "__xxx") + Both modes: + + All references to this typedef'd struct will appear in + generated lisp code as an objectd of type 'xxx'. For + non-typedef'd structs, the classHand mapping will be + + struct __xxx -> (swig-insert-id "__xxx") */ // Swig_print_node(n); String *unnamed = Getattr(n, "unnamed"); @@ -585,7 +602,11 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, String Delete(mangled_name_gen); Delete(mangled_lname_gen); } else { - Swig_warning(WARN_TYPE_REDEFINED, Getfile(n), Getline(n), "Attempting to store a foreign type that exists: %s (%s)\n", k, val); + if (!CPlusPlus || Strcmp(Getattr(n,"kind"),"typedef")) { + Swig_warning(WARN_TYPE_REDEFINED, Getfile(n), Getline(n), + "Attempting to store a foreign type that exists: %s (%s)\n", + k, val); + } } Delete(ns_list); @@ -605,7 +626,7 @@ void note_implicit_template_instantiation(SwigType *t) { add_defined_foreign_type(0, 0, t, t, implicit_ns ? implicit_ns : current_namespace); } -String *get_ffi_type(SwigType *ty, const String_or_char *name) { +String *get_ffi_type(SwigType *ty, const_String_or_char_ptr name) { /* lookup defined foreign type. if it exists, it will return a form suitable for placing into lisp code to generate the def-foreign-type name */ @@ -620,7 +641,8 @@ String *get_ffi_type(SwigType *ty, const String_or_char *name) { #ifdef ALLEGROCL_TYPE_DEBUG Printf(stderr, "found_type '%s'\n", found_type); #endif - return (Strcmp(found_type, "forward-reference") ? Copy(found_type) : NewString(":void")); + return (Strcmp(found_type, "forward-reference") ? Copy(found_type) : + get_ffi_type(fwdref_ffi_type, "")); } else { Hash *typemap = Swig_typemap_search("ffitype", ty, name, 0); @@ -707,25 +729,39 @@ String *internal_compose_foreign_type(SwigType *ty) { if (res) Printf(ffiType, "%s", res); } -// while(resolved_type) { -// // the resolved_type may expand into something like p.NS1::NS2::SomeType -// // for which get_ffi_type will not find any match (due to the p.). -// // Printf(stderr, "\n in resolved type loop on '%s'\n", resolved_type); -// res = get_ffi_type(resolved_type, ""); -// if (res) { -// Printf(ffiType, "%s", res); -// break; -// } else { -// resolved_type = SwigType_typedef_resolve(resolved_type); -// } -// } + if (!res) { - if (Strstr(tok, "struct ")) { - Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(tok), Getline(tok), "Unable to find definition of '%s', assuming forward reference.\n", tok); - } else { - Printf(stderr, "Unable to compose foreign type of: '%s'\n", tok); + String *is_struct = 0; + String *tok_remove_text = 0; + String *tok_name = Copy(tok); + String *tok_key = SwigType_str(tok,0); + if ((is_struct = Strstr(tok_key, "struct ")) || Strstr(tok_key, "union ")) { + tok_remove_text = NewString(is_struct ? "struct " : "union "); } - Printf(ffiType, "(* :void)"); + + /* be more permissive of opaque types. This is the swig way. + compiles will notice if these types are ultimately not + present. */ + + if(tok_remove_text) { + Replaceall(tok_name,tok_remove_text,""); + } + tok_name = strip_namespaces(tok_name); + Delete(tok_remove_text); + // Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(tok), Getline(tok), "Unable to find definition of '%s', assuming forward reference.\n", tok); + +#ifdef ALLEGROCL_TYPE_DEBUG + Printf(stderr, "i-c-f-t: adding forward reference for unknown type '%s'. mapping: %s -> %s\n", tok, tok_key, tok_name); +#endif + Node *nn = NewHash(); + Setattr(nn,"nodeType","classforward"); + Setattr(nn,"kind","class"); + Setattr(nn,"sym:name",tok_name); + Setattr(nn,"name",tok_key); + Setattr(nn,"allegrocl:package",current_namespace); + + add_forward_referenced_type(nn, 0); + Printf(ffiType, "%s", get_ffi_type(tok, ""), tok_name); } } } @@ -733,24 +769,36 @@ String *internal_compose_foreign_type(SwigType *ty) { return ffiType; } -String *compose_foreign_type(SwigType *ty, String *id = 0) { +String *compose_foreign_type(SwigType *ty, String * /*id*/ = 0) { + +/* Hash *lookup_res = Swig_typemap_search("ffitype", ty, id, 0); */ - Hash *lookup_res = Swig_typemap_search("ffitype", ty, id, 0); #ifdef ALLEGROCL_TYPE_DEBUG Printf(stderr, "compose_foreign_type: ENTER (%s)...\n ", ty); - String *id_ref = SwigType_str(ty, id); + // Printf(stderr, "compose_foreign_type: ENTER (%s)(%s)...\n ", ty, (id ? id : 0)); + /* String *id_ref = SwigType_str(ty, id); Printf(stderr, "looking up typemap for %s, found '%s'(%x)\n", id_ref, lookup_res ? Getattr(lookup_res, "code") : 0, lookup_res); + if (lookup_res) Swig_print_node(lookup_res); + */ #endif + /* should we allow named lookups in the typemap here? YES! */ /* unnamed lookups should be found in get_ffi_type, called by internal_compose_foreign_type(), below. */ + + /* I'm reverting to 'no' for the question above. I can no longer + remember why I needed it. If a user needed it, I'll find out + as soon as they upgrade. Sigh. -mutandiz 9/16/2008. */ + +/* if(id && lookup_res) { #ifdef ALLEGROCL_TYPE_DEBUG Printf(stderr, "compose_foreign_type: EXIT-1 (%s)\n ", Getattr(lookup_res, "code")); #endif return NewString(Getattr(lookup_res, "code")); } +*/ SwigType *temp = SwigType_strip_qualifiers(ty); String *res = internal_compose_foreign_type(temp); @@ -828,6 +876,10 @@ String *strip_parens(String *string) { } int ALLEGROCL::validIdentifier(String *s) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "validIdentifier %s\n", s); +#endif + char *c = Char(s); bool got_dot = false; @@ -954,6 +1006,7 @@ String *convert_literal(String *literal, String *type, bool try_to_split) { Delete(num); num = 0; } + Delete(lisp_exp); } else { String *id = NewStringf("#.(swig-insert-id \"%s\" %s :type :constant)", num, ns); @@ -1084,7 +1137,8 @@ void emit_synonym(Node *synonym) { of_ltype = lookup_defined_foreign_ltype(of_name); // Printf(f_clhead,";; from emit-synonym\n"); - Printf(f_clhead, "(swig-def-synonym-type %s\n %s\n %s)\n", syn_ltype, of_ltype, syn_type); + if( of_ltype ) + Printf(f_clhead, "(swig-def-synonym-type %s\n %s\n %s)\n", syn_ltype, of_ltype, syn_type); Delete(synonym_ns); Delete(of_ns_list); @@ -1284,7 +1338,6 @@ void emit_typedef(Node *n) { // leave these in for now. might want to change these to def-foreign-class at some point. // Printf(f_clhead, ";; %s\n", SwigType_typedef_resolve_all(lisp_type)); - // Swig_print_node(n); Printf(f_clhead, "(swig-def-foreign-type \"%s\"\n %s)\n", name, lisp_type); Delete(name); @@ -1468,6 +1521,7 @@ extern "C" Language *swig_allegrocl(void) { void ALLEGROCL::main(int argc, char *argv[]) { int i; + Preprocessor_define("SWIGALLEGROCL 1", 0); SWIG_library_directory("allegrocl"); SWIG_config_file("allegrocl.swg"); @@ -1515,7 +1569,10 @@ void ALLEGROCL::main(int argc, char *argv[]) { "\tcalled to convert identifiers to symbols.\n" "\n" " -[no]cwrap\n" - "\tTurn on or turn off generation of an intermediate C file when\n" "\tcreating a C interface. By default this is only done for C++ code.\n"); + "\tTurn on or turn off generation of an intermediate C file when\n" "\tcreating a C interface. By default this is only done for C++ code.\n" + " -isolate\n" + "Define all SWIG helper functions in a package unique to this module. Avoids redefinition warnings when loading multiple SWIGged modules\n" + "into the same running Allegro CL image.\n"); } @@ -1531,9 +1588,9 @@ int ALLEGROCL::top(Node *n) { swig_package = unique_swig_package ? NewStringf("swig.%s", module_name) : NewString("swig"); - Printf(cl_filename, "%s%s.cl", SWIG_output_directory(), Swig_file_basename(Getattr(n,"infile"))); + Printf(cl_filename, "%s%s.cl", SWIG_output_directory(), module_name); - f_cl = NewFile(cl_filename, "w"); + f_cl = NewFile(cl_filename, "w", SWIG_output_files()); if (!f_cl) { Printf(stderr, "Unable to open %s for writing\n", cl_filename); SWIG_exit(EXIT_FAILURE); @@ -1542,33 +1599,42 @@ int ALLEGROCL::top(Node *n) { Generate_Wrapper = CPlusPlus || CWrap; if (Generate_Wrapper) { - f_cxx = NewFile(cxx_filename, "w"); - if (!f_cxx) { + f_begin = NewFile(cxx_filename, "w", SWIG_output_files()); + if (!f_begin) { Close(f_cl); Delete(f_cl); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); SWIG_exit(EXIT_FAILURE); } } else - f_cxx = NewString(""); + f_begin = NewString(""); - f_cxx_header = f_cxx; + f_runtime = NewString(""); + f_cxx_header = f_runtime; f_cxx_wrapper = NewString(""); Swig_register_filebyname("header", f_cxx_header); Swig_register_filebyname("wrapper", f_cxx_wrapper); - Swig_register_filebyname("runtime", f_cxx); + Swig_register_filebyname("begin", f_begin); + Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("lisp", f_clwrap); Swig_register_filebyname("lisphead", f_cl); - Printf(f_cl, ";; This is an automatically generated file. Make changes in\n" - ";; the definition file, not here.\n\n" + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGALLEGROCL\n"); + Printf(f_runtime, "\n"); + + Swig_banner_target_lang(f_cl, ";;"); + + Printf(f_cl, "\n" "(defpackage :%s\n" " (:use :common-lisp :ff :excl)\n" " (:export #:*swig-identifier-converter* #:*swig-module-name*\n" " #:*void* #:*swig-export-list*))\n" "(in-package :%s)\n\n" - "(eval-when (compile load eval)\n" + "(eval-when (:compile-toplevel :load-toplevel :execute)\n" " (defparameter *swig-identifier-converter* '%s)\n" " (defparameter *swig-module-name* :%s))\n\n", swig_package, swig_package, identifier_converter, module_name); Printf(f_cl, "(defpackage :%s\n" " (:use :common-lisp :%s :ff :excl))\n\n", module_name, swig_package); @@ -1579,7 +1645,7 @@ int ALLEGROCL::top(Node *n) { Language::top(n); - // SwigType_emit_type_table(f_cxx,f_cxx_wrapper); + // SwigType_emit_type_table(f_runtime,f_cxx_wrapper); // Swig_print_tree(n); #ifdef ALLEGROCL_TYPE_DEBUG @@ -1602,8 +1668,12 @@ int ALLEGROCL::top(Node *n) { Delete(f_clhead); Delete(f_clwrap); - Close(f_cxx); - Delete(f_cxx); + Dump(f_runtime, f_begin); + Printf(f_begin, "%s\n", f_cxx_wrapper); + + Close(f_begin); + Delete(f_runtime); + Delete(f_begin); Delete(f_cxx_wrapper); // Swig_print_tree(n); @@ -1898,7 +1968,7 @@ int any_varargs(ParmList *pl) { return 0; } -String *get_lisp_type(SwigType *ty, const String_or_char *name) { +String *get_lisp_type(SwigType *ty, const_String_or_char_ptr name) { Hash *typemap = Swig_typemap_search("lisptype", ty, name, 0); if (typemap) { String *typespec = Getattr(typemap, "code"); @@ -2084,7 +2154,9 @@ struct IDargs { String *arity; IDargs():name(0), type(0), klass(0), arity(0) { - } String *full_quoted_str() { + } + + String *full_quoted_str() { String *result = no_others_quoted_str(); if (arity) Printf(result, " :arity %s", arity); @@ -2335,41 +2407,24 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { for (p = pl; p; p = nextSibling(p), argnum++, largnum++) { // SwigType *argtype=Getattr(p, "type"); SwigType *argtype = Swig_cparse_type(Getattr(p, "tmap:ctype")); + SwigType *parmtype = Getattr(p,"type"); if (!first) { Printf(fcl, "\n "); } - if (SwigType_isvarargs(argtype)) { - Printf(stderr, "Function %s (line %d) contains varargs, which is not directly supported. Use %%varargs instead.\n", Getattr(n, "name"), Getline(n)); - } else { + /* by default, skip varargs */ + if (!SwigType_isvarargs(parmtype)) { String *argname = NewStringf("PARM%d_%s", largnum, Getattr(p, "name")); - // Swig_print_node(p); // Printf(stderr,"%s\n", Getattr(p,"tmap:lin")); String *ffitype = compose_foreign_type(argtype, Getattr(p,"name")); - String *deref_ffitype; - - deref_ffitype = dereference_ffitype(ffitype); - -/* - String *temp = Copy(argtype); - - if (SwigType_ispointer(temp)) { - SwigType_pop(temp); - deref_ffitype = compose_foreign_type(temp); - } else { - deref_ffitype = Copy(ffitype); - } - - Delete(temp); -*/ - // String *lisptype=get_lisp_type(argtype, argname); - String *lisptype = get_lisp_type(Getattr(p, "type"), Getattr(p, "name")); + String *deref_ffitype = dereference_ffitype(ffitype); + String *lisptype = get_lisp_type(parmtype, Getattr(p, "name")); #ifdef ALLEGROCL_DEBUG - Printf(stderr, "lisptype of '%s' '%s' = '%s'\n", - Getattr(p, "type"), Getattr(p, "name"), lisptype); + Printf(stderr, "lisptype of '%s' '%s' = '%s'\n", parmtype, + Getattr(p, "name"), lisptype); #endif // while we're walking the parameters, generating LIN @@ -2400,7 +2455,9 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { first = 0; } + Delete(argname); Delete(ffitype); + Delete(deref_ffitype); Delete(lisptype); } } @@ -2438,11 +2495,6 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { lclass = lookup_defined_foreign_ltype(cl_t); isPtrReturn = 1; } - // if (SwigType_ispointer(cl_t)) { - // isPtrReturn = 1; - // SwigType_pop(cl_t); - // lclass = lookup_defined_foreign_ltype(cl_t); - // } int ff_foreign_ptr = 0; if (!lclass) { @@ -2515,9 +2567,16 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { } int ALLEGROCL::functionWrapper(Node *n) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "functionWrapper %s\n", Getattr(n,"name")); + Swig_print_node(n); +#endif + ParmList *parms = CopyParmList(Getattr(n, "parms")); Wrapper *f = NewWrapper(); + SwigType *t = Getattr(n, "type"); + String *name = Getattr(n, "name"); String *raw_return_type = Swig_typemap_lookup("ctype", n, "", 0); SwigType *return_type = Swig_cparse_type(raw_return_type); @@ -2527,11 +2586,13 @@ int ALLEGROCL::functionWrapper(Node *n) { Delete(resolved); if (!is_void_return) { - String *lresult_init = NewStringf("= (%s)0", raw_return_type); - Wrapper_add_localv(f, "lresult", - SwigType_lstr(SwigType_ltype(return_type), "lresult"), - lresult_init, NIL); - Delete(lresult_init); + String *lresult_init = + NewStringf("= (%s)0", + SwigType_str(SwigType_strip_qualifiers(return_type),0)); + Wrapper_add_localv(f, "lresult", + SwigType_lstr(SwigType_ltype(return_type), "lresult"), + lresult_init, NIL); + Delete(lresult_init); } // Emit all of the local variables for holding arguments. emit_parameter_variables(parms, f); @@ -2556,7 +2617,7 @@ int ALLEGROCL::functionWrapper(Node *n) { if (Getattr(n, "overload:ignore")) { // if we're the last overload, make sure to force the emit // of the rest of the overloads before we leave. - Printf(stderr, "ignored overload %s(%x)\n", Getattr(n, "name"), Getattr(n, "sym:nextSibling")); + Printf(stderr, "ignored overload %s(%x)\n", name, Getattr(n, "sym:nextSibling")); if (!Getattr(n, "sym:nextSibling")) { update_package_if_needed(n); emit_buffered_defuns(n); @@ -2571,7 +2632,7 @@ int ALLEGROCL::functionWrapper(Node *n) { int gencomma = 0; #ifdef ALLEGROCL_DEBUG - Printf(stderr, "Walking parameters for %s '%s'\n", Getattr(n, "allegrocl:kind"), Getattr(n, "name")); + Printf(stderr, "Walking parameters for %s '%s'\n", Getattr(n, "allegrocl:kind"), name); #endif // Now walk the function parameter list and generate code to get arguments String *name_and_parms = NewStringf("%s (", mangled); @@ -2625,24 +2686,34 @@ int ALLEGROCL::functionWrapper(Node *n) { String *actioncode = emit_action(n); - String *result_convert = Swig_typemap_lookup_out("out", n, "result", f, actioncode); - Replaceall(result_convert, "$result", "lresult"); - Printf(f->code, "%s\n", result_convert); - Printf(f->code, " return lresult;\n"); - Delete(result_convert); - emit_return_variable(n, Getattr(n, "type"), f); + String *tm = Swig_typemap_lookup_out("out", n, "result", f, actioncode); + if (!is_void_return && tm) { + if (tm) { + Replaceall(tm, "$result", "lresult"); + Printf(f->code, "%s\n", tm); + Printf(f->code, " return lresult;\n"); + Delete(tm); + } else { + Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, + "Unable to use return type %s in function %s.\n", + SwigType_str(t, 0), name); + } + } + + emit_return_variable(n, t, f); if (CPlusPlus) { Printf(f->code, " } catch (...) {\n"); if (!is_void_return) - Printf(f->code, " return (%s)0;\n", raw_return_type); + Printf(f->code, " return (%s)0;\n", + SwigType_str(SwigType_strip_qualifiers(return_type),0)); Printf(f->code, " }\n"); } Printf(f->code, "}\n"); /* print this when in C mode? make this a command-line arg? */ if (Generate_Wrapper) - Wrapper_print(f, f_cxx); + Wrapper_print(f, f_cxx_wrapper); String *f_buffer = NewString(""); @@ -2664,13 +2735,15 @@ int ALLEGROCL::functionWrapper(Node *n) { } int ALLEGROCL::namespaceDeclaration(Node *n) { - // Empty namespaces are not worth DEFPACKAGEing. - // Swig_print_node(n); #ifdef ALLEGROCL_DEBUG Printf(stderr, "namespaceDecl: '%s'(0x%x) (fc=0x%x)\n", Getattr(n, "sym:name"), n, firstChild(n)); #endif - if (!firstChild(n)) + /* don't wrap a namespace with no contents. package bloat. + also, test-suite/namespace_class.i claims an unnamed namespace + is 'private' and should not be wrapped. Complying... + */ + if (Getattr(n,"unnamed") || !firstChild(n)) return SWIG_OK; String *name = Getattr(n, "sym:name"); @@ -2697,7 +2770,7 @@ int ALLEGROCL::namespaceDeclaration(Node *n) { int ALLEGROCL::constructorHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "constructor %s\n", Getattr(n, "name")); + Printf(stderr, "constructorHandler %s\n", Getattr(n, "name")); #endif // Swig_print_node(n); Setattr(n, "allegrocl:kind", "constructor"); @@ -2709,7 +2782,7 @@ int ALLEGROCL::constructorHandler(Node *n) { int ALLEGROCL::destructorHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "destructor %s\n", Getattr(n, "name")); + Printf(stderr, "destructorHandler %s\n", Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "destructor"); @@ -2720,9 +2793,8 @@ int ALLEGROCL::destructorHandler(Node *n) { } int ALLEGROCL::constantWrapper(Node *n) { - #ifdef ALLEGROCL_DEBUG - Printf(stderr, "constant %s\n", Getattr(n, "name")); + Printf(stderr, "constantWrapper %s\n", Getattr(n, "name")); #endif if (Generate_Wrapper) { @@ -2741,10 +2813,10 @@ int ALLEGROCL::constantWrapper(Node *n) { } SwigType_add_qualifier(const_type, "const"); - SwigType_add_qualifier(const_type, "static"); - String *ppcname = NewStringf("ACLppc_%s", Getattr(n, "name")); - Printf(f_cxx, "static const %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val); + String *ppcname = NewStringf("ACLppc_%s", Getattr(n, "sym:name")); + // Printf(f_runtime, "static const %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val); + Printf(f_runtime, "static %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val); Setattr(n, "name", ppcname); SetFlag(n, "feature:immutable"); @@ -2778,6 +2850,10 @@ int ALLEGROCL::constantWrapper(Node *n) { } int ALLEGROCL::globalvariableHandler(Node *n) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "globalvariableHandler %s\n", Getattr(n, "name")); +#endif + if (Generate_Wrapper) return Language::globalvariableHandler(n); @@ -2797,7 +2873,7 @@ int ALLEGROCL::globalvariableHandler(Node *n) { ctype = SwigType_str(type, 0); // EXPORT ; // = ; - // Printf(f_cxx, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, + // Printf(f_runtime, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, // ctype, mangled_name, (pointer_added ? "&" : ""), name); Printf(f_clwrap, "(swig-defvar \"%s\" \"%s\" :type %s)\n", @@ -2808,7 +2884,7 @@ int ALLEGROCL::globalvariableHandler(Node *n) { int ALLEGROCL::variableWrapper(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "variable %s\n", Getattr(n, "name")); + Printf(stderr, "variableWrapper %s\n", Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "variable"); Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name")); @@ -2833,24 +2909,30 @@ int ALLEGROCL::variableWrapper(Node *n) { } ctype = SwigType_str(type, 0); + // EXPORT ; // = ; - Printf(f_cxx, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, ctype, mangled_name, (pointer_added ? "&" : ""), name); + Printf(f_runtime, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, ctype, mangled_name, (pointer_added ? "&" : ""), name); Printf(f_cl, "(swig-defvar \"%s\" :type %s)\n", mangled_name, ((SwigType_isconst(type)) ? ":constant" : ":variable")); /* - Printf(f_cxx, "// swigtype: %s\n", SwigType_typedef_resolve_all(Getattr(n,"type"))); - Printf(f_cxx, "// vwrap: %s\n", compose_foreign_type(SwigType_strip_qualifiers(Copy(rtype)))); + Printf(f_runtime, "// swigtype: %s\n", SwigType_typedef_resolve_all(Getattr(n,"type"))); + Printf(f_runtime, "// vwrap: %s\n", compose_foreign_type(SwigType_strip_qualifiers(Copy(rtype)))); */ + Printf(stderr,"***\n"); Delete(mangled_name); +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "DONE variable %s\n", Getattr(n, "name")); +#endif + return SWIG_OK; } int ALLEGROCL::memberfunctionHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "member function %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); + Printf(stderr, "memberfunctionHandler %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "member function"); Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name")); @@ -2861,7 +2943,7 @@ int ALLEGROCL::memberfunctionHandler(Node *n) { int ALLEGROCL::membervariableHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "member variable %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); + Printf(stderr, "membervariableHandler %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "member variable"); Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name")); @@ -2871,10 +2953,8 @@ int ALLEGROCL::membervariableHandler(Node *n) { } int ALLEGROCL::typedefHandler(Node *n) { - #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "In typedefHAND\n"); - // Swig_print_node(n); + Printf(stderr, "In typedefHandler\n"); #endif SwigType *typedef_type = Getattr(n,"type"); @@ -2892,9 +2972,7 @@ int ALLEGROCL::typedefHandler(Node *n) { Printf(stderr, " typedef in class '%s'(%x)\n", Getattr(in_class, "sym:name"), in_class); #endif Setattr(n, "allegrocl:typedef:in-class", in_class); - } - if (in_class) { String *class_name = Getattr(in_class, "name"); name = NewStringf("%s__%s", class_name, sym_name); type_ref = NewStringf("%s::%s", class_name, sym_name); @@ -2908,14 +2986,19 @@ int ALLEGROCL::typedefHandler(Node *n) { String *lookup = lookup_defined_foreign_type(typedef_type); - // Printf(stderr, "** lookup='%s'(%x), ff_type='%s', strstr = '%d'\n", lookup, lookup, ff_type, !Strstr(ff_type,"void")); +#ifdef ALLEGROCL_TYPE_DEBUG + Printf(stderr, "** lookup='%s'(%x), typedef_type='%s', strcmp = '%d' strstr = '%d'\n", lookup, lookup, typedef_type, Strcmp(typedef_type,"void"), Strstr(ff_type,"__SWIGACL_FwdReference")); +#endif - if(lookup || (!lookup && !Strstr(ff_type,"void"))) + if(lookup || (!lookup && Strcmp(typedef_type,"void")) || + (!lookup && Strstr(ff_type,"__SWIGACL_FwdReference"))) { add_defined_foreign_type(n, 0, type_ref, name); - else add_forward_referenced_type(n); + } else { + add_forward_referenced_type(n); + } #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "Out typedefHAND\n"); + Printf(stderr, "Out typedefHandler\n"); #endif Delete(ff_type); @@ -2925,22 +3008,33 @@ int ALLEGROCL::typedefHandler(Node *n) { // forward referenced classes are added specially to defined_foreign_types int ALLEGROCL::classforwardDeclaration(Node *n) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "classforwardDeclaration %s\n", Getattr(n, "name")); +#endif + add_forward_referenced_type(n); return SWIG_OK; } int ALLEGROCL::classHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "class %s::%s\n", current_namespace, Getattr(n, "sym:name")); + Printf(stderr, "classHandler %s::%s\n", current_namespace, Getattr(n, "sym:name")); #endif + int result; + if (Generate_Wrapper) - return cppClassHandler(n); + result = cppClassHandler(n); else - return cClassHandler(n); + result = cClassHandler(n); + + return result; } int ALLEGROCL::cClassHandler(Node *n) { +#ifdef ALLEGROCL_TYPE_DEBUG + Printf(stderr, "In cClassHandler\n"); +#endif // String *cDeclName = Getattr(n,"classDeclaration:name"); // String *name= Getattr(n, "sym:name"); // String *kind = Getattr(n,"kind"); @@ -2950,22 +3044,21 @@ int ALLEGROCL::cClassHandler(Node *n) { // Printf(stderr, "Adding %s foreign type\n", name); String *ns = listify_namespace(current_namespace); -#ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "In cClassHAND\n"); -#endif - add_defined_foreign_type(n); Delete(ns); #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "Out cClassHAND\n"); + Printf(stderr, "Out cClassHandler\n"); #endif return SWIG_OK; } int ALLEGROCL::cppClassHandler(Node *n) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "cppClassHandler %s\n", Getattr(n, "name")); +#endif // String *name=Getattr(n, "sym:name"); // String *kind = Getattr(n,"kind"); @@ -3024,6 +3117,9 @@ int ALLEGROCL::cppClassHandler(Node *n) { // so their types can be added to the linked_type_list. SwigType *childType = NewStringf("%s%s", Getattr(c, "decl"), Getattr(c, "type")); +#ifdef ALLEGROCL_CLASS_DEBUG + Printf(stderr, "looking at child '%x' of type '%s'\n", c, childType); +#endif if (!SwigType_isfunction(childType)) Delete(compose_foreign_type(childType)); @@ -3064,6 +3160,9 @@ int ALLEGROCL::emit_one(Node *n) { } int ALLEGROCL::enumDeclaration(Node *n) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "enumDeclaration %s\n", Getattr(n, "name")); +#endif if (Getattr(n, "sym:name")) { add_defined_foreign_type(n); @@ -3080,21 +3179,34 @@ int ALLEGROCL::enumDeclaration(Node *n) { int ALLEGROCL::enumvalueDeclaration(Node *n) { - +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "enumvalueDeclaration %s\n", Getattr(n, "name")); +#endif /* print this when in C mode? make this a command-line arg? */ - if (Generate_Wrapper) { - String *mangled_name = mangle_name(n, "ACL_ENUM"); + SwigType *enum_type = Copy(Getattr(n,"type")); + String *mangled_name = + mangle_name(n, "ACL_ENUM", + in_class ? Getattr(in_class,"name") : + current_namespace); + + SwigType_add_qualifier(enum_type,"const"); - Printf(f_cxx, "EXPORT const %s %s = %s;\n", Getattr(n, "type"), mangled_name, Getattr(n, "value")); + String *enum_decl = SwigType_str(enum_type, mangled_name); + Printf(f_cxx_wrapper, "EXPORT %s;\n", enum_decl); + Printf(f_cxx_wrapper, "%s = %s;\n", enum_decl, Getattr(n, "value")); Delete(mangled_name); + Delete(enum_type); + Delete(enum_decl); } - return SWIG_OK; } int ALLEGROCL::templateDeclaration(Node *n) { +#ifdef ALLEGROCL_DEBUG + Printf(stderr, "templateDeclaration %s\n", Getattr(n, "name")); +#endif String *type = Getattr(n, "templatetype"); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index cc7073ae8..1388e0106 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -12,6 +12,20 @@ char cvsroot_c_cxx[] = "$Id$"; #include #include "swigmod.h" +int SwigType_isbuiltin(SwigType *t) { + const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; + int i = 0; + char *c = Char(t); + if (!t) + return 0; + while (builtins[i]) { + if (strcmp(c, builtins[i]) == 0) + return 1; + i++; + } + return 0; +} + class C:public Language { static const char *usage; @@ -154,7 +168,7 @@ public: String *outfile = Getattr(n, "outfile"); // initialize I/O - f_runtime = NewFile(outfile, "w"); + f_runtime = NewFile(outfile, "w", SWIG_output_files()); if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -173,13 +187,13 @@ public: // create proxy files with appropriate name String *proxy_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); - if ((f_proxy_c = NewFile(proxy_code_filename, "w")) == 0) { + if ((f_proxy_c = NewFile(proxy_code_filename, "w", SWIG_output_files())) == 0) { FileErrorDisplay(proxy_code_filename); SWIG_exit(EXIT_FAILURE); } String *proxy_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module)); - if ((f_proxy_h = NewFile(proxy_header_filename, "w")) == 0) { + if ((f_proxy_h = NewFile(proxy_header_filename, "w", SWIG_output_files())) == 0) { FileErrorDisplay(proxy_header_filename); SWIG_exit(EXIT_FAILURE); } diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 736564d1a..0aa933c56 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -22,7 +22,8 @@ public: String *f_clhead; String *f_clwrap; bool CWrap; // generate wrapper file for C code? - File *f_cxx; + File *f_begin; + File *f_runtime; File *f_cxx_header; File *f_cxx_wrapper; File *f_clos; @@ -67,6 +68,7 @@ private: void CFFI::main(int argc, char *argv[]) { int i; + Preprocessor_define("SWIGCFFI 1", 0); SWIG_library_directory("cffi"); SWIG_config_file("cffi.swg"); generate_typedef_flag = 0; @@ -119,16 +121,15 @@ int CFFI::top(Node *n) { Printf(lisp_filename, "%s%s.lisp", SWIG_output_directory(), module); - File *f_lisp = NewFile(lisp_filename, "w"); - NewFile(lisp_filename, "w"); + File *f_lisp = NewFile(lisp_filename, "w", SWIG_output_files()); if (!f_lisp) { FileErrorDisplay(lisp_filename); SWIG_exit(EXIT_FAILURE); } if (CPlusPlus || CWrap) { - f_cxx = NewFile(cxx_filename, "w"); - if (!f_cxx) { + f_begin = NewFile(cxx_filename, "w", SWIG_output_files()); + if (!f_begin) { Close(f_lisp); Delete(f_lisp); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); @@ -137,7 +138,7 @@ int CFFI::top(Node *n) { String *clos_filename = NewString(""); Printf(clos_filename, "%s%s-clos.lisp", SWIG_output_directory(), module); - f_clos = NewFile(clos_filename, "w"); + f_clos = NewFile(clos_filename, "w", SWIG_output_files()); if (!f_clos) { Close(f_lisp); Delete(f_lisp); @@ -145,22 +146,32 @@ int CFFI::top(Node *n) { SWIG_exit(EXIT_FAILURE); } } else { - f_cxx = NewString(""); + f_begin = NewString(""); f_clos = NewString(""); } - f_cxx_header = f_cxx; + f_runtime = NewString(""); + f_cxx_header = f_runtime; f_cxx_wrapper = NewString(""); Swig_register_filebyname("header", f_cxx_header); Swig_register_filebyname("wrapper", f_cxx_wrapper); - Swig_register_filebyname("runtime", f_cxx); + Swig_register_filebyname("begin", f_begin); + Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("lisphead", f_clhead); if (!no_swig_lisp) Swig_register_filebyname("swiglisp", f_cl); else Swig_register_filebyname("swiglisp", f_null); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGCFFI\n"); + Printf(f_runtime, "\n"); + + Swig_banner_target_lang(f_lisp, ";;;"); + Language::top(n); Printf(f_lisp, "%s\n", f_clhead); Printf(f_lisp, "%s\n", f_cl); @@ -171,8 +182,10 @@ int CFFI::top(Node *n) { Delete(f_cl); Delete(f_clhead); Delete(f_clwrap); - Close(f_cxx); - Delete(f_cxx); + Dump(f_runtime, f_begin); + Close(f_begin); + Delete(f_runtime); + Delete(f_begin); Delete(f_cxx_wrapper); Delete(f_null); @@ -232,7 +245,7 @@ void CFFI::emit_defmethod(Node *n) { ParmList *pl = Getattr(n, "parms"); int argnum = 0; - Node *parent = parentNode(n); + Node *parent = getCurrentClass(); bool first = 0; for (Parm *p = pl; p; p = nextSibling(p), argnum++) { @@ -287,7 +300,7 @@ void CFFI::emit_initialize_instance(Node *n) { ParmList *pl = Getattr(n, "parms"); int argnum = 0; - Node *parent = parentNode(n); + Node *parent = getCurrentClass(); for (Parm *p = pl; p; p = nextSibling(p), argnum++) { String *argname = Getattr(p, "name"); @@ -324,18 +337,18 @@ void CFFI::emit_initialize_instance(Node *n) { } void CFFI::emit_setter(Node *n) { - Node *p = parentNode(n); + Node *parent = getCurrentClass(); Printf(f_clos, "(cl:defmethod (cl:setf %s) (arg0 (obj %s))\n (%s (ff-pointer obj) arg0))\n\n", lispify_name(n, Getattr(n, "name"), "'method"), - lispify_name(p, lispy_name(Char(Getattr(p, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); + lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); } void CFFI::emit_getter(Node *n) { - Node *p = parentNode(n); + Node *parent = getCurrentClass(); Printf(f_clos, "(cl:defmethod %s ((obj %s))\n (%s (ff-pointer obj)))\n\n", lispify_name(n, Getattr(n, "name"), "'method"), - lispify_name(p, lispy_name(Char(Getattr(p, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); + lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); } int CFFI::memberfunctionHandler(Node *n) { @@ -455,7 +468,7 @@ int CFFI::functionWrapper(Node *n) { Printf(f->code, "}\n"); if (CPlusPlus) - Wrapper_print(f, f_cxx); + Wrapper_print(f, f_runtime); if (CPlusPlus) { emit_defun(n, wname); @@ -630,7 +643,7 @@ int CFFI::enumDeclaration(Node *n) { else { String *type = Getattr(c, "type"); String *converted_value = convert_literal(value, type); - Printf(f_cl, "\n\t(%s %s)", slot_name, converted_value); + Printf(f_cl, "\n\t(%s #.%s)", slot_name, converted_value); Delete(converted_value); } Delete(value); diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index 2298d2939..12ef4b454 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -30,6 +30,7 @@ static char *module = 0; static char *chicken_path = (char *) "chicken"; static int num_methods = 0; +static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -101,12 +102,12 @@ protected: int isPointer(SwigType *t); void dispatchFunction(Node *n); - String *chickenNameMapping(String *, String_or_char *); + String *chickenNameMapping(String *, const_String_or_char_ptr ); String *chickenPrimitiveName(String *); String *runtimeCode(); String *defaultExternalRuntimeFilename(); - String *buildClosFunctionCall(List *types, String_or_char *closname, String_or_char *funcname); + String *buildClosFunctionCall(List *types, const_String_or_char_ptr closname, const_String_or_char_ptr funcname); }; /* ----------------------------------------------------------------------- @@ -188,11 +189,12 @@ int CHICKEN::top(Node *n) { /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -205,6 +207,7 @@ int CHICKEN::top(Node *n) { /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -215,14 +218,16 @@ int CHICKEN::top(Node *n) { clos_methods = NewString(""); scm_const_defs = NewString(""); - Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); - Swig_banner(f_runtime); + Swig_banner(f_begin); - Printf(f_runtime, "/* Implementation : CHICKEN */\n\n"); + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGCHICKEN\n"); if (no_collection) Printf(f_runtime, "#define SWIG_CHICKEN_NO_COLLECTION 1\n"); + Printf(f_runtime, "\n"); + /* Set module name */ module = Swig_copy_string(Char(Getattr(n, "name"))); scmmodule = NewString(module); @@ -251,14 +256,14 @@ int CHICKEN::top(Node *n) { Printf(f_init, "#endif\n"); Printf(chicken_filename, "%s%s.scm", SWIG_output_directory(), module); - if ((f_scm = NewFile(chicken_filename, "w")) == 0) { + if ((f_scm = NewFile(chicken_filename, "w", SWIG_output_files())) == 0) { FileErrorDisplay(chicken_filename); SWIG_exit(EXIT_FAILURE); } - Printv(f_scm, - ";; -*- buffer-read-only: t -*- vi: set ro:\n", - ";; This file was created automatically by SWIG.\n", ";; Don't modify this file, modify the SWIG interface instead.\n", NIL); + Swig_banner_target_lang(f_scm, ";;"); + Printf(f_scm, "\n"); + if (declare_unit) Printv(f_scm, "(declare (unit ", scmmodule, "))\n\n", NIL); Printv(f_scm, "(declare \n", @@ -307,15 +312,17 @@ int CHICKEN::top(Node *n) { /* Close all of the files */ Delete(primitive_names); Delete(scmmodule); - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_sym_size); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -1233,7 +1240,7 @@ int CHICKEN::importDirective(Node *n) { return Language::importDirective(n); } -String *CHICKEN::buildClosFunctionCall(List *types, String_or_char *closname, String_or_char *funcname) { +String *CHICKEN::buildClosFunctionCall(List *types, const_String_or_char_ptr closname, const_String_or_char_ptr funcname) { String *method_signature = NewString(""); String *func_args = NewString(""); String *func_call = NewString(""); @@ -1507,7 +1514,7 @@ int CHICKEN::validIdentifier(String *s) { * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ -String *CHICKEN::chickenNameMapping(String *name, String_or_char *class_name) { +String *CHICKEN::chickenNameMapping(String *name, const_String_or_char_ptr class_name) { String *n = NewString(""); if (Strcmp(class_name, "") == 0) { diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index 823f22e2c..fa73b3a0b 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -36,6 +36,7 @@ private: void CLISP::main(int argc, char *argv[]) { int i; + Preprocessor_define("SWIGCLISP 1", 0); SWIG_library_directory("clisp"); SWIG_config_file("clisp.swg"); generate_typedef_flag = 0; @@ -79,20 +80,22 @@ int CLISP::top(Node *n) { Printf(output_filename, "%s%s.lisp", SWIG_output_directory(), module); } - f_cl = NewFile(output_filename, "w+"); + f_cl = NewFile(output_filename, "w+", SWIG_output_files()); if (!f_cl) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); } Swig_register_filebyname("header", f_null); + Swig_register_filebyname("begin", f_null); Swig_register_filebyname("runtime", f_null); Swig_register_filebyname("wrapper", f_null); - String *header = - NewStringf - (";; This is an automatically generated file. \n;;Make changes as you feel are necessary (but remember if you try to regenerate this file, your changes will be lost). \n\n(defpackage :%s\n (:use :common-lisp :ffi)", - module); + String *header = NewString(""); + + Swig_banner_target_lang(header, ";;"); + + Printf(header, "\n(defpackage :%s\n (:use :common-lisp :ffi)", module); Language::top(n); diff --git a/Source/Modules/contract.cxx b/Source/Modules/contract.cxx index 9bf8decf6..518dc2997 100644 --- a/Source/Modules/contract.cxx +++ b/Source/Modules/contract.cxx @@ -46,6 +46,7 @@ public: int extendDirective(Node *n); int importDirective(Node *n); int includeDirective(Node *n); + int namespaceDeclaration(Node *n); int classDeclaration(Node *n); virtual int top(Node *n); }; @@ -320,16 +321,23 @@ int Contracts::constructorDeclaration(Node *n) { int Contracts::externDeclaration(Node *n) { return emit_children(n); } + int Contracts::extendDirective(Node *n) { return emit_children(n); } + int Contracts::importDirective(Node *n) { return emit_children(n); } + int Contracts::includeDirective(Node *n) { return emit_children(n); } +int Contracts::namespaceDeclaration(Node *n) { + return emit_children(n); +} + int Contracts::classDeclaration(Node *n) { int ret = SWIG_OK; InClass = 1; diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 7ea10170a..2730b55d4 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -24,6 +24,7 @@ class CSHARP:public Language { const String *protected_string; Hash *swig_types_hash; + File *f_begin; File *f_runtime; File *f_runtime_h; File *f_header; @@ -85,7 +86,7 @@ class CSHARP:public Language { enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum }; - static Parm *NewParmFromNode(SwigType *type, const String_or_char *name, Node *n) { + static Parm *NewParmFromNode(SwigType *type, const_String_or_char_ptr name, Node *n) { Parm *p = NewParm(type, name); Setfile(p, Getfile(n)); Setline(p, Getline(n)); @@ -102,6 +103,7 @@ public: public_string(NewString("public")), protected_string(NewString("protected")), swig_types_hash(NULL), + f_begin(NULL), f_runtime(NULL), f_runtime_h(NULL), f_header(NULL), @@ -286,8 +288,8 @@ public: SWIG_exit(EXIT_FAILURE); } - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } @@ -297,13 +299,14 @@ public: Printf(stderr, "Unable to determine outfile_h\n"); SWIG_exit(EXIT_FAILURE); } - f_runtime_h = NewFile(outfile_h, "w"); + f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); if (!f_runtime_h) { FileErrorDisplay(outfile_h); SWIG_exit(EXIT_FAILURE); } } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -313,6 +316,7 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("director", f_directors); @@ -358,13 +362,17 @@ public: if (!dllimport) dllimport = Copy(module_class_name); - Swig_banner(f_runtime); // Print the SWIG banner message + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGCSHARP\n"); if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); /* Emit initial director header and director code: */ Swig_banner(f_directors_h); + Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name); @@ -376,6 +384,8 @@ public: Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); } + Printf(f_runtime, "\n"); + Swig_name_register((char *) "wrapper", (char *) "CSharp_%f"); if (old_variable_names) { Swig_name_register((char *) "set", (char *) "set_%v"); @@ -396,7 +406,7 @@ public: // Generate the intermediary class { String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), imclass_name); - File *f_im = NewFile(filen, "w"); + File *f_im = NewFile(filen, "w", SWIG_output_files()); if (!f_im) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -440,7 +450,7 @@ public: // Generate the C# module class { String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), module_class_name); - File *f_module = NewFile(filen, "w"); + File *f_module = NewFile(filen, "w", SWIG_output_files()); if (!f_module) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -567,10 +577,11 @@ public: n_dmethods = 0; /* Close all of the files */ - Dump(f_header, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); if (directorsEnabled()) { - Dump(f_directors, f_runtime); + Dump(f_directors, f_begin); Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); @@ -585,13 +596,14 @@ public: f_directors_h = NULL; } - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -601,11 +613,7 @@ public: void emitBanner(File *f) { Printf(f, "/* ----------------------------------------------------------------------------\n"); - Printf(f, " * This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f, " * Version %s\n", Swig_package_version()); - Printf(f, " *\n"); - Printf(f, " * Do not make changes to this file unless you know what you are doing--modify\n"); - Printf(f, " * the SWIG interface file instead.\n"); + Swig_banner_target_lang(f, " *"); Printf(f, " * ----------------------------------------------------------------------------- */\n\n"); } @@ -1155,7 +1163,7 @@ public: } else { // Global enums are defined in their own file String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), symname); - File *f_enum = NewFile(filen, "w"); + File *f_enum = NewFile(filen, "w", SWIG_output_files()); if (!f_enum) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1734,7 +1742,7 @@ public: } String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), proxy_class_name); - f_proxy = NewFile(filen, "w"); + f_proxy = NewFile(filen, "w", SWIG_output_files()); if (!f_proxy) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1887,6 +1895,7 @@ public: bool setter_flag = false; String *pre_code = NewString(""); String *post_code = NewString(""); + String *terminator_code = NewString(""); if (!proxy_flag) return; @@ -1998,7 +2007,8 @@ public: if (!(variable_wrapper_flag && i == 0)) { SwigType *pt = Getattr(p, "type"); String *param_type = NewString(""); - last_parm = p; + if (setter_flag) + last_parm = p; /* Get the C# parameter type */ if ((tm = Getattr(p, "tmap:cstype"))) { @@ -2034,6 +2044,14 @@ public: Printf(post_code, "\n"); Printv(post_code, post, NIL); } + String *terminator = Getattr(p, "tmap:csin:terminator"); + if (terminator) { + substituteClassname(pt, terminator); + Replaceall(terminator, "$csinput", arg); + if (Len(terminator_code) > 0) + Insert(terminator_code, 0, "\n"); + Insert(terminator_code, 0, terminator); + } Printv(imcall, tm, NIL); } else { Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0)); @@ -2059,7 +2077,8 @@ public: excodeSubstitute(n, tm, "csout", n); bool is_pre_code = Len(pre_code) > 0; bool is_post_code = Len(post_code) > 0; - if (is_pre_code || is_post_code) { + bool is_terminator_code = Len(terminator_code) > 0; + if (is_pre_code || is_post_code || is_terminator_code) { Replaceall(tm, "\n ", "\n "); // add extra indentation to code in typemap if (is_post_code) { Insert(tm, 0, "\n try "); @@ -2071,6 +2090,9 @@ public: Insert(tm, 0, pre_code); Insert(tm, 0, "\n"); } + if (is_terminator_code) { + Printv(tm, "\n", terminator_code, NIL); + } Insert(tm, 0, "{"); Printf(tm, "\n }"); } @@ -2170,6 +2192,7 @@ public: Delete(pre_code); Delete(post_code); + Delete(terminator_code); Delete(function_code); Delete(return_type); Delete(imcall); @@ -2190,6 +2213,7 @@ public: String *helper_args = NewString(""); String *pre_code = NewString(""); String *post_code = NewString(""); + String *terminator_code = NewString(""); String *im_return_type = NewString(""); bool feature_director = (parentNode(n) && Swig_directorclass(n)); @@ -2285,6 +2309,14 @@ public: Printf(post_code, "\n"); Printv(post_code, post, NIL); } + String *terminator = Getattr(p, "tmap:csin:terminator"); + if (terminator) { + substituteClassname(pt, terminator); + Replaceall(terminator, "$csinput", arg); + if (Len(terminator_code) > 0) + Insert(terminator_code, 0, "\n"); + Insert(terminator_code, 0, terminator); + } cshin = Getattr(p, "tmap:csin:cshin"); if (cshin) Replaceall(cshin, "$csinput", arg); @@ -2341,7 +2373,8 @@ public: bool is_pre_code = Len(pre_code) > 0; bool is_post_code = Len(post_code) > 0; - if (is_pre_code || is_post_code) { + bool is_terminator_code = Len(terminator_code) > 0; + if (is_pre_code || is_post_code || is_terminator_code) { Printf(helper_code, " {\n"); if (is_pre_code) { Printv(helper_code, pre_code, "\n", NIL); @@ -2353,6 +2386,9 @@ public: } else { Printv(helper_code, " return ", imcall, ";", NIL); } + if (is_terminator_code) { + Printv(helper_code, "\n", terminator_code, NIL); + } Printf(helper_code, "\n }\n"); String *helper_name = NewStringf("%s.SwigConstruct%s(%s)", proxy_class_name, proxy_class_name, helper_args); String *im_outattributes = Getattr(n, "tmap:imtype:outattributes"); @@ -2371,6 +2407,7 @@ public: Delete(im_return_type); Delete(pre_code); Delete(post_code); + Delete(terminator_code); Delete(construct_tm); Delete(attributes); Delete(overloaded_name); @@ -2488,6 +2525,7 @@ public: bool setter_flag = false; String *pre_code = NewString(""); String *post_code = NewString(""); + String *terminator_code = NewString(""); if (l) { if (SwigType_type(Getattr(l, "type")) == T_VOID) { @@ -2592,6 +2630,14 @@ public: Printf(post_code, "\n"); Printv(post_code, post, NIL); } + String *terminator = Getattr(p, "tmap:csin:terminator"); + if (terminator) { + substituteClassname(pt, terminator); + Replaceall(terminator, "$csinput", arg); + if (Len(terminator_code) > 0) + Insert(terminator_code, 0, "\n"); + Insert(terminator_code, 0, terminator); + } Printv(imcall, tm, NIL); } else { Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0)); @@ -2616,7 +2662,8 @@ public: excodeSubstitute(n, tm, "csout", n); bool is_pre_code = Len(pre_code) > 0; bool is_post_code = Len(post_code) > 0; - if (is_pre_code || is_post_code) { + bool is_terminator_code = Len(terminator_code) > 0; + if (is_pre_code || is_post_code || is_terminator_code) { Replaceall(tm, "\n ", "\n "); // add extra indentation to code in typemap if (is_post_code) { Insert(tm, 0, "\n try "); @@ -2628,6 +2675,9 @@ public: Insert(tm, 0, pre_code); Insert(tm, 0, "\n"); } + if (is_terminator_code) { + Printv(tm, "\n", terminator_code, NIL); + } Insert(tm, 0, "{"); Printf(tm, "\n }"); } @@ -2703,6 +2753,7 @@ public: Delete(pre_code); Delete(post_code); + Delete(terminator_code); Delete(function_code); Delete(return_type); Delete(imcall); @@ -2917,7 +2968,7 @@ public: void emitTypeWrapperClass(String *classname, SwigType *type) { String *swigtype = NewString(""); String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), classname); - File *f_swigtype = NewFile(filen, "w"); + File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); if (!f_swigtype) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 4363cd813..158b53502 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -84,7 +84,7 @@ String *Swig_director_declaration(Node *n) { } -String *Swig_method_call(String_or_char *name, ParmList *parms) { +String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms) { String *func; int i = 0; int comma = 0; @@ -128,7 +128,7 @@ String *Swig_method_call(String_or_char *name, ParmList *parms) { * */ -String *Swig_method_decl(SwigType *returntype, SwigType *decl, const String_or_char *id, List *args, int strip, int values) { +String *Swig_method_decl(SwigType *returntype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values) { String *result; List *elements; String *element = 0, *nextelement; diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index f5f080034..0c72de8d0 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -47,6 +47,7 @@ Guile Options (available with -guile)\n\ -exportprimitive - Add the (export ...) code from scmstub into the\n\ GOOPS file.\n"; +static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -174,7 +175,7 @@ public: } } else if (strcmp(argv[i], "-procdoc") == 0) { if (argv[i + 1]) { - procdoc = NewFile(argv[i + 1], (char *) "w"); + procdoc = NewFile(argv[i + 1], "w", SWIG_output_files()); if (!procdoc) { FileErrorDisplay(argv[i + 1]); SWIG_exit(EXIT_FAILURE); @@ -299,11 +300,12 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -311,6 +313,7 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -322,10 +325,10 @@ public: goopscode = NewString(""); goopsexport = NewString(""); - Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); - Swig_banner(f_runtime); + Swig_banner(f_begin); - Printf(f_runtime, "/* Implementation : GUILE */\n\n"); + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGGUILE\n"); if (!use_scm_interface) { if (SwigRuntime == 1) @@ -358,6 +361,8 @@ public: Printf(f_runtime, "\n}\n"); } + Printf(f_runtime, "\n"); + Language::top(n); /* Close module */ @@ -392,14 +397,16 @@ public: Delete(goopstext); /* Close all of the files */ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -499,15 +506,15 @@ public: SWIG_output_directory(), primitive_name); Delete(primitive_name); - File *scmstubfile = NewFile(fname, (char *) "w"); + File *scmstubfile = NewFile(fname, "w", SWIG_output_files()); if (!scmstubfile) { FileErrorDisplay(fname); SWIG_exit(EXIT_FAILURE); } Delete(fname); - Printf(scmstubfile, ";;; -*- buffer-read-only: t -*- vi: set ro: */\n"); - Printf(scmstubfile, ";;; Automatically generated by SWIG; do not edit.\n\n"); + Swig_banner_target_lang(scmstubfile, ";;;"); + Printf(scmstubfile, "\n"); if (linkage == GUILE_LSTYLE_SIMPLE || linkage == GUILE_LSTYLE_PASSIVE) Printf(scmstubfile, "(define-module (%s))\n\n", mod); Delete(mod); @@ -530,14 +537,14 @@ public: String *fname = NewStringf("%s%s.scm", SWIG_output_directory(), module_name); - File *goopsfile = NewFile(fname, (char *) "w"); + File *goopsfile = NewFile(fname, "w", SWIG_output_files()); if (!goopsfile) { FileErrorDisplay(fname); SWIG_exit(EXIT_FAILURE); } Delete(fname); - Printf(goopsfile, ";;; -*- buffer-read-only: t -*- vi: set ro: */\n"); - Printf(goopsfile, ";;; Automatically generated by SWIG; do not edit.\n\n"); + Swig_banner_target_lang(goopsfile, ";;;"); + Printf(goopsfile, "\n"); Printf(goopsfile, "(define-module (%s))\n", mod); Printf(goopsfile, "%s\n", goopstext); Printf(goopsfile, "(use-modules (oop goops) (Swig common))\n"); @@ -1653,7 +1660,7 @@ public: * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ - String *goopsNameMapping(String *name, String_or_char *class_name) { + String *goopsNameMapping(String *name, const_String_or_char_ptr class_name) { String *n = NewString(""); if (Strcmp(class_name, "") == 0) { diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index b92fccdfb..8dfa19624 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -24,6 +24,7 @@ class JAVA:public Language { const String *protected_string; Hash *swig_types_hash; + File *f_begin; File *f_runtime; File *f_runtime_h; File *f_header; @@ -70,6 +71,7 @@ class JAVA:public Language { String *imclass_cppcasts_code; //C++ casts up inheritance hierarchies intermediary class code String *imclass_directors; // Intermediate class director code String *destructor_call; //C++ destructor call if any + String *destructor_throws_clause; //C++ destructor throws clause if any // Director method stuff: List *dmethods_seq; @@ -81,7 +83,7 @@ class JAVA:public Language { enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum }; - static Parm *NewParmFromNode(SwigType *type, const String_or_char *name, Node *n) { + static Parm *NewParmFromNode(SwigType *type, const_String_or_char_ptr name, Node *n) { Parm *p = NewParm(type, name); Setfile(p, Getfile(n)); Setline(p, Getline(n)); @@ -98,6 +100,7 @@ public: public_string(NewString("public")), protected_string(NewString("protected")), swig_types_hash(NULL), + f_begin(NULL), f_runtime(NULL), f_runtime_h(NULL), f_header(NULL), @@ -141,6 +144,7 @@ public: imclass_cppcasts_code(NULL), imclass_directors(NULL), destructor_call(NULL), + destructor_throws_clause(NULL), dmethods_seq(NULL), dmethods_table(NULL), n_dmethods(0), @@ -293,8 +297,8 @@ public: SWIG_exit(EXIT_FAILURE); } - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } @@ -304,13 +308,14 @@ public: Printf(stderr, "Unable to determine outfile_h\n"); SWIG_exit(EXIT_FAILURE); } - f_runtime_h = NewFile(outfile_h, "w"); + f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); if (!f_runtime_h) { FileErrorDisplay(outfile_h); SWIG_exit(EXIT_FAILURE); } } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -318,6 +323,7 @@ public: f_directors = NewString(""); /* Register file targets with the SWIG file handler */ + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("runtime", f_runtime); @@ -365,13 +371,16 @@ public: jnipackage = NewString(""); package_path = NewString(""); - Swig_banner(f_runtime); // Print the SWIG banner message + Swig_banner(f_begin); + + Printf(f_runtime, "\n#define SWIGJAVA\n"); if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); /* Emit initial director header and director code: */ Swig_banner(f_directors_h); + Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name); @@ -383,6 +392,8 @@ public: Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); } + Printf(f_runtime, "\n"); + String *wrapper_name = NewString(""); if (Len(package)) { @@ -420,7 +431,7 @@ public: // Generate the intermediary class { String *filen = NewStringf("%s%s.java", SWIG_output_directory(), imclass_name); - File *f_im = NewFile(filen, "w"); + File *f_im = NewFile(filen, "w", SWIG_output_files()); if (!f_im) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -471,7 +482,7 @@ public: // Generate the Java module class { String *filen = NewStringf("%s%s.java", SWIG_output_directory(), module_class_name); - File *f_module = NewFile(filen, "w"); + File *f_module = NewFile(filen, "w", SWIG_output_files()); if (!f_module) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -523,7 +534,7 @@ public: // Generate the Java constants interface if (Len(module_class_constants_code) != 0) { String *filen = NewStringf("%s%sConstants.java", SWIG_output_directory(), module_class_name); - File *f_module = NewFile(filen, "w"); + File *f_module = NewFile(filen, "w", SWIG_output_files()); if (!f_module) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -660,8 +671,10 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Dump(f_runtime, f_begin); Delete(f_runtime); + Close(f_begin); + Delete(f_begin); return SWIG_OK; } @@ -671,11 +684,7 @@ public: void emitBanner(File *f) { Printf(f, "/* ----------------------------------------------------------------------------\n"); - Printf(f, " * This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f, " * Version %s\n", Swig_package_version()); - Printf(f, " *\n"); - Printf(f, " * Do not make changes to this file unless you know what you are doing--modify\n"); - Printf(f, " * the SWIG interface file instead.\n"); + Swig_banner_target_lang(f, " *"); Printf(f, " * ----------------------------------------------------------------------------- */\n\n"); } @@ -1210,7 +1219,7 @@ public: } else { // Global enums are defined in their own file String *filen = NewStringf("%s%s.java", SWIG_output_directory(), symname); - File *f_enum = NewFile(filen, "w"); + File *f_enum = NewFile(filen, "w", SWIG_output_files()); if (!f_enum) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1654,7 +1663,7 @@ public: else Replaceall(destruct, "$jnicall", "throw new UnsupportedOperationException(\"C++ destructor does not have public access\")"); if (*Char(destruct)) - Printv(proxy_class_def, "\n ", destruct_methodmodifiers, " void ", destruct_methodname, "() ", destruct, "\n", NIL); + Printv(proxy_class_def, "\n ", destruct_methodmodifiers, " void ", destruct_methodname, "()", destructor_throws_clause, " ", destruct, "\n", NIL); } /* Insert directordisconnect typemap, if this class has directors enabled */ @@ -1742,7 +1751,7 @@ public: } String *filen = NewStringf("%s%s.java", SWIG_output_directory(), proxy_class_name); - f_proxy = NewFile(filen, "w"); + f_proxy = NewFile(filen, "w", SWIG_output_files()); if (!f_proxy) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1761,6 +1770,7 @@ public: Clear(proxy_class_code); destructor_call = NewString(""); + destructor_throws_clause = NewString(""); proxy_class_constants_code = NewString(""); } @@ -1819,6 +1829,8 @@ public: proxy_class_name = NULL; Delete(destructor_call); destructor_call = NULL; + Delete(destructor_throws_clause); + destructor_throws_clause = NULL; Delete(proxy_class_constants_code); proxy_class_constants_code = NULL; } @@ -2336,6 +2348,7 @@ public: if (proxy_flag) { Printv(destructor_call, imclass_name, ".", Swig_name_destroy(symname), "(swigCPtr)", NIL); + generateThrowsClause(n, destructor_throws_clause); } return SWIG_OK; } @@ -2798,7 +2811,7 @@ public: void emitTypeWrapperClass(String *classname, SwigType *type) { String *swigtype = NewString(""); String *filen = NewStringf("%s%s.java", SWIG_output_directory(), classname); - File *f_swigtype = NewFile(filen, "w"); + File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); if (!f_swigtype) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -2870,7 +2883,7 @@ public: String *throws_attribute = NewStringf("%s:throws", attribute); String *throws = Getattr(parameter, throws_attribute); - if (throws) { + if (throws && Len(throws) > 0) { String *throws_list = Getattr(n, "java:throwslist"); if (!throws_list) { throws_list = NewList(); diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 6718903d0..38658ce9c 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -61,7 +61,7 @@ static String *AttributeFunctionGet = 0; static String *AttributeFunctionSet = 0; static Node *CurrentClass = 0; int line_number = 0; -char *input_file = 0; +String *input_file = 0; int SmartPointer = 0; static Hash *classhash; @@ -352,7 +352,7 @@ int Language::emit_one(Node *n) { Extend = 1; line_number = Getline(n); - input_file = Char(Getfile(n)); + input_file = Getfile(n); /* symtab = Getattr(n,"symtab"); @@ -830,9 +830,8 @@ int Language::cDeclaration(Node *n) { if (!(directorsEnabled() && ((is_member_director(CurrentClass, n) && need_nonpublic_member(n)) || is_non_virtual_protected_access(n)))) { return SWIG_NOWRAP; } -#if 0 -// I don't see why this is needed - WSF - /* prevent wrapping the method twice due to overload */ + // Prevent wrapping protected overloaded director methods more than once - + // This bit of code is only needed due to the cDeclaration call in classHandler() String *wrapname = NewStringf("nonpublic_%s%s", symname, Getattr(n, "sym:overname")); if (Getattr(CurrentClass, wrapname)) { Delete(wrapname); @@ -840,7 +839,6 @@ int Language::cDeclaration(Node *n) { } SetFlag(CurrentClass, wrapname); Delete(wrapname); -#endif } } @@ -1424,36 +1422,39 @@ int Language::membervariableHandler(Node *n) { target = NewStringf("%s->%s", pname, name); Delete(pname); } - tm = Swig_typemap_lookup("memberin", n, target, 0); + } else { + target = NewStringf("$extendgetcall"); // member variable access expanded later } + tm = Swig_typemap_lookup("memberin", n, target, 0); int flags = Extend | SmartPointer | use_naturalvar_mode(n); if (is_non_virtual_protected_access(n)) flags = flags | CWRAP_ALL_PROTECTED_ACCESS; - Swig_MembersetToFunction(n, ClassType, flags); + String *call = 0; + Swig_MembersetToFunction(n, ClassType, flags, &call); Setattr(n, "memberset", "1"); - if (!Extend) { - /* Check for a member in typemap here */ - if (!tm) { - if (SwigType_isarray(type)) { - Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(type, 0)); - make_set_wrapper = 0; - } - } else { - String *pname0 = Swig_cparm_name(0, 0); - String *pname1 = Swig_cparm_name(0, 1); - Replace(tm, "$source", pname1, DOH_REPLACE_ANY); - Replace(tm, "$target", target, DOH_REPLACE_ANY); - Replace(tm, "$input", pname1, DOH_REPLACE_ANY); - Replace(tm, "$self", pname0, DOH_REPLACE_ANY); - Setattr(n, "wrap:action", tm); - Delete(tm); - Delete(pname0); - Delete(pname1); + if (!tm) { + if (SwigType_isarray(type)) { + Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(type, 0)); + make_set_wrapper = 0; } - Delete(target); + } else { + String *pname0 = Swig_cparm_name(0, 0); + String *pname1 = Swig_cparm_name(0, 1); + Replace(tm, "$source", pname1, DOH_REPLACE_ANY); + Replace(tm, "$target", target, DOH_REPLACE_ANY); + Replace(tm, "$input", pname1, DOH_REPLACE_ANY); + Replace(tm, "$self", pname0, DOH_REPLACE_ANY); + Replace(tm, "$extendgetcall", call, DOH_REPLACE_ANY); + Setattr(n, "wrap:action", tm); + Delete(tm); + Delete(pname0); + Delete(pname1); } + Delete(call); + Delete(target); + if (make_set_wrapper) { Setattr(n, "sym:name", mrename_set); functionWrapper(n); @@ -2476,6 +2477,13 @@ int Language::classHandler(Node *n) { Node *m = Copy(method); Setattr(m, "director", "1"); Setattr(m, "parentNode", n); + /* + * There is a bug that needs fixing still... + * This area of code is creating methods which have not been overidden in a derived class (director methods that are protected in the base) + * If the method is overloaded, then Swig_overload_dispatch() incorrectly generates a call to the base wrapper, _wrap_xxx method + * See director_protected_overloaded.i - Possibly sym:overname needs correcting here. + Printf(stdout, "new method: %s::%s(%s)\n", Getattr(parentNode(m), "name"), Getattr(m, "name"), ParmList_str_defaultargs(Getattr(m, "parms"))); + */ cDeclaration(m); Delete(m); } @@ -2955,14 +2963,9 @@ Node *Language::classLookup(SwigType *s) { n = Getattr(classtypes, s); if (!n) { Symtab *stab = 0; -// SwigType *lt = SwigType_ltype(s); -// SwigType *ty1 = SwigType_typedef_resolve_all(lt); SwigType *ty1 = SwigType_typedef_resolve_all(s); SwigType *ty2 = SwigType_strip_qualifiers(ty1); -// Printf(stdout, " stages... ty1: %s ty2: %s\n", ty1, ty2); -// Delete(lt); Delete(ty1); -// lt = 0; ty1 = 0; String *base = SwigType_base(ty2); @@ -2971,6 +2974,12 @@ Node *Language::classLookup(SwigType *s) { Replaceall(base, "struct ", ""); Replaceall(base, "union ", ""); + if (strncmp(Char(base), "::", 2) == 0) { + String *oldbase = base; + base = NewString(Char(base) + 2); + Delete(oldbase); + } + String *prefix = SwigType_prefix(ty2); /* Do a symbol table search on the base type */ @@ -3044,6 +3053,12 @@ Node *Language::enumLookup(SwigType *s) { Replaceall(base, "enum ", ""); String *prefix = SwigType_prefix(ty2); + if (strncmp(Char(base), "::", 2) == 0) { + String *oldbase = base; + base = NewString(Char(base) + 2); + Delete(oldbase); + } + /* Look for type in symbol table */ while (!n) { Hash *nstab; diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 6113da960..78cd7ce96 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -92,6 +92,7 @@ NEW LANGUAGE NOTE:END ************************************************/ class LUA:public Language { private: + File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -132,6 +133,7 @@ public: * --------------------------------------------------------------------- */ LUA() { + f_begin = 0; f_runtime = 0; f_header = 0; f_wrappers = 0; @@ -213,11 +215,12 @@ public: String *outfile = Getattr(n, "outfile"); /* Open the output file */ - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -226,6 +229,7 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("initbeforefunc", f_initbeforefunc); @@ -249,11 +253,17 @@ public: current=NO_CPP; /* Standard stuff for the SWIG runtime section */ - Swig_banner(f_runtime); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGLUA\n"); + // if (NoInclude) { // Printf(f_runtime, "#define SWIG_NOINCLUDE\n"); // } + Printf(f_runtime, "\n"); + //String *init_name = NewStringf("%(title)s_Init", module); //Printf(f_header, "#define SWIG_init %s\n", init_name); //Printf(f_header, "#define SWIG_name \"%s\"\n", module); @@ -288,13 +298,14 @@ public: this basically combines several of the strings together and then writes it all to a file NEW LANGUAGE NOTE:END ************************************************/ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Dump(f_initbeforefunc, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Dump(f_initbeforefunc, f_begin); /* for the Lua code it needs to be properly excaped to be added into the C/C++ code */ EscapeCode(s_luacode); - Printf(f_runtime, "const char* SWIG_LUACODE=\n \"%s\";\n\n",s_luacode); - Wrapper_pretty_print(f_init, f_runtime); + Printf(f_begin, "const char* SWIG_LUACODE=\n \"%s\";\n\n",s_luacode); + Wrapper_pretty_print(f_init, f_begin); /* Close all of the files */ Delete(s_luacode); Delete(s_cmd_tab); @@ -304,8 +315,9 @@ public: Delete(f_wrappers); Delete(f_init); Delete(f_initbeforefunc); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); /* Done */ return SWIG_OK; diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index 901ee812e..c824db6f9 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -117,7 +117,8 @@ static const char *usage3 = (const char *) "\ -fastdispatch -fvirtual \n\ -o - Set name of the output file to \n\ -oh - Set name of the output header file to \n\ - -outdir - Set language specific files output directory \n\ + -outcurrentdir - Set default output dir to current dir instead of input file's path\n\ + -outdir - Set language specific files output directory to \n\ -small - Compile in virtual elimination & compact mode\n\ -swiglib - Report location of SWIG library and exit\n\ -templatereduce - Reduce all the typedefs in templates\n\ @@ -153,6 +154,7 @@ static char *cpp_extension = (char *) "cxx"; static char *depends_extension = (char *) "d"; static String *outdir = 0; static String *xmlout = 0; +static int outcurrentdir = 0; static int help = 0; static int checkout = 0; static int cpp_only = 0; @@ -180,14 +182,16 @@ static String *dependencies_target = 0; static int external_runtime = 0; static String *external_runtime_name = 0; enum { STAGE1=1, STAGE2=2, STAGE3=4, STAGE4=8, STAGEOVERFLOW=16 }; +static List *all_output_files = 0; // ----------------------------------------------------------------------------- -// check_suffix(char *name) +// check_suffix() // // Checks the suffix of a file to see if we should emit extern declarations. // ----------------------------------------------------------------------------- -static int check_suffix(const char *name) { +static int check_suffix(String *filename) { + const char *name = Char(filename); const char *c; if (!name) return 0; @@ -281,7 +285,7 @@ static void set_outdir(const String *c_wrapper_file_dir) { } /* This function sets the name of the configuration file */ -void SWIG_config_file(const String_or_char *filename) { +void SWIG_config_file(const_String_or_char_ptr filename) { lang_config = NewString(filename); } @@ -300,6 +304,11 @@ void SWIG_config_cppext(const char *ext) { cpp_extension = (char *) ext; } +List *SWIG_output_files() { + assert(all_output_files); + return all_output_files; +} + void SWIG_setfeature(const char *cfeature, const char *cvalue) { Hash *features_hash = Swig_cparse_features(); String *name = NewString(""); @@ -363,13 +372,14 @@ static void SWIG_dump_runtime() { } } - runtime = NewFile(outfile, "w"); + runtime = NewFile(outfile, "w", SWIG_output_files()); if (!runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } Swig_banner(runtime); + Printf(runtime, "\n"); s = Swig_include_sys("swiglabels.swg"); if (!s) { @@ -688,6 +698,9 @@ void SWIG_getoptions(int argc, char *argv[]) { } else { Swig_arg_error(); } + } else if (strcmp(argv[i], "-outcurrentdir") == 0) { + Swig_mark_arg(i); + outcurrentdir = 1; } else if (strcmp(argv[i], "-Wall") == 0) { Swig_mark_arg(i); Swig_warnall(); @@ -867,6 +880,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { } libfiles = NewList(); + all_output_files = NewList(); /* Check for SWIG_FEATURES environment variable */ @@ -924,12 +938,13 @@ int SWIG_main(int argc, char *argv[], Language *l) { // If we made it this far, looks good. go for it.... - input_file = argv[argc - 1]; + input_file = NewString(argv[argc - 1]); + Swig_filename_correct(input_file); // If the user has requested to check out a file, handle that if (checkout) { DOH *s; - char *outfile = input_file; + char *outfile = Char(input_file); if (outfile_name) outfile = outfile_name; @@ -938,30 +953,26 @@ int SWIG_main(int argc, char *argv[], Language *l) { s = Swig_include(input_file); if (!s) { - fprintf(stderr, "Unable to locate '%s' in the SWIG library.\n", input_file); + Printf(stderr, "Unable to locate '%s' in the SWIG library.\n", input_file); } else { - FILE *f = fopen(outfile, "r"); + FILE *f = Swig_open(outfile); if (f) { fclose(f); - fprintf(stderr, "File '%s' already exists. Checkout aborted.\n", outfile); + Printf(stderr, "File '%s' already exists. Checkout aborted.\n", outfile); } else { - f = fopen(outfile, "w"); - if (!f) { - fprintf(stderr, "Unable to create file '%s'\n", outfile); - } else { - if (Verbose) - fprintf(stdout, "'%s' checked out from the SWIG library.\n", input_file); - fputs(Char(s), f); - fclose(f); - } + File *f_outfile = NewFile(outfile, "w", SWIG_output_files()); + if (!f_outfile) { + FileErrorDisplay(outfile); + SWIG_exit(EXIT_FAILURE); + } else { + if (Verbose) + Printf(stdout, "'%s' checked out from the SWIG library.\n", outfile); + Printv(f_outfile, s, NIL); + Close(f_outfile); + } } } } else { - // Check the suffix for a .c file. If so, we're going to - // declare everything we see as "extern" - - ForceExtern = check_suffix(input_file); - // Run the preprocessor if (Verbose) printf("Preprocessing...\n"); @@ -971,17 +982,22 @@ int SWIG_main(int argc, char *argv[], Language *l) { String *fs = NewString(""); FILE *df = Swig_open(input_file); if (!df) { - char *cfile = Char(input_file); - if (cfile && cfile[0] == '-') { - Printf(stderr, "Unable to find option or file '%s', ", input_file); - Printf(stderr, "use 'swig -help' for more information.\n"); + df = Swig_include_open(input_file); + if (!df) { + char *cfile = Char(input_file); + if (cfile && cfile[0] == '-') { + Printf(stderr, "Unable to find option or file '%s', ", input_file); + Printf(stderr, "use 'swig -help' for more information.\n"); + } else { + Printf(stderr, "Unable to find file '%s'.\n", input_file); + } + SWIG_exit(EXIT_FAILURE); } else { - Printf(stderr, "Unable to find file '%s'.\n", input_file); + Swig_warning(WARN_DEPRECATED_INPUT_FILE, "SWIG", 1, "Use of the include path to find the input file is deprecated and will not work with ccache. Please include the path when specifying the input file.\n"); // so that behaviour is like c/c++ compilers } - SWIG_exit(EXIT_FAILURE); } - fclose(df); if (!no_cpp) { + fclose(df); Printf(fs, "%%include \n"); if (allkw) { Printf(fs, "%%include \n"); @@ -989,7 +1005,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (lang_config) { Printf(fs, "\n%%include <%s>\n", lang_config); } - Printf(fs, "%%include \"%s\"\n", Swig_last_file()); + Printf(fs, "%%include(maininput=\"%s\") \"%s\"\n", Swig_filename_escape(input_file), Swig_last_file()); for (i = 0; i < Len(libfiles); i++) { Printf(fs, "\n%%include \"%s\"\n", Getitem(libfiles, i)); } @@ -997,8 +1013,8 @@ int SWIG_main(int argc, char *argv[], Language *l) { cpps = Preprocessor_parse(fs); Delete(fs); } else { - df = Swig_open(input_file); - cpps = NewFileFromFile(df); + cpps = Swig_read_file(df); + fclose(df); } if (Swig_error_count()) { SWIG_exit(EXIT_FAILURE); @@ -1008,47 +1024,55 @@ int SWIG_main(int argc, char *argv[], Language *l) { SWIG_exit(EXIT_SUCCESS); } if (depend) { - String *outfile; - if (!outfile_name) { - if (CPlusPlus || lang->cplus_runtime_mode()) { - outfile = NewStringf("%s_wrap.%s", Swig_file_basename(input_file), cpp_extension); + if (!no_cpp) { + String *outfile; + + char *basename = Swig_file_basename(outcurrentdir ? Swig_file_filename(input_file): Char(input_file)); + if (!outfile_name) { + if (CPlusPlus || lang->cplus_runtime_mode()) { + outfile = NewStringf("%s_wrap.%s", basename, cpp_extension); + } else { + outfile = NewStringf("%s_wrap.c", basename); + } } else { - outfile = NewStringf("%s_wrap.c", Swig_file_basename(input_file)); + outfile = NewString(outfile_name); } + if (dependencies_file && Len(dependencies_file) != 0) { + f_dependencies_file = NewFile(dependencies_file, "w", SWIG_output_files()); + if (!f_dependencies_file) { + FileErrorDisplay(dependencies_file); + SWIG_exit(EXIT_FAILURE); + } + } else if (!depend_only) { + String *filename = NewStringf("%s_wrap.%s", basename, depends_extension); + f_dependencies_file = NewFile(filename, "w", SWIG_output_files()); + if (!f_dependencies_file) { + FileErrorDisplay(filename); + SWIG_exit(EXIT_FAILURE); + } + } else + f_dependencies_file = stdout; + if (dependencies_target) { + Printf(f_dependencies_file, "%s: ", dependencies_target); + } else { + Printf(f_dependencies_file, "%s: ", outfile); + } + List *files = Preprocessor_depend(); + for (int i = 0; i < Len(files); i++) { + if ((depend != 2) || ((depend == 2) && (Strncmp(Getitem(files, i), SwigLib, Len(SwigLib)) != 0))) { + Printf(f_dependencies_file, "\\\n %s ", Getitem(files, i)); + } + } + Printf(f_dependencies_file, "\n"); + if (f_dependencies_file != stdout) + Close(f_dependencies_file); + if (depend_only) + SWIG_exit(EXIT_SUCCESS); } else { - outfile = NewString(outfile_name); + Printf(stderr, "Cannot generate dependencies with -nopreprocess\n"); + // Actually we could but it would be inefficient when just generating dependencies, as it would be done after Swig_cparse + SWIG_exit(EXIT_FAILURE); } - if (dependencies_file && Len(dependencies_file) != 0) { - f_dependencies_file = NewFile(dependencies_file, "w"); - if (!f_dependencies_file) { - FileErrorDisplay(dependencies_file); - SWIG_exit(EXIT_FAILURE); - } - } else if (!depend_only) { - String *filename = NewStringf("%s_wrap.%s", Swig_file_basename(input_file), depends_extension); - f_dependencies_file = NewFile(filename, "w"); - if (!f_dependencies_file) { - FileErrorDisplay(filename); - SWIG_exit(EXIT_FAILURE); - } - } else - f_dependencies_file = stdout; - if (dependencies_target) { - Printf(f_dependencies_file, "%s: ", dependencies_target); - } else { - Printf(f_dependencies_file, "%s: ", outfile); - } - List *files = Preprocessor_depend(); - for (int i = 0; i < Len(files); i++) { - if ((depend != 2) || ((depend == 2) && (Strncmp(Getitem(files, i), SwigLib, Len(SwigLib)) != 0))) { - Printf(f_dependencies_file, "\\\n %s ", Getitem(files, i)); - } - } - Printf(f_dependencies_file, "\n"); - if (f_dependencies_file != stdout) - Close(f_dependencies_file); - if (depend_only) - SWIG_exit(EXIT_SUCCESS); } Seek(cpps, 0, SEEK_SET); } @@ -1126,22 +1150,30 @@ int SWIG_main(int argc, char *argv[], Language *l) { } if (top) { if (!Getattr(top, "name")) { - Printf(stderr, "*** No module name specified using %%module or -module.\n"); + Printf(stderr, "No module name specified using %%module or -module.\n"); SWIG_exit(EXIT_FAILURE); } else { /* Set some filename information on the object */ - Setattr(top, "infile", input_file); + String *infile = scanner_get_main_input_file(); + if (!infile) { + Printf(stderr, "Missing input file in preprocessed output.\n"); + SWIG_exit(EXIT_FAILURE); + } + Setattr(top, "infile", infile); // Note: if nopreprocess then infile is the original input file, otherwise input_file + Setattr(top, "inputfile", input_file); + + char *basename = Swig_file_basename(outcurrentdir ? Swig_file_filename(infile): Char(infile)); if (!outfile_name) { if (CPlusPlus || lang->cplus_runtime_mode()) { - Setattr(top, "outfile", NewStringf("%s_wrap.%s", Swig_file_basename(input_file), cpp_extension)); + Setattr(top, "outfile", NewStringf("%s_wrap.%s", basename, cpp_extension)); } else { - Setattr(top, "outfile", NewStringf("%s_wrap.c", Swig_file_basename(input_file))); + Setattr(top, "outfile", NewStringf("%s_wrap.c", basename)); } } else { Setattr(top, "outfile", outfile_name); } if (!outfile_name_h) { - Setattr(top, "outfile_h", NewStringf("%s_wrap.%s", Swig_file_basename(input_file), hpp_extension)); + Setattr(top, "outfile_h", NewStringf("%s_wrap.%s", basename, hpp_extension)); } else { Setattr(top, "outfile_h", outfile_name_h); } @@ -1149,7 +1181,12 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (Swig_contract_mode_get()) { Swig_contracts(top); } + + // Check the suffix for a c/c++ file. If so, we're going to declare everything we see as "extern" + ForceExtern = check_suffix(input_file); + lang->top(top); + if (browse) { Swig_browser(top, 0); } @@ -1173,6 +1210,21 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (memory_debug) DohMemoryDebug(); + char *outfiles = getenv("CCACHE_OUTFILES"); + if (outfiles) { + File *f_outfiles = NewFile(outfiles, "w", 0); + if (!f_outfiles) { + Printf(stderr, "Failed to write list of output files to the filename '%s' specified in CCACHE_OUTFILES environment variable - ", outfiles); + FileErrorDisplay(outfiles); + SWIG_exit(EXIT_FAILURE); + } else { + int i; + for (i = 0; i < Len(all_output_files); i++) + Printf(f_outfiles, "%s\n", Getitem(all_output_files, i)); + Close(f_outfiles); + } + } + // Deletes Delete(libfiles); Preprocessor_delete(); diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index 6cb24d39a..b3568c0bf 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -127,7 +127,7 @@ char cvsroot_modula3_cxx[] = "$Id$"; #include // for INT_MAX #include -const char usageArgDir[] = "m3wrapargdir typemap expect values: in, out, inout\n"; +#define USAGE_ARG_DIR "m3wrapargdir typemap expect values: in, out, inout\n" class MODULA3:public Language { public: @@ -172,6 +172,7 @@ private: const String *empty_string; Hash *swig_types_hash; + File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -237,6 +238,7 @@ public: MODULA3(): empty_string(NewString("")), swig_types_hash(NULL), + f_begin(NULL), f_runtime(NULL), f_header(NULL), f_wrappers(NULL), @@ -374,7 +376,7 @@ MODULA3(): } else if (Strcmp(dir, "out") == 0) { return false; } else { - printf(usageArgDir); + printf("%s", USAGE_ARG_DIR); return false; } } @@ -386,7 +388,7 @@ MODULA3(): } else if ((Strcmp(dir, "out") == 0) || (Strcmp(dir, "inout") == 0)) { return true; } else { - printf(usageArgDir); + printf("%s", USAGE_ARG_DIR); return false; } } @@ -542,7 +544,7 @@ MODULA3(): * ----------------------------------------------------------------------------- */ File *openWriteFile(String *name) { - File *file = NewFile(name, "w"); + File *file = NewFile(name, "w", SWIG_output_files()); if (!file) { FileErrorDisplay(name); SWIG_exit(EXIT_FAILURE); @@ -902,11 +904,12 @@ MODULA3(): /* Initialize all of the output files */ outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -916,6 +919,7 @@ MODULA3(): /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -956,7 +960,11 @@ MODULA3(): module_imports = NewString(""); upcasts_code = NewString(""); - Swig_banner(f_runtime); // Print the SWIG banner message + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGMODULA3\n"); + Printf(f_runtime, "\n"); Swig_name_register((char *) "wrapper", (char *) "Modula3_%f"); if (old_variable_names) { @@ -1143,14 +1151,16 @@ MODULA3(): typemapfilename = NULL; /* Close all of the files */ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -1159,14 +1169,9 @@ MODULA3(): * ----------------------------------------------------------------------------- */ void emitBanner(File *f) { - Printf(f, "\ -(*******************************************************************************\n\ - * This file was automatically generated by SWIG (http://www.swig.org/).\n\ - * Version %s\n\ - *\n\ - * Do not make changes to this file unless you know what you are doing --\n\ - * modify the SWIG interface file instead.\n\ - *******************************************************************************)\n\n", Swig_package_version()); + Printf(f, "(*******************************************************************************\n"); + Swig_banner_target_lang(f, " *"); + Printf(f, "*******************************************************************************)\n\n"); } /* ---------------------------------------------------------------------- @@ -2382,7 +2387,7 @@ MODULA3(): } String *filen = NewStringf("%s%s.m3", Swig_file_dirname(outfile), proxy_class_name); - f_proxy = NewFile(filen, "w"); + f_proxy = NewFile(filen, "w", SWIG_output_files()); if (!f_proxy) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -3174,8 +3179,7 @@ MODULA3(): Clear(result_m3wraptype); Printv(result_m3wraptype, tm, NIL); } else { - Swig_warning(WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN, - input_file, line_number, + Swig_warning(WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN, input_file, line_number, "Typemap m3wrapargdir set to 'out' for %s implies a RETURN value, but the routine %s has already one.\nUse %%multiretval feature.\n", SwigType_str(Getattr(p, "type"), 0), raw_name); } @@ -3762,7 +3766,7 @@ MODULA3(): void emitTypeWrapperClass(String *classname, SwigType *type) { String *filen = NewStringf("%s%s.m3", Swig_file_dirname(outfile), classname); - File *f_swigtype = NewFile(filen, "w"); + File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); if (!f_swigtype) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index 78d4a4b65..28dd8ecd2 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -39,6 +39,7 @@ static String *module = 0; static char *mzscheme_path = (char *) "mzscheme"; static String *init_func_def = 0; +static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -129,11 +130,12 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -141,13 +143,17 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); init_func_def = NewString(""); Swig_register_filebyname("init", init_func_def); - Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); - Swig_banner(f_runtime); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGMZSCHEME\n"); + Printf(f_runtime, "\n"); module = Getattr(n, "name"); @@ -186,14 +192,16 @@ public: } /* Close all of the files */ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx old mode 100755 new mode 100644 index 9f5677ba5..b925328a3 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -38,6 +38,7 @@ static Hash *seen_enumvalues = 0; static Hash *seen_constructors = 0; static File *f_header = 0; +static File *f_begin = 0; static File *f_runtime = 0; static File *f_wrappers = 0; static File *f_directors = 0; @@ -214,11 +215,12 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -247,6 +249,7 @@ public: Swig_register_filebyname("init", init_func_def); Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("mli", f_mlibody); Swig_register_filebyname("ml", f_mlbody); @@ -262,7 +265,10 @@ public: Swig_name_register("get", "%v__get__"); } - Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGOCAML\n"); Printf(f_runtime, "#define SWIG_MODULE \"%s\"\n", module); /* Module name */ Printf(f_mlbody, "let module_name = \"%s\"\n", module); @@ -276,12 +282,12 @@ public: Printf(f_int_to_enum, "let int_to_enum x y =\n" " match (x : c_enum_type) with\n" " `unknown -> C_enum (`Int y)\n"); - Swig_banner(f_runtime); - if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); } + Printf(f_runtime, "\n"); + /* Produce the enum_to_int and int_to_enum functions */ Printf(f_enumtypes_type, "open Swig\n" "type c_enum_type = [ \n `unknown\n"); @@ -293,12 +299,12 @@ public: Printv(mlifile, module, ".mli", NIL); String *mlfilen = NewStringf("%s%s", SWIG_output_directory(), mlfile); - if ((f_mlout = NewFile(mlfilen, "w")) == 0) { + if ((f_mlout = NewFile(mlfilen, "w", SWIG_output_files())) == 0) { FileErrorDisplay(mlfilen); SWIG_exit(EXIT_FAILURE); } String *mlifilen = NewStringf("%s%s", SWIG_output_directory(), mlifile); - if ((f_mliout = NewFile(mlifilen, "w")) == 0) { + if ((f_mliout = NewFile(mlifilen, "w", SWIG_output_files())) == 0) { FileErrorDisplay(mlifilen); SWIG_exit(EXIT_FAILURE); } @@ -322,16 +328,18 @@ public: SwigType_emit_type_table(f_runtime, f_wrappers); /* Close all of the files */ + Dump(f_runtime, f_begin); Dump(f_directors_h, f_header); - Dump(f_header, f_runtime); + Dump(f_header, f_begin); Dump(f_directors, f_wrappers); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); Dump(f_enumtypes_type, f_mlout); Dump(f_enumtypes_value, f_mlout); @@ -1292,56 +1300,50 @@ public: * which means looking up and registering by typedef and enum name. */ int enumDeclaration(Node *n) { String *name = Getattr(n, "name"); - String *oname = name ? NewString(name) : NULL; - /* name is now fully qualified */ - String *fully_qualified_name = NewString(name); - bool seen_enum = false; - if (name_qualifier) - Delete(name_qualifier); - char *strip_position; - name_qualifier = fully_qualify_enum_name(n, NewString("")); + if (name) { + String *oname = NewString(name); + /* name is now fully qualified */ + String *fully_qualified_name = NewString(name); + bool seen_enum = false; + if (name_qualifier) + Delete(name_qualifier); + char *strip_position; + name_qualifier = fully_qualify_enum_name(n, NewString("")); - /* Recent changes have distrubed enum and template naming again. - * Will try to keep it consistent by can't guarantee much given - * that these things move around a lot. - * - * I need to figure out a way to isolate this module better. - */ - if (oname) { strip_position = strstr(Char(oname), "::"); while (strip_position) { - strip_position += 2; - oname = NewString(strip_position); - strip_position = strstr(Char(oname), "::"); - } - } - - seen_enum = oname ? (Getattr(seen_enums, fully_qualified_name) ? true : false) : false; - - if (oname && !seen_enum) { - const_enum = true; - Printf(f_enum_to_int, "| `%s -> (match y with\n", oname); - Printf(f_int_to_enum, "| `%s -> C_enum (\n", oname); - /* * * * A note about enum name resolution * * * * - * This code should now work, but I think we can do a bit better. - * The problem I'm having is that swig isn't very precise about - * typedef name resolution. My opinion is that SwigType_typedef - * resolve_all should *always* return the enum tag if one exists, - * rather than the admittedly friendlier enclosing typedef. - * - * This would make one of the cases below unnecessary. - * * * */ - Printf(f_mlbody, "let _ = Callback.register \"%s_marker\" (`%s)\n", fully_qualified_name, oname); - if (!strncmp(Char(fully_qualified_name), "enum ", 5)) { - String *fq_noenum = NewString(Char(fully_qualified_name) + 5); - Printf(f_mlbody, - "let _ = Callback.register \"%s_marker\" (`%s)\n" "let _ = Callback.register \"%s_marker\" (`%s)\n", fq_noenum, oname, fq_noenum, name); + strip_position += 2; + oname = NewString(strip_position); + strip_position = strstr(Char(oname), "::"); } - Printf(f_enumtypes_type, "| `%s\n", oname); - Insert(fully_qualified_name, 0, "enum "); - Setattr(seen_enums, fully_qualified_name, n); + seen_enum = (Getattr(seen_enums, fully_qualified_name) ? true : false); + + if (!seen_enum) { + const_enum = true; + Printf(f_enum_to_int, "| `%s -> (match y with\n", oname); + Printf(f_int_to_enum, "| `%s -> C_enum (\n", oname); + /* * * * A note about enum name resolution * * * * + * This code should now work, but I think we can do a bit better. + * The problem I'm having is that swig isn't very precise about + * typedef name resolution. My opinion is that SwigType_typedef + * resolve_all should *always* return the enum tag if one exists, + * rather than the admittedly friendlier enclosing typedef. + * + * This would make one of the cases below unnecessary. + * * * */ + Printf(f_mlbody, "let _ = Callback.register \"%s_marker\" (`%s)\n", fully_qualified_name, oname); + if (!strncmp(Char(fully_qualified_name), "enum ", 5)) { + String *fq_noenum = NewString(Char(fully_qualified_name) + 5); + Printf(f_mlbody, + "let _ = Callback.register \"%s_marker\" (`%s)\n" "let _ = Callback.register \"%s_marker\" (`%s)\n", fq_noenum, oname, fq_noenum, name); + } + + Printf(f_enumtypes_type, "| `%s\n", oname); + Insert(fully_qualified_name, 0, "enum "); + Setattr(seen_enums, fully_qualified_name, n); + } } int ret = Language::enumDeclaration(n); diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index d582e8a6c..c5ff2eb44 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -7,7 +7,7 @@ * Octave language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_octave_cxx[] = "$Id$"; +char cvsroot_octave_cxx[] = "$Id: octave.cxx 10538 2008-06-21 14:51:02Z maciekd $"; #include "swigmod.h" @@ -18,6 +18,7 @@ Octave Options (available with -octave)\n\ class OCTAVE:public Language { private: + File *f_begin; File *f_runtime; File *f_header; File *f_doc; @@ -37,9 +38,16 @@ private: Hash *docs; public: - OCTAVE():f_runtime(0), f_header(0), f_doc(0), f_wrappers(0), + OCTAVE():f_begin(0), f_runtime(0), f_header(0), f_doc(0), f_wrappers(0), f_init(0), f_initbeforefunc(0), f_directors(0), f_directors_h(0), s_global_tab(0), s_members_tab(0), class_name(0) { + /* Add code to manage protected constructors and directors */ + director_prot_ctor_code = NewString(""); + Printv(director_prot_ctor_code, + "if ( $comparison ) { /* subclassed */\n", + " $director_new \n", + "} else {\n", " error(\"accessing abstract class or protected constructor\"); \n", " SWIG_fail;\n", "}\n", NIL); + enable_cplus_runtime_mode(); allow_overloading(); director_multiple_inheritance = 1; @@ -87,11 +95,12 @@ public: String *module = Getattr(n, "name"); String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_header = NewString(""); f_doc = NewString(""); f_wrappers = NewString(""); @@ -100,6 +109,7 @@ public: f_directors_h = NewString(""); f_directors = NewString(""); s_global_tab = NewString(""); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("header", f_header); Swig_register_filebyname("doc", f_doc); @@ -108,11 +118,16 @@ public: Swig_register_filebyname("initbeforefunc", f_initbeforefunc); Swig_register_filebyname("director", f_directors); Swig_register_filebyname("director_h", f_directors_h); - Swig_banner(f_runtime); + + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGOCTAVE\n"); Printf(f_runtime, "#define SWIG_name_d \"%s\"\n", module); Printf(f_runtime, "#define SWIG_name %s\n", module); if (directorsEnabled()) { + Printf(f_runtime, "#define SWIG_DIRECTORS\n"); Swig_banner(f_directors_h); if (dirprot_mode()) { // Printf(f_directors_h, "#include \n"); @@ -120,6 +135,7 @@ public: } } + Printf(f_runtime, "\n"); Printf(s_global_tab, "\nstatic const struct swig_octave_member swig_globals[] = {\n"); Printf(f_init, "static void SWIG_init_user(octave_swig_type* module_ns)\n{\n"); @@ -143,15 +159,16 @@ public: Printv(f_wrappers, s_global_tab, NIL); SwigType_emit_type_table(f_runtime, f_wrappers); - Dump(f_header, f_runtime); - Dump(f_doc, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_doc, f_begin); if (directorsEnabled()) { - Dump(f_directors_h, f_runtime); - Dump(f_directors, f_runtime); + Dump(f_directors_h, f_begin); + Dump(f_directors, f_begin); } - Dump(f_wrappers, f_runtime); - Dump(f_initbeforefunc, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_wrappers, f_begin); + Dump(f_initbeforefunc, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(s_global_tab); Delete(f_initbeforefunc); @@ -161,8 +178,9 @@ public: Delete(f_header); Delete(f_directors); Delete(f_directors_h); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } diff --git a/Source/Modules/overload.cxx b/Source/Modules/overload.cxx index d16913885..511e55004 100644 --- a/Source/Modules/overload.cxx +++ b/Source/Modules/overload.cxx @@ -316,7 +316,7 @@ static bool print_typecheck(String *f, int j, Parm *pj) { * ReplaceFormat() * ----------------------------------------------------------------------------- */ -static String *ReplaceFormat(const String_or_char *fmt, int j) { +static String *ReplaceFormat(const_String_or_char_ptr fmt, int j) { String *lfmt = NewString(fmt); char buf[50]; sprintf(buf, "%d", j); @@ -352,7 +352,7 @@ static String *ReplaceFormat(const String_or_char *fmt, int j) { /* Cast dispatch mechanism. */ -String *Swig_overload_dispatch_cast(Node *n, const String_or_char *fmt, int *maxargs) { +String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int *maxargs) { int i, j; *maxargs = 1; @@ -536,7 +536,7 @@ String *Swig_overload_dispatch_cast(Node *n, const String_or_char *fmt, int *max /* Fast dispatch mechanism, provided by Salvador Fandi~no Garc'ia (#930586). */ -String *Swig_overload_dispatch_fast(Node *n, const String_or_char *fmt, int *maxargs) { +String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int *maxargs) { int i, j; *maxargs = 1; @@ -695,7 +695,7 @@ String *Swig_overload_dispatch_fast(Node *n, const String_or_char *fmt, int *max return f; } -String *Swig_overload_dispatch(Node *n, const String_or_char *fmt, int *maxargs) { +String *Swig_overload_dispatch(Node *n, const_String_or_char_ptr fmt, int *maxargs) { if (fast_dispatch_mode || GetFlag(n, "feature:fastdispatch")) { return Swig_overload_dispatch_fast(n, fmt, maxargs); diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index 6e706fc8d..eace179a7 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -78,6 +78,7 @@ static String *command_tab = 0; static String *constant_tab = 0; static String *variable_tab = 0; +static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -207,6 +208,7 @@ public: } Preprocessor_define("SWIGPERL 1", 0); + // SWIGPERL5 is deprecated, and no longer documented. Preprocessor_define("SWIGPERL5 1", 0); SWIG_typemap_lang("perl5"); SWIG_config_file("perl5.swg"); @@ -222,11 +224,12 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -234,6 +237,7 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -252,11 +256,12 @@ public: constant_tab = NewString("static swig_constant_info swig_constants[] = {\n"); variable_tab = NewString("static swig_variable_info swig_variables[] = {\n"); - Swig_banner(f_runtime); + Swig_banner(f_begin); + Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGPERL\n"); Printf(f_runtime, "#define SWIG_CASTRANK_MODE\n"); - + Printf(f_runtime, "\n"); // Is the imported module in another package? (IOW, does it use the // %module(package="name") option and it's different than the package @@ -315,7 +320,7 @@ public: pmfile = NewStringf("%s.pm", m); } String *filen = NewStringf("%s%s", SWIG_output_directory(), pmfile); - if ((f_pm = NewFile(filen, "w")) == 0) { + if ((f_pm = NewFile(filen, "w", SWIG_output_files())) == 0) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); } @@ -332,10 +337,7 @@ public: Delete(boot_name); } - Printf(f_pm, "# This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f_pm, "# Version %s\n", Swig_package_version()); - Printf(f_pm, "#\n"); - Printf(f_pm, "# Don't modify this file, modify the SWIG interface instead.\n"); + Swig_banner_target_lang(f_pm, "#"); Printf(f_pm, "\n"); Printf(f_pm, "package %s;\n", module); @@ -524,14 +526,16 @@ public: Delete(underscore_module); /* Close all of the files */ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -1141,8 +1145,9 @@ public: /* Do some work on the class name */ if (verbose > 0) { + String *modulename = Getattr(clsmodule, "name"); fprintf(stdout, "setclassname: Found sym:name: %s\n", Char(symname)); - fprintf(stdout, "setclassname: Found module: %s\n", Char(clsmodule)); + fprintf(stdout, "setclassname: Found module: %s\n", Char(modulename)); fprintf(stdout, "setclassname: No package found\n"); } @@ -1624,7 +1629,7 @@ public: } else if (Strcmp(code, "include") == 0) { /* Include a file into the .pm file */ if (value) { - FILE *f = Swig_open(value); + FILE *f = Swig_include_open(value); if (!f) { Printf(stderr, "%s : Line %d. Unable to locate file %s\n", input_file, line_number, value); } else { diff --git a/Source/Modules/php4.cxx b/Source/Modules/php.cxx similarity index 64% rename from Source/Modules/php4.cxx rename to Source/Modules/php.cxx index 42d71e79a..ee69c1864 100644 --- a/Source/Modules/php4.cxx +++ b/Source/Modules/php.cxx @@ -2,9 +2,9 @@ * See the LICENSE file for information on copyright, usage and redistribution * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * php4.cxx + * php.cxx * - * Php language module for SWIG. + * PHP language module for SWIG. * ----------------------------------------------------------------------------- */ @@ -13,11 +13,9 @@ * Short term: * * Sort out auto-renaming of method and class names which are reserved - * words (e.g. empty, clone, exception, etc.) vs -php4/-php5 in some - * sane way. + * words (e.g. empty, clone, exception, etc.) * - * Sort out wrapping of static member variables in OO PHP5 (which first may - * mean we need to sort them out for PHP4!) + * Sort out wrapping of static member variables in OO PHP5. * * Medium term: * @@ -39,10 +37,10 @@ /* * TODO: Replace remaining stderr messages with Swig_error or Swig_warning - * (may need to add more WARN_PHP4_xxx codes...) + * (may need to add more WARN_PHP_xxx codes...) */ -char cvsroot_php4_cxx[] = "$Id$"; +char cvsroot_php_cxx[] = "$Id$"; #include "swigmod.h" @@ -50,19 +48,13 @@ char cvsroot_php4_cxx[] = "$Id$"; #include static const char *usage = (char *) "\ -PHP Options (available with -php4 or -php5)\n\ +PHP Options (available with -php)\n\ -cppext - cpp file extension (default to .cpp)\n\ -noproxy - Don't generate proxy classes.\n\ - -prefix - Prepend to all class names in PHP5 wrappers\n\ - -make - Create simple makefile\n\ - -phpfull - Create full make files\n\ - -withincs - With -phpfull writes needed incs in config.m4\n\ - -withlibs - With -phpfull writes needed libs in config.m4\n\ - -withc - With -phpfull makes extra C files in Makefile.in\n\ - -withcxx - With -phpfull makes extra C++ files in Makefile.in\n\ + -prefix - Prepend to all class names in PHP wrappers\n\ \n"; -/* The original class wrappers for PHP4 store the pointer to the C++ class in +/* The original class wrappers for PHP stored the pointer to the C++ class in * the object property _cPtr. If we use the same name for the member variable * which we put the pointer to the C++ class in, then the flat function * wrappers will automatically pull it out without any changes being required. @@ -76,16 +68,10 @@ static Node *classnode = 0; static String *module = 0; static String *cap_module = 0; static String *prefix = 0; -static String *withlibs = 0; -static String *withincs = 0; -static String *withc = 0; -static String *withcxx = 0; static String *shadow_classname = 0; -static int gen_extra = 0; -static int gen_make = 0; - +static File *f_begin = 0; static File *f_runtime = 0; static File *f_h = 0; static File *f_phpcode = 0; @@ -116,9 +102,6 @@ static Node *current_class = 0; static Hash *shadow_get_vars; static Hash *shadow_set_vars; -#define NATIVE_CONSTRUCTOR 1 -#define ALTERNATIVE_CONSTRUCTOR 2 -static int native_constructor = 0; static Hash *zend_types = 0; static int shadow = 1; @@ -159,7 +142,7 @@ void SwigPHP_emit_resource_registrations() { Printf(s_wrappers, "/* NEW Destructor style */\nstatic ZEND_RSRC_DTOR_FUNC(_wrap_destroy%s) {\n", key); // write out body - if ((class_node != NOTCLASS)) { + if (class_node != NOTCLASS) { String *destructor = Getattr(class_node, "destructor"); human_name = Getattr(class_node, "sym:name"); if (!human_name) @@ -190,12 +173,9 @@ void SwigPHP_emit_resource_registrations() { } } -class PHP:public Language { - int php_version; - +class PHP : public Language { public: - PHP(int php_version_):php_version(php_version_) { - } + PHP() { } /* Test to see if a type corresponds to something wrapped with a shadow class. */ @@ -216,327 +196,57 @@ public: * ------------------------------------------------------------ */ virtual void main(int argc, char *argv[]) { - int i; - SWIG_library_directory("php4"); + SWIG_library_directory("php"); SWIG_config_cppext("cpp"); - for (i = 1; i < argc; i++) { - if (argv[i]) { - if (strcmp(argv[i], "-phpfull") == 0) { - gen_extra = 1; + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-prefix") == 0) { + if (argv[i + 1]) { + prefix = NewString(argv[i + 1]); Swig_mark_arg(i); - } else if (strcmp(argv[i], "-dlname") == 0) { - Printf(stderr, "*** -dlname is no longer supported\n*** if you want to change the module name, use -module instead.\n"); - SWIG_exit(EXIT_FAILURE); - } else if (strcmp(argv[i], "-prefix") == 0) { - if (argv[i + 1]) { - prefix = NewString(argv[i + 1]); - Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if (strcmp(argv[i], "-withlibs") == 0) { - if (argv[i + 1]) { - withlibs = NewString(argv[i + 1]); - Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if (strcmp(argv[i], "-withincs") == 0) { - if (argv[i + 1]) { - withincs = NewString(argv[i + 1]); - Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if (strcmp(argv[i], "-withc") == 0) { - if (argv[i + 1]) { - withc = NewString(argv[i + 1]); - Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if (strcmp(argv[i], "-withcxx") == 0) { - if (argv[i + 1]) { - withcxx = NewString(argv[i + 1]); - Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if (strcmp(argv[i], "-cppext") == 0) { - if (argv[i + 1]) { - SWIG_config_cppext(argv[i + 1]); - Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if ((strcmp(argv[i], "-noshadow") == 0) || (strcmp(argv[i], "-noproxy") == 0)) { - shadow = 0; - Swig_mark_arg(i); - } else if (strcmp(argv[i], "-make") == 0) { - gen_make = 1; - Swig_mark_arg(i); - } else if (strcmp(argv[i], "-help") == 0) { - fputs(usage, stdout); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); } + } else if (strcmp(argv[i], "-cppext") == 0) { + if (argv[i + 1]) { + SWIG_config_cppext(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if ((strcmp(argv[i], "-noshadow") == 0) || (strcmp(argv[i], "-noproxy") == 0)) { + shadow = 0; + Swig_mark_arg(i); + } else if (strcmp(argv[i], "-help") == 0) { + fputs(usage, stdout); + } else if (strcmp(argv[i], "-make") == 0 || + strcmp(argv[i], "-withc") == 0 || + strcmp(argv[i], "-withcxx") == 0) { + Printf(stderr, "*** %s is no longer supported.\n", argv[i]); + SWIG_exit(EXIT_FAILURE); + } else if (strcmp(argv[i], "-phpfull") == 0 || + strcmp(argv[i], "-withlibs") == 0 || + strcmp(argv[i], "-withincs") == 0) { + Printf(stderr, "*** %s is no longer supported.\n*** We recommend building as a dynamically loadable module.\n", argv[i]); + SWIG_exit(EXIT_FAILURE); + } else if (strcmp(argv[i], "-dlname") == 0) { + Printf(stderr, "*** -dlname is no longer supported.\n*** If you want to change the module name, use -module instead.\n"); + SWIG_exit(EXIT_FAILURE); } } - Preprocessor_define((void *) "SWIGPHP 1", 0); - if (php_version == 4) { - Preprocessor_define((void *) "SWIGPHP4 1", 0); - } else if (php_version == 5) { - Preprocessor_define((void *) "SWIGPHP5 1", 0); - } - SWIG_typemap_lang("php4"); - /* DB: Suggest using a language configuration file */ - SWIG_config_file("php4.swg"); + Preprocessor_define("SWIGPHP 1", 0); + // SWIGPHP5 is deprecated, and no longer documented. + Preprocessor_define("SWIGPHP5 1", 0); + SWIG_typemap_lang("php"); + SWIG_config_file("php.swg"); allow_overloading(); } - void create_simple_make(void) { - File *f_make; - - f_make = NewFile((void *) "makefile", "w"); - Printf(f_make, "CC=gcc\n"); - Printf(f_make, "CXX=g++\n"); - Printf(f_make, "CXX_SOURCES=%s\n", withcxx); - Printf(f_make, "C_SOURCES=%s\n", withc); - Printf(f_make, "OBJS=%s_wrap.o $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cxx=.o)\n", module); - Printf(f_make, "MODULE=%s.so\n", module); - Printf(f_make, "CFLAGS=-fpic\n"); - Printf(f_make, "LDFLAGS=-shared\n"); - Printf(f_make, "PHP_INC=`php-config --includes`\n"); - Printf(f_make, "EXTRA_INC=\n"); - Printf(f_make, "EXTRA_LIB=\n\n"); - Printf(f_make, "$(MODULE): $(OBJS)\n"); - if (CPlusPlus || (withcxx != NULL)) { - Printf(f_make, "\t$(CXX) $(LDFLAGS) $(OBJS) -o $@ $(EXTRA_LIB)\n\n"); - } else { - Printf(f_make, "\t$(CC) $(LDFLAGS) $(OBJS) -o $@ $(EXTRA_LIB)\n\n"); - } - Printf(f_make, "%%.o: %%.cpp\n"); - Printf(f_make, "\t$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); - Printf(f_make, "%%.o: %%.cxx\n"); - Printf(f_make, "\t$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); - Printf(f_make, "%%.o: %%.c\n"); - Printf(f_make, "\t$(CC) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); - - Close(f_make); - } - - void create_extra_files(String *outfile) { - File *f_extra; - - static String *configm4 = 0; - static String *makefilein = 0; - static String *credits = 0; - - configm4 = NewStringEmpty(); - Printv(configm4, SWIG_output_directory(), "config.m4", NIL); - - makefilein = NewStringEmpty(); - Printv(makefilein, SWIG_output_directory(), "Makefile.in", NIL); - - credits = NewStringEmpty(); - Printv(credits, SWIG_output_directory(), "CREDITS", NIL); - - // are we a --with- or --enable- - int with = (withincs || withlibs) ? 1 : 0; - - // Note Makefile.in only copes with one source file - // also withincs and withlibs only take one name each now - // the code they generate should be adapted to take multiple lines - - /* Write out Makefile.in */ - f_extra = NewFile(makefilein, "w"); - if (!f_extra) { - FileErrorDisplay(makefilein); - SWIG_exit(EXIT_FAILURE); - } - - Printf(f_extra, "# $Id$\n\n" "LTLIBRARY_NAME = %s.la\n", module); - - // C++ has more and different entries to C in Makefile.in - if (!CPlusPlus) { - Printf(f_extra, "LTLIBRARY_SOURCES = %s %s\n", Swig_file_filename(outfile), withc); - Printf(f_extra, "LTLIBRARY_SOURCES_CPP = %s\n", withcxx); - } else { - Printf(f_extra, "LTLIBRARY_SOURCES = %s\n", withc); - Printf(f_extra, "LTLIBRARY_SOURCES_CPP = %s %s\n", Swig_file_filename(outfile), withcxx); - Printf(f_extra, "LTLIBRARY_OBJECTS_X = $(LTLIBRARY_SOURCES_CPP:.cpp=.lo) $(LTLIBRARY_SOURCES_CPP:.cxx=.lo)\n"); - } - Printf(f_extra, "LTLIBRARY_SHARED_NAME = %s.la\n", module); - Printf(f_extra, "LTLIBRARY_SHARED_LIBADD = $(%s_SHARED_LIBADD)\n\n", cap_module); - Printf(f_extra, "include $(top_srcdir)/build/dynlib.mk\n"); - - Printf(f_extra, "\n# patch in .cxx support to php build system to work like .cpp\n"); - Printf(f_extra, ".SUFFIXES: .cxx\n\n"); - - Printf(f_extra, ".cxx.o:\n"); - Printf(f_extra, "\t$(CXX_COMPILE) -c $<\n\n"); - - Printf(f_extra, ".cxx.lo:\n"); - Printf(f_extra, "\t$(CXX_PHP_COMPILE)\n\n"); - Printf(f_extra, ".cxx.slo:\n"); - - Printf(f_extra, "\t$(CXX_SHARED_COMPILE)\n\n"); - - Printf(f_extra, "\n# make it easy to test module\n"); - Printf(f_extra, "testmodule:\n"); - Printf(f_extra, "\tphp -q -d extension_dir=modules %s\n\n", Swig_file_filename(phpfilename)); - - Close(f_extra); - - /* Now config.m4 */ - // Note: # comments are OK in config.m4 if you don't mind them - // appearing in the final ./configure file - // (which can help with ./configure debugging) - - // NOTE2: phpize really ought to be able to write out a sample - // config.m4 based on some simple data, I'll take this up with - // the php folk! - f_extra = NewFile(configm4, "w"); - if (!f_extra) { - FileErrorDisplay(configm4); - SWIG_exit(EXIT_FAILURE); - } - - Printf(f_extra, "dnl $Id$\n"); - Printf(f_extra, "dnl ***********************************************************************\n"); - Printf(f_extra, "dnl ** THIS config.m4 is provided for PHPIZE and PHP's consumption NOT\n"); - Printf(f_extra, "dnl ** for any part of the rest of the %s build system\n", module); - Printf(f_extra, "dnl ***********************************************************************\n\n"); - - - if (!with) { // must be enable then - Printf(f_extra, "PHP_ARG_ENABLE(%s, whether to enable %s support,\n", module, module); - Printf(f_extra, "[ --enable-%s Enable %s support])\n\n", module, module); - } else { - Printf(f_extra, "PHP_ARG_WITH(%s, for %s support,\n", module, module); - Printf(f_extra, "[ --with-%s[=DIR] Include %s support.])\n\n", module, module); - // These tests try and file the library we need - Printf(f_extra, "dnl THESE TESTS try and find the library and header files\n"); - Printf(f_extra, "dnl your new php module needs. YOU MAY NEED TO EDIT THEM\n"); - Printf(f_extra, "dnl as written they assume your header files are all in the same place\n\n"); - - Printf(f_extra, "dnl ** are we looking for %s_lib.h or something else?\n", module); - if (withincs) - Printf(f_extra, "HNAMES=\"%s\"\n\n", withincs); - else - Printf(f_extra, "HNAMES=\"\"; # %s_lib.h ?\n\n", module); - - Printf(f_extra, "dnl ** Are we looking for lib%s.a or lib%s.so or something else?\n", module, module); - - if (withlibs) - Printf(f_extra, "LIBNAMES=\"%s\"\n\n", withlibs); - else - Printf(f_extra, "LIBNAMES=\"\"; # lib%s.so ?\n\n", module); - - Printf(f_extra, "dnl IF YOU KNOW one of the symbols in the library and you\n"); - Printf(f_extra, "dnl specify it below then we can have a link test to see if it works\n"); - Printf(f_extra, "LIBSYMBOL=\"\"\n\n"); - } - - // Now write out tests to find thing.. they may need to extend tests - Printf(f_extra, "if test \"$PHP_%s\" != \"no\"; then\n\n", cap_module); - - // Ready for when we add libraries as we find them - Printf(f_extra, " PHP_SUBST(%s_SHARED_LIBADD)\n\n", cap_module); - - if (withlibs) { // find more than one library - Printf(f_extra, " for LIBNAME in $LIBNAMES ; do\n"); - Printf(f_extra, " LIBDIR=\"\"\n"); - // For each path element to try... - Printf(f_extra, " for i in $PHP_%s $PHP_%s/lib /usr/lib /usr/local/lib ; do\n", cap_module, cap_module); - Printf(f_extra, " if test -r $i/lib$LIBNAME.a -o -r $i/lib$LIBNAME.so ; then\n"); - Printf(f_extra, " LIBDIR=\"$i\"\n"); - Printf(f_extra, " break\n"); - Printf(f_extra, " fi\n"); - Printf(f_extra, " done\n\n"); - Printf(f_extra, " dnl ** and $LIBDIR should be the library path\n"); - Printf(f_extra, " if test \"$LIBNAME\" != \"\" -a -z \"$LIBDIR\" ; then\n"); - Printf(f_extra, " AC_MSG_RESULT(Library files $LIBNAME not found)\n"); - Printf(f_extra, " AC_MSG_ERROR(Is the %s distribution installed properly?)\n", module); - Printf(f_extra, " else\n"); - Printf(f_extra, " AC_MSG_RESULT(Library files $LIBNAME found in $LIBDIR)\n"); - Printf(f_extra, " PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBDIR, %s_SHARED_LIBADD)\n", cap_module); - Printf(f_extra, " fi\n"); - Printf(f_extra, " done\n\n"); - } - - if (withincs) { // Find more than once include - Printf(f_extra, " for HNAME in $HNAMES ; do\n"); - Printf(f_extra, " INCDIR=\"\"\n"); - // For each path element to try... - Printf(f_extra, " for i in $PHP_%s $PHP_%s/include $PHP_%s/includes $PHP_%s/inc $PHP_%s/incs /usr/local/include /usr/include; do\n", cap_module, - cap_module, cap_module, cap_module, cap_module); - // Try and find header files - Printf(f_extra, " if test \"$HNAME\" != \"\" -a -r $i/$HNAME ; then\n"); - Printf(f_extra, " INCDIR=\"$i\"\n"); - Printf(f_extra, " break\n"); - Printf(f_extra, " fi\n"); - Printf(f_extra, " done\n\n"); - - Printf(f_extra, " dnl ** Now $INCDIR should be the include file path\n"); - Printf(f_extra, " if test \"$HNAME\" != \"\" -a -z \"$INCDIR\" ; then\n"); - Printf(f_extra, " AC_MSG_RESULT(Include files $HNAME not found)\n"); - Printf(f_extra, " AC_MSG_ERROR(Is the %s distribution installed properly?)\n", module); - Printf(f_extra, " else\n"); - Printf(f_extra, " AC_MSG_RESULT(Include files $HNAME found in $INCDIR)\n"); - Printf(f_extra, " PHP_ADD_INCLUDE($INCDIR)\n"); - Printf(f_extra, " fi\n\n"); - Printf(f_extra, " done\n\n"); - } - - if (CPlusPlus) { - Printf(f_extra, " # As this is a C++ module..\n"); - } - - Printf(f_extra, " PHP_REQUIRE_CXX\n"); - Printf(f_extra, " AC_CHECK_LIB(stdc++, cin)\n"); - - if (with) { - Printf(f_extra, " if test \"$LIBSYMBOL\" != \"\" ; then\n"); - Printf(f_extra, " old_LIBS=\"$LIBS\"\n"); - Printf(f_extra, " LIBS=\"$LIBS -L$TEST_DIR/lib -lm -ldl\"\n"); - Printf(f_extra, " AC_CHECK_LIB($LIBNAME, $LIBSYMBOL, [AC_DEFINE(HAVE_TESTLIB,1, [ ])],\n"); - Printf(f_extra, " [AC_MSG_ERROR(wrong test lib version or lib not found)])\n"); - Printf(f_extra, " LIBS=\"$old_LIBS\"\n"); - Printf(f_extra, " fi\n\n"); - } - - Printf(f_extra, " AC_DEFINE(HAVE_%s, 1, [ ])\n", cap_module); - Printf(f_extra, "dnl AC_DEFINE_UNQUOTED(PHP_%s_DIR, \"$%s_DIR\", [ ])\n", cap_module, cap_module); - Printf(f_extra, " PHP_EXTENSION(%s, $ext_shared)\n", module); - - // and thats all! - Printf(f_extra, "fi\n"); - - Close(f_extra); - - /* CREDITS */ - f_extra = NewFile(credits, "w"); - if (!f_extra) { - FileErrorDisplay(credits); - SWIG_exit(EXIT_FAILURE); - } - Printf(f_extra, "%s\n", module); - Close(f_extra); - } - /* ------------------------------------------------------------ * top() * ------------------------------------------------------------ */ @@ -550,13 +260,12 @@ public: String *outfile = Getattr(n, "outfile"); /* main output file */ - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - - Swig_banner(f_runtime); + f_runtime = NewString(""); /* sections of the output file */ s_init = NewString("/* init section */\n"); @@ -575,6 +284,7 @@ public: s_phpclasses = NewString("/* PHP Proxy Classes */\n"); /* Register file targets with the SWIG file handler */ + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", s_init); Swig_register_filebyname("rinit", r_init); @@ -583,6 +293,12 @@ public: Swig_register_filebyname("header", s_header); Swig_register_filebyname("wrapper", s_wrappers); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGPHP\n"); + Printf(f_runtime, "\n"); + /* Set the module name */ module = Copy(Getattr(n, "name")); cap_module = NewStringf("%(upper)s", module); @@ -594,7 +310,7 @@ public: Printv(filen, SWIG_output_directory(), module, ".php", NIL); phpfilename = NewString(filen); - f_phpcode = NewFile(filen, "w"); + f_phpcode = NewFile(filen, "w", SWIG_output_files()); if (!f_phpcode) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -604,14 +320,14 @@ public: Swig_banner(f_phpcode); + Printf(f_phpcode, "\n"); Printf(f_phpcode, "// Try to load our extension if it's not already loaded.\n"); Printf(f_phpcode, "if (!extension_loaded(\"%s\")) {\n", module); Printf(f_phpcode, " if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {\n"); Printf(f_phpcode, " if (!dl('php_%s.dll')) return;\n", module); Printf(f_phpcode, " } else {\n"); - Printf(f_phpcode, " // PHP_SHLIB_SUFFIX is available as of PHP 4.3.0, for older PHP assume 'so'.\n"); - Printf(f_phpcode, " // It gives 'dylib' on MacOS X which is for libraries, modules are 'so'.\n"); - Printf(f_phpcode, " if (PHP_SHLIB_SUFFIX === 'PHP_SHLIB_SUFFIX' || PHP_SHLIB_SUFFIX === 'dylib') {\n"); + Printf(f_phpcode, " // PHP_SHLIB_SUFFIX gives 'dylib' on MacOS X but modules are 'so'.\n"); + Printf(f_phpcode, " if (PHP_SHLIB_SUFFIX === 'dylib') {\n"); Printf(f_phpcode, " if (!dl('%s.so')) return;\n", module); Printf(f_phpcode, " } else {\n"); Printf(f_phpcode, " if (!dl('%s.'.PHP_SHLIB_SUFFIX)) return;\n", module); @@ -674,7 +390,7 @@ public: /* Create the .h file too */ filen = NewStringEmpty(); Printv(filen, SWIG_output_directory(), "php_", module, ".h", NIL); - f_h = NewFile(filen, "w"); + f_h = NewFile(filen, "w", SWIG_output_files()); if (!f_h) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -682,7 +398,7 @@ public: Swig_banner(f_h); - Printf(f_h, "\n\n"); + Printf(f_h, "\n"); Printf(f_h, "#ifndef PHP_%s_H\n", cap_module); Printf(f_h, "#define PHP_%s_H\n\n", cap_module); Printf(f_h, "extern zend_module_entry %s_module_entry;\n", module); @@ -727,9 +443,6 @@ public: Printf(s_init, "};\n"); Printf(s_init, "zend_module_entry* SWIG_module_entry = &%s_module_entry;\n\n", module); - if (gen_extra) { - Printf(s_init, "#ifdef COMPILE_DL_%s\n", cap_module); - } Printf(s_init, "#ifdef __cplusplus\n"); Printf(s_init, "extern \"C\" {\n"); Printf(s_init, "#endif\n"); @@ -740,10 +453,6 @@ public: Printf(s_init, "}\n"); Printf(s_init, "#endif\n\n"); - if (gen_extra) { - Printf(s_init, "#endif\n\n"); - } - /* We have to register the constants before they are (possibly) used * by the pointer typemaps. This all needs re-arranging really as * things are being called in the wrong order @@ -818,16 +527,19 @@ public: Printf(s_wrappers, "/* end wrapper section */\n"); Printf(s_vdecl, "/* end vdecl subsection */\n"); - Printv(f_runtime, s_header, s_vdecl, s_wrappers, NIL); - Printv(f_runtime, all_cs_entry, "\n\n", s_entry, "{NULL, NULL, NULL}\n};\n\n", NIL); - Printv(f_runtime, s_init, NIL); + Dump(f_runtime, f_begin); + Printv(f_begin, s_header, s_vdecl, s_wrappers, NIL); + Printv(f_begin, all_cs_entry, "\n\n", s_entry, "{NULL, NULL, NULL}\n};\n\n", NIL); + Printv(f_begin, s_init, NIL); Delete(s_header); Delete(s_wrappers); Delete(s_init); Delete(s_vdecl); Delete(all_cs_entry); Delete(s_entry); - Close(f_runtime); + Close(f_begin); + Delete(f_runtime); + Delete(f_begin); Printf(f_phpcode, "%s\n%s\n", pragma_incl, pragma_code); if (s_fakeoowrappers) { @@ -840,22 +552,12 @@ public: Printf(f_phpcode, "%s\n?>\n", s_phpclasses); Close(f_phpcode); - if (gen_extra) { - create_extra_files(outfile); - } else if (gen_make) { - create_simple_make(); - } - return SWIG_OK; } /* Just need to append function names to function table to register with PHP. */ void create_command(String *cname, String *iname) { // This is for the single main zend_function_entry record - if (shadow && php_version == 4) { - if (wrapperType != standard) - return; - } Printf(f_h, "ZEND_NAMED_FUNCTION(%s);\n", iname); String * s = cs_entry; if (!s) s = s_entry; @@ -872,8 +574,6 @@ public: String *tmp = NewStringEmpty(); String *dispatch = Swig_overload_dispatch(n, "return %s(INTERNAL_FUNCTION_PARAM_PASSTHRU);", &maxargs); - int has_this_ptr = (wrapperType == memberfn && shadow && php_version == 4); - /* Generate a dispatch wrapper for all overloaded functions */ Wrapper *f = NewWrapper(); @@ -890,13 +590,7 @@ public: Printf(f->code, "argc = ZEND_NUM_ARGS();\n"); - if (has_this_ptr) { - Printf(f->code, "argv[0] = &this_ptr;\n"); - Printf(f->code, "zend_get_parameters_array_ex(argc,argv+1);\n"); - Printf(f->code, "argc++;\n"); - } else { - Printf(f->code, "zend_get_parameters_array_ex(argc,argv);\n"); - } + Printf(f->code, "zend_get_parameters_array_ex(argc,argv);\n"); Replaceall(dispatch, "$args", "self,args"); @@ -904,7 +598,7 @@ public: Printf(f->code, "SWIG_ErrorCode() = E_ERROR;\n"); Printf(f->code, "SWIG_ErrorMsg() = \"No matching function for overloaded '%s'\";\n", symname); - Printv(f->code, "zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());\n", NIL); + Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n", NIL); Printv(f->code, "}\n", NIL); Wrapper_print(f, s_wrappers); @@ -945,8 +639,6 @@ public: int numopt; String *tm; Wrapper *f; - bool mvr = (shadow && php_version == 4 && wrapperType == membervar); - bool mvrset = (mvr && (Strcmp(iname, Swig_name_set(Swig_name_member(shadow_classname, name))) == 0)); String *wname; int overloaded = 0; @@ -971,19 +663,6 @@ public: if (overname) { Printf(wname, "%s", overname); } - // if PHP4, shadow and variable wrapper we want to snag the main contents - // of this function to stick in to the property handler... - if (mvr) { - String *php_function_name = NewString(iname); - if (Strcmp(iname, Swig_name_set(Swig_name_member(shadow_classname, name))) == 0) { - Setattr(shadow_set_vars, php_function_name, name); - } - if (Strcmp(iname, Swig_name_get(Swig_name_member(shadow_classname, name))) == 0) { - Setattr(shadow_get_vars, php_function_name, name); - } - - Delete(php_function_name); - } f = NewWrapper(); numopt = 0; @@ -991,20 +670,11 @@ public: String *outarg = NewStringEmpty(); String *cleanup = NewStringEmpty(); - if (mvr) { // do prop[gs]et header - if (mvrset) { - Printf(f->def, "static int _wrap_%s(zend_property_reference *property_reference, pval *value) {\n", iname); - } else { - Printf(f->def, "static pval _wrap_%s(zend_property_reference *property_reference) {\n", iname); - } - } else { - // regular header - // Not issued for overloaded functions or static member variables. - if (!overloaded && wrapperType != staticmembervar) { - create_command(iname, wname); - } - Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL); + // Not issued for overloaded functions or static member variables. + if (!overloaded && wrapperType != staticmembervar) { + create_command(iname, wname); } + Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL); emit_parameter_variables(l, f); /* Attach standard typemaps */ @@ -1018,10 +688,8 @@ public: int num_required = emit_num_required(l); numopt = num_arguments - num_required; - int has_this_ptr = (wrapperType == memberfn && shadow && php_version == 4); - - if (num_arguments - has_this_ptr > 0) { - String *args = NewStringf("zval **args[%d]", num_arguments - has_this_ptr); + if (num_arguments > 0) { + String *args = NewStringf("zval **args[%d]", num_arguments); Wrapper_add_local(f, "args", args); Delete(args); args = NULL; @@ -1036,39 +704,22 @@ public: Printf(f->code, "SWIG_ResetError();\n"); - if (has_this_ptr) - Printf(f->code, "/* This function uses a this_ptr*/\n"); - - if (native_constructor) { - if (native_constructor == NATIVE_CONSTRUCTOR) { - Printf(f->code, "/* NATIVE Constructor */\n"); - } else { - Printf(f->code, "/* ALTERNATIVE Constructor */\n"); - } - } - - if (mvr && !mvrset) { - Wrapper_add_local(f, "_return_value", "zval _return_value"); - Wrapper_add_local(f, "return_value", "zval *return_value=&_return_value"); - } - if (numopt > 0) { // membervariable wrappers do not have optional args Wrapper_add_local(f, "arg_count", "int arg_count"); Printf(f->code, "arg_count = ZEND_NUM_ARGS();\n"); Printf(f->code, "if(arg_count<%d || arg_count>%d ||\n", num_required, num_arguments); Printf(f->code, " zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)\n"); Printf(f->code, "\tWRONG_PARAM_COUNT;\n\n"); - } else if (!mvr) { - int num = num_arguments - has_this_ptr; - if (num == 0) { + } else { + if (num_arguments == 0) { Printf(f->code, "if(ZEND_NUM_ARGS() != 0) {\n"); } else { - Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n", num, num); + Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n", num_arguments, num_arguments); } Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n"); } - /* Now convert from php to C variables */ + /* Now convert from PHP to C variables */ // At this point, argcount if used is the number of deliberately passed args // not including this_ptr even if it is used. // It means error messages may be out by argbase with error @@ -1089,19 +740,7 @@ public: SwigType *pt = Getattr(p, "type"); - if (mvr) { // do we assert that numargs=2, that i<2 - if (i == 0) { - source = NewString("&(property_reference->object)"); - } else { - source = NewString("&value"); - } - } else { - if (i == 0 && has_this_ptr) { - source = NewString("&this_ptr"); - } else { - source = NewStringf("args[%d]", i - has_this_ptr); - } - } + source = NewStringf("args[%d]", i); String *ln = Getattr(p, "lname"); @@ -1183,24 +822,6 @@ public: Replaceall(tm, "$result", "return_value"); Replaceall(tm, "$owner", newobject ? "1" : "0"); Printf(f->code, "%s\n", tm); - // Are we returning a wrapable object? - if (shadow && php_version == 4 && is_shadow(d) && (SwigType_type(d) != T_ARRAY)) { - // Make object. - Printf(f->code, "{\n/* Wrap this return value */\n"); - Printf(f->code, "zval *_cPtr;\n"); - Printf(f->code, "ALLOC_ZVAL(_cPtr);\n"); - Printf(f->code, "*_cPtr = *return_value;\n"); - Printf(f->code, "INIT_ZVAL(*return_value);\n"); - if (native_constructor == NATIVE_CONSTRUCTOR) { - Printf(f->code, "add_property_zval(this_ptr,\"" SWIG_PTR "\",_cPtr);\n"); - } else { - String *shadowrettype = GetShadowReturnType(n); - Printf(f->code, "object_init_ex(return_value,ptr_ce_swig_%s);\n", shadowrettype); - Delete(shadowrettype); - Printf(f->code, "add_property_zval(return_value,\"" SWIG_PTR "\",_cPtr);\n"); - } - Printf(f->code, "}\n"); - } } else { Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name); } @@ -1228,21 +849,12 @@ public: Delete(tm); } - - if (mvr) { - if (!mvrset) { - Printf(f->code, "return _return_value;\n"); - } else { - Printf(f->code, "return SUCCESS;\n"); - } - } else { - Printf(f->code, "return;\n"); - } + Printf(f->code, "return;\n"); /* Error handling code */ Printf(f->code, "fail:\n"); Printv(f->code, cleanup, NIL); - Printv(f->code, "zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());", NIL); + Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL); Printf(f->code, "}\n"); @@ -1258,7 +870,7 @@ public: Delete(wname); wname = NULL; - if (!(shadow && php_version == 5)) { + if (!shadow) { DelWrapper(f); return SWIG_OK; } @@ -1501,7 +1113,8 @@ public: case T_LONG: { char *p; errno = 0; - (void) strtol(Char(value), &p, 0); + unsigned int n = strtol(Char(value), &p, 0); + (void) n; if (errno || *p) { Clear(value); Append(value, "?"); @@ -1514,7 +1127,8 @@ public: case T_ULONG: { char *p; errno = 0; - (void) strtoul(Char(value), &p, 0); + unsigned int n = strtoul(Char(value), &p, 0); + (void) n; if (errno || *p) { Clear(value); Append(value, "?"); @@ -1638,8 +1252,8 @@ public: Setattr(seen, "this", seen); /* We use $r to store the return value, so disallow that as a parameter * name in case the user uses the "call-time pass-by-reference" feature - * (it's deprecated and off by default in PHP5 and even later PHP4 - * versions apparently, but we want to be maximally portable). + * (it's deprecated and off by default in PHP5, but we want to be + * maximally portable). */ Setattr(seen, "r", seen); @@ -1755,16 +1369,26 @@ public: Printf(output, "\n"); // If it's a member function or a class constructor... if (wrapperType == memberfn || (newobject && current_class)) { - Printf(output, "\tfunction %s(%s) {\n", methodname, args); // We don't need this code if the wrapped class has a copy ctor // since the flat function new_CLASSNAME will handle it for us. if (newobject && !Getattr(current_class, "allocate:copy_constructor")) { + const char * arg0; + if (max_num_of_arguments > 0) { + arg0 = Char(arg_names[0]); + } else { + arg0 = "res"; + Delete(args); + args = NewString("$res=null"); + } SwigType *t = Getattr(current_class, "classtype"); String *mangled_type = SwigType_manglestr(SwigType_ltype(t)); - Printf(s_oowrappers, "\t\tif (is_resource($%s) && get_resource_type($%s) == \"_p%s\") {\n", arg_names[0], arg_names[0], mangled_type); - Printf(s_oowrappers, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg_names[0]); - Printf(s_oowrappers, "\t\t\treturn;\n"); - Printf(s_oowrappers, "\t\t}\n"); + Printf(output, "\tfunction %s(%s) {\n", methodname, args); + Printf(output, "\t\tif (is_resource($%s) && get_resource_type($%s) == \"_p%s\") {\n", arg0, arg0, mangled_type); + Printf(output, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg0); + Printf(output, "\t\t\treturn;\n"); + Printf(output, "\t\t}\n"); + } else { + Printf(output, "\tfunction %s(%s) {\n", methodname, args); } } else { Printf(output, "\tstatic function %s(%s) {\n", methodname, args); @@ -1877,8 +1501,7 @@ public: Replaceall(tm, "$symname", iname); Printf(f_c->code, "%s\n", tm); } else { - Printf(stderr,"%s: Line %d, Unable to link with type %s\n", - input_file, line_number, SwigType_str(t, 0)); + Printf(stderr,"%s: Line %d, Unable to link with type %s\n", input_file, line_number, SwigType_str(t, 0)); } */ /* Now generate C -> PHP sync blocks */ @@ -1890,8 +1513,7 @@ public: Replaceall(tm, "$symname", iname); Printf(f_php->code, "%s\n", tm); } else { - Printf(stderr,"%s: Line %d, Unable to link with type %s\n", - input_file, line_number, SwigType_str(t, 0)); + Printf(stderr,"%s: Line %d, Unable to link with type %s\n", input_file, line_number, SwigType_str(t, 0)); } } */ @@ -1922,7 +1544,7 @@ public: Printf(s_cinit, "%s\n", tm); } - if (shadow && php_version == 5) { + if (shadow) { String *enumvalue = GetChar(n, "enumvalue"); String *set_to = iname; @@ -1964,8 +1586,8 @@ public: * * Pragma directive. * - * %pragma(php4) code="String" # Includes a string in the .php file - * %pragma(php4) include="file.pl" # Includes a file in the .php file + * %pragma(php) code="String" # Includes a string in the .php file + * %pragma(php) include="file.pl" # Includes a file in the .php file */ virtual int pragmaDirective(Node *n) { @@ -1974,7 +1596,7 @@ public: String *type = Getattr(n, "name"); String *value = Getattr(n, "value"); - if (Strcmp(lang, "php4") == 0) { + if (Strcmp(lang, "php") == 0 || Strcmp(lang, "php4") == 0) { if (Strcmp(type, "code") == 0) { if (value) { Printf(pragma_code, "%s\n", value); @@ -1988,7 +1610,7 @@ public: Printf(pragma_phpinfo, "%s\n", value); } } else { - Swig_warning(WARN_PHP4_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", type); + Swig_warning(WARN_PHP_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", type); } } } @@ -2018,52 +1640,7 @@ public: current_class = n; // String *use_class_name=SwigType_manglestr(SwigType_ltype(t)); - if (shadow && php_version == 4) { - char *rename = GetChar(n, "sym:name"); - - if (!addSymbol(rename, n)) - return SWIG_ERROR; - shadow_classname = NewString(rename); - cs_entry = NewStringEmpty(); - Printf(cs_entry, "/* Function entries for %s */\n", shadow_classname); - Printf(cs_entry, "static zend_function_entry %s_functions[] = {\n", shadow_classname); - - if (Strcmp(shadow_classname, module) == 0) { - Printf(stderr, "class name cannot be equal to module name: %s\n", module); - SWIG_exit(1); - } - - shadow_get_vars = NewHash(); - shadow_set_vars = NewHash(); - - /* Deal with inheritance */ - List *baselist = Getattr(n, "bases"); - if (baselist) { - Iterator base = First(baselist); - while (base.item && GetFlag(base.item, "feature:ignore")) { - base = Next(base); - } - base = Next(base); - if (base.item) { - /* Warn about multiple inheritance for additional base class(es) */ - while (base.item) { - if (GetFlag(base.item, "feature:ignore")) { - base = Next(base); - continue; - } - String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0); - String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0); - Swig_warning(WARN_PHP4_MULTIPLE_INHERITANCE, input_file, line_number, - "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Php4.\n", proxyclassname, baseclassname); - base = Next(base); - } - } - } - - /* Write out class init code */ - Printf(s_vdecl, "static zend_class_entry ce_swig_%s;\n", shadow_classname); - Printf(s_vdecl, "static zend_class_entry* ptr_ce_swig_%s=NULL;\n", shadow_classname); - } else if (shadow && php_version == 5) { + if (shadow) { char *rename = GetChar(n, "sym:name"); if (!addSymbol(rename, n)) @@ -2090,7 +1667,7 @@ public: } String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0); String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0); - Swig_warning(WARN_PHP4_MULTIPLE_INHERITANCE, input_file, line_number, + Swig_warning(WARN_PHP_MULTIPLE_INHERITANCE, input_file, line_number, "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname); base = Next(base); } @@ -2102,217 +1679,7 @@ public: Language::classHandler(n); classnode = 0; - if (shadow && php_version == 4) { - DOH *key; - String *s_propget = NewStringEmpty(); - String *s_propset = NewStringEmpty(); - List *baselist = Getattr(n, "bases"); - Iterator ki, base; - - // If no constructor was generated (abstract class) we had better - // generate a constructor that raises an error about instantiating - // abstract classes - if (Getattr(n, "abstract") && constructors == 0) { - // have to write out fake constructor which raises an error when called - abstractConstructorHandler(n); - } - - Printf(s_oinit, "/* Define class %s */\n", shadow_classname); - Printf(s_oinit, "INIT_OVERLOADED_CLASS_ENTRY(ce_swig_%s,\"%(lower)s\",%s_functions,", shadow_classname, shadow_classname, shadow_classname); - Printf(s_oinit, "NULL,_wrap_propget_%s,_wrap_propset_%s);\n", shadow_classname, shadow_classname); - - // ******** Write property SET handlers - Printf(s_header, "static int _wrap_propset_%s(zend_property_reference *property_reference, pval *value);\n", shadow_classname); - Printf(s_header, "static int _propset_%s(zend_property_reference *property_reference, pval *value);\n", shadow_classname); - - Printf(s_propset, "static int _wrap_propset_%s(zend_property_reference *property_reference, pval *value) { \n", shadow_classname); - Printf(s_propset, " zval * _value;\n"); - Printf(s_propset, " zend_llist_element *element = property_reference->elements_list->head;\n"); - Printf(s_propset, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); - Printf(s_propset, " if (_propset_%s(property_reference, value)==SUCCESS) return SUCCESS;\n", shadow_classname); - Printf(s_propset, " /* set it ourselves as it is %s */\n", shadow_classname); - Printf(s_propset, " MAKE_STD_ZVAL(_value);\n"); - Printf(s_propset, " *_value=*value;\n"); - Printf(s_propset, " INIT_PZVAL(_value);\n"); - Printf(s_propset, " zval_copy_ctor(_value);\n"); - Printf(s_propset, - " return add_property_zval_ex(property_reference->object,Z_STRVAL_P(&(property->element)),1+Z_STRLEN_P(&(property->element)),_value);\n"); - Printf(s_propset, "}\n"); - Printf(s_propset, "static int _propset_%s(zend_property_reference *property_reference, pval *value) {\n", shadow_classname); - - - if (baselist) { - base = First(baselist); - } else { - base.item = NULL; - } - - while (base.item && GetFlag(base.item, "feature:ignore")) { - base = Next(base); - } - - ki = First(shadow_set_vars); - key = ki.key; - - // Print function header; we only need to find property name if there - // are properties for this class to look up... - if (key || !base.item) { // or if we are base class and set it ourselves - Printf(s_propset, " /* get the property name */\n"); - Printf(s_propset, " zend_llist_element *element = property_reference->elements_list->head;\n"); - Printf(s_propset, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); - Printf(s_propset, " char *propname=Z_STRVAL_P(&(property->element));\n"); - } else { - if (base.item) { - Printf(s_propset, " /* No extra properties for subclass %s */\n", shadow_classname); - } else { - Printf(s_propset, " /* No properties for base class %s */\n", shadow_classname); - } - } - - while (ki.key) { - key = ki.key; - Printf(s_propset, " if (strcmp(propname,\"%s\")==0) return _wrap_%s(property_reference, value);\n", ki.item, key); - - ki = Next(ki); - } - - // If the property wasn't in this class, try the handlers of each base - // class (if any) in turn until we succeed in setting the property or - // have tried all base classes. - if (base.item) { - Printf(s_propset, " /* Try base class(es) */\n"); - while (base.item) { - Printf(s_propset, " if (_propset_%s(property_reference, value)==SUCCESS) return SUCCESS;\n", GetChar(base.item, "sym:name")); - - base = Next(base); - while (base.item && GetFlag(base.item, "feature:ignore")) { - base = Next(base); - } - } - } - Printf(s_propset, " return FAILURE;\n}\n\n"); - - // ******** Write property GET handlers - Printf(s_header, "static pval _wrap_propget_%s(zend_property_reference *property_reference);\n", shadow_classname); - Printf(s_header, "static int _propget_%s(zend_property_reference *property_reference, pval *value);\n", shadow_classname); - - Printf(s_propget, "static pval _wrap_propget_%s(zend_property_reference *property_reference) {\n", shadow_classname); - Printf(s_propget, " pval result;\n"); - Printf(s_propget, " pval **_result;\n"); - Printf(s_propget, " zend_llist_element *element = property_reference->elements_list->head;\n"); - Printf(s_propget, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); - Printf(s_propget, " result.type = IS_NULL;\n"); - Printf(s_propget, " if (_propget_%s(property_reference, &result)==SUCCESS) return result;\n", shadow_classname); - Printf(s_propget, " /* return it ourselves */\n"); - Printf(s_propget, - " if (zend_hash_find(Z_OBJPROP_P(property_reference->object),Z_STRVAL_P(&(property->element)),1+Z_STRLEN_P(&(property->element)),(void**)&_result)==SUCCESS) {\n"); - Printf(s_propget, " zval *_value;\n"); - Printf(s_propget, " MAKE_STD_ZVAL(_value);"); - Printf(s_propget, " *_value=**_result;\n"); - Printf(s_propget, " INIT_PZVAL(_value);\n"); - Printf(s_propget, " zval_copy_ctor(_value);\n"); - Printf(s_propget, " return *_value;\n"); - Printf(s_propget, " }\n"); - Printf(s_propget, " result.type = IS_NULL;\n"); - Printf(s_propget, " return result;\n"); - Printf(s_propget, "}\n"); - Printf(s_propget, "static int _propget_%s(zend_property_reference *property_reference, pval *value) {\n", shadow_classname); - - if (baselist) { - base = First(baselist); - } else { - base.item = NULL; - } - while (base.item && GetFlag(base.item, "feature:ignore")) { - base = Next(base); - } - ki = First(shadow_get_vars); - - key = ki.key; - - // Print function header; we only need to find property name if there - // are properties for this class to look up... - if (key || !base.item) { // or if we are base class... - Printf(s_propget, " /* get the property name */\n"); - Printf(s_propget, " zend_llist_element *element = property_reference->elements_list->head;\n"); - Printf(s_propget, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); - Printf(s_propget, " char *propname=Z_STRVAL_P(&(property->element));\n"); - } else { - if (base.item) { - Printf(s_propget, " /* No extra properties for subclass %s */\n", shadow_classname); - } else { - Printf(s_propget, " /* No properties for base class %s */\n", shadow_classname); - } - } - - while (ki.key) { - key = ki.key; - Printf(s_propget, " if (strcmp(propname,\"%s\")==0) {\n", ki.item); - Printf(s_propget, " *value=_wrap_%s(property_reference);\n", key); - Printf(s_propget, " return SUCCESS;\n"); - Printf(s_propget, " }\n"); - - ki = Next(ki); - } - - // If the property wasn't in this class, try the handlers of each base - // class (if any) in turn until we succeed in setting the property or - // have tried all base classes. - if (base.item) { - Printf(s_propget, " /* Try base class(es). */\n"); - while (base.item) { - Printf(s_propget, " if (_propget_%s(property_reference, value)==SUCCESS) return SUCCESS;\n", GetChar(base.item, "sym:name")); - - base = Next(base); - while (base.item && GetFlag(base.item, "feature:ignore")) { - base = Next(base); - } - } - } - Printf(s_propget, " return FAILURE;\n}\n\n"); - - // wrappers generated now... - - // add wrappers to output code - Printf(s_wrappers, "/* property handler for class %s */\n", shadow_classname); - Printv(s_wrappers, s_propget, s_propset, NIL); - - // Save class in class table - if (baselist) { - base = First(baselist); - } else { - base.item = NULL; - } - while (base.item && GetFlag(base.item, "feature:ignore")) { - base = Next(base); - } - - if (base.item) { - Printf(s_oinit, - "if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n", - shadow_classname, shadow_classname, GetChar(base.item, "sym:name"), shadow_classname); - } else { - Printf(s_oinit, - "if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n", - shadow_classname, shadow_classname, shadow_classname); - } - Printf(s_oinit, "\n"); - - // Write the enum initialisation code in a static block - // These are all the enums defined within the C++ class. - - Delete(shadow_classname); - shadow_classname = NULL; - - Delete(shadow_set_vars); - shadow_set_vars = NULL; - Delete(shadow_get_vars); - shadow_get_vars = NULL; - - Printv(all_cs_entry, cs_entry, " { NULL, NULL, NULL}\n};\n", NIL); - Delete(cs_entry); - cs_entry = NULL; - } else if (shadow && php_version == 5) { + if (shadow) { DOH *key; List *baselist = Getattr(n, "bases"); Iterator ki, base; @@ -2434,21 +1801,10 @@ public: * ------------------------------------------------------------ */ virtual int memberfunctionHandler(Node *n) { - char *name = GetChar(n, "name"); - char *iname = GetChar(n, "sym:name"); - wrapperType = memberfn; this->Language::memberfunctionHandler(n); wrapperType = standard; - // Only declare the member function if - // we are doing shadow classes, and the function - // is not overloaded, or if it is overloaded, it is the dispatch function. - if (shadow && php_version == 4 && (!Getattr(n, "sym:overloaded") || !Getattr(n, "sym:nextSibling"))) { - char *realname = iname ? iname : name; - String *php_function_name = Swig_name_member(shadow_classname, realname); - create_command(realname, Swig_name_wrapper(php_function_name)); - } return SWIG_OK; } @@ -2457,7 +1813,6 @@ public: * ------------------------------------------------------------ */ virtual int membervariableHandler(Node *n) { - wrapperType = membervar; Language::membervariableHandler(n); wrapperType = standard; @@ -2470,7 +1825,6 @@ public: * ------------------------------------------------------------ */ virtual int staticmembervariableHandler(Node *n) { - wrapperType = staticmembervar; Language::staticmembervariableHandler(n); wrapperType = standard; @@ -2480,7 +1834,7 @@ public: String *iname = Getattr(n, "sym:name"); /* A temporary(!) hack for static member variables. - * Php currently supports class functions, but not class variables. + * PHP currently supports class functions, but not class variables. * Until it does, we convert a class variable to a class function * that returns the current value of the variable. E.g. * @@ -2489,15 +1843,16 @@ public: * static int ncount; * }; * - * would be available in php as Example::ncount() + * would be available in PHP as Example::ncount() */ - // If the variable is const, then it's wrapped as a constant with set/get functions. + // If the variable is const, then it's wrapped as a constant with set/get + // functions. if (SwigType_isconst(type)) return SWIG_OK; - // This duplicates the logic from Language::variableWrapper() to test if the set wrapper - // is made. + // This duplicates the logic from Language::variableWrapper() to test if + // the set wrapper is made. int assignable = is_assignable(n); if (assignable) { String *tm = Swig_typemap_lookup("globalin", n, name, 0); @@ -2542,20 +1897,10 @@ public: * ------------------------------------------------------------ */ virtual int staticmemberfunctionHandler(Node *n) { - char *name = GetChar(n, "name"); - char *iname = GetChar(n, "sym:name"); - wrapperType = staticmemberfn; Language::staticmemberfunctionHandler(n); wrapperType = standard; - if (shadow && php_version == 4) { - String *symname = Getattr(n, "sym:name"); - char *realname = iname ? iname : name; - String *php_function_name = Swig_name_member(shadow_classname, realname); - create_command(symname, Swig_name_wrapper(php_function_name)); - } - return SWIG_OK; } @@ -2597,7 +1942,7 @@ public: return NewStringEmpty(); } - String *PhpTypeFromTypemap(char *op, Node *n, String_or_char *lname) { + String *PhpTypeFromTypemap(char *op, Node *n, const_String_or_char_ptr lname) { String *tms = Swig_typemap_lookup(op, n, lname, 0); if (!tms) return 0; @@ -2605,54 +1950,20 @@ public: return NewStringf("%s", tms); } - int abstractConstructorHandler(Node *n) { - String *iname = GetChar(n, "sym:name"); - if (shadow && php_version == 4) { - Wrapper *f = NewWrapper(); - - String *wname = NewStringf("_wrap_new_%s", iname); - create_command(iname, wname); - - Printf(f->def, "ZEND_NAMED_FUNCTION(_wrap_new_%s) {\n", iname); - Printf(f->def, " zend_error(E_ERROR,\"Cannot create swig object type: %s as the underlying class is abstract\");\n", iname); - Printf(f->def, "}\n\n"); - Wrapper_print(f, s_wrappers); - DelWrapper(f); - Delete(wname); - } + int abstractConstructorHandler(Node *) { return SWIG_OK; } + /* ------------------------------------------------------------ * constructorHandler() * ------------------------------------------------------------ */ virtual int constructorHandler(Node *n) { - char *name = GetChar(n, "name"); - char *iname = GetChar(n, "sym:name"); - - if (shadow && php_version == 4) { - if (iname && strcmp(iname, Char(shadow_classname)) == 0) { - native_constructor = NATIVE_CONSTRUCTOR; - } else { - native_constructor = ALTERNATIVE_CONSTRUCTOR; - } - } else { - native_constructor = 0; - } constructors++; wrapperType = constructor; Language::constructorHandler(n); wrapperType = standard; - if (shadow && php_version == 4) { - if (!Getattr(n, "sym:overloaded") || !Getattr(n, "sym:nextSibling")) { - char *realname = iname ? iname : name; - String *php_function_name = Swig_name_construct(realname); - create_command(realname, Swig_name_wrapper(php_function_name)); - } - } - - native_constructor = 0; return SWIG_OK; } @@ -2707,7 +2018,6 @@ public: Wrapper_print(f, s_wrappers); return SWIG_OK; - } /* ------------------------------------------------------------ @@ -2715,7 +2025,7 @@ public: * ------------------------------------------------------------ */ virtual int memberconstantHandler(Node *n) { - wrapping_member_constant = Getattr(n, "name"); + wrapping_member_constant = Getattr(n, "sym:name"); Language::memberconstantHandler(n); wrapping_member_constant = NULL; return SWIG_OK; @@ -2723,10 +2033,6 @@ public: }; /* class PHP */ -/* ----------------------------------------------------------------------------- - * swig_php() - Instantiate module - * ----------------------------------------------------------------------------- */ - static PHP *maininstance = 0; // We use this function to be able to write out zend_register_list_destructor_ex @@ -2753,8 +2059,12 @@ extern "C" void typetrace(SwigType *ty, String *mangled, String *clientdata) { (*r_prevtracefunc) (ty, mangled, (String *) clientdata); } -static Language *new_swig_php(int php_version) { - maininstance = new PHP(php_version); +/* ----------------------------------------------------------------------------- + * new_swig_php() - Instantiate module + * ----------------------------------------------------------------------------- */ + +static Language *new_swig_php() { + maininstance = new PHP; if (!r_prevtracefunc) { r_prevtracefunc = SwigType_remember_trace(typetrace); } else { @@ -2763,9 +2073,14 @@ static Language *new_swig_php(int php_version) { } return maininstance; } + extern "C" Language *swig_php4(void) { - return new_swig_php(4); + Printf(stderr, "*** -php4 is no longer supported.\n" + "*** Either upgrade to PHP5 or use SWIG 1.3.36 or earlier.\n"); + SWIG_exit(EXIT_FAILURE); + return NULL; // To avoid compiler warnings. } -extern "C" Language *swig_php5(void) { - return new_swig_php(5); + +extern "C" Language *swig_php(void) { + return new_swig_php(); } diff --git a/Source/Modules/pike.cxx b/Source/Modules/pike.cxx index 30f9b3d74..98f63056c 100644 --- a/Source/Modules/pike.cxx +++ b/Source/Modules/pike.cxx @@ -39,6 +39,7 @@ Pike Options (available with -pike)\n\ class PIKE:public Language { private: + File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -69,6 +70,7 @@ public: * --------------------------------------------------------------------- */ PIKE() { + f_begin = 0; f_runtime = 0; f_header = 0; f_wrappers = 0; @@ -123,11 +125,12 @@ public: String *outfile = Getattr(n, "outfile"); /* Open the output file */ - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_classInit = NewString(""); f_header = NewString(""); @@ -136,12 +139,17 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("classInit", f_classInit); /* Standard stuff for the SWIG runtime section */ - Swig_banner(f_runtime); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGPIKE\n"); + Printf(f_runtime, "\n"); Printf(f_header, "#define SWIG_init pike_module_init\n"); Printf(f_header, "#define SWIG_name \"%s\"\n\n", module); @@ -161,17 +169,19 @@ public: SwigType_emit_type_table(f_runtime, f_wrappers); /* Close all of the files */ - Dump(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); Delete(f_classInit); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); /* Done */ return SWIG_OK; @@ -221,7 +231,7 @@ public: * name (i.e. "enum_test"). * ------------------------------------------------------------ */ - String *strip(const DOHString_or_char *name) { + String *strip(const DOHconst_String_or_char_ptr name) { String *s = Copy(name); if (Strncmp(name, PrefixPlusUnderscore, Len(PrefixPlusUnderscore)) != 0) { return s; @@ -234,7 +244,7 @@ public: * add_method() * ------------------------------------------------------------ */ - void add_method(const DOHString_or_char *name, const DOHString_or_char *function, const DOHString_or_char *description) { + void add_method(const DOHconst_String_or_char_ptr name, const DOHconst_String_or_char_ptr function, const DOHconst_String_or_char_ptr description) { String *rename = NULL; switch (current) { case NO_CPP: diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index f0e335c37..ffeea430d 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -10,11 +10,8 @@ char cvsroot_python_cxx[] = "$Id$"; #include "swigmod.h" -#define ctab2 " " -#define ctab4 " " -#define ctab8 " " - #include "cparse.h" + static int treduce = SWIG_cparse_template_reduce(0); #include @@ -31,6 +28,7 @@ static int shadow = 1; static int use_kw = 0; static int director_method_index = 0; +static File *f_begin = 0; static File *f_runtime = 0; static File *f_runtime_h = 0; static File *f_header = 0; @@ -49,10 +47,11 @@ static String *shadow_indent = 0; static int in_class = 0; static int classic = 0; static int modern = 0; -static int apply = 0; static int new_repr = 1; static int no_header_file = 0; +static int py3 = 0; + /* C++ Support + Shadow Classes */ static int have_constructor; @@ -96,7 +95,6 @@ enum autodoc_t { static const char *usage1 = (char *) "\ Python Options (available with -python)\n\ -aliasobj0 - Alias obj0 when using fastunpack, needed for some old typemaps \n\ - -apply - Use apply() in proxy classes\n\ -buildnone - Use Py_BuildValue(" ") to obtain Py_None (default in Windows)\n\ -castmode - Enable the casting mode, which allows implicit cast between types in python\n\ -classic - Use classic classes only\n\ @@ -148,6 +146,8 @@ static const char *usage3 = (char *) "\ -O - Enable all the optimization options: \n\ -modern -fastdispatch -dirvtable -nosafecstrings -fvirtual -noproxydel \n\ -fastproxy -fastinit -fastunpack -fastquery -modernargs -nobuildnone \n\ + -py3 - Generate code with Python 3 specific features:\n\ + Function annotation \n\ \n"; class PYTHON:public Language { @@ -259,9 +259,6 @@ public: } else if ((strcmp(argv[i], "-shadow") == 0) || ((strcmp(argv[i], "-proxy") == 0))) { shadow = 1; Swig_mark_arg(i); - } else if (strcmp(argv[i], "-apply") == 0) { - apply = 1; - Swig_mark_arg(i); } else if ((strcmp(argv[i], "-new_repr") == 0) || (strcmp(argv[i], "-newrepr") == 0)) { new_repr = 1; Swig_mark_arg(i); @@ -284,7 +281,6 @@ public: } else if (strcmp(argv[i], "-classic") == 0) { classic = 1; modernargs = 0; - apply = 1; modern = 0; Swig_mark_arg(i); } else if (strcmp(argv[i], "-cppcast") == 0) { @@ -390,7 +386,6 @@ public: proxydel = 0; Swig_mark_arg(i); } else if (strcmp(argv[i], "-modern") == 0) { - apply = 0; classic = 0; modern = 1; modernargs = 1; @@ -408,7 +403,6 @@ public: no_header_file = 1; Swig_mark_arg(i); } else if (strcmp(argv[i], "-O") == 0) { - apply = 0; classic = 0; modern = 1; dirvtable = 1; @@ -429,8 +423,17 @@ public: fputs(usage1, stdout); fputs(usage2, stdout); fputs(usage3, stdout); - } + } else if (strcmp(argv[i], "-py3") == 0) { + py3 = 1; + Swig_mark_arg(i); + } + } + } /* for */ + + if (py3) { + /* force disable features that not compatible with Python 3.x */ + classic = 0; } if (cppcast) { @@ -511,15 +514,21 @@ public: String *outfile = Getattr(n, "outfile"); String *outfile_h = !no_header_file ? Getattr(n, "outfile_h") : 0; - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); + f_init = NewString(""); + f_header = NewString(""); + f_wrappers = NewString(""); + f_directors_h = NewString(""); + f_directors = NewString(""); if (directorsEnabled()) { if (!no_header_file) { - f_runtime_h = NewFile(outfile_h, "w"); + f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); if (!f_runtime_h) { FileErrorDisplay(outfile_h); SWIG_exit(EXIT_FAILURE); @@ -529,15 +538,10 @@ public: } } - f_init = NewString(""); - f_header = NewString(""); - f_wrappers = NewString(""); - f_directors_h = NewString(""); - f_directors = NewString(""); - /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("director", f_directors); @@ -546,8 +550,9 @@ public: const_code = NewString(""); methods = NewString(""); - Swig_banner(f_runtime); + Swig_banner(f_begin); + Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGPYTHON\n"); if (directorsEnabled()) { @@ -599,6 +604,8 @@ public: Printf(f_runtime, "#define SWIG_PYTHON_CLASSIC\n"); } + Printf(f_runtime, "\n"); + Printf(f_header, "#if (PY_VERSION_HEX <= 0x02000000)\n"); Printf(f_header, "# if !defined(SWIG_PYTHON_CLASSIC)\n"); Printf(f_header, "# error \"This python version requires swig to be run with the '-classic' option\"\n"); @@ -637,6 +644,7 @@ public: if (directorsEnabled()) { Swig_banner(f_directors_h); + Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module); if (dirprot_mode()) { @@ -660,7 +668,7 @@ public: module = interface; else Insert(module, 0, "_"); - if ((f_shadow_py = NewFile(filen, "w")) == 0) { + if ((f_shadow_py = NewFile(filen, "w", SWIG_output_files())) == 0) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); } @@ -674,10 +682,7 @@ public: Swig_register_filebyname("shadow", f_shadow); Swig_register_filebyname("python", f_shadow); - Printf(f_shadow, "# This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f_shadow, "# Version %s\n", Swig_package_version()); - Printf(f_shadow, "#\n"); - Printf(f_shadow, "# Don't modify this file, modify the SWIG interface instead.\n"); + Swig_banner_target_lang(f_shadow, "#"); if (!modern) { Printv(f_shadow, "# This file is compatible with both classic and new-style classes.\n", NIL); @@ -689,13 +694,53 @@ public: mod_docstring = NULL; } - Printf(f_shadow, "\nimport %s\n", module); + Printv(f_shadow, "\nfrom sys import version_info\n", NULL); + + if(fastproxy) + { + Printv(f_shadow, "if version_info >= (3,0,0):\n", NULL); + Printf(f_shadow, tab4 "new_instancemethod = lambda func, inst, cls: %s.SWIG_PyInstanceMethod_New(func)\n", module); + Printv(f_shadow, "else:\n", NULL); + Printv(f_shadow, tab4, "from new import instancemethod as new_instancemethod\n", NULL); + } + /* Import the C-extension module. This should be a relative import, + * since the shadow module may also have been imported by a relative + * import, and there is thus no guarantee that the C-extension is on + * sys.path. Relative imports must be explicitly specified from 2.6.0 + * onwards (implicit relative imports will raise a DeprecationWarning + * in 2.6, and fail in 2.7 onwards), but the relative import syntax + * isn't available in python 2.4 or earlier, so we have to write some + * code conditional on the python version. + */ + Printv(f_shadow, "if version_info >= (2,6,0):\n", NULL); + Printv(f_shadow, tab4, "def swig_import_helper():\n", NULL); + Printv(f_shadow, tab8, "from os.path import dirname\n", NULL); + Printv(f_shadow, tab8, "import imp\n", NULL); + Printv(f_shadow, tab8, "fp = None\n", NULL); + Printv(f_shadow, tab8, "try:\n", NULL); + Printf(f_shadow, tab4 tab8 "fp, pathname, description = imp.find_module('%s', [dirname(__file__)])\n", module); + Printf(f_shadow, tab8 "except ImportError:\n"); + /* At here, the module may already loaded, so simply import it. */ + Printf(f_shadow, tab4 tab8 "import %s\n", module); + Printf(f_shadow, tab4 tab8 "return %s\n", module); + Printv(f_shadow, tab8 "if fp is not None:\n", NULL); + Printv(f_shadow, tab4 tab8 "try:\n", NULL); + Printf(f_shadow, tab8 tab8 "_mod = imp.load_module('%s', fp, pathname, description)\n", module); + Printv(f_shadow, tab4 tab8, "finally:\n", NULL); + Printv(f_shadow, tab8 tab8, "fp.close()\n", NULL); + Printv(f_shadow, tab8 tab8, "return _mod\n", NULL); + Printf(f_shadow, tab4 "%s = swig_import_helper()\n", module); + Printv(f_shadow, tab4, "del swig_import_helper\n", NULL); + Printv(f_shadow, "else:\n", NULL); + Printf(f_shadow, tab4 "import %s\n", module); + + /* Delete the version_info symbol since we don't use it elsewhere in the + * module. */ + Printv(f_shadow, "del version_info\n", NULL); - Printv(f_shadow, "import new\n", NULL); - Printv(f_shadow, "new_instancemethod = new.instancemethod\n", NULL); if (modern || !classic) { Printv(f_shadow, "try:\n", tab4, "_swig_property = property\n", "except NameError:\n", tab4, "pass # Python < 2.2 doesn't have 'property'.\n", NULL); - } + } /* if (!modern) */ /* always needed, a class can be forced to be no-modern, such as an exception */ { @@ -703,7 +748,7 @@ public: Printv(f_shadow, "def _swig_setattr_nondynamic(self,class_type,name,value,static=1):\n", tab4, "if (name == \"thisown\"): return self.this.own(value)\n", - tab4, "if (name == \"this\"):\n", tab4, tab4, "if type(value).__name__ == 'PySwigObject':\n", tab4, tab8, "self.__dict__[name] = value\n", + tab4, "if (name == \"this\"):\n", tab4, tab4, "if type(value).__name__ == 'SwigPyObject':\n", tab4, tab8, "self.__dict__[name] = value\n", #ifdef USE_THISOWN tab4, tab8, "if hasattr(value,\"thisown\"): self.__dict__[\"thisown\"] = value.thisown\n", tab4, tab8, "del value.thisown\n", #endif @@ -722,7 +767,7 @@ public: "def _swig_getattr(self,class_type,name):\n", tab4, "if (name == \"thisown\"): return self.this.own()\n", tab4, "method = class_type.__swig_getmethods__.get(name,None)\n", - tab4, "if method: return method(self)\n", tab4, "raise AttributeError,name\n\n", NIL); + tab4, "if method: return method(self)\n", tab4, "raise AttributeError(name)\n\n", NIL); Printv(f_shadow, "def _swig_repr(self):\n", @@ -730,11 +775,17 @@ public: tab4, "except: strthis = \"\"\n", tab4, "return \"<%s.%s; %s >\" % (self.__class__.__module__, self.__class__.__name__, strthis,)\n\n", NIL); if (!classic) { + /* Usage of types.ObjectType is deprecated. + * But don't sure wether this would broken old Python? + */ Printv(f_shadow, - "import types\n", +// "import types\n", "try:\n", - " _object = types.ObjectType\n", - " _newclass = 1\n", "except AttributeError:\n", " class _object : pass\n", " _newclass = 0\n", "del types\n", "\n\n", NIL); +// " _object = types.ObjectType\n", + " _object = object\n", + " _newclass = 1\n", "except AttributeError:\n", " class _object : pass\n", " _newclass = 0\n", +// "del types\n", + "\n\n", NIL); } } if (modern) { @@ -760,7 +811,11 @@ public: } - Printf(f_header, "#define SWIG_init init%s\n\n", module); + Printf(f_header, "#if PY_VERSION_HEX >= 0x03000000\n"); + Printf(f_header, "# define SWIG_init PyInit_%s\n\n", module); + Printf(f_header, "#else\n"); + Printf(f_header, "# define SWIG_init init%s\n\n", module); + Printf(f_header, "#endif\n"); Printf(f_header, "#define SWIG_name \"%s\"\n", module); Printf(f_wrappers, "#ifdef __cplusplus\n"); @@ -769,6 +824,9 @@ public: Append(const_code, "static swig_const_info swig_const_table[] = {\n"); Append(methods, "static PyMethodDef SwigMethods[] = {\n"); + /* the method exported for replacement of new.instancemethod in Python 3 */ + add_pyinstancemethod_new(); + /* emit code */ Language::top(n); @@ -787,6 +845,12 @@ public: Append(const_code, "{0, 0, 0, 0.0, 0, 0}};\n"); Printf(f_wrappers, "%s\n", const_code); initialize_threads(f_init); + + Printf(f_init, "#if PY_VERSION_HEX >= 0x03000000\n"); + Printf(f_init, " return m;\n"); + Printf(f_init, "#else\n"); + Printf(f_init, " return;\n"); + Printf(f_init, "#endif\n"); Printf(f_init, "}\n"); Printf(f_wrappers, "#ifdef __cplusplus\n"); @@ -794,10 +858,6 @@ public: Printf(f_wrappers, "#endif\n"); if (shadow) { - /* - Printf(f_shadow_imports,"\nimport %s\n", module); - Printv(f_shadow_py, f_shadow_imports, "\n",NIL); - */ Printv(f_shadow_py, f_shadow, "\n", NIL); Printv(f_shadow_py, f_shadow_stubs, "\n", NIL); @@ -806,19 +866,20 @@ public: } /* Close all of the files */ - Dump(f_header, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); if (directorsEnabled()) { Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - if (f_runtime_h != f_runtime) + if (f_runtime_h != f_begin) Close(f_runtime_h); - Dump(f_directors, f_runtime); + Dump(f_directors, f_begin); } - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_wrappers, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); @@ -826,11 +887,25 @@ public: Delete(f_directors); Delete(f_directors_h); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } + + /* ------------------------------------------------------------ + * Emit the wrapper for PyInstanceMethod_New to MethodDef array. + * This wrapper is used to implement -fastproxy, + * as a replacement of new.instancemethod in Python 3. + * ------------------------------------------------------------ */ + int add_pyinstancemethod_new() + { + String* name = NewString("SWIG_PyInstanceMethod_New"); + Printf(methods, "\t { (char *)\"%s\", (PyCFunction)%s, METH_O, NULL},\n", name, name); + Delete(name); + return 0; + } /* ------------------------------------------------------------ * importDirective() @@ -862,7 +937,11 @@ public: if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) { Printf(import, "_%s\n", modname); if (!Strstr(f_shadow_imports, import)) { - Printf(f_shadow, "import %s\n", modname); + if (pkg && (!package || Strcmp(pkg, package) != 0)) { + Printf(f_shadow, "import %s.%s\n", pkg, modname); + } else { + Printf(f_shadow, "import %s\n", modname); + } Printv(f_shadow_imports, import, NULL); } } @@ -874,31 +953,25 @@ public: return Language::importDirective(n); } - /* ------------------------------------------------------------ - * emitFuncCallHelper() - * Write the shadow code to call a function in the extension - * module. Takes into account the -apply flag and whether - * to use keyword args or not. + * funcCall() + * Emit shadow code to call a function in the extension + * module. Using proper argument and calling style for + * given node n. * ------------------------------------------------------------ */ + String *funcCall(String *name, String *parms) { + String *str = NewString(""); - String *funcCallHelper(String *name, int kw) { - String *str; - - str = NewString(""); - if (apply) { - Printv(str, "apply(", module, ".", name, ", args", (kw ? ", kwargs" : ""), ")", NIL); - } else { - Printv(str, module, ".", name, "(*args", (kw ? ", **kwargs" : ""), ")", NIL); - } + Printv(str, module, ".", name, "(", parms, ")", NIL); return str; - } + } + /* ------------------------------------------------------------ * pythoncode() - Output python code into the shadow file * ------------------------------------------------------------ */ - String *pythoncode(String *code, const String *indent) { + String *pythoncode(String *code, const_String_or_char_ptr indent) { String *out = NewString(""); String *temp; char *t; @@ -1060,29 +1133,84 @@ public: return doc; } + /* ----------------------------------------------------------------------------- + * makeParameterName() + * Note: the generated name should consist with that in kwnames[] + * + * Inputs: + * n - Node + * p - parameter node + * arg_num - parameter argument number + * Return: + * arg - a unique parameter name + * ----------------------------------------------------------------------------- */ + + String *makeParameterName(ParmList *plist, Parm *p, int arg_num) { + String *arg = 0; + String *pn = Swig_name_make(p, 0, Getattr(p, "name"), 0, 0); + // Use C parameter name unless it is a duplicate or an empty parameter name + int count = 0; + if ( SwigType_isvarargs(Getattr(p, "type")) ) { + return NewString("*args"); + } + while (plist) { + if ((Cmp(pn, Getattr(plist, "name")) == 0)) + count++; + plist = nextSibling(plist); + } + arg = (!pn || !Len(pn) || (count > 1)) ? NewStringf("arg%d", arg_num) : Copy(pn); + return arg; + } + + /* ------------------------------------------------------------ * make_autodocParmList() * Generate the documentation for the function parameters + * Parameters: + * func_annotation: Function annotation support * ------------------------------------------------------------ */ - String *make_autodocParmList(Node *n, bool showTypes) { + String *make_autodocParmList(Node *n, bool showTypes, bool calling=false, bool func_annotation=false) { + + String *doc = NewString(""); String *pdocs = Copy(Getattr(n, "feature:pdocs")); ParmList *plist = CopyParmList(Getattr(n, "parms")); Parm *p; Parm *pnext; - Node *lookup; + Node *lookup; + + int lines = 0; + int arg_num = 0; const int maxwidth = 50; + if(calling) + func_annotation = false; + if (pdocs) Append(pdocs, "\n"); - Swig_typemap_attach_parms("in", plist, 0); Swig_typemap_attach_parms("doc", plist, 0); - + + if (Strcmp(ParmList_protostr(plist), "void")==0) { + //No parameters actually + return doc; + } + for (p = plist; p; p = pnext) { + + String *tm = Getattr(p, "tmap:in"); + if (tm) { + pnext = Getattr(p, "tmap:in:next"); + if (checkAttribute(p, "tmap:in:numinputs", "0")) { + continue; + } + } else { + pnext = nextSibling(p); + } + String *name = 0; String *type = 0; String *value = 0; @@ -1099,12 +1227,14 @@ public: type = type ? type : Getattr(p, "type"); value = value ? value : Getattr(p, "value"); - String *tm = Getattr(p, "tmap:in"); - if (tm) { - pnext = Getattr(p, "tmap:in:next"); - } else { - pnext = nextSibling(p); - } + name = makeParameterName(plist, p, arg_num); + // Reset it for convinient in further use. (mainly for makeParameterName()) + // Since the plist is created by CopyParmList, + // we can hope that the set would have no side effect + Setattr(p, "name", name); + + arg_num++; + if (Len(doc)) { // add a comma to the previous one if any @@ -1116,39 +1246,40 @@ public: lines += 1; } } + + type = SwigType_base(type); + lookup = Swig_symbol_clookup(type, 0); + if (lookup) + type = Getattr(lookup, "sym:name"); + // Do the param type too? - if (showTypes) { - type = SwigType_base(type); - lookup = Swig_symbol_clookup(type, 0); - if (lookup) - type = Getattr(lookup, "sym:name"); - Printf(doc, "%s ", type); + if (showTypes) + Printf(doc, "%s ", type); + + + Append(doc, name); + if (pdoc) { + if (!pdocs) + pdocs = NewString("Parameters:\n"); + Printf(pdocs, " %s\n", pdoc); } - if (name) { - Append(doc, name); - if (pdoc) { - if (!pdocs) - pdocs = NewString("Parameters:\n"); - Printf(pdocs, " %s\n", pdoc); - } - } else { - Append(doc, "?"); - } + // Write the function annoation + if (func_annotation) + Printf(doc, " : '%s'", type); - if (value) { - if (Strcmp(value, "NULL") == 0) - value = NewString("None"); - else if (Strcmp(value, "true") == 0 || Strcmp(value, "TRUE") == 0) - value = NewString("True"); - else if (Strcmp(value, "false") == 0 || Strcmp(value, "FALSE") == 0) - value = NewString("False"); + // Write default value + if (value && !calling) { + String* pv = pyvalue(value, Getattr(p, "type")); + if (pv) + value = pv; else { lookup = Swig_symbol_clookup(value, 0); - if (lookup) + if (lookup) { value = Getattr(lookup, "sym:name"); + } } - Printf(doc, "=%s", value); + Printf(doc, " = %s", value); } } if (pdocs) @@ -1226,9 +1357,9 @@ public: String *str = Getattr(n, "feature:docstring"); if (str == NULL || Len(str) == 0) { if (CPlusPlus) { - Printf(doc, "Proxy of C++ %s class", class_name); + Printf(doc, "Proxy of C++ %s class", real_classname); } else { - Printf(doc, "Proxy of C %s struct", class_name); + Printf(doc, "Proxy of C %s struct", real_classname); } } } @@ -1286,6 +1417,132 @@ public: return doc; } + + /* ------------------------------------------------------------ + * pyvalue() + * Check if string v can be a Python value literal, + * (eg. number or string), or translate it to a Python literal. + * ------------------------------------------------------------ */ + String* pyvalue(String *v, SwigType *t) + { + if (v && Len(v)>0) { + char fc = (Char(v))[0]; + if (('0'<=fc && fc<='9') || '\''==fc || '"'==fc) { + /* number or string (or maybe NULL pointer)*/ + if (SwigType_ispointer(t) && Strcmp(v, "0")==0) + return NewString("None"); + else + return v; + } + if (Strcmp(v, "true")==0 || Strcmp(v, "FALSE")==0) + return NewString("True"); + if (Strcmp(v, "false")==0 || Strcmp(v, "FALSE")==0) + return NewString("False"); + if (Strcmp(v, "NULL")==0) + return NewString("None"); + } + return 0; + } + /* ------------------------------------------------------------ + * is_primitive_defaultargs() + * Check if all the default args have primitive type. + * (So we can generate proper parameter list with default + * values..) + * ------------------------------------------------------------ */ + bool is_primitive_defaultargs(Node *n) + { + ParmList *plist = CopyParmList(Getattr(n, "parms")); + Parm *p; + Parm *pnext; + + Swig_typemap_attach_parms("in", plist, 0); + for (p = plist; p; p = pnext) { + String *tm = Getattr(p, "tmap:in"); + if (tm) { + pnext = Getattr(p, "tmap:in:next"); + if (checkAttribute(p, "tmap:in:numinputs", "0")) { + continue; + } + } else { + pnext = nextSibling(p); + } + String *type = Getattr(p, "type"); + String *value = Getattr(p, "value"); + if (!pyvalue(value, type)) + return false; + } + return true; + } + + + /* ------------------------------------------------------------ + * is_real_overloaded() + * Check if the function is overloaded, but not just have some + * siblings generated due to the original function have + * default arguments. + * ------------------------------------------------------------ */ + bool is_real_overloaded(Node *n) + { + Node *h = Getattr(n, "sym:overloaded"); + Node *i; + if (!h) + return false; + + i = Getattr(h, "sym:nextSibling"); + while (i) { + Node *nn = Getattr(i, "defaultargs"); + if (nn != h) { + /* Check if overloaded function has defaultargs and + * pointed to the first overloaded. */ + return true; + } + i = Getattr(i, "sym:nextSibling"); + } + + return false; + } + + /* ------------------------------------------------------------ + * make_pyParmList() + * Generate parameter list for Python functions or methods, + * reuse make_autodocParmList() to do so. + * ------------------------------------------------------------ */ + String* make_pyParmList(Node *n, bool in_class, bool is_calling, int kw) + { + /* Get the original function for a defaultargs copy, + * see default_arguments() in parser.y. */ + Node *nn = Getattr(n, "defaultargs"); + if (nn) n = nn; + + /* For overloaded function, just use *args */ + if (is_real_overloaded(n) || + GetFlag(n, "feature:compactdefaultargs") || + !is_primitive_defaultargs(n)) + { + String *parms = NewString(""); + if(in_class) + Printf(parms, "self, "); + Printf(parms, "*args"); + if (kw) + Printf(parms, ", **kwargs"); + return parms; + } + + bool funcanno = py3 ? true : false; + String *params = NewString(""); + String *_params = make_autodocParmList(n, false, is_calling, funcanno); + + if (in_class) + { + Printf(params, "self"); + if(Len(_params) > 0) + Printf(params, ", "); + } + + Printv(params, _params, NULL); + + return params; + } /* ------------------------------------------------------------ * have_pythonprepend() @@ -1351,6 +1608,40 @@ public: return have_pythonappend(n) || have_pythonprepend(n) || have_docstring(n); } + + /* ------------------------------------------------------------ + * returnTypeAnnotation() + * Helper function for constructing the function annotation + * of the returning type, return a empty string for Python 2.x + * ------------------------------------------------------------ */ + String* returnTypeAnnotation(Node *n) + { + String *ret=0; + Parm *p = Getattr(n, "parms"); + String *tm; + /* Try to guess the returning type by argout typemap, + * however the result may not accurate. */ + while (p) { + if ((tm=Getattr(p, "tmap:argout:match_type"))) { + tm = SwigType_str(tm, 0); + if (ret) + Printv(ret, ", ", tm, NULL); + else + ret = tm; + p = Getattr(p, "tmap:argout:next"); + } else { + p = nextSibling(p); + } + } + /* If no argout typemap, then get the returning type from + * the function prototype. */ + if (!ret) { + ret = Getattr(n, "type"); + if (ret) ret = SwigType_str(ret, 0); + } + return (ret && py3) ? NewStringf(" -> \"%s\" ", ret) + : NewString(""); + } /* ------------------------------------------------------------ * emitFunctionShadowHelper() @@ -1360,24 +1651,26 @@ public: * ------------------------------------------------------------ */ void emitFunctionShadowHelper(Node *n, File *f_dest, String *name, int kw) { - if (Getattr(n, "feature:python:callback") || !have_addtofunc(n)) { - /* If there is no addtofunc directive then just assign from the extension module */ - Printv(f_dest, name, " = ", module, ".", name, "\n", NIL); + String *parms = make_pyParmList(n, false, false, kw); + String *callParms = make_pyParmList(n, false, true, kw); + /* Make a wrapper function to insert the code into */ + Printv(f_dest, "\ndef ", name, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); + if (have_docstring(n)) + Printv(f_dest, " ", docstring(n, AUTODOC_FUNC, tab4), "\n", NIL); + if (have_pythonprepend(n)) + Printv(f_dest, pythoncode(pythonprepend(n), " "), "\n", NIL); + if (have_pythonappend(n)) { + Printv(f_dest, " val = ", funcCall(name, callParms), "\n", NIL); + Printv(f_dest, pythoncode(pythonappend(n), " "), "\n", NIL); + Printv(f_dest, " return val\n", NIL); } else { - /* Otherwise make a wrapper function to insert the code into */ - Printv(f_dest, "\ndef ", name, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); - if (have_docstring(n)) - Printv(f_dest, ctab4, docstring(n, AUTODOC_FUNC, tab4), "\n", NIL); - if (have_pythonprepend(n)) - Printv(f_dest, ctab4, pythonprepend(n), "\n", NIL); - if (have_pythonappend(n)) { - Printv(f_dest, ctab4, "val = ", funcCallHelper(name, kw), "\n", NIL); - Printv(f_dest, ctab4, pythonappend(n), "\n", NIL); - Printv(f_dest, ctab4, "return val\n", NIL); - } else { - Printv(f_dest, ctab4, "return ", funcCallHelper(name, kw), "\n", NIL); - } + Printv(f_dest, " return ", funcCall(name, callParms), "\n", NIL); } + + if (Getattr(n, "feature:python:callback") || !have_addtofunc(n)) { + /* If there is no addtofunc directive then just assign from the extension module (for speed up) */ + Printv(f_dest, name, " = ", module, ".", name, "\n", NIL); + } } @@ -1778,7 +2071,7 @@ public: /* finish argument marshalling */ Append(kwargs, " NULL }"); if (allow_kwargs) { - Printv(f->locals, ctab4, "char * kwnames[] = ", kwargs, ";\n", NIL); + Printv(f->locals, " char * kwnames[] = ", kwargs, ";\n", NIL); } if (use_parse || allow_kwargs || !modernargs) { @@ -2050,7 +2343,7 @@ public: } if (allow_thread) thread_end_block(n, f->code); - Printv(f->code, ctab4, "return NULL;\n", NIL); + Printv(f->code, " return NULL;\n", NIL); if (funpack) { @@ -2182,9 +2475,9 @@ public: } else { Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0)); } - Printv(setf->code, ctab4, "return 0;\n", NULL); + Printv(setf->code, " return 0;\n", NULL); Append(setf->code, "fail:\n"); - Printv(setf->code, ctab4, "return 1;\n", NULL); + Printv(setf->code, " return 1;\n", NULL); } else { /* Is a readonly variable. Issue an error */ if (CPlusPlus) { @@ -2192,7 +2485,7 @@ public: } else { Printf(setf->def, "SWIGINTERN int %s(PyObject *_val SWIGUNUSED) {", varsetname); } - Printv(setf->code, ctab4, "SWIG_Error(SWIG_AttributeError,\"Variable ", iname, " is read-only.\");\n", ctab4, "return 1;\n", NIL); + Printv(setf->code, " SWIG_Error(SWIG_AttributeError,\"Variable ", iname, " is read-only.\");\n", " return 1;\n", NIL); } Append(setf->code, "}\n"); @@ -2460,7 +2753,7 @@ public: Printf(f_directors_h, " PyObject *swig_get_method(size_t method_index, const char *method_name) const {\n"); Printf(f_directors_h, " PyObject *method = vtable[method_index];\n"); Printf(f_directors_h, " if (!method) {\n"); - Printf(f_directors_h, " swig::PyObject_var name = PyString_FromString(method_name);\n"); + Printf(f_directors_h, " swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);\n"); Printf(f_directors_h, " method = PyObject_GetAttr(swig_get_self(), name);\n"); Printf(f_directors_h, " if (method == NULL) {\n"); Printf(f_directors_h, " std::string msg = \"Method in class %s doesn't exist, undefined \";\n", classname); @@ -2472,7 +2765,7 @@ public: Printf(f_directors_h, " return method;\n"); Printf(f_directors_h, " }\n"); Printf(f_directors_h, "private:\n"); - Printf(f_directors_h, " mutable swig::PyObject_var vtable[%d];\n", director_method_index); + Printf(f_directors_h, " mutable swig::SwigVar_PyObject vtable[%d];\n", director_method_index); Printf(f_directors_h, "#endif\n\n"); } @@ -2584,7 +2877,12 @@ public: b = First(baselist); while (b.item) { String *bname = Getattr(b.item, "python:proxy"); - if (!bname || GetFlag(b.item, "feature:ignore")) { + bool ignore = GetFlag(b.item, "feature:ignore") ? true : false; + if (!bname || ignore) { + if (!bname && !ignore) { + Swig_warning(WARN_TYPE_UNDEFINED_CLASS, input_file, line_number, + "Base class '%s' ignored - unknown module name for base. Either import the appropriate module interface file or specify the name of the module in the %%import directive.\n", SwigType_namestr(Getattr(b.item, "name"))); + } b = Next(b); continue; } @@ -2595,6 +2893,16 @@ public: } } } + + /* dealing with abstract base class */ + String *abcs = Getattr(n, "feature:python:abc"); + if (py3 && abcs) { + if (Len(base_class)) { + Putc(',', base_class); + } + Printv(base_class, abcs, NIL); + } + Printv(f_shadow, "class ", class_name, NIL); if (Len(base_class)) { @@ -2603,6 +2911,9 @@ public: if (!classic) { Printf(f_shadow, modern ? "(object)" : "(_object)"); } + if (GetFlag(n, "feature:exceptionclass") ) { + Printf(f_shadow, "(Exception)"); + } } Printf(f_shadow, ":\n"); if (have_docstring(n)) { @@ -2671,20 +2982,20 @@ public: SwigType_add_pointer(realct); SwigType_remember(realct); Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL); - Printv(f_wrappers, ctab4, "PyObject *obj;\n", NIL); + Printv(f_wrappers, " PyObject *obj;\n", NIL); if (modernargs) { if (fastunpack) { - Printv(f_wrappers, ctab4, "if (!SWIG_Python_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); + Printv(f_wrappers, " if (!SWIG_Python_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); } else { - Printv(f_wrappers, ctab4, "if (!PyArg_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); + Printv(f_wrappers, " if (!PyArg_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); } } else { - Printv(f_wrappers, ctab4, "if (!PyArg_ParseTuple(args,(char*)\"O:swigregister\", &obj)) return NULL;\n", NIL); + Printv(f_wrappers, " if (!PyArg_ParseTuple(args,(char*)\"O:swigregister\", &obj)) return NULL;\n", NIL); } Printv(f_wrappers, - ctab4, "SWIG_TypeNewClientData(SWIGTYPE", SwigType_manglestr(ct), ", SWIG_NewClientData(obj));\n", - ctab4, "return SWIG_Py_Void();\n", "}\n\n", NIL); + " SWIG_TypeNewClientData(SWIGTYPE", SwigType_manglestr(ct), ", SWIG_NewClientData(obj));\n", + " return SWIG_Py_Void();\n", "}\n\n", NIL); String *cname = NewStringf("%s_swigregister", class_name); add_method(cname, cname, 0); Delete(smart); @@ -2693,11 +3004,11 @@ public: Delete(realct); } if (!have_constructor) { - Printv(f_shadow_file, tab4, "def __init__(self, *args, **kwargs): raise AttributeError, \"No constructor defined\"\n", NIL); + Printv(f_shadow_file, tab4, "def __init__(self, *args, **kwargs): raise AttributeError(\"No constructor defined\")\n", NIL); } else if (fastinit) { Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL); - Printv(f_wrappers, ctab4, "return SWIG_Python_InitShadowInstance(args);\n", "}\n\n", NIL); + Printv(f_wrappers, " return SWIG_Python_InitShadowInstance(args);\n", "}\n\n", NIL); String *cname = NewStringf("%s_swiginit", class_name); add_method(cname, cname, 0); Delete(cname); @@ -2806,27 +3117,29 @@ public: Delete(pycode); fproxy = 0; } else { + String *parms = make_pyParmList(n, true, false, allow_kwargs); + String *callParms = make_pyParmList(n, true, true, allow_kwargs); if (!have_addtofunc(n)) { if (!fastproxy || olddefs) { - Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL); - Printv(f_shadow, " return ", funcCallHelper(Swig_name_member(class_name, symname), allow_kwargs), "\n", NIL); + Printv(f_shadow, tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":", NIL); + Printv(f_shadow, " return ", funcCall(Swig_name_member(class_name, symname), callParms), "\n", NIL); } } else { - Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL); + Printv(f_shadow, tab4, "def ", symname, "(",parms , ")", returnTypeAnnotation(n), ":", NIL); Printv(f_shadow, "\n", NIL); if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL); if (have_pythonprepend(n)) { fproxy = 0; - Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); + Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); } if (have_pythonappend(n)) { fproxy = 0; - Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), allow_kwargs), "\n", NIL); - Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); + Printv(f_shadow, tab8, "val = ", funcCall(Swig_name_member(class_name, symname), callParms), "\n", NIL); + Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL); Printv(f_shadow, tab8, "return val\n\n", NIL); } else { - Printv(f_shadow, tab8, "return ", funcCallHelper(Swig_name_member(class_name, symname), allow_kwargs), "\n\n", NIL); + Printv(f_shadow, tab8, "return ", funcCall(Swig_name_member(class_name, symname), callParms), "\n\n", NIL); } } } @@ -2859,17 +3172,19 @@ public: if (shadow) { if (!classic && !Getattr(n, "feature:python:callback") && have_addtofunc(n)) { int kw = (check_kwargs(n) && !Getattr(n, "sym:overloaded")) ? 1 : 0; - Printv(f_shadow, tab4, "def ", symname, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); + String *parms = make_pyParmList(n, false, false, kw); + String *callParms = make_pyParmList(n, false, true, kw); + Printv(f_shadow, tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); + Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); if (have_pythonappend(n)) { - Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n", NIL); - Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); + Printv(f_shadow, tab8, "val = ", funcCall(Swig_name_member(class_name, symname), callParms), "\n", NIL); + Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL); Printv(f_shadow, tab8, "return val\n\n", NIL); } else { - Printv(f_shadow, tab8, "return ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n\n", NIL); + Printv(f_shadow, tab8, "return ", funcCall(Swig_name_member(class_name, symname), callParms), "\n\n", NIL); } Printv(f_shadow, tab4, modern ? "" : "if _newclass:", symname, " = staticmethod(", symname, ")\n", NIL); @@ -2941,8 +3256,8 @@ public: handled_as_init = (Strcmp(nname, sname) == 0) || (Strcmp(nname, cname) == 0); Delete(cname); } - - if (!have_constructor && handled_as_init) { + + if (!have_constructor && handled_as_init) { if (Getattr(n, "feature:shadow")) { String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4); String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(symname)); @@ -2956,27 +3271,34 @@ public: String *classname = Swig_class_name(parent); String *rclassname = Swig_class_name(getCurrentClass()); assert(rclassname); - if (use_director) { + + String *parms = make_pyParmList(n, true, false, allow_kwargs); + /* Pass 'self' only if using director */ + String *callParms = make_pyParmList(n, false, true, allow_kwargs); + + if (use_director) { + Insert(callParms, 0, "_self, "); Printv(pass_self, tab8, NIL); Printf(pass_self, "if self.__class__ == %s:\n", classname); - Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL); + //Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL); + Printv(pass_self, tab8, tab4, "_self = None\n", tab8, "else:\n", tab8, tab4, "_self = self\n", NIL); } - Printv(f_shadow, tab4, "def __init__(self, *args", (allow_kwargs ? ", **kwargs" : ""), "): \n", NIL); + Printv(f_shadow, tab4, "def __init__(", parms, ")", returnTypeAnnotation(n), ": \n", NIL); if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); + Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); Printv(f_shadow, pass_self, NIL); if (fastinit) { - Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL); + Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCall(Swig_name_construct(symname), callParms), ")\n", NIL); } else { Printv(f_shadow, - tab8, "this = ", funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", + tab8, "this = ", funcCall(Swig_name_construct(symname), callParms), "\n", tab8, "try: self.this.append(this)\n", tab8, "except: self.this = this\n", NIL); } if (have_pythonappend(n)) - Printv(f_shadow, tab8, pythonappend(n), "\n\n", NIL); + Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n\n", NIL); Delete(pass_self); } have_constructor = 1; @@ -2992,18 +3314,20 @@ public: Printv(f_shadow_stubs, pycode, "\n", NIL); Delete(pycode); } else { + String *parms = make_pyParmList(n, true, false, allow_kwargs); + String *callParms = make_pyParmList(n, true, true, allow_kwargs); - Printv(f_shadow_stubs, "\ndef ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):\n", NIL); + Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); if (have_docstring(n)) Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow_stubs, tab4, pythonprepend(n), "\n", NIL); - Printv(f_shadow_stubs, tab4, "val = ", funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL); + Printv(f_shadow_stubs, pythoncode(pythonprepend(n), tab4), "\n", NIL); + Printv(f_shadow_stubs, tab4, "val = ", funcCall(Swig_name_construct(symname), callParms), "\n", NIL); #ifdef USE_THISOWN Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL); #endif if (have_pythonappend(n)) - Printv(f_shadow_stubs, tab4, pythonappend(n), "\n", NIL); + Printv(f_shadow_stubs, pythoncode(pythonappend(n), tab4), "\n", NIL); Printv(f_shadow_stubs, tab4, "return val\n", NIL); } } @@ -3045,7 +3369,7 @@ public: if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR, tab8), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); + Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); #ifdef USE_THISOWN Printv(f_shadow, tab8, "try:\n", NIL); Printv(f_shadow, tab8, tab4, "if self.thisown: ", module, ".", Swig_name_destroy(symname), "(self)\n", NIL); @@ -3053,7 +3377,7 @@ public: #else #endif if (have_pythonappend(n)) - Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); + Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL); Printv(f_shadow, tab8, "pass\n", NIL); Printv(f_shadow, "\n", NIL); } @@ -3441,8 +3765,8 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Replaceall(tm, "$input", input); Delete(input); Replaceall(tm, "$owner", "0"); - /* Wrapper_add_localv(w, source, "swig::PyObject_var", source, "= 0", NIL); */ - Printv(wrap_args, "swig::PyObject_var ", source, ";\n", NIL); + /* Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); */ + Printv(wrap_args, "swig::SwigVar_PyObject ", source, ";\n", NIL); Printv(wrap_args, tm, "\n", NIL); Printv(arglist, "(PyObject *)", source, NIL); @@ -3498,7 +3822,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { if (target) { String *director = NewStringf("director_%s", mangle); Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL); - Wrapper_add_localv(w, source, "swig::PyObject_var", source, "= 0", NIL); + Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); Printf(wrap_args, "%s = SWIG_DIRECTOR_CAST(%s);\n", director, nonconst); Printf(wrap_args, "if (!%s) {\n", director); Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle); @@ -3509,7 +3833,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Delete(director); Printv(arglist, source, NIL); } else { - Wrapper_add_localv(w, source, "swig::PyObject_var", source, "= 0", NIL); + Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle); //Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE_p_%s, 0);\n", // source, nonconst, base); @@ -3560,33 +3884,33 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Append(w->code, "PyObject* method = swig_get_method(swig_method_index, swig_method_name);\n"); if (Len(parse_args) > 0) { if (use_parse || !modernargs) { - Printf(w->code, "swig::PyObject_var result = PyObject_CallFunction(method, (char *)\"(%s)\" %s);\n", parse_args, arglist); + Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)\"(%s)\" %s);\n", parse_args, arglist); } else { - Printf(w->code, "swig::PyObject_var result = PyObject_CallFunctionObjArgs(method %s, NULL);\n", arglist); + Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method %s, NULL);\n", arglist); } } else { if (modernargs) { - Append(w->code, "swig::PyObject_var args = PyTuple_New(0);\n"); - Append(w->code, "swig::PyObject_var result = PyObject_Call(method, (PyObject*) args, NULL);\n"); + Append(w->code, "swig::SwigVar_PyObject args = PyTuple_New(0);\n"); + Append(w->code, "swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject*) args, NULL);\n"); } else { - Printf(w->code, "swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);\n"); + Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);\n"); } } Append(w->code, "#else\n"); if (Len(parse_args) > 0) { if (use_parse || !modernargs) { - Printf(w->code, "swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)\"%s\", (char *)\"(%s)\" %s);\n", + Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)\"%s\", (char *)\"(%s)\" %s);\n", pyname, parse_args, arglist); - } else { - Printf(w->code, "swig::PyObject_var swig_method_name = PyString_FromString((char *)\"%s\");\n", pyname); - Printf(w->code, "swig::PyObject_var result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name %s, NULL);\n", arglist); + } else { + Printf(w->code, "swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar((char *)\"%s\");\n", pyname); + Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name %s, NULL);\n", arglist); } } else { if (!modernargs) { - Printf(w->code, "swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) \"%s\", NULL);\n", pyname); + Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) \"%s\", NULL);\n", pyname); } else { - Printf(w->code, "swig::PyObject_var swig_method_name = PyString_FromString((char *)\"%s\");\n", pyname); - Append(w->code, "swig::PyObject_var result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);\n"); + Printf(w->code, "swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar((char *)\"%s\");\n", pyname); + Append(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);\n"); } } Append(w->code, "#endif\n"); diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 49d3ecc89..8e9aa557d 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -424,6 +424,7 @@ protected: String *sfile; String *f_init; String *s_classes; + String *f_begin; String *f_runtime; String *f_wrapper; String *s_header; @@ -487,6 +488,7 @@ R::R() : sfile(0), f_init(0), s_classes(0), + f_begin(0), f_runtime(0), f_wrapper(0), s_header(0), @@ -767,6 +769,7 @@ void R::init() { sfile = NewString(""); f_init = NewString(""); s_header = NewString(""); + f_begin = NewString(""); f_runtime = NewString(""); f_wrapper = NewString(""); s_classes = NewString(""); @@ -811,16 +814,22 @@ int R::top(Node *n) { Swig_register_filebyname("sinit", s_init); Swig_register_filebyname("sinitroutine", s_init_routine); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("header", s_header); Swig_register_filebyname("wrapper", f_wrapper); Swig_register_filebyname("s", sfile); - Swig_register_filebyname("sclasses", s_classes); + Swig_banner(f_begin); - Printf(s_init, "# This is an automatically generated file by the R module for SWIG.\n\n"); + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGR\n"); + Printf(f_runtime, "\n"); + + + Swig_banner_target_lang(s_init, "#"); outputCommandLineArguments(s_init); Printf(f_wrapper, "#ifdef __cplusplus\n"); @@ -858,7 +867,9 @@ int R::top(Node *n) { Delete(f_init); Delete(s_header); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -878,7 +889,7 @@ int R::DumpCode(Node *n) { Printf(stderr, "Writing S code to %s\n", output_filename); #endif - File *scode = NewFile(output_filename, "w"); + File *scode = NewFile(output_filename, "w", SWIG_output_files()); if (!scode) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); @@ -893,25 +904,16 @@ int R::DumpCode(Node *n) { Close(scode); // Delete(scode); String *outfile = Getattr(n,"outfile"); - File *runtime = NewFile(outfile,"w"); + File *runtime = NewFile(outfile,"w", SWIG_output_files()); if (!runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - Swig_banner(runtime); - - - Printf(runtime, "/* Runtime */\n"); + Printf(runtime, "%s", f_begin); Printf(runtime, "%s\n", f_runtime); - - Printf(runtime, "/* Header */\n"); Printf(runtime, "%s\n", s_header); - - Printf(runtime, "/* Wrapper */\n"); Printf(runtime, "%s\n", f_wrapper); - - Printf(runtime, "/* Init code */\n"); Printf(runtime, "%s\n", f_init); Close(runtime); @@ -920,7 +922,7 @@ int R::DumpCode(Node *n) { if(outputNamespaceInfo) { output_filename = NewString(""); Printf(output_filename, "%sNAMESPACE", SWIG_output_directory()); - File *ns = NewFile(output_filename, "w"); + File *ns = NewFile(output_filename, "w", SWIG_output_files()); if (!ns) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); @@ -2574,9 +2576,9 @@ String * R::runtimeCode() { void R::main(int argc, char *argv[]) { bool cppcast = true; init(); + Preprocessor_define("SWIGR 1", 0); SWIG_library_directory("r"); SWIG_config_file("r.swg"); - Preprocessor_define("SWIGR 1", 0); debugMode = false; copyStruct = true; memoryProfile = false; @@ -2659,7 +2661,7 @@ int R::outputCommandLineArguments(File *out) if(Argc < 1 || !Argv || !Argv[0]) return(-1); - Printf(out, "## Generated via the command line invocation:\n##\t"); + Printf(out, "\n## Generated via the command line invocation:\n##\t"); for(int i = 0; i < Argc ; i++) { Printf(out, " %s", Argv[i]); } diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index ad448d34e..1c13747e5 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -30,7 +30,7 @@ public: /** * The C variable name used in the SWIG-generated wrapper code to refer to - * this class; usually it is of the form "cClassName.klass", where cClassName + * this class; usually it is of the form "SwigClassXXX.klass", where SwigClassXXX * is a swig_class struct instance and klass is a member of that struct. */ String *vname; @@ -39,7 +39,7 @@ public: * The C variable name used in the SWIG-generated wrapper code to refer to * the module that implements this class's methods (when we're trying to * support C++ multiple inheritance). Usually it is of the form - * "cClassName.mImpl", where cClassName is a swig_class struct instance + * "SwigClassClassName.mImpl", where SwigClassXXX is a swig_class struct instance * and mImpl is a member of that struct. */ String *mImpl; @@ -78,7 +78,7 @@ public: Delete(temp); } - void set_name(const String_or_char *cn, const String_or_char *rn, const String_or_char *valn) { + void set_name(const_String_or_char_ptr cn, const_String_or_char_ptr rn, const_String_or_char_ptr valn) { /* Original C/C++ class (or struct) name */ Clear(cname); Append(cname, cn); @@ -93,18 +93,18 @@ public: /* Variable name for the VALUE that refers to the Ruby Class object */ Clear(vname); - Printf(vname, "c%s.klass", name); + Printf(vname, "SwigClass%s.klass", name); /* Variable name for the VALUE that refers to the Ruby Class object */ Clear(mImpl); - Printf(mImpl, "c%s.mImpl", name); + Printf(mImpl, "SwigClass%s.mImpl", name); /* Prefix */ Clear(prefix); Printv(prefix, (rn ? rn : cn), "_", NIL); } - char *strip(const String_or_char *s) { + char *strip(const_String_or_char_ptr s) { Clear(temp); Append(temp, s); if (Strncmp(s, prefix, Len(prefix)) == 0) { @@ -158,6 +158,7 @@ private: File *f_directors; File *f_directors_h; File *f_directors_helpers; + File *f_begin; File *f_runtime; File *f_runtime_h; File *f_header; @@ -762,6 +763,7 @@ public: classes = 0; klass = 0; special_methods = 0; + f_begin = 0; f_runtime = 0; f_header = 0; f_wrappers = 0; @@ -992,24 +994,13 @@ public: SWIG_exit(EXIT_FAILURE); } - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - if (directorsEnabled()) { - if (!outfile_h) { - Printf(stderr, "Unable to determine outfile_h\n"); - SWIG_exit(EXIT_FAILURE); - } - f_runtime_h = NewFile(outfile_h, "w"); - if (!f_runtime_h) { - FileErrorDisplay(outfile_h); - SWIG_exit(EXIT_FAILURE); - } - } - + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -1018,9 +1009,22 @@ public: f_directors_helpers = NewString(""); f_initbeforefunc = NewString(""); + if (directorsEnabled()) { + if (!outfile_h) { + Printf(stderr, "Unable to determine outfile_h\n"); + SWIG_exit(EXIT_FAILURE); + } + f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); + if (!f_runtime_h) { + FileErrorDisplay(outfile_h); + SWIG_exit(EXIT_FAILURE); + } + } + /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("director", f_directors); @@ -1035,14 +1039,17 @@ public: registerMagicMethods(); - Swig_banner(f_runtime); + Swig_banner(f_begin); + Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGRUBY\n"); if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); } + Printf(f_runtime, "\n"); + /* typedef void *VALUE */ SwigType *value = NewSwigType(T_VOID); SwigType_add_pointer(value); @@ -1058,6 +1065,7 @@ public: Replaceall(module_macro, "::", "__"); Swig_banner(f_directors_h); + Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_macro); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_macro); Printf(f_directors_h, "namespace Swig {\n"); @@ -1110,27 +1118,29 @@ public: SwigType_emit_type_table(f_runtime, f_wrappers); /* Close all of the files */ - Dump(f_header, f_runtime); + Dump(f_runtime, f_begin); + Dump(f_header, f_begin); if (directorsEnabled()) { - Dump(f_directors_helpers, f_runtime); - Dump(f_directors, f_runtime); + Dump(f_directors_helpers, f_begin); + Dump(f_directors, f_begin); Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); Close(f_runtime_h); } - Dump(f_wrappers, f_runtime); - Dump(f_initbeforefunc, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_wrappers, f_begin); + Dump(f_initbeforefunc, f_begin); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); Delete(f_initbeforefunc); - Close(f_runtime); + Close(f_begin); Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } @@ -1226,7 +1236,7 @@ public: /** * Process the comma-separated list of aliases (if any). */ - void defineAliases(Node *n, const String_or_char *iname) { + void defineAliases(Node *n, const_String_or_char_ptr iname) { String *aliasv = Getattr(n, "feature:alias"); if (aliasv) { List *aliases = Split(aliasv, ',', INT_MAX); @@ -1260,7 +1270,7 @@ public: * as another instance of the same class. * --------------------------------------------------------------------- */ - void create_command(Node *n, const String_or_char *iname) { + void create_command(Node *n, const_String_or_char_ptr iname) { String *alloc_func = Swig_name_wrapper(iname); String *wname = Swig_name_wrapper(iname); @@ -2392,9 +2402,9 @@ public: void handleMarkFuncDirective(Node *n) { String *markfunc = Getattr(n, "feature:markfunc"); if (markfunc) { - Printf(klass->init, "c%s.mark = (void (*)(void *)) %s;\n", klass->name, markfunc); + Printf(klass->init, "SwigClass%s.mark = (void (*)(void *)) %s;\n", klass->name, markfunc); } else { - Printf(klass->init, "c%s.mark = 0;\n", klass->name); + Printf(klass->init, "SwigClass%s.mark = 0;\n", klass->name); } } @@ -2404,10 +2414,10 @@ public: void handleFreeFuncDirective(Node *n) { String *freefunc = Getattr(n, "feature:freefunc"); if (freefunc) { - Printf(klass->init, "c%s.destroy = (void (*)(void *)) %s;\n", klass->name, freefunc); + Printf(klass->init, "SwigClass%s.destroy = (void (*)(void *)) %s;\n", klass->name, freefunc); } else { if (klass->destructor_defined) { - Printf(klass->init, "c%s.destroy = (void (*)(void *)) free_%s;\n", klass->name, klass->mname); + Printf(klass->init, "SwigClass%s.destroy = (void (*)(void *)) free_%s;\n", klass->name, klass->mname); } } } @@ -2418,9 +2428,9 @@ public: void handleTrackDirective(Node *n) { int trackObjects = GetFlag(n, "feature:trackobjects"); if (trackObjects) { - Printf(klass->init, "c%s.trackObjects = 1;\n", klass->name); + Printf(klass->init, "SwigClass%s.trackObjects = 1;\n", klass->name); } else { - Printf(klass->init, "c%s.trackObjects = 0;\n", klass->name); + Printf(klass->init, "SwigClass%s.trackObjects = 0;\n", klass->name); } } @@ -2445,7 +2455,7 @@ public: Clear(klass->type); Printv(klass->type, Getattr(n, "classtype"), NIL); - Printv(f_wrappers, "swig_class c", valid_name, ";\n\n", NIL); + Printv(f_wrappers, "swig_class SwigClass", valid_name, ";\n\n", NIL); Printv(klass->init, "\n", tab4, NIL); if (!useGlobalModule) { @@ -2463,7 +2473,7 @@ public: SwigType_add_pointer(tt); SwigType_remember(tt); String *tm = SwigType_manglestr(tt); - Printf(klass->init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) &c%s);\n", tm, valid_name); + Printf(klass->init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) &SwigClass%s);\n", tm, valid_name); Delete(tm); Delete(tt); Delete(valid_name); @@ -2564,7 +2574,7 @@ public: /* First wrap the allocate method */ current = CONSTRUCTOR_ALLOCATE; - Swig_name_register((String_or_char *) "construct", (String_or_char *) "%c_allocate"); + Swig_name_register((const_String_or_char_ptr ) "construct", (const_String_or_char_ptr ) "%c_allocate"); Language::constructorHandler(n); @@ -2599,7 +2609,7 @@ public: Delete(docs); current = CONSTRUCTOR_INITIALIZE; - Swig_name_register((String_or_char *) "construct", (String_or_char *) "new_%c"); + Swig_name_register((const_String_or_char_ptr ) "construct", (const_String_or_char_ptr ) "new_%c"); Language::constructorHandler(n); /* Restore original parameter list */ @@ -2607,7 +2617,7 @@ public: Swig_restore(n); /* Done */ - Swig_name_unregister((String_or_char *) "construct"); + Swig_name_unregister((const_String_or_char_ptr ) "construct"); current = NO_CPP; klass->constructor_defined = 1; return SWIG_OK; @@ -2621,7 +2631,7 @@ public: /* First wrap the allocate method */ current = CONSTRUCTOR_ALLOCATE; - Swig_name_register((String_or_char *) "construct", (String_or_char *) "%c_allocate"); + Swig_name_register((const_String_or_char_ptr ) "construct", (const_String_or_char_ptr ) "%c_allocate"); return Language::copyconstructorHandler(n); } diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index b89b3097f..90791ec70 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -29,6 +29,9 @@ public: } virtual void main(int argc, char *argv[]) { + // Add a symbol to the parser for conditional compilation + Preprocessor_define("SWIGSEXP 1", 0); + SWIG_typemap_lang("sexp"); for (int iX = 0; iX < argc; iX++) { if (strcmp(argv[iX], "-typemaplang") == 0) { @@ -42,9 +45,6 @@ public: fputs(usage, stdout); } } - - // Add a symbol to the parser for conditional compilation - Preprocessor_define("SWIGSEXP 1", 0); } DOHHash *print_circle_hash; @@ -59,7 +59,7 @@ public: String *outfile = Getattr(n, "outfile"); Replaceall(outfile, "_wrap.cxx", ".lisp"); Replaceall(outfile, "_wrap.c", ".lisp"); - out = NewFile(outfile, "w"); + out = NewFile(outfile, "w", SWIG_output_files()); if (!out) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -68,10 +68,14 @@ public: String *f_sink = NewString(""); Swig_register_filebyname("header", f_sink); Swig_register_filebyname("wrapper", f_sink); + Swig_register_filebyname("begin", f_sink); Swig_register_filebyname("runtime", f_sink); Swig_register_filebyname("init", f_sink); + Swig_banner_target_lang(out, ";;;"); + Language::top(n); + Printf(out, "\n"); Printf(out, ";;; Lisp parse tree produced by SWIG\n"); print_circle_hash = DohNewHash(); print_circle_count = 0; diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx index b727b9c67..b121dc9b7 100644 --- a/Source/Modules/swigmain.cxx +++ b/Source/Modules/swigmain.cxx @@ -32,8 +32,8 @@ extern "C" { Language *swig_modula3(void); Language *swig_mzscheme(void); Language *swig_java(void); + Language *swig_php(void); Language *swig_php4(void); - Language *swig_php5(void); Language *swig_ocaml(void); Language *swig_octave(void); Language *swig_pike(void); @@ -76,9 +76,9 @@ static swig_module modules[] = { {"-octave", swig_octave, "Octave"}, {"-perl", swig_perl5, "Perl"}, {"-perl5", swig_perl5, 0}, - {"-php", swig_php4, 0}, - {"-php4", swig_php4, "PHP4"}, - {"-php5", swig_php5, "PHP5"}, + {"-php", swig_php, "PHP"}, + {"-php4", swig_php4, 0}, + {"-php5", swig_php, 0}, {"-pike", swig_pike, "Pike"}, {"-python", swig_python, "Python"}, {"-r", swig_r, "R (aka GNU S)"}, diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h index 5835c6362..8dec8d0af 100644 --- a/Source/Modules/swigmod.h +++ b/Source/Modules/swigmod.h @@ -26,7 +26,7 @@ typedef int bool; #define PLAIN_VIRTUAL 1 #define PURE_VIRTUAL 2 -extern char *input_file; +extern String *input_file; extern int line_number; extern int start_line; extern int CPlusPlus; // C++ mode @@ -114,8 +114,8 @@ protected: class Language:public Dispatcher { public: - Language (); - virtual ~ Language (); + Language(); + virtual ~Language(); virtual int emit_one(Node *n); /* Parse command line options */ @@ -313,10 +313,13 @@ int SWIG_main(int, char **, Language *); void emit_parameter_variables(ParmList *l, Wrapper *f); void emit_return_variable(Node *n, SwigType *rt, Wrapper *f); void SWIG_exit(int); /* use EXIT_{SUCCESS,FAILURE} */ -void SWIG_config_file(const String_or_char *); +void SWIG_config_file(const_String_or_char_ptr ); const String *SWIG_output_directory(); void SWIG_config_cppext(const char *ext); +/* get the list of generated files */ +List *SWIG_output_files(); + void SWIG_library_directory(const char *); int emit_num_arguments(ParmList *); int emit_num_required(ParmList *); @@ -326,17 +329,17 @@ void emit_mark_varargs(ParmList *l); String *emit_action(Node *n); int emit_action_code(Node *n, String *wrappercode, String *action); void Swig_overload_check(Node *n); -String *Swig_overload_dispatch(Node *n, const String_or_char *fmt, int *); -String *Swig_overload_dispatch_cast(Node *n, const String_or_char *fmt, int *); -String *Swig_overload_dispatch_fast(Node *n, const String_or_char *fmt, int *); +String *Swig_overload_dispatch(Node *n, const_String_or_char_ptr fmt, int *); +String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int *); +String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int *); SwigType *cplus_value_type(SwigType *t); /* directors.cxx start */ String *Swig_csuperclass_call(String *base, String *method, ParmList *l); String *Swig_class_declaration(Node *n, String *name); String *Swig_class_name(Node *n); -String *Swig_method_call(String_or_char *name, ParmList *parms); -String *Swig_method_decl(SwigType *rtype, SwigType *decl, const String_or_char *id, List *args, int strip, int values); +String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms); +String *Swig_method_decl(SwigType *rtype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values); String *Swig_director_declaration(Node *n); void Swig_director_emit_dynamic_cast(Node *n, Wrapper *f); /* directors.cxx end */ diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 09bd266c3..015ac5e45 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -46,6 +46,7 @@ static int nosafe = 0; static File *f_header = 0; static File *f_wrappers = 0; static File *f_init = 0; +static File *f_begin = 0; static File *f_runtime = 0; @@ -121,6 +122,7 @@ public: } Preprocessor_define("SWIGTCL 1", 0); + // SWIGTCL8 is deprecated, and no longer documented. Preprocessor_define("SWIGTCL8 1", 0); SWIG_typemap_lang("tcl8"); SWIG_config_file("tcl8.swg"); @@ -136,11 +138,12 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_runtime = NewFile(outfile, "w"); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -148,6 +151,7 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -158,7 +162,11 @@ public: methods_tab = NewString(""); const_tab = NewString(""); - Swig_banner(f_runtime); + Swig_banner(f_begin); + + Printf(f_runtime, "\n"); + Printf(f_runtime, "#define SWIGTCL\n"); + Printf(f_runtime, "\n"); /* Set the module name, namespace, and prefix */ @@ -177,7 +185,7 @@ public: Insert(module, 0, "_"); - if ((f_shadow = NewFile(filen, "w")) == 0) { + if ((f_shadow = NewFile(filen, "w", SWIG_output_files())) == 0) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); } @@ -186,10 +194,7 @@ public: Swig_register_filebyname("shadow", f_shadow); Swig_register_filebyname("itcl", f_shadow); - Printf(f_shadow, "# This file was automatically generated by SWIG (http://www.swig.org).\n"); - Printf(f_shadow, "# Version %s\n", Swig_package_version()); - Printf(f_shadow, "#\n"); - Printf(f_shadow, "# Don't modify this file, modify the SWIG interface instead.\n"); + Swig_banner_target_lang(f_shadow, "#"); Printv(f_shadow, "\npackage require Itcl\n\n", NIL); Delete(filen); @@ -244,12 +249,15 @@ public: } /* Close all of the files */ - Printv(f_runtime, f_header, f_wrappers, NIL); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_runtime, f_begin); + Printv(f_begin, f_header, f_wrappers, NIL); + Wrapper_pretty_print(f_init, f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_runtime); + Close(f_begin); + Delete(f_runtime); + Delete(f_begin); return SWIG_OK; } diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index 7a94b77bb..d3f8401f0 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -26,7 +26,6 @@ public: }; static File *f_cl = 0; -static File *f_null = 0; static struct { int count; @@ -132,7 +131,7 @@ static void add_defined_foreign_type(String *type) { } -static String *get_ffi_type(SwigType *ty, const String_or_char *name) { +static String *get_ffi_type(SwigType *ty, const_String_or_char_ptr name) { Hash *typemap = Swig_typemap_search("ffitype", ty, name, 0); if (typemap) { String *typespec = Getattr(typemap, "code"); @@ -168,7 +167,7 @@ static String *get_ffi_type(SwigType *ty, const String_or_char *name) { return 0; } -static String *get_lisp_type(SwigType *ty, const String_or_char *name) { +static String *get_lisp_type(SwigType *ty, const_String_or_char_ptr name) { Hash *typemap = Swig_typemap_search("lisptype", ty, name, 0); if (typemap) { String *typespec = Getattr(typemap, "code"); @@ -181,6 +180,7 @@ static String *get_lisp_type(SwigType *ty, const String_or_char *name) { void UFFI::main(int argc, char *argv[]) { int i; + Preprocessor_define("SWIGUFFI 1", 0); SWIG_library_directory("uffi"); SWIG_config_file("uffi.swg"); @@ -225,31 +225,26 @@ void UFFI::main(int argc, char *argv[]) { int UFFI::top(Node *n) { String *module = Getattr(n, "name"); String *output_filename = NewString(""); - String *devnull = NewString("/dev/null"); - - f_null = NewFile(devnull, "w+"); - if (!f_null) { - FileErrorDisplay(devnull); - SWIG_exit(EXIT_FAILURE); - } - Delete(devnull); - + File *f_null = NewString(""); Printf(output_filename, "%s%s.cl", SWIG_output_directory(), module); - f_cl = NewFile(output_filename, "w"); + f_cl = NewFile(output_filename, "w", SWIG_output_files()); if (!f_cl) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); } Swig_register_filebyname("header", f_null); + Swig_register_filebyname("begin", f_null); Swig_register_filebyname("runtime", f_null); Swig_register_filebyname("wrapper", f_cl); - Printf(f_cl, - ";; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; package: %s -*-\n;; This is an automatically generated file. Make changes in\n;; the definition file, not here.\n\n(defpackage :%s\n (:use :common-lisp :uffi))\n\n(in-package :%s)\n", + Swig_banner_target_lang(f_cl, ";;"); + + Printf(f_cl, "\n" + ";; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; package: %s -*-\n\n(defpackage :%s\n (:use :common-lisp :uffi))\n\n(in-package :%s)\n", module, module, module); Printf(f_cl, "(eval-when (compile load eval)\n (defparameter *swig-identifier-converter* '%s))\n", identifier_converter); diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index c74b48d7c..2edd01cf0 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -47,7 +47,7 @@ public: iX++; Swig_mark_arg(iX); String *outfile = NewString(argv[iX]); - out = NewFile(outfile, "w"); + out = NewFile(outfile, "w", SWIG_output_files()); if (!out) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -82,7 +82,7 @@ public: Replaceall(outfile, ".cxx", ".xml"); Replaceall(outfile, ".cpp", ".xml"); Replaceall(outfile, ".c", ".xml"); - out = NewFile(outfile, "w"); + out = NewFile(outfile, "w", SWIG_output_files()); if (!out) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -301,7 +301,7 @@ void Swig_print_xml(DOH *obj, String *filename) { if (!filename) { out = stdout; } else { - out = NewFile(filename, "w"); + out = NewFile(filename, "w", SWIG_output_files()); if (!out) { FileErrorDisplay(filename); SWIG_exit(EXIT_FAILURE); diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index c04f95f00..81646171a 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -74,7 +74,7 @@ static void copy_location(const DOH *s1, DOH *s2) { Setline(s2, Getline((DOH *) s1)); } -static String *cpp_include(String_or_char *fn, int sysfile) { +static String *cpp_include(const_String_or_char_ptr fn, int sysfile) { String *s = sysfile ? Swig_include_sys(fn) : Swig_include(fn); if (s && single_include) { String *file = Getfile(s); @@ -85,7 +85,8 @@ static String *cpp_include(String_or_char *fn, int sysfile) { Setattr(included_files, file, file); } if (!s) { - Seek(fn, 0, SEEK_SET); + /* XXX(bhy) may not need the seek */ + /* Seek(fn, 0, SEEK_SET); */ if (ignore_missing) { Swig_warning(WARN_PP_MISSING_FILE, Getfile(fn), Getline(fn), "Unable to find '%s'\n", fn); } else { @@ -261,8 +262,9 @@ void Preprocessor_error_as_warning(int a) { * ----------------------------------------------------------------------------- */ -String_or_char *Macro_vararg_name(String_or_char *str, String_or_char *line) { - String_or_char *argname, *varargname; +String *Macro_vararg_name(const_String_or_char_ptr str, const_String_or_char_ptr line) { + String *argname; + String *varargname; char *s, *dots; argname = Copy(str); @@ -288,24 +290,24 @@ String_or_char *Macro_vararg_name(String_or_char *str, String_or_char *line) { return varargname; } -Hash *Preprocessor_define(const String_or_char *_str, int swigmacro) { +Hash *Preprocessor_define(const_String_or_char_ptr _str, int swigmacro) { String *macroname = 0, *argstr = 0, *macrovalue = 0, *file = 0, *s = 0; Hash *macro = 0, *symbols = 0, *m1; List *arglist = 0; int c, line; int varargs = 0; - String_or_char *str = (String_or_char *) _str; + String *str; assert(cpp); - assert(str); + assert(_str); /* First make sure that string is actually a string */ - if (DohCheck(str)) { - s = Copy(str); - copy_location(str, s); + if (DohCheck(_str)) { + s = Copy(_str); + copy_location(_str, s); str = s; } else { - str = NewString((char *) str); + str = NewString((char *) _str); } Seek(str, 0, SEEK_SET); line = Getline(str); @@ -532,7 +534,7 @@ macro_error: * * Undefines a macro. * ----------------------------------------------------------------------------- */ -void Preprocessor_undef(const String_or_char *str) { +void Preprocessor_undef(const_String_or_char_ptr str) { Hash *symbols; assert(cpp); symbols = Getattr(cpp, kpp_symbols); @@ -650,14 +652,7 @@ static String *get_filename(String *str, int *sysfile) { if (isspace(c)) Ungetc(c, str); } -#if defined(_WIN32) || defined(MACSWIG) - /* accept Unix path separator on non-Unix systems */ - Replaceall(fn, "/", SWIG_FILE_DELIMITER); -#endif -#if defined(__CYGWIN__) - /* accept Windows path separator in addition to Unix path separator */ - Replaceall(fn, "\\", SWIG_FILE_DELIMITER); -#endif + Swig_filename_correct(fn); Seek(fn, 0, SEEK_SET); return fn; } diff --git a/Source/Preprocessor/preprocessor.h b/Source/Preprocessor/preprocessor.h index 4f7ff8804..3579eede2 100644 --- a/Source/Preprocessor/preprocessor.h +++ b/Source/Preprocessor/preprocessor.h @@ -19,8 +19,8 @@ extern "C" { #endif extern int Preprocessor_expr(String *s, int *error); extern char *Preprocessor_expr_error(void); - extern Hash *Preprocessor_define(const String_or_char *str, int swigmacro); - extern void Preprocessor_undef(const String_or_char *name); + extern Hash *Preprocessor_define(const_String_or_char_ptr str, int swigmacro); + extern void Preprocessor_undef(const_String_or_char_ptr name); extern void Preprocessor_init(void); extern void Preprocessor_delete(void); extern String *Preprocessor_parse(String *s); diff --git a/Source/README b/Source/README index 8d910e405..814ec45bd 100644 --- a/Source/README +++ b/Source/README @@ -1,9 +1,5 @@ SWIG Source directory -This directory currently contains a mix of legacy SWIG1.1 code and -recent development work. As a result, it's still a little messy. -Here is a rough breakdown of the directories: - Source/DOH - A core set of basic datatypes including strings, lists, hashes, and files. Used extensively by the rest of SWIG. @@ -16,8 +12,9 @@ Here is a rough breakdown of the directories: Source/Modules - Language modules. + Source/Include - Include files. -The following directories may be in CVS, but are largely deprecated: +Historic directories which may be in CVS, but have been removed: Source/Modules1.1 - Old SWIG-1.1 modules. Empty. @@ -26,5 +23,3 @@ The following directories may be in CVS, but are largely deprecated: Source/SWIG1.1 - Old SWIG1.1 core. Completely empty now. - - diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 18920ecc2..7c6837a2b 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -45,7 +45,7 @@ String *Swig_cparm_name(Parm *p, int i) { * and user defined types to pointers. * ----------------------------------------------------------------------------- */ -static String *Swig_clocal(SwigType *t, const String_or_char *name, const String_or_char *value) { +static String *Swig_clocal(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr value) { String *decl; decl = NewStringEmpty(); @@ -147,7 +147,7 @@ String *Swig_wrapped_member_var_type(SwigType *t, int varcref) { } -static String *Swig_wrapped_var_deref(SwigType *t, String_or_char *name, int varcref) { +static String *Swig_wrapped_var_deref(SwigType *t, const_String_or_char_ptr name, int varcref) { if (SwigType_isclass(t)) { if (varcref) { if (cparse_cplusplus) { @@ -163,7 +163,7 @@ static String *Swig_wrapped_var_deref(SwigType *t, String_or_char *name, int var } } -static String *Swig_wrapped_var_assign(SwigType *t, const String_or_char *name, int varcref) { +static String *Swig_wrapped_var_assign(SwigType *t, const_String_or_char_ptr name, int varcref) { if (SwigType_isclass(t)) { if (varcref) { return NewStringf("%s", name); @@ -251,7 +251,7 @@ int Swig_cargs(Wrapper *w, ParmList *p) { * function call. * ----------------------------------------------------------------------------- */ -String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_char *decl) { +String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr decl) { String *fcall; fcall = NewStringEmpty(); @@ -260,10 +260,9 @@ String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_ch break; case T_REFERENCE: { - String *str = SwigType_str(t, "_result_ref"); - Printf(fcall, "{\n"); - Printf(fcall, "%s = ", str); - Delete(str); + String *lstr = SwigType_lstr(t, 0); + Printf(fcall, "%s = (%s) &", name, lstr); + Delete(lstr); } break; case T_USER: @@ -290,12 +289,6 @@ String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_ch Append(fcall, ";"); } - if (SwigType_type(t) == T_REFERENCE) { - String *lstr = SwigType_lstr(t, 0); - Printf(fcall, "\n%s = (%s) &_result_ref;\n", name, lstr); - Append(fcall, "}"); - Delete(lstr); - } return fcall; } @@ -309,7 +302,7 @@ String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_ch * * ----------------------------------------------------------------------------- */ -String *Swig_cfunction_call(String_or_char *name, ParmList *parms) { +String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms) { String *func; int i = 0; int comma = 0; @@ -376,7 +369,7 @@ String *Swig_cfunction_call(String_or_char *name, ParmList *parms) { * set to "(*this)->" or some similar sequence. * ----------------------------------------------------------------------------- */ -static String *Swig_cmethod_call(String_or_char *name, ParmList *parms, String_or_char *self, String *explicit_qualifier, SwigType *director_type) { +static String *Swig_cmethod_call(const_String_or_char_ptr name, ParmList *parms, const_String_or_char_ptr self, String *explicit_qualifier, SwigType *director_type) { String *func, *nname; int i = 0; Parm *p = parms; @@ -468,7 +461,7 @@ static String *Swig_cmethod_call(String_or_char *name, ParmList *parms, String_o * calloc(1,sizeof(name)); * ----------------------------------------------------------------------------- */ -String *Swig_cconstructor_call(String_or_char *name) { +String *Swig_cconstructor_call(const_String_or_char_ptr name) { DOH *func; func = NewStringEmpty(); @@ -487,7 +480,7 @@ String *Swig_cconstructor_call(String_or_char *name) { * * ----------------------------------------------------------------------------- */ -String *Swig_cppconstructor_base_call(String_or_char *name, ParmList *parms, int skip_self) { +String *Swig_cppconstructor_base_call(const_String_or_char_ptr name, ParmList *parms, int skip_self) { String *func; String *nname; int i = 0; @@ -532,15 +525,15 @@ String *Swig_cppconstructor_base_call(String_or_char *name, ParmList *parms, int return func; } -String *Swig_cppconstructor_call(String_or_char *name, ParmList *parms) { +String *Swig_cppconstructor_call(const_String_or_char_ptr name, ParmList *parms) { return Swig_cppconstructor_base_call(name, parms, 0); } -String *Swig_cppconstructor_nodirector_call(String_or_char *name, ParmList *parms) { +String *Swig_cppconstructor_nodirector_call(const_String_or_char_ptr name, ParmList *parms) { return Swig_cppconstructor_base_call(name, parms, 1); } -String *Swig_cppconstructor_director_call(String_or_char *name, ParmList *parms) { +String *Swig_cppconstructor_director_call(const_String_or_char_ptr name, ParmList *parms) { return Swig_cppconstructor_base_call(name, parms, 0); } @@ -683,7 +676,7 @@ String *Swig_cppdestructor_call(Node *n) { * * ----------------------------------------------------------------------------- */ -String *Swig_cmemberset_call(String_or_char *name, SwigType *type, String_or_char *self, int varcref) { +String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref) { String *func; String *pname0 = Swig_cparm_name(0, 0); String *pname1 = Swig_cparm_name(0, 1); @@ -718,7 +711,7 @@ String *Swig_cmemberset_call(String_or_char *name, SwigType *type, String_or_cha * * ----------------------------------------------------------------------------- */ -String *Swig_cmemberget_call(const String_or_char *name, SwigType *t, String_or_char *self, int varcref) { +String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref) { String *func; String *call; String *pname0 = Swig_cparm_name(0, 0); @@ -1210,7 +1203,7 @@ int Swig_DestructorToFunction(Node *n, String *classname, int cplus, int flags) * This function creates a C wrapper for setting a structure member. * ----------------------------------------------------------------------------- */ -int Swig_MembersetToFunction(Node *n, String *classname, int flags) { +int Swig_MembersetToFunction(Node *n, String *classname, int flags, String **call) { String *name; ParmList *parms; Parm *p; @@ -1258,23 +1251,21 @@ int Swig_MembersetToFunction(Node *n, String *classname, int flags) { Delete(p); if (flags & CWRAP_EXTEND) { - String *call; String *cres; String *code = Getattr(n, "code"); if (code) { /* I don't think this ever gets run - WSF */ Swig_add_extension_code(n, mangled, parms, void_type, code, cparse_cplusplus, "self"); } - call = Swig_cfunction_call(mangled, parms); - cres = NewStringf("%s;", call); + *call = Swig_cfunction_call(mangled, parms); + cres = NewStringf("%s;", *call); Setattr(n, "wrap:action", cres); - Delete(call); Delete(cres); } else { - String *call = Swig_cmemberset_call(name, type, self, varcref); - String *cres = NewStringf("%s;", call); + String *cres; + *call = Swig_cmemberset_call(name, type, self, varcref); + cres = NewStringf("%s;", *call); Setattr(n, "wrap:action", cres); - Delete(call); Delete(cres); } Setattr(n, "type", void_type); diff --git a/Source/Swig/error.c b/Source/Swig/error.c index 1eaba1f17..156fe06a7 100644 --- a/Source/Swig/error.c +++ b/Source/Swig/error.c @@ -50,7 +50,7 @@ static char wrn_nnum_fmt[64]; static char err_line_fmt[64]; static char err_eof_fmt[64]; -static String *format_filename(const String_or_char *filename); +static String *format_filename(const_String_or_char_ptr filename); /* ----------------------------------------------------------------------------- * Swig_warning() @@ -58,7 +58,7 @@ static String *format_filename(const String_or_char *filename); * Issue a warning message * ----------------------------------------------------------------------------- */ -void Swig_warning(int wnum, const String_or_char *filename, int line, const char *fmt, ...) { +void Swig_warning(int wnum, const_String_or_char_ptr filename, int line, const char *fmt, ...) { String *out; char *msg; int wrn = 1; @@ -121,7 +121,7 @@ void Swig_warning(int wnum, const String_or_char *filename, int line, const char * Issue an error message * ----------------------------------------------------------------------------- */ -void Swig_error(const String_or_char *filename, int line, const char *fmt, ...) { +void Swig_error(const_String_or_char_ptr filename, int line, const char *fmt, ...) { va_list ap; String *formatted_filename = NULL; @@ -170,7 +170,7 @@ void Swig_error_silent(int s) { * Takes a comma separate list of warning numbers and puts in the filter. * ----------------------------------------------------------------------------- */ -void Swig_warnfilter(const String_or_char *wlist, int add) { +void Swig_warnfilter(const_String_or_char_ptr wlist, int add) { char *c; char *cw; String *s; @@ -268,7 +268,7 @@ void Swig_error_msg_format(ErrorMessageFormat format) { * * Remove double backslashes in Windows filename paths for display * ----------------------------------------------------------------------------- */ -static String *format_filename(const String_or_char *filename) { +static String *format_filename(const_String_or_char_ptr filename) { String *formatted_filename = NewString(filename); #if defined(_WIN32) Replaceall(formatted_filename, "\\\\", "\\"); diff --git a/Source/Swig/getopt.c b/Source/Swig/getopt.c index 87b0f7c9d..cbd051d9f 100644 --- a/Source/Swig/getopt.c +++ b/Source/Swig/getopt.c @@ -100,7 +100,7 @@ void Swig_check_options(int check_input) { * Generates a generic error message and exits. * ----------------------------------------------------------------------------- */ -void Swig_arg_error() { +void Swig_arg_error(void) { Printf(stderr, "SWIG : Unable to parse command line options.\n"); Printf(stderr, "Use 'swig -help' for available options.\n"); exit(1); diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 3f47be15b..f42eb5d45 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -33,7 +33,7 @@ int Swig_get_push_dir(void) { * Adds a directory to the SWIG search path. * ----------------------------------------------------------------------------- */ -List *Swig_add_directory(const String_or_char *dirname) { +List *Swig_add_directory(const_String_or_char_ptr dirname) { String *adirname; if (!directories) directories = NewList(); @@ -53,7 +53,7 @@ List *Swig_add_directory(const String_or_char *dirname) { * the preprocessor to grab files in the same directory as other included files. * ----------------------------------------------------------------------------- */ -void Swig_push_directory(const String_or_char *dirname) { +void Swig_push_directory(const_String_or_char_ptr dirname) { String *pdirname; if (!Swig_get_push_dir()) return; @@ -73,7 +73,7 @@ void Swig_push_directory(const String_or_char *dirname) { * the preprocessor. * ----------------------------------------------------------------------------- */ -void Swig_pop_directory() { +void Swig_pop_directory(void) { if (!Swig_get_push_dir()) return; if (!pdirectories) @@ -87,13 +87,13 @@ void Swig_pop_directory() { * Returns the full pathname of the last file opened. * ----------------------------------------------------------------------------- */ -String *Swig_last_file() { +String *Swig_last_file(void) { assert(lastpath); return lastpath; } /* ----------------------------------------------------------------------------- - * Swig_search_path() + * Swig_search_path_any() * * Returns a list of the current search paths. * ----------------------------------------------------------------------------- */ @@ -151,10 +151,11 @@ List *Swig_search_path() { /* ----------------------------------------------------------------------------- * Swig_open() * - * Looks for a file and open it. Returns an open FILE * on success. + * open a file, optionally looking for it in the include path. Returns an open + * FILE * on success. * ----------------------------------------------------------------------------- */ -static FILE *Swig_open_any(const String_or_char *name, int sysfile) { +static FILE *Swig_open_file(const_String_or_char_ptr name, int sysfile, int use_include_path) { FILE *f; String *filename; List *spath = 0; @@ -169,7 +170,7 @@ static FILE *Swig_open_any(const String_or_char *name, int sysfile) { filename = NewString(cname); assert(filename); f = fopen(Char(filename), "r"); - if (!f) { + if (!f && use_include_path) { spath = Swig_search_path_any(sysfile); ilen = Len(spath); for (i = 0; i < ilen; i++) { @@ -182,19 +183,21 @@ static FILE *Swig_open_any(const String_or_char *name, int sysfile) { Delete(spath); } if (f) { -#if defined(_WIN32) /* Note not on Cygwin else filename is displayed with double '/' */ - Replaceall(filename, "\\\\", "\\"); /* remove double '\' in case any already present */ - Replaceall(filename, "\\", "\\\\"); -#endif Delete(lastpath); - lastpath = Copy(filename); + lastpath = Swig_filename_escape(filename); } Delete(filename); return f; } -FILE *Swig_open(const String_or_char *name) { - return Swig_open_any(name, 0); +/* Open a file - searching the include paths to find it */ +FILE *Swig_include_open(const_String_or_char_ptr name) { + return Swig_open_file(name, 0, 1); +} + +/* Open a file - does not use include paths to find it */ +FILE *Swig_open(const_String_or_char_ptr name) { + return Swig_open_file(name, 0, 0); } @@ -230,12 +233,12 @@ String *Swig_read_file(FILE *f) { * Opens a file and returns it as a string. * ----------------------------------------------------------------------------- */ -static String *Swig_include_any(const String_or_char *name, int sysfile) { +static String *Swig_include_any(const_String_or_char_ptr name, int sysfile) { FILE *f; String *str; String *file; - f = Swig_open_any(name, sysfile); + f = Swig_open_file(name, sysfile, 1); if (!f) return 0; str = Swig_read_file(f); @@ -248,11 +251,11 @@ static String *Swig_include_any(const String_or_char *name, int sysfile) { return str; } -String *Swig_include(const String_or_char *name) { +String *Swig_include(const_String_or_char_ptr name) { return Swig_include_any(name, 0); } -String *Swig_include_sys(const String_or_char *name) { +String *Swig_include_sys(const_String_or_char_ptr name) { return Swig_include_any(name, 1); } @@ -262,10 +265,10 @@ String *Swig_include_sys(const String_or_char *name) { * Copies the contents of a file into another file * ----------------------------------------------------------------------------- */ -int Swig_insert_file(const String_or_char *filename, File *outfile) { +int Swig_insert_file(const_String_or_char_ptr filename, File *outfile) { char buffer[4096]; int nbytes; - FILE *f = Swig_open(filename); + FILE *f = Swig_include_open(filename); if (!f) return -1; @@ -286,7 +289,7 @@ int Swig_insert_file(const String_or_char *filename, File *outfile) { static Hash *named_files = 0; -void Swig_register_filebyname(const String_or_char *filename, File *outfile) { +void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile) { if (!named_files) named_files = NewHash(); Setattr(named_files, filename, outfile); @@ -298,7 +301,7 @@ void Swig_register_filebyname(const String_or_char *filename, File *outfile) { * Get a named file * ----------------------------------------------------------------------------- */ -File *Swig_filebyname(const String_or_char *filename) { +File *Swig_filebyname(const_String_or_char_ptr filename) { if (!named_files) return 0; return Getattr(named_files, filename); @@ -310,7 +313,7 @@ File *Swig_filebyname(const String_or_char *filename) { * Returns the suffix of a file * ----------------------------------------------------------------------------- */ -char *Swig_file_suffix(const String_or_char *filename) { +char *Swig_file_suffix(const_String_or_char_ptr filename) { char *d; char *c = Char(filename); int len = Len(filename); @@ -332,7 +335,7 @@ char *Swig_file_suffix(const String_or_char *filename) { * Returns the filename with no suffix attached. * ----------------------------------------------------------------------------- */ -char *Swig_file_basename(const String_or_char *filename) { +char *Swig_file_basename(const_String_or_char_ptr filename) { static char tmp[1024]; char *c; strcpy(tmp, Char(filename)); @@ -346,7 +349,7 @@ char *Swig_file_basename(const String_or_char *filename) { * * Return the file with any leading path stripped off * ----------------------------------------------------------------------------- */ -char *Swig_file_filename(const String_or_char *filename) { +char *Swig_file_filename(const_String_or_char_ptr filename) { static char tmp[1024]; const char *delim = SWIG_FILE_DELIMITER; char *c; @@ -364,7 +367,7 @@ char *Swig_file_filename(const String_or_char *filename) { * * Return the name of the directory associated with a file * ----------------------------------------------------------------------------- */ -char *Swig_file_dirname(const String_or_char *filename) { +char *Swig_file_dirname(const_String_or_char_ptr filename) { static char tmp[1024]; const char *delim = SWIG_FILE_DELIMITER; char *c; diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index d29250517..050e5357a 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -54,7 +54,7 @@ const char *Swig_package_version(void) { /* ----------------------------------------------------------------------------- * Swig_banner() * - * Emits the SWIG identifying banner. + * Emits the SWIG identifying banner for the C/C++ wrapper file. * ----------------------------------------------------------------------------- */ void Swig_banner(File *f) { @@ -67,10 +67,24 @@ void Swig_banner(File *f) { * changes to this file unless you know what you are doing--modify the SWIG \n\ * interface file instead. \n", Swig_package_version()); /* String too long for ISO compliance */ - Printf(f, " * ----------------------------------------------------------------------------- */\n\n"); + Printf(f, " * ----------------------------------------------------------------------------- */\n"); } +/* ----------------------------------------------------------------------------- + * Swig_banner_target_lang() + * + * Emits a SWIG identifying banner in the target language + * ----------------------------------------------------------------------------- */ + +void Swig_banner_target_lang(File *f, const_String_or_char_ptr commentchar) { + Printf(f, "%s This file was automatically generated by SWIG (http://www.swig.org).\n", commentchar); + Printf(f, "%s Version %s\n", commentchar, Swig_package_version()); + Printf(f, "%s\n", commentchar); + Printf(f, "%s Do not make changes to this file unless you know what you are doing--modify\n", commentchar); + Printf(f, "%s the SWIG interface file instead.\n", commentchar); +} + /* ----------------------------------------------------------------------------- * Swig_strip_c_comments() * @@ -117,6 +131,39 @@ String *Swig_strip_c_comments(const String *s) { } +/* ----------------------------------------------------------------------------- + * Swig_filename_correct() + * + * Corrects filenames on non-unix systems + * ----------------------------------------------------------------------------- */ + +void Swig_filename_correct(String *filename) { + (void)filename; +#if defined(_WIN32) || defined(MACSWIG) + /* accept Unix path separator on non-Unix systems */ + Replaceall(filename, "/", SWIG_FILE_DELIMITER); +#endif +#if defined(__CYGWIN__) + /* accept Windows path separator in addition to Unix path separator */ + Replaceall(filename, "\\", SWIG_FILE_DELIMITER); +#endif +} + +/* ----------------------------------------------------------------------------- + * Swig_filename_escape() + * + * Escapes backslashes in filename - for Windows + * ----------------------------------------------------------------------------- */ + +String *Swig_filename_escape(String *filename) { + String *adjusted_filename = Copy(filename); +#if defined(_WIN32) /* Note not on Cygwin else filename is displayed with double '/' */ + Replaceall(adjusted_filename, "\\\\", "\\"); /* remove double '\' in case any already present */ + Replaceall(adjusted_filename, "\\", "\\\\"); +#endif + return adjusted_filename; +} + /* ----------------------------------------------------------------------------- * Swig_string_escape() * @@ -604,7 +651,7 @@ String *Swig_string_emangle(String *s) { * In this case, "A::B". Returns NULL if there is no base. * ----------------------------------------------------------------------------- */ -void Swig_scopename_split(String *s, String **rprefix, String **rlast) { +void Swig_scopename_split(const String *s, String **rprefix, String **rlast) { char *tmp = Char(s); char *c = tmp; char *cc = c; @@ -658,7 +705,7 @@ void Swig_scopename_split(String *s, String **rprefix, String **rlast) { } -String *Swig_scopename_prefix(String *s) { +String *Swig_scopename_prefix(const String *s) { char *tmp = Char(s); char *c = tmp; char *cc = c; @@ -710,7 +757,7 @@ String *Swig_scopename_prefix(String *s) { * case, "C". * ----------------------------------------------------------------------------- */ -String *Swig_scopename_last(String *s) { +String *Swig_scopename_last(const String *s) { char *tmp = Char(s); char *c = tmp; char *cc = c; @@ -754,7 +801,7 @@ String *Swig_scopename_last(String *s) { * In this case, "A". Returns NULL if there is no base. * ----------------------------------------------------------------------------- */ -String *Swig_scopename_first(String *s) { +String *Swig_scopename_first(const String *s) { char *tmp = Char(s); char *c = tmp; char *co = 0; @@ -804,7 +851,7 @@ String *Swig_scopename_first(String *s) { * In this case, "B::C". Returns NULL if there is no suffix. * ----------------------------------------------------------------------------- */ -String *Swig_scopename_suffix(String *s) { +String *Swig_scopename_suffix(const String *s) { char *tmp = Char(s); char *c = tmp; char *co = 0; @@ -848,7 +895,7 @@ String *Swig_scopename_suffix(String *s) { * Checks to see if a name is qualified with a scope name * ----------------------------------------------------------------------------- */ -int Swig_scopename_check(String *s) { +int Swig_scopename_check(const String *s) { char *c = Char(s); char *co = strstr(c, "operator "); @@ -926,6 +973,37 @@ String *Swig_string_command(String *s) { } +/* ----------------------------------------------------------------------------- + * Swig_string_strip() + * + * Strip given prefix from identifiers + * + * Printf(stderr,"%(strip:[wx])s","wxHello") -> Hello + * ----------------------------------------------------------------------------- */ + +String *Swig_string_strip(String *s) { + String *ns; + if (!Len(s)) { + ns = NewString(s); + } else { + const char *cs = Char(s); + const char *ce = Strchr(cs, ']'); + if (*cs != '[' || ce == NULL) { + ns = NewString(s); + } else { + String *fmt = NewStringf("%%.%ds", ce-cs-1); + String *prefix = NewStringf(fmt, cs+1); + if (0 == Strncmp(ce+1, prefix, Len(prefix))) { + ns = NewString(ce+1+Len(prefix)); + } else { + ns = NewString(ce+1); + } + } + } + return ns; +} + + /* ----------------------------------------------------------------------------- * Swig_string_rxspencer() * @@ -1053,6 +1131,7 @@ void Swig_init() { DohEncoding("command", Swig_string_command); DohEncoding("rxspencer", Swig_string_rxspencer); DohEncoding("schemify", Swig_string_schemify); + DohEncoding("strip", Swig_string_strip); /* aliases for the case encoders */ DohEncoding("uppercase", Swig_string_upper); diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index f34a24612..013ce5929 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -27,13 +27,13 @@ static Hash *naming_hash = 0; * Register a new naming format. * ----------------------------------------------------------------------------- */ -void Swig_name_register(const String_or_char *method, const String_or_char *format) { +void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format) { if (!naming_hash) naming_hash = NewHash(); Setattr(naming_hash, method, format); } -void Swig_name_unregister(const String_or_char *method) { +void Swig_name_unregister(const_String_or_char_ptr method) { if (naming_hash) { Delattr(naming_hash, method); } @@ -127,7 +127,7 @@ static int name_mangle(String *r) { * Converts all of the non-identifier characters of a string to underscores. * ----------------------------------------------------------------------------- */ -String *Swig_name_mangle(const String_or_char *s) { +String *Swig_name_mangle(const_String_or_char_ptr s) { #if 0 String *r = NewString(s); name_mangle(r); @@ -143,7 +143,7 @@ String *Swig_name_mangle(const String_or_char *s) { * Returns the name of a wrapper function. * ----------------------------------------------------------------------------- */ -String *Swig_name_wrapper(const String_or_char *fname) { +String *Swig_name_wrapper(const_String_or_char_ptr fname) { String *r; String *f; @@ -168,7 +168,7 @@ String *Swig_name_wrapper(const String_or_char *fname) { * Returns the name of a class method. * ----------------------------------------------------------------------------- */ -String *Swig_name_member(const String_or_char *classname, const String_or_char *mname) { +String *Swig_name_member(const_String_or_char_ptr classname, const_String_or_char_ptr mname) { String *r; String *f; String *rclassname; @@ -201,7 +201,7 @@ String *Swig_name_member(const String_or_char *classname, const String_or_char * * Returns the name of the accessor function used to get a variable. * ----------------------------------------------------------------------------- */ -String *Swig_name_get(const String_or_char *vname) { +String *Swig_name_get(const_String_or_char_ptr vname) { String *r; String *f; @@ -229,7 +229,7 @@ String *Swig_name_get(const String_or_char *vname) { * Returns the name of the accessor function used to set a variable. * ----------------------------------------------------------------------------- */ -String *Swig_name_set(const String_or_char *vname) { +String *Swig_name_set(const_String_or_char_ptr vname) { String *r; String *f; @@ -253,7 +253,7 @@ String *Swig_name_set(const String_or_char *vname) { * Returns the name of the accessor function used to create an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_construct(const String_or_char *classname) { +String *Swig_name_construct(const_String_or_char_ptr classname) { String *r; String *f; String *rclassname; @@ -286,7 +286,7 @@ String *Swig_name_construct(const String_or_char *classname) { * Returns the name of the accessor function used to copy an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_copyconstructor(const String_or_char *classname) { +String *Swig_name_copyconstructor(const_String_or_char_ptr classname) { String *r; String *f; String *rclassname; @@ -319,7 +319,7 @@ String *Swig_name_copyconstructor(const String_or_char *classname) { * Returns the name of the accessor function used to destroy an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_destroy(const String_or_char *classname) { +String *Swig_name_destroy(const_String_or_char_ptr classname) { String *r; String *f; String *rclassname; @@ -351,7 +351,7 @@ String *Swig_name_destroy(const String_or_char *classname) { * Returns the name of the accessor function used to disown an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_disown(const String_or_char *classname) { +String *Swig_name_disown(const_String_or_char_ptr classname) { String *r; String *f; String *rclassname; @@ -600,7 +600,7 @@ static void merge_features(Hash *features, Node *n) { * ----------------------------------------------------------------------------- */ static -void features_get(Hash *features, String *tname, SwigType *decl, SwigType *ncdecl, Node *node) { +void features_get(Hash *features, const String *tname, SwigType *decl, SwigType *ncdecl, Node *node) { Node *n = Getattr(features, tname); #ifdef SWIG_DEBUG Printf(stdout, " features_get: %s\n", tname); @@ -655,7 +655,7 @@ void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *d } #ifdef SWIG_DEBUG - Printf(stdout, "Swig_features_get: %s %s %s\n", prefix, name, decl); + Printf(stdout, "Swig_features_get: '%s' '%s' '%s'\n", prefix, name, decl); #endif /* Global features */ @@ -727,12 +727,12 @@ void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *d * concatenating the feature name plus ':' plus the attribute name. * ----------------------------------------------------------------------------- */ -void Swig_feature_set(Hash *features, const String_or_char *name, SwigType *decl, const String_or_char *featurename, String *value, Hash *featureattribs) { +void Swig_feature_set(Hash *features, const_String_or_char_ptr name, SwigType *decl, const_String_or_char_ptr featurename, String *value, Hash *featureattribs) { Hash *n; Hash *fhash; #ifdef SWIG_DEBUG - Printf(stdout, "Swig_feature_set: %s %s %s %s\n", name, decl, featurename, value); + Printf(stdout, "Swig_feature_set: '%s' '%s' '%s' '%s'\n", name, decl, featurename, value); #endif n = Getattr(features, name); @@ -1436,7 +1436,7 @@ static String *apply_rename(String *newname, int fullname, String *prefix, Strin * * ----------------------------------------------------------------------------- */ -String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType *decl, String *oldname) { +String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, SwigType *decl, String *oldname) { String *nname = 0; String *result = 0; String *name = NewString(cname); diff --git a/Source/Swig/parms.c b/Source/Swig/parms.c index baa1dfbf3..9b58f5fcb 100644 --- a/Source/Swig/parms.c +++ b/Source/Swig/parms.c @@ -17,7 +17,7 @@ char cvsroot_parms_c[] = "$Id$"; * Create a new parameter from datatype 'type' and name 'name'. * ------------------------------------------------------------------------ */ -Parm *NewParm(SwigType *type, const String_or_char *name) { +Parm *NewParm(SwigType *type, const_String_or_char_ptr name) { Parm *p = NewHash(); set_nodeType(p, "parm"); if (type) { diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 06e78db37..53f1ad4a0 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -15,6 +15,9 @@ char cvsroot_scanner_c[] = "$Id$"; #include "swig.h" #include +extern String *cparse_file; +extern int cparse_start_line; + struct Scanner { String *text; /* Current token value */ List *scanobjs; /* Objects being scanned */ @@ -36,7 +39,7 @@ struct Scanner { * Create a new scanner object * ----------------------------------------------------------------------------- */ -Scanner *NewScanner() { +Scanner *NewScanner(void) { Scanner *s; s = (Scanner *) malloc(sizeof(Scanner)); s->line = 1; @@ -115,11 +118,11 @@ void Scanner_push(Scanner * s, String *txt) { * call to Scanner_token(). * ----------------------------------------------------------------------------- */ -void Scanner_pushtoken(Scanner * s, int nt, const String_or_char *val) { +void Scanner_pushtoken(Scanner * s, int nt, const_String_or_char_ptr val) { assert(s); assert((nt >= 0) && (nt < SWIG_MAXTOKENS)); s->nexttoken = nt; - if (val != s->text) { + if ( Char(val) != Char(s->text) ) { Clear(s->text); Append(s->text,val); } @@ -209,7 +212,7 @@ static char nextchar(Scanner * s) { * Sets error information on the scanner. * ----------------------------------------------------------------------------- */ -static void set_error(Scanner *s, int line, String_or_char *msg) { +static void set_error(Scanner *s, int line, const_String_or_char_ptr msg) { s->error_line = line; s->error = NewString(msg); } @@ -536,7 +539,7 @@ static int look(Scanner * s) { break; case 10: /* C++ style comment */ if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line,"Unterminated comment"); + Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n"); return SWIG_TOKEN_ERROR; } if (c == '\n') { @@ -548,7 +551,7 @@ static int look(Scanner * s) { break; case 11: /* C style comment block */ if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line,"Unterminated comment"); + Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n"); return SWIG_TOKEN_ERROR; } if (c == '*') { @@ -559,7 +562,7 @@ static int look(Scanner * s) { break; case 12: /* Still in C style comment */ if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line,"Unterminated comment"); + Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n"); return SWIG_TOKEN_ERROR; } if (c == '*') { @@ -573,7 +576,7 @@ static int look(Scanner * s) { case 2: /* Processing a string */ if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line, "Unterminated string"); + Swig_error(cparse_file, cparse_start_line, "Unterminated string\n"); return SWIG_TOKEN_ERROR; } if (c == '\"') { @@ -656,7 +659,7 @@ static int look(Scanner * s) { case 40: /* Process an include block */ if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line,"Unterminated code block"); + Swig_error(cparse_file, cparse_start_line, "Unterminated block\n"); return SWIG_TOKEN_ERROR; } if (c == '%') @@ -933,7 +936,7 @@ static int look(Scanner * s) { /* A character constant */ case 9: if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line,"Unterminated character constant"); + Swig_error(cparse_file, cparse_start_line, "Unterminated character constant\n"); return SWIG_TOKEN_ERROR; } if (c == '\'') { @@ -1048,7 +1051,7 @@ static int look(Scanner * s) { /* Reverse string */ case 900: if ((c = nextchar(s)) == 0) { - set_error(s,s->start_line,"Unterminated character constant"); + Swig_error(cparse_file, cparse_start_line, "Unterminated character constant\n"); return SWIG_TOKEN_ERROR; } if (c == '`') { diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index b6960f4d6..8a7700bec 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -270,20 +270,6 @@ int SwigType_issimple(SwigType *t) { return 1; } -int SwigType_isbuiltin(SwigType *t) { - const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; - int i = 0; - char *c = Char(t); - if (!t) - return 0; - while (builtins[i]) { - if (strcmp(c, builtins[i]) == 0) - return 1; - i++; - } - return 0; -} - /* ----------------------------------------------------------------------------- * SwigType_default() * @@ -551,7 +537,7 @@ String *SwigType_namestr(const SwigType *t) { * Create a C string representation of a datatype. * ----------------------------------------------------------------------------- */ -String *SwigType_str(SwigType *s, const String_or_char *id) { +String *SwigType_str(SwigType *s, const_String_or_char_ptr id) { String *result; String *element = 0, *nextelement; List *elements; @@ -746,7 +732,7 @@ SwigType *SwigType_ltype(SwigType *s) { * with an equivalent assignable version. * -------------------------------------------------------------------- */ -String *SwigType_lstr(SwigType *s, const String_or_char *id) { +String *SwigType_lstr(SwigType *s, const_String_or_char_ptr id) { String *result; SwigType *tc; @@ -763,7 +749,7 @@ String *SwigType_lstr(SwigType *s, const String_or_char *id) { * datatype printed by str(). * ----------------------------------------------------------------------------- */ -String *SwigType_rcaststr(SwigType *s, const String_or_char *name) { +String *SwigType_rcaststr(SwigType *s, const_String_or_char_ptr name) { String *result, *cast; String *element = 0, *nextelement; SwigType *td, *rs, *tc = 0; @@ -906,7 +892,7 @@ String *SwigType_rcaststr(SwigType *s, const String_or_char *name) { * Casts a variable from the real type to the local datatype. * ----------------------------------------------------------------------------- */ -String *SwigType_lcaststr(SwigType *s, const String_or_char *name) { +String *SwigType_lcaststr(SwigType *s, const_String_or_char_ptr name) { String *result; result = NewStringEmpty(); diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 20bd95e6a..2b2c797c9 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -110,15 +110,15 @@ extern "C" { extern SwigType *NewSwigType(int typecode); extern SwigType *SwigType_del_element(SwigType *t); extern SwigType *SwigType_add_pointer(SwigType *t); - extern SwigType *SwigType_add_memberpointer(SwigType *t, const String_or_char *qual); + extern SwigType *SwigType_add_memberpointer(SwigType *t, const_String_or_char_ptr qual); extern SwigType *SwigType_del_memberpointer(SwigType *t); extern SwigType *SwigType_del_pointer(SwigType *t); - extern SwigType *SwigType_add_array(SwigType *t, const String_or_char *size); + extern SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size); extern SwigType *SwigType_del_array(SwigType *t); extern SwigType *SwigType_pop_arrays(SwigType *t); extern SwigType *SwigType_add_reference(SwigType *t); extern SwigType *SwigType_del_reference(SwigType *t); - extern SwigType *SwigType_add_qualifier(SwigType *t, const String_or_char *qual); + extern SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual); extern SwigType *SwigType_del_qualifier(SwigType *t); extern SwigType *SwigType_add_function(SwigType *t, ParmList *parms); extern SwigType *SwigType_add_template(SwigType *t, ParmList *parms); @@ -129,10 +129,10 @@ extern "C" { extern void SwigType_push(SwigType *t, SwigType *s); extern List *SwigType_parmlist(const SwigType *p); extern String *SwigType_parm(String *p); - extern String *SwigType_str(SwigType *s, const String_or_char *id); - extern String *SwigType_lstr(SwigType *s, const String_or_char *id); - extern String *SwigType_rcaststr(SwigType *s, const String_or_char *id); - extern String *SwigType_lcaststr(SwigType *s, const String_or_char *id); + extern String *SwigType_str(SwigType *s, const_String_or_char_ptr id); + extern String *SwigType_lstr(SwigType *s, const_String_or_char_ptr id); + extern String *SwigType_rcaststr(SwigType *s, const_String_or_char_ptr id); + extern String *SwigType_lcaststr(SwigType *s, const_String_or_char_ptr id); extern String *SwigType_manglestr(SwigType *t); extern SwigType *SwigType_ltype(SwigType *t); extern int SwigType_ispointer(SwigType *t); @@ -151,8 +151,7 @@ extern "C" { extern int SwigType_isvarargs(const SwigType *t); extern int SwigType_istemplate(const SwigType *t); extern int SwigType_isenum(SwigType *t); - extern int SwigType_isbuiltin(SwigType *t); - extern int SwigType_check_decl(SwigType *t, const String_or_char *decl); + extern int SwigType_check_decl(SwigType *t, const_String_or_char_ptr decl); extern SwigType *SwigType_strip_qualifiers(SwigType *t); extern SwigType *SwigType_functionpointer_decompose(SwigType *t); extern String *SwigType_base(const SwigType *t); @@ -163,7 +162,7 @@ extern "C" { extern String *SwigType_prefix(const SwigType *t); extern int SwigType_array_ndim(SwigType *t); extern String *SwigType_array_getdim(SwigType *t, int n); - extern void SwigType_array_setdim(SwigType *t, int n, const String_or_char *rep); + extern void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep); extern SwigType *SwigType_array_type(SwigType *t); extern String *SwigType_default(SwigType *t); extern void SwigType_typename_replace(SwigType *t, String *pat, String *rep); @@ -174,27 +173,27 @@ extern "C" { /* --- Type-system managment --- */ extern void SwigType_typesystem_init(void); - extern int SwigType_typedef(SwigType *type, String_or_char *name); - extern int SwigType_typedef_class(String_or_char *name); - extern int SwigType_typedef_using(String_or_char *qname); + extern int SwigType_typedef(SwigType *type, const_String_or_char_ptr name); + extern int SwigType_typedef_class(const_String_or_char_ptr name); + extern int SwigType_typedef_using(const_String_or_char_ptr qname); extern void SwigType_inherit(String *subclass, String *baseclass, String *cast, String *conversioncode); extern int SwigType_issubtype(SwigType *subtype, SwigType *basetype); extern void SwigType_scope_alias(String *aliasname, Typetab *t); extern void SwigType_using_scope(Typetab *t); - extern void SwigType_new_scope(const String_or_char *name); + extern void SwigType_new_scope(const_String_or_char_ptr name); extern void SwigType_inherit_scope(Typetab *scope); extern Typetab *SwigType_pop_scope(void); extern Typetab *SwigType_set_scope(Typetab *h); extern void SwigType_print_scope(Typetab *t); - extern SwigType *SwigType_typedef_resolve(SwigType *t); + extern SwigType *SwigType_typedef_resolve(const SwigType *t); extern SwigType *SwigType_typedef_resolve_all(SwigType *t); extern SwigType *SwigType_typedef_qualified(SwigType *t); extern int SwigType_istypedef(SwigType *t); extern int SwigType_isclass(SwigType *t); extern void SwigType_attach_symtab(Symtab *syms); extern void SwigType_remember(SwigType *t); - extern void SwigType_remember_clientdata(SwigType *t, const String_or_char *clientdata); - extern void SwigType_remember_mangleddata(String *mangled, const String_or_char *clientdata); + extern void SwigType_remember_clientdata(SwigType *t, const_String_or_char_ptr clientdata); + extern void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr clientdata); extern void (*SwigType_remember_trace(void (*tf) (SwigType *, String *, String *))) (SwigType *, String *, String *); extern void SwigType_emit_type_table(File *f_headers, File *f_table); extern int SwigType_type(SwigType *t); @@ -202,25 +201,25 @@ extern "C" { /* --- Symbol table module --- */ extern void Swig_symbol_init(void); - extern void Swig_symbol_setscopename(const String_or_char *name); + extern void Swig_symbol_setscopename(const_String_or_char_ptr name); extern String *Swig_symbol_getscopename(void); extern String *Swig_symbol_qualifiedscopename(Symtab *symtab); extern Symtab *Swig_symbol_newscope(void); extern Symtab *Swig_symbol_setscope(Symtab *); - extern Symtab *Swig_symbol_getscope(const String_or_char *symname); + extern Symtab *Swig_symbol_getscope(const_String_or_char_ptr symname); extern Symtab *Swig_symbol_current(void); extern Symtab *Swig_symbol_popscope(void); - extern Node *Swig_symbol_add(String_or_char *symname, Node *node); - extern void Swig_symbol_cadd(String_or_char *symname, Node *node); - extern Node *Swig_symbol_clookup(String_or_char *symname, Symtab *tab); - extern Node *Swig_symbol_clookup_check(String_or_char *symname, Symtab *tab, int (*check) (Node *)); - extern Symtab *Swig_symbol_cscope(String_or_char *symname, Symtab *tab); - extern Node *Swig_symbol_clookup_local(String_or_char *symname, Symtab *tab); - extern Node *Swig_symbol_clookup_local_check(String_or_char *symname, Symtab *tab, int (*check) (Node *)); + extern Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *node); + extern void Swig_symbol_cadd(const_String_or_char_ptr symname, Node *node); + extern Node *Swig_symbol_clookup(const_String_or_char_ptr symname, Symtab *tab); + extern Node *Swig_symbol_clookup_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *)); + extern Symtab *Swig_symbol_cscope(const_String_or_char_ptr symname, Symtab *tab); + extern Node *Swig_symbol_clookup_local(const_String_or_char_ptr symname, Symtab *tab); + extern Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *)); extern String *Swig_symbol_qualified(Node *node); extern Node *Swig_symbol_isoverloaded(Node *node); extern void Swig_symbol_remove(Node *node); - extern void Swig_symbol_alias(String_or_char *aliasname, Symtab *tab); + extern void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *tab); extern void Swig_symbol_inherit(Symtab *tab); extern SwigType *Swig_symbol_type_qualify(const SwigType *ty, Symtab *tab); extern String *Swig_symbol_string_qualify(String *s, Symtab *tab); @@ -247,17 +246,17 @@ extern int ParmList_is_compactdefargs(ParmList *p); /* --- Naming functions --- */ - extern void Swig_name_register(const String_or_char *method, const String_or_char *format); - extern void Swig_name_unregister(const String_or_char *method); - extern String *Swig_name_mangle(const String_or_char *s); - extern String *Swig_name_wrapper(const String_or_char *fname); - extern String *Swig_name_member(const String_or_char *classname, const String_or_char *mname); - extern String *Swig_name_get(const String_or_char *vname); - extern String *Swig_name_set(const String_or_char *vname); - extern String *Swig_name_construct(const String_or_char *classname); - extern String *Swig_name_copyconstructor(const String_or_char *classname); - extern String *Swig_name_destroy(const String_or_char *classname); - extern String *Swig_name_disown(const String_or_char *classname); + extern void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format); + extern void Swig_name_unregister(const_String_or_char_ptr method); + extern String *Swig_name_mangle(const_String_or_char_ptr s); + extern String *Swig_name_wrapper(const_String_or_char_ptr fname); + extern String *Swig_name_member(const_String_or_char_ptr classname, const_String_or_char_ptr mname); + extern String *Swig_name_get(const_String_or_char_ptr vname); + extern String *Swig_name_set(const_String_or_char_ptr vname); + extern String *Swig_name_construct(const_String_or_char_ptr classname); + extern String *Swig_name_copyconstructor(const_String_or_char_ptr classname); + extern String *Swig_name_destroy(const_String_or_char_ptr classname); + extern String *Swig_name_disown(const_String_or_char_ptr classname); extern void Swig_naming_init(void); extern void Swig_name_namewarn_add(String *prefix, String *name, SwigType *decl, Hash *namewrn); @@ -268,33 +267,36 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern int Swig_need_name_warning(Node *n); extern int Swig_need_redefined_warn(Node *a, Node *b, int InClass); - extern String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType *decl, String *oldname); + extern String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, SwigType *decl, String *oldname); extern String *Swig_name_warning(Node *n, String *prefix, String *name, SwigType *decl); extern String *Swig_name_decl(Node *n); extern String *Swig_name_fulldecl(Node *n); /* --- parameterized rename functions --- */ - extern void Swig_name_object_set(Hash *namehash, String_or_char *name, SwigType *decl, DOH *object); - extern DOH *Swig_name_object_get(Hash *namehash, String_or_char *prefix, String_or_char *name, SwigType *decl); + extern void Swig_name_object_set(Hash *namehash, String *name, SwigType *decl, DOH *object); + extern DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *decl); extern void Swig_name_object_inherit(Hash *namehash, String *base, String *derived); - extern void Swig_features_get(Hash *features, String_or_char *prefix, String_or_char *name, SwigType *decl, Node *n); - extern void Swig_feature_set(Hash *features, const String_or_char *name, SwigType *decl, const String_or_char *featurename, String *value, Hash *featureattribs); + extern void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl, Node *n); + extern void Swig_feature_set(Hash *features, const_String_or_char_ptr name, SwigType *decl, const_String_or_char_ptr featurename, String *value, Hash *featureattribs); /* --- Misc --- */ extern char *Swig_copy_string(const char *c); extern void Swig_set_fakeversion(const char *version); extern const char *Swig_package_version(void); extern void Swig_banner(File *f); + extern void Swig_banner_target_lang(File *f, const_String_or_char_ptr commentchar); extern String *Swig_strip_c_comments(const String *s); + extern String *Swig_filename_escape(String *filename); + extern void Swig_filename_correct(String *filename); extern String *Swig_string_escape(String *s); extern String *Swig_string_mangle(const String *s); - extern void Swig_scopename_split(String *s, String **prefix, String **last); - extern String *Swig_scopename_prefix(String *s); - extern String *Swig_scopename_last(String *s); - extern String *Swig_scopename_first(String *s); - extern String *Swig_scopename_suffix(String *s); - extern int Swig_scopename_check(String *s); + extern void Swig_scopename_split(const String *s, String **prefix, String **last); + extern String *Swig_scopename_prefix(const String *s); + extern String *Swig_scopename_last(const String *s); + extern String *Swig_scopename_first(const String *s); + extern String *Swig_scopename_suffix(const String *s); + extern int Swig_scopename_check(const String *s); extern String *Swig_string_lower(String *s); extern String *Swig_string_upper(String *s); extern String *Swig_string_title(String *s); @@ -309,11 +311,11 @@ extern int ParmList_is_compactdefargs(ParmList *p); typedef enum { EMF_STANDARD, EMF_MICROSOFT } ErrorMessageFormat; - extern void Swig_warning(int num, const String_or_char *filename, int line, const char *fmt, ...); - extern void Swig_error(const String_or_char *filename, int line, const char *fmt, ...); + extern void Swig_warning(int num, const_String_or_char_ptr filename, int line, const char *fmt, ...); + extern void Swig_error(const_String_or_char_ptr filename, int line, const char *fmt, ...); extern int Swig_error_count(void); extern void Swig_error_silent(int s); - extern void Swig_warnfilter(const String_or_char *wlist, int val); + extern void Swig_warnfilter(const_String_or_char_ptr wlist, int val); extern void Swig_warnall(void); extern int Swig_warn_count(void); extern void Swig_error_msg_format(ErrorMessageFormat format); @@ -322,17 +324,17 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern String *Swig_cparm_name(Parm *p, int i); extern String *Swig_wrapped_var_type(SwigType *t, int varcref); extern int Swig_cargs(Wrapper *w, ParmList *l); - extern String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_char *decl); + extern String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr decl); - extern String *Swig_cfunction_call(String_or_char *name, ParmList *parms); - extern String *Swig_cconstructor_call(String_or_char *name); - extern String *Swig_cppconstructor_call(String_or_char *name, ParmList *parms); + extern String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms); + extern String *Swig_cconstructor_call(const_String_or_char_ptr name); + extern String *Swig_cppconstructor_call(const_String_or_char_ptr name, ParmList *parms); extern String *Swig_unref_call(Node *n); extern String *Swig_ref_call(Node *n, const String *lname); extern String *Swig_cdestructor_call(Node *n); extern String *Swig_cppdestructor_call(Node *n); - extern String *Swig_cmemberset_call(String_or_char *name, SwigType *type, String_or_char *self, int varcref); - extern String *Swig_cmemberget_call(const String_or_char *name, SwigType *t, String_or_char *self, int varcref); + extern String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref); + extern String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref); extern int Swig_add_extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self); @@ -341,7 +343,7 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern int Swig_MethodToFunction(Node *n, String *classname, int flags, SwigType *director_type, int is_director); extern int Swig_ConstructorToFunction(Node *n, String *classname, String *none_comparison, String *director_ctor, int cplus, int flags); extern int Swig_DestructorToFunction(Node *n, String *classname, int cplus, int flags); - extern int Swig_MembersetToFunction(Node *n, String *classname, int flags); + extern int Swig_MembersetToFunction(Node *n, String *classname, int flags, String **call); extern int Swig_MembergetToFunction(Node *n, String *classname, int flags); extern int Swig_VargetToFunction(Node *n, int flags); extern int Swig_VarsetToFunction(Node *n, int flags); @@ -361,22 +363,22 @@ extern int ParmList_is_compactdefargs(ParmList *p); /* --- Legacy Typemap API (somewhat simplified, ha!) --- */ extern void Swig_typemap_init(void); - extern void Swig_typemap_register(const String_or_char *op, ParmList *pattern, String_or_char *code, ParmList *locals, ParmList *kwargs); - extern int Swig_typemap_copy(const String_or_char *op, ParmList *srcpattern, ParmList *pattern); - extern void Swig_typemap_clear(const String_or_char *op, ParmList *pattern); + extern void Swig_typemap_register(const_String_or_char_ptr op, ParmList *pattern, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs); + extern int Swig_typemap_copy(const_String_or_char_ptr op, ParmList *srcpattern, ParmList *pattern); + extern void Swig_typemap_clear(const_String_or_char_ptr op, ParmList *pattern); extern int Swig_typemap_apply(ParmList *srcpat, ParmList *destpat); extern void Swig_typemap_clear_apply(ParmList *pattern); extern void Swig_typemap_debug(void); - extern Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String_or_char *pname, SwigType **matchtype); - extern Hash *Swig_typemap_search_multi(const String_or_char *op, ParmList *parms, int *nmatch); - extern String *Swig_typemap_lookup(const String_or_char *op, Node *n, const String_or_char *lname, Wrapper *f); - extern String *Swig_typemap_lookup_out(const String_or_char *op, Node *n, const String_or_char *lname, Wrapper *f, String *actioncode); - extern void Swig_typemap_attach_kwargs(Hash *tm, const String_or_char *op, Parm *p); + extern Hash *Swig_typemap_search(const_String_or_char_ptr op, SwigType *type, const_String_or_char_ptr pname, SwigType **matchtype); + extern Hash *Swig_typemap_search_multi(const_String_or_char_ptr op, ParmList *parms, int *nmatch); + extern String *Swig_typemap_lookup(const_String_or_char_ptr op, Node *n, const_String_or_char_ptr lname, Wrapper *f); + extern String *Swig_typemap_lookup_out(const_String_or_char_ptr op, Node *n, const_String_or_char_ptr lname, Wrapper *f, String *actioncode); + extern void Swig_typemap_attach_kwargs(Hash *tm, const_String_or_char_ptr op, Parm *p); extern void Swig_typemap_new_scope(void); extern Hash *Swig_typemap_pop_scope(void); - extern void Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f); + extern void Swig_typemap_attach_parms(const_String_or_char_ptr op, ParmList *parms, Wrapper *f); /* --- Code fragment support --- */ diff --git a/Source/Swig/swigfile.h b/Source/Swig/swigfile.h index c945fb1ac..92c7945e6 100644 --- a/Source/Swig/swigfile.h +++ b/Source/Swig/swigfile.h @@ -9,24 +9,25 @@ /* $Id: swig.h 9603 2006-12-05 21:47:01Z beazley $ */ -extern List *Swig_add_directory(const String_or_char *dirname); -extern void Swig_push_directory(const String_or_char *dirname); -extern void Swig_pop_directory(); -extern String *Swig_last_file(); -extern List *Swig_search_path(); -extern FILE *Swig_open(const String_or_char *name); +extern List *Swig_add_directory(const_String_or_char_ptr dirname); +extern void Swig_push_directory(const_String_or_char_ptr dirname); +extern void Swig_pop_directory(void); +extern String *Swig_last_file(void); +extern List *Swig_search_path(void); +extern FILE *Swig_include_open(const_String_or_char_ptr name); +extern FILE *Swig_open(const_String_or_char_ptr name); extern String *Swig_read_file(FILE *f); -extern String *Swig_include(const String_or_char *name); -extern String *Swig_include_sys(const String_or_char *name); -extern int Swig_insert_file(const String_or_char *name, File *outfile); +extern String *Swig_include(const_String_or_char_ptr name); +extern String *Swig_include_sys(const_String_or_char_ptr name); +extern int Swig_insert_file(const_String_or_char_ptr name, File *outfile); extern void Swig_set_push_dir(int dopush); extern int Swig_get_push_dir(void); -extern void Swig_register_filebyname(const String_or_char *filename, File *outfile); -extern File *Swig_filebyname(const String_or_char *filename); -extern char *Swig_file_suffix(const String_or_char *filename); -extern char *Swig_file_basename(const String_or_char *filename); -extern char *Swig_file_filename(const String_or_char *filename); -extern char *Swig_file_dirname(const String_or_char *filename); +extern void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile); +extern File *Swig_filebyname(const_String_or_char_ptr filename); +extern char *Swig_file_suffix(const_String_or_char_ptr filename); +extern char *Swig_file_basename(const_String_or_char_ptr filename); +extern char *Swig_file_filename(const_String_or_char_ptr filename); +extern char *Swig_file_dirname(const_String_or_char_ptr filename); /* Delimiter used in accessing files and directories */ diff --git a/Source/Swig/swigopt.h b/Source/Swig/swigopt.h index 428d90dce..11eb5ba99 100644 --- a/Source/Swig/swigopt.h +++ b/Source/Swig/swigopt.h @@ -13,4 +13,4 @@ extern void Swig_mark_arg(int n); extern int Swig_check_marked(int n); extern void Swig_check_options(int check_input); - extern void Swig_arg_error(); + extern void Swig_arg_error(void); diff --git a/Source/Swig/swigparm.h b/Source/Swig/swigparm.h index 529438bae..49ae7992e 100644 --- a/Source/Swig/swigparm.h +++ b/Source/Swig/swigparm.h @@ -11,7 +11,7 @@ /* $Id: swig.h 9629 2006-12-30 18:27:47Z beazley $ */ /* Individual parameters */ -extern Parm *NewParm(SwigType *type, const String_or_char *name); +extern Parm *NewParm(SwigType *type, const_String_or_char_ptr name); extern Parm *CopyParm(Parm *p); /* Parameter lists */ diff --git a/Source/Swig/swigscan.h b/Source/Swig/swigscan.h index 2486286a9..3403098df 100644 --- a/Source/Swig/swigscan.h +++ b/Source/Swig/swigscan.h @@ -11,11 +11,11 @@ typedef struct Scanner Scanner; -extern Scanner *NewScanner(); +extern Scanner *NewScanner(void); extern void DelScanner(Scanner *); extern void Scanner_clear(Scanner *); extern void Scanner_push(Scanner *, String *); -extern void Scanner_pushtoken(Scanner *, int, const String_or_char *value); +extern void Scanner_pushtoken(Scanner *, int, const_String_or_char_ptr value); extern int Scanner_token(Scanner *); extern String *Scanner_text(Scanner *); extern void Scanner_skip_line(Scanner *); diff --git a/Source/Swig/swigtree.h b/Source/Swig/swigtree.h index 2e5c4da36..5b43006a9 100644 --- a/Source/Swig/swigtree.h +++ b/Source/Swig/swigtree.h @@ -31,7 +31,7 @@ /* Utility functions */ -extern int checkAttribute(Node *obj, const String_or_char *name, const String_or_char *value); +extern int checkAttribute(Node *obj, const_String_or_char_ptr name, const_String_or_char_ptr value); extern void appendChild(Node *node, Node *child); extern void prependChild(Node *node, Node *child); extern void removeNode(Node *node); diff --git a/Source/Swig/swigwrap.h b/Source/Swig/swigwrap.h index 25eeb6f7f..0dcf88059 100644 --- a/Source/Swig/swigwrap.h +++ b/Source/Swig/swigwrap.h @@ -16,14 +16,14 @@ typedef struct Wrapper { String *code; } Wrapper; -extern Wrapper *NewWrapper(); +extern Wrapper *NewWrapper(void); extern void DelWrapper(Wrapper *w); extern void Wrapper_compact_print_mode_set(int flag); extern void Wrapper_pretty_print(String *str, File *f); extern void Wrapper_compact_print(String *str, File *f); extern void Wrapper_print(Wrapper *w, File *f); -extern int Wrapper_add_local(Wrapper *w, const String_or_char *name, const String_or_char *decl); -extern int Wrapper_add_localv(Wrapper *w, const String_or_char *name, ...); -extern int Wrapper_check_local(Wrapper *w, const String_or_char *name); -extern char *Wrapper_new_local(Wrapper *w, const String_or_char *name, const String_or_char *decl); -extern char *Wrapper_new_localv(Wrapper *w, const String_or_char *name, ...); +extern int Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl); +extern int Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...); +extern int Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name); +extern char *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl); +extern char *Wrapper_new_localv(Wrapper *w, const_String_or_char_ptr name, ...); diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index c9691fa54..055af854f 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -220,7 +220,7 @@ void Swig_symbol_init() { * Set the C scopename of the current symbol table. * ----------------------------------------------------------------------------- */ -void Swig_symbol_setscopename(const String_or_char *name) { +void Swig_symbol_setscopename(const_String_or_char_ptr name) { String *qname; /* assert(!Getattr(current_symtab,"name")); */ Setattr(current_symtab, "name", name); @@ -250,10 +250,10 @@ String *Swig_symbol_getscopename() { * Given a fully qualified C scopename, this function returns a symbol table * ----------------------------------------------------------------------------- */ -Symtab *Swig_symbol_getscope(const String_or_char *name) { +Symtab *Swig_symbol_getscope(const_String_or_char_ptr name) { if (!symtabs) return 0; - if (Equal("::", (String_or_char *) name)) + if (Equal("::", (const_String_or_char_ptr ) name)) name = ""; return Getattr(symtabs, name); } @@ -373,7 +373,7 @@ Symtab *Swig_symbol_current() { * Makes an alias for a symbol in the global symbol table. * ----------------------------------------------------------------------------- */ -void Swig_symbol_alias(String_or_char *aliasname, Symtab *s) { +void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *s) { String *qname = Swig_symbol_qualifiedscopename(current_symtab); if (qname) { Printf(qname, "::%s", aliasname); @@ -421,7 +421,7 @@ void Swig_symbol_inherit(Symtab *s) { * Adds a node to the C symbol table only. * ----------------------------------------------------------------------------- */ -void Swig_symbol_cadd(String_or_char *name, Node *n) { +void Swig_symbol_cadd(const_String_or_char_ptr name, Node *n) { Node *append = 0; Node *cn; @@ -594,7 +594,7 @@ void Swig_symbol_cadd(String_or_char *name, Node *n) { * for namespace support, type resolution, and other issues. * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_add(String_or_char *symname, Node *n) { +Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *n) { Hash *c, *cn, *cl = 0; SwigType *decl, *ndecl; String *cstorage, *nstorage; @@ -827,7 +827,7 @@ Node *Swig_symbol_add(String_or_char *symname, Node *n) { * verifying that a class hierarchy implements all pure virtual methods. * ----------------------------------------------------------------------------- */ -static Node *_symbol_lookup(String *name, Symtab *symtab, int (*check) (Node *n)) { +static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (Node *n)) { Node *n; List *inherit; Hash *sym = Getattr(symtab, "csymtab"); @@ -890,7 +890,7 @@ static Node *_symbol_lookup(String *name, Symtab *symtab, int (*check) (Node *n) return 0; } -static Node *symbol_lookup(String_or_char *name, Symtab *symtab, int (*check) (Node *n)) { +static Node *symbol_lookup(const_String_or_char_ptr name, Symtab *symtab, int (*check) (Node *n)) { Node *n = 0; if (DohCheck(name)) { n = _symbol_lookup(name, symtab, check); @@ -908,7 +908,7 @@ static Node *symbol_lookup(String_or_char *name, Symtab *symtab, int (*check) (N * symbol_lookup_qualified() * ----------------------------------------------------------------------------- */ -static Node *symbol_lookup_qualified(String_or_char *name, Symtab *symtab, String *prefix, int local, int (*checkfunc) (Node *n)) { +static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symtab, const String *prefix, int local, int (*checkfunc) (Node *n)) { /* This is a little funky, we search by fully qualified names */ if (!symtab) @@ -928,6 +928,7 @@ static Node *symbol_lookup_qualified(String_or_char *name, Symtab *symtab, Strin /* Make qualified name of current scope */ String *qalloc = 0; String *qname = Swig_symbol_qualifiedscopename(symtab); + const String *cqname; if (qname) { if (Len(qname)) { if (prefix && Len(prefix)) { @@ -937,10 +938,11 @@ static Node *symbol_lookup_qualified(String_or_char *name, Symtab *symtab, Strin Append(qname, prefix); } qalloc = qname; + cqname = qname; } else { - qname = prefix; + cqname = prefix; } - st = Getattr(symtabs, qname); + st = Getattr(symtabs, cqname); /* Found a scope match */ if (st) { if (!name) { @@ -974,7 +976,7 @@ static Node *symbol_lookup_qualified(String_or_char *name, Symtab *symtab, Strin * to get the real node. * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup(String_or_char *name, Symtab *n) { +Node *Swig_symbol_clookup(const_String_or_char_ptr name, Symtab *n) { Hash *hsym = 0; Node *s = 0; @@ -1046,7 +1048,7 @@ Node *Swig_symbol_clookup(String_or_char *name, Symtab *n) { * inheritance hierarchy. * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup_check(String_or_char *name, Symtab *n, int (*checkfunc) (Node *n)) { +Node *Swig_symbol_clookup_check(const_String_or_char_ptr name, Symtab *n, int (*checkfunc) (Node *n)) { Hash *hsym = 0; Node *s = 0; @@ -1110,7 +1112,7 @@ Node *Swig_symbol_clookup_check(String_or_char *name, Symtab *n, int (*checkfunc * Swig_symbol_clookup_local() * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup_local(String_or_char *name, Symtab *n) { +Node *Swig_symbol_clookup_local(const_String_or_char_ptr name, Symtab *n) { Hash *h, *hsym; Node *s = 0; @@ -1158,7 +1160,7 @@ Node *Swig_symbol_clookup_local(String_or_char *name, Symtab *n) { * Swig_symbol_clookup_local_check() * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup_local_check(String_or_char *name, Symtab *n, int (*checkfunc) (Node *)) { +Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n, int (*checkfunc) (Node *)) { Hash *h, *hsym; Node *s = 0; @@ -1209,7 +1211,7 @@ Node *Swig_symbol_clookup_local_check(String_or_char *name, Symtab *n, int (*che * Look up a scope name. * ----------------------------------------------------------------------------- */ -Symtab *Swig_symbol_cscope(String_or_char *name, Symtab *symtab) { +Symtab *Swig_symbol_cscope(const_String_or_char_ptr name, Symtab *symtab) { char *cname = Char(name); if (strncmp(cname, "::", 2) == 0) return symbol_lookup_qualified(0, global_scope, name, 0, 0); diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index 61dca8353..14d231afa 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -229,7 +229,7 @@ Node *copyNode(Node *n) { * checkAttribute() * ----------------------------------------------------------------------------- */ -int checkAttribute(Node *n, const String_or_char *name, const String_or_char *value) { +int checkAttribute(Node *n, const_String_or_char_ptr name, const_String_or_char_ptr value) { String *v = Getattr(n, name); return v ? Equal(v, value) : 0; } diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 6cbeb67ea..401a99801 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -107,7 +107,7 @@ void Swig_typemap_init() { tm_scope = 0; } -static String *tmop_name(const String_or_char *op) { +static String *tmop_name(const_String_or_char_ptr op) { static Hash *names = 0; String *s; /* Due to "interesting" object-identity semantics of DOH, @@ -164,7 +164,7 @@ Hash *Swig_typemap_pop_scope() { * Add a new multi-valued typemap * ----------------------------------------------------------------------------- */ -void Swig_typemap_register(const String_or_char *op, ParmList *parms, String_or_char *code, ParmList *locals, ParmList *kwargs) { +void Swig_typemap_register(const_String_or_char_ptr op, ParmList *parms, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs) { Hash *tm; Hash *tm1; Hash *tm2; @@ -270,7 +270,7 @@ void Swig_typemap_register(const String_or_char *op, ParmList *parms, String_or_ * Retrieve typemap information from current scope. * ----------------------------------------------------------------------------- */ -static Hash *Swig_typemap_get(SwigType *type, String_or_char *name, int scope) { +static Hash *Swig_typemap_get(SwigType *type, const_String_or_char_ptr name, int scope) { Hash *tm, *tm1; /* See if this type has been seen before */ if ((scope < 0) || (scope > tm_scope)) @@ -292,7 +292,7 @@ static Hash *Swig_typemap_get(SwigType *type, String_or_char *name, int scope) { * Copy a typemap * ----------------------------------------------------------------------------- */ -int Swig_typemap_copy(const String_or_char *op, ParmList *srcparms, ParmList *parms) { +int Swig_typemap_copy(const_String_or_char_ptr op, ParmList *srcparms, ParmList *parms) { Hash *tm = 0; String *tmop; Parm *p; @@ -347,7 +347,7 @@ int Swig_typemap_copy(const String_or_char *op, ParmList *srcparms, ParmList *pa * Delete a multi-valued typemap * ----------------------------------------------------------------------------- */ -void Swig_typemap_clear(const String_or_char *op, ParmList *parms) { +void Swig_typemap_clear(const_String_or_char_ptr op, ParmList *parms) { SwigType *type; String *name; Parm *p; @@ -590,7 +590,7 @@ static SwigType *strip_arrays(SwigType *type) { * that includes a 'code' attribute. * ----------------------------------------------------------------------------- */ -Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String_or_char *name, SwigType **matchtype) { +Hash *Swig_typemap_search(const_String_or_char_ptr op, SwigType *type, const_String_or_char_ptr name, SwigType **matchtype) { Hash *result = 0, *tm, *tm1, *tma; Hash *backup = 0; SwigType *noarrays = 0; @@ -737,7 +737,7 @@ ret_result: * Search for a multi-valued typemap. * ----------------------------------------------------------------------------- */ -Hash *Swig_typemap_search_multi(const String_or_char *op, ParmList *parms, int *nmatch) { +Hash *Swig_typemap_search_multi(const_String_or_char_ptr op, ParmList *parms, int *nmatch) { SwigType *type; SwigType *mtype = 0; String *name; @@ -1173,7 +1173,7 @@ static void typemap_locals(DOHString * s, ParmList *l, Wrapper *f, int argnum) { * $1 in the out typemap will be replaced by the code in actioncode. * ----------------------------------------------------------------------------- */ -static String *Swig_typemap_lookup_impl(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f, String *actioncode) { +static String *Swig_typemap_lookup_impl(const_String_or_char_ptr op, Node *node, const_String_or_char_ptr lname, Wrapper *f, String *actioncode) { SwigType *type; SwigType *mtype = 0; String *pname; @@ -1384,13 +1384,13 @@ static String *Swig_typemap_lookup_impl(const String_or_char *op, Node *node, co return s; } -String *Swig_typemap_lookup_out(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f, String *actioncode) { +String *Swig_typemap_lookup_out(const_String_or_char_ptr op, Node *node, const_String_or_char_ptr lname, Wrapper *f, String *actioncode) { assert(actioncode); assert(Cmp(op, "out") == 0); return Swig_typemap_lookup_impl(op, node, lname, f, actioncode); } -String *Swig_typemap_lookup(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f) { +String *Swig_typemap_lookup(const_String_or_char_ptr op, Node *node, const_String_or_char_ptr lname, Wrapper *f) { return Swig_typemap_lookup_impl(op, node, lname, f, 0); } @@ -1406,7 +1406,7 @@ String *Swig_typemap_lookup(const String_or_char *op, Node *node, const String_o * A new attribute called "tmap:in:foo" with value "xyz" is attached to p. * ----------------------------------------------------------------------------- */ -void Swig_typemap_attach_kwargs(Hash *tm, const String_or_char *op, Parm *p) { +void Swig_typemap_attach_kwargs(Hash *tm, const_String_or_char_ptr op, Parm *p) { String *temp = NewStringEmpty(); Parm *kw = Getattr(tm, "kwargs"); while (kw) { @@ -1438,7 +1438,7 @@ void Swig_typemap_attach_kwargs(Hash *tm, const String_or_char *op, Parm *p) { * attribute, print that warning message. * ----------------------------------------------------------------------------- */ -static void Swig_typemap_warn(const String_or_char *op, Parm *p) { +static void Swig_typemap_warn(const_String_or_char_ptr op, Parm *p) { String *temp = NewStringf("%s:warning", op); String *w = Getattr(p, tmop_name(temp)); Delete(temp); @@ -1447,7 +1447,7 @@ static void Swig_typemap_warn(const String_or_char *op, Parm *p) { } } -static void Swig_typemap_emit_code_fragments(const String_or_char *op, Parm *p) { +static void Swig_typemap_emit_code_fragments(const_String_or_char_ptr op, Parm *p) { String *temp = NewStringf("%s:fragment", op); String *f = Getattr(p, tmop_name(temp)); if (f) { @@ -1467,7 +1467,7 @@ static void Swig_typemap_emit_code_fragments(const String_or_char *op, Parm *p) * given typemap type * ----------------------------------------------------------------------------- */ -String *Swig_typemap_get_option(Hash *tm, String *name) { +String *Swig_typemap_get_option(Hash *tm, const_String_or_char_ptr name) { Parm *kw = Getattr(tm, "kwargs"); while (kw) { String *kname = Getattr(kw, "name"); @@ -1479,7 +1479,7 @@ String *Swig_typemap_get_option(Hash *tm, String *name) { return 0; } -void Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f) { +void Swig_typemap_attach_parms(const_String_or_char_ptr op, ParmList *parms, Wrapper *f) { Parm *p, *firstp; Hash *tm; int nmatch = 0; diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 18d1b2304..8ff31bc0b 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -110,7 +110,7 @@ char cvsroot_typeobj_c[] = "$Id$"; * ----------------------------------------------------------------------------- */ #ifdef NEW -SwigType *NewSwigType(const String_or_char *initial) { +SwigType *NewSwigType(const_String_or_char_ptr initial) { return NewString(initial); } @@ -419,7 +419,7 @@ int SwigType_isreference(SwigType *t) { * stored in exactly the same way as "q(const volatile)". * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_qualifier(SwigType *t, const String_or_char *qual) { +SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { char temp[256], newq[256]; int sz, added = 0; char *q, *cqual; @@ -537,7 +537,7 @@ SwigType *SwigType_functionpointer_decompose(SwigType *t) { * Add, remove, and test for C++ pointer to members. * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_memberpointer(SwigType *t, const String_or_char *name) { +SwigType *SwigType_add_memberpointer(SwigType *t, const_String_or_char_ptr name) { String *temp = NewStringf("m(%s).", name); Insert(t, 0, temp); Delete(temp); @@ -579,7 +579,7 @@ int SwigType_ismemberpointer(SwigType *t) { * SwigType_pop_arrays() - Remove all arrays * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_array(SwigType *t, const String_or_char *size) { +SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size) { char temp[512]; strcpy(temp, "a("); strcat(temp, Char(size)); @@ -673,7 +673,7 @@ String *SwigType_array_getdim(SwigType *t, int n) { } /* Replace nth array dimension */ -void SwigType_array_setdim(SwigType *t, int n, const String_or_char *rep) { +void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep) { String *result = 0; char temp; char *start; diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index ae6ab3dc8..2562e12f8 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -163,7 +163,7 @@ void SwigType_typesystem_init() { * already defined. * ----------------------------------------------------------------------------- */ -int SwigType_typedef(SwigType *type, String_or_char *name) { +int SwigType_typedef(SwigType *type, const_String_or_char_ptr name) { if (Getattr(current_typetab, name)) return -1; /* Already defined */ if (Strcmp(type, name) == 0) { /* Can't typedef a name to itself */ @@ -193,7 +193,7 @@ int SwigType_typedef(SwigType *type, String_or_char *name) { * Defines a class in the current scope. * ----------------------------------------------------------------------------- */ -int SwigType_typedef_class(String_or_char *name) { +int SwigType_typedef_class(const_String_or_char_ptr name) { String *cname; /* Printf(stdout,"class : '%s'\n", name); */ if (Getattr(current_typetab, name)) @@ -232,7 +232,7 @@ String *SwigType_scope_name(Typetab *ttab) { * Creates a new scope * ----------------------------------------------------------------------------- */ -void SwigType_new_scope(const String_or_char *name) { +void SwigType_new_scope(const_String_or_char_ptr name) { Typetab *s; Hash *ttab; String *qname; @@ -539,7 +539,7 @@ static SwigType *typedef_resolve(Typetab *s, String *base) { * ----------------------------------------------------------------------------- */ /* #define SWIG_DEBUG */ -SwigType *SwigType_typedef_resolve(SwigType *t) { +SwigType *SwigType_typedef_resolve(const SwigType *t) { String *base; String *type = 0; String *r = 0; @@ -840,6 +840,7 @@ SwigType *SwigType_typedef_resolve_all(SwigType *t) { * * Given a type declaration, this function tries to fully qualify it according to * typedef scope rules. + * Inconsistency to be fixed: ::Foo returns ::Foo, whereas ::Foo * returns Foo * * ----------------------------------------------------------------------------- */ SwigType *SwigType_typedef_qualified(SwigType *t) { @@ -847,7 +848,7 @@ SwigType *SwigType_typedef_qualified(SwigType *t) { String *result; int i, len; - if (t && strncmp(Char(t), "::", 2) == 0) { + if (strncmp(Char(t), "::", 2) == 0) { return Copy(t); } @@ -1071,7 +1072,7 @@ int SwigType_istypedef(SwigType *t) { * Name is a qualified name like A::B. * ----------------------------------------------------------------------------- */ -int SwigType_typedef_using(String_or_char *name) { +int SwigType_typedef_using(const_String_or_char_ptr name) { String *base; String *td; String *prefix; @@ -1415,7 +1416,7 @@ static Hash *r_remembered = 0; /* Hash of types we remembered already */ static void (*r_tracefunc) (SwigType *t, String *mangled, String *clientdata) = 0; -void SwigType_remember_mangleddata(String *mangled, const String_or_char *clientdata) { +void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr clientdata) { if (!r_mangleddata) { r_mangleddata = NewHash(); } @@ -1423,7 +1424,7 @@ void SwigType_remember_mangleddata(String *mangled, const String_or_char *client } -void SwigType_remember_clientdata(SwigType *t, const String_or_char *clientdata) { +void SwigType_remember_clientdata(SwigType *t, const_String_or_char_ptr clientdata) { String *mt; SwigType *lt; Hash *h; diff --git a/Source/Swig/wrapfunc.c b/Source/Swig/wrapfunc.c index 3778066ce..11518bfc2 100644 --- a/Source/Swig/wrapfunc.c +++ b/Source/Swig/wrapfunc.c @@ -23,7 +23,7 @@ static int Max_line_size = 128; * Create a new wrapper function object. * ----------------------------------------------------------------------------- */ -Wrapper *NewWrapper() { +Wrapper *NewWrapper(void) { Wrapper *w; w = (Wrapper *) malloc(sizeof(Wrapper)); w->localh = NewHash(); @@ -406,7 +406,7 @@ void Wrapper_print(Wrapper *w, File *f) { * present (which may or may not be okay to the caller). * ----------------------------------------------------------------------------- */ -int Wrapper_add_local(Wrapper *w, const String_or_char *name, const String_or_char *decl) { +int Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl) { /* See if the local has already been declared */ if (Getattr(w->localh, name)) { return -1; @@ -424,7 +424,7 @@ int Wrapper_add_local(Wrapper *w, const String_or_char *name, const String_or_ch * to manually construct the 'decl' string before calling. * ----------------------------------------------------------------------------- */ -int Wrapper_add_localv(Wrapper *w, const String_or_char *name, ...) { +int Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...) { va_list ap; int ret; String *decl; @@ -451,7 +451,7 @@ int Wrapper_add_localv(Wrapper *w, const String_or_char *name, ...) { * Check to see if a local name has already been declared * ----------------------------------------------------------------------------- */ -int Wrapper_check_local(Wrapper *w, const String_or_char *name) { +int Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name) { if (Getattr(w->localh, name)) { return 1; } @@ -465,7 +465,7 @@ int Wrapper_check_local(Wrapper *w, const String_or_char *name) { * used. Returns the name that was actually selected. * ----------------------------------------------------------------------------- */ -char *Wrapper_new_local(Wrapper *w, const String_or_char *name, const String_or_char *decl) { +char *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl) { int i; String *nname = NewString(name); String *ndecl = NewString(decl); @@ -496,7 +496,7 @@ char *Wrapper_new_local(Wrapper *w, const String_or_char *name, const String_or_ * to manually construct the 'decl' string before calling. * ----------------------------------------------------------------------------- */ -char *Wrapper_new_localv(Wrapper *w, const String_or_char *name, ...) { +char *Wrapper_new_localv(Wrapper *w, const_String_or_char_ptr name, ...) { va_list ap; char *ret; String *decl; diff --git a/TODO b/TODO index 103185d23..879e65f1f 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,5 @@ SWIG TO-DO -Release: SWIG-1.3.36 - ----------------------------------------------------------------------------- **** = High Priority @@ -339,6 +337,14 @@ Common Lisp typemaps would be written as Lisp programs that generate Lisp code. +ALLEGROCL +----- +These first three will remove most of the warnings from most of the +remaining checkpartial tests that are failing. +**** Throws typemap support +**** const typemaps +**** long long typemaps + Ocaml ----- ** I've been working with my camlp4 module and type information diff --git a/Tools/config/config.guess b/Tools/config/config.guess deleted file mode 100755 index 7b24a8728..000000000 --- a/Tools/config/config.guess +++ /dev/null @@ -1,1542 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2008-11-15' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Tools/config/config.sub b/Tools/config/config.sub deleted file mode 100755 index 053e7381f..000000000 --- a/Tools/config/config.sub +++ /dev/null @@ -1,1677 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2008-09-08' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Tools/mkdist.py b/Tools/mkdist.py index f5bdd01c7..0e2eafa79 100755 --- a/Tools/mkdist.py +++ b/Tools/mkdist.py @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/env python # This script builds a swig-1.3 distribution. # Usage : mkdist.py version, where version should be 1.3.x @@ -43,11 +43,6 @@ os.system("svn export -r HEAD https://swig.svn.sourceforge.net/svnroot/swig/trun os.system("rm -Rf "+dirname+"/debian") == 0 or failed() -# Blow away all .cvsignore files - -print "Blowing away .cvsignore files" -os.system("find "+dirname+" -name .cvsignore -exec rm {} \\;") == 0 or failed() - # Go build the system print "Building system" @@ -61,7 +56,8 @@ os.system("find "+dirname+" -name autom4te.cache -exec rm -rf {} \\;") # Build documentation print "Building documentation" -os.system("cd "+dirname+"/Doc/Manual && make && rm *.bak") == 0 or failed() +os.system("cd "+dirname+"/Doc/Manual && make all clean-baks") == 0 or failed() +os.system("cd "+dirname+"/CCache && yodl2man -o ccache-swig.1 ccache.yo") == 0 or failed() # Build the tar-ball os.system("tar -cf "+dirname+".tar "+dirname) == 0 or failed() diff --git a/Tools/mkrelease.py b/Tools/mkrelease.py index d7927f8e6..edf3b07fe 100755 --- a/Tools/mkrelease.py +++ b/Tools/mkrelease.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # This script builds the SWIG source tarball, creates the Windows executable and the Windows zip package # and uploads them both to SF ready for release diff --git a/Tools/mkwindows.sh b/Tools/mkwindows.sh index 116e32d11..fb2547e14 100755 --- a/Tools/mkwindows.sh +++ b/Tools/mkwindows.sh @@ -82,10 +82,13 @@ if test -f "$tarball"; then echo "Compiling (quietly)..." make > build.log echo "Simple check to see if swig.exe runs..." - env LD_LIBRARY_PATH= PATH= ./swig.exe -version + env LD_LIBRARY_PATH= PATH= ./swig.exe -version || exit 1 + echo "Simple check to see if ccache-swig.exe runs..." + env LD_LIBRARY_PATH= PATH= ./CCache/ccache-swig.exe -V || exit 1 echo "Creating $swigwinbasename.zip..." cd .. cp $swigbasename/swig.exe $swigwinbasename + cp $swigbasename/CCache/ccache-swig.exe $swigwinbasename/CCache cp $swigbasename/Lib/swigwarn.swg $swigwinbasename/Lib sleep 2 # fix strange not finding swig.exe echo "Unzip into a directory of your choice. Please read the README file as well as Doc\Manual\Windows.html for installation instructions." > swig_windows_zip_comments.txt diff --git a/Tools/pyname_patch.py b/Tools/pyname_patch.py new file mode 100644 index 000000000..5931269f9 --- /dev/null +++ b/Tools/pyname_patch.py @@ -0,0 +1,123 @@ +#!/usr/bin/env python +""" +From SWIG 1.3.37 we deprecated all SWIG symbols that start with Py, +since they are inappropriate and discouraged in Python documentation +(from http://www.python.org/doc/2.5.2/api/includes.html): + +"All user visible names defined by Python.h (except those defined by the included +standard headers) have one of the prefixes "Py" or "_Py". Names beginning with +"_Py" are for internal use by the Python implementation and should not be used +by extension writers. Structure member names do not have a reserved prefix. + +Important: user code should never define names that begin with "Py" or "_Py". +This confuses the reader, and jeopardizes the portability of the user code to +future Python versions, which may define additional names beginning with one +of these prefixes." + +This file is a simple script used for change all of these symbols, for user code +or SWIG itself. +""" +import re +from shutil import copyfile +import sys + +symbols = [ + #(old name, new name) + ("PySequence_Base", "SwigPySequence_Base"), + ("PySequence_Cont", "SwigPySequence_Cont"), + ("PySwigIterator_T", "SwigPyIterator_T"), + ("PyPairBoolOutputIterator", "SwigPyPairBoolOutputIterator"), + ("PySwigIterator", "SwigPyIterator"), + ("PySwigIterator_T", "SwigPyIterator_T"), + ("PyMapIterator_T", "SwigPyMapIterator_T"), + ("PyMapKeyIterator_T", "SwigPyMapKeyIterator_T"), + ("PyMapValueIterator_T", "SwigPyMapValueITerator_T"), + ("PyObject_ptr", "SwigPtr_PyObject"), + ("PyObject_var", "SwigVar_PyObject"), + ("PyOper", "SwigPyOper"), + ("PySeq", "SwigPySeq"), + ("PySequence_ArrowProxy", "SwigPySequence_ArrowProxy"), + ("PySequence_Cont", "SwigPySequence_Cont"), + ("PySequence_InputIterator", "SwigPySequence_InputIterator"), + ("PySequence_Ref", "SwigPySequence_Ref"), + ("PySwigClientData", "SwigPyClientData"), + ("PySwigClientData_Del", "SwigPyClientData_Del"), + ("PySwigClientData_New", "SwigPyClientData_New"), + ("PySwigIterator", "SwigPyIterator"), + ("PySwigIteratorClosed_T", "SwigPyIteratorClosed_T"), + ("PySwigIteratorOpen_T", "SwigPyIteratorOpen_T"), + ("PySwigIterator_T", "SwigPyIterator_T"), + ("PySwigObject", "SwigPyObject"), + ("PySwigObject_Check", "SwigPyObject_Check"), + ("PySwigObject_GetDesc", "SwigPyObject_GetDesc"), + ("PySwigObject_New", "SwigPyObject_New"), + ("PySwigObject_acquire", "SwigPyObject_acquire"), + ("PySwigObject_append", "SwigPyObject_append"), + ("PySwigObject_as_number", "SwigPyObject_as_number"), + ("PySwigObject_compare", "SwigPyObject_compare"), + ("PySwigObject_dealloc", "SwigPyObject_dealloc"), + ("PySwigObject_disown", "SwigPyObject_disown"), + ("PySwigObject_format", "SwigPyObject_format"), + ("PySwigObject_getattr", "SwigPyObject_getattr"), + ("PySwigObject_hex", "SwigPyObject_hex"), + ("PySwigObject_long", "SwigPyObject_long"), + ("PySwigObject_next", "SwigPyObject_next"), + ("PySwigObject_oct", "SwigPyObject_oct"), + ("PySwigObject_own", "SwigPyObject_own"), + ("PySwigObject_print", "SwigPyObject_print"), + ("PySwigObject_repr", "SwigPyObject_repr"), + ("PySwigObject_richcompare", "SwigPyObject_richcompare"), + ("PySwigObject_str", "SwigPyObject_str"), + ("PySwigObject_type", "SwigPyObject_type"), + ("PySwigPacked", "SwigPyPacked"), + ("PySwigPacked_Check", "SwigPyPacked_Check"), + ("PySwigPacked_New", "SwigPyPacked_New"), + ("PySwigPacked_UnpackData", "SwigPyPacked_UnpackData"), + ("PySwigPacked_compare", "SwigPyPacked_compare"), + ("PySwigPacked_dealloc", "SwigPyPacked_dealloc"), + ("PySwigPacked_print", "SwigPyPacked_print"), + ("PySwigPacked_repr", "SwigPyPacked_repr"), + ("PySwigPacked_str", "SwigPyPacked_str"), + ("PySwigPacked_type", "SwigPyPacked_type"), + ("pyseq", "swigpyseq"), + ("pyswigobject_type", "swigpyobject_type"), + ("pyswigpacked_type", "swigpypacked_type"), + ] + +res = [(re.compile("\\b(%s)\\b"%oldname), newname) for oldname, newname in symbols] + +def patch_file(fn): + newf = [] + changed = False + for line in open(fn): + for r, newname in res: + line, n = r.subn(newname, line) + if n>0: + changed = True + newf.append(line) + + if changed: + copyfile(fn, fn+".bak") + f = open(fn, "w") + f.write("".join(newf)) + f.close() + return changed + +def main(fns): + for fn in fns: + try: + if patch_file(fn): + print "Patched file", fn + except IOError: + print "Error occured during patching", fn + return + +if __name__=="__main__": + if len(sys.argv) > 1: + main(sys.argv[1:]) + else: + print "Patch your interface file for SWIG's Py* symbol name deprecation." + print "Usage:" + print " %s files..."%sys.argv[0] + + diff --git a/autogen.sh b/autogen.sh index 33f54aa7c..97916d9f3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,9 +2,8 @@ # Bootstrap the development environment - add extra files needed to run configure. # Note autoreconf should do what this file achieves, but it has a bug when working with automake! -# The latest config.guess and config.sub should be copied into Tools/config and checked into SVN -# when upgrading the autotools. Otherwise this script will ensure the latest is copied from -# your autotool installation. +# The latest config.guess and config.sub should be copied into Tools/config. +# This script will ensure the latest is copied from your autotool installation. set -e set -x @@ -13,3 +12,4 @@ ${ACLOCAL-aclocal} -I Tools/config ${AUTOHEADER-autoheader} ${AUTOMAKE-automake} --add-missing --copy --force-missing ${AUTOCONF-autoconf} +cd CCache && ${AUTORECONF-autoreconf} diff --git a/configure.in b/configure.in index a8b8be5f3..c6f2c2970 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[1.3.37],[http://www.swig.org]) +AC_INIT([swig],[1.3.40],[http://www.swig.org]) AC_PREREQ(2.58) AC_CONFIG_SRCDIR([Source/Swig/swig.h]) AC_CONFIG_AUX_DIR([Tools/config]) @@ -21,26 +21,83 @@ AH_BOTTOM([ #endif ]) -dnl Checks for programs. +dnl Check for programs that a user requires to build SWIG AC_PROG_CC AC_PROG_CXX -AC_PROG_YACC AC_EXEEXT AC_OBJEXT -AC_PROG_RANLIB AM_PROG_CC_C_O # Needed for subdir-objects in AUTOMAKE_OPTIONS -AC_CHECK_PROGS(AR, ar aal, ar) -AC_SUBST(AR) AC_COMPILE_WARNINGS # Increase warning levels AC_DEFINE_UNQUOTED(SWIG_CXX, ["$CXX"], [Compiler that built SWIG]) AC_DEFINE_UNQUOTED(SWIG_PLATFORM, ["$build"], [Platform that SWIG is built for]) - dnl Checks for header files. AC_HEADER_STDC +dnl Checks for types. +AC_LANG_PUSH([C++]) +AC_CHECK_TYPES([bool]) +AC_LANG_POP([C++]) + +dnl Look for popen +AC_ARG_WITH(popen, AS_HELP_STRING([--without-popen], [Disable popen]), with_popen="$withval") +if test x"${with_popen}" = xno ; then +AC_MSG_NOTICE([Disabling popen]) +else +AC_CHECK_FUNC(popen, AC_DEFINE(HAVE_POPEN, 1, [Define if popen is available]), AC_MSG_NOTICE([Disabling popen])) +fi + +dnl Look for RxSpencer +AC_ARG_WITH(rxspencer, AS_HELP_STRING([--with-rxspencer], [Enable RxSpencer]), with_rxspencer="yes") +if test x"${with_rxspencer}" = xyes ; then +#check first for the header + AC_CHECK_HEADER(rxspencer/regex.h,with_rxspencer="yes",with_rxspencer="no") + if test x"${with_rxspencer}" = xyes ; then +# now check for the library + AC_CHECK_LIB(rxspencer, regcomp,with_rxspencer="yes",with_rxspencer="no") + fi + if test x"${with_rxspencer}" = xyes ; then +# library and header are available + AC_DEFINE(HAVE_RXSPENCER, 1,[Define if rxspencer is available]) + LIBS="$LIBS -lrxspencer" + else + AC_MSG_NOTICE([RxSpencer not found. Obtain it at http://arglist.com/regex or http://gnuwin32.sourceforge.net/packages.html]) + fi +fi + +dnl CCache +AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes]) +AC_MSG_CHECKING([whether to enable ccache-swig]) +AC_MSG_RESULT([$enable_ccache]) + +if test "$enable_ccache" = yes; then + AC_CONFIG_SUBDIRS(CCache) + ENABLE_CCACHE=1 +fi +AC_SUBST(ENABLE_CCACHE) + + +echo "" +echo "Checking packages required for SWIG developers." +echo "Note : None of the following packages are required for users to compile and install SWIG" +echo "" + +AC_PROG_YACC +AC_PROG_RANLIB +AC_CHECK_PROGS(AR, ar aal, ar) +AC_SUBST(AR) +AC_CHECK_PROGS(YODL2MAN, yodl2man) +AC_CHECK_PROGS(YODL2HTML, yodl2html) + + +echo "" +echo "Checking for installed target languages and other information in order to compile and run the examples." +echo "Note : None of the following packages are required for users to compile and install SWIG" +echo "" + + dnl How to specify include directories that may be system directories. # -I should not be used on system directories (GCC) if test "$GCC" = yes; then @@ -50,21 +107,9 @@ else fi -dnl Checks for types. -AC_LANG_PUSH([C++]) -AC_CHECK_TYPES([bool]) -AC_LANG_POP([C++]) +dnl Info for building shared libraries ... in order to run the examples - -# Set info about shared libraries. -AC_SUBST(SO) -AC_SUBST(LDSHARED) -AC_SUBST(CCSHARED) -AC_SUBST(CXXSHARED) -AC_SUBST(TRYLINKINGWITHCXX) -AC_SUBST(LINKFORSHARED) - -# SO is the extension of shared libraries `(including the dot!) +# SO is the extension of shared libraries (including the dot!) AC_MSG_CHECKING(SO) if test -z "$SO" then @@ -201,7 +246,6 @@ then esac fi AC_MSG_RESULT($RPATH) -AC_SUBST(RPATH) # LINKFORSHARED are the flags passed to the $(CC) command that links # the a few executables -- this is only needed for a few systems @@ -221,6 +265,15 @@ then fi AC_MSG_RESULT($LINKFORSHARED) +# Set info about shared libraries. +AC_SUBST(SO) +AC_SUBST(LDSHARED) +AC_SUBST(CCSHARED) +AC_SUBST(CXXSHARED) +AC_SUBST(TRYLINKINGWITHCXX) +AC_SUBST(LINKFORSHARED) +AC_SUBST(RPATH) + # This variation is needed on OS-X because there is no (apparent) consistency in shared library naming. # Sometimes .bundle works, but sometimes .so is needed. It depends on the target language @@ -243,10 +296,10 @@ case $host in *) GUILE_SO=$SO;; esac -AC_SUBST(PHP4_SO) +AC_SUBST(PHP_SO) case $host in - *-*-darwin*) PHP4_SO=.so;; - *) PHP4_SO=$SO;; + *-*-darwin*) PHP_SO=.so;; + *) PHP_SO=$SO;; esac AC_SUBST(MZSCHEME_SO) @@ -269,46 +322,6 @@ case $host in esac - -echo "" -echo "Checking for installed packages." -echo "Note : None of the following packages are required to compile SWIG" -echo "" - -#---------------------------------------------------------------- -# Look for popen -#---------------------------------------------------------------- - -AC_ARG_WITH(popen, AS_HELP_STRING([--without-popen], [Disable popen]), with_popen="$withval") -if test x"${with_popen}" = xno ; then -AC_MSG_NOTICE([Disabling popen]) -else -AC_CHECK_FUNC(popen, AC_DEFINE(HAVE_POPEN, 1, [Define if popen is available]), AC_MSG_NOTICE([Disabling popen])) -fi - -#---------------------------------------------------------------- -# Look for RxSpencer -#---------------------------------------------------------------- - -AC_ARG_WITH(rxspencer, AS_HELP_STRING([--with-rxspencer], [Enable RxSpencer]), with_rxspencer="yes") -if test x"${with_rxspencer}" = xyes ; then -#check first for the header - AC_CHECK_HEADER(rxspencer/regex.h,with_rxspencer="yes",with_rxspencer="no") - if test x"${with_rxspencer}" = xyes ; then -# now check for the library - AC_CHECK_LIB(rxspencer, regcomp,with_rxspencer="yes",with_rxspencer="no") - fi - if test x"${with_rxspencer}" = xyes ; then -# library and header are available - AC_DEFINE(HAVE_RXSPENCER, 1,[Define if rxspencer is available]) - LIBS="$LIBS -lrxspencer" - else - AC_MSG_NOTICE([RxSpencer not found. Obtain it at http://arglist.com/regex or http://gnuwin32.sourceforge.net/packages.html]) - fi -fi - -#---------------------------------------------------------------- - # Check for specific libraries. Used for SWIG examples AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX @@ -376,12 +389,12 @@ if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include /usr/X11R6/include /usr/include/X11R6" for i in $dirs ; do if test -r $i/X11/Intrinsic.h; then - AC_MSG_RESULT($i) XINCLUDES=" -I$i" break fi done fi + AC_MSG_RESULT($XINCLUDES) else if test "$x_includes" != ""; then XINCLUDES=-I$x_includes @@ -533,14 +546,27 @@ fi # Cygwin (Windows) needs the library for dynamic linking case $host in *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; -*-*-darwin*) TCLDYNAMICLINKING="-dynamiclib -flat_namespace -undefined suppress";; *)TCLDYNAMICLINKING="";; esac + +case $host in +*-*-darwin*) + TCLLDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace' + TCLCXXSHARED='$(CXX) -dynamiclib -undefined suppress -flat_namespace' + ;; +*) + TCLLDSHARED='$(LDSHARED)' + TCLCXXSHARED='$(CXXSHARED)' + ;; +esac + fi AC_SUBST(TCLINCLUDE) AC_SUBST(TCLLIB) AC_SUBST(TCLDYNAMICLINKING) +AC_SUBST(TCLLDSHARED) +AC_SUBST(TCLCXXSHARED) #---------------------------------------------------------------- # Look for Python @@ -560,7 +586,7 @@ else # First figure out the name of the Python executable if test "x$PYBIN" = xyes; then -AC_CHECK_PROGS(PYTHON, python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python) +AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python]) else PYTHON="$PYBIN" fi @@ -644,6 +670,107 @@ AC_SUBST(PYLIB) AC_SUBST(PYLINK) AC_SUBST(PYTHONDYNAMICLINKING) + +#---------------------------------------------------------------- +# Look for Python 3.x +#---------------------------------------------------------------- + +# mostly copy & pasted from "Look for Python" section, +# did some trim, fix and rename + +PY3INCLUDE= +PY3LIB= +PY3PACKAGE= + +AC_ARG_WITH(python3, AS_HELP_STRING([--without-python3], [Disable Python 3.x support]) +AS_HELP_STRING([--with-python3=path], [Set location of Python 3.x executable]),[ PY3BIN="$withval"], [PY3BIN=yes]) + +# First, check for "--without-python3" or "--with-python3=no". +if test x"${PY3BIN}" = xno -o x"${with_alllang}" = xno ; then +AC_MSG_NOTICE([Disabling Python 3.x support]) +else +# First figure out the name of the Python3 executable + +if test "x$PY3BIN" = xyes; then + AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1]) +else + PYTHON3="$PY3BIN" +fi + +# Check for Python 3.x development tools (header files, static library and python3-config) +if test "x$PYTHON3" = x; then + AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config]) +else + AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config]) +fi + +if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then + AC_MSG_CHECKING([for Python 3.x prefix]) + PY3PREFIX=`($PY3CONFIG --prefix) 2>/dev/null` + AC_MSG_RESULT($PY3PREFIX) + AC_MSG_CHECKING(for Python 3.x exec-prefix) + PY3EPREFIX=`($PY3CONFIG --exec-prefix) 2>/dev/null` + AC_MSG_RESULT($PY3EPREFIX) + + # Note: I could not think of a standard way to get the version string from different versions. + # This trick pulls it out of the file location for a standard library file. + + AC_MSG_CHECKING([for Python 3.x version]) + + # Need to do this hack since autoconf replaces __file__ with the name of the configure file + filehack="file__" + PY3VERSION=`($PYTHON3 -c "import string,operator,os.path; print(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")` + AC_MSG_RESULT($PY3VERSION) + + # Find the directory for libraries this is necessary to deal with + # platforms that can have apps built for multiple archs: e.g. x86_64 + AC_MSG_CHECKING([for Python 3.x lib dir]) + PY3LIBDIR=`($PYTHON3 -c "import sys; print(sys.lib)") 2>/dev/null` + if test -z "$PY3LIBDIR"; then + # some dists don't have sys.lib so the best we can do is assume lib + PY3LIBDIR="lib" + fi + AC_MSG_RESULT($PY3LIBDIR) + + # Set the include directory + + AC_MSG_CHECKING([for Python 3.x header files]) + PY3INCLUDE=`($PY3CONFIG --includes) 2>/dev/null` + AC_MSG_RESULT($PY3INCLUDE) + + # Set the library directory blindly. This probably won't work with older versions + AC_MSG_CHECKING([for Python 3.x library]) + dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR" + for i in $dirs; do + if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then + PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i" + break + fi + done + if test -z "$PY3LIB"; then + AC_MSG_RESULT([Not found]) + else + AC_MSG_RESULT($PY3LIB) + fi + + PY3LINK="-l$PY3VERSION" +fi + +# Cygwin (Windows) needs the library for dynamic linking +case $host in +*-*-cygwin* | *-*-mingw*) PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK" + DEFS="-DUSE_DL_IMPORT $DEFS" PY3INCLUDE="$PY3INCLUDE" + ;; +*)PYTHON3DYNAMICLINKING="";; +esac +fi + +AC_SUBST(PY3INCLUDE) +AC_SUBST(PY3LIB) +AC_SUBST(PY3LINK) +AC_SUBST(PYTHON3DYNAMICLINKING) + + #---------------------------------------------------------------- # Look for Perl5 #---------------------------------------------------------------- @@ -732,13 +859,13 @@ OCTAVEDYNAMICLINKING= OCTAVE_SO=.oct AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave]) -AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[ OCTAVEBIN="$withval"], [OCTAVEBIN=yes]) +AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN=yes]) # First, check for "--without-octave" or "--with-octave=no". if test x"${OCTAVEBIN}" = xno -o x"${with_alllang}" = xno ; then AC_MSG_NOTICE([Disabling Octave]) OCTAVE= -fi +else # First figure out what the name of Octave is @@ -779,6 +906,8 @@ else AC_MSG_RESULT(could not figure out how to run octave) fi +fi + AC_SUBST(OCTAVE) AC_SUBST(OCTAVEEXT) AC_SUBST(OCTAVE_SO) @@ -1066,25 +1195,35 @@ AC_ARG_WITH(mzc, AS_HELP_STRING([--with-mzc=path], [Set location of MzScheme's m # First, check for "--without-mzscheme" or "--with-mzscheme=no". if test x"${MZSCHEMEBIN}" = xno -o x"${with_alllang}" = xno ; then -AC_MSG_NOTICE([Disabling MzScheme]) -MZC= + AC_MSG_NOTICE([Disabling MzScheme]) + MZC= else + if test "x$MZSCHEMEBIN" = xyes; then + AC_PATH_PROG(MZSCHEME, mzscheme) + else + MZSCHEME="$MZSCHEMEBIN" + fi + + if test -z "$MZCBIN"; then + AC_PATH_PROG(MZC, mzc) + fi -if test "x$MZSCHEMEBIN" = xyes; then - AC_PATH_PROG(MZSCHEME, mzscheme) -else - MZSCHEME="$MZSCHEMEBIN" -fi - -if test -z "$MZCBIN"; then - AC_PATH_PROG(MZC, mzc) -fi - -if test -n "$MZSCHEME"; then -AC_MSG_CHECKING(for MzScheme dynext object) -MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) (expand-for-link-variant (current-standard-link-libraries)))))'` -AC_MSG_RESULT($MZDYNOBJ) -fi + if test -n "$MZSCHEME"; then + AC_MSG_CHECKING(for MzScheme dynext object) + MZDYNOBJ=`$MZSCHEME --eval '(begin (require dynext/link) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (printf "~a" x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` + if test -f "$MZDYNOBJ"; then + MZDYNOBJ="$MZDYNOBJ" + else + # older versions (3.72 approx and earlier) + MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` + fi + if test -f "$MZDYNOBJ"; then + AC_MSG_RESULT($MZDYNOBJ) + else + AC_MSG_RESULT(not found) + MZDYNOBJ="" + fi + fi fi AC_SUBST(MZDYNOBJ) @@ -1114,7 +1253,7 @@ fi AC_MSG_CHECKING(for Ruby header files) if test -n "$RUBY"; then RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null` - if test "$RUBYDIR" != ""; then + if test x"$RUBYDIR" != x""; then dirs="$RUBYDIR" RUBYINCLUDE=none for i in $dirs; do @@ -1213,37 +1352,37 @@ AC_SUBST(RUBYDYNAMICLINKING) # Look for PHP #------------------------------------------------------------------------- -PHP4BIN= +PHPBIN= -AC_ARG_WITH(php4, AS_HELP_STRING([--without-php4], [Disable PHP]) -AS_HELP_STRING([--with-php4=path], [Set location of PHP executable]),[ PHP4BIN="$withval"], [PHP4BIN=yes]) +AC_ARG_WITH(php, AS_HELP_STRING([--without-php], [Disable PHP]) +AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHPBIN="$withval"], [PHPBIN=yes]) -# First, check for "--without-php4" or "--with-php4=no". -if test x"${PHP4BIN}" = xno -o x"${with_alllang}" = xno ; then +# First, check for "--without-php" or "--with-php=no". +if test x"${PHPBIN}" = xno -o x"${with_alllang}" = xno ; then AC_MSG_NOTICE([Disabling PHP]) - PHP4= + PHP= else - if test "x$PHP4BIN" = xyes; then - AC_CHECK_PROGS(PHP4, [php5 php]) + if test "x$PHPBIN" = xyes; then + AC_CHECK_PROGS(PHP, [php5 php]) else - PHP4=$PHP4BIN + PHP=$PHPBIN fi AC_MSG_CHECKING(for PHP header files) dnl /usr/bin/php5 -> /usr/bin/php-config5 - case $PHP4 in + case $PHP in *5) - PHP4CONFIG=`echo "$PHP4"|sed 's/5$/-config5/'` ;; + PHPCONFIG=`echo "$PHP"|sed 's/5$/-config5/'` ;; *) - PHP4CONFIG=$PHP4-config ;; + PHPCONFIG=$PHP-config ;; esac - php_version=`$PHP4CONFIG --version 2>/dev/null` + php_version=`$PHPCONFIG --version 2>/dev/null` case $php_version in 5*) - PHP4INC=`$PHP4CONFIG --includes 2>/dev/null` - if test -n "$PHP4INC"; then - AC_MSG_RESULT($PHP4INC) + PHPINC=`$PHPCONFIG --includes 2>/dev/null` + if test -n "$PHPINC"; then + AC_MSG_RESULT($PHPINC) else AC_MSG_RESULT(not found) fi @@ -1252,8 +1391,8 @@ else AC_MSG_RESULT([found PHP $version, but only PHP 5 is supported]) ;; esac fi -AC_SUBST(PHP4) -AC_SUBST(PHP4INC) +AC_SUBST(PHP) +AC_SUBST(PHPINC) #---------------------------------------------------------------- # Look for ocaml @@ -1859,11 +1998,17 @@ AC_SUBST(SKIP_OCTAVE) SKIP_PYTHON= -if test -z "$PYINCLUDE" || test -z "$PYLIB" ; then +if (test -z "$PYINCLUDE" || test -z "$PYLIB") && + (test -z "$PY3INCLUDE" || test -z "PY3LIB") ; then SKIP_PYTHON="1" fi AC_SUBST(SKIP_PYTHON) +SKIP_PYTHON3= +if test -z "$PY3INCLUDE" || test -z "$PY3LIB" ; then + SKIP_PYTHON3="1" +fi +AC_SUBST(SKIP_PYTHON3) SKIP_JAVA= if test -z "$JAVA" || test -z "$JAVAC" || test -z "$JAVAINC" ; then @@ -1886,7 +2031,7 @@ AC_SUBST(SKIP_GUILESCM) SKIP_MZSCHEME= -if test -z "$MZC" ; then +if test -z "$MZC" || test -z "$MZDYNOBJ" ; then SKIP_MZSCHEME="1" fi AC_SUBST(SKIP_MZSCHEME) @@ -1899,11 +2044,11 @@ fi AC_SUBST(SKIP_RUBY) -SKIP_PHP4= -if test -z "$PHP4" || test -z "$PHP4INC" ; then - SKIP_PHP4="1" +SKIP_PHP= +if test -z "$PHP" || test -z "$PHPINC" ; then + SKIP_PHP="1" fi -AC_SUBST(SKIP_PHP4) +AC_SUBST(SKIP_PHP) SKIP_OCAML= @@ -2001,6 +2146,7 @@ AC_SUBST(SKIP_GCJ) # Miscellaneous #---------------------------------------------------------------- + # Root directory # Translate path for native Windows compilers for use with 'make check' ROOT_DIR=`pwd` @@ -2033,7 +2179,6 @@ case $host in esac AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)]) - AC_CONFIG_FILES([ \ Makefile \ swig.spec \ @@ -2052,7 +2197,7 @@ AC_CONFIG_FILES([ \ Examples/test-suite/ocaml/Makefile \ Examples/test-suite/octave/Makefile \ Examples/test-suite/perl5/Makefile \ - Examples/test-suite/php4/Makefile \ + Examples/test-suite/php/Makefile \ Examples/test-suite/pike/Makefile \ Examples/test-suite/python/Makefile \ Examples/test-suite/ruby/Makefile \ @@ -2063,11 +2208,11 @@ AC_CONFIG_FILES([ \ Examples/test-suite/cffi/Makefile \ Examples/test-suite/uffi/Makefile \ Examples/test-suite/r/Makefile \ - Examples/test-suite/c/Makefile \ + Examples/test-suite/c/Makefile \ Lib/ocaml/swigp4.ml ]) AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig]) +AC_CONFIG_FILES([CCache/ccache_swig_config.h]) + AC_OUTPUT - - dnl configure.in ends here From a2dc2756c8009e277889247caa09524e7a1f975d Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Mon, 13 Apr 2009 21:23:07 +0000 Subject: [PATCH 052/508] Several major fixes for: arrays, static members, member func.ptrs., exceptions, ... Lots of tests runs ok now. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11188 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/arrays_dimensionless.i | 4 + Examples/test-suite/c/Makefile.in | 7 + Examples/test-suite/dynamic_cast.i | 8 +- Lib/c/c.swg | 188 ++++++---- Lib/c/std_string.i | 3 +- Source/Modules/c.cxx | 395 +++++++++++---------- 6 files changed, 331 insertions(+), 274 deletions(-) diff --git a/Examples/test-suite/arrays_dimensionless.i b/Examples/test-suite/arrays_dimensionless.i index 11dc022f7..717021643 100644 --- a/Examples/test-suite/arrays_dimensionless.i +++ b/Examples/test-suite/arrays_dimensionless.i @@ -9,10 +9,14 @@ int globalints[] = {100, 200, 300}; const int constglobalints[] = {400, 500, 600}; +class CC {}; + struct Bar { static int ints[]; + static CC ccs[]; }; int Bar::ints[] = {700, 800, 900}; +CC Bar::ccs[] = {CC(), CC()}; double arr_bool(bool array[], int length) { double sum=0.0; int i=0; for(; i($1); *(Bar **)&$result = downcast; } #endif -#if defined(SWIGJAVA) +#if defined(SWIGJAVA) %typemap(javaout) Foo * { return new Bar($jnicall, $owner); } @@ -54,7 +54,7 @@ char *do_test(Bar *b) { } %} -#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) +#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGC) // A general purpose function for dynamic casting of a Foo * %{ static swig_type_info * diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 9418e7d8e..090edcd51 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -5,6 +5,11 @@ * c.swg * ----------------------------------------------------------------------------- */ +// WARNING: passing function pointers from C as parameters of type (or as +// return values) SWIGTYPE (CLASS::*) causes cast of C function to type +// void(*)() and it is user's responsibility to properly handle this +// function's arguments and return value. + %insert("runtime") "clabels.swg" %insert("proxy_header") "cproxy.swg" @@ -18,64 +23,82 @@ #define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else %} +%fragment("fptr_decl", "runtime") {typedef void(*SWIG_CPP_FP)();} +%fragment("fptr_decl_proxy", "proxy_header") {typedef void(*SWIG_CPP_FP)();} +%fragment("stdbool_inc", "proxy_header") {#include } + // typemaps for function parameters -%typemap(ctype) void, short, int, long, char, float, double "$1_type" -%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_type" -%typemap(ctype) void *, short *, int *, long *, char *, float *, double * "$1_type" -%typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_type" -%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_type" +%typemap(ctype) void, short, int, long, char, float, double "$1_ltype" +%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_ltype" +%typemap(ctype) void *, short *, int *, long *, char *, float *, double * "$1_ltype" +%typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_ltype" +%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_ltype" %typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_basetype *" -%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_basetype *" -%typemap(ctype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" -%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_type" +%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_ltype" +%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_ltype" +%typemap(ctype) const short &, const int &, const long &, const char &, const float &, const double & "$1_ltype" +%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_ltype" %typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" -%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" -%typemap(ctype) short *&, int *&, long *&, char *&, float *&, double *& "$1_basetype **" +%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "/*hhhh*/$1_type" +%typemap(ctype) short *&, int *&, long *&, char *&, float *&, double *& "$1_ltype" %typemap(ctype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype *" -%typemap(ctype) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_basetype **" +%typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" + +// special cases of array passing - does not work for objects +%typemap(ctype) SWIGTYPE [] "$1_ltype" +%typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **" + +%typemap(ctype) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" %typemap(ctype) SWIGTYPE "SwigObj *" %typemap(ctype) SWIGTYPE * "SwigObj *" %typemap(ctype) SWIGTYPE & "SwigObj *" -%typemap(ctype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" -%typemap(ctype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" -%typemap(ctype) SWIGTYPE *& "SwigObj **" +%typemap(ctype) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $*1_ltype *" +%typemap(ctype) SWIGTYPE *[ANY] "/*ooooh*/ $*1_ltype" +//%typemap(ctype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" +%typemap(ctype) SWIGTYPE *& "/* *& */ SwigObj **" %typemap(ctype) enum SWIGTYPE "int" +%typemap(ctype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" -%fragment("stdbool_inc", "proxy_header") {#include } %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" -%typemap(ctype, fragment="stdbool_inc") bool & "$1_basetype *" -%typemap(ctype, fragment="stdbool_inc") const bool & "$1_basetype const *" +%typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype" +%typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const" -%typemap(in) short, int, long, char, float, double "$1 = ($1_type) $input;" -%typemap(in) void *, short *, int *, long *, char *, float *, double * "$1 = ($1_type) $input;" +%typemap(in) short, int, long, char, float, double "$1 = ($1_ltype) $input;" +%typemap(in) void *, short *, int *, long *, char *, float *, double * "$1 = ($1_ltype) $input;" %typemap(in) void **, short **, int **, long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" -%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1 = ($1_type) $input;" -%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1 = ($1_type) $input;" -%typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1 = ($1_basetype *) $input;" -%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned char * "$1 = ($1_type) $input;" -%typemap(in) unsigned short, unsigned int, unsigned long, unsigned char "$1 = ($1_type) $input;" -%typemap(in) short &, int &, long &, char &, float &, double &, bool & "$1 = ($1_basetype *) $input;" -%typemap(in) const short &, const int &, const long &, const char &, const float &, const double & "$1 = ($1_basetype *) $input;" -%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_basetype *) $input;" -%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_basetype *) $input;" +%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1 = ($1_ltype) $input;" +%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1 = ($1_ltype) $input;" +%typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1 = ($1_ltype) $input;" +%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned char * "$1 = ($1_ltype) $input;" +%typemap(in) unsigned short, unsigned int, unsigned long, unsigned char "$1 = ($1_ltype) $input;" +%typemap(in) short &, int &, long &, char &, float &, double &, bool & "$1 = ($1_ltype) $input;" +%typemap(in) const short &, const int &, const long &, const char &, const float &, const double & "$1 = ($1_ltype) $input;" +%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_ltype) $input;" +%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_ltype) $input;" %typemap(in) short *&, int *&, long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;" %typemap(in) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;" -%typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1 = ($1_basetype *) $input;" +%typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" -%typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_type) $input;" +%typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;" %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" %typemap(in) enum SWIGTYPE "$1 = ($1_type) $input;" +%typemap(in) SWIGTYPE [] "$1 = ($1_ltype) $input;" +%typemap(in) SWIGTYPE ((&)[ANY]) "$1 = ($1_ltype) $input;" + +%typemap(in) SWIGTYPE (CLASS::*) { + if ($input) + $1 = *($&1_ltype) &$input; +} + %typemap(in) SWIGTYPE { - $1 = * ($1_type *) ($input->obj); + $1 = *($1_ltype *) ($input->obj); } %typemap(in) SWIGTYPE * { @@ -83,7 +106,12 @@ $1 = ($1_ltype) $input->obj; } -%typemap(in) SWIGTYPE * [ANY], SWIGTYPE ** { +%typemap(in) SWIGTYPE ** { + if ($input) + $1 = ($1_ltype) $input; +} + +%typemap(in) SWIGTYPE *[ANY] { if ($input) { $1 = ($1_ltype) malloc($1_dim0 * sizeof($1_basetype)); size_t i = 0; @@ -97,15 +125,7 @@ $1 = ($1_ltype) 0; } -/* - * unsupported yet -%typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY], SWIGTYPE **, SWIGTYPE *** { - if ($input) - free($input); -} -*/ - -%typemap(in) SWIGTYPE * [ANY][ANY], SWIGTYPE *** { +%typemap(in) SWIGTYPE [ANY][ANY] { if ($input) { $1 = ($1_ltype) malloc($1_dim0 * $1_dim1 * sizeof($1_basetype)); size_t i = 0, j = 0; @@ -122,64 +142,86 @@ $1 = ($1_ltype) 0; } +/* + * unsupported yet +%typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY], SWIGTYPE **, SWIGTYPE *** { + if ($input) + free($input); +} +*/ + %typemap(in) SWIGTYPE & { if ($input) - $1 = ($1_basetype *) $input->obj; + $1 = ($1_ltype) $input->obj; else - $1 = ($1_basetype *) 0; + $1 = ($1_ltype) 0; } %typemap(in) SWIGTYPE *& { if ($input) - $1 = ($1_basetype **) &(*$input)->obj; + $1 = ($1_ltype) &(*$input)->obj; else - $1 = ($1_basetype **) 0; + $1 = ($1_ltype) 0; } // typemaps for return values -%typemap(couttype) void, short, int, long, char, float, double "$1_type" -%typemap(couttype) void *, short *, int *, long *, char *, float *, double* "$1_type" -%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_basetype" -%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_type" -%typemap(couttype) short &, int &, long &, char &, float &, double & "$1_basetype *" +%typemap(couttype) void, short, int, long, char, float, double "$1_ltype" +%typemap(couttype) unsigned short, unsigned int, unsigned long, unsigned char, signed char "$1_ltype" +%typemap(couttype) void *, short *, int *, long *, char *, float *, double*, unsigned char *, signed char * "$1_ltype" +%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_ltype" +%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_ltype" +%typemap(couttype) short &, int &, long &, char &, float &, double & "$1_ltype" %typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" -%typemap(couttype) short *&, int *&, long *&, char *&, float *&, double *& "$1_basetype **" -%typemap(couttype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$1_basetype *" -%typemap(couttype) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1_basetype *" +%typemap(couttype) short *&, int *&, long *&, char *&, float *&, double *& "$1_ltype" +%typemap(couttype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_ltype" +%typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" +%typemap(couttype) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" +%typemap(couttype) short **, int **, long **, char **, float **, double ** "$1_ltype" %typemap(couttype) SWIGTYPE "SwigObj *" -%typemap(couttype) SWIGTYPE * "SwigObj *" -%typemap(couttype) SWIGTYPE & "SwigObj *" -%typemap(couttype) SWIGTYPE [ANY] "SwigObj **" -%typemap(couttype) SWIGTYPE * [ANY], SWIGTYPE ** "SwigObj **" -%typemap(couttype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" +%typemap(couttype) SWIGTYPE * "/*aaaaaa*/SwigObj *" +%typemap(couttype) SWIGTYPE & "SwigObj *" +%typemap(couttype) SWIGTYPE *& "SwigObj **" +%typemap(couttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ SwigObj **" +%typemap(couttype) SWIGTYPE * [ANY], SWIGTYPE ** "/*SWIGTYPE *[ANY]/** */ SwigObj **" +//%typemap(couttype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" %typemap(couttype) enum SWIGTYPE "int" +%typemap(couttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" -%typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_type" +%typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" %typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*" %typemap(couttype, fragment="stdbool_inc") const bool & "$1_basetype const *" %typemap(out) short, int, long, char, float, double "$result = $1;" %typemap(out) void*, short*, int*, long*, char*, float*, double* "$result = $1;" -%typemap(out) const short, const int, const long, const char, const float, const double "$result = $1;" -%typemap(out) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$result = $1;" -%typemap(out) unsigned short, unsigned int, unsigned long, unsigned char "$result = $1;" -%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$result = $1;" +%typemap(out) const short, const int, const long, const char, const float, const double "$result = ($1_ltype) $1;" +%typemap(out) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$result = ($1_ltype) $1;" +%typemap(out) unsigned short, unsigned int, unsigned long, unsigned char, signed char "$result = $1;" +%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned char *, signed char * "$result = $1;" %typemap(out) short &, int &, long &, char &, float &, double & "$result = $1;" -%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$result = $1;" +%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char &, signed char & "$result = $1;" %typemap(out) const short &, const int &, const long &, const char &, const float &, const double & "$result = $1;" -%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$result = $1;" +%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char &, const signed char & "$result = $1;" %typemap(out) short *&, int *&, long *&, char *&, float *&, double *& "$result = $1;" %typemap(out) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$result = $1;" -%typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY] "$result = $1;" +%typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$result = $1;" %typemap(out) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$result = $1;" +%typemap(out) short **, int **, long **, char **, float **, double ** "$result = $1;" %typemap(out) void "" -%typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = $1;" +%typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" -%typemap(out) enum SWIGTYPE "$result = ($1_type) $1;" +%typemap(out) enum SWIGTYPE "$result = ($1_ltype) $1;" + +%typemap(out) SWIGTYPE (CLASS::*) { + *($&1_ltype) &$result = $1; +} + +%typemap(out) SWIGTYPE *&, SWIGTYPE ** { + $result = &SWIG_temporary; + (*result)->obj = (void*) $1; +} %typemap(out) SWIGTYPE { $result = SWIG_temporary; @@ -191,7 +233,7 @@ $result->obj = (void*) $1; } -%typemap(out) SWIGTYPE * [ANY], SWIGTYPE ** { +%typemap(out) SWIGTYPE * [ANY], SWIGTYPE [ANY][ANY] { static SwigObj **_temp = 0; if ($1) { size_t i = 0; diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index a6dc0607b..0740de333 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -11,6 +11,7 @@ class string; %typemap(ctype) string "char *" %typemap(ctype) string * "char *" +%typemap(ctype) string & "char *" %typemap(ctype) const string & "char *" %typemap(couttype) string "char *" %typemap(couttype) const string & "char *" @@ -25,7 +26,7 @@ class string; } } -%typemap(in) const string &, string * { +%typemap(in) const string &, string *, string & { if ($input) { $1 = new std::string($input); } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 1388e0106..7783e5367 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -7,13 +7,14 @@ * C language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_c_cxx[] = "$Id$"; +char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $"; #include #include "swigmod.h" int SwigType_isbuiltin(SwigType *t) { - const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; + const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", + "unsigned short", "unsigned int", "unsigned long", "unsigned char", "signed char", 0 }; int i = 0; char *c = Char(t); if (!t) @@ -410,7 +411,9 @@ ready: virtual int functionWrapper(Node *n) { String *name = Getattr(n, "sym:name"); + String *storage = Getattr(n, "storage"); SwigType *type = Getattr(n, "type"); + SwigType *otype = Copy(type); SwigType *return_type = NewString(""); String *wname; String *arg_names = NewString(""); @@ -422,7 +425,7 @@ ready: SwigType *return_var_type = empty_string; int gencomma; bool is_void_return = (SwigType_type(type) == T_VOID); - + // create new function wrapper object Wrapper *wrapper = NewWrapper(); @@ -479,18 +482,19 @@ ready: else { // C++ function wrapper - // mark the first parameter as object-struct - if ((Cmp(Getattr(n, "storage"), "static") != 0) && - (Cmp(Getattr(n, "ismember"), "1") == 0) && + // mark the first parameter as object-struct + if (storage && Cmp(storage, "static") != 0) { + if ((Cmp(Getattr(n, "ismember"), "1") == 0) && (Cmp(nodeType(n), "constructor") != 0)) { - Setattr(parms, "c:objstruct", "1"); - if (!Getattr(parms, "lname")) - Setattr(parms, "lname", "arg1"); - SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); - SwigType_add_pointer(stype); - Setattr(parms, "c:stype", stype); + Setattr(parms, "c:objstruct", "1"); + if (!Getattr(parms, "lname")) + Setattr(parms, "lname", "arg1"); + SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); + SwigType_add_pointer(stype); + Setattr(parms, "c:stype", stype); + } } - + // mangle name if function is overloaded if (Getattr(n, "sym:overloaded")) { if (!Getattr(n, "copy_constructor")) { @@ -521,82 +525,111 @@ ready: else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); } - + // add variable for holding result of original function 'cppresult' + // WARNING: Here we possibly make change to 'type' attribute of the node. + // This is done before the standard typemaps are attached, so they will + // use the modified type. + // In order to refer to the original type use 'otype' variable. bool return_object = false; if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - SwigType *tdtype = SwigType_typedef_resolve(type); + SwigType *tdtype = SwigType_typedef_resolve_all(type); if (tdtype) type = tdtype; - if (SwigType_isenum(type)) { + if (SwigType_ismemberpointer(type)) { + Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult")); + } + else if (SwigType_isenum(type)) { Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); } - else if (SwigType_isbuiltin(SwigType_base(type))) { - // type is built-in (int, char, double, etc.) - if (SwigType_isconst(type)) - SwigType_del_qualifier(type); + else { + if (SwigType_isbuiltin(SwigType_base(type))) { + // type is built-in (int, char, double, etc.) + + //Printf(stdout, "BUILTIN %s %s\n", name, SwigType_str(type, 0)); + + if (SwigType_isconst(type)) + SwigType_del_qualifier(type); - if (SwigType_isreference(type)) { - if (SwigType_isconst(SwigType_del_reference(type))) { + if (SwigType_isreference(type)) { + if (SwigType_isconst(SwigType_del_reference(type))) { + return_var_type = SwigType_base(type); + SwigType_add_qualifier(return_var_type, "const"); + SwigType_add_pointer(return_var_type); + } + else { + return_var_type = SwigType_base(type); + SwigType_add_pointer(return_var_type); + } + if (SwigType_ispointer(type)) { + SwigType_add_pointer(return_var_type); + } + SwigType_add_reference(type); + } + else if (SwigType_isarray(type)) { + return_var_type = SwigType_base(type); - SwigType_add_qualifier(return_var_type, "const"); - SwigType_add_pointer(return_var_type); + SwigType *atype = Copy(type); + do { + SwigType_del_array(atype); + SwigType_add_pointer(return_var_type); + } while (SwigType_isarray(atype)); + if (SwigType_ispointer(atype)) + SwigType_add_pointer(return_var_type); + Delete(atype); } else { - return_var_type = SwigType_base(type); - SwigType_add_pointer(return_var_type); + return_var_type = type; } + } + else { + // type is class + + //Printf(stdout, "CLASS %s %s\n", name, SwigType_str(type, 0)); if (SwigType_ispointer(type)) { - SwigType_add_pointer(return_var_type); + return_var_type = type; } - SwigType_add_reference(type); + else if (SwigType_isreference(type)) { + return_var_type = type; + SwigType_del_reference(return_var_type); + SwigType_add_pointer(return_var_type); + } + else if (SwigType_isarray(type)) { + return_var_type = SwigType_base(type); + SwigType *atype = Copy(type); + do { + SwigType_del_array(atype); + SwigType_add_pointer(return_var_type); + } while (SwigType_isarray(atype)); + Delete(atype); + //if (Cmp(Getattr(n, "c:retval"), "1")) + SwigType_add_pointer(return_var_type); + } + else { + SwigType_add_pointer(type); + return_var_type = type; + } + return_object = true; } - else if (SwigType_isarray(type)) { - - return_var_type = SwigType_base(type); - SwigType *atype = Copy(type); - do { - SwigType_del_array(atype); - SwigType_add_pointer(return_var_type); - } while (SwigType_isarray(atype)); - if (SwigType_ispointer(atype)) - SwigType_add_pointer(return_var_type); - Delete(atype); + + // hack for handling const 'cppresult' return values, + // including cases like: A const *& + SwigType *temp1 = Copy(otype), *temp2 = 0; + if (SwigType_isreference(temp1)) { + SwigType_del_reference(temp1); + temp2 = Copy(temp1); + if (SwigType_ispointer(temp2)) + SwigType_del_pointer(temp2); } - else { - return_var_type = type; - } - - Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); - } - else { - // type is class - if (SwigType_ispointer(type)) - return_var_type = type; - else if (SwigType_isreference(type)) { - return_var_type = SwigType_base(type); - SwigType_add_pointer(return_var_type); - if (SwigType_ispointer(type)) - SwigType_add_pointer(return_var_type); - } - else if (SwigType_isarray(type)) { - return_var_type = SwigType_base(type); - SwigType *atype = Copy(type); - do { - SwigType_del_array(atype); - SwigType_add_pointer(return_var_type); - } while (SwigType_isarray(atype)); - Delete(atype); - if (Cmp(Getattr(n, "c:retval"), "1")) - SwigType_add_pointer(return_var_type); - } - else { - SwigType_add_pointer(type); - return_var_type = type; - } - Wrapper_add_localv(wrapper, "cppresult", SwigType_str(return_var_type, 0), "cppresult", NIL); - return_object = true; + String *var_name = SwigType_str(return_var_type, 0); + if (SwigType_isconst(otype) || SwigType_isconst(temp1) || SwigType_isconst(temp2)) + Replaceall(var_name, "const", ""); + Wrapper_add_localv(wrapper, "cppresult", var_name, "cppresult", NIL); + Delete(var_name); + Delete(temp1); + if (temp2) + Delete(temp2); } } @@ -624,16 +657,27 @@ ready: // prepare function definition gencomma = 0; for (p = parms; p; ) { + + //Printf(stdout, "TYPE: %s ", SwigType_str(Getattr(p, "type"), 0)); + //Swig_print_node(p); while (checkAttribute(p, "tmap:in:numinputs", "0")) { p = Getattr(p, "tmap:in:next"); } SwigType *type = Getattr(p, "type"); + if (SwigType_type(type) == T_VOID) { + p = nextSibling(p); + continue; + } String *lname = Getattr(p, "lname"); String *c_parm_type = NewString(""); String *proxy_parm_type = NewString(""); String *arg_name = NewString(""); + + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) + type = tdtype; Printf(arg_name, "c%s", lname); @@ -644,6 +688,11 @@ ready: else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); } + + // hack for handling arrays of objects, as typemap SWIGOBJ *[ANY] + // precedes int *[ANY] for int arrays + if (!SwigType_isbuiltin(SwigType_base(type))) + Replaceall(c_parm_type, SwigType_base(type), SwigType_isarray(type) ? "SwigObj *" : "SwigObj"); // use proxy-type for parameter if supplied String* stype = Getattr(p, "c:stype"); @@ -654,9 +703,9 @@ ready: Printv(proxy_parm_type, c_parm_type, NIL); } - Printv(arg_names, gencomma ? ", " : "", Getattr(p, "name"), NIL); + Printv(arg_names, gencomma ? ", " : "", arg_name, NIL); Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); - Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", Getattr(p, "name"), NIL); + Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); gencomma = 1; // apply typemaps for input parameter @@ -674,7 +723,6 @@ ready: p = nextSibling(p); } - Delete(arg_name); Delete(proxy_parm_type); Delete(c_parm_type); @@ -703,13 +751,10 @@ ready: } } - // emit action code - String *action = emit_action(n); - String *except = Getattr(n, "feature:except"); - if (Getattr(n, "throws") || except) { - if (!except || (Cmp(except, "0") != 0)) - Printf(action, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); - } + // create action code + String *action = Getattr(n, "wrap:action"); + if (!action) + action = NewString(""); // handle special cases of cpp return result if (Cmp(nodeType(n), "constructor") != 0) { @@ -717,19 +762,32 @@ ready: // returning enum value Replace(action, "result =", "cppresult = (int)", DOH_REPLACE_FIRST); } - else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type)) { + else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type) + && Cmp(Getattr(n, "storage"), "static") != 0) { // returning object by value String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref"); String *lstr = SwigType_lstr(type, 0); - Replace(action, "result =", NewStringf("const %s = ", str), DOH_REPLACE_FIRST); - Printf(action, "cppresult = (%s) &_result_ref;\n", lstr); + if (Cmp(Getattr(n, "kind"), "variable") == 0) { + Delete(action); + action = NewStringf("const %s = %s;\n", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0)); + } + else { + String *call_str = NewStringf("const %s = %s", str, + SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : ""); + Replace(action, "result =", call_str, DOH_REPLACE_FIRST); + Delete(call_str); + } + Printf(action, "\ncppresult = (%s) &_result_ref;\n", lstr); Delete(str); Delete(lstr); } else Replace(action, "result =", "cppresult = ", DOH_REPLACE_FIRST); } - + + // prepare action code to use, e.g. insert try-catch blocks + action = emit_action(n); + // emit output typemap if needed if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { @@ -746,6 +804,12 @@ ready: Append(wrapper->code, action); } + String *except = Getattr(n, "feature:except"); + if (Getattr(n, "throws") || except) { + if (!except || (Cmp(except, "0") != 0)) + Printf(wrapper->code, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); + } + // insert cleanup code for (p = parms; p; ) { if ((tm = Getattr(p, "tmap:freearg"))) { @@ -796,6 +860,7 @@ ready: Delete(arg_names); Delete(wname); Delete(return_type); + Delete(otype); DelWrapper(wrapper); return SWIG_OK; } @@ -923,7 +988,7 @@ ready: virtual int staticmemberfunctionHandler(Node *n) { SwigType *type = Getattr(n, "type"); SwigType *tdtype; - tdtype = SwigType_typedef_resolve(type); + tdtype = SwigType_typedef_resolve_all(type); if (tdtype) type = tdtype; if (type) { @@ -940,7 +1005,7 @@ ready: virtual int memberfunctionHandler(Node *n) { SwigType *type = Getattr(n, "type"); SwigType *tdtype; - tdtype = SwigType_typedef_resolve(type); + tdtype = SwigType_typedef_resolve_all(type); if (tdtype) type = tdtype; if (type) { @@ -950,114 +1015,32 @@ ready: return Language::memberfunctionHandler(n); } - /* -------------------------------------------------------------------- - * wrap_get_variable() - * --------------------------------------------------------------------- */ - - void wrap_get_variable(Node *n, String *classname, String *newclassname, String *name, String *code) { - // modify method name - String *new_name = NewString(""); - Printv(new_name, newclassname, "_", Swig_name_get(name), NIL); - Setattr(n, "sym:name", new_name); - - // generate action code - String *action = NewString(""); - if (!code) { - code = NewString(""); - Printv(code, "result = ((", classname, "*) arg1->obj)->", name, ";\n", NIL); - } - Append(action, code); - - Setattr(n, "wrap:action", action); - - functionWrapper(n); - - Delete(code); // we are deallocating it, regardless of where it was created - Delete(action); - Delete(new_name); - } - - /* -------------------------------------------------------------------- - * wrap_set_variable() - * --------------------------------------------------------------------- */ - - void wrap_set_variable(Node *n, String *classname, String *newclassname, String *name, String *code) { - // modify method name - String *new_name = NewString(""); - Printv(new_name, newclassname, "_", Swig_name_set(name), NIL); - Setattr(n, "sym:name", new_name); - - // generate action code - String *action = NewString(""); - if (!code) { - code = NewString(""); - Printv(code, "((", classname, "*) arg1->obj)->", name, " = arg2;\n", NIL); - } - Append(action, code); - Setattr(n, "wrap:action", action); - - functionWrapper(n); - - Delete(code); // see wrap_get_variable() - Delete(action); - Delete(new_name); - } /* --------------------------------------------------------------------- * staticmembervariableHandler() - * TODO: refactor * --------------------------------------------------------------------- */ virtual int staticmembervariableHandler(Node *n) { - Node *klass = Swig_methodclass(n); - String *name = Getattr(n, "sym:name"); - SwigType *type = Copy(Getattr(n, "type")); - String *classname = Getattr(klass, "classtype"); - String *newclassname = Getattr(klass, "sym:name"); - String *new_name = NewString(""); - String *code = NewString(""); - - // create code for 'get' function - Printv(code, "result = $mod", classname, "::", name, ";\n", NIL); - if (!SwigType_isbuiltin(SwigType_base(type)) && !SwigType_ispointer(type)) - Replaceall(code, "$mod", "&"); - else - Replaceall(code, "$mod", ""); - wrap_get_variable(n, classname, newclassname, name, code); - - // create parameter for 'set' function - Parm *p = NewParm(Getattr(n, "type"), "value"); - Setattr(p, "lname", "arg1"); - Setattr(n, "parms", p); - - if (!SwigType_isconst(type)) { - // create code for 'set' function - if (SwigType_isarray(Getattr(n, "type"))) { - code = NewString(""); - Printf(code, "if (arg2) {\n"); - Printf(code, "int i;\n"); - Printv(code, "for (i = 0; i < ", SwigType_array_getdim(Getattr(n, "type"), 0), "; ++i) {\n", NIL); - Printv(code, classname, "::", name, "[i] = arg2[i];\n", NIL); - Printf(code, "}\n}\n"); - } - else if (SwigType_isenum(Getattr(n, "type")) && Getattr(n, "unnamed")) { - code = NewString("* (int *) &"); - } - else - code = NewString(""); - Printv(code, classname, "::", name, " = $mod arg1;\nresult = arg1;\n", NIL); - if (!SwigType_isbuiltin(SwigType_base(type)) && !SwigType_ispointer(type)) - Replaceall(code, "$mod", "*"); - else - Replaceall(code, "$mod", ""); - wrap_set_variable(n, classname, newclassname, name, code); + SwigType *type = Getattr(n, "type"); + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) { + type = tdtype; + Setattr(n, "type", type); + } + SwigType *btype = SwigType_base(type); + if (SwigType_isarray(type) && !SwigType_isbuiltin(btype)) { + // this hack applies to member objects array (not ptrs.) + SwigType_add_pointer(btype); + SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0))); + Setattr(n, "type", btype); + } + if (type) { + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) + Setattr(n, "c:retval", "1"); } - - Setattr(n, "type", "void"); - - Delete(new_name); Delete(type); - return SWIG_OK; + Delete(btype); + return Language::staticmembervariableHandler(n); } /* --------------------------------------------------------------------- @@ -1066,6 +1049,11 @@ ready: virtual int membervariableHandler(Node *n) { SwigType *type = Getattr(n, "type"); + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) { + type = tdtype; + Setattr(n, "type", type); + } SwigType *btype = SwigType_base(type); if (SwigType_isarray(type) && !SwigType_isbuiltin(btype)) { // this hack applies to member objects array (not ptrs.) @@ -1073,6 +1061,12 @@ ready: SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0))); Setattr(n, "type", btype); } + if (type) { + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) + Setattr(n, "c:retval", "1"); + } + Delete(type); + Delete(btype); return Language::membervariableHandler(n); } @@ -1093,17 +1087,23 @@ ready: if (baselist) { Iterator it; for (it = First(baselist); it.item; it = Next(it)) { - Printf(s, "result->typenames[%d] = Swig_typename_%s;\n", i++, Getattr(it.item, "sym:name")); + String *kname = Getattr(it.item, "sym:name"); + if (kname) + Printf(s, "result->typenames[%d] = Swig_typename_%s;\n", i++, kname); } } Printf(s, "result->typenames[%d] = 0;\n", i); Printf(s, "}\n"); + } - s = destroy_object; - - Printv(s, "if (strcmp(object->typenames[0], \"", classname, "\") == 0) {\n", NIL); - Printv(s, "if (object->obj)\ndelete (", classname, " *) (object->obj);\n", NIL); - Printf(s, "}\n"); + void add_to_destroy_object(Node *n, String *classname) { + String *s = destroy_object; + String *access = Getattr(n, "access"); + if (access && Cmp(access, "private") != 0) { + Printv(s, "if (strcmp(object->typenames[0], \"", classname, "\") == 0) {\n", NIL); + Printv(s, "if (object->obj)\ndelete (", classname, " *) (object->obj);\n", NIL); + Printf(s, "}\n"); + } } /* --------------------------------------------------------------------- @@ -1111,6 +1111,9 @@ ready: * --------------------------------------------------------------------- */ virtual int constructorHandler(Node *n) { + String *access = Getattr(n, "access"); + if (Cmp(access, "private") == 0) + return SWIG_NOWRAP; if (Getattr(n, "copy_constructor")) return copyconstructorHandler(n); @@ -1125,7 +1128,6 @@ ready: String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); - // prepare argument names Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); @@ -1197,7 +1199,7 @@ ready: Setattr(n, "c:stype", stype); // modify the constructor name - constr_name = Swig_name_construct(newclassname); + constr_name = Swig_name_copyconstructor(newclassname); Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); @@ -1259,6 +1261,7 @@ ready: // create action code if (except_flag) { + add_to_destroy_object(n, classname); Printf(code, "SWIG_remove_registry_entry(carg1);\n"); Printf(code, "SWIG_destroy_object(carg1);"); } From 32e03aa13d7f774376d45a4e6ce73ebde42dc026 Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 15 Apr 2009 23:30:16 +0000 Subject: [PATCH 053/508] Many major improvements. Almost all testsuite compiles now. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11189 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/GIFPlot/C/Makefile | 17 + Examples/GIFPlot/C/gifplot.i | 15 + Examples/c/check.list | 3 +- Examples/c/std_vector/Makefile | 30 ++ Examples/c/std_vector/example.cxx | 2 + Examples/c/std_vector/example.h | 18 + Examples/c/std_vector/example.i | 14 + Examples/c/std_vector/runme.c | 37 ++ Examples/test-suite/c/Makefile.in | 28 +- Examples/test-suite/c/cast_operator_runme.c | 24 +- Examples/test-suite/common.mk | 1 + Examples/test-suite/operator_overload.i | 5 + Examples/test-suite/special_variables.i | 32 ++ Lib/c/c.swg | 390 ++++++++++----- Lib/c/cexcept.swg | 525 ++++++++++---------- Lib/c/cproxy.swg | 1 + Lib/c/std_common.i | 4 + Lib/c/std_except.i | 34 ++ Lib/c/std_map.i | 1 + Lib/c/std_pair.i | 1 + Lib/c/std_string.i | 3 +- Lib/c/std_vector.i | 64 +++ Lib/c/stl.i | 12 + Lib/c/typemaps.i | 12 + Source/Modules/c.cxx | 388 +++++++-------- 25 files changed, 1052 insertions(+), 609 deletions(-) create mode 100644 Examples/GIFPlot/C/Makefile create mode 100644 Examples/GIFPlot/C/gifplot.i create mode 100644 Examples/c/std_vector/Makefile create mode 100644 Examples/c/std_vector/example.cxx create mode 100644 Examples/c/std_vector/example.h create mode 100644 Examples/c/std_vector/example.i create mode 100644 Examples/c/std_vector/runme.c create mode 100644 Lib/c/std_common.i create mode 100644 Lib/c/std_except.i create mode 100644 Lib/c/std_map.i create mode 100644 Lib/c/std_pair.i create mode 100644 Lib/c/std_vector.i create mode 100644 Lib/c/stl.i create mode 100644 Lib/c/typemaps.i diff --git a/Examples/GIFPlot/C/Makefile b/Examples/GIFPlot/C/Makefile new file mode 100644 index 000000000..f45d360cf --- /dev/null +++ b/Examples/GIFPlot/C/Makefile @@ -0,0 +1,17 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SWIGOPT = -I../Include +SRCS = +TARGET = gifplot +INTERFACE = gifplot.i +LIBS = -L.. -lgifplot +INCLUDES = -I../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' LIBS='$(LIBS)' \ + SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c + +clean: + rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme + +check: all diff --git a/Examples/GIFPlot/C/gifplot.i b/Examples/GIFPlot/C/gifplot.i new file mode 100644 index 000000000..356edd7f1 --- /dev/null +++ b/Examples/GIFPlot/C/gifplot.i @@ -0,0 +1,15 @@ +/* Oh what the heck, let's just grab the whole darn header file + and see what happens. */ + +%module gifplot +%{ + +/* Note: You still need this part because the %include directive + merely causes SWIG to interpret the contents of a file. It doesn't + include the right include headers for the resulting C code */ + +#include "../Include/gifplot.h" + +%} + +%include gifplot.h diff --git a/Examples/c/check.list b/Examples/c/check.list index 91eaa8179..16a00accf 100644 --- a/Examples/c/check.list +++ b/Examples/c/check.list @@ -1,4 +1,5 @@ # see top-level Makefile.in -class simple +class +std_vector exception diff --git a/Examples/c/std_vector/Makefile b/Examples/c/std_vector/Makefile new file mode 100644 index 000000000..a029dd0b5 --- /dev/null +++ b/Examples/c/std_vector/Makefile @@ -0,0 +1,30 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +RUNME = runme.c +PROXY = example_proxy.c +INCLUDES = +MEMTOOL = valgrind --leak-check=full + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INCLUDES='$(INCLUDES)' c_cpp + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' c_compile + +run: + env LD_LIBRARY_PATH=. ./runme + +memchk: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXXFLAGS='-g' INCLUDES='$(INCLUDES)' c_cpp + $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ + TARGET='$(TARGET)' CFLAGS='-g' c_compile + env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme + +clean: + rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme + +check: all diff --git a/Examples/c/std_vector/example.cxx b/Examples/c/std_vector/example.cxx new file mode 100644 index 000000000..cd6c9d173 --- /dev/null +++ b/Examples/c/std_vector/example.cxx @@ -0,0 +1,2 @@ +/* File : example.c */ + diff --git a/Examples/c/std_vector/example.h b/Examples/c/std_vector/example.h new file mode 100644 index 000000000..ca8ba9dbe --- /dev/null +++ b/Examples/c/std_vector/example.h @@ -0,0 +1,18 @@ +/* File : example.h */ + +#include +#include + +class A { +public: + A() : name(""), value(0) {} + A(std::string str, int i) : name(str), value(i) {} + std::string name; + int value; +}; + +class Klass { +public: + std::vector vi; + std::vector va; +}; diff --git a/Examples/c/std_vector/example.i b/Examples/c/std_vector/example.i new file mode 100644 index 000000000..36ff4e243 --- /dev/null +++ b/Examples/c/std_vector/example.i @@ -0,0 +1,14 @@ +/* File : example.i */ +%module example +%include +%include + +%{ +#include "example.h" +%} + +/* Let's just grab the original header file here */ +%include "example.h" + +%template(Vint) std::vector; +%template(VA) std::vector; diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c new file mode 100644 index 000000000..0dc91969b --- /dev/null +++ b/Examples/c/std_vector/runme.c @@ -0,0 +1,37 @@ +#include "example_proxy.h" + +int main() { + Klass *klass = new_Klass(); + Vint *vint = Klass_vi_get(klass); + VA *va = Klass_va_get(klass); + + printf("Vector of ints:\n"); + printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint)); + + int i; + for (i = 0; i < 10; i++) + Vint_push_back(vint, i*i); + + printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint)); + + for (i = 0; i < Vint_size(vint); i++) + printf("%d%c", Vint_at(vint, i), i+1 == Vint_size(vint) ? '\n' : ','); + + Vint_clear(vint); + Vint_reserve(vint, 100); + printf("\nsize=%d\ncapacity=%d\n", Vint_size(vint), Vint_capacity(vint)); + + printf("\nVector of objects:\n"); + + for (i = 0; i < 10; i++) { + A *a = new_A_std_string_i("hello", i); + VA_push_back(va, a); + } + + for (i = 0; i < VA_size(va); i++) { + A *a = VA_at(va, i); + printf("%s %d\n", A_name_get(a), A_value_get(a)); + } + + SWIG_exit(0); +} \ No newline at end of file diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 40d165b8d..5734805b6 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -10,23 +10,29 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@/.. top_builddir = @top_builddir@/.. -C_TEST_CASES = - -CPP_TEST_CASES = cast_operator \ - char_strings \ - exception_order \ - exception_partial_info \ - enums \ - enum_plus +include $(srcdir)/../common.mk # # BROKEN TEST CASES: -# default_constructor - last case: when using %extend generates 2 ctors wrappers, +# default_constructor - last case fail: using %extend generates 2 ctors wrappers, # both using new, while the class constructor is private +# extend* - directive %extend is not fully supported yet +# li* - not supported at all yet +# long_long_apply - no INPUT, OUTPUT, INOUT typemaps defined +# template* - not fully supported yet # -CPP_TEST_BROKEN_CXX = default_constructor -include $(srcdir)/../common.mk +C_CPP_TEST_BROKEN = \ + default_constructor \ + extend \ + extend_default \ + extend_placement \ + li_attribute \ + li_boost_shared_ptr \ + li_carrays \ + li_cdata \ + li_windows \ + long_long_apply INTERFACEDIR = ../../ diff --git a/Examples/test-suite/c/cast_operator_runme.c b/Examples/test-suite/c/cast_operator_runme.c index 8b84ee60b..b9a14aea9 100644 --- a/Examples/test-suite/c/cast_operator_runme.c +++ b/Examples/test-suite/c/cast_operator_runme.c @@ -1,12 +1,12 @@ -#include - -#include "cast_operator/cast_operator_proxy.h" - -int main() { - A *a = new_A(); - if (strcmp(A_tochar(a), "hi")) - fprintf(stderr, "cast failed\n"); - delete_A(a); - SWIG_exit(0); -} - +#include + +#include "cast_operator/cast_operator_proxy.h" + +int main() { + A *a = new_A(); + if (strcmp(A_tochar(a), "hi")) + fprintf(stderr, "cast failed\n"); + delete_A(a); + SWIG_exit(0); +} + diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index afcb87159..85858c2fd 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -73,6 +73,7 @@ INTERFACEDIR = ../ # Broken C++ test cases. (Can be run individually using make testcase.cpptest.) CPP_TEST_BROKEN += \ + abstract_access \ constants \ cpp_broken \ exception_partial_info \ diff --git a/Examples/test-suite/operator_overload.i b/Examples/test-suite/operator_overload.i index b62bf5179..c9b0a6e34 100644 --- a/Examples/test-suite/operator_overload.i +++ b/Examples/test-suite/operator_overload.i @@ -15,6 +15,11 @@ see bottom for a set of possible tests SWIGWARN_IGNORE_OPERATOR_LOR); #endif +#if defined(SWIGC) +%warnfilter(SWIGWARN_IGNORE_OPERATOR_EQ, + SWIGWARN_IGNORE_OPERATOR_PLUSPLUS); +#endif + #if !defined(SWIGLUA) && !defined(SWIGR) %rename(Equal) operator =; %rename(PlusEqual) operator +=; diff --git a/Examples/test-suite/special_variables.i b/Examples/test-suite/special_variables.i index e8853cec2..ea7e12d02 100644 --- a/Examples/test-suite/special_variables.i +++ b/Examples/test-suite/special_variables.i @@ -27,6 +27,19 @@ std::string ExceptionVars(double i, double j) { %} %rename(ExceptionVars) Space::exceptionvars; + +#ifdef SWIGC + +%exception Space::exceptionvars %{ + $action + result = (char*)$symname(1.0,2.0).c_str(); // Should expand to ExceptionVars + result = (char*)$name(3.0,4.0).c_str(); // Should expand to Space::exceptionvars + // above will not compile if the variables are not expanded properly + result = "$action $name $symname $overname $wrapname"; +%} + +#else + %exception Space::exceptionvars %{ $action result = $symname(1.0,2.0); // Should expand to ExceptionVars @@ -34,6 +47,9 @@ std::string ExceptionVars(double i, double j) { // above will not compile if the variables are not expanded properly result = "$action $name $symname $overname $wrapname"; %} + +#endif + %inline %{ namespace Space { std::string exceptionvars(double i, double j) { @@ -43,6 +59,20 @@ std::string exceptionvars(double i, double j) { %} +#ifdef SWIGC + +%exception Space::overloadedmethod %{ + $action + result = (char*)Space::$symname(1.0).c_str(); + result = (char*)$name().c_str(); + result = (char*)$name(2.0).c_str(); + // above will not compile if the variables are not expanded properly + result = "$action $name $symname $overname $wrapname"; + // $decl +%} + +#else + %exception Space::overloadedmethod %{ $action result = Space::$symname(1.0); @@ -53,6 +83,8 @@ std::string exceptionvars(double i, double j) { // $decl %} +#endif + %inline %{ namespace Space { std::string overloadedmethod(double j) { diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 090edcd51..726fd76c6 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -8,7 +8,7 @@ // WARNING: passing function pointers from C as parameters of type (or as // return values) SWIGTYPE (CLASS::*) causes cast of C function to type // void(*)() and it is user's responsibility to properly handle this -// function's arguments and return value. +// function's arguments and return value. See 'cpp_basic' test for details. %insert("runtime") "clabels.swg" %insert("proxy_header") "cproxy.swg" @@ -28,25 +28,25 @@ %fragment("stdbool_inc", "proxy_header") {#include } // typemaps for function parameters +%typemap(ctype) void, short, int, long, long long, char, float, double "$1_ltype" +%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" +%typemap(ctype) void *, short *, int *, long *, long long *, char *, float *, double * "$1_ltype" +%typemap(ctype) void **, short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" +%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1_ltype" +%typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" +%typemap(ctype) short &, int &, long &, long long &, char &, float &, double & "$1_ltype" +%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1_ltype" +%typemap(ctype) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" +%typemap(ctype) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" +%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" +%typemap(ctype) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1_ltype" +%typemap(ctype) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" +%typemap(ctype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" +%typemap(ctype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" +%typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" +%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" -%typemap(ctype) void, short, int, long, char, float, double "$1_ltype" -%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned char "$1_ltype" -%typemap(ctype) void *, short *, int *, long *, char *, float *, double * "$1_ltype" -%typemap(ctype) void **, short **, int **, long **, char **, float **, double ** "$1_ltype" -%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1_ltype" -%typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, char &, float &, double & "$1_ltype" -%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1_ltype" -%typemap(ctype) const short &, const int &, const long &, const char &, const float &, const double & "$1_ltype" -%typemap(ctype) const short, const int, const long, const char, const float, const double "$1_ltype" -%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned char "$1_type" -%typemap(ctype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "/*hhhh*/$1_type" -%typemap(ctype) short *&, int *&, long *&, char *&, float *&, double *& "$1_ltype" -%typemap(ctype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(ctype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" - -// special cases of array passing - does not work for objects +// special cases of array passing - does not intended to be used for objects %typemap(ctype) SWIGTYPE [] "$1_ltype" %typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **" @@ -54,40 +54,41 @@ %typemap(ctype) SWIGTYPE "SwigObj *" %typemap(ctype) SWIGTYPE * "SwigObj *" %typemap(ctype) SWIGTYPE & "SwigObj *" -%typemap(ctype) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $*1_ltype *" -%typemap(ctype) SWIGTYPE *[ANY] "/*ooooh*/ $*1_ltype" -//%typemap(ctype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" +%typemap(ctype) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ SwigObj ***" +%typemap(ctype) SWIGTYPE *[ANY] "/*ooooh*/ SwigObj **" %typemap(ctype) SWIGTYPE *& "/* *& */ SwigObj **" %typemap(ctype) enum SWIGTYPE "int" +%typemap(ctype) enum SWIGTYPE & "int *" %typemap(ctype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype" %typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const" -%typemap(in) short, int, long, char, float, double "$1 = ($1_ltype) $input;" -%typemap(in) void *, short *, int *, long *, char *, float *, double * "$1 = ($1_ltype) $input;" -%typemap(in) void **, short **, int **, long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" -%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned char * "$1 = ($1_ltype) $input;" -%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned char ** "$1 = ($1_ltype) $input;" -%typemap(in) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1 = ($1_ltype) $input;" -%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned char * "$1 = ($1_ltype) $input;" -%typemap(in) unsigned short, unsigned int, unsigned long, unsigned char "$1 = ($1_ltype) $input;" -%typemap(in) short &, int &, long &, char &, float &, double &, bool & "$1 = ($1_ltype) $input;" -%typemap(in) const short &, const int &, const long &, const char &, const float &, const double & "$1 = ($1_ltype) $input;" -%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned char & "$1 = ($1_ltype) $input;" -%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char & "$1 = ($1_ltype) $input;" +%typemap(in) short, int, long, long long, char, float, double "$1 = ($1_ltype) $input;" +%typemap(in) void *, short *, int *, long *, long long *, char *, float *, double * "$1 = ($1_ltype) $input;" +%typemap(in) void **, short **, int **, long **, long long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" +%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1 = ($1_ltype) $input;" +%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1 = ($1_ltype) $input;" +%typemap(in) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1 = ($1_ltype) $input;" +%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned long long *, const unsigned char * "$1 = ($1_ltype) $input;" +%typemap(in) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1 = ($1_ltype) $input;" +%typemap(in) short &, int &, long &, long long &, char &, float &, double &, bool & "$1 = ($1_ltype) $input;" +%typemap(in) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1 = ($1_ltype) $input;" +%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1 = ($1_ltype) $input;" +%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1 = ($1_ltype) $input;" -%typemap(in) short *&, int *&, long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;" -%typemap(in) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;" -%typemap(in) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" -%typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" +%typemap(in) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;" +%typemap(in) const short *&, const int *&, const long *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;" +%typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" +%typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;" %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" -%typemap(in) enum SWIGTYPE "$1 = ($1_type) $input;" +%typemap(in) enum SWIGTYPE "$1 = ($1_ltype) $input;" +%typemap(in) enum SWIGTYPE & "$1 = ($1_ltype) $input;" %typemap(in) SWIGTYPE [] "$1 = ($1_ltype) $input;" %typemap(in) SWIGTYPE ((&)[ANY]) "$1 = ($1_ltype) $input;" @@ -142,13 +143,10 @@ $1 = ($1_ltype) 0; } -/* - * unsupported yet %typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY], SWIGTYPE **, SWIGTYPE *** { if ($input) free($input); } -*/ %typemap(in) SWIGTYPE & { if ($input) @@ -166,70 +164,151 @@ // typemaps for return values -%typemap(couttype) void, short, int, long, char, float, double "$1_ltype" -%typemap(couttype) unsigned short, unsigned int, unsigned long, unsigned char, signed char "$1_ltype" -%typemap(couttype) void *, short *, int *, long *, char *, float *, double*, unsigned char *, signed char * "$1_ltype" -%typemap(couttype) const short, const int, const long, const char, const float, const double "$1_ltype" -%typemap(couttype) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$1_ltype" -%typemap(couttype) short &, int &, long &, char &, float &, double & "$1_ltype" -%typemap(couttype) const short &, const int &, const long &, const char &, const float &, const double & "$1_basetype const *" -%typemap(couttype) short *&, int *&, long *&, char *&, float *&, double *& "$1_ltype" -%typemap(couttype) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$1_ltype" -%typemap(couttype) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" -%typemap(couttype) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" -%typemap(couttype) short **, int **, long **, char **, float **, double ** "$1_ltype" +// void +%typemap(couttype) void "void" +%typemap(couttype) void*, const void* "void *" + +// short +%typemap(couttype) short, const short "short" +%typemap(couttype) short*, short&, short[ANY], short[] "short *" +%typemap(couttype) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(couttype) unsigned short "unsigned short" +%typemap(couttype) const unsigned short "const unsigned short" +%typemap(couttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(couttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(couttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(couttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(couttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(couttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" + +// int +%typemap(couttype) int, const int "int" +%typemap(couttype) int*, int&, int[ANY], int[] "int *" +%typemap(couttype) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(couttype) unsigned int "unsigned int" +%typemap(couttype) const unsigned int "unsigned int" +%typemap(couttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(couttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(couttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(couttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" + +// long +%typemap(couttype) long, const long "long" +%typemap(couttype) long*, long&, long[ANY], long[] "long *" +%typemap(couttype) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(couttype) unsigned long "unsigned long" +%typemap(couttype) const unsigned long "const unsigned long" +%typemap(couttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(couttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(couttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(couttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(couttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(couttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" + +// long long +%typemap(couttype) long long, const long long "long long" +%typemap(couttype) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(couttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(couttype) unsigned long long "unsigned long long" +%typemap(couttype) const unsigned long long "const unsigned long long" +%typemap(couttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(couttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(couttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(couttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(couttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(couttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" + +// char: signed/unsigned +%typemap(couttype) char, const char "char" +%typemap(couttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(couttype) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(couttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(couttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(couttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(couttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(couttype) signed char "signed char" +%typemap(couttype) const signed char "const signed char" +%typemap(couttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(couttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(couttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(couttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(couttype) unsigned char "unsigned char" +%typemap(couttype) const unsigned char "const unsigned char" +%typemap(couttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(couttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" + +// float +%typemap(couttype) float, const float "float" +%typemap(couttype) float*, float&, float[ANY], float[] "float *" +%typemap(couttype) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(couttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(couttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" + +// double +%typemap(couttype) double, const double "double" +%typemap(couttype) double*, double&, double[ANY], double[] "double *" +%typemap(couttype) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" + +// objects %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "/*aaaaaa*/SwigObj *" %typemap(couttype) SWIGTYPE & "SwigObj *" %typemap(couttype) SWIGTYPE *& "SwigObj **" %typemap(couttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ SwigObj **" -%typemap(couttype) SWIGTYPE * [ANY], SWIGTYPE ** "/*SWIGTYPE *[ANY]/** */ SwigObj **" -//%typemap(couttype) SWIGTYPE * [ANY][ANY], SWIGTYPE *** "SwigObj ***" +%typemap(couttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ SwigObj **" +%typemap(couttype) SWIGTYPE ** "/*SWIGTYPE ** */ SwigObj **" %typemap(couttype) enum SWIGTYPE "int" +%typemap(couttype) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(couttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" %typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" %typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*" %typemap(couttype, fragment="stdbool_inc") const bool & "$1_basetype const *" -%typemap(out) short, int, long, char, float, double "$result = $1;" -%typemap(out) void*, short*, int*, long*, char*, float*, double* "$result = $1;" -%typemap(out) const short, const int, const long, const char, const float, const double "$result = ($1_ltype) $1;" -%typemap(out) const void *, const short *, const int *, const long *, const char *, const float *, const double * "$result = ($1_ltype) $1;" -%typemap(out) unsigned short, unsigned int, unsigned long, unsigned char, signed char "$result = $1;" -%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned char *, signed char * "$result = $1;" -%typemap(out) short &, int &, long &, char &, float &, double & "$result = $1;" -%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned char &, signed char & "$result = $1;" -%typemap(out) const short &, const int &, const long &, const char &, const float &, const double & "$result = $1;" -%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned char &, const signed char & "$result = $1;" -%typemap(out) short *&, int *&, long *&, char *&, float *&, double *& "$result = $1;" -%typemap(out) const short *&, const int *&, const long *&, const char *&, const float *&, const double *& "$result = $1;" -%typemap(out) short [ANY], int [ANY], long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$result = $1;" -%typemap(out) short * [ANY], int * [ANY], long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$result = $1;" -%typemap(out) short **, int **, long **, char **, float **, double ** "$result = $1;" +%typemap(out) short, int, long, long long, char, float, double "$result = $1;" +%typemap(out) void*, short*, int*, long*, long long *, char*, float*, double* "$result = $1;" +%typemap(out) const short, const int, const long, const long long, const char, const float, const double "$result = ($1_ltype) $1;" +%typemap(out) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$result = ($1_ltype) $1;" +%typemap(out) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char, signed char "$result = $1;" +%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char *, signed char * "$result = $1;" +%typemap(out) short &, int &, long &, long long &, char &, float &, double & "$result = $1;" +%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &, signed char & "$result = $1;" +%typemap(out) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$result = $1;" +%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char &, const signed char & "$result = $1;" +%typemap(out) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$result = $1;" +%typemap(out) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$result = $1;" +%typemap(out) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$result = $1;" +%typemap(out) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$result = $1;" +%typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;" %typemap(out) void "" %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" -%typemap(out) enum SWIGTYPE "$result = ($1_ltype) $1;" +%typemap(out) enum SWIGTYPE "$result = (int) $1;" +%typemap(out) enum SWIGTYPE &, enum SWIGTYPE * "$result = (int *) &$1;" %typemap(out) SWIGTYPE (CLASS::*) { *($&1_ltype) &$result = $1; } %typemap(out) SWIGTYPE *&, SWIGTYPE ** { - $result = &SWIG_temporary; + static SwigObj* _ptr = (SwigObj*) SWIG_create_object(SWIG_STR($1_basetype)); + $result = &_ptr; (*result)->obj = (void*) $1; } %typemap(out) SWIGTYPE { - $result = SWIG_temporary; + $result = (SwigObj*) SWIG_create_object(SWIG_STR($1_basetype)); $result->obj = (void*) &$1; } %typemap(out) SWIGTYPE *, SWIGTYPE & { - $result = SWIG_temporary; + $result = (SwigObj*) SWIG_create_object(SWIG_STR($1_basetype)); $result->obj = (void*) $1; } @@ -257,65 +336,68 @@ $result = (SwigObj**) 0; } +// typemaps for 'cppresult' +// this needs refactoring -- see 'couttype' typemaps + +%typemap(cppouttype) void, short, int, long, long long, char, float, double "$1_ltype" +%typemap(cppouttype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char, signed char "$1_ltype" +%typemap(cppouttype) void *, short *, int *, long *, long long *, char *, float *, double*, unsigned char *, unsigned int *, unsigned long *, unsigned char *, signed char * "$1_ltype" +%typemap(cppouttype) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" +%typemap(cppouttype) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_ltype" +%typemap(cppouttype) short &, int &, long &, long long &, char &, float &, double &, unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &, signed char & "$1_ltype" +%typemap(cppouttype) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" +%typemap(cppouttype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" +%typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" +%typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" + +%typemap(cppouttype) const char* "const char *" +%typemap(cppouttype) const unsigned char* "const unsigned char *" +%typemap(cppouttype) const signed char* "const signed char *" +%typemap(cppouttype) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" + +%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" +%typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" +%typemap(cppouttype) SWIGTYPE * "$1_ltype" +%typemap(cppouttype) const SWIGTYPE * "const $1_ltype" +%typemap(cppouttype) SWIGTYPE & "$1_ltype" +%typemap(cppouttype) SWIGTYPE *& "$1_ltype" +%typemap(cppouttype) SWIGTYPE [ANY] "$1_ltype" +%typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype" +%typemap(cppouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_basetype **" +%typemap(cppouttype, retobj="1") enum SWIGTYPE "int" +%typemap(cppouttype) enum SWIGTYPE * "int *" +%typemap(cppouttype) enum SWIGTYPE & "int *" +%typemap(cppouttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "$1_ltype" + +%typemap(cppouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" +%typemap(cppouttype, fragment="stdbool_inc") bool & "$1_basetype*" +%typemap(cppouttype, fragment="stdbool_inc") const bool & "$1_basetype const *" + +// templates typemaps - in progress... /* - * 2+ dim arrays - not supported yet -%typemap(out) SWIGTYPE * [ANY][ANY], SWIGTYPE *** { - if ($1) { - $result = (SwigObj***) malloc($1_dim0 * $1_dim1 * sizeof(SwigObj*)); - size_t i = 0, j = 0; - for ( ; i < $1_dim0; ++i) { - for ( ; j < $1_dim1; ++j) { - if ($1[i][j]) { - $result[i][j] = SWIG_create_object(SWIG_STR($1_ltype)); - $result[i][j]->obj = (void*) $1[i][j]; - } - else - $result[i][j] = (SwigObj*) 0; - } - } - } - else - $result = (SwigObj***) 0; -}*/ +%typemap(ctype) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "SwigObj *" +%typemap(in) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * { $1 = ($1_ltype) $input; } +%typemap(out) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "$result = ($1_ltype) $1;" -#ifdef SWIG_C_EXCEPT +%typemap(cppouttype) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "$1_ltype" +*/ + +//%define size_t unsigned long %enddef + +%apply unsigned long { size_t }; +%apply const unsigned long & { const size_t & }; + +#ifdef SWIG_CPPMODE + + #ifdef SWIG_C_EXCEPT + %insert("runtime") %{ typedef struct { void *obj; const char **typenames; } SwigObj; %} -%include "cexcept.swg" -#ifdef SWIG_CPPMODE -%insert("runtime") %{ -SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj)); -%} -#endif -#else -%insert("runtime") %{ -typedef struct { - void *obj; -} SwigObj; - -#ifdef __cplusplus -extern "C" { -#endif - -SWIGEXPORTC int SWIG_exit(int code) { - exit(code); -} - -#ifdef __cplusplus -} -#endif -%} - -#ifdef SWIG_CPPMODE -%insert("runtime") %{ -SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj)); -%} -#endif %insert("proxy_header") %{ typedef struct { @@ -324,5 +406,61 @@ typedef struct { } SwigObj; %} -#endif +%include "cexcept.swg" + + #else + +%insert("runtime") %{ +typedef struct { + void *obj; +} SwigObj; +#ifdef __cplusplus +extern "C" { +#endif +SWIGEXPORTC int SWIG_exit(int code) { exit(code); } +#ifdef __cplusplus +} +#endif +%} + +%insert("proxy_header") %{ +typedef struct { + void *obj; +} SwigObj; +%} + + #endif + +%insert(runtime) %{ + SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj)); +%} + +%insert("proxy_header") %{ +#include + +#define SWIG_MAKE_DELETE(Name,Obj) void Name(Obj *op1, ...) {\ + Obj *obj;\ + va_list vl;\ + va_start(vl, op1);\ + do {\ + obj = va_arg(vl, Obj *);\ + delete_##Obj(obj);\ + } while (obj);\ + va_end(vl);\ +} +%} + +#else + +%insert("runtime") %{ +#ifdef __cplusplus +extern "C" { +#endif +SWIGEXPORTC int SWIG_exit(int code) { exit(code); } +#ifdef __cplusplus +} +#endif +%} + +#endif diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index 37077f21e..0f953e184 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -1,260 +1,265 @@ -/* ----------------------------------------------------------------------------- - * clabels.swg - * - * Exception handling code and typemaps for C module. - * ----------------------------------------------------------------------------- */ - -%typemap(throws) BASIC_INT_TYPES { - char error_msg[256]; - sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); - SWIG_CThrowException(0, error_msg); -} - -%apply BASIC_INT_TYPES { int, long, short, unsigned int, unsigned long, unsigned short, int &, long &, short &, unsigned int &, unsigned long &, unsigned short & }; - -%typemap(throws) char *, const char * { - SWIG_CThrowException(0, $1); -} - -// this should match only SwigObj objects -%typemap(throws) SWIGTYPE { - SwigObj *c_ex; - c_ex = SWIG_create_object(SWIG_STR($1_basetype)); - c_ex->obj = (void*) &$1; - SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); -} - -%typemap(throws) SWIGTYPE * { - SwigObj *c_ex; - c_ex = SWIG_create_object(SWIG_STR($1_basetype)); - c_ex->obj = (void*) $1; - SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); -} - -%insert("runtime") %{ -#define SWIG_MAX_RT_STACK 256 -#define SWIG_REGISTRY_INIT 256 - -SWIGINTERN SwigObj **SWIG_registry_base = 0; -SWIGINTERN SwigObj **SWIG_registry = 0; -SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT; - -SWIGINTERN SwigObj *SWIG_create_object(const char *classname); -SWIGINTERN void SWIG_destroy_object(SwigObj *object); - -SWIGEXPORTC struct SWIG_exc_struct { - int code; - char *msg; - SwigObj *klass; - int handled; -} SWIG_exc = { 0, 0, 0, 0 }; - -SWIGEXPORTC jmp_buf SWIG_rt_env; -SWIGEXPORTC int SWIG_rt_init = 0; -SWIGINTERN jmp_buf SWIG_cpp_back_env; -SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; -SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; - -SWIGINTERN void SWIG_rt_stack_push() { - // TODO: check for stack overflow - memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env)); - SWIG_rt_stack_ptr++; -} - -SWIGINTERN void SWIG_rt_stack_pop() { - if (SWIG_rt_stack_ptr == SWIG_rt_stack_base) - return; - SWIG_rt_stack_ptr--; - memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); -} - -SWIGINTERN void SWIG_add_registry_entry(SwigObj *entry) { - if (SWIG_registry_base == 0) { - SWIG_registry_base = SWIG_registry = (SwigObj **) malloc(SWIG_registry_size * sizeof(SwigObj *)); - memset(SWIG_registry_base, 0, SWIG_registry_size * sizeof(SwigObj *)); - } - *SWIG_registry = entry; - SWIG_registry++; - if ((SWIG_registry - SWIG_registry_base) == SWIG_registry_size) { - SWIG_registry = SWIG_registry_base; - SWIG_registry_size += SWIG_REGISTRY_INIT; - int new_size = SWIG_registry_size * sizeof(SwigObj *); - SWIG_registry_base = (SwigObj **) malloc(new_size); - memset(SWIG_registry_base, 0, new_size); - memcpy(SWIG_registry_base, SWIG_registry, (SWIG_registry_size - SWIG_REGISTRY_INIT) * sizeof(SwigObj *)); - free(SWIG_registry); - SWIG_registry = SWIG_registry_base + (SWIG_registry_size - SWIG_REGISTRY_INIT); - } -} - -SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) { - int i; - for (i = 0; i < SWIG_registry_size; ++i) { - if (*(SWIG_registry_base + i) == entry) { - *(SWIG_registry_base + i) = 0; - break; - } - } -} - -SWIGINTERN void SWIG_cleanup() { - if (SWIG_rt_stack_base) - free(SWIG_rt_stack_base); - if (SWIG_exc.msg) - free(SWIG_exc.msg); - if (SWIG_exc.klass) { - if (SWIG_exc.klass->typenames) - free(SWIG_exc.klass->typenames); - free(SWIG_exc.klass); - } - int i; - if (SWIG_registry_base) { - for (i = 0; i < SWIG_registry_size; ++i) { - if (*(SWIG_registry_base + i)) { - SWIG_destroy_object(*(SWIG_registry_base + i)); - *(SWIG_registry_base + i) = 0; - } - } - } - free(SWIG_registry_base); - SWIG_registry_base = 0; -} - -#ifdef __cplusplus -extern "C" { -#endif - -SWIGEXPORTC void SWIG_rt_try() { - SWIG_rt_stack_push(); -} - -SWIGEXPORTC int SWIG_rt_catch(const char *type) { - int result = 0; - if (!type || (strcmp("SWIG_AnyException", type) == 0)) { - result = 1; - } - else if (SWIG_exc.klass) { - int i = 0; - while (SWIG_exc.klass->typenames[i]) { - if (strcmp(SWIG_exc.klass->typenames[i++], type) == 0) { - result = 1; - break; - } - } - } - if (result) { - SWIG_rt_stack_pop(); - SWIG_exc.handled = 1; - } - return result; -} - -SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { - if (SWIG_exc.msg) { - free(SWIG_exc.msg); - SWIG_exc.msg = (char *) 0; - } - if (msg) { - SWIG_exc.msg = (char *) malloc(strlen(msg) + 1); - strcpy(SWIG_exc.msg, msg); - } - SWIG_exc.klass = klass; - SWIG_exc.handled = 0; - longjmp(SWIG_rt_env, 1); -} - -SWIGEXPORTC void SWIG_rt_unhandled() { - if (SWIG_exc.msg) { - free(SWIG_exc.msg); - SWIG_exc.msg = 0; - } - SWIG_rt_stack_pop(); - longjmp(SWIG_rt_env, SWIG_exc.code); -} - -SWIGEXPORTC void SWIG_rt_endtry() { - if (SWIG_exc.handled) { - if (setjmp(SWIG_rt_env) == 0) { - SWIG_rt_stack_push(); - longjmp(SWIG_cpp_back_env, 1); - } - } - else { - SWIG_rt_stack_pop(); // pop the SWIG_try context - } -} - -SWIGEXPORTC int SWIG_exit(int code) { - SWIG_cleanup(); - exit(code); -} - -#ifdef __cplusplus -} -#endif - -SWIGINTERN void SWIG_terminate() { - fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", - SWIG_exc.klass->typenames[0], - SWIG_exc.msg ? SWIG_exc.msg : ""); - SWIG_exit(SWIG_exc.code); -} - -SWIGINTERN void SWIG_runtime_init() { - int i, code; - if (!SWIG_rt_init) { - SWIG_rt_init = 1; - SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); - if (SWIG_exc.code = setjmp(SWIG_rt_env)) { - // deallocate C++ exception - if (setjmp(SWIG_rt_env) == 0) { - SWIG_rt_stack_push(); - SWIG_exc.handled = 1; - longjmp(SWIG_cpp_back_env, 1); - } - SWIG_terminate(); - } - } -} - -#define SWIG_CThrowException(klass, msg) \ - if (setjmp(SWIG_cpp_back_env) == 0) \ - SWIG_rt_throw((SwigObj *) klass, msg); -%} - -%insert("proxy_header") %{ -// special value indicating any type of exception like 'catch(...)' -#define SWIG_AnyException "SWIG_AnyException" - -#include - -SWIGIMPORT jmp_buf SWIG_rt_env; - -typedef struct { - void *obj; - const char **typenames; -} SwigObj; - -SWIGIMPORT struct SWIG_exc_struct { - int code; - char *msg; - SwigObj *klass; -} SWIG_exc; - -SWIGIMPORT void SWIG_rt_try(); -SWIGIMPORT int SWIG_rt_catch(const char *type); -SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg); -SWIGIMPORT int SWIG_rt_unhandled(); -SWIGIMPORT void SWIG_rt_endtry(); -SWIGIMPORT int SWIG_exit(int code); - -#define SWIG_try \ - SWIG_rt_try(); \ - if ((SWIG_exc.code = setjmp(SWIG_rt_env)) == 0) -#define SWIG_catch(type) else if (SWIG_rt_catch(#type)) -#define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); -#define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); -#define SWIG_endtry else SWIG_rt_unhandled(); SWIG_rt_endtry(); - -%} - +/* ----------------------------------------------------------------------------- + * clabels.swg + * + * Exception handling code and typemaps for C module. + * ----------------------------------------------------------------------------- */ + +%typemap(throws) BASIC_INT_TYPES { + char error_msg[256]; + sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); + SWIG_CThrowException(0, error_msg); +} + +%apply BASIC_INT_TYPES { int, long, short, unsigned int, unsigned long, unsigned short, int &, long &, short &, unsigned int &, unsigned long &, unsigned short & }; + +%typemap(throws) char *, const char * { + SWIG_CThrowException(0, $1); +} + +// this should match only SwigObj objects +%typemap(throws) SWIGTYPE { + SwigObj *c_ex; + c_ex = SWIG_create_object(SWIG_STR($1_basetype)); + c_ex->obj = (void*) &$1; + SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); +} + +%typemap(throws) SWIGTYPE * { + SwigObj *c_ex; + c_ex = SWIG_create_object(SWIG_STR($1_basetype)); + c_ex->obj = (void*) $1; + SWIG_CThrowException(c_ex, "C++ $1_type exception thrown"); +} + +%insert("runtime") %{ +#define SWIG_MAX_RT_STACK 256 +#define SWIG_REGISTRY_INIT 256 + +SWIGINTERN SwigObj **SWIG_registry_base = 0; +SWIGINTERN SwigObj **SWIG_registry = 0; +SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT; + +SWIGINTERN SwigObj *SWIG_create_object(const char *classname); +SWIGINTERN void SWIG_destroy_object(SwigObj *object); +SWIGINTERN void SWIG_free_SwigObj(SwigObj *object); + +SWIGEXPORTC struct SWIG_exc_struct { + int code; + char *msg; + SwigObj *klass; + int handled; +} SWIG_exc = { 0, 0, 0, 0 }; + +SWIGEXPORTC jmp_buf SWIG_rt_env; +SWIGEXPORTC int SWIG_rt_init = 0; +SWIGINTERN jmp_buf SWIG_cpp_back_env; +SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0; +SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0; + +SWIGINTERN void SWIG_rt_stack_push() { + // TODO: check for stack overflow + memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env)); + SWIG_rt_stack_ptr++; +} + +SWIGINTERN void SWIG_rt_stack_pop() { + if (SWIG_rt_stack_ptr == SWIG_rt_stack_base) + return; + SWIG_rt_stack_ptr--; + memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env)); +} + +SWIGINTERN void SWIG_add_registry_entry(SwigObj *entry) { + if (SWIG_registry_base == 0) { + SWIG_registry_base = SWIG_registry = (SwigObj **) malloc(SWIG_registry_size * sizeof(SwigObj *)); + memset(SWIG_registry_base, 0, SWIG_registry_size * sizeof(SwigObj *)); + } + *SWIG_registry = entry; + SWIG_registry++; + if ((SWIG_registry - SWIG_registry_base) == SWIG_registry_size) { + SWIG_registry = SWIG_registry_base; + SWIG_registry_size += SWIG_REGISTRY_INIT; + int new_size = SWIG_registry_size * sizeof(SwigObj *); + SWIG_registry_base = (SwigObj **) malloc(new_size); + memset(SWIG_registry_base, 0, new_size); + memcpy(SWIG_registry_base, SWIG_registry, (SWIG_registry_size - SWIG_REGISTRY_INIT) * sizeof(SwigObj *)); + free(SWIG_registry); + SWIG_registry = SWIG_registry_base + (SWIG_registry_size - SWIG_REGISTRY_INIT); + } +} + +SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) { + int i; + for (i = 0; i < SWIG_registry_size; ++i) { + if (*(SWIG_registry_base + i) == entry) { + *(SWIG_registry_base + i) = 0; + break; + } + } +} + +SWIGINTERN void SWIG_free_SwigObj(SwigObj *object) { + if (object) { + if (object->typenames) + free(object->typenames); + free(object); + object = (SwigObj *) 0; + } +} + +SWIGINTERN void SWIG_cleanup() { + if (SWIG_rt_stack_base) + free(SWIG_rt_stack_base); + if (SWIG_exc.msg) + free(SWIG_exc.msg); + if (SWIG_exc.klass) { + if (SWIG_exc.klass->typenames) + free(SWIG_exc.klass->typenames); + free(SWIG_exc.klass); + } + int i; + if (SWIG_registry_base) { + for (i = 0; i < SWIG_registry_size; ++i) { + if (*(SWIG_registry_base + i)) { + SWIG_free_SwigObj(*(SWIG_registry_base + i)); + *(SWIG_registry_base + i) = 0; + } + } + } + free(SWIG_registry_base); + SWIG_registry_base = 0; +} + +#ifdef __cplusplus +extern "C" { +#endif + +SWIGEXPORTC void SWIG_rt_try() { + SWIG_rt_stack_push(); +} + +SWIGEXPORTC int SWIG_rt_catch(const char *type) { + int result = 0; + if (!type || (strcmp("SWIG_AnyException", type) == 0)) { + result = 1; + } + else if (SWIG_exc.klass) { + int i = 0; + while (SWIG_exc.klass->typenames[i]) { + if (strcmp(SWIG_exc.klass->typenames[i++], type) == 0) { + result = 1; + break; + } + } + } + if (result) { + SWIG_rt_stack_pop(); + SWIG_exc.handled = 1; + } + return result; +} + +SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) { + if (SWIG_exc.msg) { + free(SWIG_exc.msg); + SWIG_exc.msg = (char *) 0; + } + if (msg) { + SWIG_exc.msg = (char *) malloc(strlen(msg) + 1); + strcpy(SWIG_exc.msg, msg); + } + SWIG_exc.klass = klass; + SWIG_exc.handled = 0; + longjmp(SWIG_rt_env, 1); +} + +SWIGEXPORTC void SWIG_rt_unhandled() { + if (SWIG_exc.msg) { + free(SWIG_exc.msg); + SWIG_exc.msg = 0; + } + SWIG_rt_stack_pop(); + longjmp(SWIG_rt_env, SWIG_exc.code); +} + +SWIGEXPORTC void SWIG_rt_endtry() { + if (SWIG_exc.handled) { + if (setjmp(SWIG_rt_env) == 0) { + SWIG_rt_stack_push(); + longjmp(SWIG_cpp_back_env, 1); + } + } + else { + SWIG_rt_stack_pop(); // pop the SWIG_try context + } +} + +SWIGEXPORTC int SWIG_exit(int code) { + SWIG_cleanup(); + exit(code); +} + +#ifdef __cplusplus +} +#endif + +SWIGINTERN void SWIG_terminate() { + fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", + SWIG_exc.klass->typenames[0], + SWIG_exc.msg ? SWIG_exc.msg : ""); + SWIG_exit(SWIG_exc.code); +} + +SWIGINTERN void SWIG_runtime_init() { + int i, code; + if (!SWIG_rt_init) { + SWIG_rt_init = 1; + SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); + if (SWIG_exc.code = setjmp(SWIG_rt_env)) { + // deallocate C++ exception + if (setjmp(SWIG_rt_env) == 0) { + SWIG_rt_stack_push(); + SWIG_exc.handled = 1; + longjmp(SWIG_cpp_back_env, 1); + } + SWIG_terminate(); + } + } +} + +#define SWIG_CThrowException(klass, msg) \ + if (setjmp(SWIG_cpp_back_env) == 0) \ + SWIG_rt_throw((SwigObj *) klass, msg); +%} + +%insert("proxy_header") %{ +// special value indicating any type of exception like 'catch(...)' +#define SWIG_AnyException "SWIG_AnyException" + +#include + +SWIGIMPORT jmp_buf SWIG_rt_env; + +SWIGIMPORT struct SWIG_exc_struct { + int code; + char *msg; + SwigObj *klass; +} SWIG_exc; + +SWIGIMPORT void SWIG_rt_try(); +SWIGIMPORT int SWIG_rt_catch(const char *type); +SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg); +SWIGIMPORT int SWIG_rt_unhandled(); +SWIGIMPORT void SWIG_rt_endtry(); +SWIGIMPORT int SWIG_exit(int code); + +#define SWIG_try \ + SWIG_rt_try(); \ + if ((SWIG_exc.code = setjmp(SWIG_rt_env)) == 0) +#define SWIG_catch(type) else if (SWIG_rt_catch(#type)) +#define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0); +#define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg); +#define SWIG_endtry else SWIG_rt_unhandled(); SWIG_rt_endtry(); + +%} + diff --git a/Lib/c/cproxy.swg b/Lib/c/cproxy.swg index 1806e3865..90626db98 100644 --- a/Lib/c/cproxy.swg +++ b/Lib/c/cproxy.swg @@ -17,3 +17,4 @@ # endif #endif +#include \ No newline at end of file diff --git a/Lib/c/std_common.i b/Lib/c/std_common.i new file mode 100644 index 000000000..c21a2e564 --- /dev/null +++ b/Lib/c/std_common.i @@ -0,0 +1,4 @@ +%include + +%apply size_t { std::size_t }; +%apply const size_t& { const std::size_t & }; diff --git a/Lib/c/std_except.i b/Lib/c/std_except.i new file mode 100644 index 000000000..5b6a929cd --- /dev/null +++ b/Lib/c/std_except.i @@ -0,0 +1,34 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * std_except.i + * + * Typemaps used by the STL wrappers that throw exceptions. + * These typemaps are used when methods are declared with an STL exception specification, such as + * size_t at() const throw (std::out_of_range); + * ----------------------------------------------------------------------------- */ + +%{ +#include +%} + +namespace std +{ + %ignore exception; + struct exception {}; +} + +/* +%typemap(throws) std::bad_exception "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" +%typemap(throws) std::domain_error "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" +%typemap(throws) std::exception "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" +%typemap(throws) std::invalid_argument "SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, $1.what());\n return $null;" +%typemap(throws) std::length_error "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;" +%typemap(throws) std::logic_error "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" +%typemap(throws) std::out_of_range "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;" +%typemap(throws) std::overflow_error "SWIG_JavaThrowException(jenv, SWIG_JavaArithmeticException, $1.what());\n return $null;" +%typemap(throws) std::range_error "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;" +%typemap(throws) std::runtime_error "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" +%typemap(throws) std::underflow_error "SWIG_JavaThrowException(jenv, SWIG_JavaArithmeticException, $1.what());\n return $null;" +*/ diff --git a/Lib/c/std_map.i b/Lib/c/std_map.i new file mode 100644 index 000000000..479e921cc --- /dev/null +++ b/Lib/c/std_map.i @@ -0,0 +1 @@ +%include \ No newline at end of file diff --git a/Lib/c/std_pair.i b/Lib/c/std_pair.i new file mode 100644 index 000000000..82ca45c1a --- /dev/null +++ b/Lib/c/std_pair.i @@ -0,0 +1 @@ +%include diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index 0740de333..8be2455fb 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -16,6 +16,8 @@ class string; %typemap(couttype) string "char *" %typemap(couttype) const string & "char *" %typemap(couttype) string * "char *" +%typemap(cppouttype, retobj="1") string "std::string*" +%typemap(cppouttype) const string &, string * "std::string*" %typemap(in) string { if ($input) { @@ -50,4 +52,3 @@ class string; } } - diff --git a/Lib/c/std_vector.i b/Lib/c/std_vector.i new file mode 100644 index 000000000..e6011f285 --- /dev/null +++ b/Lib/c/std_vector.i @@ -0,0 +1,64 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * std_vector.i + * ----------------------------------------------------------------------------- */ + +%include + +%{ +#include +#include +%} + +// C module specific: $tt expands to the type the template is instantiated +%typemap(ctype) std::vector "$tt" +%typemap(in) std::vector "$1 = ($1_ltype) $input;" +%typemap(out) std::vector "$result = ($1_ltype) $1;" +%typemap(cppouttype) std::vector "$1_ltype" + +namespace std { + + template class vector { + public: + typedef size_t size_type; + typedef T value_type; + typedef const value_type& const_reference; + vector(); + vector(size_type n); + size_type size() const; + size_type capacity() const; + void reserve(size_type n); + bool empty() const; + void clear(); + void push_back(const value_type& x); + const_reference at(size_type i); + }; + + %define specialize_std_vector(T) + template<> class vector { + public: + typedef size_t size_type; + typedef T value_type; + vector(); + vector(size_type n); + size_type size() const; + size_type capacity() const; + void reserve(size_type n); + bool empty() const; + void clear(); + void push_back(T x) { this->push_back(x); } + T at(size_type i) { return this->at(i); } + }; + %enddef + + specialize_std_vector(int); + specialize_std_vector(bool); + /*specialize_std_vector(long); + specialize_std_vector(char); + specialize_std_vector(double); + specialize_std_vector(int*); + specialize_std_vector(char*);*/ +} + diff --git a/Lib/c/stl.i b/Lib/c/stl.i new file mode 100644 index 000000000..72e9628c9 --- /dev/null +++ b/Lib/c/stl.i @@ -0,0 +1,12 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * stl.i + * ----------------------------------------------------------------------------- */ + +%include +%include +%include +%include +%include diff --git a/Lib/c/typemaps.i b/Lib/c/typemaps.i new file mode 100644 index 000000000..10407cd21 --- /dev/null +++ b/Lib/c/typemaps.i @@ -0,0 +1,12 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * typemaps.i + * + * Pointer handling + * These mappings provide support for input/output arguments and common + * uses for C/C++ pointers. + * ----------------------------------------------------------------------------- */ + +%include diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 7783e5367..74a960214 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -14,7 +14,8 @@ char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $"; int SwigType_isbuiltin(SwigType *t) { const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", - "unsigned short", "unsigned int", "unsigned long", "unsigned char", "signed char", 0 }; + "unsigned short", "unsigned int", "unsigned long", "unsigned char", "signed char", + "long long", "unsigned long long", 0 }; int i = 0; char *c = Char(t); if (!t) @@ -30,6 +31,7 @@ int SwigType_isbuiltin(SwigType *t) { class C:public Language { static const char *usage; + File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -127,6 +129,7 @@ public: String *finish_create_object() { String *s = create_object; + Printf(s, "SWIG_add_registry_entry(result);\n"); Printf(s, "return result;\n"); Printf(s, "}\n\n"); return create_object; @@ -150,13 +153,7 @@ public: String *finish_destroy_object() { String *s = destroy_object; - if (except_flag) - Printf(s, "free(object->typenames);\n"); - Printf(s, "free(object);\n"); - Printf(s, "object = (SwigObj *) 0;\n"); - if (except_flag) - Printf(s, "}\n"); - Printf(s, "}\n}\n"); + Printf(s, "SWIG_free_SwigObj(object);\n}\n}\n}\n"); return destroy_object; } @@ -169,16 +166,17 @@ public: String *outfile = Getattr(n, "outfile"); // initialize I/O - f_runtime = NewFile(outfile, "w", SWIG_output_files()); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } + f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); - Swig_banner(f_runtime); + Swig_banner(f_begin); // generate proxy files if enabled if (proxy_flag) { @@ -209,6 +207,7 @@ public: Printf(f_proxy_header, "#ifndef _%s_proxy_H_\n#define _%s_proxy_H_\n\n", Char(module), Char(module)); } + Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("runtime", f_runtime); @@ -218,16 +217,19 @@ public: Printf(f_wrappers, "extern \"C\" {\n"); Printf(f_wrappers, "#endif\n\n"); - start_create_object(); - if (except_flag) + + if (except_flag) { + start_create_object(); start_destroy_object(); + } // emit code for children Language::top(n); - Append(f_header, finish_create_object()); - if (except_flag) + if (except_flag) { + Append(f_header, finish_create_object()); Append(f_header, finish_destroy_object()); + } Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "}\n"); @@ -245,11 +247,13 @@ public: } // write all to the file - Wrapper_pretty_print(f_header, f_runtime); - Dump(f_wrappers, f_runtime); - Wrapper_pretty_print(f_init, f_runtime); + Dump(f_header, f_runtime); + Wrapper_pretty_print(f_wrappers, f_runtime); + Dump(f_init, f_runtime); + Dump(f_runtime, f_begin); // cleanup + Delete(f_begin); Delete(f_header); Delete(f_wrappers); Delete(f_init); @@ -274,7 +278,6 @@ public: char *c = Char(type_str); c[Len(type_str) - Len(dims) - 1] = '\0'; String *bare_type = NewStringf("%s", c); - //Printv(f_proxy_header, "SWIGIMPORT ", bare_type, " *", name, ";\n\n", NIL); Printv(f_proxy_header, "SWIGIMPORT ", bare_type, " ", name, "[];\n\n", NIL); Delete(bare_type); } @@ -297,11 +300,12 @@ public: String *arg_list = NewString(""); String *call = empty_string; String *cres = empty_string; - + call = Swig_cfunction_call(Getattr(n, "name"), parms); cres = Swig_cresult(type, "result", call); Setattr(n, "wrap:action", cres); - + Setattr(n, "c:globalfun", "1"); + if (!SwigType_ispointer(type) && !SwigType_isreference(type)) Setattr(n, "c:retval", "1"); @@ -355,19 +359,20 @@ public: * ---------------------------------------------------------------------- */ String *get_mangled_type(SwigType *type_arg) { - static String *result = 0; + String *result = NewString(""); SwigType *prefix = 0; - if (result) - Delete(result); - result = NewString(""); - - SwigType *type = Copy(type_arg); + SwigType *type = 0; + SwigType *tdtype = SwigType_typedef_resolve_all(type_arg); + if (tdtype) + type = tdtype; + else + type = Copy(type_arg); + // special cases for ptr to function as an argument if (SwigType_ismemberpointer(type)) { SwigType_del_memberpointer(type); SwigType_add_pointer(type); } - if (SwigType_ispointer(type)) { SwigType_del_pointer(type); if (SwigType_isfunction(type)) { @@ -395,13 +400,14 @@ public: else if (SwigType_isenum(type)) Printf(result, "e%s", Swig_scopename_last(type)); else - Printf(result, "%s", Char(SwigType_base(type))); + Printf(result, "%s", Char(Swig_name_mangle(SwigType_base(type)))); ready: if (prefix) Delete(prefix); if (type) Delete(type); + return result; } @@ -410,7 +416,7 @@ ready: * ---------------------------------------------------------------------- */ virtual int functionWrapper(Node *n) { - String *name = Getattr(n, "sym:name"); + String *name = Copy(Getattr(n, "sym:name")); String *storage = Getattr(n, "storage"); SwigType *type = Getattr(n, "type"); SwigType *otype = Copy(type); @@ -422,9 +428,10 @@ ready: String *tm; String *proto = NewString(""); String *over_suffix = NewString(""); - SwigType *return_var_type = empty_string; int gencomma; + bool is_global = Cmp(Getattr(n, "c:globalfun"), "1") == 0; // possibly no longer neede bool is_void_return = (SwigType_type(type) == T_VOID); + bool return_object = false; // create new function wrapper object Wrapper *wrapper = NewWrapper(); @@ -483,7 +490,7 @@ ready: // C++ function wrapper // mark the first parameter as object-struct - if (storage && Cmp(storage, "static") != 0) { + if (!is_global && storage && Cmp(storage, "static") != 0) { if ((Cmp(Getattr(n, "ismember"), "1") == 0) && (Cmp(nodeType(n), "constructor") != 0)) { Setattr(parms, "c:objstruct", "1"); @@ -507,11 +514,17 @@ ready: Append(name, over_suffix); } } + + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) + type = tdtype; + + Setattr(n, "type", type); // create new wrapper name wname = Swig_name_wrapper(name); Setattr(n, "wrap:name", wname); - + // set the return type if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { Printv(return_type, SwigType_str(type, 0), NIL); @@ -521,115 +534,30 @@ ready: if (ctypeout) tm = ctypeout; Printf(return_type, "%s", tm); + // template handling + Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); } else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); } - - // add variable for holding result of original function 'cppresult' - // WARNING: Here we possibly make change to 'type' attribute of the node. - // This is done before the standard typemaps are attached, so they will - // use the modified type. - // In order to refer to the original type use 'otype' variable. - bool return_object = false; - if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - SwigType *tdtype = SwigType_typedef_resolve_all(type); - if (tdtype) - type = tdtype; - - if (SwigType_ismemberpointer(type)) { - Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult")); - } - else if (SwigType_isenum(type)) { - Wrapper_add_localv(wrapper, "cppresult", "int", "cppresult", NIL); - } - else { - if (SwigType_isbuiltin(SwigType_base(type))) { - // type is built-in (int, char, double, etc.) - - //Printf(stdout, "BUILTIN %s %s\n", name, SwigType_str(type, 0)); - - if (SwigType_isconst(type)) - SwigType_del_qualifier(type); - if (SwigType_isreference(type)) { - if (SwigType_isconst(SwigType_del_reference(type))) { - return_var_type = SwigType_base(type); - SwigType_add_qualifier(return_var_type, "const"); - SwigType_add_pointer(return_var_type); - } - else { - return_var_type = SwigType_base(type); - SwigType_add_pointer(return_var_type); - } - if (SwigType_ispointer(type)) { - SwigType_add_pointer(return_var_type); - } - SwigType_add_reference(type); - } - else if (SwigType_isarray(type)) { - - return_var_type = SwigType_base(type); - SwigType *atype = Copy(type); - do { - SwigType_del_array(atype); - SwigType_add_pointer(return_var_type); - } while (SwigType_isarray(atype)); - if (SwigType_ispointer(atype)) - SwigType_add_pointer(return_var_type); - Delete(atype); - } - else { - return_var_type = type; - } - } - else { - // type is class - - //Printf(stdout, "CLASS %s %s\n", name, SwigType_str(type, 0)); - if (SwigType_ispointer(type)) { - return_var_type = type; - } - else if (SwigType_isreference(type)) { - return_var_type = type; - SwigType_del_reference(return_var_type); - SwigType_add_pointer(return_var_type); - } - else if (SwigType_isarray(type)) { - return_var_type = SwigType_base(type); - SwigType *atype = Copy(type); - do { - SwigType_del_array(atype); - SwigType_add_pointer(return_var_type); - } while (SwigType_isarray(atype)); - Delete(atype); - //if (Cmp(Getattr(n, "c:retval"), "1")) - SwigType_add_pointer(return_var_type); - } - else { - SwigType_add_pointer(type); - return_var_type = type; - } - return_object = true; - } - - // hack for handling const 'cppresult' return values, - // including cases like: A const *& - SwigType *temp1 = Copy(otype), *temp2 = 0; - if (SwigType_isreference(temp1)) { - SwigType_del_reference(temp1); - temp2 = Copy(temp1); - if (SwigType_ispointer(temp2)) - SwigType_del_pointer(temp2); - } - String *var_name = SwigType_str(return_var_type, 0); - if (SwigType_isconst(otype) || SwigType_isconst(temp1) || SwigType_isconst(temp2)) - Replaceall(var_name, "const", ""); - Wrapper_add_localv(wrapper, "cppresult", var_name, "cppresult", NIL); - Delete(var_name); - Delete(temp1); - if (temp2) - Delete(temp2); + // add variable for holding result of original function 'cppresult' + // WARNING: testing typemap approach + SwigType *cpptype; + if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { + if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) { + SwigType *tdtype = SwigType_typedef_resolve_all(tm); + if (tdtype) + cpptype = tdtype; + else + cpptype = tm; + if (SwigType_ismemberpointer(type)) + Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult")); + Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult")); + return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1"); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cppouttype typemap defined for %s\n", SwigType_str(type, 0)); } } @@ -658,12 +586,10 @@ ready: gencomma = 0; for (p = parms; p; ) { - //Printf(stdout, "TYPE: %s ", SwigType_str(Getattr(p, "type"), 0)); - //Swig_print_node(p); - - while (checkAttribute(p, "tmap:in:numinputs", "0")) { + while (p && checkAttribute(p, "tmap:in:numinputs", "0")) { p = Getattr(p, "tmap:in:next"); } + if (!p) break; SwigType *type = Getattr(p, "type"); if (SwigType_type(type) == T_VOID) { @@ -684,16 +610,13 @@ ready: // set the appropriate type for parameter if ((tm = Getattr(p, "tmap:ctype"))) { Printv(c_parm_type, tm, NIL); + // template handling + Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); } else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); } - // hack for handling arrays of objects, as typemap SWIGOBJ *[ANY] - // precedes int *[ANY] for int arrays - if (!SwigType_isbuiltin(SwigType_base(type))) - Replaceall(c_parm_type, SwigType_base(type), SwigType_isarray(type) ? "SwigObj *" : "SwigObj"); - // use proxy-type for parameter if supplied String* stype = Getattr(p, "c:stype"); if (stype) { @@ -755,12 +678,19 @@ ready: String *action = Getattr(n, "wrap:action"); if (!action) action = NewString(""); + + String *cbase_name = Getattr(n, "c:base_name"); + if (cbase_name) { + Replaceall(action, "arg1)->", NewStringf("(%s*)arg1)->", Getattr(n, "c:inherited_from"))); + Replaceall(action, Getattr(n, "name"), cbase_name); + } // handle special cases of cpp return result - if (Cmp(nodeType(n), "constructor") != 0) { - if (SwigType_isenum(type)) { - // returning enum value - Replace(action, "result =", "cppresult = (int)", DOH_REPLACE_FIRST); + if (Cmp(nodeType(n), "constructor") != 0) { + if (SwigType_isenum(SwigType_base(type))){ + if (return_object) + Replaceall(action, "result =", "cppresult = (int)"); + else Replaceall(action, "result =", "cppresult = (int*)"); } else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type) && Cmp(Getattr(n, "storage"), "static") != 0) { @@ -769,25 +699,28 @@ ready: String *lstr = SwigType_lstr(type, 0); if (Cmp(Getattr(n, "kind"), "variable") == 0) { Delete(action); - action = NewStringf("const %s = %s;\n", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0)); + action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0)); } else { - String *call_str = NewStringf("const %s = %s", str, + String *call_str = NewStringf("{const %s = %s", str, SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : ""); - Replace(action, "result =", call_str, DOH_REPLACE_FIRST); + Replaceall(action, "result =", call_str); Delete(call_str); } - Printf(action, "\ncppresult = (%s) &_result_ref;\n", lstr); + if (Getattr(n, "nested")) + Replaceall(action, "=", NewStringf("= *(%s)(void*) &", SwigType_str(otype, 0))); + Printf(action, "cppresult = (%s*) &_result_ref;}", lstr); Delete(str); Delete(lstr); } else - Replace(action, "result =", "cppresult = ", DOH_REPLACE_FIRST); + Replaceall(action, "result =", "cppresult = "); } // prepare action code to use, e.g. insert try-catch blocks action = emit_action(n); + Setattr(n, "type", type); // emit output typemap if needed if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { @@ -861,6 +794,7 @@ ready: Delete(wname); Delete(return_type); Delete(otype); + Delete(name); DelWrapper(wrapper); return SWIG_OK; } @@ -879,6 +813,9 @@ ready: Setattr(new_node, "parms", Copy(Getattr(node, "parms"))); Setattr(new_node, "type", Copy(Getattr(node, "type"))); Setattr(new_node, "decl", Copy(Getattr(node, "decl"))); + String *cif = Getattr(node, "c:inherited_from"); + if (cif) + Setattr(new_node, "c:inherited_from", Copy(cif)); return new_node; } @@ -888,13 +825,13 @@ ready: * tests if given name already exists in one of child nodes of n * --------------------------------------------------------------------- */ - bool is_in(String *name, Node *n) { + Hash *is_in(String *name, Node *n) { Hash *h; for (h = firstChild(n); h; h = nextSibling(h)) { if (Cmp(name, Getattr(h, "name")) == 0) - return true; + return h; } - return false; + return 0; } /* --------------------------------------------------------------------- @@ -910,6 +847,7 @@ ready: Printv(f_proxy_header, " ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL); Delete(type); } + // WARNING: proxy delaration can be different than original code if (Cmp(nodeType(node), "extend") == 0) emit_c_struct_def(firstChild(node)); } @@ -920,16 +858,10 @@ ready: * --------------------------------------------------------------------- */ virtual int classHandler(Node *n) { - String *name = NewString(""); + String *name = Getattr(n, "sym:name"); String *sobj = NewString(""); List *baselist = Getattr(n, "bases"); - String *prefix = Swig_scopename_prefix(Getattr(n, "classtype")); - if (prefix) - Printf(name, "%s_", Swig_name_mangle(prefix)); - Append(name, Getattr(n, "sym:name")); - Setattr(n, "sym:name", name); - if (CPlusPlus) { // inheritance support: attach all members from base classes to this class if (baselist) { @@ -942,22 +874,39 @@ ready: || (Cmp(Getattr(node, "kind"), "function") == 0)) { if ((Cmp(Getattr(node, "access"), "public") == 0) && (Cmp(Getattr(node, "storage"), "static") != 0)) { - if (!is_in(Getattr(node, "name"), n)) { - Node* new_node = copy_node(node); - Setattr(new_node, "sym:name", Getattr(new_node, "name")); - Setattr(new_node, "sym:symtab", Getattr(n, "symtab")); - set_nodeType(new_node, "cdecl"); - appendChild(n, new_node); - } + Node *new_node = copy_node(node); + String *parent_name = Getattr(parentNode(node), "name"); + Hash *dupl_name_node = is_in(Getattr(node, "name"), n); + // if there's a duplicate inherited name, due to the C++ multiple + // inheritance, change both names to avoid ambiguity + if (dupl_name_node) { + String *cif = Getattr(dupl_name_node, "c:inherited_from"); + String *old_name = Getattr(dupl_name_node, "name"); + if (cif && parent_name && (Cmp(cif, parent_name) != 0)) { + Setattr(dupl_name_node, "name", NewStringf("%s%s", cif ? cif : "", old_name)); + Setattr(dupl_name_node, "c:base_name", old_name); + Setattr(new_node, "name", NewStringf("%s%s", parent_name, old_name)); + Setattr(new_node, "c:base_name", old_name); + Setattr(new_node, "c:inherited_from", parent_name); + Setattr(new_node, "sym:name", Getattr(new_node, "name")); + Setattr(new_node, "sym:symtab", Getattr(n, "symtab")); + set_nodeType(new_node, "cdecl"); + appendChild(n, new_node); + } + } + else { + Setattr(new_node, "c:inherited_from", parent_name); + Setattr(new_node, "sym:name", Getattr(new_node, "name")); + Setattr(new_node, "sym:symtab", Getattr(n, "symtab")); + set_nodeType(new_node, "cdecl"); + appendChild(n, new_node); + } } } } } } - if (except_flag) - Printv(f_header, "const char* Swig_typename_", name, " = \"", name, "\";\n\n", NIL); - // declare type for specific class in the proxy header if (proxy_flag) Printv(f_proxy_header, "\ntypedef SwigObj ", name, ";\n\n", NIL); @@ -967,12 +916,20 @@ ready: return Language::classHandler(n); } else if (Cmp(Getattr(n, "kind"), "struct") == 0) { - // this is C struct, just declare it in proxy + // this is C struct, just declare it in the proxy if (proxy_flag) { - Printv(f_proxy_header, "struct ", name, " {\n", NIL); + String *storage = Getattr(n, "storage"); + int usetd = storage && Cmp(storage, "typedef") == 0; + if (usetd) + Append(f_proxy_header, "typedef struct {\n"); + else + Printv(f_proxy_header, "struct ", name, " {\n", NIL); Node *node = firstChild(n); emit_c_struct_def(node); - Append(f_proxy_header, "};\n\n"); + if (usetd) + Printv(f_proxy_header, "} ", name, ";\n\n", NIL); + else + Append(f_proxy_header, "};\n\n"); } Delete(sobj); @@ -1015,7 +972,6 @@ ready: return Language::memberfunctionHandler(n); } - /* --------------------------------------------------------------------- * staticmembervariableHandler() * --------------------------------------------------------------------- */ @@ -1095,13 +1051,17 @@ ready: Printf(s, "result->typenames[%d] = 0;\n", i); Printf(s, "}\n"); } + + /* --------------------------------------------------------------------- + * add_to_destroy_object() + * --------------------------------------------------------------------- */ - void add_to_destroy_object(Node *n, String *classname) { + void add_to_destroy_object(Node *n, String *classname, String *classtype) { String *s = destroy_object; String *access = Getattr(n, "access"); if (access && Cmp(access, "private") != 0) { Printv(s, "if (strcmp(object->typenames[0], \"", classname, "\") == 0) {\n", NIL); - Printv(s, "if (object->obj)\ndelete (", classname, " *) (object->obj);\n", NIL); + Printv(s, "if (object->obj)\ndelete (", classtype, " *) (object->obj);\n", NIL); Printf(s, "}\n"); } } @@ -1118,7 +1078,7 @@ ready: return copyconstructorHandler(n); Node *klass = Swig_methodclass(n); - String *classname = Getattr(klass, "classtype"); + String *classname = Getattr(klass, "name"); String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype; @@ -1148,18 +1108,18 @@ ready: // generate action code if (except_flag) { - add_to_create_object(n, classname, newclassname); + if (!Getattr(klass, "c:create")) { + add_to_create_object(n, classname, newclassname); + Setattr(klass, "c:create", "1"); + } Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); - Printf(code, "SWIG_add_registry_entry(result);\n"); } else { Printf(code, "result = SWIG_create_object();\n"); } - - Printv(code, "result->obj = (void*) new ", classname, arg_lnames, ";\n", NIL); + Printv(code, "result->obj = (void*) new ", Getattr(klass, "classtype"), arg_lnames, ";\n", NIL); Setattr(n, "wrap:action", code); - functionWrapper(n); Delete(arg_lnames); @@ -1205,18 +1165,18 @@ ready: // generate action code if (except_flag) { - add_to_create_object(n, classname, newclassname); + if (!Getattr(klass, "c:create")) { + add_to_create_object(n, classname, newclassname); + Setattr(klass, "c:create", "1"); + } Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL); - Printf(code, "SWIG_add_registry_entry(result);\n"); - } + } else { Printf(code, "result = SWIG_create_object();\n"); } - Printv(code, "result->obj = (void*) new ", classname, "((", classname, " const &)*arg1);\n", NIL); - Setattr(n, "wrap:action", code); - + Setattr(n, "wrap:action", code); functionWrapper(n); Delete(constr_name); @@ -1233,7 +1193,8 @@ ready: virtual int destructorHandler(Node *n) { Node *klass = Swig_methodclass(n); - String *classname = Getattr(klass, "classtype"); + String *classname = Getattr(klass, "name"); + String *classtype = Getattr(klass, "classtype"); String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); String *ctype; @@ -1261,18 +1222,18 @@ ready: // create action code if (except_flag) { - add_to_destroy_object(n, classname); + add_to_destroy_object(n, classname, classtype); Printf(code, "SWIG_remove_registry_entry(carg1);\n"); Printf(code, "SWIG_destroy_object(carg1);"); } else { - Printv(code, "if (carg1->obj)\ndelete (", classname, " *) (carg1->obj);\n", NIL); + Printv(code, "if (carg1->obj)\ndelete (", classtype, " *) (carg1->obj);\n", NIL); } - + Setattr(n, "wrap:action", code); functionWrapper(n); - + Delete(p); Delete(destr_name); Delete(code); @@ -1318,7 +1279,38 @@ ready: Printv(f_proxy_header, "#define ", name, " ", value, "\n", NIL); return SWIG_OK; } + + /* --------------------------------------------------------------------- + * classDeclaration() + * --------------------------------------------------------------------- */ + virtual int classDeclaration(Node *n) { + String *name = NewString(""); + String *classtype = Getattr(n, "classtype"); + String *prefix = 0; + if (classtype) { + prefix = Swig_scopename_prefix(classtype); + if (prefix) + Printf(name, "%s_", Swig_name_mangle(prefix)); + } + Append(name, Swig_name_mangle(Getattr(n, "sym:name"))); + Setattr(n, "sym:name", name); + if (except_flag) + Printv(f_header, "const char* Swig_typename_", name, " = \"", Getattr(n, "name"), "\";\n\n", NIL); + return Language::classDeclaration(n); + } + + /* --------------------------------------------------------------------- + * extendDirective() + * + * The idea is to extend the class with additional variables, using + * SwigObj structs. This is not implemented yet. + * --------------------------------------------------------------------- */ + + virtual int extendDirective(Node *n) { + return Language::extendDirective(n); + } + }; /* class C */ /* ----------------------------------------------------------------------------- From 3ab6cb695ea4c9d75c117d748586e07483cb1d0c Mon Sep 17 00:00:00 2001 From: Maciej Drwal Date: Wed, 15 Apr 2009 23:38:48 +0000 Subject: [PATCH 054/508] One more runtime test case git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11190 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- .../test-suite/c/operator_overload_runme.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Examples/test-suite/c/operator_overload_runme.c diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c new file mode 100644 index 000000000..fc27fd5b5 --- /dev/null +++ b/Examples/test-suite/c/operator_overload_runme.c @@ -0,0 +1,25 @@ +#include + +#include "operator_overload/operator_overload_proxy.h" + +#define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); SWIG_exit(0); } + +SWIG_MAKE_DELETE(delete_Ops, Op); + +int main() { + Op_sanity_check(); + + Op *op1 = new_Op_i(1), *op2 = new_Op_i(2), *op3 = copy_Op(op1); + + assert(Op_NotEqual(op1, op2), "neq failed"); + Op_PlusPlusPrefix(op3); + assert(Op_EqualEqual(op2, op3), "eqeq failed"); + assert(Op_GreaterThanEqual(op2, op1), "geq failed"); + Op_PlusEqual(op3, op1); + assert(Op_LessThan(op1, op2) && Op_LessThan(op2, op3), "lt failed"); + assert(3 == *Op_IndexInto(op3, Op_IndexIntoConst(op2, Op_Functor_pOp(op1))), "[] or () failed"); + assert(5 == Op_Functor_pOp_i(op3, 2), "f(x) failed"); + + delete_Ops(op1, op2, op3, 0); + SWIG_exit(0); +} From d1e871f0d218b0d421c41b15633fb5e13458345e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 6 Mar 2010 13:26:09 +0000 Subject: [PATCH 055/508] merge revisions 11872:11876 from trunk to gsoc2008-maciekd branch - license changes git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@11918 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 10 +- COPYRIGHT | 63 + Doc/Manual/Sections.html | 2 +- Examples/GIFPlot/C/Makefile | 17 - Examples/GIFPlot/C/gifplot.i | 15 - Examples/GIFPlot/Chicken/check.list | 3 - Examples/GIFPlot/Chicken/full/Makefile | 28 - Examples/GIFPlot/Chicken/full/README | 6 - Examples/GIFPlot/Chicken/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Chicken/full/gifplot.i | 26 - .../GIFPlot/Chicken/full/test-gifplot.scm | 66 - Examples/GIFPlot/Chicken/simple/Makefile | 28 - Examples/GIFPlot/Chicken/simple/README | 5 - Examples/GIFPlot/Chicken/simple/simple.i | 34 - .../GIFPlot/Chicken/simple/test-simple.scm | 29 - Examples/GIFPlot/Common-Lisp/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Common-Lisp/full/gifplot.i | 21 - Examples/GIFPlot/Common-Lisp/full/runme.lisp | 59 - Examples/GIFPlot/Guile/check.list | 3 - Examples/GIFPlot/Guile/full/Makefile | 28 - Examples/GIFPlot/Guile/full/README | 8 - Examples/GIFPlot/Guile/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Guile/full/gifplot.i | 21 - Examples/GIFPlot/Guile/full/runme.scm | 66 - Examples/GIFPlot/Guile/simple/Makefile | 28 - Examples/GIFPlot/Guile/simple/README | 11 - Examples/GIFPlot/Guile/simple/runme.scm | 30 - Examples/GIFPlot/Guile/simple/simple.i | 34 - Examples/GIFPlot/Include/gifplot.h | 333 --- Examples/GIFPlot/Interface/gifplot.i | 264 -- Examples/GIFPlot/Java/check.list | 4 - Examples/GIFPlot/Java/full/Makefile | 20 - Examples/GIFPlot/Java/full/README | 8 - Examples/GIFPlot/Java/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Java/full/gifplot.i | 15 - Examples/GIFPlot/Java/full/runme.java | 75 - Examples/GIFPlot/Java/shadow/Makefile | 21 - Examples/GIFPlot/Java/shadow/README | 5 - Examples/GIFPlot/Java/shadow/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Java/shadow/runme.java | 76 - Examples/GIFPlot/Java/simple/Makefile | 21 - Examples/GIFPlot/Java/simple/README | 5 - Examples/GIFPlot/Java/simple/runme.java | 41 - Examples/GIFPlot/Java/simple/simple.i | 38 - Examples/GIFPlot/Lib/Makefile.in | 22 - Examples/GIFPlot/Lib/color.c | 143 -- Examples/GIFPlot/Lib/font.c | 705 ------ Examples/GIFPlot/Lib/frame.c | 924 ------- Examples/GIFPlot/Lib/gif.c | 672 ----- Examples/GIFPlot/Lib/matrix.c | 343 --- Examples/GIFPlot/Lib/pixmap.c | 159 -- Examples/GIFPlot/Lib/plot2d.c | 445 ---- Examples/GIFPlot/Lib/plot3d.c | 2181 ----------------- Examples/GIFPlot/Makefile.in | 23 - Examples/GIFPlot/Ocaml/check.list | 3 - Examples/GIFPlot/Ocaml/full/Makefile | 33 - Examples/GIFPlot/Ocaml/full/README | 8 - Examples/GIFPlot/Ocaml/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Ocaml/full/gifplot.i | 15 - Examples/GIFPlot/Ocaml/full/runme.ml | 87 - Examples/GIFPlot/Ocaml/simple/Makefile | 33 - Examples/GIFPlot/Ocaml/simple/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Ocaml/simple/runme.ml | 35 - Examples/GIFPlot/Ocaml/simple/simple.i | 33 - Examples/GIFPlot/Perl5/check.list | 4 - Examples/GIFPlot/Perl5/full/Makefile | 24 - Examples/GIFPlot/Perl5/full/README | 8 - Examples/GIFPlot/Perl5/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Perl5/full/gifplot.i | 15 - Examples/GIFPlot/Perl5/full/runme.pl | 68 - Examples/GIFPlot/Perl5/shadow/Makefile | 25 - Examples/GIFPlot/Perl5/shadow/README | 2 - Examples/GIFPlot/Perl5/shadow/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Perl5/shadow/runme.pl | 68 - Examples/GIFPlot/Perl5/simple/Makefile | 24 - Examples/GIFPlot/Perl5/simple/README | 5 - Examples/GIFPlot/Perl5/simple/runme.pl | 28 - Examples/GIFPlot/Perl5/simple/simple.i | 38 - Examples/GIFPlot/Php/check.list | 3 - Examples/GIFPlot/Php/full/Makefile | 20 - Examples/GIFPlot/Php/full/README | 4 - Examples/GIFPlot/Php/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Php/full/gifplot.i | 15 - Examples/GIFPlot/Php/full/runme.php | 78 - Examples/GIFPlot/Php/shadow/Makefile | 19 - Examples/GIFPlot/Php/shadow/README | 2 - Examples/GIFPlot/Php/shadow/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Php/shadow/runme.php | 79 - Examples/GIFPlot/Php/simple/Makefile | 20 - Examples/GIFPlot/Php/simple/README | 5 - Examples/GIFPlot/Php/simple/runme.php | 32 - Examples/GIFPlot/Php/simple/simple.i | 38 - Examples/GIFPlot/Pike/check.list | 2 - Examples/GIFPlot/Pike/simple/Makefile | 24 - Examples/GIFPlot/Pike/simple/README | 5 - Examples/GIFPlot/Pike/simple/runme.pike | 30 - Examples/GIFPlot/Pike/simple/simple.i | 38 - Examples/GIFPlot/Python/check.list | 4 - Examples/GIFPlot/Python/full/Makefile | 26 - Examples/GIFPlot/Python/full/README | 8 - Examples/GIFPlot/Python/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Python/full/gifplot.i | 15 - Examples/GIFPlot/Python/full/runme.py | 64 - Examples/GIFPlot/Python/shadow/Makefile | 27 - Examples/GIFPlot/Python/shadow/README | 8 - Examples/GIFPlot/Python/shadow/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Python/shadow/runme.py | 62 - Examples/GIFPlot/Python/simple/Makefile | 26 - Examples/GIFPlot/Python/simple/README | 5 - Examples/GIFPlot/Python/simple/runme.py | 27 - Examples/GIFPlot/Python/simple/simple.i | 38 - Examples/GIFPlot/README | 59 - Examples/GIFPlot/Ruby/check.list | 4 - Examples/GIFPlot/Ruby/full/Makefile | 24 - Examples/GIFPlot/Ruby/full/README | 8 - Examples/GIFPlot/Ruby/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Ruby/full/gifplot.i | 15 - Examples/GIFPlot/Ruby/full/runme.rb | 66 - Examples/GIFPlot/Ruby/shadow/Makefile | 25 - Examples/GIFPlot/Ruby/shadow/README | 5 - Examples/GIFPlot/Ruby/shadow/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Ruby/shadow/runme.rb | 66 - Examples/GIFPlot/Ruby/simple/Makefile | 24 - Examples/GIFPlot/Ruby/simple/README | 5 - Examples/GIFPlot/Ruby/simple/runme.rb | 27 - Examples/GIFPlot/Ruby/simple/simple.i | 38 - Examples/GIFPlot/Tcl/check.list | 4 - Examples/GIFPlot/Tcl/full/Makefile | 24 - Examples/GIFPlot/Tcl/full/README | 8 - Examples/GIFPlot/Tcl/full/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Tcl/full/gifplot.i | 15 - Examples/GIFPlot/Tcl/full/runme.tcl | 67 - Examples/GIFPlot/Tcl/mandel/Makefile | 24 - Examples/GIFPlot/Tcl/mandel/README | 6 - Examples/GIFPlot/Tcl/mandel/cmap | Bin 768 -> 0 bytes Examples/GIFPlot/Tcl/mandel/display.tcl | 68 - Examples/GIFPlot/Tcl/mandel/mandel.i | 47 - Examples/GIFPlot/Tcl/mandel/mandel.tcl | 170 -- Examples/GIFPlot/Tcl/simple/Makefile | 24 - Examples/GIFPlot/Tcl/simple/README | 5 - Examples/GIFPlot/Tcl/simple/runme.tcl | 27 - Examples/GIFPlot/Tcl/simple/simple.i | 38 - Examples/chicken/zlib/Makefile | 28 - Examples/chicken/zlib/README.html | 1666 ------------- Examples/chicken/zlib/example.i | 76 - Examples/chicken/zlib/test-zlib.scm | 41 - Examples/guile/check.list | 1 - Examples/lua/lua.c | 1 - Examples/test-suite/li_std_queue.i | 11 +- Examples/test-suite/li_std_set.i | 22 +- Examples/test-suite/li_std_stack.i | 11 +- .../ruby/ruby_li_std_speed_runme.rb | 3 - Examples/test-suite/ruby_li_std_speed.i | 11 +- Examples/xml/example_gif.i | 329 --- LICENSE | 109 +- LICENSE-GPL | 674 +++++ LICENSE-UNIVERSITIES | 95 + Lib/allegrocl/allegrocl.swg | 2 - Lib/allegrocl/longlongs.i | 3 - Lib/allegrocl/std_list.i | 3 - Lib/allegrocl/std_string.i | 3 - Lib/attribute.i | 3 - Lib/carrays.i | 3 - Lib/cdata.i | 3 - Lib/chicken/chicken.swg | 3 - Lib/chicken/chickenrun.swg | 4 - Lib/chicken/multi-generic.scm | 2 +- Lib/chicken/std_string.i | 3 - Lib/chicken/typemaps.i | 3 - Lib/clisp/clisp.swg | 3 - Lib/cmalloc.i | 3 - Lib/constraints.i | 3 - Lib/cpointer.i | 3 - Lib/csharp/arrays_csharp.i | 3 - Lib/csharp/csharp.swg | 3 - Lib/csharp/csharphead.swg | 3 - Lib/csharp/director.swg | 3 - Lib/csharp/enums.swg | 3 - Lib/csharp/enumsimple.swg | 3 - Lib/csharp/enumtypesafe.swg | 3 - Lib/csharp/std_except.i | 3 - Lib/csharp/std_map.i | 3 - Lib/csharp/std_pair.i | 3 - Lib/csharp/std_string.i | 3 - Lib/csharp/std_vector.i | 3 - Lib/csharp/std_wstring.i | 3 - Lib/csharp/stl.i | 3 - Lib/csharp/typemaps.i | 3 - Lib/csharp/wchar.i | 3 - Lib/cstring.i | 3 - Lib/cwstring.i | 3 - Lib/exception.i | 3 - Lib/gcj/cni.swg | 3 - Lib/guile/common.scm | 6 - Lib/guile/cplusplus.i | 3 - Lib/guile/guile.i | 3 - Lib/guile/guile_gh.swg | 3 - Lib/guile/guile_gh_run.swg | 3 - Lib/guile/guile_scm.swg | 3 - Lib/guile/guile_scm_run.swg | 3 - Lib/guile/guilemain.i | 3 - Lib/guile/interpreter.i | 3 - Lib/guile/list-vector.i | 3 - Lib/guile/pointer-in-out.i | 3 - Lib/guile/ports.i | 3 - Lib/guile/std_common.i | 3 - Lib/guile/std_map.i | 3 - Lib/guile/std_pair.i | 3 - Lib/guile/std_string.i | 3 - Lib/guile/std_vector.i | 3 - Lib/guile/stl.i | 3 - Lib/guile/typemaps.i | 3 - Lib/inttypes.i | 3 - Lib/java/arrays_java.i | 3 - Lib/java/director.swg | 3 - Lib/java/enums.swg | 3 - Lib/java/enumsimple.swg | 3 - Lib/java/enumtypesafe.swg | 3 - Lib/java/enumtypeunsafe.swg | 3 - Lib/java/java.swg | 3 - Lib/java/javahead.swg | 3 - Lib/java/std_except.i | 3 - Lib/java/std_map.i | 3 - Lib/java/std_pair.i | 3 - Lib/java/std_string.i | 3 - Lib/java/std_vector.i | 3 - Lib/java/std_wstring.i | 3 - Lib/java/stl.i | 3 - Lib/java/typemaps.i | 3 - Lib/java/various.i | 3 - Lib/lua/_std_common.i | 3 - Lib/lua/lua.swg | 3 - Lib/lua/lua_fnptr.i | 3 - Lib/lua/luarun.swg | 3 - Lib/lua/luaruntime.swg | 3 - Lib/lua/luatypemaps.swg | 3 - Lib/lua/std_except.i | 3 - Lib/lua/std_map.i | 3 - Lib/lua/std_pair.i | 3 - Lib/lua/std_string.i | 3 - Lib/lua/std_vector.i | 3 - Lib/lua/stl.i | 3 - Lib/lua/typemaps.i | 3 - Lib/lua/wchar.i | 6 +- Lib/math.i | 3 - Lib/modula3/modula3.swg | 3 - Lib/modula3/modula3head.swg | 3 - Lib/modula3/typemaps.i | 3 - Lib/mzscheme/mzrun.swg | 3 - Lib/mzscheme/mzscheme.swg | 3 - Lib/mzscheme/std_common.i | 3 - Lib/mzscheme/std_map.i | 3 - Lib/mzscheme/std_pair.i | 3 - Lib/mzscheme/std_string.i | 3 - Lib/mzscheme/std_vector.i | 3 - Lib/mzscheme/stl.i | 3 - Lib/mzscheme/typemaps.i | 3 - Lib/ocaml/cstring.i | 3 - Lib/ocaml/director.swg | 3 - Lib/ocaml/ocaml.i | 3 - Lib/ocaml/ocamldec.swg | 3 - Lib/ocaml/std_common.i | 3 - Lib/ocaml/std_deque.i | 3 - Lib/ocaml/std_list.i | 3 - Lib/ocaml/std_map.i | 3 - Lib/ocaml/std_pair.i | 3 - Lib/ocaml/std_string.i | 3 - Lib/ocaml/std_vector.i | 3 - Lib/ocaml/stl.i | 3 - Lib/ocaml/typecheck.i | 3 - Lib/ocaml/typemaps.i | 3 - Lib/octave/octcontainer.swg | 3 - Lib/octave/octiterators.swg | 3 - Lib/perl5/perlmain.i | 3 - Lib/perl5/reference.i | 3 - Lib/perl5/std_common.i | 3 - Lib/perl5/std_list.i | 3 - Lib/perl5/std_map.i | 3 - Lib/perl5/std_pair.i | 3 - Lib/perl5/std_vector.i | 3 - Lib/perl5/stl.i | 3 - Lib/perl5/typemaps.i | 3 - Lib/php/const.i | 3 - Lib/php/globalvar.i | 3 - Lib/php/php.swg | 3 - Lib/php/phpkw.swg | 3 - Lib/php/phprun.swg | 3 - Lib/php/std_common.i | 3 - Lib/php/std_map.i | 3 - Lib/php/std_pair.i | 3 - Lib/php/std_string.i | 3 - Lib/php/std_vector.i | 3 - Lib/php/stl.i | 3 - Lib/php/typemaps.i | 3 - Lib/pike/pike.swg | 3 - Lib/pike/pikerun.swg | 3 - Lib/pike/std_string.i | 3 - Lib/pointer.i | 3 - Lib/python/ccomplex.i | 3 - Lib/python/director.swg | 3 - Lib/python/embed15.i | 3 - Lib/python/file.i | 4 - Lib/python/pycontainer.swg | 3 - Lib/python/pyiterators.swg | 3 - Lib/python/pyrun.swg | 3 - Lib/python/typemaps.i | 3 - Lib/ruby/director.swg | 3 - Lib/ruby/rubyautodoc.swg | 15 +- Lib/ruby/rubycontainer.swg | 3 - Lib/ruby/rubycontainer_extended.swg | 24 +- Lib/ruby/rubyiterators.swg | 3 - Lib/ruby/rubyprimtypes.swg | 4 - Lib/ruby/rubyrun.swg | 3 - Lib/ruby/rubystdautodoc.swg | 12 +- Lib/ruby/rubytracking.swg | 3 - Lib/ruby/rubywstrings.swg | 20 +- Lib/ruby/stl.i | 3 - Lib/ruby/typemaps.i | 3 - Lib/std/_std_deque.i | 3 - Lib/std_except.i | 3 - Lib/stdint.i | 3 - Lib/stl.i | 3 - Lib/swigarch.i | 3 - Lib/swigrun.i | 3 - Lib/tcl/mactclinit.c | 93 - Lib/tcl/mactkinit.c | 3 - Lib/tcl/std_common.i | 3 - Lib/tcl/std_pair.i | 3 - Lib/tcl/std_vector.i | 3 - Lib/tcl/stl.i | 3 - Lib/tcl/tcl8.swg | 3 - Lib/tcl/tclinterp.i | 3 - Lib/tcl/tclopers.swg | 3 - Lib/tcl/tclresult.i | 3 - Lib/tcl/tclrun.swg | 3 - Lib/tcl/tclsh.i | 3 - Lib/tcl/tclwstrings.swg | 3 - Lib/tcl/typemaps.i | 3 - Lib/tcl/wish.i | 3 - Lib/typemaps/attribute.swg | 3 - Lib/typemaps/carrays.swg | 3 - Lib/typemaps/cdata.swg | 3 - Lib/typemaps/cmalloc.swg | 3 - Lib/typemaps/cpointer.swg | 3 - Lib/typemaps/cstrings.swg | 3 - Lib/typemaps/exception.swg | 3 - Lib/typemaps/ptrtypes.swg | 3 - Lib/typemaps/swigtypemaps.swg | 3 - Lib/typemaps/typemaps.swg | 3 - Lib/uffi/uffi.swg | 2 - Lib/wchar.i | 3 - Lib/windows.i | 3 - Makefile.in | 57 +- README | 57 +- Source/CParse/cparse.h | 8 +- Source/CParse/cscanner.c | 8 +- Source/CParse/parser.y | 8 +- Source/CParse/templ.c | 8 +- Source/CParse/util.c | 8 +- Source/DOH/base.c | 12 +- Source/DOH/doh.h | 14 +- Source/DOH/dohint.h | 15 +- Source/DOH/file.c | 12 +- Source/DOH/fio.c | 12 +- Source/DOH/hash.c | 12 +- Source/DOH/list.c | 12 +- Source/DOH/memory.c | 12 +- Source/DOH/string.c | 12 +- Source/DOH/void.c | 12 +- Source/Include/swigwarn.h | 10 +- Source/Modules/allegrocl.cxx | 8 +- Source/Modules/allocate.cxx | 8 +- Source/Modules/browser.cxx | 8 +- Source/Modules/cffi.cxx | 8 +- Source/Modules/chicken.cxx | 8 +- Source/Modules/clisp.cxx | 8 +- Source/Modules/contract.cxx | 8 +- Source/Modules/csharp.cxx | 8 +- Source/Modules/directors.cxx | 8 +- Source/Modules/emit.cxx | 8 +- Source/Modules/guile.cxx | 8 +- Source/Modules/java.cxx | 8 +- Source/Modules/lang.cxx | 8 +- Source/Modules/lua.cxx | 8 +- Source/Modules/main.cxx | 8 +- Source/Modules/modula3.cxx | 8 +- Source/Modules/module.cxx | 8 +- Source/Modules/mzscheme.cxx | 8 +- Source/Modules/ocaml.cxx | 8 +- Source/Modules/octave.cxx | 8 +- Source/Modules/overload.cxx | 8 +- Source/Modules/perl5.cxx | 12 +- Source/Modules/php.cxx | 8 +- Source/Modules/pike.cxx | 8 +- Source/Modules/python.cxx | 8 +- Source/Modules/r.cxx | 8 +- Source/Modules/ruby.cxx | 8 +- Source/Modules/s-exp.cxx | 8 +- Source/Modules/swigmain.cxx | 12 +- Source/Modules/swigmod.h | 8 +- Source/Modules/tcl8.cxx | 8 +- Source/Modules/typepass.cxx | 8 +- Source/Modules/uffi.cxx | 8 +- Source/Modules/utils.cxx | 8 +- Source/Modules/xml.cxx | 8 +- Source/Preprocessor/cpp.c | 8 +- Source/Preprocessor/expr.c | 8 +- Source/Preprocessor/preprocessor.h | 8 +- Source/Swig/cwrap.c | 8 +- Source/Swig/deprecate.c | 8 +- Source/Swig/error.c | 8 +- Source/Swig/fragment.c | 8 +- Source/Swig/getopt.c | 8 +- Source/Swig/include.c | 8 +- Source/Swig/misc.c | 8 +- Source/Swig/naming.c | 8 +- Source/Swig/parms.c | 8 +- Source/Swig/scanner.c | 8 +- Source/Swig/stype.c | 8 +- Source/Swig/swig.h | 8 +- Source/Swig/swigfile.h | 8 +- Source/Swig/swigopt.h | 8 +- Source/Swig/swigparm.h | 8 +- Source/Swig/swigscan.h | 8 +- Source/Swig/swigtree.h | 8 +- Source/Swig/swigwrap.h | 8 +- Source/Swig/symbol.c | 8 +- Source/Swig/tree.c | 8 +- Source/Swig/typemap.c | 8 +- Source/Swig/typeobj.c | 8 +- Source/Swig/typesys.c | 8 +- Source/Swig/wrapfunc.c | 8 +- configure.in | 4 +- 433 files changed, 1381 insertions(+), 12591 deletions(-) create mode 100644 COPYRIGHT delete mode 100644 Examples/GIFPlot/C/Makefile delete mode 100644 Examples/GIFPlot/C/gifplot.i delete mode 100644 Examples/GIFPlot/Chicken/check.list delete mode 100644 Examples/GIFPlot/Chicken/full/Makefile delete mode 100644 Examples/GIFPlot/Chicken/full/README delete mode 100644 Examples/GIFPlot/Chicken/full/cmap delete mode 100644 Examples/GIFPlot/Chicken/full/gifplot.i delete mode 100644 Examples/GIFPlot/Chicken/full/test-gifplot.scm delete mode 100644 Examples/GIFPlot/Chicken/simple/Makefile delete mode 100644 Examples/GIFPlot/Chicken/simple/README delete mode 100644 Examples/GIFPlot/Chicken/simple/simple.i delete mode 100644 Examples/GIFPlot/Chicken/simple/test-simple.scm delete mode 100644 Examples/GIFPlot/Common-Lisp/full/cmap delete mode 100644 Examples/GIFPlot/Common-Lisp/full/gifplot.i delete mode 100644 Examples/GIFPlot/Common-Lisp/full/runme.lisp delete mode 100644 Examples/GIFPlot/Guile/check.list delete mode 100644 Examples/GIFPlot/Guile/full/Makefile delete mode 100644 Examples/GIFPlot/Guile/full/README delete mode 100644 Examples/GIFPlot/Guile/full/cmap delete mode 100644 Examples/GIFPlot/Guile/full/gifplot.i delete mode 100644 Examples/GIFPlot/Guile/full/runme.scm delete mode 100644 Examples/GIFPlot/Guile/simple/Makefile delete mode 100644 Examples/GIFPlot/Guile/simple/README delete mode 100644 Examples/GIFPlot/Guile/simple/runme.scm delete mode 100644 Examples/GIFPlot/Guile/simple/simple.i delete mode 100644 Examples/GIFPlot/Include/gifplot.h delete mode 100644 Examples/GIFPlot/Interface/gifplot.i delete mode 100644 Examples/GIFPlot/Java/check.list delete mode 100644 Examples/GIFPlot/Java/full/Makefile delete mode 100644 Examples/GIFPlot/Java/full/README delete mode 100644 Examples/GIFPlot/Java/full/cmap delete mode 100644 Examples/GIFPlot/Java/full/gifplot.i delete mode 100644 Examples/GIFPlot/Java/full/runme.java delete mode 100644 Examples/GIFPlot/Java/shadow/Makefile delete mode 100644 Examples/GIFPlot/Java/shadow/README delete mode 100644 Examples/GIFPlot/Java/shadow/cmap delete mode 100644 Examples/GIFPlot/Java/shadow/runme.java delete mode 100644 Examples/GIFPlot/Java/simple/Makefile delete mode 100644 Examples/GIFPlot/Java/simple/README delete mode 100644 Examples/GIFPlot/Java/simple/runme.java delete mode 100644 Examples/GIFPlot/Java/simple/simple.i delete mode 100644 Examples/GIFPlot/Lib/Makefile.in delete mode 100644 Examples/GIFPlot/Lib/color.c delete mode 100644 Examples/GIFPlot/Lib/font.c delete mode 100644 Examples/GIFPlot/Lib/frame.c delete mode 100644 Examples/GIFPlot/Lib/gif.c delete mode 100644 Examples/GIFPlot/Lib/matrix.c delete mode 100644 Examples/GIFPlot/Lib/pixmap.c delete mode 100644 Examples/GIFPlot/Lib/plot2d.c delete mode 100644 Examples/GIFPlot/Lib/plot3d.c delete mode 100644 Examples/GIFPlot/Makefile.in delete mode 100644 Examples/GIFPlot/Ocaml/check.list delete mode 100644 Examples/GIFPlot/Ocaml/full/Makefile delete mode 100644 Examples/GIFPlot/Ocaml/full/README delete mode 100644 Examples/GIFPlot/Ocaml/full/cmap delete mode 100644 Examples/GIFPlot/Ocaml/full/gifplot.i delete mode 100644 Examples/GIFPlot/Ocaml/full/runme.ml delete mode 100644 Examples/GIFPlot/Ocaml/simple/Makefile delete mode 100644 Examples/GIFPlot/Ocaml/simple/cmap delete mode 100644 Examples/GIFPlot/Ocaml/simple/runme.ml delete mode 100644 Examples/GIFPlot/Ocaml/simple/simple.i delete mode 100644 Examples/GIFPlot/Perl5/check.list delete mode 100644 Examples/GIFPlot/Perl5/full/Makefile delete mode 100644 Examples/GIFPlot/Perl5/full/README delete mode 100644 Examples/GIFPlot/Perl5/full/cmap delete mode 100644 Examples/GIFPlot/Perl5/full/gifplot.i delete mode 100644 Examples/GIFPlot/Perl5/full/runme.pl delete mode 100644 Examples/GIFPlot/Perl5/shadow/Makefile delete mode 100644 Examples/GIFPlot/Perl5/shadow/README delete mode 100644 Examples/GIFPlot/Perl5/shadow/cmap delete mode 100644 Examples/GIFPlot/Perl5/shadow/runme.pl delete mode 100644 Examples/GIFPlot/Perl5/simple/Makefile delete mode 100644 Examples/GIFPlot/Perl5/simple/README delete mode 100644 Examples/GIFPlot/Perl5/simple/runme.pl delete mode 100644 Examples/GIFPlot/Perl5/simple/simple.i delete mode 100644 Examples/GIFPlot/Php/check.list delete mode 100644 Examples/GIFPlot/Php/full/Makefile delete mode 100644 Examples/GIFPlot/Php/full/README delete mode 100644 Examples/GIFPlot/Php/full/cmap delete mode 100644 Examples/GIFPlot/Php/full/gifplot.i delete mode 100644 Examples/GIFPlot/Php/full/runme.php delete mode 100644 Examples/GIFPlot/Php/shadow/Makefile delete mode 100644 Examples/GIFPlot/Php/shadow/README delete mode 100644 Examples/GIFPlot/Php/shadow/cmap delete mode 100644 Examples/GIFPlot/Php/shadow/runme.php delete mode 100644 Examples/GIFPlot/Php/simple/Makefile delete mode 100644 Examples/GIFPlot/Php/simple/README delete mode 100644 Examples/GIFPlot/Php/simple/runme.php delete mode 100644 Examples/GIFPlot/Php/simple/simple.i delete mode 100644 Examples/GIFPlot/Pike/check.list delete mode 100644 Examples/GIFPlot/Pike/simple/Makefile delete mode 100644 Examples/GIFPlot/Pike/simple/README delete mode 100644 Examples/GIFPlot/Pike/simple/runme.pike delete mode 100644 Examples/GIFPlot/Pike/simple/simple.i delete mode 100644 Examples/GIFPlot/Python/check.list delete mode 100644 Examples/GIFPlot/Python/full/Makefile delete mode 100644 Examples/GIFPlot/Python/full/README delete mode 100644 Examples/GIFPlot/Python/full/cmap delete mode 100644 Examples/GIFPlot/Python/full/gifplot.i delete mode 100644 Examples/GIFPlot/Python/full/runme.py delete mode 100644 Examples/GIFPlot/Python/shadow/Makefile delete mode 100644 Examples/GIFPlot/Python/shadow/README delete mode 100644 Examples/GIFPlot/Python/shadow/cmap delete mode 100644 Examples/GIFPlot/Python/shadow/runme.py delete mode 100644 Examples/GIFPlot/Python/simple/Makefile delete mode 100644 Examples/GIFPlot/Python/simple/README delete mode 100644 Examples/GIFPlot/Python/simple/runme.py delete mode 100644 Examples/GIFPlot/Python/simple/simple.i delete mode 100644 Examples/GIFPlot/README delete mode 100644 Examples/GIFPlot/Ruby/check.list delete mode 100644 Examples/GIFPlot/Ruby/full/Makefile delete mode 100644 Examples/GIFPlot/Ruby/full/README delete mode 100644 Examples/GIFPlot/Ruby/full/cmap delete mode 100644 Examples/GIFPlot/Ruby/full/gifplot.i delete mode 100644 Examples/GIFPlot/Ruby/full/runme.rb delete mode 100644 Examples/GIFPlot/Ruby/shadow/Makefile delete mode 100644 Examples/GIFPlot/Ruby/shadow/README delete mode 100644 Examples/GIFPlot/Ruby/shadow/cmap delete mode 100644 Examples/GIFPlot/Ruby/shadow/runme.rb delete mode 100644 Examples/GIFPlot/Ruby/simple/Makefile delete mode 100644 Examples/GIFPlot/Ruby/simple/README delete mode 100644 Examples/GIFPlot/Ruby/simple/runme.rb delete mode 100644 Examples/GIFPlot/Ruby/simple/simple.i delete mode 100644 Examples/GIFPlot/Tcl/check.list delete mode 100644 Examples/GIFPlot/Tcl/full/Makefile delete mode 100644 Examples/GIFPlot/Tcl/full/README delete mode 100644 Examples/GIFPlot/Tcl/full/cmap delete mode 100644 Examples/GIFPlot/Tcl/full/gifplot.i delete mode 100644 Examples/GIFPlot/Tcl/full/runme.tcl delete mode 100644 Examples/GIFPlot/Tcl/mandel/Makefile delete mode 100644 Examples/GIFPlot/Tcl/mandel/README delete mode 100644 Examples/GIFPlot/Tcl/mandel/cmap delete mode 100644 Examples/GIFPlot/Tcl/mandel/display.tcl delete mode 100644 Examples/GIFPlot/Tcl/mandel/mandel.i delete mode 100644 Examples/GIFPlot/Tcl/mandel/mandel.tcl delete mode 100644 Examples/GIFPlot/Tcl/simple/Makefile delete mode 100644 Examples/GIFPlot/Tcl/simple/README delete mode 100644 Examples/GIFPlot/Tcl/simple/runme.tcl delete mode 100644 Examples/GIFPlot/Tcl/simple/simple.i delete mode 100644 Examples/chicken/zlib/Makefile delete mode 100644 Examples/chicken/zlib/README.html delete mode 100644 Examples/chicken/zlib/example.i delete mode 100644 Examples/chicken/zlib/test-zlib.scm delete mode 100644 Examples/xml/example_gif.i create mode 100644 LICENSE-GPL create mode 100644 LICENSE-UNIVERSITIES delete mode 100644 Lib/tcl/mactclinit.c diff --git a/ANNOUNCE b/ANNOUNCE index 9ef41142a..2595f7a55 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,10 +1,10 @@ -*** ANNOUNCE: SWIG 1.3.40 (in progress) *** +*** ANNOUNCE: SWIG 2.0.0 (in progress) *** http://www.swig.org -We're pleased to announce SWIG-1.3.40, the latest installment in the -SWIG development effort. SWIG-1.3.40 includes a number of bug fixes +We're pleased to announce SWIG-2.0.0, the latest installment in the +SWIG development effort. SWIG-2.0.0 includes a number of bug fixes and enhancements. What is SWIG? @@ -24,11 +24,11 @@ Availability: ------------- The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-1.3.40.tar.gz + http://prdownloads.sourceforge.net/swig/swig-2.0.0.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-1.3.40.zip + http://prdownloads.sourceforge.net/swig/swigwin-2.0.0.zip Please report problems with this release to the swig-dev mailing list, details at http://www.swig.org/mail.html. diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 000000000..45f9d6b45 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,63 @@ +SWIG Copyright and Authors +-------------------------- + +Copyright (c) 1995-2010 The SWIG Developers +Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona). +Copyright (c) 1998-2005 University of Chicago. +Copyright (c) 1995-1998 The University of Utah and the Regents of the University of California + +Portions also copyrighted by: + Network Applied Communication Laboratory, Inc + Information-technology Promotion Agency, Japan + +Active SWIG Developers: + William Fulton (wsf@fultondesigns.co.uk) (SWIG core, Java, C#, Windows, Cygwin) + Olly Betts (olly@survex.com) (PHP) + Joseph Wang (joequant@gmail.com) (R) + Xavier Delacour (xavier.delacour@gmail.com) (Octave) + +Past SWIG developers and major contributors include: + Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) + Henning Thielemann (swig@henning-thielemann.de) (Modula3) + Matthias Köppe (mkoeppe@mail.math.uni-magdeburg.de) (Guile, MzScheme) + Luigi Ballabio (luigi.ballabio@fastwebnet.it) (STL wrapping) + Mikel Bancroft (mikel@franz.com) (Allegro CL) + Surendra Singhi (efuzzyone@netscape.net) (CLISP, CFFI) + Marcelo Matus (mmatus@acms.arizona.edu) (SWIG core, Python, UTL[python,perl,tcl,ruby]) + Art Yerkes (ayerkes@speakeasy.net) (Ocaml) + Lyle Johnson (lyle@users.sourceforge.net) (Ruby) + Charlie Savage (cfis@interserv.com) (Ruby) + Thien-Thi Nguyen (ttn@glug.org) (build/test/misc) + Richard Palmer (richard@magicality.org) (PHP) + Sam Liddicott - Anonova Ltd (saml@liddicott.com) (PHP) + Tim Hockin - Sun Microsystems (thockin@sun.com) (PHP) + Kevin Ruland (PHP) + Shibukawa Yoshiki (Japanese Translation) + Jason Stewart (jason@openinformatics.com) (Perl5) + Loic Dachary (Perl5) + David Fletcher (Perl5) + Gary Holt (Perl5) + Masaki Fukushima (Ruby) + Scott Michel (scottm@cs.ucla.edu) (Java directors) + Tiger Feng (songyanf@cs.uchicago.edu) (SWIG core) + Mark Rose (mrose@stm.lbl.gov) (Directors) + Jonah Beckford (beckford@usermail.com) (CHICKEN) + Ahmon Dancy (dancy@franz.com) (Allegro CL) + Dirk Gerrits (Allegro CL) + Neil Cawse (C#) + Harco de Hilster (Java) + Alexey Dyachenko (dyachenko@fromru.com) (Tcl) + Bob Techentin (Tcl) + Martin Froehlich (Guile) + Marcio Luis Teixeira (Guile) + Duncan Temple Lang (R) + Miklos Vajna (PHP directors) + Mark Gossage (mark@gossage.cjb.net) (Lua) + Gonzalo Garramuno (ggarra@advancedsl.com.ar) (Ruby, Ruby's UTL) + John Lenz (Guile, MzScheme updates, Chicken module, runtime system) + +Past contributors include: + James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran + Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn + (See CHANGES and CHANGES.current for a more complete list). + diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html index 789efc129..ab47ed8ee 100644 --- a/Doc/Manual/Sections.html +++ b/Doc/Manual/Sections.html @@ -6,7 +6,7 @@

        SWIG-1.3 Development Documentation

        -Last update : SWIG-1.3.40 (in progress) +Last update : SWIG-2.0.0 (in progress)

        Sections

        diff --git a/Examples/GIFPlot/C/Makefile b/Examples/GIFPlot/C/Makefile deleted file mode 100644 index f45d360cf..000000000 --- a/Examples/GIFPlot/C/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -SWIGOPT = -I../Include -SRCS = -TARGET = gifplot -INTERFACE = gifplot.i -LIBS = -L.. -lgifplot -INCLUDES = -I../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' LIBS='$(LIBS)' \ - SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c - -clean: - rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme - -check: all diff --git a/Examples/GIFPlot/C/gifplot.i b/Examples/GIFPlot/C/gifplot.i deleted file mode 100644 index 356edd7f1..000000000 --- a/Examples/GIFPlot/C/gifplot.i +++ /dev/null @@ -1,15 +0,0 @@ -/* Oh what the heck, let's just grab the whole darn header file - and see what happens. */ - -%module gifplot -%{ - -/* Note: You still need this part because the %include directive - merely causes SWIG to interpret the contents of a file. It doesn't - include the right include headers for the resulting C code */ - -#include "../Include/gifplot.h" - -%} - -%include gifplot.h diff --git a/Examples/GIFPlot/Chicken/check.list b/Examples/GIFPlot/Chicken/check.list deleted file mode 100644 index e75ee586a..000000000 --- a/Examples/GIFPlot/Chicken/check.list +++ /dev/null @@ -1,3 +0,0 @@ -# see top-level Makefile.in -full -simple diff --git a/Examples/GIFPlot/Chicken/full/Makefile b/Examples/GIFPlot/Chicken/full/Makefile deleted file mode 100644 index 2ae4fd7ea..000000000 --- a/Examples/GIFPlot/Chicken/full/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../preinst-swig -INTERFACE = gifplot.i -SRCS = -CXXSRCS = -TARGET = gifplot -INCLUDE = -I. -I../../Include -SWIGOPT = -I../../Include -CFLAGS = -VARIANT = -LIBS = -L../.. -lgifplot -lm - -# comment the following two lines to build a dynamic so file -CHICKEN_MAIN = test-gifplot.scm -VARIANT = _static - -all:: $(TARGET) - -$(TARGET): $(INTERFACE) $(SRCS) - $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) - -clean:: - $(MAKE) -f $(TOP)/Makefile chicken_clean - rm -f gifplot.scm image.gif - rm -f $(TARGET) diff --git a/Examples/GIFPlot/Chicken/full/README b/Examples/GIFPlot/Chicken/full/README deleted file mode 100644 index e5ddd7af1..000000000 --- a/Examples/GIFPlot/Chicken/full/README +++ /dev/null @@ -1,6 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The Scheme program 'test-gifplot.scm' does something a -little more interesting. You'll have to go look at the header file to -get a complete listing of the functions. - -`make' will build a static binary. Run ./gifplot to test it. diff --git a/Examples/GIFPlot/Chicken/full/cmap b/Examples/GIFPlot/Chicken/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9ICexact (round (max (min cc 239) 0))))) - (gifplot:Plot3D-solidquad p3 x y z1 (+ x dx) y z2 (+ x dx) (+ y dy) - z3 x (+ y dy) z4 - (gifplot:int->Pixel (+ c 16)))) - (y-loop (+ y dy) (+ j 1))))) - (x-loop (+ x dx) (+ i 1))))))) - -(display "Making a nice 3D plot...\n") -(drawsolid) - -(gifplot:FrameBuffer-writeGIF frame cmap "image.gif") -(display "Wrote image.gif\n") diff --git a/Examples/GIFPlot/Chicken/simple/Makefile b/Examples/GIFPlot/Chicken/simple/Makefile deleted file mode 100644 index 484e58390..000000000 --- a/Examples/GIFPlot/Chicken/simple/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../preinst-swig -INTERFACE = simple.i -SRCS = -CXXSRCS = -TARGET = simple -INCLUDE = -I. -I../../Include -SWIGOPT = -I../../Include -CFLAGS = -VARIANT = -LIBS = -L../.. -lgifplot -lm - -# comment the following two lines to build a dynamic so file -CHICKEN_MAIN = test-simple.scm -VARIANT = _static - -all:: $(TARGET) - -$(TARGET): $(INTERFACE) $(SRCS) - $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) - -clean:: - $(MAKE) -f $(TOP)/Makefile chicken_clean - rm -f simple.scm image.gif - rm -f $(TARGET) diff --git a/Examples/GIFPlot/Chicken/simple/README b/Examples/GIFPlot/Chicken/simple/README deleted file mode 100644 index 3b138f381..000000000 --- a/Examples/GIFPlot/Chicken/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. - -`make' will build an exe. Run ./simple to test it. diff --git a/Examples/GIFPlot/Chicken/simple/simple.i b/Examples/GIFPlot/Chicken/simple/simple.i deleted file mode 100644 index 23ac8a856..000000000 --- a/Examples/GIFPlot/Chicken/simple/simple.i +++ /dev/null @@ -1,34 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned int Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants, which we redefine (from gifplot.h) so - that SWIG sees them */ -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - diff --git a/Examples/GIFPlot/Chicken/simple/test-simple.scm b/Examples/GIFPlot/Chicken/simple/test-simple.scm deleted file mode 100644 index 43250d8e9..000000000 --- a/Examples/GIFPlot/Chicken/simple/test-simple.scm +++ /dev/null @@ -1,29 +0,0 @@ -;;; Draw some simple shapes - -(declare (uses simple)) - -(display "Drawing some basic shapes\n") - -(define cmap (simple:new-ColorMap #f)) -(define f (simple:new-FrameBuffer 400 400)) - -;; Clear the picture -(simple:FrameBuffer-clear f (simple:BLACK)) - -;; Make a red box -(simple:FrameBuffer-box f 40 40 200 200 (simple:RED)) - -;; Make a blue circle -(simple:FrameBuffer-circle f 200 200 40 (simple:BLUE)) - -;; Make green line -(simple:FrameBuffer-line f 10 390 390 200 (simple:GREEN)) - -;; Write an image out to disk - -(simple:FrameBuffer-writeGIF f cmap "image.gif") -(display "Wrote image.gif\n") - -(simple:delete-FrameBuffer f) -(simple:delete-ColorMap cmap) - diff --git a/Examples/GIFPlot/Common-Lisp/full/cmap b/Examples/GIFPlot/Common-Lisp/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC -#include -#include -#include -#include -#include - -#ifndef GIFPLOT_H - -#ifdef SWIG -%nodefault; -#endif - -/* Pixel is 8-bits */ - -typedef unsigned char Pixel; -typedef float Zvalue; - -/* ------------------------------------------------------------------------ - ColorMap - - Definition and methods for colormaps - ------------------------------------------------------------------------ */ - -typedef struct ColorMap { - unsigned char *cmap; - char *name; -} ColorMap; - -extern ColorMap *new_ColorMap(char *filename); -extern void delete_ColorMap(ColorMap *c); -extern void ColorMap_default(ColorMap *c); -extern void ColorMap_assign(ColorMap *c, int index, int r, int g, int b); -extern int ColorMap_getitem(ColorMap *c, int index); -extern void ColorMap_setitem(ColorMap *c, int index, int value); -extern int ColorMap_write(ColorMap *c, char *filename); - -/* Some default colors */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - -/*------------------------------------------------------------------------- - FrameBuffer - - This structure defines a simple 8 bit framebuffer. - ------------------------------------------------------------------------- */ - -typedef struct FrameBuffer { - Pixel **pixels; - Zvalue **zbuffer; - unsigned int height; - unsigned int width; - int xmin; /* These are used for clipping */ - int ymin; - int xmax; - int ymax; -} FrameBuffer; - -#define ZMIN 1e+36 - -/* FrameBuffer Methods */ - -extern FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -extern void delete_FrameBuffer(FrameBuffer *frame); -extern int FrameBuffer_resize(FrameBuffer *frame, int width, int height); -extern void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -extern void FrameBuffer_plot(FrameBuffer *frame, int x, int y, Pixel color); -extern void FrameBuffer_horizontal(FrameBuffer *frame, int xmin, int xmax, int y, Pixel color); -extern void FrameBuffer_horizontalinterp(FrameBuffer *f, int xmin, int xmax, int y, Pixel c1, Pixel c2); -extern void FrameBuffer_vertical(FrameBuffer *frame, int ymin, int ymax, int x, Pixel color); -extern void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -extern void FrameBuffer_solidbox(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -extern void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); -extern void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -extern void FrameBuffer_solidcircle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -extern void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -extern void FrameBuffer_setclip(FrameBuffer *frame, int xmin, int ymin, int xmax, int ymax); -extern void FrameBuffer_noclip(FrameBuffer *frame); -extern int FrameBuffer_makeGIF(FrameBuffer *frame, ColorMap *cmap, void *buffer, unsigned int maxsize); -extern int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); -extern void FrameBuffer_zresize(FrameBuffer *f, int width, int height); -extern void FrameBuffer_zclear(FrameBuffer *f); -extern void FrameBuffer_solidtriangle(FrameBuffer *f, int x1, int y1, int x2, int y2, int x3, int y3, Pixel c); -extern void FrameBuffer_interptriangle(FrameBuffer *f, int tx1, int ty1, Pixel c1, - int tx2, int ty2, Pixel c2, int tx3, int ty3, Pixel c3); - -#define HORIZONTAL 1 -#define VERTICAL 2 - -extern void FrameBuffer_drawchar(FrameBuffer *frame, int x, int y, int fgcolor, int bgcolor, char chr, int orientation); -extern void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, int bgcolor, char *text, int orientation); - -/* ------------------------------------------------------------------------ - PixMap - - The equivalent of "bit-maps". - ------------------------------------------------------------------------ */ - -typedef struct PixMap { - int width; - int height; - int centerx; - int centery; - int *map; -} PixMap; - -/* PIXMAP methods */ - -extern PixMap *new_PixMap(int width, int height, int centerx, int centery); -extern void delete_PixMap(PixMap *pm); -extern void PixMap_set(PixMap *pm, int x, int y, int pix); -extern void FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor); - -#define GIFPLOT_TRANSPARENT 0 -#define GIFPLOT_FOREGROUND 1 -#define GIFPLOT_BACKGROUND 2 - -/* ------------------------------------------------------------------------ - Plot2D - - Definition and methods for 2D plots. - ------------------------------------------------------------------------ */ - -typedef struct Plot2D { - FrameBuffer *frame; /* what frame buffer are we using */ - int view_xmin; /* Minimum coordinates of view region */ - int view_ymin; - int view_xmax; /* Maximum coordinates of view region */ - int view_ymax; - double xmin; /* Minimum coordinates of plot region */ - double ymin; - double xmax; /* Maximum coordinates of plot region */ - double ymax; - int xscale; /* Type of scaling (LINEAR, LOG, etc..) */ - int yscale; - double dx; /* Private scaling parameters */ - double dy; -} Plot2D; - -/* 2D Plot methods */ - -extern Plot2D *new_Plot2D(FrameBuffer *frame,double xmin,double ymin, double xmax, double ymax); -extern void delete_Plot2D(Plot2D *p2); -extern Plot2D *Plot2D_copy(Plot2D *p2); -extern void Plot2D_clear(Plot2D *p2, Pixel c); -extern void Plot2D_setview(Plot2D *p2, int vxmin, int vymin, int vxmax, int vymax); -extern void Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax); -extern void Plot2D_setscale(Plot2D *p2, int xscale, int yscale); -extern void Plot2D_plot(Plot2D *p2, double x, double y, Pixel color); -extern void Plot2D_box(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); -extern void Plot2D_solidbox(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color); -extern void Plot2D_interpbox(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); -extern void Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color); -extern void Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color); -extern void Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); -extern void Plot2D_start(Plot2D *p2); -extern void Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor); -extern void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel c); -extern void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel c); -extern void Plot2D_triangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); -extern void Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); -extern void Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, - double x2, double y2, Pixel c2, - double x3, double y3, Pixel c3); - -#define LINEAR 10 -#define LOG 11 - -/* ----------------------------------------------------------------------- - Matrix - - Operations on 4x4 transformation matrices and vectors. - Matrices are represented as a double array of 16 elements - ----------------------------------------------------------------------- */ - -typedef double *Matrix; -typedef struct GL_Vector { - double x; - double y; - double z; - double w; -} GL_Vector; - -extern Matrix new_Matrix(); -extern void delete_Matrix(Matrix a); -extern Matrix Matrix_copy(Matrix a); -extern void Matrix_multiply(Matrix a, Matrix b, Matrix c); -extern void Matrix_identity(Matrix a); -extern void Matrix_zero(Matrix a); -extern void Matrix_transpose(Matrix a, Matrix result); -extern void Matrix_invert(Matrix a, Matrix inva); -extern void Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t); -extern void Matrix_transform4(Matrix a, double rx, double ry, double rz, - double rw, GL_Vector *t); - -extern void Matrix_print(Matrix a); -extern void Matrix_translate(Matrix a, double tx, double ty, double tz); -extern void Matrix_rotatex(Matrix a, double deg); -extern void Matrix_rotatey(Matrix a, double deg); -extern void Matrix_rotatez(Matrix a, double deg); - -/* ----------------------------------------------------------------------- - Plot3D - - Data Structure for 3-D plots - ------------------------------------------------------------------------ */ - -typedef struct Plot3D { - FrameBuffer *frame; /* Frame buffer being used */ - int view_xmin; /* Viewing region */ - int view_ymin; - int view_xmax; - int view_ymax; - double xmin; /* Bounding box */ - double ymin; - double zmin; - double xmax; - double ymax; - double zmax; - double xcenter; /* Center point */ - double ycenter; - double zcenter; - double fovy; /* Field of view */ - double aspect; /* Aspect ratio */ - double znear; /* near "clipping" plane */ - double zfar; /* far "clipping" plane */ - Matrix center_mat; /* Matrix used for centering the model */ - Matrix model_mat; /* Model rotation matrix */ - Matrix view_mat; /* Viewing matrix */ - Matrix fullmodel_mat; /* Full model matrix. Used by sphere plot */ - Matrix trans_mat; /* Total transformation matrix */ - double lookatz; /* Where is the z-lookat point */ - double xshift; /* Used for translation and stuff */ - double yshift; - double zoom; - int width; - int height; - int pers_mode; /* Perspective mode (private) */ - double ortho_left,ortho_right,ortho_bottom,ortho_top; -} Plot3D; - -extern Plot3D *new_Plot3D(FrameBuffer *frame, double xmin, double ymin, double zmin, - double xmax, double ymax, double zmax); -extern void delete_Plot3D(Plot3D *p3); -extern Plot3D *Plot3D_copy(Plot3D *p3); -extern void Plot3D_clear(Plot3D *p3, Pixel Color); -extern void Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar); -extern void Plot3D_ortho(Plot3D *p3, double left, double right, double top, double bottom); -extern void Plot3D_lookat(Plot3D *p3, double z); -extern void Plot3D_autoperspective(Plot3D *p3, double fovy); -extern void Plot3D_autoortho(Plot3D *p3); -extern void Plot3D_rotx(Plot3D *p3, double deg); -extern void Plot3D_roty(Plot3D *p3, double deg); -extern void Plot3D_rotz(Plot3D *p3, double deg); -extern void Plot3D_rotl(Plot3D *p3, double deg); -extern void Plot3D_rotr(Plot3D *p3, double deg); -extern void Plot3D_rotd(Plot3D *p3, double deg); -extern void Plot3D_rotu(Plot3D *p3, double deg); -extern void Plot3D_rotc(Plot3D *p3, double deg); -extern void Plot3D_zoom(Plot3D *p3, double percent); -extern void Plot3D_left(Plot3D *p3, double percent); -extern void Plot3D_right(Plot3D *p3, double percent); -extern void Plot3D_down(Plot3D *p3, double percent); -extern void Plot3D_up(Plot3D *p3, double percent); -extern void Plot3D_center(Plot3D *p3, double cx, double cy); - -extern void Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel Color); - -extern void Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax); -extern void Plot3D_start(Plot3D *p3); -extern void Plot3D_line(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, Pixel color); -extern void Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color); -extern void Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color); - -extern void Plot3D_interptriangle(Plot3D *p3, - double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3); - -extern void Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color); - -extern void Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color); - -extern void Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3, - double x4, double y4, double z4, Pixel c4); - - -extern void Plot3D_solidsphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c); - -extern void Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c, Pixel bc); - -extern PixMap PixMap_SQUARE; -extern PixMap PixMap_TRIANGLE; -extern PixMap PixMap_CROSS; - -#endif -#define GIFPLOT_H - - - diff --git a/Examples/GIFPlot/Interface/gifplot.i b/Examples/GIFPlot/Interface/gifplot.i deleted file mode 100644 index fdf661c5e..000000000 --- a/Examples/GIFPlot/Interface/gifplot.i +++ /dev/null @@ -1,264 +0,0 @@ -// -// Graphics module -// -%module gifplot -%{ -#include "gifplot.h" -%} - -#if defined(SWIGJAVA ) || defined(SWIGPHP) - %rename(make_default) ColorMap::default(); -#endif - -%rename(__getitem__) ColorMap::getitem(int index); -%rename(__setitem__) ColorMap::setitem(int index, int value); - -/* Pixel is 8-bits */ - -typedef unsigned char Pixel; -typedef float Zvalue; - -/* ------------------------------------------------------------------------ - ColorMap - - Definition and methods for colormaps - ------------------------------------------------------------------------ */ - -typedef struct ColorMap { - char *name; - -// -// %extend adds some C methods to this structure to make it -// look like a C++ class in Python. -// These are really named things like ColorMap_default, ColorMap_assign, etc... - - %extend { - ColorMap(char *filename); - ~ColorMap(); - void default(); - void assign(int index,int r, int g, int b); - int getitem(int index); - void setitem(int index, int value); - int write(char *filename); - } -} ColorMap; - -/* Some default colors */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - -/*------------------------------------------------------------------------- - FrameBuffer - - This structure defines a simple 8 bit framebuffer. - ------------------------------------------------------------------------- */ - -typedef struct FrameBuffer { - unsigned int height; - unsigned int width; - int xmin; /* These are used for clipping */ - int ymin; - int xmax; - int ymax; - %extend { - FrameBuffer(unsigned int width, unsigned int height); - ~FrameBuffer(); - void resize(int width, int height); - void clear(Pixel color); - void plot(int x, int y, Pixel color); - void horizontal(int xmin, int xmax, int y, Pixel color); - void horizontalinterp(int xmin, int xmax, int y, Pixel c1, Pixel c2); - void vertical(int ymin, int ymax, int x, Pixel color); - void box(int x1, int y1, int x2, int y2, Pixel color); - void solidbox(int x1, int y1, int x2, int y2, Pixel color); - void interpbox(int x1, int y1, int x2, int y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); - void circle(int x1, int y1, int radius, Pixel color); - void solidcircle(int x1, int y1, int radius, Pixel color); - void line(int x1, int y1, int x2, int y2, Pixel color); - void setclip(int xmin, int ymin, int xmax, int ymax); - void noclip(); - int makeGIF(ColorMap *cmap, void *buffer, unsigned int maxsize); - void zresize(int width, int height); - void zclear(); - void drawchar(int x, int y, int fgcolor, int bgcolor, char chr, int orientation); - void drawstring(int x, int y, int fgcolor, int bgcolor, char *text, int orientation); - void drawpixmap(PixMap *pm, int x, int y, int fgcolor, int bgcolor); - int writeGIF(ColorMap *cmap, char *filename); - } -} FrameBuffer; - -#define HORIZONTAL 1 -#define VERTICAL 2 - -/* -------------------------------------------------------------------------- - PixMap - - The equivalent of "bit-maps". - -------------------------------------------------------------------------- */ - -/* PIXMAP methods */ - -extern PixMap *new_PixMap(int width, int height, int centerx, int centery); -extern void delete_PixMap(PixMap *pm); -extern void PixMap_set(PixMap *pm, int x, int y, int pix); - -#define GIFPLOT_TRANSPARENT 0 -#define GIFPLOT_FOREGROUND 1 -#define GIFPLOT_BACKGROUND 2 - -/* -------------------------------------------------------------------------- - Plot2D - - Definition and methods for 2D plots. - --------------------------------------------------------------------------- */ - -typedef struct Plot2D { - FrameBuffer *frame; - int view_xmin; /* Minimum coordinates of view region */ - int view_ymin; - int view_xmax; /* Maximum coordinates of view region */ - int view_ymax; - double xmin; /* Minimum coordinates of plot region */ - double ymin; - double xmax; /* Maximum coordinates of plot region */ - double ymax; - int xscale; /* Type of scaling (LINEAR, LOG, etc..) */ - int yscale; - %extend { - Plot2D(FrameBuffer *frame,double xmin,double ymin, double xmax, double ymax); - ~Plot2D(); - Plot2D *copy(); - void clear(Pixel c); - void setview(int vxmin, int vymin, int vxmax, int vymax); - void setrange(double xmin, double ymin, double xmax, double ymax); - void setscale(int xscale, int yscale); - void plot(double x, double y, Pixel color); - void box(double x1, double y1, double x2, double y2, Pixel color); - void solidbox(double x1, double y1, double x2, double y2, Pixel color); - void interpbox(double x1, double y1, double x2, double y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); - - void circle(double x, double y, double radius, Pixel color); - void solidcircle(double x, double y, double radius, Pixel color); - void line(double x1, double y1, double x2, double y2, Pixel color); - void start(); - void drawpixmap(PixMap *pm, double x, double y, Pixel color, Pixel bgcolor); - void xaxis(double x, double y, double xtick, int ticklength, Pixel color); - void yaxis(double x, double y, double ytick, int ticklength, Pixel color); - void triangle(double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); - - void solidtriangle(double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); - - void interptriangle(double x1, double y1, Pixel c1, - double x2, double y2, Pixel c2, - double x3, double y3, Pixel c3); - - } -} Plot2D; - -#define LINEAR 10 -#define LOG 11 - -/* ------------------------------------------------------------------------------ - Plot3D - - Data Structure for 3-D plots - ------------------------------------------------------------------------------ */ - -typedef struct Plot3D { - FrameBuffer *frame; - int view_xmin; /* Viewing region */ - int view_ymin; - int view_xmax; - int view_ymax; - double xmin; /* Bounding box */ - double ymin; - double zmin; - double xmax; - double ymax; - double zmax; - double xcenter; /* Center point */ - double ycenter; - double zcenter; - double fovy; /* Field of view */ - double aspect; /* Aspect ratio */ - double znear; /* near "clipping" plane */ - double zfar; /* far "clipping" plane */ - double lookatz; /* Where is the z-lookat point */ - double xshift; /* Used for translation and stuff */ - double yshift; - %extend { - Plot3D(FrameBuffer *frame, double xmin, double ymin, double zmin, double xmax, double ymax, double zmax); - ~Plot3D(); - Plot3D *copy(); - void clear(Pixel bgcolor); - void perspective( double fovy, double znear, double zfar); - void lookat( double z); - void autoperspective( double fovy); - void ortho(double left, double right, double bottom, double top); - void autoortho(); - void rotx( double deg); - void roty( double deg); - void rotz( double deg); - void rotl( double deg); - void rotr( double deg); - void rotd( double deg); - void rotu( double deg); - void rotc( double deg); - void zoom( double percent); - void left( double percent); - void right( double percent); - void down( double percent); - void up( double percent); - void center( double cx, double cy); - void plot( double x, double y, double z, Pixel Color); - void setview( int vxmin, int vymin, int vxmax, int vymax); - void start(); - void line( double x1, double y1, double z1, - double x2, double y2, double z2, Pixel color); - void triangle( double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color); - void solidtriangle( double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color); - void interptriangle(double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3); - void quad( double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color); - void solidquad( double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color); - void interpquad( double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3, - double x4, double y4, double z4, Pixel c4); - void solidsphere( double x, double y, double z, double radius,Pixel c); - void outlinesphere( double x, double y, double z, double radius,Pixel c, Pixel bc); - } -} Plot3D; - -#ifndef SWIGJAVA -/* These directives create constants of a specific type. They - do not correspond to any C variable or declared constant in the - header file */ -%constant PixMap * SQUARE = &PixMap_SQUARE; -%constant PixMap * TRIANGLE = &PixMap_TRIANGLE; -%constant PixMap * CROSS = &PixMap_CROSS; -#endif - - - - diff --git a/Examples/GIFPlot/Java/check.list b/Examples/GIFPlot/Java/check.list deleted file mode 100644 index 13de977af..000000000 --- a/Examples/GIFPlot/Java/check.list +++ /dev/null @@ -1,4 +0,0 @@ -# see top-level Makefile.in -full -shadow -simple diff --git a/Examples/GIFPlot/Java/full/Makefile b/Examples/GIFPlot/Java/full/Makefile deleted file mode 100644 index 8f167237d..000000000 --- a/Examples/GIFPlot/Java/full/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Include -noproxy -SRCS = -TARGET = gifplot -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java - -clean:: - $(MAKE) -f $(TOP)/Makefile java_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Java/full/README b/Examples/GIFPlot/Java/full/README deleted file mode 100644 index 93463ea30..000000000 --- a/Examples/GIFPlot/Java/full/README +++ /dev/null @@ -1,8 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The program 'runme.java' does something a little more -interesting. After doing a make, run it using 'java runme'. You'll have to go -look at the header file to get a complete listing of the functions. - -Note the differences in the runme.java files between this example and the -'full' example. This example does not use shadow classes. - diff --git a/Examples/GIFPlot/Java/full/cmap b/Examples/GIFPlot/Java/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) c = 239; - gifplot.Plot3D_solidquad(p3,x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,(short)(c+16)); - y = y + dy; - } - x = x + dx; - } - - gifplot.FrameBuffer_writeGIF(frame,cmap,"image.gif"); - System.out.println( "Wrote image.gif" ); - } - - // Here is the function to plot - public static double func(double x, double y) { - return 5*java.lang.Math.cos(2*java.lang.Math.sqrt(x*x+y*y))*java.lang.Math.exp(-0.3*java.lang.Math.sqrt(x*x+y*y)); - } -} diff --git a/Examples/GIFPlot/Java/shadow/Makefile b/Examples/GIFPlot/Java/shadow/Makefile deleted file mode 100644 index 8062c2700..000000000 --- a/Examples/GIFPlot/Java/shadow/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -outcurrentdir -SRCS = -TARGET = gifplot -INTERFACEDIR = ../../Interface/ -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java - javac *.java - -clean:: - $(MAKE) -f $(TOP)/Makefile java_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Java/shadow/README b/Examples/GIFPlot/Java/shadow/README deleted file mode 100644 index b06c5a8f1..000000000 --- a/Examples/GIFPlot/Java/shadow/README +++ /dev/null @@ -1,5 +0,0 @@ -This example uses the file in ../../Interface/gifplot.i to build -an interface with shadow classes. After doing a make, run the program runme, ie: 'java runme'. - -Note the differences in the runme.java files between this example and the -'full' example. This example uses the shadow classes. diff --git a/Examples/GIFPlot/Java/shadow/cmap b/Examples/GIFPlot/Java/shadow/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) c = 239; - p3.solidquad(x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,(short)(c+16)); - y = y + dy; - } - x = x + dx; - } - - frame.writeGIF(cmap,"image.gif"); - System.out.println( "Wrote image.gif" ); - } - - // Here is the function to plot - public static double func(double x, double y) { - return 5*java.lang.Math.cos(2*java.lang.Math.sqrt(x*x+y*y))*java.lang.Math.exp(-0.3*java.lang.Math.sqrt(x*x+y*y)); - } -} diff --git a/Examples/GIFPlot/Java/simple/Makefile b/Examples/GIFPlot/Java/simple/Makefile deleted file mode 100644 index d707fd458..000000000 --- a/Examples/GIFPlot/Java/simple/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -noproxy -SRCS = -TARGET = simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java - - -clean:: - $(MAKE) -f $(TOP)/Makefile java_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Java/simple/README b/Examples/GIFPlot/Java/simple/README deleted file mode 100644 index 13ff49611..000000000 --- a/Examples/GIFPlot/Java/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. After doing a make, run the java program, ie 'java runme'. - - diff --git a/Examples/GIFPlot/Java/simple/runme.java b/Examples/GIFPlot/Java/simple/runme.java deleted file mode 100644 index 2d8d2bb48..000000000 --- a/Examples/GIFPlot/Java/simple/runme.java +++ /dev/null @@ -1,41 +0,0 @@ - -public class runme { - - static { - try { - System.loadLibrary("simple"); - } catch (UnsatisfiedLinkError e) { - System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); - System.exit(1); - } - } - - public static void main(String argv[]) { - - // Draw some simple shapes - System.out.println( "Drawing some basic shapes" ); - - SWIGTYPE_p_ColorMap cmap = simple.new_ColorMap(null); - SWIGTYPE_p_FrameBuffer f = simple.new_FrameBuffer(400,400); - - // Clear the picture - simple.FrameBuffer_clear(f,(short)simple.BLACK); - - // Make a red box - simple.FrameBuffer_box(f,40,40,200,200,(short)simple.RED); - - // Make a blue circle - simple.FrameBuffer_circle(f,200,200,40,(short)simple.BLUE); - - // Make green line - simple.FrameBuffer_line(f,10,390,390,200, (short)simple.GREEN); - - // Write an image out to disk - - simple.FrameBuffer_writeGIF(f,cmap,"image.gif"); - System.out.println( "Wrote image.gif" ); - - simple.delete_FrameBuffer(f); - simple.delete_ColorMap(cmap); - } -} diff --git a/Examples/GIFPlot/Java/simple/simple.i b/Examples/GIFPlot/Java/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Java/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/GIFPlot/Lib/Makefile.in b/Examples/GIFPlot/Lib/Makefile.in deleted file mode 100644 index 9db828eb2..000000000 --- a/Examples/GIFPlot/Lib/Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -CC = @CC@ -CCSHARED= @CCSHARED@ -INCLUDES= -I../Include -CFLAGS = -O -SRCS = frame.c color.c plot2d.c plot3d.c font.c pixmap.c matrix.c gif.c -OBJS = $(SRCS:.c=.@OBJEXT@) -AR = @AR@ -RANLIB = @RANLIB@ -TARGET = ../libgifplot.a - -.c.@OBJEXT@: - $(CC) $(CCSHARED) $(INCLUDES) $(CFLAGS) -c -o $*.@OBJEXT@ $< - -all: $(OBJS) - @rm -f ../libgifplot.a - $(AR) cr $(TARGET) $(OBJS) - $(RANLIB) $(TARGET) - -clean: - rm -f *.@OBJEXT@ *~ $(TARGET) - -check: all diff --git a/Examples/GIFPlot/Lib/color.c b/Examples/GIFPlot/Lib/color.c deleted file mode 100644 index 7d79baca9..000000000 --- a/Examples/GIFPlot/Lib/color.c +++ /dev/null @@ -1,143 +0,0 @@ -/* ----------------------------------------------------------------------------- - * color.c - * - * Colormaps - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define COLORMAP -#include "gifplot.h" -#include - -/* ------------------------------------------------------------------------ - ColorMap *new_ColorMap(char *filename) - - Read a colormap from a file. - ------------------------------------------------------------------------ */ - -ColorMap *new_ColorMap(char *filename) { - ColorMap *c; - FILE *cm; - void ColorMap_default(ColorMap *); - - if (!filename) { - c = (ColorMap *) malloc(sizeof(ColorMap)); - c->cmap = (unsigned char *) malloc(768*sizeof(char)); - c->name = 0; - ColorMap_default(c); - return c; - } - if (strlen(filename) == 0) { - c = (ColorMap *) malloc(sizeof(ColorMap)); - c->cmap = (unsigned char *) malloc(768*sizeof(char)); - ColorMap_default(c); - return c; - } - if ((cm = fopen(filename,"rb")) == NULL) { - return (ColorMap *) 0; - } - c = (ColorMap *) malloc(sizeof(ColorMap)); - c->cmap = (unsigned char *) malloc(768*sizeof(char)); - if (fread(c->cmap, 768, 1, cm) != 1) { - free((char *)c->cmap); - free((char *)c); - fclose(cm); - return (ColorMap *) 0; - } - fclose(cm); - c->name = (char *) malloc(strlen(filename)+1); - strcpy(c->name, filename); - ColorMap_default(c); - return c; -} - -/* -------------------------------------------------------------------------- - delete_ColorMap(ColorMap *cm) - - Destroy a ColorMap - -------------------------------------------------------------------------- */ - -void delete_ColorMap(ColorMap *cm) { - if (cm) { - free((char *)cm->cmap); - if (cm->name) - free((char *)cm->name); - free((char *)cm); - } -} - -/* -------------------------------------------------------------------------- - ColorMap_default(ColorMap *cm) - - This function fills in default values for the first 8 entries of the - colormap. These are *fixed* values---used internally. - -------------------------------------------------------------------------- */ - -void ColorMap_default(ColorMap *cm) { - unsigned char *r,*g,*b; - if (cm) { - r = cm->cmap; - g = cm->cmap+256; - b = cm->cmap+512; - - r[0] = 0; g[0] = 0; b[0] = 0; /* BLACK */ - r[1] = 255; g[1] = 255; b[1] = 255; /* WHITE */ - r[2] = 255; g[2] = 0; b[2] = 0; /* RED */ - r[3] = 0; g[3] = 255; b[3] = 0; /* GREEN */ - r[4] = 0; g[4] = 0; b[4] = 255; /* BLUE */ - r[5] = 255; g[5] = 255; b[5] = 0; /* YELLOW */ - r[6] = 0; g[6] = 255; b[6] = 255; /* CYAN */ - r[7] = 255; g[7] = 0; b[7] = 255; /* MAGENTA */ - } -} - -void ColorMap_assign(ColorMap *cm, int index, int r, int g, int b) { - unsigned char *rb,*gb,*bb; - - rb = cm->cmap; - gb = cm->cmap+256; - bb = cm->cmap+512; - - rb[index] = r; - gb[index] = g; - bb[index] = b; -} - -int ColorMap_getitem(ColorMap *cm, int index) { - if ((index < 0) && (index >= 768)) return -1; - return cm->cmap[index]; -} - -void ColorMap_setitem(ColorMap *cm, int index, int value) { - if ((index < 0) && (index >= 768)) return; - cm->cmap[index]=value; -} - -/* -------------------------------------------------------------------- - ColorMap_write(ColorMap *cm, char *filename) - - Write out a colormap to disk. - -------------------------------------------------------------------- */ - -int ColorMap_write(ColorMap *cm, char *filename) { - - FILE *f; - if (!cm) return -1; - if (!filename) return -1; - if (strlen(filename) == 0) return -1; - - f = fopen(filename,"w"); - - if (fwrite(cm->cmap,768,1,f) != 1) { - fclose(f); - return -1; - } - fclose(f); - return 0; -} - -#undef COLORMAP diff --git a/Examples/GIFPlot/Lib/font.c b/Examples/GIFPlot/Lib/font.c deleted file mode 100644 index b30ee9b14..000000000 --- a/Examples/GIFPlot/Lib/font.c +++ /dev/null @@ -1,705 +0,0 @@ -/* ----------------------------------------------------------------------------- - * font.c - * - * Some basic fonts. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define FONT -#include "gifplot.h" - -static char Char_A[80] = "\ -...x....\ -...x....\ -..x.x...\ -..x.x...\ -.x...x..\ -.xxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -........"; - -static char Char_B[80] = "\ -xxxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -xxxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -xxxxxx..\ -........"; - -static char Char_C[80] = "\ -..xxxx..\ -.x....x.\ -x.......\ -x.......\ -x.......\ -x.......\ -x.......\ -.x....x.\ -..xxxx..\ -........"; - -static char Char_D[80] = "\ -xxxxx...\ -x....x..\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x....x..\ -xxxxx...\ -........"; -static char Char_E[80] = "\ -xxxxxxx.\ -x.......\ -x.......\ -x.......\ -xxxxx...\ -x.......\ -x.......\ -x.......\ -xxxxxxx.\ -........"; -static char Char_F[80] = "\ -xxxxxxx.\ -x.......\ -x.......\ -x.......\ -xxxxx...\ -x.......\ -x.......\ -x.......\ -x.......\ -........"; -static char Char_G[80] = "\ -.xxxxx..\ -x.....x.\ -x.......\ -x.......\ -x...xxx.\ -x.....x.\ -x.....x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_H[80] = "\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -xxxxxxx.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -........"; -static char Char_I[80] = "\ -xxxxxxx.\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -xxxxxxx.\ -........"; -static char Char_J[80] = "\ -......x.\ -......x.\ -......x.\ -......x.\ -......x.\ -......x.\ -x.....x.\ -.x...x..\ -..xxx...\ -........"; -static char Char_K[80] = "\ -x.....x.\ -x....x..\ -x...x...\ -x..x....\ -xxx.....\ -x..x....\ -x...x...\ -x....x..\ -x.....x.\ -........"; -static char Char_L[80] = "\ -x.......\ -x.......\ -x.......\ -x.......\ -x.......\ -x.......\ -x.......\ -x.......\ -xxxxxxx.\ -........"; -static char Char_M[80] = "\ -x.....x.\ -xx...xx.\ -xx...xx.\ -x.x.x.x.\ -x.x.x.x.\ -x..x..x.\ -x..x..x.\ -x.....x.\ -x.....x.\ -........"; -static char Char_N[80] = "\ -x.....x.\ -xx....x.\ -x.x...x.\ -x.x...x.\ -x..x..x.\ -x...x.x.\ -x...x.x.\ -x....xx.\ -x.....x.\ -........"; -static char Char_O[80] = "\ -.xxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_P[80] = "\ -xxxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -xxxxxx..\ -x.......\ -x.......\ -x.......\ -x.......\ -........"; -static char Char_Q[80] = "\ -.xxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x...x.x.\ -x....x..\ -.xxxx.x.\ -........"; -static char Char_R[80] = "\ -xxxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -xxxxxx..\ -x..x....\ -x...x...\ -x....x..\ -x.....x.\ -........"; -static char Char_S[80] = "\ -.xxxxx..\ -x.....x.\ -x.......\ -x.......\ -.xxxxx..\ -......x.\ -......x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_T[80] = "\ -xxxxxxx.\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -........"; -static char Char_U[80] = "\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_V[80] = "\ -x.....x.\ -x.....x.\ -.x...x..\ -.x...x..\ -..x.x...\ -..x.x...\ -...x....\ -...x....\ -...x....\ -........"; -static char Char_W[80] = "\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x.....x.\ -x..x..x.\ -x..x..x.\ -x.x.x.x.\ -.x...x..\ -........"; -static char Char_X[80] = "\ -x.....x.\ -x.....x.\ -.x...x..\ -..x.x...\ -...x....\ -..x.x...\ -.x...x..\ -x.....x.\ -x.....x.\ -........"; -static char Char_Y[80] = "\ -x.....x.\ -x.....x.\ -.x...x..\ -..x.x...\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -........"; -static char Char_Z[80] = "\ -xxxxxxx.\ -......x.\ -.....x..\ -....x...\ -...x....\ -..x.....\ -.x......\ -x.......\ -xxxxxxx.\ -........"; -static char Char_0[80] = "\ -.xxxxx..\ -x....xx.\ -x...x.x.\ -x..x..x.\ -x..x..x.\ -x.x...x.\ -x.x...x.\ -xx....x.\ -.xxxxx..\ -........"; -static char Char_1[80] = "\ -...x....\ -..xx....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -...x....\ -..xxx...\ -........"; -static char Char_2[80] = "\ -..xxxx..\ -.x....x.\ -x.....x.\ -.....x..\ -....x...\ -...x....\ -..x.....\ -.x......\ -xxxxxxx.\ -........"; -static char Char_3[80] = "\ -.xxxxx..\ -x.....x.\ -......x.\ -......x.\ -...xxx..\ -......x.\ -......x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_4[80] = "\ -....xx..\ -...x.x..\ -..x..x..\ -.x...x..\ -xxxxxxx.\ -.....x..\ -.....x..\ -.....x..\ -.....x..\ -........"; -static char Char_5[80] = "\ -xxxxxxx.\ -x.......\ -x.......\ -x.......\ -xxxxxx..\ -......x.\ -......x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_6[80] = "\ -....xxx.\ -..xx....\ -.x......\ -x.......\ -x.xxx...\ -xx...x..\ -x.....x.\ -.x...x..\ -..xxx...\ -........"; -static char Char_7[80] = "\ -xxxxxxx.\ -x.....x.\ -.....x..\ -....x...\ -...x....\ -..x.....\ -.x......\ -x.......\ -x.......\ -........"; -static char Char_8[80] = "\ -.xxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -.xxxxx..\ -x.....x.\ -x.....x.\ -x.....x.\ -.xxxxx..\ -........"; -static char Char_9[80] = "\ -..xxxx..\ -.x....x.\ -x.....x.\ -x....xx.\ -.xxxx.x.\ -......x.\ -......x.\ -....xx..\ -.xxx....\ -........"; -static char Char_MINUS[80] = "\ -........\ -........\ -........\ -........\ -.xxxxxx.\ -........\ -........\ -........\ -........\ -........"; -static char Char_PLUS[80] = "\ -........\ -........\ -...x....\ -...x....\ -.xxxxx..\ -...x....\ -...x....\ -........\ -........\ -........"; -static char Char_EQUAL[80] = "\ -........\ -........\ -........\ -.xxxxx..\ -........\ -.xxxxx..\ -........\ -........\ -........\ -........"; -static char Char_LPAREN[80] = "\ -....x...\ -...x....\ -..x.....\ -.x......\ -.x......\ -.x......\ -..x.....\ -...x....\ -....x...\ -........"; -static char Char_RPAREN[80] = "\ -...x....\ -....x...\ -.....x..\ -......x.\ -......x.\ -......x.\ -.....x..\ -....x...\ -...x....\ -........"; -static char Char_QUOTE[80] = "\ -..x.x...\ -..x.x...\ -........\ -........\ -........\ -........\ -........\ -........\ -........\ -........"; -static char Char_COLON[80] = "\ -........\ -........\ -...xx...\ -...xx...\ -........\ -...xx...\ -...xx...\ -........\ -........\ -........"; -static char Char_PERIOD[80] = "\ -........\ -........\ -........\ -........\ -........\ -........\ -........\ -...xx...\ -...xx...\ -........"; -static char Char_COMMA[80] = "\ -........\ -........\ -........\ -........\ -........\ -........\ -...xx...\ -...xx...\ -....x...\ -...x...."; - -static char Char_SLASH[80] = "\ -........\ -......x.\ -.....x..\ -....x...\ -...x....\ -..x.....\ -.x......\ -x.......\ -........\ -........"; - -static char Char_SPACE[80] = "\ -........\ -........\ -........\ -........\ -........\ -........\ -........\ -........\ -........\ -........"; - -static char *GP_Font[128]; -static int InitGP_Font = 0; - -static void initGP_Fonts(void) { - - int i; - for (i = 0; i < 128; i++) - GP_Font[i] = (char *) 0; - - GP_Font['A'] = GP_Font['a'] = Char_A; - GP_Font['B'] = GP_Font['b'] = Char_B; - GP_Font['C'] = GP_Font['c'] = Char_C; - GP_Font['D'] = GP_Font['d'] = Char_D; - GP_Font['E'] = GP_Font['e'] = Char_E; - GP_Font['F'] = GP_Font['f'] = Char_F; - GP_Font['G'] = GP_Font['g'] = Char_G; - GP_Font['H'] = GP_Font['h'] = Char_H; - GP_Font['I'] = GP_Font['i'] = Char_I; - GP_Font['J'] = GP_Font['j'] = Char_J; - GP_Font['K'] = GP_Font['k'] = Char_K; - GP_Font['L'] = GP_Font['l'] = Char_L; - GP_Font['M'] = GP_Font['m'] = Char_M; - GP_Font['N'] = GP_Font['n'] = Char_N; - GP_Font['O'] = GP_Font['o'] = Char_O; - GP_Font['P'] = GP_Font['p'] = Char_P; - GP_Font['Q'] = GP_Font['q'] = Char_Q; - GP_Font['R'] = GP_Font['r'] = Char_R; - GP_Font['S'] = GP_Font['s'] = Char_S; - GP_Font['T'] = GP_Font['t'] = Char_T; - GP_Font['U'] = GP_Font['u'] = Char_U; - GP_Font['V'] = GP_Font['v'] = Char_V; - GP_Font['W'] = GP_Font['w'] = Char_W; - GP_Font['X'] = GP_Font['x'] = Char_X; - GP_Font['Y'] = GP_Font['y'] = Char_Y; - GP_Font['Z'] = GP_Font['z'] = Char_Z; - GP_Font['0'] = Char_0; - GP_Font['1'] = Char_1; - GP_Font['2'] = Char_2; - GP_Font['3'] = Char_3; - GP_Font['4'] = Char_4; - GP_Font['5'] = Char_5; - GP_Font['6'] = Char_6; - GP_Font['7'] = Char_7; - GP_Font['8'] = Char_8; - GP_Font['9'] = Char_9; - GP_Font['.'] = Char_PERIOD; - GP_Font[','] = Char_COMMA; - GP_Font['='] = Char_EQUAL; - GP_Font['-'] = Char_MINUS; - GP_Font['+'] = Char_PLUS; - GP_Font['\"'] = Char_QUOTE; - GP_Font['('] = Char_LPAREN; - GP_Font[')'] = Char_RPAREN; - GP_Font[':'] = Char_COLON; - GP_Font['/'] = Char_SLASH; - GP_Font[' '] = Char_SPACE; - InitGP_Font = 1; -} - -/* ----------------------------------------------------------------------- - void FrameBuffer_drawchar(FrameBuffer *f, int x, int y, Pixel fgcolor, Pixel bgcolor, char chr, int orientation) - - Draws a character at location x, y with given color and orientation parameters. - Orientation can either be HORIZONTAL or VERTICAL - ----------------------------------------------------------------------- */ -void FrameBuffer_drawchar(FrameBuffer *f, int x, int y, int fgcolor, - int bgcolor, char chr, int orientation) { - - Pixel c, bc,*p,*p1; - char *ch; - int i,j; - int xpixels,ypixels; - - if (!InitGP_Font) initGP_Fonts(); - - c = (Pixel) fgcolor; - bc = (Pixel) bgcolor; - xpixels = f->width; - ypixels = f->height; - - if (orientation == HORIZONTAL) { - if ((x < f->xmin) || (x > f->xmax-8) || - (y < f->ymin) || (y > f->ymax-10)) return; - - ch = GP_Font[(int) chr]; - if (!ch) return; - p = &f->pixels[y+9][x]; - for (i = 0; i < 10; i++) { - p1 = p; - for (j = 0; j< 8; j++) { - if (*(ch++) == 'x') *p= c; - else if (bgcolor >= 0) - *p = bc; - p++; - } - p = (p1 - xpixels); - } - } else { - if ((x < f->xmin+10) || (x >= f->xmax) || - (y < f->ymin) || (y > f->ymax-8)) return; - - ch = GP_Font[(int) chr]; - if (!ch) return; - p = &f->pixels[y][x-9]; - for (i = 0; i < 10; i++) { - p1 = p; - for (j = 0; j< 8; j++) { - if (*(ch++) == 'x') *p= c; - else if (bgcolor >= 0) - *p = bc; - p+=xpixels; - } - p = p1 + 1; - } - } -} - -/* ---------------------------------------------------------------------- - void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, - int bgcolor, char *text, int orientation) - - Draws an ASCII string on the framebuffer. Can be oriented either horizontally - or vertically. - ---------------------------------------------------------------------- */ - -void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, int bgcolor, char *text, int orientation) { - - char *c; - int x1, y1; - int xpixels, ypixels; - - x1 = x; - y1 = y; - xpixels = f->width; - ypixels = f->height; - c = text; - while (*c) { - if (*c == '\n') { - if (orientation == HORIZONTAL) { - x1 = x; y1= y1- 10*xpixels; - } else { - y1 = y; x1= x1 + 10*ypixels; - } - } else { - FrameBuffer_drawchar(f, x1,y1,fgcolor, bgcolor,*c, orientation); - if (orientation == HORIZONTAL) { - x1+=8; - if (x1 >= (xpixels-8)) { - x1 = x; y1= y1- 10;} - if (y1 < 0) return; - } else { - y1 += 8; - if (y1 >= (ypixels-8)) { - y1 = y; x1 = x1 + 10;} - if (x1 > (xpixels-10)) return; - } - } - c++; - } -} - - - - - - - - diff --git a/Examples/GIFPlot/Lib/frame.c b/Examples/GIFPlot/Lib/frame.c deleted file mode 100644 index e006f0daf..000000000 --- a/Examples/GIFPlot/Lib/frame.c +++ /dev/null @@ -1,924 +0,0 @@ -/* ----------------------------------------------------------------------------- - * frame.c - * - * Frame buffer management - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define FRAME -#include "gifplot.h" -#include - -/* ------------------------------------------------------------------------ - FrameBuffer *new_FrameBuffer(int width, int height) - - Creates a new framebuffer for storing data. - ------------------------------------------------------------------------ */ - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height) { - - FrameBuffer *f; - int FrameBuffer_resize(FrameBuffer *f, int width, int height); - - /* Create a new frame buffer */ - - f = (FrameBuffer *) malloc(sizeof(FrameBuffer)); - f->pixels = (Pixel **) 0; - f->zbuffer = (Zvalue **) 0; - /* Set its size */ - - if (FrameBuffer_resize(f, width, height) == -1) { - free((char *) f); - return (FrameBuffer *) 0; - } - - f->xmin = 0; - f->ymin = 0; - f->xmax = width; - f->ymax = height; - return f; -} - -/* ------------------------------------------------------------------------ - void delete_FrameBuffer(FrameBuffer *f) - - Destroys the given framebuffer - ------------------------------------------------------------------------ */ - -void delete_FrameBuffer(FrameBuffer *f) { - - if (f) { - if (f->pixels) { - free((char *) f->pixels[0]); - free((char *) f->pixels); - } - if (f->zbuffer) { - free((char *) f->zbuffer[0]); - free((char *) f->zbuffer); - } - free((char *)f); - } -} - -/* ------------------------------------------------------------------------ - int *FrameBuffer_resize(FrameBuffer *f, int width, int height) - - Resize the given framebuffer. Returns 0 on success, -1 on failure. - ------------------------------------------------------------------------ */ - -int FrameBuffer_resize(FrameBuffer *f, int width, int height) { - int i; - if ((f) && (width > 0) && (height > 0)) { - if (f->pixels) { - free((char *)f->pixels[0]); - free((char *)f->pixels); - } - f->pixels = (Pixel **) malloc (height*sizeof(Pixel *)); - if (!f->pixels) return -1; - f->pixels[0] = (Pixel *) malloc(height*width*sizeof(Pixel)); - if (!f->pixels[0]) { - free((char *)f->pixels); - return -1; - } - for (i = 0; i < height; i++) - f->pixels[i] = f->pixels[0] + i*width; - f->width = width; - f->height = height; - if (f->zbuffer) { - FrameBuffer_zresize(f,width,height); - } - return 0; - } else { - return -1; - } -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_clear(FrameBuffer *f, Pixel color) - - Clears the current FrameBuffer - ------------------------------------------------------------------------ */ - -void FrameBuffer_clear(FrameBuffer *f, Pixel color) { - Pixel *p; - unsigned int i; - p = &f->pixels[0][0]; - - for (i = 0; i < f->width*f->height; i++, p++) - *p = color; -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_plot(FrameBuffer *f, int x1, int y1, Pixel color) - - Plots a point and does a bounds check. - ------------------------------------------------------------------------ */ - -void FrameBuffer_plot(FrameBuffer *f, int x1, int y1, Pixel color) { - - if ((x1 < f->xmin) || (x1 >= f->xmax) || (y1 < f->ymin) || (y1 >= f->ymax)) - return; - f->pixels[y1][x1] = color; - -} - -/* ------------------------------------------------------------------------ - FrameBuffer_horizontal(Framebuffer *f, int xmin, int xmax, int y, Pixel color) - - Draw a horizontal line (clipped) - ------------------------------------------------------------------------ */ - -void FrameBuffer_horizontal(FrameBuffer *f, int xmin, int xmax, int y, Pixel color) { - - Pixel *p; - int i; - - if ((y < f->ymin) || (y >= f->ymax)) return; - if (xmin < f->xmin) xmin = f->xmin; - if (xmax >= f->xmax) xmax = f->xmax - 1; - - p = &f->pixels[y][xmin]; - for (i = xmin; i <= xmax; i++, p++) - *p = color; - -} - -/* ------------------------------------------------------------------------ - FrameBuffer_horizontalinterp(Framebuffer *f, int xmin, int xmax, int y, - Pixel c1, Pixel c2) - - Draw a horizontal line (clipped) with color interpolation. - ------------------------------------------------------------------------ */ - -void FrameBuffer_horizontalinterp(FrameBuffer *f, int xmin, int xmax, int y, - Pixel c1, Pixel c2) { - - Pixel *p; - int i; - double mc; - int x1; - if ((y < f->ymin) || (y >= f->ymax)) return; - - x1 = xmin; - if (xmin < f->xmin) xmin = f->xmin; - if (xmax >= f->xmax) xmax = f->xmax - 1; - if (xmax < f->xmin) return; - if (xmin >= f->xmax) return; - - if (xmin != xmax) - mc = (double)(c2 - c1)/(double) (xmax - xmin); - else - mc = 0.0; - - p = &f->pixels[y][xmin]; - for (i = xmin; i <= xmax; i++, p++) - *p = (Pixel) (mc*(i-x1) + c1); - -} - - -/* ------------------------------------------------------------------------ - FrameBuffer_vertical(Framebuffer *f, int xmin, int xmax, int y, Pixel color) - - Draw a Vertical line (clipped) - ------------------------------------------------------------------------ */ - -void FrameBuffer_vertical(FrameBuffer *f, int ymin, int ymax, int x, Pixel color) { - - Pixel *p; - int i; - - if ((x < f->xmin) || (x >= f->xmax)) return; - if (ymax < f->ymin) return; - if (ymin > f->ymax) return; - if (ymin < f->ymin) ymin = f->ymin; - if (ymax >= f->ymax) ymax = f->ymax - 1; - - p = &f->pixels[ymin][x]; - for (i = 0; i <= (ymax - ymin); i++, p+=f->width) - *p = color; - -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_box(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) - - Makes an outline box. - ------------------------------------------------------------------------ */ - -void FrameBuffer_box(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) { - - int xt, yt; - - /* Make sure points are in correct order */ - - if (x2 < x1) { - xt = x2; - x2 = x1; - x1 = xt; - } - if (y2 < y1) { - yt = y2; - y2 = y1; - y1 = yt; - } - - /* Draw lower edge */ - - FrameBuffer_horizontal(f,x1,x2,y1,color); - - /* Draw upper edge */ - - FrameBuffer_horizontal(f,x1,x2,y2,color); - - /* Draw left side */ - - FrameBuffer_vertical(f,y1,y2,x1,color); - - /* Draw right side */ - - FrameBuffer_vertical(f,y1,y2,x2,color); - -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_solidbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) - - Makes an solid box. - ------------------------------------------------------------------------ */ - -void FrameBuffer_solidbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) { - - int xt, yt; - - /* Make sure points are in correct order */ - - if (x2 < x1) { - xt = x2; - x2 = x1; - x1 = xt; - } - if (y2 < y1) { - yt = y2; - y2 = y1; - y1 = yt; - } - - /* Now perform some clipping */ - - if (y1 < f->ymin) y1 = f->ymin; - if (y2 >= f->ymax) y2 = f->ymax - 1; - - /* Fill it in using horizontal lines */ - - for (yt = y1; yt <= y2; yt++) - FrameBuffer_horizontal(f,x1,x2,yt,color); - -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2 - Pixel c1, Pixel c2, Pixel c3, Pixel c4) - - Makes a box with interpolated color. Colors are assigned as follows : - (x1,y1) = c1 - (x1,y2) = c2 - (x2,y1) = c3 - (x2,y2) = c4 - ------------------------------------------------------------------------ */ - -void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2, - Pixel c1, Pixel c2, Pixel c3, Pixel c4) { - - int xt, yt; - Pixel ct; - double mc1,mc2; - int ystart; - /* Make sure points are in correct order */ - - if (x2 < x1) { - xt = x2; - x2 = x1; - x1 = xt; - ct = c1; - c1 = c3; - c3 = ct; - ct = c2; - c2 = c4; - c4 = ct; - } - if (y2 < y1) { - yt = y2; - y2 = y1; - y1 = yt; - ct = c1; - c1 = c2; - c2 = ct; - ct = c3; - c3 = c4; - c4 = ct; - } - - /* Now perform some clipping */ - - ystart = y1; - mc1 = (double) (c2 - c1)/(double) (y2 - y1); - mc2 = (double) (c4 - c3)/(double) (y2 - y1); - if (y1 < f->ymin) y1 = f->ymin; - if (y2 >= f->ymax) y2 = f->ymax - 1; - - /* Fill it in using horizontal lines */ - - for (yt = y1; yt <= y2; yt++) - FrameBuffer_horizontalinterp(f,x1,x2,yt,(Pixel) ((mc1*(yt - ystart)) + c1), - (Pixel) ((mc2*(yt-ystart))+c3)); - -} - -/* --------------------------------------------------------------------------- - FrameBuffer_line(FrameBuffer *f, int x1, int y1, int x2, int y2, color) - - Draws a line on the framebuffer using the Bresenham line algorithm. The - line is clipped to fit within the current view window. - ---------------------------------------------------------------------------- */ - -void FrameBuffer_line(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel c) { - - int dx,dy,dxneg,dyneg, inc1,inc2,di; - int x, y, xpixels, ypixels, xt, yt; - Pixel *p; - double m; - int end1 = 0, end2 = 0; - - /* Need to figure out where in the heck this line is */ - - dx = x2 - x1; - dy = y2 - y1; - - if (dx == 0) { - /* Draw a Vertical Line */ - if (y1 < y2) - FrameBuffer_vertical(f,y1,y2,x1,c); - else - FrameBuffer_vertical(f,y2,y1,x1,c); - return; - } - if (dy == 0) { - /* Draw a Horizontal Line */ - if (x1 < x2) - FrameBuffer_horizontal(f,x1,x2,y1,c); - else - FrameBuffer_horizontal(f,x2,x1,y1,c); - return; - } - - /* Figure out where in the heck these lines are using the - Cohen-Sutherland Line Clipping Scheme. */ - - end1 = ((x1 - f->xmin) < 0) | - (((f->xmax- 1 - x1) < 0) << 1) | - (((y1 - f->ymin) < 0) << 2) | - (((f->ymax-1 - y1) < 0) << 3); - - end2 = ((x2 - f->xmin) < 0) | - (((f->xmax-1 - x2) < 0) << 1) | - (((y2 - f->ymin) < 0) << 2) | - (((f->ymax-1 - y2) < 0) << 3); - - if (end1 & end2) return; /* Nope : Not visible */ - - /* Make sure points have a favorable orientation */ - - if (x1 > x2) { - xt = x1; - x1 = x2; - x2 = xt; - yt = y1; - y1 = y2; - y2 = yt; - } - - /* Clip against the boundaries */ - m = (y2 - y1)/(double) (x2-x1); - if (x1 < f->xmin) { - y1 = (int) ((f->xmin - x1)*m + y1); - x1 = (int) f->xmin; - } - if (x2 >= f->xmax) { - y2 = (int) ((f->xmax -1 -x1)*m + y1); - x2 = (int) (f->xmax - 1); - } - - if (y1 > y2) { - xt = x1; - x1 = x2; - x2 = xt; - yt = y1; - y1 = y2; - y2 = yt; - } - - m = 1/m; - if (y1 < f->ymin) { - x1 = (int) ((f->ymin - y1)*m + x1); - y1 = (int) f->ymin; - } - if (y2 >= f->ymax) { - x2 = (int) ((f->ymax-1-y1)*m + x1); - y2 = (int) (f->ymax-1); - } - - if ((x1 < f->xmin) || (x1 >= f->xmax) || (y1 < f->ymin) || (y1 >= f->ymax) || - (x2 < f->xmin) || (x2 >= f->xmax) || (y2 < f->ymin) || (y2 >= f->ymax)) return; - - dx = x2 - x1; - dy = y2 - y1; - xpixels = f->width; - ypixels = f->height; - - dxneg = (dx < 0) ? 1 : 0; - dyneg = (dy < 0) ? 1 : 0; - - dx = abs(dx); - dy = abs(dy); - if (dx >= dy) { - /* Slope between -1 and 1. */ - if (dxneg) { - x = x1; - y = y1; - x1 = x2; - y1 = y2; - x2 = x; - y2 = y; - dyneg = !dyneg; - } - inc1 = 2*dy; - inc2 = 2*(dy-dx); - di = 2*dy-dx; - - /* Draw a line using x as independent variable */ - - p = &f->pixels[y1][x1]; - x = x1; - while (x <= x2) { - *(p++) = c; - if (di < 0) { - di = di + inc1; - } else { - if (dyneg) { - p = p - xpixels; - di = di + inc2; - } else { - p = p + xpixels; - di = di + inc2; - } - } - x++; - } - } else { - /* Slope < -1 or > 1 */ - if (dyneg) { - x = x1; - y = y1; - x1 = x2; - y1 = y2; - x2 = x; - y2 = y; - dxneg = !dxneg; - } - inc1 = 2*dx; - inc2 = 2*(dx-dy); - di = 2*dx-dy; - - /* Draw a line using y as independent variable */ - - p = &f->pixels[y1][x1]; - y = y1; - while (y <= y2) { - *p = c; - p = p + xpixels; - if (di < 0) { - di = di + inc1; - } else { - if (dxneg) { - p = p - 1; - di = di + inc2; - } else { - p = p + 1; - di = di + inc2; - } - } - y++; - } - } -} - - -/* ------------------------------------------------------------------------- - FrameBuffer_circle(FrameBuffer f, int xc, int yc, int radius, Pixel c) - - Create an outline circle - ------------------------------------------------------------------------- */ - -#define plot_circle(x,y,c) \ - if ((x >= xmin) && (x < xmax) && \ - (y >= ymin) && (y < ymax)) \ - pixels[y][x] = c; - -void FrameBuffer_circle(FrameBuffer *f, int xc, int yc, int radius, Pixel c) { - - int xpixels, ypixels, x, y, p; - int xmin, ymin, xmax, ymax; - Pixel **pixels; - - if (radius <= 0) return; - xpixels = f->width; - ypixels = f->height; - pixels = f->pixels; - xmin = f->xmin; - ymin = f->ymin; - xmax = f->xmax; - ymax = f->ymax; - x = 0; - y = radius; - p = 3-2*radius; - while (x <= y) { - plot_circle(xc+x,yc+y,c); - plot_circle(xc-x,yc+y,c); - plot_circle(xc+x,yc-y,c); - plot_circle(xc-x,yc-y,c); - plot_circle(xc+y,yc+x,c); - plot_circle(xc-y,yc+x,c); - plot_circle(xc+y,yc-x,c); - plot_circle(xc-y,yc-x,c); - if (p < 0) p = p + 4*x + 6; - else { - p = p + 4*(x-y) + 10; - y = y -1; - } - x++; - } -} - - -/* ------------------------------------------------------------------------- - FrameBuffer_solidcircle(FrameBuffer f, int xc, int yc, int radius, Pixel c) - - Create an filled circle - ------------------------------------------------------------------------- */ - - -#define fill_circle(x,y,c) \ - x1 = xc - x; \ - x2 = xc + x; \ - FrameBuffer_horizontal(f,x1,x2,y,c); - -void FrameBuffer_solidcircle(FrameBuffer *f, int xc, int yc, int radius, Pixel c) { - - int xpixels, ypixels, x, y, p; - int x1,x2; - int xmin, ymin, xmax, ymax; - Pixel **pixels; - - if (radius <= 0) return; - xpixels = f->width; - ypixels = f->height; - pixels = f->pixels; - xmin = f->xmin; - ymin = f->ymin; - xmax = f->xmax; - ymax = f->ymax; - x = 0; - y = radius; - p = 3-2*radius; - while (x <= y) { - fill_circle(x,yc+y,c); - fill_circle(x,yc-y,c); - fill_circle(y,yc+x,c); - fill_circle(y,yc-x,c); - if (p < 0) p = p + 4*x + 6; - else { - p = p + 4*(x-y) + 10; - y = y -1; - } - x++; - } -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_setclip(f,xmin,ymin,xmax,ymax) - - Set clipping region for plotting - ------------------------------------------------------------------------ */ - -void FrameBuffer_setclip(FrameBuffer *f, int xmin, int ymin, int xmax, int ymax) { - - if (xmin >= xmax) return; - if (ymin >= ymax) return; - - if (xmin < 0) xmin = 0; - if (ymin < 0) ymin = 0; - if (xmax > (int) f->width) xmax = f->width; - if (ymax > (int) f->height) ymax = f->height; - - f->xmin = xmin; - f->ymin = ymin; - f->xmax = xmax; - f->ymax = ymax; -} - -/* ------------------------------------------------------------------------ - void FrameBuffer_noclip(f) - - Disable clipping region - ------------------------------------------------------------------------ */ - -void FrameBuffer_noclip(FrameBuffer *f) { - f->xmin = 0; - f->ymin = 0; - f->xmax = f->width; - f->ymax = f->height; -} - - -/* ------------------------------------------------------------------------ - FrameBuffer_zresize(FrameBuffer *f, int width, int height) - - This function resizes the framebuffer's zbuffer. If none exist, it - creates a new one. - ------------------------------------------------------------------------ */ - -void FrameBuffer_zresize(FrameBuffer *f, int width, int height) { - int i; - - if (f->zbuffer) { - free((char *)f->zbuffer[0]); - free((char *)f->zbuffer); - } - f->zbuffer = (Zvalue **) malloc(height*sizeof(Zvalue *)); - f->zbuffer[0] = (Zvalue *) malloc(height*width*sizeof(Zvalue)); - for (i = 0; i < height; i++) - f->zbuffer[i] = f->zbuffer[0]+i*width; -} - -/* ------------------------------------------------------------------------ - FrameBuffer_zclear(FrameBuffer *f) - - Clears the z-buffer for a particular frame. Sets all of the z-values to - ZMIN. - ------------------------------------------------------------------------- */ - -void FrameBuffer_zclear(FrameBuffer *f) { - unsigned int i,j; - if (f) { - if (f->zbuffer) { - for (i = 0; i < f->width; i++) - for (j = 0; j < f->height; j++) - f->zbuffer[j][i] = ZMIN; - } - } -} - - - -/* ------------------------------------------------------------------------- - FrameBuffer_solidtriangle(FrameBuffer *f, int tx1, int ty2, - int tx2, int ty2, - int tx3, int ty3, Pixel color) - - This function draws a 2D filled triangle. - - General idea : - 1. Transform the three points into screen coordinates - 2. Order three points vertically on screen. - 3. Check for degenerate cases (where 3 points are colinear). - 4. Fill in the resulting triangle using horizontal lines. - -------------------------------------------------------------------------- */ - -void FrameBuffer_solidtriangle(FrameBuffer *f, int tx1, int ty1, - int tx2, int ty2, - int tx3, int ty3, Pixel color) { - int tempx, tempy; - double m1,m2,m3; - int y; - int ix1, ix2; - - /* Figure out which point has the greatest "y" value */ - - if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ - tempx = tx1; - tempy = ty1; - tx1 = tx2; - ty1 = ty2; - tx2 = tempx; - ty2 = tempy; - } - if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ - tempx = tx1; - tempy = ty1; - tx1 = tx3; - ty1 = ty3; - tx3 = tempx; - ty3 = tempy; - } - if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ - tempx = tx2; - tempy = ty2; - tx2 = tx3; - ty2 = ty3; - tx3 = tempx; - ty3 = tempy; - } - - /* Points are now order so that t_1 is the highest point, t_2 is the - middle point, and t_3 is the lowest point */ - - /* Check for degenerate cases here */ - - if ((ty1 == ty2) && (ty2 == ty3)) { - - /* Points are aligned horizontally. Handle as a special case */ - /* Just draw three lines using the outline color */ - - FrameBuffer_line(f,tx1,ty1,tx2,ty2,color); - FrameBuffer_line(f,tx1,ty1,tx3,ty3,color); - FrameBuffer_line(f,tx2,ty2,tx3,ty3,color); - - } else { - - if (ty2 < ty1) { - /* First process line segments between (x1,y1)-(x2,y2) - And between (x1,y1),(x3,y3) */ - - m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - - y = ty1; - while (y >= ty2) { - /* Calculate x values from slope */ - ix1 = (int) (m1*(y-ty1)+0.5) + tx1; - ix2 = (int) (m2*(y-ty1)+0.5) + tx1; - if (ix1 > ix2) - FrameBuffer_horizontal(f,ix2,ix1,y,color); - else - FrameBuffer_horizontal(f,ix1,ix2,y,color); - y--; - } - } - if (ty3 < ty2) { - /* Draw lower half of the triangle */ - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); - y = ty2; - while (y >= ty3) { - ix1 = (int) (m3*(y-ty2)+0.5)+tx2; - ix2 = (int) (m2*(y-ty1)+0.5)+tx1; - if (ix1 > ix2) - FrameBuffer_horizontal(f,ix2,ix1,y,color); - else - FrameBuffer_horizontal(f,ix1,ix2,y,color); - y--; - } - } - } -} - -/* ------------------------------------------------------------------------- - FrameBuffer_interptriangle(FrameBuffer *f, - int tx1, int ty2, Pixel c1, - int tx2, int ty2, Pixel c2, - int tx3, int ty3, Pixel c3) - - This function draws a filled triangle with color - interpolation. - - General idea : - 1. Transform the three points into screen coordinates - 2. Order three points vertically on screen. - 3. Check for degenerate cases (where 3 points are colinear). - 4. Fill in the resulting triangle using horizontal lines. - 5. Colors are interpolated between end points - -------------------------------------------------------------------------- */ - -void FrameBuffer_interptriangle(FrameBuffer *f, - int tx1, int ty1, Pixel c1, - int tx2, int ty2, Pixel c2, - int tx3, int ty3, Pixel c3) { - int tempx, tempy; - double m1,m2,m3; - double mc1,mc2,mc3; - Pixel ic1,ic2,tempc; - int y; - int ix1, ix2; - - /* Figure out which point has the greatest "y" value */ - - if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ - tempx = tx1; - tempy = ty1; - tempc = c1; - tx1 = tx2; - ty1 = ty2; - c1 = c2; - tx2 = tempx; - ty2 = tempy; - c2 = tempc; - } - if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ - tempx = tx1; - tempy = ty1; - tempc = c1; - tx1 = tx3; - ty1 = ty3; - c1 = c3; - tx3 = tempx; - ty3 = tempy; - c3 = tempc; - } - if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ - tempx = tx2; - tempy = ty2; - tempc = c2; - tx2 = tx3; - ty2 = ty3; - c2 = c3; - tx3 = tempx; - ty3 = tempy; - c3 = tempc; - } - - /* Points are now order so that t_1 is the highest point, t_2 is the - middle point, and t_3 is the lowest point */ - - /* Check for degenerate cases here */ - - if ((ty1 == ty2) && (ty2 == ty3)) { - - /* Points are aligned horizontally. Handle as a special case */ - /* Just draw three lines using the outline color */ - - if (tx2 > tx1) - FrameBuffer_horizontalinterp(f,tx1,tx2,ty1,c1,c2); - else - FrameBuffer_horizontalinterp(f,tx2,tx1,ty1,c2,c1); - if (tx3 > tx1) - FrameBuffer_horizontalinterp(f,tx1,tx3,ty1,c1,c3); - else - FrameBuffer_horizontalinterp(f,tx3,tx1,ty1,c3,c1); - if (tx3 > tx2) - FrameBuffer_horizontalinterp(f,tx2,tx3,ty2,c2,c3); - else - FrameBuffer_horizontalinterp(f,tx3,tx2,ty2,c3,c2); - - } else { - - /* First process line segments between (x1,y1)-(x2,y2) - And between (x1,y1),(x3,y3) */ - - if (ty2 < ty1) { - m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - mc1 = (c2 - c1)/(double) (ty2 - ty1); - mc2 = (c3 - c1)/(double) (ty3 - ty1); - - y = ty1; - while (y >= ty2) { - /* Calculate x values from slope */ - ix1 = (int) (m1*(y-ty1)+0.5) + tx1; - ix2 = (int) (m2*(y-ty1)+0.5) + tx1; - ic1 = (int) (mc1*(y-ty1) + c1); - ic2 = (int) (mc2*(y-ty1) + c1); - if (ix1 > ix2) - FrameBuffer_horizontalinterp(f,ix2,ix1,y,ic2,ic1); - else - FrameBuffer_horizontalinterp(f,ix1,ix2,y,ic1,ic2); - y--; - } - } - if (ty3 < ty2) { - /* Draw lower half of the triangle */ - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - mc2 = (c3 - c1)/(double) (ty3 - ty1); - m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); - mc3 = (c3 - c2)/(double) (ty3 - ty2); - y = ty2; - while (y >= ty3) { - ix1 = (int) (m3*(y-ty2)+0.5)+tx2; - ix2 = (int) (m2*(y-ty1)+0.5)+tx1; - ic1 = (int) (mc3*(y-ty2)+c2); - ic2 = (int) (mc2*(y-ty1)+c1); - if (ix1 > ix2) - FrameBuffer_horizontalinterp(f,ix2,ix1,y,ic2,ic1); - else - FrameBuffer_horizontalinterp(f,ix1,ix2,y,ic1,ic2); - y--; - } - } - } -} - - diff --git a/Examples/GIFPlot/Lib/gif.c b/Examples/GIFPlot/Lib/gif.c deleted file mode 100644 index 7953e5ce9..000000000 --- a/Examples/GIFPlot/Lib/gif.c +++ /dev/null @@ -1,672 +0,0 @@ - -/********************************************************************** - * GIFPlot 0.0 - * - * Dave Beazley - * - * Department of Computer Science Theoretical Division (T-11) - * University of Utah Los Alamos National Laboratory - * Salt Lake City, Utah 84112 Los Alamos, New Mexico 87545 - * beazley@cs.utah.edu beazley@lanl.gov - * - * Copyright (c) 1996 - * The Regents of the University of California and the University of Utah - * All Rights Reserved - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that - * (1) The above copyright notice and the following two paragraphs - * appear in all copies of the source code and (2) redistributions - * including binaries reproduces these notices in the supporting - * documentation. Substantial modifications to this software may be - * copyrighted by their authors and need not follow the licensing terms - * described here, provided that the new terms are clearly indicated in - * all files where they apply. - * - * IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE - * UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY - * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL - * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, - * EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - * - * THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH - * SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND - * THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, - * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - **************************************************************************/ - -/******************************************************************* - * Creates a GIF format file. - * - * Dave Beazley (T-11) - * August 11, 1995 - * - * Rather than writing directly to files, this module fills out - * output buffer. - * - * Note : To save memory, this routine uses approximately 50K of the - * output buffer as temporary storage (for hash tables and compression codes). - * The remainder of the output buffer is used to store the final image. - * This feature allows GIF images to be created with no additional - * memory overhead. - * - * -- Revision History - * $Log$ - * Revision 1.2 2003/09/01 16:23:31 beazley - * Restored the 'mojo'. - * - * Revision 1.2 1996/09/25 22:39:30 dmb - * Fixed prototypes and use of void pointers for compatibility with the Cray T3D - * - * Revision 1.1 1996/09/10 17:44:00 dmb - * Initial revision - * - * Revision 1.2 1995/08/31 14:46:07 beazley - * Minor changes to support comments and a few bug fixes. - * - * - ******************************************************************/ - - -/* - * xvgifwr.c - handles writing of GIF files. based on flgife.c and - * flgifc.c from the FBM Library, by Michael Maudlin - * - * Contains: - * WriteGIF(fp, pic, ptype, w, h, rmap, gmap, bmap, numcols, colorstyle, - * comment) - * - * Note: slightly brain-damaged, in that it'll only write non-interlaced - * GIF files (in the interests of speed, or something) - * - */ - - - -/***************************************************************** - * Portions of this code Copyright (C) 1989 by Michael Mauldin. - * Permission is granted to use this file in whole or in - * part for any purpose, educational, recreational or commercial, - * provided that this copyright notice is retained unchanged. - * This software is available to all free of charge by anonymous - * FTP and in the UUNET archives. - * - * - * Authors: Michael Mauldin (mlm@cs.cmu.edu) - * David Rowley (mgardi@watdcsu.waterloo.edu) - * - * Based on: compress.c - File compression ala IEEE Computer, June 1984. - * - * Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas) - * Jim McKie (decvax!mcvax!jim) - * Steve Davies (decvax!vax135!petsd!peora!srd) - * Ken Turkowski (decvax!decwrl!turtlevax!ken) - * James A. Woods (decvax!ihnp4!ames!jaw) - * Joe Orost (decvax!vax135!petsd!joe) - *****************************************************************/ - -#include "gifplot.h" -#include -typedef long int count_int; -typedef unsigned char byte; - -static int gif_error; -static unsigned char *op; -static int Width, Height; -static int curx, cury; -static int Interlace; - -static void putgifword(int); -static void compress(int, byte **, int); -static void output_GIF(int); -static void cl_block(void); -static void cl_hash(count_int); -static void char_init(void); -static void char_out(int); -static void flush_char(void); -static void *OutBuffer; -static int OutBufSize; -static FrameBuffer *GIF_frame; - -static unsigned char pc2nc[256],r1[256],g1[256],b1[256]; - -/*************************************************************/ -int FrameBuffer_makeGIF(FrameBuffer *f, ColorMap *c, void *outbuffer, unsigned int outbufsize) -{ - int RWidth, RHeight; - int LeftOfs, TopOfs; - int ColorMapSize, InitCodeSize, Background, BitsPerPixel; - int i,j,nc; - char *rmap, *gmap, *bmap; - char *cmap; - int count; - - Interlace = 0; - Background = 0; - OutBuffer = outbuffer; - OutBufSize = outbufsize; - GIF_frame = f; - cmap = (char *) c->cmap; - - op = (unsigned char *) outbuffer; - gif_error = 0; - for (i=0; i<256; i++) { pc2nc[i] = r1[i] = g1[i] = b1[i] = 0; } - - /* compute number of unique colors */ - nc = 0; - rmap = &cmap[0]; - gmap = &cmap[256]; - bmap = &cmap[512]; - - for (i=0; i<256; i++) { - /* see if color #i is already used */ - for (j=0; j= nc) break; - - BitsPerPixel = i; - - ColorMapSize = 1 << BitsPerPixel; - - RWidth = Width = f->width; - RHeight = Height = f->height; - LeftOfs = TopOfs = 0; - - if (BitsPerPixel <= 1) InitCodeSize = 2; - else InitCodeSize = BitsPerPixel; - - curx = 0; - cury = f->height - 1; - - strcpy((char *) op,"GIF89a"); /* Put in GIF magic number */ - op+=6; - putgifword(RWidth); /* screen descriptor */ - putgifword(RHeight); - - i = 0x80; /* Yes, there is a color map */ - i |= (8-1)<<4; /* OR in the color resolution (hardwired 8) */ - i |= (BitsPerPixel - 1); /* OR in the # of bits per pixel */ - *(op++) = i; - *(op++) = Background; /* background color */ - *(op++) = 0; - for (i=0; ipixels, f->width*f->height); - - *(op++) = 0; - *(op++) = ';'; - - count = (op - (unsigned char *) OutBuffer); - if (gif_error) return -1; - else return count; -} - -/******************************/ -static void putgifword(w) -int w; -{ - /* writes a 16-bit integer in GIF order (LSB first) */ - *(op++) = w & 0xff; - *(op++) = (w>>8)&0xff; -} - -/***********************************************************************/ - - -static unsigned long cur_accum = 0; -static int cur_bits = 0; - - - - -#define GP_BITS 12 /* BITS was already defined on some systems */ - -#define HSIZE 5003 /* 80% occupancy */ - -typedef unsigned char char_type; - -static int n_bits; /* number of bits/code */ -static int maxbits = GP_BITS; /* user settable max # bits/code */ -static int maxcode; /* maximum code, given n_bits */ -static int maxmaxcode = 1 << GP_BITS; /* NEVER generate this */ - -#define MAXCODE(n_bits) ( (1 << (n_bits)) - 1) - -static count_int *htab; -static unsigned short *codetab; -static int GIFOutBufSize; - -/* static count_int htab [HSIZE]; -static unsigned short codetab [HSIZE]; */ - -#define HashTabOf(i) htab[i] -#define CodeTabOf(i) codetab[i] - -static int hsize = HSIZE; /* for dynamic table sizing */ - -/* - * To save much memory, we overlay the table used by compress() with those - * used by decompress(). The tab_prefix table is the same size and type - * as the codetab. The tab_suffix table needs 2**BITS characters. We - * get this from the beginning of htab. The output stack uses the rest - * of htab, and contains characters. There is plenty of room for any - * possible stack (stack used to be 8000 characters). - */ - -#define tab_prefixof(i) CodeTabOf(i) -#define tab_suffixof(i) ((char_type *)(htab))[i] -#define de_stack ((char_type *)&tab_suffixof(1<= GIF_frame->width) { - curx = 0; - cury--; - } - len--; - - hshift = 0; - for ( fcode = (long) hsize; fcode < 65536L; fcode *= 2L ) - hshift++; - hshift = 8 - hshift; /* set hash code range bound */ - - hsize_reg = hsize; - cl_hash( (count_int) hsize_reg); /* clear hash table */ - - output_GIF(ClearCode); - while (len) { - c = pc2nc[data[cury][curx]]; - curx++; - if (curx >= GIF_frame->width) { - curx = 0; - cury--; - } - len--; - - fcode = (long) ( ( (long) c << maxbits) + ent); - i = (((int) c << hshift) ^ ent); /* xor hashing */ - - if ( HashTabOf (i) == fcode ) { - ent = CodeTabOf (i); - continue; - } - - if ( (long)HashTabOf (i) < 0 ) /* empty slot */ - goto nomatch; - - disp = hsize_reg - i; /* secondary hash (after G. Knott) */ - if ( i == 0 ) - disp = 1; - -probe: - if ( (i -= disp) < 0 ) - i += hsize_reg; - - if ( HashTabOf (i) == fcode ) { - ent = CodeTabOf (i); - continue; - } - - if ( (long)HashTabOf (i) >= 0 ) - goto probe; - -nomatch: - output_GIF(ent); - out_count++; - ent = c; - - if ( free_ent < maxmaxcode ) { - CodeTabOf (i) = free_ent++; /* code -> hashtable */ - HashTabOf (i) = fcode; - } - else - cl_block(); - - } - /* Put out the final code */ - output_GIF(ent); - output_GIF(EOFCode); -} - - -/***************************************************************** - * TAG( output_GIF ) - * - * Output the given code. - * Inputs: - * code: A n_bits-bit integer. If == -1, then EOF. This assumes - * that n_bits =< (long)wordsize - 1. - * Outputs: - * Outputs code to the file. - * Assumptions: - * Chars are 8 bits long. - * Algorithm: - * Maintain a BITS character long buffer (so that 8 codes will - * fit in it exactly). Use the VAX insv instruction to insert each - * code in turn. When the buffer fills up empty it and start over. - */ - -static -unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, - 0x001F, 0x003F, 0x007F, 0x00FF, - 0x01FF, 0x03FF, 0x07FF, 0x0FFF, - 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF }; - -static void output_GIF(code) -int code; -{ - cur_accum &= masks[cur_bits]; - - if (cur_bits > 0) - cur_accum |= ((long)code << cur_bits); - else - cur_accum = code; - - cur_bits += n_bits; - - while( cur_bits >= 8 ) { - char_out( (int) (cur_accum & 0xff) ); - cur_accum >>= 8; - cur_bits -= 8; - } - - /* - * If the next entry is going to be too big for the code size, - * then increase it, if possible. - */ - - if (free_ent > maxcode || clear_flg) { - - if( clear_flg ) { - maxcode = MAXCODE (n_bits = g_init_bits); - clear_flg = 0; - } - else { - n_bits++; - if ( n_bits == maxbits ) - maxcode = maxmaxcode; - else - maxcode = MAXCODE(n_bits); - } - } - - if( code == EOFCode ) { - /* At EOF, write the rest of the buffer */ - while( cur_bits > 0 ) { - char_out( (int)(cur_accum & 0xff) ); - cur_accum >>= 8; - cur_bits -= 8; - } - - flush_char(); - } -} - - -/********************************/ -static void cl_block () /* table clear for block compress */ -{ - /* Clear out the hash table */ - - cl_hash ( (count_int) hsize ); - free_ent = ClearCode + 2; - clear_flg = 1; - - output_GIF(ClearCode); -} - - -/********************************/ -static void cl_hash(hsize) /* reset code table */ -register count_int hsize; -{ - register count_int *htab_p = htab+hsize; - register long i; - register long m1 = -1; - - i = hsize - 16; - do { /* might use Sys V memset(3) here */ - *(htab_p-16) = m1; - *(htab_p-15) = m1; - *(htab_p-14) = m1; - *(htab_p-13) = m1; - *(htab_p-12) = m1; - *(htab_p-11) = m1; - *(htab_p-10) = m1; - *(htab_p-9) = m1; - *(htab_p-8) = m1; - *(htab_p-7) = m1; - *(htab_p-6) = m1; - *(htab_p-5) = m1; - *(htab_p-4) = m1; - *(htab_p-3) = m1; - *(htab_p-2) = m1; - *(htab_p-1) = m1; - htab_p -= 16; - } while ((i -= 16) >= 0); - - for ( i += 16; i > 0; i-- ) - *--htab_p = m1; -} - - -/****************************************************************************** - * - * GIF Specific routines - * - ******************************************************************************/ - -/* - * Number of characters so far in this 'packet' - */ -static int a_count; - -/* - * Set up the 'byte output' routine - */ -static void char_init() -{ - a_count = 0; -} - -/* - * Define the storage for the packet accumulator - */ -static char accum[ 256 ]; - -/* - * Add a character to the end of the current packet, and if it is 254 - * characters, flush the packet to disk. - */ -static void char_out(c) -int c; -{ - accum[ a_count++ ] = c; - if( a_count >= 254 ) - flush_char(); -} - -/* - * Flush the packet to disk, and reset the accumulator - */ -static void flush_char() -{ - if (gif_error) return; - if( a_count > 0 ) { - *(op++) = a_count; - memcpy(op,accum,a_count); - op+=a_count; - a_count = 0; - - if (op > (unsigned char *) ((char *) OutBuffer + (GIFOutBufSize - 2048))) { - gif_error = 1; - } - } -} - - -/* ---------------------------------------------------------------------- - int FrameBuffer_writeGIF(char *filename) - - Write a GIF file to filename - ----------------------------------------------------------------------- */ - -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename) { - - FILE *file; - void *buffer; - int nbytes; - int bufsize; - - file = fopen(filename,"wb"); - if (file == NULL) return -1; - - bufsize = (f->width*f->height*3)/2; - buffer = (void *) malloc(bufsize); - nbytes = FrameBuffer_makeGIF(f,c,buffer,bufsize); - if (nbytes == -1) { - free(buffer); - fclose(file); - return -1; - } - if (fwrite(buffer,nbytes,1,file) != 1) { - free(buffer); - fclose(file); - return -1; - } - fclose(file); - free(buffer); - return 0; -} - - - - - diff --git a/Examples/GIFPlot/Lib/matrix.c b/Examples/GIFPlot/Lib/matrix.c deleted file mode 100644 index ef0cf3aab..000000000 --- a/Examples/GIFPlot/Lib/matrix.c +++ /dev/null @@ -1,343 +0,0 @@ -/* ----------------------------------------------------------------------------- - * matrix.c - * - * Some 4x4 matrix operations - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define MATRIX -#include "gifplot.h" -#include - -/* ------------------------------------------------------------------------ - Matrix new_Matrix() - - Create a new 4x4 matrix. - ------------------------------------------------------------------------ */ -Matrix -new_Matrix() { - Matrix m; - m = (Matrix) malloc(16*sizeof(double)); - return m; -} - -/* ------------------------------------------------------------------------ - delete_Matrix(Matrix *m); - - Destroy a matrix - ------------------------------------------------------------------------ */ - -void -delete_Matrix(Matrix m) { - if (m) - free((char *) m); -} - -/* ------------------------------------------------------------------------ - Matrix Matrix_copy(Matrix a) - - Makes a copy of matrix a and returns it. - ------------------------------------------------------------------------ */ - -Matrix Matrix_copy(Matrix a) { - int i; - Matrix r = 0; - if (a) { - r = new_Matrix(); - if (r) { - for (i = 0; i < 16; i++) - r[i] = a[i]; - } - } - return r; -} - -/* ------------------------------------------------------------------------ - Matrix_multiply(Matrix a, Matrix b, Matrix c) - - Multiplies a*b = c - c may be one of the source matrices - ------------------------------------------------------------------------ */ -void -Matrix_multiply(Matrix a, Matrix b, Matrix c) { - double temp[16]; - int i,j,k; - - for (i =0; i < 4; i++) - for (j = 0; j < 4; j++) { - temp[i*4+j] = 0.0; - for (k = 0; k < 4; k++) - temp[i*4+j] += a[i*4+k]*b[k*4+j]; - } - for (i = 0; i < 16; i++) - c[i] = temp[i]; -} - -/* ------------------------------------------------------------------------ - Matrix_identity(Matrix a) - - Puts an identity matrix in matrix a - ------------------------------------------------------------------------ */ - -void -Matrix_identity(Matrix a) { - int i; - for (i = 0; i < 16; i++) a[i] = 0; - a[0] = 1; - a[5] = 1; - a[10] = 1; - a[15] = 1; -} - -/* ------------------------------------------------------------------------ - Matrix_zero(Matrix a) - - Puts a zero matrix in matrix a - ------------------------------------------------------------------------ */ -void -Matrix_zero(Matrix a) { - int i; - for (i = 0; i < 16; i++) a[i] = 0; -} - -/* ------------------------------------------------------------------------ - Matrix_transpose(Matrix a, Matrix result) - - Transposes matrix a and puts it in result. - ------------------------------------------------------------------------ */ -void -Matrix_transpose(Matrix a, Matrix result) { - double temp[16]; - int i,j; - - for (i = 0; i < 4; i++) - for (j = 0; j < 4; j++) - temp[4*i+j] = a[4*j+i]; - - for (i = 0; i < 16; i++) - result[i] = temp[i]; -} - - -/* ------------------------------------------------------------------------ - Matrix_gauss(Matrix a, Matrix b) - - Solves ax=b for x, using Gaussian elimination. Destroys a. - Really only used for calculating inverses of 4x4 transformation - matrices. - ------------------------------------------------------------------------ */ - -void Matrix_gauss(Matrix a, Matrix b) { - int ipiv[4], indxr[4], indxc[4]; - int i,j,k,l,ll; - int irow=0, icol=0; - double big, pivinv; - double dum; - for (j = 0; j < 4; j++) - ipiv[j] = 0; - for (i = 0; i < 4; i++) { - big = 0; - for (j = 0; j < 4; j++) { - if (ipiv[j] != 1) { - for (k = 0; k < 4; k++) { - if (ipiv[k] == 0) { - if (fabs(a[4*j+k]) >= big) { - big = fabs(a[4*j+k]); - irow = j; - icol = k; - } - } else if (ipiv[k] > 1) - return; /* Singular matrix */ - } - } - } - ipiv[icol] = ipiv[icol]+1; - if (irow != icol) { - for (l = 0; l < 4; l++) { - dum = a[4*irow+l]; - a[4*irow+l] = a[4*icol+l]; - a[4*icol+l] = dum; - } - for (l = 0; l < 4; l++) { - dum = b[4*irow+l]; - b[4*irow+l] = b[4*icol+l]; - b[4*icol+l] = dum; - } - } - indxr[i] = irow; - indxc[i] = icol; - if (a[4*icol+icol] == 0) return; - pivinv = 1.0/a[4*icol+icol]; - a[4*icol+icol] = 1.0; - for (l = 0; l < 4; l++) - a[4*icol+l] = a[4*icol+l]*pivinv; - for (l = 0; l < 4; l++) - b[4*icol+l] = b[4*icol+l]*pivinv; - for (ll = 0; ll < 4; ll++) { - if (ll != icol) { - dum = a[4*ll+icol]; - a[4*ll+icol] = 0; - for (l = 0; l < 4; l++) - a[4*ll+l] = a[4*ll+l] - a[4*icol+l]*dum; - for (l = 0; l < 4; l++) - b[4*ll+l] = b[4*ll+l] - b[4*icol+l]*dum; - } - } - } - for (l = 3; l >= 0; l--) { - if (indxr[l] != indxc[l]) { - for (k = 0; k < 4; k++) { - dum = a[4*k+indxr[l]]; - a[4*k+indxr[l]] = a[4*k+indxc[l]]; - a[4*k+indxc[l]] = dum; - } - } - } -} - -/* ------------------------------------------------------------------------ - Matrix_invert(Matrix a, Matrix inva) - - Inverts Matrix a and places the result in inva. - Relies on the Gaussian Elimination code above. (See Numerical recipes). - ------------------------------------------------------------------------ */ -void -Matrix_invert(Matrix a, Matrix inva) { - - double temp[16]; - int i; - - for (i = 0; i < 16; i++) - temp[i] = a[i]; - Matrix_identity(inva); - Matrix_gauss(temp,inva); -} - -/* ------------------------------------------------------------------------ - Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t) - - Transform a vector. a*r ----> t - ------------------------------------------------------------------------ */ - -void Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t) { - - double rx, ry, rz, rw; - - rx = r->x; - ry = r->y; - rz = r->z; - rw = r->w; - t->x = a[0]*rx + a[1]*ry + a[2]*rz + a[3]*rw; - t->y = a[4]*rx + a[5]*ry + a[6]*rz + a[7]*rw; - t->z = a[8]*rx + a[9]*ry + a[10]*rz + a[11]*rw; - t->w = a[12]*rx + a[13]*ry + a[14]*rz + a[15]*rw; -} - -/* ------------------------------------------------------------------------ - Matrix_transform4(Matrix a, double x, double y, double z, double w, GL_Vector *t) - - Transform a vector from a point specified as 4 doubles - ------------------------------------------------------------------------ */ - -void Matrix_transform4(Matrix a, double rx, double ry, double rz, double rw, - GL_Vector *t) { - - t->x = a[0]*rx + a[1]*ry + a[2]*rz + a[3]*rw; - t->y = a[4]*rx + a[5]*ry + a[6]*rz + a[7]*rw; - t->z = a[8]*rx + a[9]*ry + a[10]*rz + a[11]*rw; - t->w = a[12]*rx + a[13]*ry + a[14]*rz + a[15]*rw; -} - -/* --------------------------------------------------------------------- - Matrix_translate(Matrix a, double tx, double ty, double tz) - - Put a translation matrix in Matrix a - ---------------------------------------------------------------------- */ - -void Matrix_translate(Matrix a, double tx, double ty, double tz) { - Matrix_identity(a); - a[3] = tx; - a[7] = ty; - a[11] = tz; - a[15] = 1; -} - -/* ----------------------------------------------------------------------- - Matrix_rotatex(Matrix a, double deg) - - Produce an x-rotation matrix for given angle in degrees. - ----------------------------------------------------------------------- */ -void -Matrix_rotatex(Matrix a, double deg) { - double r; - - r = 3.1415926*deg/180.0; - Matrix_zero(a); - a[0] = 1.0; - a[5] = cos(r); - a[6] = -sin(r); - a[9] = sin(r); - a[10] = cos(r); - a[15] = 1.0; -} - -/* ----------------------------------------------------------------------- - Matrix_rotatey(Matrix a, double deg) - - Produce an y-rotation matrix for given angle in degrees. - ----------------------------------------------------------------------- */ -void -Matrix_rotatey(Matrix a, double deg) { - double r; - - r = 3.1415926*deg/180.0; - Matrix_zero(a); - a[0] = cos(r); - a[2] = sin(r); - a[5] = 1.0; - a[8] = -sin(r); - a[10] = cos(r); - a[15] = 1; - -} -/* ----------------------------------------------------------------------- - Matrix_RotateZ(Matrix a, double deg) - - Produce an z-rotation matrix for given angle in degrees. - ----------------------------------------------------------------------- */ -void -Matrix_rotatez(Matrix a, double deg) { - double r; - - r = 3.1415926*deg/180.0; - Matrix_zero(a); - a[0] = cos(r); - a[1] = -sin(r); - a[4] = sin(r); - a[5] = cos(r); - a[10] = 1.0; - a[15] = 1.0; -} - - -/* A debugging routine */ - -void Matrix_set(Matrix a, int i, int j, double val) { - a[4*j+i] = val; -} - -void Matrix_print(Matrix a) { - int i,j; - for (i = 0; i < 4; i++) { - for (j = 0; j < 4; j++) { - fprintf(stdout,"%10f ",a[4*i+j]); - } - fprintf(stdout,"\n"); - } - fprintf(stdout,"\n"); -} - diff --git a/Examples/GIFPlot/Lib/pixmap.c b/Examples/GIFPlot/Lib/pixmap.c deleted file mode 100644 index a55cf041f..000000000 --- a/Examples/GIFPlot/Lib/pixmap.c +++ /dev/null @@ -1,159 +0,0 @@ -/* ----------------------------------------------------------------------------- - * pixmap.c - * - * Pixel maps (i.e., bitmaps) - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define PIXMAP -#include "gifplot.h" - -/* ----------------------------------------------------------------------- - PixMap *new_PixMap(int width, int height, int centerx, int centery) - - Create a new pixmap of given size - ----------------------------------------------------------------------- */ -PixMap *new_PixMap(int width, int height, int centerx, int centery) { - PixMap *pm; - if ((width > 0) && (height > 0)) { - pm = (PixMap *) malloc(sizeof(PixMap)); - pm->width = width; - pm->height = height; - pm->centerx = centerx; - pm->centery = centery; - pm->map = (int *) malloc(height*width*sizeof(int)); - return pm; - } - return (PixMap *) 0; -} - -/* -------------------------------------------------------------------------- - void delete_PixMap(PixMap *pm) - - Destroy a pixmap - -------------------------------------------------------------------------- */ - -void delete_PixMap(PixMap *pm) { - if (pm) { - free((char *) pm->map); - free((char *) pm); - } -} - -/* --------------------------------------------------------------------------- - void PixMap_set(PixMap *pm, int x, int y, int pix) - - Set a pixel in the bitmap - --------------------------------------------------------------------------- */ -void -PixMap_set(PixMap *pm, int x, int y, int pix) { - if ((x < 0) || (x>=pm->width)) return; - if ((y < 0) || (y>=pm->height)) return; - - pm->map[pm->width*y + x] = pix; -} - -/* ----------------------------------------------------------------------------- - void FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor) - - Draw a pixmap onto the framebuffer. This is somewhat optimized for speed. - ------------------------------------------------------------------------------ */ - -void -FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor) { - - int startx, starty; /* Starting location on framebuffer */ - int startpixx = 0, startpixy = 0; /* Starting location in pixmap */ - int endx, endy; /* Ending location on framebuffer */ - int i,j, px, py; - int c; - - startx = x - pm->centerx; - starty = y + pm->centery; - endx = startx + pm->width; - endy = starty - pm->height; - - /* Figure out if we need to clip */ - - if (startx < f->xmin) { - startpixx = f->xmin - startx; - startx = f->xmin; - } - if (starty >= f->ymax) { - startpixy = starty - f->ymax; - starty = f->ymax-1; - } - if (endx >= f->xmax) { - endx = f->xmax-1; - } - if (endy < f->ymin) { - endy = f->ymin; - } - py = startpixy; - for (j = starty; j >= endy; j--) { - px = startpixx; - for (i = startx; i < endx; i++) { - c = pm->map[py*pm->width + px]; - switch (c) { - case GIFPLOT_FOREGROUND: - f->pixels[j][i] = fgcolor; - break; - case GIFPLOT_BACKGROUND: - f->pixels[j][i] = bgcolor; - break; - default: - break; - } - px++; - } - py++; - } -} - -/************************************************************************** - * Some common PixMaps (for plotting) - * - **************************************************************************/ - -int _SQUARE_MAP[] = { - 0,1,1,1,1,1,1,1, - 0,1,1,1,1,1,1,1, - 0,1,1,1,1,1,1,1, - 0,1,1,1,1,1,1,1, - 0,1,1,1,1,1,1,1, - 0,1,1,1,1,1,1,1, - 0,1,1,1,1,1,1,1, - 0,0,0,0,0,0,0,0 }; - -PixMap PixMap_SQUARE = { 8,8,4,4, _SQUARE_MAP}; - -int _TRIANGLE_MAP[] = { - 0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0, - 0,0,1,1,1,0,0,0, - 0,0,1,1,1,0,0,0, - 0,1,1,1,1,1,0,0, - 0,1,1,1,1,1,0,0, - 1,1,1,1,1,1,1,0, - 0,0,0,0,0,0,0,0 }; - -PixMap PixMap_TRIANGLE = { 8,8,4,4,_TRIANGLE_MAP}; - -int _CROSS_MAP[] = { - 0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0, - 1,1,1,1,1,1,1,0, - 0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0, - 0,0,0,0,0,0,0,0 }; - -PixMap PixMap_CROSS = { 8,8,4,4,_CROSS_MAP}; - - - diff --git a/Examples/GIFPlot/Lib/plot2d.c b/Examples/GIFPlot/Lib/plot2d.c deleted file mode 100644 index e78107bf1..000000000 --- a/Examples/GIFPlot/Lib/plot2d.c +++ /dev/null @@ -1,445 +0,0 @@ -/* ----------------------------------------------------------------------------- - * plot2d.c - * - * 2-Dimensional plotting - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define PLOT2D - -#include "gifplot.h" - -/* ------------------------------------------------------------------------ - Plot2D *new_Plot2D(FrameBuffer *frame, xmin, ymin, xmax, ymax) - - Create a new 2D plot with given minimum and maximum coordinates. - ------------------------------------------------------------------------ */ -Plot2D *new_Plot2D(FrameBuffer *frame,double xmin,double ymin,double xmax,double ymax) { - Plot2D *p2; - if (frame) { - if (xmax <= xmin) return (Plot2D *) 0; - if (ymax <= ymin) return (Plot2D *) 0; - p2 = (Plot2D *) malloc(sizeof(Plot2D)); - p2->frame = frame; - p2->xmin = xmin; - p2->ymin = ymin; - p2->xmax = xmax; - p2->ymax = ymax; - p2->view_xmin = 0; - p2->view_xmax = frame->width; - p2->view_ymin = 0; - p2->view_ymax = frame->height; - p2->xscale = LINEAR; - p2->yscale = LINEAR; - p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); - p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); - return p2; - } - return (Plot2D *) 0; -} - -/* ---------------------------------------------------------------------------- - delete_Plot2D(Plot2D *p2) - - Delete a 2D plot - ---------------------------------------------------------------------------- */ -void -delete_Plot2D(Plot2D *p2) { - if (p2) - free((char *) p2); -} - -/* ----------------------------------------------------------------------------- - Plot2D *Plot2D_copy(Plot2D *p2) - - Makes a copy of the Plot2D data structure. - ----------------------------------------------------------------------------- */ - -Plot2D *Plot2D_copy(Plot2D *p2) { - Plot2D *c2; - if (p2) { - c2 = (Plot2D *) malloc(sizeof(Plot2D)); - if (c2) { - c2->frame = p2->frame; - c2->view_xmin = p2->view_xmin; - c2->view_ymin = p2->view_ymin; - c2->view_xmax = p2->view_xmax; - c2->view_ymax = p2->view_ymax; - c2->xmin = p2->xmin; - c2->ymin = p2->ymin; - c2->xmax = p2->xmax; - c2->ymax = p2->ymax; - c2->xscale = p2->xscale; - c2->yscale = p2->yscale; - c2->dx = p2->dx; - c2->dy = p2->dy; - } - return c2; - } else { - return (Plot2D *) 0; - } -} - -/* ----------------------------------------------------------------------------- - Plot2D_clear(Plot2D *p2, Pixel c) - - Clear the region assigned to this plot to the given color. - -------------------------------------------------------------------------- */ - -void Plot2D_clear(Plot2D *p2, Pixel c) { - int i,j; - for (i = p2->view_xmin; i < p2->view_xmax; i++) - for (j = p2->view_ymin; j < p2->view_ymax; j++) { - p2->frame->pixels[j][i] = c; - } -} - -/* ------------------------------------------------------------------------------ - Plot2D_setview - - Sets the plot region on the framebuffer - ------------------------------------------------------------------------------ */ - -void -Plot2D_setview(Plot2D *p2, int vxmin, int vymin, int vxmax, int vymax) { - if (p2) { - p2->view_xmin = vxmin; - p2->view_ymin = vymin; - p2->view_xmax = vxmax; - p2->view_ymax = vymax; - p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); - p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); - FrameBuffer_setclip(p2->frame,vxmin,vymin,vxmax,vymax); - } -} - -/* ------------------------------------------------------------------------------- - Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax) - - Sets the plotting range. - ------------------------------------------------------------------------------- */ - -void -Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax) { - if (p2) { - p2->xmin = xmin; - p2->ymin = ymin; - p2->xmax = xmax; - p2->ymax = ymax; - p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); - p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); - } -} - -/* ------------------------------------------------------------------------------- - Plot2D_setscale(Plot2D *p2, int xscale, int yscale) - - Sets the plotting scaling method - ------------------------------------------------------------------------------- */ - -void -Plot2D_setscale(Plot2D *p2, int xscale, int yscale) { - if (p2) { - p2->xscale = xscale; - p2->yscale = yscale; - } -} - -/* ---------------------------------------------------------------------------- - Plot2D_transform(Plot2D *p2, double x, double y, int *px, int *py) - - Transforms x,y into screen coordinates px and py. Result is returned - in px and py. Rounds to the nearest pixel instead of truncating. - ----------------------------------------------------------------------------- */ - -void -Plot2D_transform(Plot2D *p2, double x, double y, int *px, int *py) { - if (p2) { - *px = p2->view_xmin + (int) (p2->dx*(x-p2->xmin) + 0.5); - *py = p2->view_ymin + (int) (p2->dy*(y-p2->ymin) + 0.5); - } -} - -/* ------------------------------------------------------------------------------- - Plot2D_plot(Plot2D *p2, double x, double y, Pixel color) - - Plot a 2D Point of a given color - ------------------------------------------------------------------------------- */ -void -Plot2D_plot(Plot2D *p2, double x, double y, Pixel color) { - int px, py; - - Plot2D_transform(p2,x,y,&px,&py); - FrameBuffer_plot(p2->frame, px, py, color); -} - -/* ------------------------------------------------------------------------------- - Plot2D_box(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel Color) - - Plot an outline box on the 2D plot - ------------------------------------------------------------------------------- */ -void -Plot2D_box(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color) { - int ix1, ix2,iy1, iy2; - - Plot2D_transform(p2,x1,y1,&ix1,&iy1); - Plot2D_transform(p2,x2,y2,&ix2,&iy2); - FrameBuffer_box(p2->frame,ix1,iy1,ix2,iy2,color); -} - -/* ------------------------------------------------------------------------------- - Plot2D_solidbox(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel Color) - - Plot a solid box box on the 2D plot - ------------------------------------------------------------------------------- */ -void -Plot2D_solidbox(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color) { - int ix1, ix2,iy1, iy2; - - Plot2D_transform(p2,x1,y1,&ix1,&iy1); - Plot2D_transform(p2,x2,y2,&ix2,&iy2); - FrameBuffer_solidbox(p2->frame,ix1,iy1,ix2,iy2,color); -} - -/* ------------------------------------------------------------------------------- - Plot2D_interpbox(Plot2D *p2, double x1, double y1, double x2, double y2, - Pixel c1, Pixel c2, Pixel c3, Pixel c4) - - Plot a color-interpolated box on the 2D plot - ------------------------------------------------------------------------------- */ -void -Plot2D_interpbox(Plot2D *p2, double x1, double y1,double x2, double y2, - Pixel c1, Pixel c2, Pixel c3, Pixel c4) { - int ix1, ix2,iy1, iy2; - - Plot2D_transform(p2,x1,y1,&ix1,&iy1); - Plot2D_transform(p2,x2,y2,&ix2,&iy2); - FrameBuffer_interpbox(p2->frame,ix1,iy1,ix2,iy2,c1,c2,c3,c4); -} - -/* ------------------------------------------------------------------------------- - Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color) - - Make an outline circle on the 2D plot. - ------------------------------------------------------------------------------- */ -void -Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color) { - int ix, iy, ir; - - Plot2D_transform(p2,x,y,&ix,&iy); - ir = p2->dx * radius; /* This is really incorrect. Will need ellipse */ - if (ir > 1) - FrameBuffer_circle(p2->frame,ix,iy,ir,color); - else - FrameBuffer_plot(p2->frame,ix,iy,color); - -} - -/* ------------------------------------------------------------------------------- - Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color) - - Make an solid circle on the 2D plot. - ------------------------------------------------------------------------------- */ -void -Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color) { - int ix, iy, ir; - - Plot2D_transform(p2,x,y,&ix,&iy); - ir = p2->dx * radius; /* This is really incorrect. Will need ellipse */ - if (ir > 1) - FrameBuffer_solidcircle(p2->frame,ix,iy,ir,color); - else - FrameBuffer_plot(p2->frame,ix,iy,color); -} - -/* ------------------------------------------------------------------------------- - Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color) - - Draw a line - ------------------------------------------------------------------------------- */ - -void -Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color) { - int ix1, ix2, iy1, iy2; - - Plot2D_transform(p2,x1,y1,&ix1,&iy1); - Plot2D_transform(p2,x2,y2,&ix2,&iy2); - FrameBuffer_line(p2->frame,ix1,iy1,ix2,iy2,color); -} - - - -/* ------------------------------------------------------------------------------- - Plot2D_start(Plot2D *p2) - - This should be called before starting to make a 2D plot. It will change - the viewport coordinates for the framebuffer and do other stuff. - ------------------------------------------------------------------------------- */ - -void Plot2D_start(Plot2D *p2) { - if (p2) { - FrameBuffer_setclip(p2->frame, p2->view_xmin,p2->view_ymin,p2->view_xmax, p2->view_ymax); - p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); - p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); - } -} - -/* -------------------------------------------------------------------------- - void Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor) - - Draw a pixel map at the given coordinates. (Used for putting symbols on 2D - plots). - -------------------------------------------------------------------------- */ -void -Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor) { - int ix, iy; - - Plot2D_transform(p2,x,y,&ix,&iy); - FrameBuffer_drawpixmap(p2->frame,pm,ix,iy,color,bgcolor); -} - -/* ---------------------------------------------------------------------------- - void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel color) - - Draw an X axis bar at location x,y with ticks spaced every xtick units. - Ticks are spaced starting at "x" - ----------------------------------------------------------------------------- */ - -void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel color) { - int ix, iy,iy2; - double xt; - - /* Draw a line fox the axis */ - - Plot2D_line(p2,p2->xmin,y,p2->xmax,y,color); - xt = x; - while (xt >= p2->xmin) { - Plot2D_transform(p2,xt,y,&ix,&iy); - iy2 = iy+ticklength; - iy = iy-ticklength; - FrameBuffer_line(p2->frame,ix,iy,ix,iy2,color); - xt = xt - xtick; - } - xt = x + xtick; - while (xt < p2->xmax) { - Plot2D_transform(p2,xt,y,&ix,&iy); - iy2 = iy+ticklength; - iy = iy-ticklength; - FrameBuffer_line(p2->frame,ix,iy,ix,iy2,color); - xt = xt + xtick; - } -} - - -/* ---------------------------------------------------------------------------- - void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel c) - - Draw an Y axis bar at location x,y with ticks spaced every xtick units. - Ticks are spaced starting at "y" - ----------------------------------------------------------------------------- */ - -void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel color) { - int ix, iy, ix2; - double yt; - - /* Draw a line fox the axis */ - - Plot2D_line(p2,x,p2->ymin,x,p2->ymax,color); - yt = y; - while (yt >= p2->ymin) { - Plot2D_transform(p2,x,yt,&ix,&iy); - ix2 = ix+ticklength; - ix = ix-ticklength; - FrameBuffer_line(p2->frame,ix,iy,ix2,iy,color); - yt = yt - ytick; - } - yt = y + ytick; - while (yt < p2->ymax) { - Plot2D_transform(p2,x,yt,&ix,&iy); - ix2 = ix+ticklength; - ix = ix-ticklength; - FrameBuffer_line(p2->frame,ix,iy,ix2,iy,color); - yt = yt + ytick; - } -} - - -/* ------------------------------------------------------------------------- - Plot2D_triangle(Plot2D *p2, double x1, double y1, - double x2, double y2, - double x3, double y3, - Pixel fillcolor) - - This function draws a 2D outline triangle. - -------------------------------------------------------------------------- */ - -void Plot2D_triangle(Plot2D *p2, double x1, double y1, - double x2, double y2, - double x3, double y3, Pixel color) { - - Plot2D_line(p2,x1,y1,x2,y2,color); - Plot2D_line(p2,x2,y2,x3,y3,color); - Plot2D_line(p2,x3,y3,x1,y1,color); - -} - - -/* ------------------------------------------------------------------------- - Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, - double x2, double y2, - double x3, double y3, - Pixel color) - - This function draws a 2D filled triangle. Can be used to - draw other primitives such as quadralaterals, etc... - - -------------------------------------------------------------------------- */ - -void Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, - - double x2, double y2, - double x3, double y3, Pixel color) { - - int tx1, tx2, tx3, ty1, ty2, ty3; - - /* Transform the three points into screen coordinates */ - - Plot2D_transform(p2,x1,y1,&tx1,&ty1); - Plot2D_transform(p2,x2,y2,&tx2,&ty2); - Plot2D_transform(p2,x3,y3,&tx3,&ty3); - - FrameBuffer_solidtriangle(p2->frame,tx1,ty1,tx2,ty2,tx3,ty3,color); - -} - -/* ------------------------------------------------------------------------- - Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, - double x2, double y2, Pixel c2, - double x3, double y3, Pixel c3); - - This function draws a 2D filled triangle with color interpolation. - Can be used to draw other primitives such as quadralaterals, etc... - -------------------------------------------------------------------------- */ - -void Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, - double x2, double y2, Pixel c2, - double x3, double y3, Pixel c3) { - - int tx1, tx2, tx3, ty1, ty2, ty3; - - /* Transform the three points into screen coordinates */ - - Plot2D_transform(p2,x1,y1,&tx1,&ty1); - Plot2D_transform(p2,x2,y2,&tx2,&ty2); - Plot2D_transform(p2,x3,y3,&tx3,&ty3); - - FrameBuffer_interptriangle(p2->frame,tx1,ty1,c1,tx2,ty2,c2,tx3,ty3,c3); - -} - - - diff --git a/Examples/GIFPlot/Lib/plot3d.c b/Examples/GIFPlot/Lib/plot3d.c deleted file mode 100644 index 387e420e2..000000000 --- a/Examples/GIFPlot/Lib/plot3d.c +++ /dev/null @@ -1,2181 +0,0 @@ -/* ----------------------------------------------------------------------------- - * plot3d.c - * - * Three-dimensional plotting. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#define PLOT3D -#include "gifplot.h" -#include -#include - -#define ORTHO 1 -#define PERSPECTIVE 2 -/* ------------------------------------------------------------------------ - Plot3D *new_Plot3D(FrameBuffer *f, double xmin, double ymin, double zmin, - double xmax, double ymax, double zmax) - - Creates a new 3D plot. Min and max coordinates are primarily used to - pick some default parameters. Returns NULL on failure - ------------------------------------------------------------------------- */ - -Plot3D *new_Plot3D(FrameBuffer *f, double xmin, double ymin, double zmin, - double xmax, double ymax, double zmax) { - - Plot3D *p3; - void Plot3D_maketransform(Plot3D *p3); - - /* Check to make sure the framebuffer and min/max parameters are valid */ - - if (!f) return (Plot3D *) 0; - if ((xmin > xmax) || (ymin > ymax) || (zmin > zmax)) return (Plot3D *) 0; - - p3 = (Plot3D *) malloc(sizeof(Plot3D)); - p3->frame = f; - p3->xmin = xmin; - p3->ymin = ymin; - p3->zmin = zmin; - p3->xmax = xmax; - p3->ymax = ymax; - p3->zmax = zmax; - - /* Set view region to the entire size of the framebuffer */ - - p3->view_xmin = 0; - p3->view_ymin = 0; - p3->view_xmax = f->width; - p3->view_ymax = f->height; - p3->width = f->width; - p3->height = f->height; - - /* Calculate a center point based off the min and max coordinates given */ - - p3->xcenter = (xmax - xmin)/2.0 + xmin; - p3->ycenter = (ymax - ymin)/2.0 + ymin; - p3->zcenter = (zmax - zmin)/2.0 + zmin; - - /* Calculate the aspect ratio of the viewing region */ - - p3->aspect = (double) f->width/(double) f->height; - - /* Set default view parameters */ - p3->xshift = 1.0; - p3->yshift = 1.0; - p3->zoom = 0.5; - p3->fovy = 40.0; /* 40 degree field of view */ - - /* Create matrices */ - - p3->model_mat = new_Matrix(); - p3->view_mat = new_Matrix(); - p3->center_mat = new_Matrix(); - p3->fullmodel_mat = new_Matrix(); - p3->trans_mat = new_Matrix(); - p3->pers_mode = ORTHO; - - FrameBuffer_zresize(p3->frame,p3->width, p3->height); - Matrix_identity(p3->view_mat); - Matrix_identity(p3->model_mat); - Matrix_translate(p3->center_mat, -p3->xcenter,-p3->ycenter,-p3->zcenter); - Plot3D_maketransform(p3); - return p3; -} - -/* --------------------------------------------------------------------- - delete_Plot3D(Plot3D *p3) - - Deletes a 3D plot - --------------------------------------------------------------------- */ - -void delete_Plot3D(Plot3D *p3) { - if (p3) { - delete_Matrix(p3->view_mat); - delete_Matrix(p3->model_mat); - delete_Matrix(p3->trans_mat); - free((char *) p3); - } -} - -/* --------------------------------------------------------------------- - Plot3D *Plot3D_copy(Plot3D *p3) - - This makes a copy of the 3D plot structure and returns a pointer to it. - --------------------------------------------------------------------- */ - -Plot3D *Plot3D_copy(Plot3D *p3) { - Plot3D *c3; - if (p3) { - c3 = (Plot3D *) malloc(sizeof(Plot3D)); - if (c3) { - c3->frame = p3->frame; - c3->view_xmin = p3->view_xmin; - c3->view_ymin = p3->view_ymin; - c3->view_xmax = p3->view_xmax; - c3->view_ymax = p3->view_ymax; - c3->xmin = p3->xmin; - c3->ymin = p3->ymin; - c3->zmin = p3->zmin; - c3->xmax = p3->xmax; - c3->ymax = p3->ymax; - c3->zmax = p3->zmax; - c3->xcenter = p3->xcenter; - c3->ycenter = p3->ycenter; - c3->zcenter = p3->zcenter; - c3->fovy = p3->fovy; - c3->aspect = p3->aspect; - c3->znear = p3->znear; - c3->zfar = p3->zfar; - c3->center_mat = Matrix_copy(p3->center_mat); - c3->model_mat = Matrix_copy(p3->model_mat); - c3->view_mat = Matrix_copy(p3->view_mat); - c3->fullmodel_mat = Matrix_copy(p3->fullmodel_mat); - c3->trans_mat = Matrix_copy(p3->trans_mat); - c3->lookatz = p3->lookatz; - c3->xshift = p3->xshift; - c3->yshift = p3->yshift; - c3->zoom = p3->zoom; - c3->width = p3->width; - c3->height = p3->height; - c3->pers_mode = p3->pers_mode; - } - return c3; - } else { - return (Plot3D *) 0; - } -} - -/* ---------------------------------------------------------------------- - Plot3D_clear(Plot3D *p3, Pixel bgcolor) - - Clear the pixel and zbuffer only for the view region of this image. - ---------------------------------------------------------------------- */ -void -Plot3D_clear(Plot3D *p3, Pixel bgcolor) { - int i,j; - - for (i = p3->view_xmin; i < p3->view_xmax; i++) - for (j = p3->view_ymin; j < p3->view_ymax; j++) { - p3->frame->pixels[j][i] = bgcolor; - p3->frame->zbuffer[j][i] = ZMIN; - } -} - -/* --------------------------------------------------------------------- - Plot3D_maketransform(Plot3D *p3) - - This function builds the total 3D transformation matrix from a - collection of components. - - Trans = View * Rotation * Center - - Where View is the viewing transformation matrix, Rotation is the - model rotation matrix, Center is the translation matrix used to - center the Model at the origin. - --------------------------------------------------------------------- */ - -void -Plot3D_maketransform(Plot3D *p3) { - - Matrix_multiply(p3->model_mat,p3->center_mat, p3->fullmodel_mat); - Matrix_multiply(p3->view_mat,p3->fullmodel_mat, p3->trans_mat); -} - -/* --------------------------------------------------------------------- - Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar) - - Sets up the perspective viewing transformation. Assumes "lookat" - has already been called. - --------------------------------------------------------------------- */ - -void -Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar) { - double theta; - double mat[16]; - - p3->fovy = fovy; - p3->znear = znear; - p3->zfar = zfar; - - theta = 3.1415926*fovy/180.0; - - Matrix_identity(mat); - mat[0] = cos(theta/2.0)/(sin(theta/2.0)*p3->aspect); - mat[5] = cos(theta/2.0)/(sin(theta/2.0)); - mat[10] = -(zfar + znear)/(zfar-znear); - mat[14] = -1.0; - mat[11] = -(2*zfar*znear)/(zfar - znear); - mat[15] = 0.0; - - /* Update the view transformation matrix */ - - Matrix_multiply(mat,p3->view_mat,p3->view_mat); - - /* Update the global transformation matrix */ - - Plot3D_maketransform(p3); - p3->pers_mode = PERSPECTIVE; - -} - -/* --------------------------------------------------------------------- - Plot3D_lookat(Plot3D *p3, double z) - - A greatly simplified version of (lookat). Specifies the position - of the viewpoint. (can be used for moving image in or out). - - Destroys the current viewing transformation matrix, so it will have - to be recalculated. - --------------------------------------------------------------------- */ - -void -Plot3D_lookat(Plot3D *p3, double z) { - if (p3) { - Matrix_translate(p3->view_mat, 0,0,-z); - p3->lookatz = z; - Plot3D_maketransform(p3); - } -} - -/* ------------------------------------------------------------------------- - Plot3D_autoperspective(Plot3D *p3, double fovy) - - Automatically figures out a semi-decent viewpoint given the - min,max parameters currently set for this image - ------------------------------------------------------------------------- */ - -void -Plot3D_autoperspective(Plot3D *p3, double fovy) { - - /* Make a perspective transformation matrix for this system */ - - double zfar; - double znear; - double d, dmax; - double cx,cy,cz; - double xmin,xmax,ymin,ymax,zmin,zmax; - - xmin = p3->xmin; - ymin = p3->ymin; - zmin = p3->zmin; - xmax = p3->xmax; - ymax = p3->ymax; - zmax = p3->zmax; - cx = p3->xcenter; - cy = p3->ycenter; - cz = p3->zcenter; - - /* Calculate longest point from center point */ - - dmax = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); - d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); - if (d > dmax) dmax = d; - d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); - if (d > dmax) dmax = d; - d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); - if (d > dmax) dmax = d; - d = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - - dmax = sqrt(dmax); - d = p3->lookatz; - - znear = d - dmax; - zfar = znear+1.5*dmax; - Plot3D_perspective(p3, fovy,znear,zfar); - -} - - -/* --------------------------------------------------------------------- - Plot3D_ortho(Plot3D *p3, double left, double right, double bottom, double top) - - Sets up an orthographic viewing transformation. - --------------------------------------------------------------------- */ - -void -Plot3D_ortho(Plot3D *p3, double left, double right, double bottom, double top) { - - - Matrix_identity(p3->view_mat); - p3->view_mat[0] = (2.0/(right - left))/p3->aspect; - p3->view_mat[5] = 2.0/(top - bottom); - p3->view_mat[10] = -1; - p3->view_mat[15] = 1.0; - p3->view_mat[3] = -(right+left)/(right-left); - p3->view_mat[7] = -(top+bottom)/(top-bottom); - - /* Update the global transformation matrix */ - - Plot3D_maketransform(p3); - p3->pers_mode = ORTHO; - p3->ortho_left = left; - p3->ortho_right = right; - p3->ortho_bottom = bottom; - p3->ortho_top = top; - -} - -/* --------------------------------------------------------------------- - Plot3D_autoortho(Plot3D *p3) - - Automatically pick an orthographic projection that's probably - pretty good. - --------------------------------------------------------------------- */ - -void -Plot3D_autoortho(Plot3D *p3) { - - /* Make a perspective transformation matrix for this system */ - - double d, dmax; - double cx,cy,cz; - double xmin,xmax,ymin,ymax,zmin,zmax; - - xmin = p3->xmin; - ymin = p3->ymin; - zmin = p3->zmin; - xmax = p3->xmax; - ymax = p3->ymax; - zmax = p3->zmax; - cx = p3->xcenter; - cy = p3->ycenter; - cz = p3->zcenter; - - /* Calculate longest point from center point */ - - dmax = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); - d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); - if (d > dmax) dmax = d; - d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); - if (d > dmax) dmax = d; - d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); - if (d > dmax) dmax = d; - d = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); - if (d > dmax) dmax = d; - - dmax = sqrt(dmax); - - Plot3D_ortho(p3,-dmax,dmax,-dmax,dmax); - -} - - - -/* ------------------------------------------------------------------------- - Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax) - - Sets the viewport for this 3D graph. Will recalculate all of the - local viewing transformation matrices accordingly. - ------------------------------------------------------------------------- */ -void -Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax) { - if (p3) { - if ((vxmin > vxmax) || (vymin >vymax)) return; - p3->view_xmin = vxmin; - p3->view_ymin = vymin; - p3->view_xmax = vxmax; - p3->view_ymax = vymax; - p3->width = (vxmax - vxmin); - p3->height = (vymax - vymin); - p3->aspect = (double) p3->width/(double) p3->height; - - /* Fix up the viewing transformation matrix */ - - if (p3->pers_mode == PERSPECTIVE) { - Plot3D_lookat(p3,p3->lookatz); - Plot3D_perspective(p3,p3->fovy,p3->znear,p3->zfar); - } else { - Plot3D_ortho(p3,p3->ortho_left,p3->ortho_right,p3->ortho_bottom, p3->ortho_top); - } - FrameBuffer_setclip(p3->frame,vxmin,vymin,vxmax,vymax); - } -} - -/* --------------------------------------------------------------------------- - Plot2D_start(Plot2D *p3) - - Set up viewing region and other parameters for this image. - --------------------------------------------------------------------------- */ - -void -Plot3D_start(Plot3D *p3) { - if (p3) - FrameBuffer_setclip(p3->frame, p3->view_xmin,p3->view_ymin,p3->view_xmax, p3->view_ymax); - -} - -/* ------------------------------------------------------------------------- - Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel Color) - - Plot a 3D point - ------------------------------------------------------------------------- */ - -void -Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel color) { - - GL_Vector t; - int ix, iy; - double invw; - FrameBuffer *f; - - /* Perform a transformation */ - - Matrix_transform4(p3->trans_mat,x,y,z,1,&t); - - /* Scale the coordinates into unit cube */ - - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; -#ifdef GL_DEBUG - fprintf(stdout,"t.x = %g, t.y = %g, t.z = %g\n", t.x,t.y,t.z); -#endif - /* Calculate the x and y coordinates */ - - ix = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5); - iy = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5); - - if ((ix >= 0) && (ix < p3->width) && - (iy >= 0) && (ix < p3->height)) { - ix += p3->view_xmin; - iy += p3->view_ymin; - f = p3->frame; - if (t.z <= f->zbuffer[iy][ix]) { - f->pixels[iy][ix] = color; - f->zbuffer[iy][ix] = t.z; - } - } -} - -/* ---------------------------------------------------------------------- - Plot3D_rotx(Plot3D *p3, double deg) - - Rotate the model around its x axis. - ---------------------------------------------------------------------- */ - -void -Plot3D_rotx(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatex(temp,deg); /* Construct a x rotation matrix */ - Matrix_multiply(p3->model_mat,temp,p3->model_mat); - Plot3D_maketransform(p3); - -} - -/* ---------------------------------------------------------------------- - Plot3D_roty(Plot3D *p3, double deg) - - Rotate the model around its y axis. - ---------------------------------------------------------------------- */ - -void -Plot3D_roty(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatey(temp,deg); /* Construct a y rotation matrix */ - Matrix_multiply(p3->model_mat,temp,p3->model_mat); - Plot3D_maketransform(p3); - -} - -/* ---------------------------------------------------------------------- - Plot3D_rotz(Plot3D *p3, double deg) - - Rotate the model around its z axis. - ---------------------------------------------------------------------- */ - -void -Plot3D_rotz(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatez(temp,deg); /* Construct a z rotation matrix */ - Matrix_multiply(p3->model_mat,temp,p3->model_mat); - Plot3D_maketransform(p3); - -} - - -/* ---------------------------------------------------------------------- - Plot3D_rotd(Plot3D *p3, double deg) - - Rotate the model down - ---------------------------------------------------------------------- */ - -void -Plot3D_rotd(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatex(temp,deg); /* Construct a x rotation matrix */ - Matrix_multiply(temp, p3->model_mat,p3->model_mat); - Plot3D_maketransform(p3); - -} - - -/* ---------------------------------------------------------------------- - Plot3D_rotu(Plot3D *p3, double deg) - - Rotate the model up - ---------------------------------------------------------------------- */ - -void -Plot3D_rotu(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatex(temp,-deg); /* Construct a x rotation matrix */ - Matrix_multiply(temp,p3->model_mat,p3->model_mat); - Plot3D_maketransform(p3); - -} - - -/* ---------------------------------------------------------------------- - Plot3D_rotr(Plot3D *p3, double deg) - - Rotate the model down - ---------------------------------------------------------------------- */ - -void -Plot3D_rotr(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatey(temp,deg); /* Construct a y rotation matrix */ - Matrix_multiply(temp, p3->model_mat,p3->model_mat); - Plot3D_maketransform(p3); - -} - - -/* ---------------------------------------------------------------------- - Plot3D_rotl(Plot3D *p3, double deg) - - Rotate the model left - ---------------------------------------------------------------------- */ - -void -Plot3D_rotl(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatey(temp,-deg); /* Construct a y rotation matrix */ - Matrix_multiply(temp,p3->model_mat,p3->model_mat); - Plot3D_maketransform(p3); - -} - - -/* ---------------------------------------------------------------------- - Plot3D_rotc(Plot3D *p3, double deg) - - Rotate the model around center point - ---------------------------------------------------------------------- */ - -void -Plot3D_rotc(Plot3D *p3, double deg) { - double temp[16]; - - Matrix_rotatez(temp,-deg); /* Construct a z rotation matrix */ - Matrix_multiply(temp,p3->model_mat,p3->model_mat); - Plot3D_maketransform(p3); -} - -/* ------------------------------------------------------------------------- - Plot3D_zoom(Plot3D *p3, double percent) - - Zooms in or out the current image. percent defines a percentage of - zoom. - - Zooming is actually done by adjusting the perspective field of view - instead of scaling the model or moving in the viewpoint. This - seems to work the best. - ------------------------------------------------------------------------- */ - -void -Plot3D_zoom(Plot3D *p3, double percent) { - - double scale; - double dx; - if (percent <= 0) return; - scale = percent/100.0; - - dx = (1.0/scale - 1.0)/(2*p3->zoom); /* Don't even ask where this came from */ - p3->xshift += dx; - p3->yshift += dx; - p3->zoom = p3->zoom*scale; - -#ifdef OLD - p3->fovy = p3->fovy*scale; - if (p3->fovy > 170.0) p3->fovy = 170.0; - if (p3->fovy == 0) p3->fovy = 0.0001; - Plot3D_lookat(p3,p3->lookatz); - Plot3D_perspective(p3,p3->fovy,p3->znear,p3->zfar); -#endif -} - -/* -------------------------------------------------------------------------- - Plot3D_left(Plot3D *p3, double s) - - Shifts the image to the left by s units. This is a little funky. - - s is scaled so that s = 100 equals one full screen. - -------------------------------------------------------------------------- */ -void -Plot3D_left(Plot3D *p3, double s) { - p3->xshift -= (s/100.0)/p3->zoom; -} - -/* -------------------------------------------------------------------------- - Plot3D_right(Plot3D *p3, double s) - - Shifts the image to the right by s units. - - s is scaled so that s = 100 equals one full screen. - -------------------------------------------------------------------------- */ -void -Plot3D_right(Plot3D *p3, double s) { - p3->xshift += (s/100.0)/p3->zoom; -} - -/* -------------------------------------------------------------------------- - Plot3D_up(Plot3D *p3, double s) - - Shifts the image up left by s units. - - s is scaled so that s = 100 equals one full screen. - -------------------------------------------------------------------------- */ -void -Plot3D_up(Plot3D *p3, double s) { - p3->yshift += (s/100.0)/p3->zoom; -} - -/* -------------------------------------------------------------------------- - Plot3D_down(Plot3D *p3, double s) - - Shifts the image down by s units. - - s is scaled so that s = 100 equals one full screen. - -------------------------------------------------------------------------- */ -void -Plot3D_down(Plot3D *p3, double s) { - p3->yshift -= (s/100.0)/p3->zoom; -} - -/* ------------------------------------------------------------------------- - Plot3D_center(Plot3D *p3, double cx, double cy) - - Centers the image on a point in the range (0,0) - (100,100) - ------------------------------------------------------------------------- */ -void -Plot3D_center(Plot3D *p3, double cx, double cy) { - Plot3D_left(p3,cx-50); - Plot3D_down(p3,cy-50); -} - - - -/*************************************************************************** - * 3d Primitives * - ***************************************************************************/ - -/* ------------------------------------------------------------------------- - Plot3D_horizontal(Plot3D *p3, int xmin, int xmax, int y, double z1, double z2, Pixel color) - - Draws a "Horizontal" line on the framebuffer between two screen coordinates, - but also supplies z-values and zbuffering. This function probably isn't - too useful by itself, but will be used by a number of other primitives. - -------------------------------------------------------------------------- */ - -void Plot3D_horizontal(Plot3D *p3, int xmin, int xmax, int y, Zvalue z1, Zvalue z2, Pixel color) { - Pixel *p; - FrameBuffer *f; - int i; - Zvalue *zbuf,z,mz; - int startx, endx; - - f = p3->frame; - if ((y < f->ymin) || (y >= f->ymax)) return; - if (xmin > f->xmax) return; - if (xmin < f->xmin) startx = f->xmin; - else startx = xmin; - if (xmax < f->xmin) return; - if (xmax >= f->xmax) endx = f->xmax - 1; - else endx = xmax; - - /* Calculate z slope */ - - if (xmax != xmin) { - mz = (Zvalue) ((double) (z2 - z1)/(double) (xmax - xmin)); - } else { - mz = 0; - } - - /* Draw it */ - - p = &f->pixels[y][startx]; - zbuf = &f->zbuffer[y][startx]; - z = (Zvalue) (mz*(startx-xmin) + z1); - for (i = startx; i <= endx; i++, p++, zbuf++,z+=mz) { - if (z <= *zbuf) { - *p = color; - *zbuf = z; - } - } -} - - -/* ------------------------------------------------------------------------- - Plot3D_vertical(Plot3D *p3, int ymin, int ymax, int x, double z1, double z2, Pixel color) - - Draws a "Vertical" line on the framebuffer between two screen coordinates, - but also supplies z-values and zbuffering. This function probably isn't - too useful by itself, but will be used by a number of other primitives. - -------------------------------------------------------------------------- */ - -void Plot3D_vertical(Plot3D *p3, int ymin, int ymax, int x, Zvalue z1, Zvalue z2, Pixel color) { - Pixel *p; - FrameBuffer *f; - int i; - Zvalue *zbuf,z,mz; - int starty, endy; - - f = p3->frame; - if ((x < f->xmin) || (x >= f->xmax)) return; - if (ymin >= f->ymax) return; - if (ymin < f->ymin) starty = f->ymin; - else starty = ymin; - if (ymax < f->ymin) return; - if (ymax >= f->ymax) endy = f->ymax - 1; - else endy = ymax; - - /* Calculate z slope */ - - mz = (double) (z2 - z1)/(double) (ymax - ymin); - - /* Draw it */ - - p = &f->pixels[starty][x]; - zbuf = &f->zbuffer[starty][x]; - for (i = starty; i <= endy; i++, p+=f->width, zbuf+=f->width) { - z = (Zvalue) (mz*(i-ymin) + z1); - if (z <= *zbuf) { - *p = color; - *zbuf = z; - } - } -} - -/* ------------------------------------------------------------------------------- - Plot3D_linetransform(Plot3D *p3, int x1, int y1, Zvalue z1, - int x2, int y2, Zvalue z2, Pixel c) - - Draw a 3D line between points that have already been transformed into - 3D space. - - Uses a Bresenham line algorithm, but with linear interpolation between - Zvalues. - ------------------------------------------------------------------------------- */ - -void -Plot3D_linetransform(Plot3D *p3, int x1, int y1, Zvalue z1, int x2, int y2, Zvalue z2, Pixel c) { - - int orig_x1, orig_y1, orig_x2,orig_y2; - Zvalue zt; - - /* Bresenham line drawing parameters */ - FrameBuffer *f; - int dx,dy,dxneg,dyneg, inc1,inc2,di; - int x, y, xpixels, ypixels, xt, yt; - Pixel *p; - double m; - int end1 = 0, end2 = 0; - Zvalue *zbuf,mz,z; - - f = p3->frame; - - /* Need to figure out where in the heck this line is */ - - dx = x2 - x1; - dy = y2 - y1; - - if ((dx == 0) && (dy == 0)) { - if ((x1 < f->xmin) || (x1 >= f->xmax) || - (y1 < f->ymin) || (y1 >= f->ymax)) return; - if (z1 <= f->zbuffer[y1][x1]) { - f->pixels[y1][x1] = c; - } - return; - } - if (dx == 0) { - /* Draw a Vertical Line */ - if (y1 < y2) - Plot3D_vertical(p3,y1,y2,x1,z1,z2,c); - else - Plot3D_vertical(p3,y2,y1,x1,z2,z1,c); - return; - } - if (dy == 0) { - /* Draw a Horizontal Line */ - if (x1 < x2) - Plot3D_horizontal(p3,x1,x2,y1,z1,z2,c); - else - Plot3D_horizontal(p3,x2,x1,y1,z2,z1,c); - return; - } - - /* Figure out where in the heck these lines are using the - Cohen-Sutherland Line Clipping Scheme. */ - - end1 = ((x1 - f->xmin) < 0) | - (((f->xmax- 1 - x1) < 0) << 1) | - (((y1 - f->ymin) < 0) << 2) | - (((f->ymax-1 - y1) < 0) << 3); - - end2 = ((x2 - f->xmin) < 0) | - (((f->xmax-1 - x2) < 0) << 1) | - (((y2 - f->ymin) < 0) << 2) | - (((f->ymax-1 - y2) < 0) << 3); - - if (end1 & end2) return; /* Nope : Not visible */ - - /* Make sure points have a favorable orientation */ - - if (x1 > x2) { - xt = x1; - x1 = x2; - x2 = xt; - yt = y1; - y1 = y2; - y2 = yt; - zt = z1; - z1 = z2; - z2 = zt; - } - - /* Save original points before we clip them off */ - orig_x1 = x1; - orig_y1 = y1; - orig_x2 = x2; - orig_y2 = y2; - - /* Clip against the boundaries */ - m = (y2 - y1)/(double) (x2-x1); - if (x1 < f->xmin) { - y1 = (f->xmin - x1)*m + y1; - x1 = f->xmin; - } - if (x2 >= f->xmax) { - y2 = (f->xmax -1 -x1)*m + y1; - x2 = f->xmax - 1; - } - - if (y1 > y2) { - xt = x1; - x1 = x2; - x2 = xt; - yt = y1; - y1 = y2; - y2 = yt; - zt = z1; - z1 = z2; - z2 = zt; - - /* Swap original points */ - - xt = orig_x1; - orig_x1 = orig_x2; - orig_x2 = xt; - yt = orig_y1; - orig_y1 = orig_y2; - orig_y2 = yt; - } - - m = 1/m; - if (y1 < f->ymin) { - x1 = (f->ymin - y1)*m + x1; - y1 = f->ymin; - } - if (y2 >= f->ymax) { - x2 = (f->ymax-1-y1)*m + x1; - y2 = f->ymax-1; - } - - if ((x1 < f->xmin) || (x1 >= f->xmax) || (y1 < f->ymin) || (y1 >= f->ymax) || - (x2 < f->xmin) || (x2 >= f->xmax) || (y2 < f->ymin) || (y2 >= f->ymax)) return; - - dx = x2 - x1; - dy = y2 - y1; - xpixels = f->width; - ypixels = f->height; - - dxneg = (dx < 0) ? 1 : 0; - dyneg = (dy < 0) ? 1 : 0; - - dx = abs(dx); - dy = abs(dy); - if (dx >= dy) { - /* Slope between -1 and 1. */ - mz = (z2 - z1)/(orig_x2 - orig_x1); /* Z interpolation slope */ - if (dxneg) { - x = x1; - y = y1; - x1 = x2; - y1 = y2; - x2 = x; - y2 = y; - dyneg = !dyneg; - } - inc1 = 2*dy; - inc2 = 2*(dy-dx); - di = 2*dy-dx; - - /* Draw a line using x as independent variable */ - - p = &f->pixels[y1][x1]; - zbuf = &f->zbuffer[y1][x1]; - x = x1; - while (x <= x2) { - /* Do a z-buffer check */ - z = mz*(x-orig_x1)+z1; - if (z <= *zbuf){ - *p = c; - *zbuf = z; - } - p++; - zbuf++; - if (di < 0) { - di = di + inc1; - } else { - if (dyneg) { - p = p - xpixels; - zbuf = zbuf - xpixels; - di = di + inc2; - } else { - p = p + xpixels; - zbuf = zbuf + xpixels; - di = di + inc2; - } - } - x++; - } - } else { - /* Slope < -1 or > 1 */ - mz = (z2 - z1)/(double) (orig_y2 - orig_y1); - if (dyneg) { - x = x1; - y = y1; - x1 = x2; - y1 = y2; - x2 = x; - y2 = y; - dxneg = !dxneg; - } - inc1 = 2*dx; - inc2 = 2*(dx-dy); - di = 2*dx-dy; - - /* Draw a line using y as independent variable */ - - p = &f->pixels[y1][x1]; - zbuf = &f->zbuffer[y1][x1]; - y = y1; - while (y <= y2) { - /* Do a z-buffer check */ - z = mz*(y-orig_y1)+z1; - if (z <= *zbuf) { - *p = c; - *zbuf = z; - } - p = p + xpixels; - zbuf = zbuf + xpixels; - if (di < 0) { - di = di + inc1; - } else { - if (dxneg) { - p = p - 1; - zbuf = zbuf - 1; - di = di + inc2; - } else { - p = p + 1; - zbuf = zbuf + 1; - di = di + inc2; - } - } - y++; - } - } -} - -/* --------------------------------------------------------------------------- - Plot3D_line(Plot3D *p3, double x1, double y1, double z1, double x2, double y2, double z2,int color) - - Draws a line in 3D space. This is done as follows (for lack of a better - method). - - 1. The points (x1,y1,z1) and (x2,y2,z2) are transformed into screen coordinates - 2. We draw the line using a modified Bresenham line algorithm. - 3. Zbuffer values are linearly interpolated between the two points. - ---------------------------------------------------------------------------- */ - -void -Plot3D_line(Plot3D *p3, double fx1, double fy1, double fz1, double fx2, double fy2, - double fz2, Pixel c) { - - /* 3D Transformation parameters */ - GL_Vector t; - double invw; - int x1,y1,x2,y2; - Zvalue z1,z2; - - /* Transform the two points into screen coordinates */ - - Matrix_transform4(p3->trans_mat,fx1,fy1,fz1,1,&t); /* Point 1 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - x1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - y1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - z1 = t.z; - - Matrix_transform4(p3->trans_mat,fx2,fy2,fz2,1,&t); /* Point 2 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - x2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - y2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - z2 = t.z; - Plot3D_linetransform(p3,x1,y1,z1,x2,y2,z2,c); -} - - -/* ------------------------------------------------------------------------- - Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - Pixel fillcolor) - - This function draws a 3D z-buffered outline triangle. - -------------------------------------------------------------------------- */ - -void Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color) { - - int tx1, tx2, tx3, ty1, ty2, ty3; - Zvalue tz1, tz2, tz3; - GL_Vector t; - double invw; - - /* Transform the three points into screen coordinates */ - - Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz1 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz2 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz3 = (Zvalue) t.z; - - - Plot3D_linetransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,color); - Plot3D_linetransform(p3,tx1,ty1,tz1,tx3,ty3,tz3,color); - Plot3D_linetransform(p3,tx2,ty2,tz2,tx3,ty3,tz3,color); -} - - -/* ------------------------------------------------------------------------- - Plot3D_solidtriangletransform(Plot3D *p3, int tx1, int ty2, Zvalue tz1, - int tx2, int ty2, Zvalue tz2, - int tx3, int ty3, Zvalue tz3, Pixel color) - - This function draws a 3D z-buffered filled triangle. Assumes three - points have already been transformed into screen coordinates. - - General idea : - 1. Transform the three points into screen coordinates - 2. Order three points vertically on screen. - 3. Check for degenerate cases (where 3 points are colinear). - 4. Fill in the resulting triangle using horizontal lines. - -------------------------------------------------------------------------- */ - -void Plot3D_solidtriangletransform(Plot3D *p3, int tx1, int ty1, Zvalue tz1, - int tx2, int ty2, Zvalue tz2, - int tx3, int ty3, Zvalue tz3, Pixel color) { - int tempx, tempy; - Zvalue tempz; - double m1,m2,m3, mz1, mz2, mz3; - int y; - int ix1, ix2; - Zvalue zz1, zz2; - FrameBuffer *f; - register double fy1,fy2; - register Zvalue fz1,fz2; - - f = p3->frame; - - /* Check for degenerate cases here */ - - if ((ty1 == ty2) && (ty2 == ty3)) { - if (tx2 < tx1) { /* Swap points 1 and 2 if 2 is higher */ - tempx = tx1; - tempz = tz1; - tx1 = tx2; - tz1 = tz2; - tx2 = tempx; - tz2 = tempz; - } - if (tx3 < tx1) { /* Swap points 1 and 3 if 3 is higher */ - tempx = tx1; - tempz = tz1; - tx1 = tx3; - tz1 = tz3; - tx3 = tempx; - tz3 = tempz; - } - if (tx3 < tx2) { /* Swap points 2 and 3 if 3 is higher */ - tempx = tx2; - tempz = tz2; - tx2 = tx3; - tz2 = tz3; - tx3 = tempx; - tz3 = tempz; - } - - /* Points are aligned horizontally. Handle as a special case */ - /* Just draw three lines using the outline color */ - - Plot3D_horizontal(p3,tx1,tx2,ty1,tz1,tz3,color); - - /* Plot3D_linetransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,color); - Plot3D_linetransform(p3,tx1,ty1,tz1,tx3,ty3,tz3,color); - Plot3D_linetransform(p3,tx2,ty2,tz2,tx3,ty3,tz3,color); - */ - - return; - } - - /* Figure out which point has the greatest "y" value */ - - if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ - tempx = tx1; - tempy = ty1; - tempz = tz1; - tx1 = tx2; - ty1 = ty2; - tz1 = tz2; - tx2 = tempx; - ty2 = tempy; - tz2 = tempz; - } - if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ - tempx = tx1; - tempy = ty1; - tempz = tz1; - tx1 = tx3; - ty1 = ty3; - tz1 = tz3; - tx3 = tempx; - ty3 = tempy; - tz3 = tempz; - } - if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ - tempx = tx2; - tempy = ty2; - tempz = tz2; - tx2 = tx3; - ty2 = ty3; - tz2 = tz3; - tx3 = tempx; - ty3 = tempy; - tz3 = tempz; - } - - /* Points are now order so that t_1 is the highest point, t_2 is the - middle point, and t_3 is the lowest point */ - - if (ty2 < ty1) { - /* First process line segments between (x1,y1)-(x2,y2) - And between (x1,y1),(x3,y3) */ - - m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - mz1 = (tz2 - tz1)/(double) (ty2 - ty1); - mz2 = (tz3 - tz1)/(double) (ty3 - ty1); - - y = ty1; - fy1 = m1*(y-ty1)+0.5 + tx1; - fy2 = m2*(y-ty1)+0.5 + tx1; - fz1 = mz1*(y-ty1) + tz1; - fz2 = mz2*(y-ty1) + tz1; - while (y >= ty2) { - /* Replace with bresenham scheme */ - /* Calculate x values from slope */ - ix1 = (int) fy1; - ix2 = (int) fy2; - zz1 = fz1; - zz2 = fz2; - fy1-= m1; - fy2-= m2; - fz1-= mz1; - fz2-= mz2; - if (ix1 > ix2) - Plot3D_horizontal(p3,ix2,ix1,y,zz2,zz1,color); - else - Plot3D_horizontal(p3,ix1,ix2,y,zz1,zz2,color); - y--; - } - } - if (ty3 < ty2) { - /* Draw lower half of the triangle */ - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); - mz2 = (tz3 - tz1)/(double) (ty3 - ty1); - mz3 = (tz3 - tz2)/(double) (ty3 - ty2); - y = ty2; - while (y >= ty3) { - ix1 = (int) (m3*(y-ty2)+0.5)+tx2; - ix2 = (int) (m2*(y-ty1)+0.5)+tx1; - zz1 = mz3*(y-ty2)+tz2; - zz2 = mz2*(y-ty1)+tz1; - if (ix1 > ix2) - Plot3D_horizontal(p3,ix2,ix1,y,zz2,zz1,color); - else - Plot3D_horizontal(p3,ix1,ix2,y,zz1,zz2,color); - y--; - } - } -} - -/* ------------------------------------------------------------------------- - Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - Pixel color) - - This function draws a 3D z-buffered filled triangle. Can be used to - draw other primitives such as quadralaterals, etc... - - This function simply transforms the given points and calls - Plot3D_SolidTriangleTransform(). - -------------------------------------------------------------------------- */ - -void Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color) { - - int tx1, tx2, tx3, ty1, ty2, ty3; - Zvalue tz1, tz2, tz3; - GL_Vector t; - double invw; - Matrix a; - register double xshift, yshift, zoom, width, height, view_xmin, view_ymin; - - a = p3->trans_mat; - xshift = p3->xshift; - yshift = p3->yshift; - zoom = p3->zoom; - height = p3->height; - width = p3->width; - view_xmin = p3->view_xmin; - view_ymin = p3->view_ymin; - - /* Transform the three points into screen coordinates */ - - t.w = a[12]*x1 + a[13]*y1 + a[14]*z1 + a[15]; - invw = 1.0/t.w; - t.x = (a[0]*x1 + a[1]*y1 + a[2]*z1 + a[3])*invw; - t.y = (a[4]*x1 + a[5]*y1 + a[6]*z1 + a[7])*invw; - t.z = (a[8]*x1 + a[9]*y1 + a[10]*z1 + a[11])*invw; - - tx1 = (int) ((t.x +xshift)*zoom*width + 0.5) + view_xmin; - ty1 = (int) ((t.y +yshift)*zoom*height + 0.5) + view_ymin; - tz1 = (Zvalue) t.z; - - - t.w = a[12]*x2 + a[13]*y2 + a[14]*z2 + a[15]; - invw = 1.0/t.w; - t.x = (a[0]*x2 + a[1]*y2 + a[2]*z2 + a[3])*invw; - t.y = (a[4]*x2 + a[5]*y2 + a[6]*z2 + a[7])*invw; - t.z = (a[8]*x2 + a[9]*y2 + a[10]*z2 + a[11])*invw; - tx2 = (int) ((t.x +xshift)*zoom*width + 0.5) + view_xmin; - ty2 = (int) ((t.y +yshift)*zoom*height + 0.5) + view_ymin; - tz2 = (Zvalue) t.z; - - t.w = a[12]*x3 + a[13]*y3 + a[14]*z3 + a[15]; - invw = 1.0/t.w; - t.x = (a[0]*x3 + a[1]*y3 + a[2]*z3 + a[3])*invw; - t.y = (a[4]*x3 + a[5]*y3 + a[6]*z3 + a[7])*invw; - t.z = (a[8]*x3 + a[9]*y3 + a[10]*z3 + a[11])*invw; - tx3 = (int) ((t.x +xshift)*zoom*width + 0.5) + view_xmin; - ty3 = (int) ((t.y +yshift)*zoom*height + 0.5) + view_ymin; - tz3 = (Zvalue) t.z; - - Plot3D_solidtriangletransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,tx3,ty3,tz3,color); - -} - - -/* ------------------------------------------------------------------------- - Plot3D_horizontalinterp(Plot3D *p3, int xmin, int xmax, int y, - double z1, double z2, Pixel c1, Pixel c2) - - Draws a "Horizontal" line on the framebuffer between two screen coordinates, - but also supplies z-values and zbuffering. Performs a color interpolation - between c1 and c2. This is primarily used by the SolidTriangleInterp() - function to give the illusion of smooth surfaces. - -------------------------------------------------------------------------- */ - -void Plot3D_horizontalinterp(Plot3D *p3, int xmin, int xmax, int y, - Zvalue z1, Zvalue z2, Pixel c1, Pixel c2) { - Pixel *p; - FrameBuffer *f; - int i; - Zvalue *zbuf,z,mz; - double mc; - int startx, endx; - double invdx; - - f = p3->frame; - if ((y < f->ymin) || (y >= f->ymax)) return; - if (xmin >= f->xmax) return; - if (xmin < f->xmin) startx = f->xmin; - else startx = xmin; - if (xmax < f->xmin) return; - if (xmax >= f->xmax) endx = f->xmax - 1; - else endx = xmax; - - /* Calculate z slope */ - if (xmax != xmin) { - invdx = 1.0/(double) (xmax-xmin); - } else { - invdx = 0; - } - - mz = (Zvalue) (z2 - z1)*invdx; - - /* Calculate c slope */ - - mc = (double) (c2 - c1)*invdx; - - /* Draw it */ - - p = &f->pixels[y][startx]; - zbuf = &f->zbuffer[y][startx]; - for (i = startx; i <= endx; i++, p++, zbuf++) { - z = (Zvalue) (mz*(i-xmin) + z1); - if (z <= *zbuf) { - *p = (Pixel) (mc*(i-xmin)+c1); - *zbuf = z; - } - } -} - -/* ------------------------------------------------------------------------- - Plot3D_interptriangletransform(Plot3D *p3, - int tx1, int ty2, Zvalue tz1, Pixel c1, - int tx2, int ty2, Zvalue tz2, Pixel c2, - int tx3, int ty3, Zvalue tz3, Pixel c3) - - This function draws a 3D z-buffered filled triangle with color - interpolation. Assumes three points have already been transformed - into screen coordinates. - - General idea : - 1. Transform the three points into screen coordinates - 2. Order three points vertically on screen. - 3. Check for degenerate cases (where 3 points are colinear). - 4. Fill in the resulting triangle using horizontal lines. - 5. Colors are interpolated between end points - -------------------------------------------------------------------------- */ - -void Plot3D_interptriangletransform(Plot3D *p3, - int tx1, int ty1, Zvalue tz1, Pixel c1, - int tx2, int ty2, Zvalue tz2, Pixel c2, - int tx3, int ty3, Zvalue tz3, Pixel c3) { - int tempx, tempy; - Zvalue tempz; - double m1,m2,m3, mz1, mz2, mz3; - double mc1,mc2,mc3; - Pixel ic1,ic2,tempc; - int y; - int ix1, ix2; - Zvalue zz1, zz2; - FrameBuffer *f; - - f = p3->frame; - - /* Figure out which point has the greatest "y" value */ - - if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ - tempx = tx1; - tempy = ty1; - tempz = tz1; - tempc = c1; - tx1 = tx2; - ty1 = ty2; - tz1 = tz2; - c1 = c2; - tx2 = tempx; - ty2 = tempy; - tz2 = tempz; - c2 = tempc; - } - if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ - tempx = tx1; - tempy = ty1; - tempz = tz1; - tempc = c1; - tx1 = tx3; - ty1 = ty3; - tz1 = tz3; - c1 = c3; - tx3 = tempx; - ty3 = tempy; - tz3 = tempz; - c3 = tempc; - } - if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ - tempx = tx2; - tempy = ty2; - tempz = tz2; - tempc = c2; - tx2 = tx3; - ty2 = ty3; - tz2 = tz3; - c2 = c3; - tx3 = tempx; - ty3 = tempy; - tz3 = tempz; - c3 = tempc; - } - - /* Points are now order so that t_1 is the highest point, t_2 is the - middle point, and t_3 is the lowest point */ - - /* Check for degenerate cases here */ - - if ((ty1 == ty2) && (ty2 == ty3)) { - - /* Points are aligned horizontally. Handle as a special case */ - /* Just draw three lines using the outline color */ - - if (tx2 > tx1) - Plot3D_horizontalinterp(p3,tx1,tx2,ty1,tz1,tz2,c1,c2); - else - Plot3D_horizontalinterp(p3,tx2,tx1,ty1,tz2,tz1,c2,c1); - if (tx3 > tx1) - Plot3D_horizontalinterp(p3,tx1,tx3,ty1,tz1,tz3,c1,c3); - else - Plot3D_horizontalinterp(p3,tx3,tx1,ty1,tz3,tz1,c3,c1); - if (tx3 > tx2) - Plot3D_horizontalinterp(p3,tx2,tx3,ty2,tz2,tz3,c2,c3); - else - Plot3D_horizontalinterp(p3,tx3,tx2,ty2,tz3,tz2,c3,c2); - - } else { - - /* First process line segments between (x1,y1)-(x2,y2) - And between (x1,y1),(x3,y3) */ - - if (ty2 < ty1) { - m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - mz1 = (tz2 - tz1)/(double) (ty2 - ty1); - mz2 = (tz3 - tz1)/(double) (ty3 - ty1); - mc1 = (c2 - c1)/(double) (ty2 - ty1); - mc2 = (c3 - c1)/(double) (ty3 - ty1); - - y = ty1; - while (y >= ty2) { - /* Calculate x values from slope */ - ix1 = (int) (m1*(y-ty1)+0.5) + tx1; - ix2 = (int) (m2*(y-ty1)+0.5) + tx1; - zz1 = mz1*(y-ty1) + tz1; - zz2 = mz2*(y-ty1) + tz1; - ic1 = mc1*(y-ty1) + c1; - ic2 = mc2*(y-ty1) + c1; - if (ix1 > ix2) - Plot3D_horizontalinterp(p3,ix2,ix1,y,zz2,zz1,ic2,ic1); - else - Plot3D_horizontalinterp(p3,ix1,ix2,y,zz1,zz2,ic1,ic2); - y--; - } - } - if (ty3 < ty2) { - /* Draw lower half of the triangle */ - m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); - mz2 = (tz3 - tz1)/(double) (ty3 - ty1); - mc2 = (c3 - c1)/(double) (ty3 - ty1); - m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); - mz3 = (tz3 - tz2)/(double) (ty3 - ty2); - mc3 = (c3 - c2)/(double) (ty3 - ty2); - y = ty2; - while (y >= ty3) { - ix1 = (int) (m3*(y-ty2)+0.5)+tx2; - ix2 = (int) (m2*(y-ty1)+0.5)+tx1; - zz1 = mz3*(y-ty2)+tz2; - zz2 = mz2*(y-ty1)+tz1; - ic1 = mc3*(y-ty2)+c2; - ic2 = mc2*(y-ty1)+c1; - if (ix1 > ix2) - Plot3D_horizontalinterp(p3,ix2,ix1,y,zz2,zz1,ic2,ic1); - else - Plot3D_horizontalinterp(p3,ix1,ix2,y,zz1,zz2,ic1,ic2); - y--; - } - } - } -} - -/* ------------------------------------------------------------------------- - Plot3D_interptriangle(Plot3D *p3, - double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3) - - This function draws a 3D z-buffered filled triangle with color - interpolation. - - This function simply transforms the given points and calls - Plot3D_InterpTriangleTransform(). - -------------------------------------------------------------------------- */ - -void Plot3D_interptriangle(Plot3D *p3, - double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3) { - - int tx1, tx2, tx3, ty1, ty2, ty3; - Zvalue tz1, tz2, tz3; - GL_Vector t; - double invw; - - /* Transform the three points into screen coordinates */ - - Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz1 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz2 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz3 = (Zvalue) t.z; - - Plot3D_interptriangletransform(p3,tx1,ty1,tz1,c1,tx2,ty2,tz2,c2,tx3,ty3,tz3,c3); -} - -/* ------------------------------------------------------------------------- - Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel fillcolor) - - This function draws a 3D outlined Quadralateral. Used primarily for - drawing meshes and other things. - - Plotting is done in the following order : - (x1,y1,z1) --> (x2,y2,z2) - (x2,y2,z2) --> (x3,y3,z3) - (x3,y3,z3) --> (x4,y4,z4) - (x4,y4,z4) --> (x1,y1,z1) - -------------------------------------------------------------------------- */ - -void Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color) { - - int tx1, tx2, tx3, tx4, ty1, ty2, ty3, ty4; - Zvalue tz1, tz2, tz3, tz4; - GL_Vector t; - double invw; - - /* Transform the three points into screen coordinates */ - - Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz1 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz2 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz3 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x4,y4,z4,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx4 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty4 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz4 = (Zvalue) t.z; - - Plot3D_linetransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,color); - Plot3D_linetransform(p3,tx2,ty2,tz2,tx3,ty3,tz3,color); - Plot3D_linetransform(p3,tx3,ty3,tz3,tx4,ty4,tz4,color); - Plot3D_linetransform(p3,tx4,ty4,tz4,tx1,ty1,tz1,color); - -} - - -/* ------------------------------------------------------------------------- - Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel fillcolor) - - This function draws a 3D solid Quadralateral. Uses the function - Plot3D_SolidTriangleTransform() to fill in the region. - - Plotting is done in the following order : - (x1,y1,z1) --> (x2,y2,z2) - (x2,y2,z2) --> (x3,y3,z3) - (x3,y3,z3) --> (x4,y4,z4) - (x4,y4,z4) --> (x1,y1,z1) - -------------------------------------------------------------------------- */ - -void Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color) { - - int tx1, tx2, tx3, tx4, ty1, ty2, ty3, ty4; - Zvalue tz1, tz2, tz3, tz4; - GL_Vector t; - double invw; - - /* Transform the three points into screen coordinates */ - - Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz1 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz2 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz3 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x4,y4,z4,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx4 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty4 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz4 = (Zvalue) t.z; - - Plot3D_solidtriangletransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,tx3,ty3,tz3,color); - Plot3D_solidtriangletransform(p3,tx1,ty1,tz1,tx4,ty4,tz4,tx3,ty3,tz3,color); -} - -/* ------------------------------------------------------------------------- - Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3, - double x4, double y4, double z4, Pixel c4) - - This function draws a 3D color-interpolated Quadralateral. Uses the function - Plot3D_InterpTriangleTransform() to fill in the region. - - Plotting is done in the following order : - (x1,y1,z1) --> (x2,y2,z2) - (x2,y2,z2) --> (x3,y3,z3) - (x3,y3,z3) --> (x4,y4,z4) - (x4,y4,z4) --> (x1,y1,z1) - -------------------------------------------------------------------------- */ - -void Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3, - double x4, double y4, double z4, Pixel c4) { - - - int tx1, tx2, tx3, tx4, ty1, ty2, ty3, ty4; - Zvalue tz1, tz2, tz3, tz4; - GL_Vector t; - double invw; - - /* Transform the three points into screen coordinates */ - - Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz1 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz2 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz3 = (Zvalue) t.z; - - Matrix_transform4(p3->trans_mat,x4,y4,z4,1,&t); /* Point 3 */ - invw = 1.0/t.w; - t.x = t.x *invw; - t.y = t.y *invw; - t.z = t.z *invw; - tx4 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty4 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz4 = (Zvalue) t.z; - - Plot3D_interptriangletransform(p3,tx1,ty1,tz1,c1,tx2,ty2,tz2,c2,tx3,ty3,tz3,c3); - Plot3D_interptriangletransform(p3,tx1,ty1,tz1,c1,tx4,ty4,tz4,c4,tx3,ty3,tz3,c3); - -} - -/* -------------------------------------------------------------------------- - Plot3D_solidsphere(Plot3 *p3, double x, double y, double z, double radius, - Pixel c) - - Makes a 3D sphere at x,y,z with given radius and color. - - Basic strategy : - 1. Transform point to screen coordinates - 2. Figure out what the radius is in screen coordinates - 3. Use bresenham algorithm for large spheres - 4. Use bitmaps for small spheres - -------------------------------------------------------------------------- */ - -/* This is used to fill in spheres */ -static int s_xmin; -static int s_ymin; -static int s_xmax; -static int s_ymax; -static Pixel **s_pixels; -static Zvalue **s_zbuffer; - -void Plot3D_spherehorizontal(int xmin, int xmax, int y, Zvalue z, Pixel color) { - int i; - int startx, endx; - Pixel *p; - Zvalue *zbuf; - - if ((y < s_ymin) || (y >= s_ymax)) return; - if (xmin < s_xmin) startx = s_xmin; - else startx = xmin; - if (xmax >= s_xmax) endx = s_xmax - 1; - else endx = xmax; - - /* Draw it */ - - p = &s_pixels[y][xmin]; - zbuf = &s_zbuffer[y][xmin]; - for (i = startx; i <= endx; i++, p++, zbuf++) { - if (z <= *zbuf) { - *p = color; - *zbuf = z; - } - } -} - -void Plot3D_solidsphere(Plot3D *p3, double x, double y, double z, double radius, - Pixel c) { - - GL_Vector t,r; - double rad; - int tx,ty, irad; - Zvalue tz; - double invw; - int ix, iy, ix1,ix2,p; - FrameBuffer *f; - - /* First transform the point into model coordinates */ - - Matrix_transform4(p3->fullmodel_mat,x,y,z,1,&t); - - /* Now transform two points in order to find proper sphere radius */ - - Matrix_transform4(p3->view_mat,t.x+radius,t.y,t.z,t.w,&r); /* transform radius */ - Matrix_transform4(p3->view_mat,t.x,t.y,t.z,t.w,&t); - - invw = 1.0/t.w; - t.x = t.x*invw; - t.y = t.y*invw; - t.z = t.z*invw; - invw = 1.0/r.w; - r.x = r.x*invw; - r.y = r.y*invw; - r.z = r.z*invw; - invw = 1.0/r.w; - - rad = fabs(t.x - r.x); - - /* Transform everything into screen coordinates */ - - tx = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz = (Zvalue) t.z; - irad = (int) (p3->zoom*(rad*p3->width + 0.5)); - - /* This is only a temporary solution (maybe). */ - -#define fill_zcircle(x,y,c) \ - ix1 = tx - x; \ - ix2 = tx + x; \ - if (ix1 < s_xmin) ix1 = s_xmin; \ - if (ix2 >= s_xmax) ix2 = s_xmax; \ - Plot3D_spherehorizontal(ix1,ix2,y,tz,c); - - f = p3->frame; - s_xmin = f->xmin; - s_ymin = f->ymin; - s_xmax = f->xmax; - s_ymax = f->ymax; - s_pixels = f->pixels; - s_zbuffer = f->zbuffer; - if (irad <= 1) { - /* Plot a single pixel */ - if ((tx >= f->xmin) && (tx < f->xmax)) { - if ((ty >= f->ymin) && (ty ymax)) { - if (tz <= f->zbuffer[ty][tx]) { - f->pixels[ty][tx] = c; - f->zbuffer[ty][tx] = tz; - } - } - } - return; - } - ix = 0; - iy = irad; - p = 3-2*irad; - while (ix <= iy) { - fill_zcircle(ix,ty+iy,c); - fill_zcircle(ix,ty-iy,c); - fill_zcircle(iy,ty+ix,c); - fill_zcircle(iy,ty-ix,c); - if (p < 0) p = p + 4*ix + 6; - else { - p = p + 4*(ix-iy) + 10; - iy = iy -1; - } - ix++; - } -} - - -/* -------------------------------------------------------------------- - Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, - double radius, Pixel color, Pixel bc) - - Draws an outlined sphere. - -------------------------------------------------------------------- */ - -void Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, - double radius, Pixel c, Pixel bc) -{ - GL_Vector t,r; - double rad; - int tx,ty, irad; - Zvalue tz; - double invw; - int ix, iy, ix1,ix2,p; - - FrameBuffer *f; - - /* First transform the point into model coordinates */ - - Matrix_transform4(p3->fullmodel_mat,x,y,z,1,&t); - - /* Now transform two points in order to find proper sphere radius */ - - Matrix_transform4(p3->view_mat,t.x+radius,t.y,t.z,t.w,&r); /* transform radius */ - Matrix_transform4(p3->view_mat,t.x,t.y,t.z,t.w,&t); - - invw = 1.0/t.w; - t.x = t.x*invw; - t.y = t.y*invw; - t.z = t.z*invw; - invw = 1.0/r.w; - r.x = r.x*invw; - r.y = r.y*invw; - r.z = r.z*invw; - invw = 1.0/r.w; - - rad = fabs(t.x - r.x); - - /* Transform everything into screen coordinates */ - - tx = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; - ty = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; - tz = (Zvalue) t.z; - irad = (int) (p3->zoom*(rad*p3->width + 0.5)); - - /* This is only a temporary solution (maybe). */ -#define plot_zcircle(x,y,c) \ - if ((x >= s_xmin) && (x < s_xmax) && \ - (y >= s_ymin) && (y < s_ymax)) {\ - if (tz <= s_zbuffer[y][x]) { \ - s_pixels[y][x] = c; \ - s_zbuffer[y][x] = tz; } \ - } - - f = p3->frame; - s_xmin = f->xmin; - s_ymin = f->ymin; - s_xmax = f->xmax; - s_ymax = f->ymax; - s_pixels = f->pixels; - s_zbuffer = f->zbuffer; - - if (irad <= 1) { - /* Plot a single pixel */ - if ((tx >= f->xmin) && (tx < f->xmax)) { - if ((ty >= f->ymin) && (ty ymax)) { - if (tz <= f->zbuffer[ty][tx]) { - f->pixels[ty][tx] = c; - f->zbuffer[ty][tx] = tz; - } - } - } - return; - } - ix = 0; - iy = irad; - p = 3-2*irad; - while (ix <= iy) { - fill_zcircle(ix,ty+iy,c); - fill_zcircle(ix,ty-iy,c); - fill_zcircle(iy,ty+ix,c); - fill_zcircle(iy,ty-ix,c); - - plot_zcircle(tx+ix,ty+iy,bc); - plot_zcircle(tx-ix,ty+iy,bc); - plot_zcircle(tx+ix,ty-iy,bc); - plot_zcircle(tx-ix,ty-iy,bc); - plot_zcircle(tx+iy,ty+ix,bc); - plot_zcircle(tx-iy,ty+ix,bc); - plot_zcircle(tx+iy,ty-ix,bc); - plot_zcircle(tx-iy,ty-ix,bc); - if (p < 0) p = p + 4*ix + 6; - else { - p = p + 4*(ix-iy) + 10; - iy = iy -1; - } - ix++; - } -} - -/* QUAD Test - Test out quad functions for graphing */ - -double zf(double x, double y) { - return cos(sqrt(x*x + y*y)*10.0)/(sqrt(x*x+y*y)+1); -} - -void Quad_Test(Plot3D *p3, int npoints) { - int i,j; - double dx; - double x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,za; - int c; - dx = 2.0/npoints; - - - for (i = 0; i < npoints; i++) - for (j = 0; j < npoints; j++) { - x1 = i*dx + -1.0; - y1 = j*dx + -1.0; - x2 = x1 + dx; - x3 = x1 + dx; - x4 = x1; - y2 = y1; - y3 = y1 + dx; - y4 = y1 + dx; - z1 = zf(x1,y1); - z2 = zf(x2,y2); - z3 = zf(x3,y3); - z4 = zf(x4,y4); - za = 0.25*(z1+z2+z3+z4); - c = 16+((za + 1)*120); - if (c > 254) c = 254; - Plot3D_quad(p3,x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,(Pixel) c); - } -} - - -void Quad_SolidTest(Plot3D *p3, int npoints) { - int i,j; - double dx; - double x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,za; - int c; - dx = 2.0/npoints; - - - for (i = 0; i < npoints; i++) - for (j = 0; j < npoints; j++) { - x1 = i*dx + -1.0; - y1 = j*dx + -1.0; - x2 = x1 + dx; - x3 = x1 + dx; - x4 = x1; - y2 = y1; - y3 = y1 + dx; - y4 = y1 + dx; - z1 = zf(x1,y1); - z2 = zf(x2,y2); - z3 = zf(x3,y3); - z4 = zf(x4,y4); - za = 0.25*(z1+z2+z3+z4); - c = 16+((za + 1)*120); - if (c > 254) c = 254; - Plot3D_solidquad(p3,x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,(Pixel) c); - } -} - - - -void Quad_InterpTest(Plot3D *p3, int npoints) { - int i,j; - double dx; - double x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4; - int c1,c2,c3,c4; - dx = 2.0/npoints; - - - for (i = 0; i < npoints; i++) - for (j = 0; j < npoints; j++) { - x1 = i*dx + -1.0; - y1 = j*dx + -1.0; - x2 = x1 + dx; - x3 = x1 + dx; - x4 = x1; - y2 = y1; - y3 = y1 + dx; - y4 = y1 + dx; - z1 = zf(x1,y1); - z2 = zf(x2,y2); - z3 = zf(x3,y3); - z4 = zf(x4,y4); - c1 = 16+((z1 + 1)*120); - c2 = 16+((z2 + 1)*120); - c3 = 16+((z3 + 1)*120); - c4 = 16+((z4 + 1)*120); - if (c1 > 254) c1 = 254; - if (c2 > 254) c2 = 254; - if (c3 > 254) c3 = 254; - if (c4 > 254) c4 = 254; - Plot3D_interpquad(p3,x1,y1,z1,(Pixel) c1,x2,y2,z2,(Pixel) c2,x3,y3,z3,(Pixel) c3,x4,y4,z4,(Pixel) c4); - } -} - - - - - - - - - - - - diff --git a/Examples/GIFPlot/Makefile.in b/Examples/GIFPlot/Makefile.in deleted file mode 100644 index 4e51360c8..000000000 --- a/Examples/GIFPlot/Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -RANLIB = @RANLIB@ -OPT = - -INSTALL = ../install-sh -c -INSTALL_DATA = ${INSTALL} -m 644 -SHELL = /bin/sh - -all: - cd Lib && $(MAKE) OPT="$(OPT)" - -install: - $(INSTALL_DATA) Include/gifplot.h $(prefix)/include/gifplot.h - $(INSTALL_DATA) libgifplot.a $(exec_prefix)/lib/libgifplot.a - $(RANLIB) $(exec_prefix)/lib/libgifplot.a - -clean:: - rm -f *.@OBJEXT@ *~ libgifplot.a *_wrap* *_man* - cd Lib && $(MAKE) clean - rm -f config.log config.status config.cache - -check: all diff --git a/Examples/GIFPlot/Ocaml/check.list b/Examples/GIFPlot/Ocaml/check.list deleted file mode 100644 index e75ee586a..000000000 --- a/Examples/GIFPlot/Ocaml/check.list +++ /dev/null @@ -1,3 +0,0 @@ -# see top-level Makefile.in -full -simple diff --git a/Examples/GIFPlot/Ocaml/full/Makefile b/Examples/GIFPlot/Ocaml/full/Makefile deleted file mode 100644 index 4f35c43f9..000000000 --- a/Examples/GIFPlot/Ocaml/full/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Include -SRCS = -TARGET = gifcaml -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -lm -INCLUDES = -I../../Include -MLFILE = gifplot.ml -IOBJS = runme.cmo -PROGFILE = runme.ml - -all:: static - -static:: - $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ - IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ - SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_static - -dynamic:: - $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ - IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ - SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_dynamic - -clean:: - $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Ocaml/full/README b/Examples/GIFPlot/Ocaml/full/README deleted file mode 100644 index 4a2b400b5..000000000 --- a/Examples/GIFPlot/Ocaml/full/README +++ /dev/null @@ -1,8 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The ocaml program 'runme.ml' does something a little more -interesting. You'll have to go look at the header file to get a complete -listing of the functions. - - - - diff --git a/Examples/GIFPlot/Ocaml/full/cmap b/Examples/GIFPlot/Ocaml/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC C_float x) - [ x ; y ; z1 ; - (x +. dx) ; y ; z2 ; - (x +. dx) ; (y +. dy) ; z3 ; - x ; (y +. dx) ; z4 ; - (float_of_int (c + 16)) ]))) ; - y_loop (y +. dy) (j + 1) - end in - begin - y_loop ymin 0 ; - x_loop (x +. dx) (i + 1) - end - end in - x_loop xmin 0 - end - -let _ = print_endline "Making a nice 3D plot..." -let _ = drawsolid () - -let _ = _FrameBuffer_writeGIF (C_list [ frame ; cmap ; C_string "image.gif" ]) -let _ = print_endline "Write image.gif" diff --git a/Examples/GIFPlot/Ocaml/simple/Makefile b/Examples/GIFPlot/Ocaml/simple/Makefile deleted file mode 100644 index 50492efc7..000000000 --- a/Examples/GIFPlot/Ocaml/simple/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Include -SRCS = -TARGET = gifsimple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -lm -INCLUDES = -I../../Include -MLFILE = simple.ml -IOBJS = simple_wrap.o simple.cmo runme.cmo -PROGFILE = runme.ml - -all:: static - -static:: - $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ - IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ - SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_static - -dynamic:: - $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ - IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ - SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_static - -clean:: - $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Ocaml/simple/cmap b/Examples/GIFPlot/Ocaml/simple/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) { $c = 239; } - Plot3D_solidquad($p3,$x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); - $y = $y + $dy; - } - $x = $x + $dx; - } -} - -print "Making a nice 3D plot...\n"; -drawsolid(); - -FrameBuffer_writeGIF($frame,$cmap,"image.gif"); -print "Wrote image.gif\n"; - diff --git a/Examples/GIFPlot/Perl5/shadow/Makefile b/Examples/GIFPlot/Perl5/shadow/Makefile deleted file mode 100644 index c39eac52c..000000000 --- a/Examples/GIFPlot/Perl5/shadow/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -outcurrentdir -SRCS = -TARGET = gifplot -INTERFACEDIR = ../../Interface/ -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -lm -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5 - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static - -clean:: - $(MAKE) -f $(TOP)/Makefile perl5_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Perl5/shadow/README b/Examples/GIFPlot/Perl5/shadow/README deleted file mode 100644 index ab12e344e..000000000 --- a/Examples/GIFPlot/Perl5/shadow/README +++ /dev/null @@ -1,2 +0,0 @@ -This example use the file in ../../Interface/gifplot.i to build -an interface with shadow classes. Run the script 'runme.pl'. diff --git a/Examples/GIFPlot/Perl5/shadow/cmap b/Examples/GIFPlot/Perl5/shadow/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9ICclear($BLACK); - -$p3 = new gifplot::Plot3D($frame,$xmin,$ymin,$zmin,$xmax,$ymax,$zmax); -$p3->lookat(2*($zmax-$zmin)); -$p3->autoperspective(40); -$p3->rotu(60); -$p3->rotr(30); -$p3->rotd(10); - -sub drawsolid { - $p3->clear($BLACK); - $p3->start(); - my $dx = 1.0*($xmax-$xmin)/$nxpoints; - my $dy = 1.0*($ymax-$ymin)/$nypoints; - my $cscale = 240.0/($zmax-$zmin); - my $x = $xmin; - for ($i = 0; $i < $nxpoints; $i++) { - my $y = $ymin; - for ($j = 0; $j < $nypoints; $j++) { - my $z1 = func($x,$y); - my $z2 = func($x+$dx,$y); - my $z3 = func($x+$dx,$y+$dy); - my $z4 = func($x,$y+$dy); - my $c1 = $cscale*($z1-$zmin); - my $c2 = $cscale*($z2-$zmin); - my $c3 = $cscale*($z3-$zmin); - my $c4 = $cscale*($z4-$zmin); - my $c = ($c1+$c2+$c3+$c4)/4; - if ($c < 0) { $c = 0; } - if ($c > 239) { $c = 239; } - $p3->solidquad($x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); - $y = $y + $dy; - } - $x = $x + $dx; - } -} - -print "Making a nice 3D plot...\n"; -drawsolid(); - -$frame->writeGIF($cmap,"image.gif"); -print "Wrote image.gif\n"; - diff --git a/Examples/GIFPlot/Perl5/simple/Makefile b/Examples/GIFPlot/Perl5/simple/Makefile deleted file mode 100644 index 36a8fa938..000000000 --- a/Examples/GIFPlot/Perl5/simple/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -SRCS = -TARGET = simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static - -clean:: - $(MAKE) -f $(TOP)/Makefile perl5_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Perl5/simple/README b/Examples/GIFPlot/Perl5/simple/README deleted file mode 100644 index c2c799a70..000000000 --- a/Examples/GIFPlot/Perl5/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. The script 'runme.pl' runs the example. - - diff --git a/Examples/GIFPlot/Perl5/simple/runme.pl b/Examples/GIFPlot/Perl5/simple/runme.pl deleted file mode 100644 index f28255e7c..000000000 --- a/Examples/GIFPlot/Perl5/simple/runme.pl +++ /dev/null @@ -1,28 +0,0 @@ -# Draw some simple shapes -print "Drawing some basic shapes\n"; - -use simple; - -$cmap = simple::new_ColorMap(); -$f = simple::new_FrameBuffer(400,400); - -# Clear the picture -simple::FrameBuffer_clear($f,$simple::BLACK); - -# Make a red box -simple::FrameBuffer_box($f,40,40,200,200,$simple::RED); - -# Make a blue circle -simple::FrameBuffer_circle($f,200,200,40,$simple::BLUE); - -# Make green line -simple::FrameBuffer_line($f,10,390,390,200, $simple::GREEN); - -# Write an image out to disk - -simple::FrameBuffer_writeGIF($f,$cmap,"image.gif"); -print "Wrote image.gif\n"; - -simple::delete_FrameBuffer($f); -simple::delete_ColorMap($cmap); - diff --git a/Examples/GIFPlot/Perl5/simple/simple.i b/Examples/GIFPlot/Perl5/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Perl5/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/GIFPlot/Php/check.list b/Examples/GIFPlot/Php/check.list deleted file mode 100644 index e75ee586a..000000000 --- a/Examples/GIFPlot/Php/check.list +++ /dev/null @@ -1,3 +0,0 @@ -# see top-level Makefile.in -full -simple diff --git a/Examples/GIFPlot/Php/full/Makefile b/Examples/GIFPlot/Php/full/Makefile deleted file mode 100644 index e33e7a730..000000000 --- a/Examples/GIFPlot/Php/full/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Include -noproxy -SRCS = -TARGET = php_gifplot -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -lm -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php - -clean:: - $(MAKE) -f $(TOP)/Makefile php_clean - rm -f *.gif - rm -f php_gifplot.h - -check: all diff --git a/Examples/GIFPlot/Php/full/README b/Examples/GIFPlot/Php/full/README deleted file mode 100644 index f8d38d9af..000000000 --- a/Examples/GIFPlot/Php/full/README +++ /dev/null @@ -1,4 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The script 'runme.php3' does something a little more -interesting. You'll have to go look at the header file to get a complete -listing of the functions. diff --git a/Examples/GIFPlot/Php/full/cmap b/Examples/GIFPlot/Php/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) { $c = 239; } - Plot3D_solidquad($p3, $x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); - $y = $y + $dy; - } - $x = $x + $dx; - } -} - -print "Making a nice 3D plot...\n"; -drawsolid(); - -FrameBuffer_writeGIF($frame, $cmap,"image.gif"); -print "Wrote image.gif\n"; - -?> diff --git a/Examples/GIFPlot/Php/shadow/Makefile b/Examples/GIFPlot/Php/shadow/Makefile deleted file mode 100644 index df8ee30c0..000000000 --- a/Examples/GIFPlot/Php/shadow/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface -SRCS = -TARGET = php_gifplot -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -lm -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php - -clean:: - $(MAKE) -f $(TOP)/Makefile php_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Php/shadow/README b/Examples/GIFPlot/Php/shadow/README deleted file mode 100644 index 3e91f7d59..000000000 --- a/Examples/GIFPlot/Php/shadow/README +++ /dev/null @@ -1,2 +0,0 @@ -This example use the file in ../../Interface/gifplot.i to build -an interface with shadow classes. Run the script 'runme.php3'. diff --git a/Examples/GIFPlot/Php/shadow/cmap b/Examples/GIFPlot/Php/shadow/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9ICclear(BLACK); - - -$p3 = new Plot3D($frame,$xmin,$ymin,$zmin,$xmax,$ymax,$zmax); -$p3->lookat(2*($zmax-$zmin)); -$p3->autoperspective(40); -$p3->rotu(60); -$p3->rotr(30); -$p3->rotd(10); - -function drawsolid() { - global $xmax; - global $xmin; - global $ymax; - global $ymin; - global $zmin; - global $zmax; - global $nxpoints; - global $nypoints; - global $p3; - - $p3->clear(BLACK); - $p3->start(); - $dx = 1.0*($xmax-$xmin)/$nxpoints; - $dy = 1.0*($ymax-$ymin)/$nypoints; - $cscale = 240.0/($zmax-$zmin); - $x = $xmin; - for ($i = 0; $i < $nxpoints; $i++) { - $y = $ymin; - for ($j = 0; $j < $nypoints; $j++) { - $z1 = func($x,$y); - $z2 = func($x+$dx,$y); - $z3 = func($x+$dx,$y+$dy); - $z4 = func($x,$y+$dy); - $c1 = $cscale*($z1-$zmin); - $c2 = $cscale*($z2-$zmin); - $c3 = $cscale*($z3-$zmin); - $c4 = $cscale*($z4-$zmin); - $c = ($c1+$c2+$c3+$c4)/4; - if ($c < 0) { $c = 0; } - if ($c > 239) { $c = 239; } - $p3->solidquad($x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); - $y = $y + $dy; - } - $x = $x + $dx; - } -} - -print "Making a nice 3D plot...\n"; -drawsolid(); - -$frame->writeGIF($cmap,"image.gif"); -print "Wrote image.gif\n"; - -?> diff --git a/Examples/GIFPlot/Php/simple/Makefile b/Examples/GIFPlot/Php/simple/Makefile deleted file mode 100644 index e60b641fa..000000000 --- a/Examples/GIFPlot/Php/simple/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -noproxy -SRCS = -TARGET = php_simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php - -clean:: - $(MAKE) -f $(TOP)/Makefile php_clean - rm -f *.gif - rm -f php_simple.h - -check: all diff --git a/Examples/GIFPlot/Php/simple/README b/Examples/GIFPlot/Php/simple/README deleted file mode 100644 index c2c799a70..000000000 --- a/Examples/GIFPlot/Php/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. The script 'runme.pl' runs the example. - - diff --git a/Examples/GIFPlot/Php/simple/runme.php b/Examples/GIFPlot/Php/simple/runme.php deleted file mode 100644 index cf21a0927..000000000 --- a/Examples/GIFPlot/Php/simple/runme.php +++ /dev/null @@ -1,32 +0,0 @@ - - diff --git a/Examples/GIFPlot/Php/simple/simple.i b/Examples/GIFPlot/Php/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Php/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/GIFPlot/Pike/check.list b/Examples/GIFPlot/Pike/check.list deleted file mode 100644 index d38998cab..000000000 --- a/Examples/GIFPlot/Pike/check.list +++ /dev/null @@ -1,2 +0,0 @@ -# see top-level Makefile.in -simple diff --git a/Examples/GIFPlot/Pike/simple/Makefile b/Examples/GIFPlot/Pike/simple/Makefile deleted file mode 100644 index d339e0333..000000000 --- a/Examples/GIFPlot/Pike/simple/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -SRCS = -TARGET = simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypike' INTERFACE='$(INTERFACE)' pike_static - -clean:: - $(MAKE) -f $(TOP)/Makefile pike_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Pike/simple/README b/Examples/GIFPlot/Pike/simple/README deleted file mode 100644 index 177b3633b..000000000 --- a/Examples/GIFPlot/Pike/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. The script 'runme.pike' runs the example. - - diff --git a/Examples/GIFPlot/Pike/simple/runme.pike b/Examples/GIFPlot/Pike/simple/runme.pike deleted file mode 100644 index 0e70235f1..000000000 --- a/Examples/GIFPlot/Pike/simple/runme.pike +++ /dev/null @@ -1,30 +0,0 @@ -int main() -{ - // Draw some simple shapes - write("Drawing some basic shapes\n"); - - .simple.ColorMap cmap = .simple.new_ColorMap(); - .simple.FrameBuffer f = .simple.new_FrameBuffer(400, 400); - - // Clear the picture - .simple.FrameBuffer_clear(f, .simple.BLACK); - - // Make a red box - .simple.FrameBuffer_box(f, 40, 40, 200, 200, .simple.RED); - - // Make a blue circle - .simple.FrameBuffer_circle(f, 200, 200, 40, .simple.BLUE); - - // Make green line - .simple.FrameBuffer_line(f, 10, 390, 390, 200, .simple.GREEN); - - // Write an image out to disk - .simple.FrameBuffer_writeGIF(f, cmap, "image.gif"); - write("Wrote image.gif\n"); - - .simple.delete_FrameBuffer(f); - .simple.delete_ColorMap(cmap); - - return 0; -} - diff --git a/Examples/GIFPlot/Pike/simple/simple.i b/Examples/GIFPlot/Pike/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Pike/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/GIFPlot/Python/check.list b/Examples/GIFPlot/Python/check.list deleted file mode 100644 index 13de977af..000000000 --- a/Examples/GIFPlot/Python/check.list +++ /dev/null @@ -1,4 +0,0 @@ -# see top-level Makefile.in -full -shadow -simple diff --git a/Examples/GIFPlot/Python/full/Makefile b/Examples/GIFPlot/Python/full/Makefile deleted file mode 100644 index 83a7c864b..000000000 --- a/Examples/GIFPlot/Python/full/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../preinst-swig -SWIGOPT = -I../../Include -SRCS = -TARGET = gifplot -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypython' INTERFACE='$(INTERFACE)' python_static - -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - rm -f *.gif - -check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/full/README b/Examples/GIFPlot/Python/full/README deleted file mode 100644 index 52971e40a..000000000 --- a/Examples/GIFPlot/Python/full/README +++ /dev/null @@ -1,8 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The script 'runme.py' does something a little more -interesting. You'll have to go look at the header file to get a complete -listing of the functions. - - - - diff --git a/Examples/GIFPlot/Python/full/cmap b/Examples/GIFPlot/Python/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 : c = 239 - Plot3D_solidquad(p3,x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) - y = y + dy - x = x + dx - -print "Making a nice 3D plot..." -drawsolid() - -FrameBuffer_writeGIF(frame,cmap,"image.gif") -print "Wrote image.gif" - diff --git a/Examples/GIFPlot/Python/shadow/Makefile b/Examples/GIFPlot/Python/shadow/Makefile deleted file mode 100644 index 3ae9a9897..000000000 --- a/Examples/GIFPlot/Python/shadow/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../preinst-swig -SWIGOPT = -outcurrentdir -SRCS = -TARGET = gifplot -INTERFACEDIR = ../../Interface/ -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static - -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - rm -f *.gif - -check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/shadow/README b/Examples/GIFPlot/Python/shadow/README deleted file mode 100644 index aa761e240..000000000 --- a/Examples/GIFPlot/Python/shadow/README +++ /dev/null @@ -1,8 +0,0 @@ -This example illustrates Python shadow classes. Take a look at -the file GIFPlot/Interface/gifplot.i - - - - - - diff --git a/Examples/GIFPlot/Python/shadow/cmap b/Examples/GIFPlot/Python/shadow/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 : c = 239 - p3.solidquad(x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) - y = y + dy - x = x + dx - -print "Making a nice 3D plot..." -drawsolid() - -frame.writeGIF(cmap,"image.gif") -print "Wrote image.gif" - diff --git a/Examples/GIFPlot/Python/simple/Makefile b/Examples/GIFPlot/Python/simple/Makefile deleted file mode 100644 index 9fc9a6c72..000000000 --- a/Examples/GIFPlot/Python/simple/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../preinst-swig -SWIGOPT = -SRCS = -TARGET = simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypython' INTERFACE='$(INTERFACE)' python_static - -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - rm -f *.gif - -check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/simple/README b/Examples/GIFPlot/Python/simple/README deleted file mode 100644 index 22152c665..000000000 --- a/Examples/GIFPlot/Python/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. The script 'runme.py' runs the example. - - diff --git a/Examples/GIFPlot/Python/simple/runme.py b/Examples/GIFPlot/Python/simple/runme.py deleted file mode 100644 index dade67767..000000000 --- a/Examples/GIFPlot/Python/simple/runme.py +++ /dev/null @@ -1,27 +0,0 @@ -# Draw some simple shapes -print "Drawing some basic shapes" -import simple - -cmap = simple.new_ColorMap() -f = simple.new_FrameBuffer(400,400) - -# Clear the picture -simple.FrameBuffer_clear(f,simple.BLACK) - -# Make a red box -simple.FrameBuffer_box(f,40,40,200,200,simple.RED) - -# Make a blue circle -simple.FrameBuffer_circle(f,200,200,40,simple.BLUE) - -# Make green line -simple.FrameBuffer_line(f,10,390,390,200, simple.GREEN) - -# Write an image out to disk - -simple.FrameBuffer_writeGIF(f,cmap,"image.gif") -print "Wrote image.gif" - -simple.delete_FrameBuffer(f) -simple.delete_ColorMap(cmap) - diff --git a/Examples/GIFPlot/Python/simple/simple.i b/Examples/GIFPlot/Python/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Python/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/GIFPlot/README b/Examples/GIFPlot/README deleted file mode 100644 index ac1025a42..000000000 --- a/Examples/GIFPlot/README +++ /dev/null @@ -1,59 +0,0 @@ -GIFPlot -======= - -To illustrate various SWIG features, the following examples involve -building an interface to a small, but somewhat useful graphics library -for creating 2D and 3D images in the form of GIF files. The Perl, -Python, Tcl, Java, Ruby etc. directories contain various examples specific to -those languages. - -This library was originally developed as part of the SPaSM molecular -dynamics project at Los Alamos National Laboratory. However, due to -patent enforcement issues related to LZW encoding and a general lack -of time on the part of the author, the library was never officially -released. On the plus side, a number of people have found it to be a -useful easter egg within the SWIG distribution :-). - - -DUE TO PATENT RESTRICTIONS ON THE LZW COMPRESSION ALGORITHM, THIS -LIBRARY ONLY PRODUCES UNCOMPRESSED GIF FILES. SO THERE. - - -Building the Library -==================== - -In order to run the examples, it is first necessary to build the GIFPlot -C library. To do this, simply run make: - - make - -Running the Examples -==================== - -Once the library has been built, go to your chosen language directory, -that is, Perl, Python, Tcl, Java, Ruby etc. Each example should have a -README file with a description. - -Each example can be compiled using the makefile in each example directory. This -makefile uses the top level makefile in the "Examples" directory of the distribution. -If the example doesn't compile, you will need to adjust the settings in this file. - -Documentation -============= - -Read the source Luke. The examples should be pretty much self-explanatory. -The header file Include/gifplot.h contains the full API. - -The original documentation for the library can be found online at: - - http://www.dabeaz.com/gifplot/index.html - - -Let me know what you think! -=========================== -If you found this example to be useful, confusing, or otherwise, I would like to know -about it. Suggestions for improvement are welcome. - --- Dave (dave@dabeaz.com) - - diff --git a/Examples/GIFPlot/Ruby/check.list b/Examples/GIFPlot/Ruby/check.list deleted file mode 100644 index 13de977af..000000000 --- a/Examples/GIFPlot/Ruby/check.list +++ /dev/null @@ -1,4 +0,0 @@ -# see top-level Makefile.in -full -shadow -simple diff --git a/Examples/GIFPlot/Ruby/full/Makefile b/Examples/GIFPlot/Ruby/full/Makefile deleted file mode 100644 index 5af8bc832..000000000 --- a/Examples/GIFPlot/Ruby/full/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Include -SRCS = -TARGET = gifplot -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static - -clean:: - $(MAKE) -f $(TOP)/Makefile ruby_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Ruby/full/README b/Examples/GIFPlot/Ruby/full/README deleted file mode 100644 index 22af6cb06..000000000 --- a/Examples/GIFPlot/Ruby/full/README +++ /dev/null @@ -1,8 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The script 'runme.rb' does something a little more -interesting. You'll have to go look at the header file to get a complete -listing of the functions. - - - - diff --git a/Examples/GIFPlot/Ruby/full/cmap b/Examples/GIFPlot/Ruby/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 - Plot3D_solidquad(P3,x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) - y = y + dy - end - x = x + dx - end -end - -puts "Making a nice 3D plot..." -drawsolid() - -FrameBuffer_writeGIF(frame,cmap,"image.gif") -puts "Wrote image.gif" diff --git a/Examples/GIFPlot/Ruby/shadow/Makefile b/Examples/GIFPlot/Ruby/shadow/Makefile deleted file mode 100644 index 8cbea2a57..000000000 --- a/Examples/GIFPlot/Ruby/shadow/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -outcurrentdir -SRCS = -TARGET = gifplot -INTERFACEDIR = ../../Interface/ -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static - -clean:: - $(MAKE) -f $(TOP)/Makefile ruby_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Ruby/shadow/README b/Examples/GIFPlot/Ruby/shadow/README deleted file mode 100644 index 7a33e137f..000000000 --- a/Examples/GIFPlot/Ruby/shadow/README +++ /dev/null @@ -1,5 +0,0 @@ -This example illustrates Ruby shadow classes. Take a look at -the file GIFPlot/Interface/gifplot.i - -Actually Ruby module of SWIG needs no shadow class. But this example -is named "shadow" in order to be consistent with other languages. diff --git a/Examples/GIFPlot/Ruby/shadow/cmap b/Examples/GIFPlot/Ruby/shadow/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 - P3.solidquad(x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) - y = y + dy - end - x = x + dx - end -end - -puts "Making a nice 3D plot..." -drawsolid() - -frame.writeGIF(cmap,"image.gif") -puts "Wrote image.gif" - diff --git a/Examples/GIFPlot/Ruby/simple/Makefile b/Examples/GIFPlot/Ruby/simple/Makefile deleted file mode 100644 index f7ca1a7d8..000000000 --- a/Examples/GIFPlot/Ruby/simple/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -SRCS = -TARGET = simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static - -clean:: - $(MAKE) -f $(TOP)/Makefile ruby_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Ruby/simple/README b/Examples/GIFPlot/Ruby/simple/README deleted file mode 100644 index 9b51038bf..000000000 --- a/Examples/GIFPlot/Ruby/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. The script 'runme.rb' runs the example. - - diff --git a/Examples/GIFPlot/Ruby/simple/runme.rb b/Examples/GIFPlot/Ruby/simple/runme.rb deleted file mode 100644 index e8bf5a40f..000000000 --- a/Examples/GIFPlot/Ruby/simple/runme.rb +++ /dev/null @@ -1,27 +0,0 @@ -# Draw some simple shapes -puts "Drawing some basic shapes" -require 'simple' - -cmap = Simple.new_ColorMap() -f = Simple.new_FrameBuffer(400,400) - -# Clear the picture -Simple.FrameBuffer_clear(f,Simple::BLACK) - -# Make a red box -Simple.FrameBuffer_box(f,40,40,200,200,Simple::RED) - -# Make a blue circle -Simple.FrameBuffer_circle(f,200,200,40,Simple::BLUE) - -# Make green line -Simple.FrameBuffer_line(f,10,390,390,200, Simple::GREEN) - -# Write an image out to disk - -Simple.FrameBuffer_writeGIF(f,cmap,"image.gif") -puts "Wrote image.gif" - -Simple.delete_FrameBuffer(f) -Simple.delete_ColorMap(cmap) - diff --git a/Examples/GIFPlot/Ruby/simple/simple.i b/Examples/GIFPlot/Ruby/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Ruby/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/GIFPlot/Tcl/check.list b/Examples/GIFPlot/Tcl/check.list deleted file mode 100644 index 2b6e3d28a..000000000 --- a/Examples/GIFPlot/Tcl/check.list +++ /dev/null @@ -1,4 +0,0 @@ -# see top-level Makefile.in -full -mandel -simple diff --git a/Examples/GIFPlot/Tcl/full/Makefile b/Examples/GIFPlot/Tcl/full/Makefile deleted file mode 100644 index 0c016e364..000000000 --- a/Examples/GIFPlot/Tcl/full/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Include -SRCS = -TARGET = gifplot -INTERFACE = gifplot.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh - -clean:: - $(MAKE) -f $(TOP)/Makefile tcl_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Tcl/full/README b/Examples/GIFPlot/Tcl/full/README deleted file mode 100644 index bdba4e8b0..000000000 --- a/Examples/GIFPlot/Tcl/full/README +++ /dev/null @@ -1,8 +0,0 @@ -This example runs the entire gifplot.h header file through SWIG without -any changes. The script 'runme.tcl' does something a little more -interesting. You'll have to go look at the header file to get a complete -listing of the functions. - - - - diff --git a/Examples/GIFPlot/Tcl/full/cmap b/Examples/GIFPlot/Tcl/full/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239} { set c 239 } - Plot3D_solidquad $p3 $x $y $z1 [expr {$x+$dx}] $y $z2 [expr {$x+$dx}] [expr {$y+$dy}] $z3 $x [expr {$y+$dy}] $z4 [expr {$c+16}] - set y [expr {$y + $dy}] - } - set x [expr {$x + $dx}] - } -} - -puts "Making a nice 3D plot..." -drawsolid - -FrameBuffer_writeGIF $frame $cmap "image.gif" -puts "Wrote image.gif" - diff --git a/Examples/GIFPlot/Tcl/mandel/Makefile b/Examples/GIFPlot/Tcl/mandel/Makefile deleted file mode 100644 index 9280d7bb2..000000000 --- a/Examples/GIFPlot/Tcl/mandel/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface -SRCS = -TARGET = gifplot -INTERFACE = mandel.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mywish' INTERFACE='$(INTERFACE)' wish - -clean:: - $(MAKE) -f $(TOP)/Makefile tcl_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Tcl/mandel/README b/Examples/GIFPlot/Tcl/mandel/README deleted file mode 100644 index a533d09b8..000000000 --- a/Examples/GIFPlot/Tcl/mandel/README +++ /dev/null @@ -1,6 +0,0 @@ -Kill lots of time exploring the Mandelbrot set. This example uses -the full SWIG interface file located in ../../Interface. To run -the program, type 'wish mandel.tcl'. - - - diff --git a/Examples/GIFPlot/Tcl/mandel/cmap b/Examples/GIFPlot/Tcl/mandel/cmap deleted file mode 100644 index a20c331a9573dd8443380680bfe2cc428780d8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC {BoxBegin %W %x %y} - bind $c {BoxDrag %W %x %y} - bind $c "BoxFinish %W %x %y $p2 $mxmin $mymin $mxmax $mymax $func" -} - -proc BoxBegin {w x y} { - global box - set box(anchor) [list $x $y] - catch {unset box(last)} -} - -proc BoxDrag { w x y} { - global box - catch {$w delete $box(last)} - set box(last) [eval {$w create rect} $box(anchor) {$x $y -tag box -outline white}] -} - -proc BoxFinish {w x y p2 mxmin mymin mxmax mymax func } { - global box - set start $box(anchor) - set x1 [lrange $start 0 0] - set y1 [lrange $start 1 1] - catch {$w delete $box(last)} -# Call the handler function - $func $p2 $mxmin $mymin $mxmax $mymax $x1 $y1 $x $y -} - -proc display_image {filename p2 handler} { - global __imageno __images - set i [image create photo -file $filename] - set tl .image$__imageno - toplevel $tl - frame $tl.img - frame $tl.button - - set width [image width $i] - set height [image height $i] - canvas $tl.img.c -width [expr {$width+0}] -height [expr {$height+0}] - pack $tl.img.c - $tl.img.c create image 0 0 -image $i -anchor nw - label $tl.button.label -text $filename - pack $tl.button.label -side left - button $tl.button.dismiss -text "Dismiss" -command "dismiss $tl $i" -width 10 - pack $tl.button.dismiss -side right - pack $tl.img $tl.button -side top -fill x - BoxInit $tl.img.c $p2 [$p2 cget -xmin] [$p2 cget -ymin] [$p2 cget -xmax] [$p2 cget -ymax] $handler - bind $tl "dismiss $tl $i" - bind $tl "dismiss $tl $i" - - # Bind some actions to the canvas - - incr __imageno 1 -} - -proc test {} { - puts "hello" -} - diff --git a/Examples/GIFPlot/Tcl/mandel/mandel.i b/Examples/GIFPlot/Tcl/mandel/mandel.i deleted file mode 100644 index 0b19f4727..000000000 --- a/Examples/GIFPlot/Tcl/mandel/mandel.i +++ /dev/null @@ -1,47 +0,0 @@ -// Special module to run the mandlebrot set -%module gifplot -%include gifplot.i - -%inline %{ - -void mandel(Plot2D *p2, int tol) { - double scalingx; - double scalingy; - double zr,zi,ztr,zti,cr,ci; - double cscale; - int i,j,n; - FrameBuffer *f; - - f = p2->frame; - scalingx = (p2->xmax-p2->xmin)/f->width; - scalingy = (p2->ymax-p2->ymin)/f->height; - - cscale = 239.0/tol; - printf("working...\n"); - for (i = 0; i < f->width; i++) { - for (j = 0; j < f->height; j++) { - zr = scalingx*i + p2->xmin; - zi = scalingy*j + p2->ymin; - cr = zr; - ci = zi; - n = 0; - while (n < tol) { - ztr = zr*zr-zi*zi + cr; - zti = 2*zr*zi + ci; - zr = ztr; - zi = zti; - if (ztr*ztr + zti*zti > 20) break; - n = n + 1; - } - - if (n >= tol) FrameBuffer_plot(f,i,j,BLACK); - else FrameBuffer_plot(f,i,j,16+(int) (n*cscale)); - } - if ((i % 10) == 0) printf("%d\n",i); - } - -} - -%} - - diff --git a/Examples/GIFPlot/Tcl/mandel/mandel.tcl b/Examples/GIFPlot/Tcl/mandel/mandel.tcl deleted file mode 100644 index 3e1600bc1..000000000 --- a/Examples/GIFPlot/Tcl/mandel/mandel.tcl +++ /dev/null @@ -1,170 +0,0 @@ -catch { load ./gifplot[info sharedlibextension] } -source display.tcl -set tcl_precision 17 -set f [FrameBuffer -args 400 400] -set cmap [ColorMap -args cmap] -set p2 [Plot2D -args $f -3 -2 1 2] - -set xmin -3 -set xmax 1 -set ymin -2.0 -set ymax 2.0 -set tolerance 240 -set filename mandel.gif - -# Make a plot from the above parms - -proc make_plot {} { - global p2 cmap tolerance - global xmin ymin xmax ymax filename - $p2 setrange $xmin $ymin $xmax $ymax - $p2 start - . config -cursor watch - update - mandel $p2 $tolerance - . config -cursor arrow - [$p2 cget -frame] writeGIF $cmap $filename - display_image $filename $p2 set_zoom -} - - -# Take some screen coordinates and set global min and max values - -proc set_zoom {p2 mxmin mymin mxmax mymax x1 y1 x2 y2} { - global xmin ymin xmax ymax - - set frame [$p2 cget -frame] - set width [$frame cget -width] - set height [$frame cget -height] - - if {$x1 < 0} {set x1 0} - if {$x1 > ($width)} {set x1 $width} - if {$x2 < 0} {set x2 0} - if {$x2 > ($width)} {set x2 $width} - if {$x1 < $x2} {set ixmin $x1; set ixmax $x2} {set ixmin $x2; set ixmax $x1} - - if {$y1 < 0} {set y1 0} - if {$y1 > ($height)} {set y1 $height} - if {$y2 < 0} {set y2 0} - if {$y2 > ($height)} {set y2 $height} - if {$y1 < $y2} {set iymin $y1; set iymax $y2} {set iymin $y2; set iymax $y1} - - # Now determine new min and max values based on screen location - - set xmin [expr {$mxmin + ($mxmax-$mxmin)*($ixmin)/($width)}] - set xmax [expr {$mxmin + ($mxmax-$mxmin)*($ixmax)/($width)}] - set ymin [expr {$mymin + ($mymax-$mymin)*(($height)-($iymax))/($height)}] - set ymax [expr {$mymin + ($mymax-$mymin)*(($height)-($iymin))/($height)}] - - catch {make_plot} -} - -# Box drag constrained to a square -proc BoxDrag { w x y} { - global box - catch {$w delete $box(last)} - set x1 [lrange $box(anchor) 0 0] - set y1 [lrange $box(anchor) 1 1] - set dx [expr {$x - $x1}] - set dy [expr {$y - $y1}] - if {abs($dy) > abs($dx)} {set dx $dy} - set newx [expr {$x1 + $dx}] - set newy [expr {$y1 + $dx}] - set box(last) [eval {$w create rect} $box(anchor) {$newx $newy -tag box -outline white}] -} - - -proc BoxFinish {w x y p2 mxmin mymin mxmax mymax func } { - global box - set start $box(anchor) - set x1 [lrange $box(anchor) 0 0] - set y1 [lrange $box(anchor) 1 1] - set dx [expr {$x - $x1}] - set dy [expr {$y - $y1}] - if {($dx == 0) || ($dy == 0)} { - catch {$w delete $box(last)} - return - } - if {abs($dy) > abs($dx)} {set dx $dy} - set newx [expr {$x1 + $dx}] - set newy [expr {$y1 + $dx}] - $w config -cursor watch - update -# Call the handler function - $func $p2 $mxmin $mymin $mxmax $mymax $x1 $y1 $newx $newy - catch {$w delete $box(last)} - $w config -cursor arrow -} - - -# Create a few frames - -wm title . Mandelbrot -frame .title -relief groove -borderwidth 1 -label .title.name -text "Mandelbrot Set" -button .title.quit -text "Quit" -command "exit" -button .title.about -text "About" -command "about" -pack .title.name -side left -pack .title.quit .title.about -side right - -frame .func -relief groove -borderwidth 1 - -frame .func.xrange -label .func.xrange.xrlabel -text "X range" -width 12 -entry .func.xrange.xmin -textvar xmin -width 8 -label .func.xrange.xtolabel -text "to" -entry .func.xrange.xmax -textvar xmax -width 8 -pack .func.xrange.xrlabel .func.xrange.xmin .func.xrange.xtolabel .func.xrange.xmax -side left - -frame .func.yrange -label .func.yrange.yrlabel -text "Y range" -width 12 -entry .func.yrange.ymin -textvar ymin -width 8 -label .func.yrange.ytolabel -text "to" -entry .func.yrange.ymax -textvar ymax -width 8 -pack .func.yrange.yrlabel .func.yrange.ymin .func.yrange.ytolabel .func.yrange.ymax -side left - -frame .func.npoints -label .func.npoints.label -text "Tolerance " -width 12 -entry .func.npoints.npoints -textvar tolerance -width 8 -scale .func.npoints.scale -from 0 -to 2500 -variable tolerance -orient horizontal -showvalue false \ - -sliderlength 13 -bigincrement 10 -resolution 10 -pack .func.npoints.label .func.npoints.npoints .func.npoints.scale -side left - -pack .func.xrange .func.yrange .func.npoints -side top -fill x - -# Filename dialog - -frame .save -relief groove -borderwidth 1 - -frame .save.file -label .save.file.label -text "Save as" -width 12 -entry .save.file.filename -textvar filename -width 20 -pack .save.file.label .save.file.filename -side left -pack .save.file -side left -fill x -button .save.go -text "Plot" -command "make_plot" -pack .save.go -side right - -bind .save.file.filename {make_plot} - -pack .title .func .save -side top -fill both - -proc about { } { - toplevel .about -width 350 - - message .about.m -text "\ -Mandelbrot Set\n\n\ -Copyright (c) 1997\n\ -Dave Beazley\n\ -University of Utah\n\n\ -Creates a plot of the Mandelbrot set. Any displayed image can be zoomed by clicking and \ -dragging. Although the main calculation is written in C, it may take awhile for each \ -image to be calculated (be patient). Image quality can be improved at the expense of speed \ -by increasing the tolerance value.\n" - -button .about.okay -text "Ok" -command {destroy .about} - -pack .about.m .about.okay -side top -focus .about.okay -} - -make_plot diff --git a/Examples/GIFPlot/Tcl/simple/Makefile b/Examples/GIFPlot/Tcl/simple/Makefile deleted file mode 100644 index 752d79c10..000000000 --- a/Examples/GIFPlot/Tcl/simple/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../../.. -SWIG = $(TOP)/../swig -SWIGOPT = -SRCS = -TARGET = simple -INTERFACE = simple.i -LIBS = -L../.. -lgifplot -INCLUDES = -I../../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh - -clean:: - $(MAKE) -f $(TOP)/Makefile tcl_clean - rm -f *.gif - -check: all diff --git a/Examples/GIFPlot/Tcl/simple/README b/Examples/GIFPlot/Tcl/simple/README deleted file mode 100644 index d6b291c92..000000000 --- a/Examples/GIFPlot/Tcl/simple/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a very minimalistic example in which just a few functions -and constants from library are wrapped and used to draw some simple -shapes. The script 'runme.tcl' runs the example. - - diff --git a/Examples/GIFPlot/Tcl/simple/runme.tcl b/Examples/GIFPlot/Tcl/simple/runme.tcl deleted file mode 100644 index e3f41266c..000000000 --- a/Examples/GIFPlot/Tcl/simple/runme.tcl +++ /dev/null @@ -1,27 +0,0 @@ -# Draw some simple shapes -puts "Drawing some basic shapes" - -catch { load ./simple[info sharedlibextension] simple} - -set cmap [new_ColorMap] -set f [new_FrameBuffer 400 400] - -# Clear the picture -FrameBuffer_clear $f $BLACK - -# Make a red box -FrameBuffer_box $f 40 40 200 200 $RED - -# Make a blue circle -FrameBuffer_circle $f 200 200 40 $BLUE - -# Make green line -FrameBuffer_line $f 10 390 390 200 $GREEN - -# Write an image out to disk -FrameBuffer_writeGIF $f $cmap image.gif -puts "Wrote image.gif" - -delete_FrameBuffer $f -delete_ColorMap $cmap - diff --git a/Examples/GIFPlot/Tcl/simple/simple.i b/Examples/GIFPlot/Tcl/simple/simple.i deleted file mode 100644 index 457bc4c09..000000000 --- a/Examples/GIFPlot/Tcl/simple/simple.i +++ /dev/null @@ -1,38 +0,0 @@ -/* This example shows a very simple interface wrapping a few - primitive declarations */ - -%module simple -%{ -#include "gifplot.h" -%} - -typedef unsigned char Pixel; - -/* Here are a few useful functions */ - -ColorMap *new_ColorMap(char *filename = 0); -void delete_ColorMap(ColorMap *cmap); - -FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -void delete_FrameBuffer(FrameBuffer *frame); -void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); - -/* And some useful constants */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - - - - - diff --git a/Examples/chicken/zlib/Makefile b/Examples/chicken/zlib/Makefile deleted file mode 100644 index 720701444..000000000 --- a/Examples/chicken/zlib/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -INTERFACE = example.i -SRCS = -CXXSRCS = -TARGET = zlib -INCLUDE = -SWIGOPT = -I/usr/include -CFLAGS = -VARIANT = -LIBS = -lz -VARIANT = _direct - -all:: $(TARGET) - -$(TARGET): $(INTERFACE) $(SRCS) - $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) - -clean:: - $(MAKE) -f $(TOP)/Makefile chicken_clean - rm -f example.scm - rm -f $(TARGET) - -check:: - csi test-zlib.scm diff --git a/Examples/chicken/zlib/README.html b/Examples/chicken/zlib/README.html deleted file mode 100644 index b082a310c..000000000 --- a/Examples/chicken/zlib/README.html +++ /dev/null @@ -1,1666 +0,0 @@ - - - - zlib - Chicken - SWIG example - - -

        zlib - Chicken - SWIG

        - -

        Table of Contents

        - Building the example
        - zlib.h
        - How the zlib wrapper was developed
        - -

        Building the example

        - - zlib must be installed for this example to work.
        - - Just type make to build this example.
        - - If zlib is not installed in /usr/lib and /usr/include, then do - something similar to the following: - -
        - 
        make SWIGOPT="-I/usr/local/include" LIBS="-L/usr/local/lib -lz"
        -
        - -

        zlib.h

        -
        - 
        -001: /* zlib.h -- interface of the 'zlib' general purpose compression library
-002:   version 1.1.4, March 11th, 2002
-003: 
-004:   Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-005: 
-006:   This software is provided 'as-is', without any express or implied
-007:   warranty.  In no event will the authors be held liable for any damages
-008:   arising from the use of this software.
-009: 
-010:   Permission is granted to anyone to use this software for any purpose,
-011:   including commercial applications, and to alter it and redistribute it
-012:   freely, subject to the following restrictions:
-013: 
-014:   1. The origin of this software must not be misrepresented; you must not
-015:      claim that you wrote the original software. If you use this software
-016:      in a product, an acknowledgment in the product documentation would be
-017:      appreciated but is not required.
-018:   2. Altered source versions must be plainly marked as such, and must not be
-019:      misrepresented as being the original software.
-020:   3. This notice may not be removed or altered from any source distribution.
-021: 
-022:   Jean-loup Gailly        Mark Adler
-023:   jloup@gzip.org          madler@alumni.caltech.edu
-024: 
-025: 
-026:   The data format used by the zlib library is described by RFCs (Request for
-027:   Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-028:   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-029: */
-030: 
-031: #ifndef _ZLIB_H
-032: #define _ZLIB_H
-033: 
-034: #include "zconf.h"
-035: 
-036: #ifdef __cplusplus
-037: extern "C" {
-038: #endif
-039: 
-040: #define ZLIB_VERSION "1.1.4"
-041: 
-042: /* 
-043:      The 'zlib' compression library provides in-memory compression and
-044:   decompression functions, including integrity checks of the uncompressed
-045:   data.  This version of the library supports only one compression method
-046:   (deflation) but other algorithms will be added later and will have the same
-047:   stream interface.
-048: 
-049:      Compression can be done in a single step if the buffers are large
-050:   enough (for example if an input file is mmap'ed), or can be done by
-051:   repeated calls of the compression function.  In the latter case, the
-052:   application must provide more input and/or consume the output
-053:   (providing more output space) before each call.
-054: 
-055:      The library also supports reading and writing files in gzip (.gz) format
-056:   with an interface similar to that of stdio.
-057: 
-058:      The library does not install any signal handler. The decoder checks
-059:   the consistency of the compressed data, so the library should never
-060:   crash even in case of corrupted input.
-061: */
-062: 
-063: typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-064: typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-065: 
-066: struct internal_state;
-067: 
-068: typedef struct z_stream_s {
-069:     Bytef    *next_in;  /* next input byte */
-070:     uInt     avail_in;  /* number of bytes available at next_in */
-071:     uLong    total_in;  /* total nb of input bytes read so far */
-072: 
-073:     Bytef    *next_out; /* next output byte should be put there */
-074:     uInt     avail_out; /* remaining free space at next_out */
-075:     uLong    total_out; /* total nb of bytes output so far */
-076: 
-077:     char     *msg;      /* last error message, NULL if no error */
-078:     struct internal_state FAR *state; /* not visible by applications */
-079: 
-080:     alloc_func zalloc;  /* used to allocate the internal state */
-081:     free_func  zfree;   /* used to free the internal state */
-082:     voidpf     opaque;  /* private data object passed to zalloc and zfree */
-083: 
-084:     int     data_type;  /* best guess about the data type: ascii or binary */
-085:     uLong   adler;      /* adler32 value of the uncompressed data */
-086:     uLong   reserved;   /* reserved for future use */
-087: } z_stream;
-088: 
-089: typedef z_stream FAR *z_streamp;
-090: 
-091: /*
-092:    The application must update next_in and avail_in when avail_in has
-093:    dropped to zero. It must update next_out and avail_out when avail_out
-094:    has dropped to zero. The application must initialize zalloc, zfree and
-095:    opaque before calling the init function. All other fields are set by the
-096:    compression library and must not be updated by the application.
-097: 
-098:    The opaque value provided by the application will be passed as the first
-099:    parameter for calls of zalloc and zfree. This can be useful for custom
-100:    memory management. The compression library attaches no meaning to the
-101:    opaque value.
-102: 
-103:    zalloc must return Z_NULL if there is not enough memory for the object.
-104:    If zlib is used in a multi-threaded application, zalloc and zfree must be
-105:    thread safe.
-106: 
-107:    On 16-bit systems, the functions zalloc and zfree must be able to allocate
-108:    exactly 65536 bytes, but will not be required to allocate more than this
-109:    if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-110:    pointers returned by zalloc for objects of exactly 65536 bytes *must*
-111:    have their offset normalized to zero. The default allocation function
-112:    provided by this library ensures this (see zutil.c). To reduce memory
-113:    requirements and avoid any allocation of 64K objects, at the expense of
-114:    compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-115: 
-116:    The fields total_in and total_out can be used for statistics or
-117:    progress reports. After compression, total_in holds the total size of
-118:    the uncompressed data and may be saved for use in the decompressor
-119:    (particularly if the decompressor wants to decompress everything in
-120:    a single step).
-121: */
-122: 
-123:                         /* constants */
-124: 
-125: #define Z_NO_FLUSH      0
-126: #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-127: #define Z_SYNC_FLUSH    2
-128: #define Z_FULL_FLUSH    3
-129: #define Z_FINISH        4
-130: /* Allowed flush values; see deflate() below for details */
-131: 
-132: #define Z_OK            0
-133: #define Z_STREAM_END    1
-134: #define Z_NEED_DICT     2
-135: #define Z_ERRNO        (-1)
-136: #define Z_STREAM_ERROR (-2)
-137: #define Z_DATA_ERROR   (-3)
-138: #define Z_MEM_ERROR    (-4)
-139: #define Z_BUF_ERROR    (-5)
-140: #define Z_VERSION_ERROR (-6)
-141: /* Return codes for the compression/decompression functions. Negative
-142:  * values are errors, positive values are used for special but normal events.
-143:  */
-144: 
-145: #define Z_NO_COMPRESSION         0
-146: #define Z_BEST_SPEED             1
-147: #define Z_BEST_COMPRESSION       9
-148: #define Z_DEFAULT_COMPRESSION  (-1)
-149: /* compression levels */
-150: 
-151: #define Z_FILTERED            1
-152: #define Z_HUFFMAN_ONLY        2
-153: #define Z_DEFAULT_STRATEGY    0
-154: /* compression strategy; see deflateInit2() below for details */
-155: 
-156: #define Z_BINARY   0
-157: #define Z_ASCII    1
-158: #define Z_UNKNOWN  2
-159: /* Possible values of the data_type field */
-160: 
-161: #define Z_DEFLATED   8
-162: /* The deflate compression method (the only one supported in this version) */
-163: 
-164: #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-165: 
-166: #define zlib_version zlibVersion()
-167: /* for compatibility with versions < 1.0.2 */
-168: 
-169:                         /* basic functions */
-170: 
-171: ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-172: /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-173:    If the first character differs, the library code actually used is
-174:    not compatible with the zlib.h header file used by the application.
-175:    This check is automatically made by deflateInit and inflateInit.
-176:  */
-177: 
-178: /* 
-179: ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-180: 
-181:      Initializes the internal stream state for compression. The fields
-182:    zalloc, zfree and opaque must be initialized before by the caller.
-183:    If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-184:    use default allocation functions.
-185: 
-186:      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-187:    1 gives best speed, 9 gives best compression, 0 gives no compression at
-188:    all (the input data is simply copied a block at a time).
-189:    Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-190:    compression (currently equivalent to level 6).
-191: 
-192:      deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-193:    enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-194:    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-195:    with the version assumed by the caller (ZLIB_VERSION).
-196:    msg is set to null if there is no error message.  deflateInit does not
-197:    perform any compression: this will be done by deflate().
-198: */
-199: 
-200: 
-201: ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-202: /*
-203:     deflate compresses as much data as possible, and stops when the input
-204:   buffer becomes empty or the output buffer becomes full. It may introduce some
-205:   output latency (reading input without producing any output) except when
-206:   forced to flush.
-207: 
-208:     The detailed semantics are as follows. deflate performs one or both of the
-209:   following actions:
-210: 
-211:   - Compress more input starting at next_in and update next_in and avail_in
-212:     accordingly. If not all input can be processed (because there is not
-213:     enough room in the output buffer), next_in and avail_in are updated and
-214:     processing will resume at this point for the next call of deflate().
-215: 
-216:   - Provide more output starting at next_out and update next_out and avail_out
-217:     accordingly. This action is forced if the parameter flush is non zero.
-218:     Forcing flush frequently degrades the compression ratio, so this parameter
-219:     should be set only when necessary (in interactive applications).
-220:     Some output may be provided even if flush is not set.
-221: 
-222:   Before the call of deflate(), the application should ensure that at least
-223:   one of the actions is possible, by providing more input and/or consuming
-224:   more output, and updating avail_in or avail_out accordingly; avail_out
-225:   should never be zero before the call. The application can consume the
-226:   compressed output when it wants, for example when the output buffer is full
-227:   (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-228:   and with zero avail_out, it must be called again after making room in the
-229:   output buffer because there might be more output pending.
-230: 
-231:     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-232:   flushed to the output buffer and the output is aligned on a byte boundary, so
-233:   that the decompressor can get all input data available so far. (In particular
-234:   avail_in is zero after the call if enough output space has been provided
-235:   before the call.)  Flushing may degrade compression for some compression
-236:   algorithms and so it should be used only when necessary.
-237: 
-238:     If flush is set to Z_FULL_FLUSH, all output is flushed as with
-239:   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-240:   restart from this point if previous compressed data has been damaged or if
-241:   random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-242:   the compression.
-243: 
-244:     If deflate returns with avail_out == 0, this function must be called again
-245:   with the same value of the flush parameter and more output space (updated
-246:   avail_out), until the flush is complete (deflate returns with non-zero
-247:   avail_out).
-248: 
-249:     If the parameter flush is set to Z_FINISH, pending input is processed,
-250:   pending output is flushed and deflate returns with Z_STREAM_END if there
-251:   was enough output space; if deflate returns with Z_OK, this function must be
-252:   called again with Z_FINISH and more output space (updated avail_out) but no
-253:   more input data, until it returns with Z_STREAM_END or an error. After
-254:   deflate has returned Z_STREAM_END, the only possible operations on the
-255:   stream are deflateReset or deflateEnd.
-256:   
-257:     Z_FINISH can be used immediately after deflateInit if all the compression
-258:   is to be done in a single step. In this case, avail_out must be at least
-259:   0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-260:   Z_STREAM_END, then it must be called again as described above.
-261: 
-262:     deflate() sets strm->adler to the adler32 checksum of all input read
-263:   so far (that is, total_in bytes).
-264: 
-265:     deflate() may update data_type if it can make a good guess about
-266:   the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-267:   binary. This field is only for information purposes and does not affect
-268:   the compression algorithm in any manner.
-269: 
-270:     deflate() returns Z_OK if some progress has been made (more input
-271:   processed or more output produced), Z_STREAM_END if all input has been
-272:   consumed and all output has been produced (only when flush is set to
-273:   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-274:   if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-275:   (for example avail_in or avail_out was zero).
-276: */
-277: 
-278: 
-279: ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-280: /*
-281:      All dynamically allocated data structures for this stream are freed.
-282:    This function discards any unprocessed input and does not flush any
-283:    pending output.
-284: 
-285:      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-286:    stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-287:    prematurely (some input or output was discarded). In the error case,
-288:    msg may be set but then points to a static string (which must not be
-289:    deallocated).
-290: */
-291: 
-292: 
-293: /* 
-294: ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-295: 
-296:      Initializes the internal stream state for decompression. The fields
-297:    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-298:    the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-299:    value depends on the compression method), inflateInit determines the
-300:    compression method from the zlib header and allocates all data structures
-301:    accordingly; otherwise the allocation will be deferred to the first call of
-302:    inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-303:    use default allocation functions.
-304: 
-305:      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-306:    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-307:    version assumed by the caller.  msg is set to null if there is no error
-308:    message. inflateInit does not perform any decompression apart from reading
-309:    the zlib header if present: this will be done by inflate().  (So next_in and
-310:    avail_in may be modified, but next_out and avail_out are unchanged.)
-311: */
-312: 
-313: 
-314: ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-315: /*
-316:     inflate decompresses as much data as possible, and stops when the input
-317:   buffer becomes empty or the output buffer becomes full. It may some
-318:   introduce some output latency (reading input without producing any output)
-319:   except when forced to flush.
-320: 
-321:   The detailed semantics are as follows. inflate performs one or both of the
-322:   following actions:
-323: 
-324:   - Decompress more input starting at next_in and update next_in and avail_in
-325:     accordingly. If not all input can be processed (because there is not
-326:     enough room in the output buffer), next_in is updated and processing
-327:     will resume at this point for the next call of inflate().
-328: 
-329:   - Provide more output starting at next_out and update next_out and avail_out
-330:     accordingly.  inflate() provides as much output as possible, until there
-331:     is no more input data or no more space in the output buffer (see below
-332:     about the flush parameter).
-333: 
-334:   Before the call of inflate(), the application should ensure that at least
-335:   one of the actions is possible, by providing more input and/or consuming
-336:   more output, and updating the next_* and avail_* values accordingly.
-337:   The application can consume the uncompressed output when it wants, for
-338:   example when the output buffer is full (avail_out == 0), or after each
-339:   call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-340:   must be called again after making room in the output buffer because there
-341:   might be more output pending.
-342: 
-343:     If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
-344:   output as possible to the output buffer. The flushing behavior of inflate is
-345:   not specified for values of the flush parameter other than Z_SYNC_FLUSH
-346:   and Z_FINISH, but the current implementation actually flushes as much output
-347:   as possible anyway.
-348: 
-349:     inflate() should normally be called until it returns Z_STREAM_END or an
-350:   error. However if all decompression is to be performed in a single step
-351:   (a single call of inflate), the parameter flush should be set to
-352:   Z_FINISH. In this case all pending input is processed and all pending
-353:   output is flushed; avail_out must be large enough to hold all the
-354:   uncompressed data. (The size of the uncompressed data may have been saved
-355:   by the compressor for this purpose.) The next operation on this stream must
-356:   be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-357:   is never required, but can be used to inform inflate that a faster routine
-358:   may be used for the single inflate() call.
-359: 
-360:      If a preset dictionary is needed at this point (see inflateSetDictionary
-361:   below), inflate sets strm-adler to the adler32 checksum of the
-362:   dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
-363:   it sets strm->adler to the adler32 checksum of all output produced
-364:   so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
-365:   an error code as described below. At the end of the stream, inflate()
-366:   checks that its computed adler32 checksum is equal to that saved by the
-367:   compressor and returns Z_STREAM_END only if the checksum is correct.
-368: 
-369:     inflate() returns Z_OK if some progress has been made (more input processed
-370:   or more output produced), Z_STREAM_END if the end of the compressed data has
-371:   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-372:   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-373:   corrupted (input stream not conforming to the zlib format or incorrect
-374:   adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
-375:   (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
-376:   enough memory, Z_BUF_ERROR if no progress is possible or if there was not
-377:   enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
-378:   case, the application may then call inflateSync to look for a good
-379:   compression block.
-380: */
-381: 
-382: 
-383: ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-384: /*
-385:      All dynamically allocated data structures for this stream are freed.
-386:    This function discards any unprocessed input and does not flush any
-387:    pending output.
-388: 
-389:      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-390:    was inconsistent. In the error case, msg may be set but then points to a
-391:    static string (which must not be deallocated).
-392: */
-393: 
-394:                         /* Advanced functions */
-395: 
-396: /*
-397:     The following functions are needed only in some special applications.
-398: */
-399: 
-400: /*   
-401: ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-402:                                      int  level,
-403:                                      int  method,
-404:                                      int  windowBits,
-405:                                      int  memLevel,
-406:                                      int  strategy));
-407: 
-408:      This is another version of deflateInit with more compression options. The
-409:    fields next_in, zalloc, zfree and opaque must be initialized before by
-410:    the caller.
-411: 
-412:      The method parameter is the compression method. It must be Z_DEFLATED in
-413:    this version of the library.
-414: 
-415:      The windowBits parameter is the base two logarithm of the window size
-416:    (the size of the history buffer).  It should be in the range 8..15 for this
-417:    version of the library. Larger values of this parameter result in better
-418:    compression at the expense of memory usage. The default value is 15 if
-419:    deflateInit is used instead.
-420: 
-421:      The memLevel parameter specifies how much memory should be allocated
-422:    for the internal compression state. memLevel=1 uses minimum memory but
-423:    is slow and reduces compression ratio; memLevel=9 uses maximum memory
-424:    for optimal speed. The default value is 8. See zconf.h for total memory
-425:    usage as a function of windowBits and memLevel.
-426: 
-427:      The strategy parameter is used to tune the compression algorithm. Use the
-428:    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-429:    filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-430:    string match).  Filtered data consists mostly of small values with a
-431:    somewhat random distribution. In this case, the compression algorithm is
-432:    tuned to compress them better. The effect of Z_FILTERED is to force more
-433:    Huffman coding and less string matching; it is somewhat intermediate
-434:    between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-435:    the compression ratio but not the correctness of the compressed output even
-436:    if it is not set appropriately.
-437: 
-438:       deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-439:    memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-440:    method). msg is set to null if there is no error message.  deflateInit2 does
-441:    not perform any compression: this will be done by deflate().
-442: */
-443:                             
-444: ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-445:                                              const Bytef *dictionary,
-446:                                              uInt  dictLength));
-447: /*
-448:      Initializes the compression dictionary from the given byte sequence
-449:    without producing any compressed output. This function must be called
-450:    immediately after deflateInit, deflateInit2 or deflateReset, before any
-451:    call of deflate. The compressor and decompressor must use exactly the same
-452:    dictionary (see inflateSetDictionary).
-453: 
-454:      The dictionary should consist of strings (byte sequences) that are likely
-455:    to be encountered later in the data to be compressed, with the most commonly
-456:    used strings preferably put towards the end of the dictionary. Using a
-457:    dictionary is most useful when the data to be compressed is short and can be
-458:    predicted with good accuracy; the data can then be compressed better than
-459:    with the default empty dictionary.
-460: 
-461:      Depending on the size of the compression data structures selected by
-462:    deflateInit or deflateInit2, a part of the dictionary may in effect be
-463:    discarded, for example if the dictionary is larger than the window size in
-464:    deflate or deflate2. Thus the strings most likely to be useful should be
-465:    put at the end of the dictionary, not at the front.
-466: 
-467:      Upon return of this function, strm->adler is set to the Adler32 value
-468:    of the dictionary; the decompressor may later use this value to determine
-469:    which dictionary has been used by the compressor. (The Adler32 value
-470:    applies to the whole dictionary even if only a subset of the dictionary is
-471:    actually used by the compressor.)
-472: 
-473:      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-474:    parameter is invalid (such as NULL dictionary) or the stream state is
-475:    inconsistent (for example if deflate has already been called for this stream
-476:    or if the compression method is bsort). deflateSetDictionary does not
-477:    perform any compression: this will be done by deflate().
-478: */
-479: 
-480: ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-481:                                     z_streamp source));
-482: /*
-483:      Sets the destination stream as a complete copy of the source stream.
-484: 
-485:      This function can be useful when several compression strategies will be
-486:    tried, for example when there are several ways of pre-processing the input
-487:    data with a filter. The streams that will be discarded should then be freed
-488:    by calling deflateEnd.  Note that deflateCopy duplicates the internal
-489:    compression state which can be quite large, so this strategy is slow and
-490:    can consume lots of memory.
-491: 
-492:      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-493:    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-494:    (such as zalloc being NULL). msg is left unchanged in both source and
-495:    destination.
-496: */
-497: 
-498: ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-499: /*
-500:      This function is equivalent to deflateEnd followed by deflateInit,
-501:    but does not free and reallocate all the internal compression state.
-502:    The stream will keep the same compression level and any other attributes
-503:    that may have been set by deflateInit2.
-504: 
-505:       deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-506:    stream state was inconsistent (such as zalloc or state being NULL).
-507: */
-508: 
-509: ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-510: 				      int level,
-511: 				      int strategy));
-512: /*
-513:      Dynamically update the compression level and compression strategy.  The
-514:    interpretation of level and strategy is as in deflateInit2.  This can be
-515:    used to switch between compression and straight copy of the input data, or
-516:    to switch to a different kind of input data requiring a different
-517:    strategy. If the compression level is changed, the input available so far
-518:    is compressed with the old level (and may be flushed); the new level will
-519:    take effect only at the next call of deflate().
-520: 
-521:      Before the call of deflateParams, the stream state must be set as for
-522:    a call of deflate(), since the currently available input may have to
-523:    be compressed and flushed. In particular, strm->avail_out must be non-zero.
-524: 
-525:      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-526:    stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-527:    if strm->avail_out was zero.
-528: */
-529: 
-530: /*   
-531: ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-532:                                      int  windowBits));
-533: 
-534:      This is another version of inflateInit with an extra parameter. The
-535:    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-536:    before by the caller.
-537: 
-538:      The windowBits parameter is the base two logarithm of the maximum window
-539:    size (the size of the history buffer).  It should be in the range 8..15 for
-540:    this version of the library. The default value is 15 if inflateInit is used
-541:    instead. If a compressed stream with a larger window size is given as
-542:    input, inflate() will return with the error code Z_DATA_ERROR instead of
-543:    trying to allocate a larger window.
-544: 
-545:       inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-546:    memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-547:    memLevel). msg is set to null if there is no error message.  inflateInit2
-548:    does not perform any decompression apart from reading the zlib header if
-549:    present: this will be done by inflate(). (So next_in and avail_in may be
-550:    modified, but next_out and avail_out are unchanged.)
-551: */
-552: 
-553: ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-554:                                              const Bytef *dictionary,
-555:                                              uInt  dictLength));
-556: /*
-557:      Initializes the decompression dictionary from the given uncompressed byte
-558:    sequence. This function must be called immediately after a call of inflate
-559:    if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-560:    can be determined from the Adler32 value returned by this call of
-561:    inflate. The compressor and decompressor must use exactly the same
-562:    dictionary (see deflateSetDictionary).
-563: 
-564:      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-565:    parameter is invalid (such as NULL dictionary) or the stream state is
-566:    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-567:    expected one (incorrect Adler32 value). inflateSetDictionary does not
-568:    perform any decompression: this will be done by subsequent calls of
-569:    inflate().
-570: */
-571: 
-572: ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-573: /* 
-574:     Skips invalid compressed data until a full flush point (see above the
-575:   description of deflate with Z_FULL_FLUSH) can be found, or until all
-576:   available input is skipped. No output is provided.
-577: 
-578:     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-579:   if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-580:   or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-581:   case, the application may save the current current value of total_in which
-582:   indicates where valid compressed data was found. In the error case, the
-583:   application may repeatedly call inflateSync, providing more input each time,
-584:   until success or end of the input data.
-585: */
-586: 
-587: ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-588: /*
-589:      This function is equivalent to inflateEnd followed by inflateInit,
-590:    but does not free and reallocate all the internal decompression state.
-591:    The stream will keep attributes that may have been set by inflateInit2.
-592: 
-593:       inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-594:    stream state was inconsistent (such as zalloc or state being NULL).
-595: */
-596: 
-597: 
-598:                         /* utility functions */
-599: 
-600: /*
-601:      The following utility functions are implemented on top of the
-602:    basic stream-oriented functions. To simplify the interface, some
-603:    default options are assumed (compression level and memory usage,
-604:    standard memory allocation functions). The source code of these
-605:    utility functions can easily be modified if you need special options.
-606: */
-607: 
-608: ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-609:                                  const Bytef *source, uLong sourceLen));
-610: /*
-611:      Compresses the source buffer into the destination buffer.  sourceLen is
-612:    the byte length of the source buffer. Upon entry, destLen is the total
-613:    size of the destination buffer, which must be at least 0.1% larger than
-614:    sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-615:    compressed buffer.
-616:      This function can be used to compress a whole file at once if the
-617:    input file is mmap'ed.
-618:      compress returns Z_OK if success, Z_MEM_ERROR if there was not
-619:    enough memory, Z_BUF_ERROR if there was not enough room in the output
-620:    buffer.
-621: */
-622: 
-623: ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-624:                                   const Bytef *source, uLong sourceLen,
-625:                                   int level));
-626: /*
-627:      Compresses the source buffer into the destination buffer. The level
-628:    parameter has the same meaning as in deflateInit.  sourceLen is the byte
-629:    length of the source buffer. Upon entry, destLen is the total size of the
-630:    destination buffer, which must be at least 0.1% larger than sourceLen plus
-631:    12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-632: 
-633:      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-634:    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-635:    Z_STREAM_ERROR if the level parameter is invalid.
-636: */
-637: 
-638: ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-639:                                    const Bytef *source, uLong sourceLen));
-640: /*
-641:      Decompresses the source buffer into the destination buffer.  sourceLen is
-642:    the byte length of the source buffer. Upon entry, destLen is the total
-643:    size of the destination buffer, which must be large enough to hold the
-644:    entire uncompressed data. (The size of the uncompressed data must have
-645:    been saved previously by the compressor and transmitted to the decompressor
-646:    by some mechanism outside the scope of this compression library.)
-647:    Upon exit, destLen is the actual size of the compressed buffer.
-648:      This function can be used to decompress a whole file at once if the
-649:    input file is mmap'ed.
-650: 
-651:      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-652:    enough memory, Z_BUF_ERROR if there was not enough room in the output
-653:    buffer, or Z_DATA_ERROR if the input data was corrupted.
-654: */
-655: 
-656: 
-657: typedef voidp gzFile;
-658: 
-659: ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-660: /*
-661:      Opens a gzip (.gz) file for reading or writing. The mode parameter
-662:    is as in fopen ("rb" or "wb") but can also include a compression level
-663:    ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-664:    Huffman only compression as in "wb1h". (See the description
-665:    of deflateInit2 for more information about the strategy parameter.)
-666: 
-667:      gzopen can be used to read a file which is not in gzip format; in this
-668:    case gzread will directly read from the file without decompression.
-669: 
-670:      gzopen returns NULL if the file could not be opened or if there was
-671:    insufficient memory to allocate the (de)compression state; errno
-672:    can be checked to distinguish the two cases (if errno is zero, the
-673:    zlib error is Z_MEM_ERROR).  */
-674: 
-675: ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-676: /*
-677:      gzdopen() associates a gzFile with the file descriptor fd.  File
-678:    descriptors are obtained from calls like open, dup, creat, pipe or
-679:    fileno (in the file has been previously opened with fopen).
-680:    The mode parameter is as in gzopen.
-681:      The next call of gzclose on the returned gzFile will also close the
-682:    file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-683:    descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-684:      gzdopen returns NULL if there was insufficient memory to allocate
-685:    the (de)compression state.
-686: */
-687: 
-688: ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-689: /*
-690:      Dynamically update the compression level or strategy. See the description
-691:    of deflateInit2 for the meaning of these parameters.
-692:      gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-693:    opened for writing.
-694: */
-695: 
-696: ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-697: /*
-698:      Reads the given number of uncompressed bytes from the compressed file.
-699:    If the input file was not in gzip format, gzread copies the given number
-700:    of bytes into the buffer.
-701:      gzread returns the number of uncompressed bytes actually read (0 for
-702:    end of file, -1 for error). */
-703: 
-704: ZEXTERN int ZEXPORT    gzwrite OF((gzFile file, 
-705: 				   const voidp buf, unsigned len));
-706: /*
-707:      Writes the given number of uncompressed bytes into the compressed file.
-708:    gzwrite returns the number of uncompressed bytes actually written
-709:    (0 in case of error).
-710: */
-711: 
-712: ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-713: /*
-714:      Converts, formats, and writes the args to the compressed file under
-715:    control of the format string, as in fprintf. gzprintf returns the number of
-716:    uncompressed bytes actually written (0 in case of error).
-717: */
-718: 
-719: ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-720: /*
-721:       Writes the given null-terminated string to the compressed file, excluding
-722:    the terminating null character.
-723:       gzputs returns the number of characters written, or -1 in case of error.
-724: */
-725: 
-726: ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-727: /*
-728:       Reads bytes from the compressed file until len-1 characters are read, or
-729:    a newline character is read and transferred to buf, or an end-of-file
-730:    condition is encountered.  The string is then terminated with a null
-731:    character.
-732:       gzgets returns buf, or Z_NULL in case of error.
-733: */
-734: 
-735: ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-736: /*
-737:       Writes c, converted to an unsigned char, into the compressed file.
-738:    gzputc returns the value that was written, or -1 in case of error.
-739: */
-740: 
-741: ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-742: /*
-743:       Reads one byte from the compressed file. gzgetc returns this byte
-744:    or -1 in case of end of file or error.
-745: */
-746: 
-747: ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-748: /*
-749:      Flushes all pending output into the compressed file. The parameter
-750:    flush is as in the deflate() function. The return value is the zlib
-751:    error number (see function gzerror below). gzflush returns Z_OK if
-752:    the flush parameter is Z_FINISH and all output could be flushed.
-753:      gzflush should be called only when strictly necessary because it can
-754:    degrade compression.
-755: */
-756: 
-757: ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-758: 				      z_off_t offset, int whence));
-759: /* 
-760:       Sets the starting position for the next gzread or gzwrite on the
-761:    given compressed file. The offset represents a number of bytes in the
-762:    uncompressed data stream. The whence parameter is defined as in lseek(2);
-763:    the value SEEK_END is not supported.
-764:      If the file is opened for reading, this function is emulated but can be
-765:    extremely slow. If the file is opened for writing, only forward seeks are
-766:    supported; gzseek then compresses a sequence of zeroes up to the new
-767:    starting position.
-768: 
-769:       gzseek returns the resulting offset location as measured in bytes from
-770:    the beginning of the uncompressed stream, or -1 in case of error, in
-771:    particular if the file is opened for writing and the new starting position
-772:    would be before the current position.
-773: */
-774: 
-775: ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-776: /*
-777:      Rewinds the given file. This function is supported only for reading.
-778: 
-779:    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-780: */
-781: 
-782: ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-783: /*
-784:      Returns the starting position for the next gzread or gzwrite on the
-785:    given compressed file. This position represents a number of bytes in the
-786:    uncompressed data stream.
-787: 
-788:    gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-789: */
-790: 
-791: ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-792: /*
-793:      Returns 1 when EOF has previously been detected reading the given
-794:    input stream, otherwise zero.
-795: */
-796: 
-797: ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-798: /*
-799:      Flushes all pending output if necessary, closes the compressed file
-800:    and deallocates all the (de)compression state. The return value is the zlib
-801:    error number (see function gzerror below).
-802: */
-803: 
-804: ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-805: /*
-806:      Returns the error message for the last error which occurred on the
-807:    given compressed file. errnum is set to zlib error number. If an
-808:    error occurred in the file system and not in the compression library,
-809:    errnum is set to Z_ERRNO and the application may consult errno
-810:    to get the exact error code.
-811: */
-812: 
-813:                         /* checksum functions */
-814: 
-815: /*
-816:      These functions are not related to compression but are exported
-817:    anyway because they might be useful in applications using the
-818:    compression library.
-819: */
-820: 
-821: ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-822: 
-823: /*
-824:      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-825:    return the updated checksum. If buf is NULL, this function returns
-826:    the required initial value for the checksum.
-827:    An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-828:    much faster. Usage example:
-829: 
-830:      uLong adler = adler32(0L, Z_NULL, 0);
-831: 
-832:      while (read_buffer(buffer, length) != EOF) {
-833:        adler = adler32(adler, buffer, length);
-834:      }
-835:      if (adler != original_adler) error();
-836: */
-837: 
-838: ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-839: /*
-840:      Update a running crc with the bytes buf[0..len-1] and return the updated
-841:    crc. If buf is NULL, this function returns the required initial value
-842:    for the crc. Pre- and post-conditioning (one's complement) is performed
-843:    within this function so it shouldn't be done by the application.
-844:    Usage example:
-845: 
-846:      uLong crc = crc32(0L, Z_NULL, 0);
-847: 
-848:      while (read_buffer(buffer, length) != EOF) {
-849:        crc = crc32(crc, buffer, length);
-850:      }
-851:      if (crc != original_crc) error();
-852: */
-853: 
-854: 
-855:                         /* various hacks, don't look :) */
-856: 
-857: /* deflateInit and inflateInit are macros to allow checking the zlib version
-858:  * and the compiler's view of z_stream:
-859:  */
-860: ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-861:                                      const char *version, int stream_size));
-862: ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-863:                                      const char *version, int stream_size));
-864: ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-865:                                       int windowBits, int memLevel,
-866:                                       int strategy, const char *version,
-867:                                       int stream_size));
-868: ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-869:                                       const char *version, int stream_size));
-870: #define deflateInit(strm, level) \
-871:         deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-872: #define inflateInit(strm) \
-873:         inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-874: #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-875:         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-876:                       (strategy),           ZLIB_VERSION, sizeof(z_stream))
-877: #define inflateInit2(strm, windowBits) \
-878:         inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-879: 
-880: 
-881: #if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
-882:     struct internal_state {int dummy;}; /* hack for buggy compilers */
-883: #endif
-884: 
-885: ZEXTERN const char   * ZEXPORT zError           OF((int err));
-886: ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-887: ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-888: 
-889: #ifdef __cplusplus
-890: }
-891: #endif
-892: 
-893: #endif /* _ZLIB_H */
-
        -
        - -

        How the zlib wrapper was developed

        - -

        Attempt #1

        -
        - 
        -/* File : example.i */
-%module example
-%{
-/* Put headers and other declarations here */
-#include "zlib.h"
-%}
-
-%include typemaps.i
-
-%include "zlib.h"
-
        -
        - - The result is: - -
        - 
        -% swig -chicken -I/usr/include example.i
-/usr/include/zlib.h:63: Syntax error in input.
-/usr/include/zlib.h:78: Syntax error in input.
-/usr/include/zlib.h:80: Syntax error in input.
-
        -
        - - The first problem we see is that the macro OF(...) is - not defined. - -

        Attempt #2

        - - We make sure to include zconf.h so that SWIG can see the - definition of OF(...). We try again. - -
        - 
        -/* File : example.i */
-%module example
-%{
-/* Put headers and other declarations here */
-#include "zlib.h"
-%}
-
-%include typemaps.i
-
-%include "zconf.h"
-%include "zlib.h"
-
        -
        - - The result is: - -
        - 
        -% swig -chicken -I/usr/include example.i
-
        -
        - - This seems to work! But we should take a peek inside the generated - example_wrap.c to see what the names of the Scheme - procedures will be. - -
        - 
        -% grep C_intern example_wrap.c
-  C_word err = C_intern2 (&a, errorhook);
-    sym = C_intern (&a, 21, "example:max-mem-level");
-    sym = C_intern (&a, 17, "example:max-wbits");
-    sym = C_intern (&a, 16, "example:seek-set");
-    sym = C_intern (&a, 16, "example:seek-cur");
-    sym = C_intern (&a, 16, "example:seek-end");
-    sym = C_intern (&a, 20, "example:zlib-version");
-    sym = C_intern (&a, 28, "example:z-stream-next-in-set");
-    sym = C_intern (&a, 28, "example:z-stream-next-in-get");
-    sym = C_intern (&a, 29, "example:z-stream-avail-in-set");
-    sym = C_intern (&a, 29, "example:z-stream-avail-in-get");
-    sym = C_intern (&a, 29, "example:z-stream-total-in-set");
-    sym = C_intern (&a, 29, "example:z-stream-total-in-get");
-    sym = C_intern (&a, 29, "example:z-stream-next-out-set");
-    sym = C_intern (&a, 29, "example:z-stream-next-out-get");
-    sym = C_intern (&a, 30, "example:z-stream-avail-out-set");
-    sym = C_intern (&a, 30, "example:z-stream-avail-out-get");
-    sym = C_intern (&a, 30, "example:z-stream-total-out-set");
-    sym = C_intern (&a, 30, "example:z-stream-total-out-get");
-    sym = C_intern (&a, 24, "example:z-stream-msg-set");
-    sym = C_intern (&a, 24, "example:z-stream-msg-get");
-    sym = C_intern (&a, 26, "example:z-stream-state-set");
-    sym = C_intern (&a, 26, "example:z-stream-state-get");
-    sym = C_intern (&a, 27, "example:z-stream-zalloc-set");
-    sym = C_intern (&a, 27, "example:z-stream-zalloc-get");
-    sym = C_intern (&a, 26, "example:z-stream-zfree-set");
-    sym = C_intern (&a, 26, "example:z-stream-zfree-get");
-    sym = C_intern (&a, 27, "example:z-stream-opaque-set");
-    sym = C_intern (&a, 27, "example:z-stream-opaque-get");
-    sym = C_intern (&a, 30, "example:z-stream-data-type-set");
-    sym = C_intern (&a, 30, "example:z-stream-data-type-get");
-    sym = C_intern (&a, 26, "example:z-stream-adler-set");
-    sym = C_intern (&a, 26, "example:z-stream-adler-get");
-    sym = C_intern (&a, 29, "example:z-stream-reserved-set");
-    sym = C_intern (&a, 29, "example:z-stream-reserved-get");
-    sym = C_intern (&a, 20, "example:new-z-stream");
-    sym = C_intern (&a, 23, "example:delete-z-stream");
-    sym = C_intern (&a, 18, "example:z-no-flush");
-    sym = C_intern (&a, 23, "example:z-partial-flush");
-    sym = C_intern (&a, 20, "example:z-sync-flush");
-    sym = C_intern (&a, 20, "example:z-full-flush");
-    sym = C_intern (&a, 16, "example:z-finish");
-    sym = C_intern (&a, 12, "example:z-ok");
-    sym = C_intern (&a, 20, "example:z-stream-end");
-    sym = C_intern (&a, 19, "example:z-need-dict");
-    sym = C_intern (&a, 15, "example:z-errno");
-    sym = C_intern (&a, 22, "example:z-stream-error");
-    sym = C_intern (&a, 20, "example:z-data-error");
-    sym = C_intern (&a, 19, "example:z-mem-error");
-    sym = C_intern (&a, 19, "example:z-buf-error");
-    sym = C_intern (&a, 23, "example:z-version-error");
-    sym = C_intern (&a, 24, "example:z-no-compression");
-    sym = C_intern (&a, 20, "example:z-best-speed");
-    sym = C_intern (&a, 26, "example:z-best-compression");
-    sym = C_intern (&a, 29, "example:z-default-compression");
-    sym = C_intern (&a, 18, "example:z-filtered");
-    sym = C_intern (&a, 22, "example:z-huffman-only");
-    sym = C_intern (&a, 26, "example:z-default-strategy");
-    sym = C_intern (&a, 16, "example:z-binary");
-    sym = C_intern (&a, 15, "example:z-ascii");
-    sym = C_intern (&a, 17, "example:z-unknown");
-    sym = C_intern (&a, 18, "example:z-deflated");
-    sym = C_intern (&a, 14, "example:z-null");
-    sym = C_intern (&a, 19, "example:zlibversion");
-    sym = C_intern (&a, 15, "example:deflate");
-    sym = C_intern (&a, 18, "example:deflateend");
-    sym = C_intern (&a, 15, "example:inflate");
-    sym = C_intern (&a, 18, "example:inflateend");
-    sym = C_intern (&a, 28, "example:deflatesetdictionary");
-    sym = C_intern (&a, 19, "example:deflatecopy");
-    sym = C_intern (&a, 20, "example:deflatereset");
-    sym = C_intern (&a, 21, "example:deflateparams");
-    sym = C_intern (&a, 28, "example:inflatesetdictionary");
-    sym = C_intern (&a, 19, "example:inflatesync");
-    sym = C_intern (&a, 20, "example:inflatereset");
-    sym = C_intern (&a, 16, "example:compress");
-    sym = C_intern (&a, 17, "example:compress2");
-    sym = C_intern (&a, 18, "example:uncompress");
-    sym = C_intern (&a, 14, "example:gzopen");
-    sym = C_intern (&a, 15, "example:gzdopen");
-    sym = C_intern (&a, 19, "example:gzsetparams");
-    sym = C_intern (&a, 14, "example:gzread");
-    sym = C_intern (&a, 15, "example:gzwrite");
-    sym = C_intern (&a, 16, "example:gzprintf");
-    sym = C_intern (&a, 14, "example:gzputs");
-    sym = C_intern (&a, 14, "example:gzgets");
-    sym = C_intern (&a, 14, "example:gzputc");
-    sym = C_intern (&a, 14, "example:gzgetc");
-    sym = C_intern (&a, 15, "example:gzflush");
-    sym = C_intern (&a, 14, "example:gzseek");
-    sym = C_intern (&a, 16, "example:gzrewind");
-    sym = C_intern (&a, 14, "example:gztell");
-    sym = C_intern (&a, 13, "example:gzeof");
-    sym = C_intern (&a, 15, "example:gzclose");
-    sym = C_intern (&a, 15, "example:gzerror");
-    sym = C_intern (&a, 15, "example:adler32");
-    sym = C_intern (&a, 13, "example:crc32");
-    sym = C_intern (&a, 20, "example:deflateinit-");
-    sym = C_intern (&a, 20, "example:inflateinit-");
-    sym = C_intern (&a, 21, "example:deflateinit2-");
-    sym = C_intern (&a, 21, "example:inflateinit2-");
-    sym = C_intern (&a, 32, "example:internal-state-dummy-set");
-    sym = C_intern (&a, 32, "example:internal-state-dummy-get");
-    sym = C_intern (&a, 26, "example:new-internal-state");
-    sym = C_intern (&a, 29, "example:delete-internal-state");
-    sym = C_intern (&a, 14, "example:zerror");
-    sym = C_intern (&a, 24, "example:inflatesyncpoint");
-    sym = C_intern (&a, 21, "example:get-crc-table");
-
        -
        - - In fact, we want the Scheme procedure names to begin with - zlib instead of example. For - example:zlib-version, we want - zlib-version. And we want dashes when the case - switches to/from upper/lowercase; ex. the function - deflateEnd() should be the Scheme procedure - zlib-deflate-end. - -

        Attempt #3

        - - We make sure to add -prefix zlib -mixed to the - swig command line, and we rename - ZLIB_VERSION to VERSION. We try again. - -
        - 
        -/* File : example.i */
-%module example
-%{
-/* Put headers and other declarations here */
-#include "zlib.h"
-%}
-
-%include typemaps.i
-
-%rename(VERSION) ZLIB_VERSION;
-
-%include "zconf.h"
-%include "zlib.h"
-
        -
        - - The result is: - -
        - 
        -% swig -chicken -prefix zlib -mixed -I/usr/include example.i
-% grep C_intern example_wrap.c
-  C_word err = C_intern2 (&a, errorhook);
-    sym = C_intern (&a, 18, "zlib:max-mem-level");
-    sym = C_intern (&a, 14, "zlib:max-wbits");
-    sym = C_intern (&a, 13, "zlib:seek-set");
-    sym = C_intern (&a, 13, "zlib:seek-cur");
-    sym = C_intern (&a, 13, "zlib:seek-end");
-    sym = C_intern (&a, 12, "zlib:version");
-    sym = C_intern (&a, 25, "zlib:z-stream-next-in-set");
-    sym = C_intern (&a, 25, "zlib:z-stream-next-in-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-total-in-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-total-in-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-next-out-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-next-out-get");
-    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-set");
-    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-get");
-    sym = C_intern (&a, 27, "zlib:z-stream-total-out-set");
-    sym = C_intern (&a, 27, "zlib:z-stream-total-out-get");
-    sym = C_intern (&a, 21, "zlib:z-stream-msg-set");
-    sym = C_intern (&a, 21, "zlib:z-stream-msg-get");
-    sym = C_intern (&a, 23, "zlib:z-stream-state-set");
-    sym = C_intern (&a, 23, "zlib:z-stream-state-get");
-    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-set");
-    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-get");
-    sym = C_intern (&a, 23, "zlib:z-stream-zfree-set");
-    sym = C_intern (&a, 23, "zlib:z-stream-zfree-get");
-    sym = C_intern (&a, 24, "zlib:z-stream-opaque-set");
-    sym = C_intern (&a, 24, "zlib:z-stream-opaque-get");
-    sym = C_intern (&a, 27, "zlib:z-stream-data-type-set");
-    sym = C_intern (&a, 27, "zlib:z-stream-data-type-get");
-    sym = C_intern (&a, 23, "zlib:z-stream-adler-set");
-    sym = C_intern (&a, 23, "zlib:z-stream-adler-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-reserved-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-reserved-get");
-    sym = C_intern (&a, 17, "zlib:new-z-stream");
-    sym = C_intern (&a, 20, "zlib:delete-z-stream");
-    sym = C_intern (&a, 15, "zlib:z-no-flush");
-    sym = C_intern (&a, 20, "zlib:z-partial-flush");
-    sym = C_intern (&a, 17, "zlib:z-sync-flush");
-    sym = C_intern (&a, 17, "zlib:z-full-flush");
-    sym = C_intern (&a, 13, "zlib:z-finish");
-    sym = C_intern (&a, 9, "zlib:z-ok");
-    sym = C_intern (&a, 17, "zlib:z-stream-end");
-    sym = C_intern (&a, 16, "zlib:z-need-dict");
-    sym = C_intern (&a, 12, "zlib:z-errno");
-    sym = C_intern (&a, 19, "zlib:z-stream-error");
-    sym = C_intern (&a, 17, "zlib:z-data-error");
-    sym = C_intern (&a, 16, "zlib:z-mem-error");
-    sym = C_intern (&a, 16, "zlib:z-buf-error");
-    sym = C_intern (&a, 20, "zlib:z-version-error");
-    sym = C_intern (&a, 21, "zlib:z-no-compression");
-    sym = C_intern (&a, 17, "zlib:z-best-speed");
-    sym = C_intern (&a, 23, "zlib:z-best-compression");
-    sym = C_intern (&a, 26, "zlib:z-default-compression");
-    sym = C_intern (&a, 15, "zlib:z-filtered");
-    sym = C_intern (&a, 19, "zlib:z-huffman-only");
-    sym = C_intern (&a, 23, "zlib:z-default-strategy");
-    sym = C_intern (&a, 13, "zlib:z-binary");
-    sym = C_intern (&a, 12, "zlib:z-ascii");
-    sym = C_intern (&a, 14, "zlib:z-unknown");
-    sym = C_intern (&a, 15, "zlib:z-deflated");
-    sym = C_intern (&a, 11, "zlib:z-null");
-    sym = C_intern (&a, 17, "zlib:zlib-version");
-    sym = C_intern (&a, 12, "zlib:deflate");
-    sym = C_intern (&a, 16, "zlib:deflate-end");
-    sym = C_intern (&a, 12, "zlib:inflate");
-    sym = C_intern (&a, 16, "zlib:inflate-end");
-    sym = C_intern (&a, 27, "zlib:deflate-set-dictionary");
-    sym = C_intern (&a, 17, "zlib:deflate-copy");
-    sym = C_intern (&a, 18, "zlib:deflate-reset");
-    sym = C_intern (&a, 19, "zlib:deflate-params");
-    sym = C_intern (&a, 27, "zlib:inflate-set-dictionary");
-    sym = C_intern (&a, 17, "zlib:inflate-sync");
-    sym = C_intern (&a, 18, "zlib:inflate-reset");
-    sym = C_intern (&a, 13, "zlib:compress");
-    sym = C_intern (&a, 14, "zlib:compress2");
-    sym = C_intern (&a, 15, "zlib:uncompress");
-    sym = C_intern (&a, 11, "zlib:gzopen");
-    sym = C_intern (&a, 12, "zlib:gzdopen");
-    sym = C_intern (&a, 16, "zlib:gzsetparams");
-    sym = C_intern (&a, 11, "zlib:gzread");
-    sym = C_intern (&a, 12, "zlib:gzwrite");
-    sym = C_intern (&a, 13, "zlib:gzprintf");
-    sym = C_intern (&a, 11, "zlib:gzputs");
-    sym = C_intern (&a, 11, "zlib:gzgets");
-    sym = C_intern (&a, 11, "zlib:gzputc");
-    sym = C_intern (&a, 11, "zlib:gzgetc");
-    sym = C_intern (&a, 12, "zlib:gzflush");
-    sym = C_intern (&a, 11, "zlib:gzseek");
-    sym = C_intern (&a, 13, "zlib:gzrewind");
-    sym = C_intern (&a, 11, "zlib:gztell");
-    sym = C_intern (&a, 10, "zlib:gzeof");
-    sym = C_intern (&a, 12, "zlib:gzclose");
-    sym = C_intern (&a, 12, "zlib:gzerror");
-    sym = C_intern (&a, 12, "zlib:adler32");
-    sym = C_intern (&a, 10, "zlib:crc32");
-    sym = C_intern (&a, 18, "zlib:deflate-init-");
-    sym = C_intern (&a, 18, "zlib:inflate-init-");
-    sym = C_intern (&a, 19, "zlib:deflate-init2-");
-    sym = C_intern (&a, 19, "zlib:inflate-init2-");
-    sym = C_intern (&a, 29, "zlib:internal-state-dummy-set");
-    sym = C_intern (&a, 29, "zlib:internal-state-dummy-get");
-    sym = C_intern (&a, 23, "zlib:new-internal-state");
-    sym = C_intern (&a, 26, "zlib:delete-internal-state");
-    sym = C_intern (&a, 12, "zlib:ze-rror");
-    sym = C_intern (&a, 23, "zlib:inflate-sync-point");
-    sym = C_intern (&a, 18, "zlib:get-crc-table");
-
        -
        - - Much better. The only problem is the identifier - zlib:ze-rror, and we are missing - zlib:deflate-init and zlib:inflate-init - because they are defined as macros (see macro definitions). - -

        Attempt #4

        - - We make sure to rename zError to - z_error, and we inline some helper functions for the - zlib:...-init macros. We try again. - -
        - 
        -/* File : example.i */
-%module example
-%{
-/* Put headers and other declarations here */
-#include "zlib.h"
-%}
-
-%include typemaps.i
-
-%rename(VERSION) ZLIB_VERSION;
-%rename(z_error) zError;
-
-%include "zconf.h"
-%include "zlib.h"
-
-%inline %{
-/* %inline blocks are seen by SWIG and are inserted into the header
-   portion of example_wrap.c, so that they are also seen by the C
-   compiler. */
-int deflate_init(z_streamp strm, int level) {
-  return deflateInit(strm,level); /* call macro */
-}
-int inflate_init(z_streamp strm) {
-  return inflateInit(strm); /* call macro */
-}
-%}
-
-
-
        -
        - - The result is: - -
        - 
        -% swig -chicken -prefix zlib -mixed -I/usr/include example.i
-% grep C_intern example_wrap.c
-  C_word err = C_intern2 (&a, errorhook);
-    sym = C_intern (&a, 18, "zlib:max-mem-level");
-    sym = C_intern (&a, 14, "zlib:max-wbits");
-    sym = C_intern (&a, 13, "zlib:seek-set");
-    sym = C_intern (&a, 13, "zlib:seek-cur");
-    sym = C_intern (&a, 13, "zlib:seek-end");
-    sym = C_intern (&a, 12, "zlib:version");
-    sym = C_intern (&a, 25, "zlib:z-stream-next-in-set");
-    sym = C_intern (&a, 25, "zlib:z-stream-next-in-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-total-in-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-total-in-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-next-out-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-next-out-get");
-    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-set");
-    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-get");
-    sym = C_intern (&a, 27, "zlib:z-stream-total-out-set");
-    sym = C_intern (&a, 27, "zlib:z-stream-total-out-get");
-    sym = C_intern (&a, 21, "zlib:z-stream-msg-set");
-    sym = C_intern (&a, 21, "zlib:z-stream-msg-get");
-    sym = C_intern (&a, 23, "zlib:z-stream-state-set");
-    sym = C_intern (&a, 23, "zlib:z-stream-state-get");
-    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-set");
-    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-get");
-    sym = C_intern (&a, 23, "zlib:z-stream-zfree-set");
-    sym = C_intern (&a, 23, "zlib:z-stream-zfree-get");
-    sym = C_intern (&a, 24, "zlib:z-stream-opaque-set");
-    sym = C_intern (&a, 24, "zlib:z-stream-opaque-get");
-    sym = C_intern (&a, 27, "zlib:z-stream-data-type-set");
-    sym = C_intern (&a, 27, "zlib:z-stream-data-type-get");
-    sym = C_intern (&a, 23, "zlib:z-stream-adler-set");
-    sym = C_intern (&a, 23, "zlib:z-stream-adler-get");
-    sym = C_intern (&a, 26, "zlib:z-stream-reserved-set");
-    sym = C_intern (&a, 26, "zlib:z-stream-reserved-get");
-    sym = C_intern (&a, 17, "zlib:new-z-stream");
-    sym = C_intern (&a, 20, "zlib:delete-z-stream");
-    sym = C_intern (&a, 15, "zlib:z-no-flush");
-    sym = C_intern (&a, 20, "zlib:z-partial-flush");
-    sym = C_intern (&a, 17, "zlib:z-sync-flush");
-    sym = C_intern (&a, 17, "zlib:z-full-flush");
-    sym = C_intern (&a, 13, "zlib:z-finish");
-    sym = C_intern (&a, 9, "zlib:z-ok");
-    sym = C_intern (&a, 17, "zlib:z-stream-end");
-    sym = C_intern (&a, 16, "zlib:z-need-dict");
-    sym = C_intern (&a, 12, "zlib:z-errno");
-    sym = C_intern (&a, 19, "zlib:z-stream-error");
-    sym = C_intern (&a, 17, "zlib:z-data-error");
-    sym = C_intern (&a, 16, "zlib:z-mem-error");
-    sym = C_intern (&a, 16, "zlib:z-buf-error");
-    sym = C_intern (&a, 20, "zlib:z-version-error");
-    sym = C_intern (&a, 21, "zlib:z-no-compression");
-    sym = C_intern (&a, 17, "zlib:z-best-speed");
-    sym = C_intern (&a, 23, "zlib:z-best-compression");
-    sym = C_intern (&a, 26, "zlib:z-default-compression");
-    sym = C_intern (&a, 15, "zlib:z-filtered");
-    sym = C_intern (&a, 19, "zlib:z-huffman-only");
-    sym = C_intern (&a, 23, "zlib:z-default-strategy");
-    sym = C_intern (&a, 13, "zlib:z-binary");
-    sym = C_intern (&a, 12, "zlib:z-ascii");
-    sym = C_intern (&a, 14, "zlib:z-unknown");
-    sym = C_intern (&a, 15, "zlib:z-deflated");
-    sym = C_intern (&a, 11, "zlib:z-null");
-    sym = C_intern (&a, 17, "zlib:zlib-version");
-    sym = C_intern (&a, 12, "zlib:deflate");
-    sym = C_intern (&a, 16, "zlib:deflate-end");
-    sym = C_intern (&a, 12, "zlib:inflate");
-    sym = C_intern (&a, 16, "zlib:inflate-end");
-    sym = C_intern (&a, 27, "zlib:deflate-set-dictionary");
-    sym = C_intern (&a, 17, "zlib:deflate-copy");
-    sym = C_intern (&a, 18, "zlib:deflate-reset");
-    sym = C_intern (&a, 19, "zlib:deflate-params");
-    sym = C_intern (&a, 27, "zlib:inflate-set-dictionary");
-    sym = C_intern (&a, 17, "zlib:inflate-sync");
-    sym = C_intern (&a, 18, "zlib:inflate-reset");
-    sym = C_intern (&a, 13, "zlib:compress");
-    sym = C_intern (&a, 14, "zlib:compress2");
-    sym = C_intern (&a, 15, "zlib:uncompress");
-    sym = C_intern (&a, 11, "zlib:gzopen");
-    sym = C_intern (&a, 12, "zlib:gzdopen");
-    sym = C_intern (&a, 16, "zlib:gzsetparams");
-    sym = C_intern (&a, 11, "zlib:gzread");
-    sym = C_intern (&a, 12, "zlib:gzwrite");
-    sym = C_intern (&a, 13, "zlib:gzprintf");
-    sym = C_intern (&a, 11, "zlib:gzputs");
-    sym = C_intern (&a, 11, "zlib:gzgets");
-    sym = C_intern (&a, 11, "zlib:gzputc");
-    sym = C_intern (&a, 11, "zlib:gzgetc");
-    sym = C_intern (&a, 12, "zlib:gzflush");
-    sym = C_intern (&a, 11, "zlib:gzseek");
-    sym = C_intern (&a, 13, "zlib:gzrewind");
-    sym = C_intern (&a, 11, "zlib:gztell");
-    sym = C_intern (&a, 10, "zlib:gzeof");
-    sym = C_intern (&a, 12, "zlib:gzclose");
-    sym = C_intern (&a, 12, "zlib:gzerror");
-    sym = C_intern (&a, 12, "zlib:adler32");
-    sym = C_intern (&a, 10, "zlib:crc32");
-    sym = C_intern (&a, 18, "zlib:deflate-init-");
-    sym = C_intern (&a, 18, "zlib:inflate-init-");
-    sym = C_intern (&a, 19, "zlib:deflate-init2-");
-    sym = C_intern (&a, 19, "zlib:inflate-init2-");
-    sym = C_intern (&a, 29, "zlib:internal-state-dummy-set");
-    sym = C_intern (&a, 29, "zlib:internal-state-dummy-get");
-    sym = C_intern (&a, 23, "zlib:new-internal-state");
-    sym = C_intern (&a, 26, "zlib:delete-internal-state");
-    sym = C_intern (&a, 12, "zlib:z-error");
-    sym = C_intern (&a, 23, "zlib:inflate-sync-point");
-    sym = C_intern (&a, 18, "zlib:get-crc-table");
-    sym = C_intern (&a, 17, "zlib:deflate-init");
-    sym = C_intern (&a, 17, "zlib:inflate-init");
-
        -
        - - Perfect! Now let's integrate this zlib extension into a - CHICKEN interpreter. To save some time, in this - Examples/chicken/zlib directory: -
          -
        1. Backup the original example.i.
          2. -
        2. Copy and paste the example.i text from above and - put it into the file called example.i
          3. -
        3. Run 'make' as per Building the - example.
          4. -
        4. Run the resultant executable zlib.
          5. -
        - - The interpreter interaction is as follows: - -
        - 
        -% ./zlib
-zlib
-
-  A SWIG example for the CHICKEN compiler
-  Author: Jonah Beckford, February 2003
-
-Scheme Procedures:
-
-zlib:max-mem-level
-zlib:max-wbits
-zlib:seek-set
-zlib:seek-cur
-zlib:seek-end
-zlib:version
-zlib:z-stream-next-in-set
-zlib:z-stream-next-in-get
-zlib:z-stream-avail-in-set
-...
-zlib:get-crc-table
-zlib:deflate-init
-zlib:inflate-init
-; This is the CHICKEN interpreter - Version 0, Build 1095 - windows-cygwin-x86
-; (c)2000-2003 Felix L. Winkelmann
->>> (define s (zlib:new-z-stream))
->>> s
-#<tagged pointer #<c++ "z_stream *">(#<pointer 6d9290>)>
->>> (zlib:z-stream-next-in-get s)
-#f
->>> (zlib:z-stream-next-in-set s "some dummy stream data")
-Error: Type error. Expected _p_Bytef: "bad argument type"
->>> (exit)
-
        -
        - - Apparently we cannot use Scheme strings as Bytef *. The SWIG - manual shows many ways how to handle strings and byte arrays, but - to be simplistic, let's just make the Bytef * look - like a char *, which is automatically handled as a - string by SWIG CHICKEN. - -

        Attempt #5

        - - We make sure to add an %apply construct so that Bytef - * is handled the same as char * to SWIG. We - try again. - -
        - 
        -/* File : example.i */
-%module example
-%{
-/* Put headers and other declarations here */
-#include "zlib.h"
-%}
-
-%include typemaps.i
-
-%rename(VERSION) ZLIB_VERSION;
-%rename(z_error) zError;
-%apply char * { Bytef * };
-
-%include "zconf.h"
-%include "zlib.h"
-
-%inline %{
-/* %inline blocks are seen by SWIG and are inserted into the header
-   portion of example_wrap.c, so that they are also seen by the C
-   compiler. */
-int deflate_init(z_streamp strm, int level) {
-  return deflateInit(strm,level); /* call macro */
-}
-int inflate_init(z_streamp strm) {
-  return inflateInit(strm); /* call macro */
-}
-%}
-
        -
        - - Build the example once more.
        - - The interpreter interaction is as follows: - -
        - 
        -% ./zlib
-zlib
-
-  A SWIG example for the CHICKEN compiler
-  Author: Jonah Beckford, February 2003
-
-Scheme Procedures:
-
-zlib:max-mem-level
-zlib:max-wbits
-zlib:seek-set
-zlib:seek-cur
-zlib:seek-end
-zlib:version
-zlib:z-stream-next-in-set
-zlib:z-stream-next-in-get
-zlib:z-stream-avail-in-set
-...
-zlib:get-crc-table
-zlib:deflate-init
-zlib:inflate-init
-; This is the CHICKEN interpreter - Version 0, Build 1095 - windows-cygwin-x86
-; (c)2000-2003 Felix L. Winkelmann
->>> (define s (zlib:new-z-stream))
-Init zstream
->>> (zlib:z-stream-zalloc-set s #f) 
->>> (zlib:z-stream-zfree-set s #f)
->>> (zlib:z-stream-opaque-set s #f)
->>> (zlib:deflate-init s (zlib:z-default-compression))
-0
-Deflate something small so we don't need to loop/stream data
->>> (define in "some dummy data")
->>> (define out (make-string 1000))
->>> (zlib:z-stream-next-in-set s in)
->>> (zlib:z-stream-avail-in-set s (string-length in))
->>> (zlib:z-stream-next-out-set s out)
->>> (zlib:z-stream-avail-out-set s (string-length out))
->>> (zlib:deflate s (zlib:z-finish))
-1 ;; (zlib:z-stream-end) == 1, which is good
->>> (zlib:z-stream-total-out-get s)
-23.
->>> out
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "
-
        -
        - - We see the problem ... the compression is occurring as it should, - but we cannot see any of the compressed output. This is because - when SWIG CHICKEN passes a Scheme string to a C function, it - duplicates the string before calling the C function. We want to - save the memory address that - zlib:z-stream-next-out-set is using, so we can - display this later. While we are at it, we can foresee that - compress, compress2 and - uncompress will all need some finessing to work with - mutating strings. - -

        Attempt #6

        - - When we have to finesse strings, we must use typemaps. As well, - we define some functions to save and restore the - next_out element. We try again. - -
        - 
        -/* File : example.i */
-%module example
-%{
-/* Put headers and other declarations here */
-#include "zlib.h"
-%}
-
-%include typemaps.i
-
-%rename(VERSION) ZLIB_VERSION;
-%rename(z_error) zError;
-%apply char * { Bytef * };
-	
-/* Allow the sourceLen to be automatically filled in from the length
-   of the 'source' string */
-%typemap(in) (const Bytef *source, uLong sourceLen)
-%{  if (!C_swig_is_string ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a string");
-  }
-  $2 = (uLong) C_header_size ($input);
-  $1 = C_c_string ($input);
-%}
-
-/* Allocate space the size of which is determined by the Scheme
-   integer argument, and make a temporary integer so we can set
-   destLen. */
-%typemap(in) (Bytef *dest, uLongf *destLen) (uLong len)
-%{  if (!C_swig_is_fixnum ($input)) {
-    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a integer");
-  }
-  len = (uLong) C_unfix ($input);
-  $2 = &len;
-  $1 = (char *) malloc (*$2);
-%}
-
-/* Return the mutated string as a new object. */
-%typemap(argout) (Bytef *dest, uLongf *destLen) 
-(C_word *scmstr) 
-%{  scmstr = C_alloc (C_SIZEOF_STRING (*$2));
-  SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1));
-  free ($1);
-%}
-	
-%include "zconf.h"
-%include "zlib.h"
-	
-/* Ignore destLen as an input argument, and make a temporary integer so
-   we can set destLen. */
-%typemap(in, numinputs=0) uLongf *destLen (uLong len)
-"$1 = &len;";
-
-/* Return a sized string as a new object. */
-%typemap(argout)
-(void *outstr, uLongf *destLen) (C_word *scmstr) 
-%{  scmstr = C_alloc (C_SIZEOF_STRING (*$2));
-  SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1));
-%}
-	
-%inline %{
-/* %inline blocks are seen by SWIG and are inserted into the header
-   portion of example_wrap.c, so that they are also seen by the C
-   compiler. */
-int deflate_init(z_streamp strm, int level) {
-  return deflateInit(strm,level); /* call macro */
-}
-int inflate_init(z_streamp strm) {
-  return inflateInit(strm); /* call macro */
-}
-void* z_stream_save_next_out(z_streamp strm) {
-  return (void*) strm->next_out;
-}
-void z_stream_get_next_chunk(z_streamp strm, void *outstr, uLongf *destLen) {
-  *destLen = strm->next_out - (Bytef*)outstr;
-}
-%}
-
        -
        - - And that's it. Try building the entire example from the - Makefile. Run ./zlib test-zlib.scm to test it out. - - - diff --git a/Examples/chicken/zlib/example.i b/Examples/chicken/zlib/example.i deleted file mode 100644 index dd962ad56..000000000 --- a/Examples/chicken/zlib/example.i +++ /dev/null @@ -1,76 +0,0 @@ -/* File : example.i */ -%module example -%{ -/* Put headers and other declarations here */ -#include "zlib.h" -%} - -%include typemaps.i - -%rename(VERSION) ZLIB_VERSION; -%rename(z_error) zError; -%apply char * { Bytef * }; - -/* Allow the sourceLen to be automatically filled in from the length - of the 'source' string */ -%typemap(in) (const Bytef *source, uLong sourceLen) -%{ if (!C_swig_is_string ($input)) { - swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a string"); - } - $2 = (uLong) C_header_size ($input); - $1 = C_c_string ($input); -%} - -/* Allocate space the size of which is determined by the Scheme - integer argument, and make a temporary integer so we can set - destLen. */ -%typemap(in) (Bytef *dest, uLongf *destLen) (uLong len) -%{ if (!C_swig_is_fixnum ($input)) { - swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a integer"); - } - len = (uLong) C_unfix ($input); - $2 = &len; - $1 = (char *) malloc (*$2); -%} - -/* Return the mutated string as a new object. */ -%typemap(argout) (Bytef *dest, uLongf *destLen) -(C_word *scmstr) -%{ scmstr = C_alloc (C_SIZEOF_STRING (*$2)); - SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1)); - free ($1); -%} - -%include "zconf.h" -%include "zlib.h" - -/* Ignore destLen as an input argument, and make a temporary integer so - we can set destLen. */ -%typemap(numinputs=0) uLongf *destLen (uLong len) -"$1 = &len;"; - -/* Return a sized string as a new object. */ -%typemap(argout) -(void *outstr, uLongf *destLen) (C_word *scmstr) -%{ scmstr = C_alloc (C_SIZEOF_STRING (*$2)); - SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1)); -%} - -%inline %{ -/* %inline blocks are seen by SWIG and are inserted into the header - portion of example_wrap.c, so that they are also seen by the C - compiler. */ -int deflate_init(z_streamp strm, int level) { - return deflateInit(strm,level); /* call macro */ -} -int inflate_init(z_streamp strm) { - return inflateInit(strm); /* call macro */ -} -void* z_stream_save_next_out(z_streamp strm) { - return (void*) strm->next_out; -} -void z_stream_get_next_chunk(z_streamp strm, void *outstr, uLongf *destLen) { - *destLen = strm->next_out - (Bytef*)outstr; -} -%} - diff --git a/Examples/chicken/zlib/test-zlib.scm b/Examples/chicken/zlib/test-zlib.scm deleted file mode 100644 index a13d801b8..000000000 --- a/Examples/chicken/zlib/test-zlib.scm +++ /dev/null @@ -1,41 +0,0 @@ -(load-library 'example "./zlib.so") - -;; Init zstream -(define s (new-z-stream)) -(z-stream-zalloc-set s #f) -(z-stream-zfree-set s #f) -(z-stream-opaque-set s #f) -(deflate-init s (Z-DEFAULT-COMPRESSION)) - -;; Deflate something small so we don't need to loop/stream data -(define in "some pony et jumping et jack et flash et had a jack pony") -(define out (make-string 1000)) -(printf "to be compressed: ~A~%to be compressed bytes: ~A~%~%" in (string-length in)) -(z-stream-next-in-set s in) -(z-stream-avail-in-set s (string-length in)) -(z-stream-next-out-set s out) -(z-stream-avail-out-set s (string-length out)) -(let* - ((saved-out (z-stream-save-next-out s)) - (ret (deflate s (Z-FINISH)))) - (cond - ((= ret (Z-STREAM-END)) - (printf "deflated properly!~%compressed bytes: ~A~%compressed stream: ~A~%" - (z-stream-total-out-get s) (z-stream-get-next-chunk s saved-out))) - ((= ret (Z-OK)) - (display "only partial deflation ... not enough output space\n")) - (else - (printf "deflate error(~D): ~A ~%" ret (z-stream-msg-get s))))) - -;; Use simple compress routine, and set max output size to 100 -(newline) -(call-with-values (lambda () (compress 100 in)) - (lambda (ret compressed) - (cond - ((= ret (Z-OK)) - (printf "compressed properly!~%compressed bytes: ~A~%compressed stream: ~A~%" - (string-length compressed) compressed)) - (else - (printf "compress error(~D): ~A ~%" ret (z-error ret)))))) - -(exit 0) diff --git a/Examples/guile/check.list b/Examples/guile/check.list index d35b2d693..7ccd0730a 100644 --- a/Examples/guile/check.list +++ b/Examples/guile/check.list @@ -1,6 +1,5 @@ # see top-level Makefile.in constants -matrix simple port multimap diff --git a/Examples/lua/lua.c b/Examples/lua/lua.c index e06e2c5fc..8cffaa503 100644 --- a/Examples/lua/lua.c +++ b/Examples/lua/lua.c @@ -1,5 +1,4 @@ /* -** $Id$ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ diff --git a/Examples/test-suite/li_std_queue.i b/Examples/test-suite/li_std_queue.i index 2d322b4d9..6bf71afca 100644 --- a/Examples/test-suite/li_std_queue.i +++ b/Examples/test-suite/li_std_queue.i @@ -1,13 +1,4 @@ -/** - * @file std_queue.i - * @author gga - * @date Sun May 6 01:52:44 2007 - * - * @brief test of std::queue - * - * - */ - +// test of std::queue %module li_std_queue %include std_queue.i diff --git a/Examples/test-suite/li_std_set.i b/Examples/test-suite/li_std_set.i index 8c335b24c..2dcc2f17c 100644 --- a/Examples/test-suite/li_std_set.i +++ b/Examples/test-suite/li_std_set.i @@ -1,18 +1,12 @@ -/** - * @file li_std_set.i - * @author gga - * @date Tue May 1 02:52:47 2007 - * - * @brief a test of set containers. - * Languages should define swig::LANGUAGE_OBJ to be - * an entity of their native pointer type which can be - * included in a STL container. +/* + * a test of set containers. + * Languages should define swig::LANGUAGE_OBJ to be + * an entity of their native pointer type which can be + * included in a STL container. * - * For example: - * swig::LANGUAGE_OBJ is GC_VALUE in Ruby - * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python - * - * + * For example: + * swig::LANGUAGE_OBJ is GC_VALUE in Ruby + * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python */ %module li_std_set diff --git a/Examples/test-suite/li_std_stack.i b/Examples/test-suite/li_std_stack.i index d29254089..19b45d46f 100644 --- a/Examples/test-suite/li_std_stack.i +++ b/Examples/test-suite/li_std_stack.i @@ -1,13 +1,4 @@ -/** - * @file std_stack.i - * @author gga - * @date Sun May 6 01:52:44 2007 - * - * @brief test of std::stack - * - * - */ - +// test of std::stack %module li_std_stack %include std_stack.i diff --git a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb index 825f3c593..e79cb46a8 100755 --- a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb +++ b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb @@ -3,9 +3,6 @@ # This is a simple speed benchmark suite for std containers, # to verify their O(n) performance. # It is not part of the standard tests. -# -# License:: SWIG -# require 'benchmark' diff --git a/Examples/test-suite/ruby_li_std_speed.i b/Examples/test-suite/ruby_li_std_speed.i index 3c8e60643..bfb0b2776 100644 --- a/Examples/test-suite/ruby_li_std_speed.i +++ b/Examples/test-suite/ruby_li_std_speed.i @@ -1,13 +1,4 @@ -/** - * @file ruby_li_std_speed.i - * @author gga - * @date Fri May 18 18:03:15 2007 - * - * @brief A speed test of the ruby stl - * - * - */ - +// A speed test of the ruby stl %module ruby_li_std_speed %include diff --git a/Examples/xml/example_gif.i b/Examples/xml/example_gif.i deleted file mode 100644 index f0fb3b183..000000000 --- a/Examples/xml/example_gif.i +++ /dev/null @@ -1,329 +0,0 @@ -/* ----------------------------------------------------------------------------- - * gifplot.h - * - * Main header file for the GIFPlot library. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * Copyright (C) 1995-1996 - * - * See the file LICENSE for information on usage and redistribution. - * ----------------------------------------------------------------------------- */ - -#include -#include -#include -#include -#include -#include - -#ifndef GIFPLOT_H - -/* Pixel is 8-bits */ - -typedef unsigned char Pixel; -typedef float Zvalue; - -/* ------------------------------------------------------------------------ - ColorMap - - Definition and methods for colormaps - ------------------------------------------------------------------------ */ - -typedef struct ColorMap { - unsigned char *cmap; - char *name; -} ColorMap; - -extern ColorMap *new_ColorMap(char *filename); -extern void delete_ColorMap(ColorMap *c); -extern void ColorMap_default(ColorMap *c); -extern void ColorMap_assign(ColorMap *c, int index, int r, int g, int b); -extern int ColorMap_getitem(ColorMap *c, int index); -extern void ColorMap_setitem(ColorMap *c, int index, int value); -extern int ColorMap_write(ColorMap *c, char *filename); - -/* Some default colors */ - -#define BLACK 0 -#define WHITE 1 -#define RED 2 -#define GREEN 3 -#define BLUE 4 -#define YELLOW 5 -#define CYAN 6 -#define MAGENTA 7 - -/*------------------------------------------------------------------------- - FrameBuffer - - This structure defines a simple 8 bit framebuffer. - ------------------------------------------------------------------------- */ - -typedef struct FrameBuffer { - Pixel **pixels; - Zvalue **zbuffer; - unsigned int height; - unsigned int width; - int xmin; /* These are used for clipping */ - int ymin; - int xmax; - int ymax; -} FrameBuffer; - -#define ZMIN 1e+36 - -/* FrameBuffer Methods */ - -extern FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); -extern void delete_FrameBuffer(FrameBuffer *frame); -extern int FrameBuffer_resize(FrameBuffer *frame, int width, int height); -extern void FrameBuffer_clear(FrameBuffer *frame, Pixel color); -extern void FrameBuffer_plot(FrameBuffer *frame, int x, int y, Pixel color); -extern void FrameBuffer_horizontal(FrameBuffer *frame, int xmin, int xmax, int y, Pixel color); -extern void FrameBuffer_horizontalinterp(FrameBuffer *f, int xmin, int xmax, int y, Pixel c1, Pixel c2); -extern void FrameBuffer_vertical(FrameBuffer *frame, int ymin, int ymax, int x, Pixel color); -extern void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -extern void FrameBuffer_solidbox(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -extern void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); -extern void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -extern void FrameBuffer_solidcircle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); -extern void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); -extern void FrameBuffer_setclip(FrameBuffer *frame, int xmin, int ymin, int xmax, int ymax); -extern void FrameBuffer_noclip(FrameBuffer *frame); -extern int FrameBuffer_makeGIF(FrameBuffer *frame, ColorMap *cmap, void *buffer, unsigned int maxsize); -extern int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); -extern void FrameBuffer_zresize(FrameBuffer *f, int width, int height); -extern void FrameBuffer_zclear(FrameBuffer *f); -extern void FrameBuffer_solidtriangle(FrameBuffer *f, int x1, int y1, int x2, int y2, int x3, int y3, Pixel c); -extern void FrameBuffer_interptriangle(FrameBuffer *f, int tx1, int ty1, Pixel c1, - int tx2, int ty2, Pixel c2, int tx3, int ty3, Pixel c3); - -#define HORIZONTAL 1 -#define VERTICAL 2 - -extern void FrameBuffer_drawchar(FrameBuffer *frame, int x, int y, int fgcolor, int bgcolor, char chr, int orientation); -extern void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, int bgcolor, char *text, int orientation); - -/* ------------------------------------------------------------------------ - PixMap - - The equivalent of "bit-maps". - ------------------------------------------------------------------------ */ - -typedef struct PixMap { - int width; - int height; - int centerx; - int centery; - int *map; -} PixMap; - -/* PIXMAP methods */ - -extern PixMap *new_PixMap(int width, int height, int centerx, int centery); -extern void delete_PixMap(PixMap *pm); -extern void PixMap_set(PixMap *pm, int x, int y, int pix); -extern void FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor); - -#define TRANSPARENT 0 -#define FOREGROUND 1 -#define BACKGROUND 2 - -/* ------------------------------------------------------------------------ - Plot2D - - Definition and methods for 2D plots. - ------------------------------------------------------------------------ */ - -typedef struct Plot2D { - FrameBuffer *frame; /* what frame buffer are we using */ - int view_xmin; /* Minimum coordinates of view region */ - int view_ymin; - int view_xmax; /* Maximum coordinates of view region */ - int view_ymax; - double xmin; /* Minimum coordinates of plot region */ - double ymin; - double xmax; /* Maximum coordinates of plot region */ - double ymax; - int xscale; /* Type of scaling (LINEAR, LOG, etc..) */ - int yscale; - double dx; /* Private scaling parameters */ - double dy; -} Plot2D; - -/* 2D Plot methods */ - -extern Plot2D *new_Plot2D(FrameBuffer *frame,double xmin,double ymin, double xmax, double ymax); -extern void delete_Plot2D(Plot2D *p2); -extern Plot2D *Plot2D_copy(Plot2D *p2); -extern void Plot2D_clear(Plot2D *p2, Pixel c); -extern void Plot2D_setview(Plot2D *p2, int vxmin, int vymin, int vxmax, int vymax); -extern void Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax); -extern void Plot2D_setscale(Plot2D *p2, int xscale, int yscale); -extern void Plot2D_plot(Plot2D *p2, double x, double y, Pixel color); -extern void Plot2D_box(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); -extern void Plot2D_solidbox(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color); -extern void Plot2D_interpbox(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); -extern void Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color); -extern void Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color); -extern void Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); -extern void Plot2D_start(Plot2D *p2); -extern void Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor); -extern void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel c); -extern void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel c); -extern void Plot2D_triangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); -extern void Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); -extern void Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, - double x2, double y2, Pixel c2, - double x3, double y3, Pixel c3); - -#define LINEAR 10 -#define LOG 11 - -/* ----------------------------------------------------------------------- - Matrix - - Operations on 4x4 transformation matrices and vectors. - Matrices are represented as a double array of 16 elements - ----------------------------------------------------------------------- */ - -typedef double *Matrix; -typedef struct GL_Vector { - double x; - double y; - double z; - double w; -} GL_Vector; - -extern Matrix new_Matrix(); -extern void delete_Matrix(Matrix a); -extern Matrix Matrix_copy(Matrix a); -extern void Matrix_multiply(Matrix a, Matrix b, Matrix c); -extern void Matrix_identity(Matrix a); -extern void Matrix_zero(Matrix a); -extern void Matrix_transpose(Matrix a, Matrix result); -extern void Matrix_invert(Matrix a, Matrix inva); -extern void Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t); -extern void Matrix_transform4(Matrix a, double rx, double ry, double rz, - double rw, GL_Vector *t); - -extern void Matrix_print(Matrix a); -extern void Matrix_translate(Matrix a, double tx, double ty, double tz); -extern void Matrix_rotatex(Matrix a, double deg); -extern void Matrix_rotatey(Matrix a, double deg); -extern void Matrix_rotatez(Matrix a, double deg); - -/* ----------------------------------------------------------------------- - Plot3D - - Data Structure for 3-D plots - ------------------------------------------------------------------------ */ - -typedef struct Plot3D { - FrameBuffer *frame; /* Frame buffer being used */ - int view_xmin; /* Viewing region */ - int view_ymin; - int view_xmax; - int view_ymax; - double xmin; /* Bounding box */ - double ymin; - double zmin; - double xmax; - double ymax; - double zmax; - double xcenter; /* Center point */ - double ycenter; - double zcenter; - double fovy; /* Field of view */ - double aspect; /* Aspect ratio */ - double znear; /* near "clipping" plane */ - double zfar; /* far "clipping" plane */ - Matrix center_mat; /* Matrix used for centering the model */ - Matrix model_mat; /* Model rotation matrix */ - Matrix view_mat; /* Viewing matrix */ - Matrix fullmodel_mat; /* Full model matrix. Used by sphere plot */ - Matrix trans_mat; /* Total transformation matrix */ - double lookatz; /* Where is the z-lookat point */ - double xshift; /* Used for translation and stuff */ - double yshift; - double zoom; - int width; - int height; - int pers_mode; /* Perspective mode (private) */ - double ortho_left,ortho_right,ortho_bottom,ortho_top; -} Plot3D; - -extern Plot3D *new_Plot3D(FrameBuffer *frame, double xmin, double ymin, double zmin, - double xmax, double ymax, double zmax); -extern void delete_Plot3D(Plot3D *p3); -extern Plot3D *Plot3D_copy(Plot3D *p3); -extern void Plot3D_clear(Plot3D *p3, Pixel Color); -extern void Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar); -extern void Plot3D_ortho(Plot3D *p3, double left, double right, double top, double bottom); -extern void Plot3D_lookat(Plot3D *p3, double z); -extern void Plot3D_autoperspective(Plot3D *p3, double fovy); -extern void Plot3D_autoortho(Plot3D *p3); -extern void Plot3D_rotx(Plot3D *p3, double deg); -extern void Plot3D_roty(Plot3D *p3, double deg); -extern void Plot3D_rotz(Plot3D *p3, double deg); -extern void Plot3D_rotl(Plot3D *p3, double deg); -extern void Plot3D_rotr(Plot3D *p3, double deg); -extern void Plot3D_rotd(Plot3D *p3, double deg); -extern void Plot3D_rotu(Plot3D *p3, double deg); -extern void Plot3D_rotc(Plot3D *p3, double deg); -extern void Plot3D_zoom(Plot3D *p3, double percent); -extern void Plot3D_left(Plot3D *p3, double percent); -extern void Plot3D_right(Plot3D *p3, double percent); -extern void Plot3D_down(Plot3D *p3, double percent); -extern void Plot3D_up(Plot3D *p3, double percent); -extern void Plot3D_center(Plot3D *p3, double cx, double cy); - -extern void Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel Color); - -extern void Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax); -extern void Plot3D_start(Plot3D *p3); -extern void Plot3D_line(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, Pixel color); -extern void Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color); -extern void Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, Pixel color); - -extern void Plot3D_interptriangle(Plot3D *p3, - double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3); - -extern void Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color); - -extern void Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, - double x2, double y2, double z2, - double x3, double y3, double z3, - double x4, double y4, double z4, - Pixel color); - -extern void Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, - double x2, double y2, double z2, Pixel c2, - double x3, double y3, double z3, Pixel c3, - double x4, double y4, double z4, Pixel c4); - - -extern void Plot3D_solidsphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c); - -extern void Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c, Pixel bc); - -extern PixMap PixMap_SQUARE; -extern PixMap PixMap_TRIANGLE; -extern PixMap PixMap_CROSS; - -#endif -#define GIFPLOT_H - - - diff --git a/LICENSE b/LICENSE index fdb73d916..d7a422fda 100644 --- a/LICENSE +++ b/LICENSE @@ -1,95 +1,22 @@ -SWIG is distributed under the following terms: +SWIG is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. See the LICENSE-GPL file for +the full terms of the GNU General Public license version 3. -I. +Portions of SWIG are also licensed under the terms of the licenses +in the file LICENSE-UNIVERSITIES. You must observe the terms of +these licenses, as well as the terms of the GNU General Public License, +when you distribute SWIG. -Copyright (c) 1995-1998 -The University of Utah and the Regents of the University of California -All Rights Reserved +The SWIG library and examples, under the Lib and Examples top level +directories, are distributed under the following terms: -Permission is hereby granted, without written agreement and without -license or royalty fees, to use, copy, modify, and distribute this -software and its documentation for any purpose, provided that -(1) The above copyright notice and the following two paragraphs -appear in all copies of the source code and (2) redistributions -including binaries reproduces these notices in the supporting -documentation. Substantial modifications to this software may be -copyrighted by their authors and need not follow the licensing terms -described here, provided that the new terms are clearly indicated in -all files where they apply. - -IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE -UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY -PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, -EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH -SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND -THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, -SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - - -II. - -This software includes contributions that are Copyright (c) 1998-2005 -University of Chicago. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. Redistributions -in binary form must reproduce the above copyright notice, this list of -conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. Neither the name of -the University of Chicago nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF CHICAGO AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF -CHICAGO OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -III. - -This software includes contributions that are Copyright (c) 2005-2006 -Arizona Board of Regents (University of Arizona). -All Rights Reserved - -Permission is hereby granted, without written agreement and without -license or royalty fees, to use, copy, modify, and distribute this -software and its documentation for any purpose, provided that -(1) The above copyright notice and the following two paragraphs -appear in all copies of the source code and (2) redistributions -including binaries reproduces these notices in the supporting -documentation. Substantial modifications to this software may be -copyrighted by their authors and need not follow the licensing terms -described here, provided that the new terms are clearly indicated in -all files where they apply. - -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF ARIZONA AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF -ARIZONA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + You may copy, modify, distribute, and make derivative works based on + this software, in source code or object code form, without + restriction. If you distribute the software to others, you may do + so according to the terms of your choice. This software is offered as + is, without warranty of any kind. +See the COPYRIGHT file for a list of contributors to SWIG and their +copyright notices. diff --git a/LICENSE-GPL b/LICENSE-GPL new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/LICENSE-GPL @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/LICENSE-UNIVERSITIES b/LICENSE-UNIVERSITIES new file mode 100644 index 000000000..fdb73d916 --- /dev/null +++ b/LICENSE-UNIVERSITIES @@ -0,0 +1,95 @@ +SWIG is distributed under the following terms: + +I. + +Copyright (c) 1995-1998 +The University of Utah and the Regents of the University of California +All Rights Reserved + +Permission is hereby granted, without written agreement and without +license or royalty fees, to use, copy, modify, and distribute this +software and its documentation for any purpose, provided that +(1) The above copyright notice and the following two paragraphs +appear in all copies of the source code and (2) redistributions +including binaries reproduces these notices in the supporting +documentation. Substantial modifications to this software may be +copyrighted by their authors and need not follow the licensing terms +described here, provided that the new terms are clearly indicated in +all files where they apply. + +IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE +UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY +PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, +EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH +SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND +THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, +SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + + +II. + +This software includes contributions that are Copyright (c) 1998-2005 +University of Chicago. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. Redistributions +in binary form must reproduce the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. Neither the name of +the University of Chicago nor the names of its contributors may be +used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF CHICAGO AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF +CHICAGO OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +III. + +This software includes contributions that are Copyright (c) 2005-2006 +Arizona Board of Regents (University of Arizona). +All Rights Reserved + +Permission is hereby granted, without written agreement and without +license or royalty fees, to use, copy, modify, and distribute this +software and its documentation for any purpose, provided that +(1) The above copyright notice and the following two paragraphs +appear in all copies of the source code and (2) redistributions +including binaries reproduces these notices in the supporting +documentation. Substantial modifications to this software may be +copyrighted by their authors and need not follow the licensing terms +described here, provided that the new terms are clearly indicated in +all files where they apply. + +THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF ARIZONA AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF +ARIZONA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/Lib/allegrocl/allegrocl.swg b/Lib/allegrocl/allegrocl.swg index 4479f6ac2..266303113 100644 --- a/Lib/allegrocl/allegrocl.swg +++ b/Lib/allegrocl/allegrocl.swg @@ -289,8 +289,6 @@ $body)" #endif %insert("lisphead") %{ -;; $Id$ - (eval-when (:compile-toplevel :load-toplevel :execute) ;; avoid compiling ef-templates at runtime diff --git a/Lib/allegrocl/longlongs.i b/Lib/allegrocl/longlongs.i index b887a8a0a..4aa54660b 100644 --- a/Lib/allegrocl/longlongs.i +++ b/Lib/allegrocl/longlongs.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * longlongs.i * * Typemap addition for support of 'long long' type and 'unsigned long long diff --git a/Lib/allegrocl/std_list.i b/Lib/allegrocl/std_list.i index c8ab45649..4e260897f 100644 --- a/Lib/allegrocl/std_list.i +++ b/Lib/allegrocl/std_list.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_list.i * * SWIG typemaps for std::list types diff --git a/Lib/allegrocl/std_string.i b/Lib/allegrocl/std_string.i index 4da0148fe..becc322e9 100644 --- a/Lib/allegrocl/std_string.i +++ b/Lib/allegrocl/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/attribute.i b/Lib/attribute.i index 45c3c5b64..0cc3ff1a3 100644 --- a/Lib/attribute.i +++ b/Lib/attribute.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * attribute.i * * SWIG library file for implementing attributes. diff --git a/Lib/carrays.i b/Lib/carrays.i index 738b4577a..5fc78877c 100644 --- a/Lib/carrays.i +++ b/Lib/carrays.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * carrays.i * * SWIG library file containing macros that can be used to manipulate simple diff --git a/Lib/cdata.i b/Lib/cdata.i index 67601f737..41e8f86ce 100644 --- a/Lib/cdata.i +++ b/Lib/cdata.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cdata.i * * SWIG library file containing macros for manipulating raw C data as strings. diff --git a/Lib/chicken/chicken.swg b/Lib/chicken/chicken.swg index a8d1b5a57..68f022570 100644 --- a/Lib/chicken/chicken.swg +++ b/Lib/chicken/chicken.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * chicken.swg * * CHICKEN configuration module. diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg index 8703ea65a..f4e94d6f6 100644 --- a/Lib/chicken/chickenrun.swg +++ b/Lib/chicken/chickenrun.swg @@ -1,9 +1,5 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * chickenrun.swg - * * ----------------------------------------------------------------------------- */ #include diff --git a/Lib/chicken/multi-generic.scm b/Lib/chicken/multi-generic.scm index ae822f37b..9d2e31d34 100644 --- a/Lib/chicken/multi-generic.scm +++ b/Lib/chicken/multi-generic.scm @@ -21,7 +21,7 @@ ;; which functions are used when. ;; Comments, bugs, suggestions: send either to chicken-users@nongnu.org or to -;; Author: John Lenz , most code copied from TinyCLOS +;; Most code copied from TinyCLOS (define (make 'name "multi-generic" diff --git a/Lib/chicken/std_string.i b/Lib/chicken/std_string.i index 2955d0e2f..ce24cba32 100644 --- a/Lib/chicken/std_string.i +++ b/Lib/chicken/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/chicken/typemaps.i b/Lib/chicken/typemaps.i index d79e20184..56cd18a5d 100644 --- a/Lib/chicken/typemaps.i +++ b/Lib/chicken/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Pointer handling diff --git a/Lib/clisp/clisp.swg b/Lib/clisp/clisp.swg index fb6cdbf2a..e1d330cb3 100644 --- a/Lib/clisp/clisp.swg +++ b/Lib/clisp/clisp.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * clisp.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/cmalloc.i b/Lib/cmalloc.i index 03a61351c..9f58bc03c 100644 --- a/Lib/cmalloc.i +++ b/Lib/cmalloc.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cmalloc.i * * SWIG library file containing macros that can be used to create objects using diff --git a/Lib/constraints.i b/Lib/constraints.i index 2deb1168a..8bc7f9159 100644 --- a/Lib/constraints.i +++ b/Lib/constraints.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * constraints.i * * SWIG constraints library. diff --git a/Lib/cpointer.i b/Lib/cpointer.i index 1a6e51741..6b15a8417 100644 --- a/Lib/cpointer.i +++ b/Lib/cpointer.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cpointer.i * * SWIG library file containing macros that can be used to manipulate simple diff --git a/Lib/csharp/arrays_csharp.i b/Lib/csharp/arrays_csharp.i index ea22da584..513330e4e 100644 --- a/Lib/csharp/arrays_csharp.i +++ b/Lib/csharp/arrays_csharp.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * arrays_csharp.i * * This file contains a two approaches to marshaling arrays. The first uses diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg index 94f76a3ad..4ca55fa77 100644 --- a/Lib/csharp/csharp.swg +++ b/Lib/csharp/csharp.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * csharp.swg * * C# typemaps diff --git a/Lib/csharp/csharphead.swg b/Lib/csharp/csharphead.swg index ffff70372..eec4a2f2c 100644 --- a/Lib/csharp/csharphead.swg +++ b/Lib/csharp/csharphead.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * csharphead.swg * * Support code for exceptions if the SWIG_CSHARP_NO_EXCEPTION_HELPER is not defined diff --git a/Lib/csharp/director.swg b/Lib/csharp/director.swg index 8957ecf42..7768d8c02 100644 --- a/Lib/csharp/director.swg +++ b/Lib/csharp/director.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * director.swg * * This file contains support for director classes so that C# proxy diff --git a/Lib/csharp/enums.swg b/Lib/csharp/enums.swg index be2a6063b..6605da8c8 100644 --- a/Lib/csharp/enums.swg +++ b/Lib/csharp/enums.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enums.swg * * Include this file in order for C/C++ enums to be wrapped by proper C# enums. diff --git a/Lib/csharp/enumsimple.swg b/Lib/csharp/enumsimple.swg index f50849892..2b1cb182b 100644 --- a/Lib/csharp/enumsimple.swg +++ b/Lib/csharp/enumsimple.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enumsimple.swg * * This file provides backwards compatible enum wrapping. SWIG versions 1.3.21 diff --git a/Lib/csharp/enumtypesafe.swg b/Lib/csharp/enumtypesafe.swg index 8ba7838ef..a6bf64b9a 100644 --- a/Lib/csharp/enumtypesafe.swg +++ b/Lib/csharp/enumtypesafe.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enumtypesafe.swg * * Include this file in order for C/C++ enums to be wrapped by the so called diff --git a/Lib/csharp/std_except.i b/Lib/csharp/std_except.i index c86e97a54..27eb84bc2 100644 --- a/Lib/csharp/std_except.i +++ b/Lib/csharp/std_except.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_except.i * * Typemaps used by the STL wrappers that throw exceptions. These typemaps are diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i index c35f21dc7..b19414597 100644 --- a/Lib/csharp/std_map.i +++ b/Lib/csharp/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/csharp/std_pair.i b/Lib/csharp/std_pair.i index 78142ffa6..0712ad762 100644 --- a/Lib/csharp/std_pair.i +++ b/Lib/csharp/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/csharp/std_string.i b/Lib/csharp/std_string.i index d29692717..0d804518b 100644 --- a/Lib/csharp/std_string.i +++ b/Lib/csharp/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * Typemaps for std::string and const std::string& diff --git a/Lib/csharp/std_vector.i b/Lib/csharp/std_vector.i index f4ad88bae..448226860 100644 --- a/Lib/csharp/std_vector.i +++ b/Lib/csharp/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * SWIG typemaps for std::vector diff --git a/Lib/csharp/std_wstring.i b/Lib/csharp/std_wstring.i index 938070e4b..9142d36a5 100644 --- a/Lib/csharp/std_wstring.i +++ b/Lib/csharp/std_wstring.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_wstring.i * * Typemaps for std::wstring and const std::wstring& diff --git a/Lib/csharp/stl.i b/Lib/csharp/stl.i index 66b72e073..9d2e91eee 100644 --- a/Lib/csharp/stl.i +++ b/Lib/csharp/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/csharp/typemaps.i b/Lib/csharp/typemaps.i index ddfbd1b0c..ac8398021 100644 --- a/Lib/csharp/typemaps.i +++ b/Lib/csharp/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Pointer and reference handling typemap library diff --git a/Lib/csharp/wchar.i b/Lib/csharp/wchar.i index be87560c3..f02c09a53 100644 --- a/Lib/csharp/wchar.i +++ b/Lib/csharp/wchar.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * wchar.i * * Typemaps for the wchar_t type diff --git a/Lib/cstring.i b/Lib/cstring.i index 4ebdf6857..6829f7597 100644 --- a/Lib/cstring.i +++ b/Lib/cstring.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cstring.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/cwstring.i b/Lib/cwstring.i index a6b08ae40..f0631d328 100644 --- a/Lib/cwstring.i +++ b/Lib/cwstring.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cwstring.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/exception.i b/Lib/exception.i index 18b08994f..e9ba189a1 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * exception.i * * SWIG library file providing language independent exception handling diff --git a/Lib/gcj/cni.swg b/Lib/gcj/cni.swg index 247909a4a..4bd07df06 100644 --- a/Lib/gcj/cni.swg +++ b/Lib/gcj/cni.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cni.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/guile/common.scm b/Lib/guile/common.scm index a51d3a71d..17c9ab580 100644 --- a/Lib/guile/common.scm +++ b/Lib/guile/common.scm @@ -3,12 +3,6 @@ ;;;* ;;;* This file contains generic SWIG GOOPS classes for generated ;;;* GOOPS file support -;;;* -;;;* Copyright (C) 2003 John Lenz (jelenz@wisc.edu) -;;;* Copyright (C) 2004 Matthias Koeppe (mkoeppe@mail.math.uni-magdeburg.de) -;;;* -;;;* This file may be freely redistributed without license or fee provided -;;;* this copyright message remains intact. ;;;************************************************************************ (define-module (Swig swigrun)) diff --git a/Lib/guile/cplusplus.i b/Lib/guile/cplusplus.i index cb4cf7434..0dfe71754 100644 --- a/Lib/guile/cplusplus.i +++ b/Lib/guile/cplusplus.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cplusplus.i * * SWIG typemaps for C++ diff --git a/Lib/guile/guile.i b/Lib/guile/guile.i index 1bf28d6f3..ef270d74b 100644 --- a/Lib/guile/guile.i +++ b/Lib/guile/guile.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * guile.i * * SWIG Configuration File for Guile. diff --git a/Lib/guile/guile_gh.swg b/Lib/guile/guile_gh.swg index 6412a4c61..3b65af897 100644 --- a/Lib/guile/guile_gh.swg +++ b/Lib/guile/guile_gh.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * guile_gh.swg * * This SWIG interface file is processed if the Guile module is run diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg index 5b1fca0aa..0eba1f97e 100644 --- a/Lib/guile/guile_gh_run.swg +++ b/Lib/guile/guile_gh_run.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * guile_gh_run.swg * * Guile GH runtime file diff --git a/Lib/guile/guile_scm.swg b/Lib/guile/guile_scm.swg index caded728d..d12401451 100644 --- a/Lib/guile/guile_scm.swg +++ b/Lib/guile/guile_scm.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * guile_scm.swg * * This SWIG interface file is processed if the Guile module is run diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg index 5da8558fc..91b74095d 100644 --- a/Lib/guile/guile_scm_run.swg +++ b/Lib/guile/guile_scm_run.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * guile_scm_run.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/guile/guilemain.i b/Lib/guile/guilemain.i index 6f4e4d94d..925b81fee 100644 --- a/Lib/guile/guilemain.i +++ b/Lib/guile/guilemain.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * guilemain.i * * The main functions for a user augmented guile diff --git a/Lib/guile/interpreter.i b/Lib/guile/interpreter.i index 7e8f0777a..524e0694a 100644 --- a/Lib/guile/interpreter.i +++ b/Lib/guile/interpreter.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * interpreter.i * * SWIG file for a simple Guile interpreter diff --git a/Lib/guile/list-vector.i b/Lib/guile/list-vector.i index d98cae59a..c2cd1aea2 100644 --- a/Lib/guile/list-vector.i +++ b/Lib/guile/list-vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * list_vector.i * * Guile typemaps for converting between arrays and Scheme lists or vectors diff --git a/Lib/guile/pointer-in-out.i b/Lib/guile/pointer-in-out.i index bc6438759..d8a631ca9 100644 --- a/Lib/guile/pointer-in-out.i +++ b/Lib/guile/pointer-in-out.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pointer-in-out.i * * Guile typemaps for passing pointers indirectly diff --git a/Lib/guile/ports.i b/Lib/guile/ports.i index 0d0e142e1..5940b4d3b 100644 --- a/Lib/guile/ports.i +++ b/Lib/guile/ports.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * ports.i * * Guile typemaps for handling ports diff --git a/Lib/guile/std_common.i b/Lib/guile/std_common.i index ace5d65a8..a46c42c69 100644 --- a/Lib/guile/std_common.i +++ b/Lib/guile/std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i index cc53e1560..19c863096 100644 --- a/Lib/guile/std_map.i +++ b/Lib/guile/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/guile/std_pair.i b/Lib/guile/std_pair.i index f8c2ea688..35f0cfad5 100644 --- a/Lib/guile/std_pair.i +++ b/Lib/guile/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/guile/std_string.i b/Lib/guile/std_string.i index f80a65ca5..c10806e98 100644 --- a/Lib/guile/std_string.i +++ b/Lib/guile/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/guile/std_vector.i b/Lib/guile/std_vector.i index 145db945b..6801daee8 100644 --- a/Lib/guile/std_vector.i +++ b/Lib/guile/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * SWIG typemaps for std::vector diff --git a/Lib/guile/stl.i b/Lib/guile/stl.i index 66b72e073..9d2e91eee 100644 --- a/Lib/guile/stl.i +++ b/Lib/guile/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i index d9f972850..4f306f7f8 100644 --- a/Lib/guile/typemaps.i +++ b/Lib/guile/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Guile-specific typemaps diff --git a/Lib/inttypes.i b/Lib/inttypes.i index 0cc81948e..8450cb840 100644 --- a/Lib/inttypes.i +++ b/Lib/inttypes.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * inttypes.i * * SWIG library file for ISO C99 types: 7.8 Format conversion of integer types diff --git a/Lib/java/arrays_java.i b/Lib/java/arrays_java.i index 95510c3f9..ddaf7408c 100644 --- a/Lib/java/arrays_java.i +++ b/Lib/java/arrays_java.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * arrays_java.i * * These typemaps give more natural support for arrays. The typemaps are not efficient diff --git a/Lib/java/director.swg b/Lib/java/director.swg index fa588671d..07e5a1af1 100644 --- a/Lib/java/director.swg +++ b/Lib/java/director.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/java/enums.swg b/Lib/java/enums.swg index 1a8f89b3a..edb67c417 100644 --- a/Lib/java/enums.swg +++ b/Lib/java/enums.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enums.swg * * Include this file in order for C/C++ enums to be wrapped by proper Java enums. diff --git a/Lib/java/enumsimple.swg b/Lib/java/enumsimple.swg index f45774d0c..e08401869 100644 --- a/Lib/java/enumsimple.swg +++ b/Lib/java/enumsimple.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enumsimple.swg * * This file provides backwards compatible enum wrapping. SWIG versions 1.3.21 diff --git a/Lib/java/enumtypesafe.swg b/Lib/java/enumtypesafe.swg index a49a9d134..d6c6e5190 100644 --- a/Lib/java/enumtypesafe.swg +++ b/Lib/java/enumtypesafe.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enumtypesafe.swg * * Include this file in order for C/C++ enums to be wrapped by the so called diff --git a/Lib/java/enumtypeunsafe.swg b/Lib/java/enumtypeunsafe.swg index bda055113..d9a7c4d29 100644 --- a/Lib/java/enumtypeunsafe.swg +++ b/Lib/java/enumtypeunsafe.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * enumtypeunsafe.swg * * Include this file in order for C/C++ enums to be wrapped by integers values. diff --git a/Lib/java/java.swg b/Lib/java/java.swg index bd2357a86..6173502ca 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * java.swg * * Java typemaps diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index fc4c4e267..d2ea560b6 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * javahead.swg * * Java support code diff --git a/Lib/java/std_except.i b/Lib/java/std_except.i index 15be1deb8..9e23d50e6 100644 --- a/Lib/java/std_except.i +++ b/Lib/java/std_except.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_except.i * * Typemaps used by the STL wrappers that throw exceptions. diff --git a/Lib/java/std_map.i b/Lib/java/std_map.i index 00967d3f9..a7020532c 100644 --- a/Lib/java/std_map.i +++ b/Lib/java/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/java/std_pair.i b/Lib/java/std_pair.i index dc0604dc5..fe45ee676 100644 --- a/Lib/java/std_pair.i +++ b/Lib/java/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i index 789e17a65..f0d837696 100644 --- a/Lib/java/std_string.i +++ b/Lib/java/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * Typemaps for std::string and const std::string& diff --git a/Lib/java/std_vector.i b/Lib/java/std_vector.i index 29439606b..3f29b19c7 100644 --- a/Lib/java/std_vector.i +++ b/Lib/java/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/java/std_wstring.i b/Lib/java/std_wstring.i index 989176500..12d8fc14f 100644 --- a/Lib/java/std_wstring.i +++ b/Lib/java/std_wstring.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_wstring.i * * Typemaps for std::wstring and const std::wstring& diff --git a/Lib/java/stl.i b/Lib/java/stl.i index b8d7a654c..04f86014f 100644 --- a/Lib/java/stl.i +++ b/Lib/java/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i index 59f7af99a..74ed99374 100644 --- a/Lib/java/typemaps.i +++ b/Lib/java/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Pointer and reference handling typemap library diff --git a/Lib/java/various.i b/Lib/java/various.i index 733b8fa79..7c396de3e 100644 --- a/Lib/java/various.i +++ b/Lib/java/various.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * various.i * * SWIG Typemap library for Java. diff --git a/Lib/lua/_std_common.i b/Lib/lua/_std_common.i index 33cc513c3..e552d0c8f 100644 --- a/Lib/lua/_std_common.i +++ b/Lib/lua/_std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * _std_common.i * * std::helpers for LUA diff --git a/Lib/lua/lua.swg b/Lib/lua/lua.swg index b6d888670..c3f5cecc5 100644 --- a/Lib/lua/lua.swg +++ b/Lib/lua/lua.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * lua.swg * * SWIG Configuration File for Lua. diff --git a/Lib/lua/lua_fnptr.i b/Lib/lua/lua_fnptr.i index c7df6f5a3..7e9facdf3 100644 --- a/Lib/lua/lua_fnptr.i +++ b/Lib/lua/lua_fnptr.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * lua_fnptr.i * * SWIG Library file containing the main typemap code to support Lua modules. diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg index 32e1b1617..4c9aa5144 100644 --- a/Lib/lua/luarun.swg +++ b/Lib/lua/luarun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * luarun.swg * * This file contains the runtime support for Lua modules diff --git a/Lib/lua/luaruntime.swg b/Lib/lua/luaruntime.swg index b82cd56d7..5823d4fcf 100644 --- a/Lib/lua/luaruntime.swg +++ b/Lib/lua/luaruntime.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * luaruntime.swg * * all the runtime code for . diff --git a/Lib/lua/luatypemaps.swg b/Lib/lua/luatypemaps.swg index caa2a6ce1..401541267 100644 --- a/Lib/lua/luatypemaps.swg +++ b/Lib/lua/luatypemaps.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * luatypemaps.swg * * basic typemaps for Lua. diff --git a/Lib/lua/std_except.i b/Lib/lua/std_except.i index ce148ef63..9c736b9ef 100644 --- a/Lib/lua/std_except.i +++ b/Lib/lua/std_except.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * Typemaps used by the STL wrappers that throw exceptions. * These typemaps are used when methods are declared with an STL exception * specification, such as: diff --git a/Lib/lua/std_map.i b/Lib/lua/std_map.i index dd22443d5..84b0c74ff 100644 --- a/Lib/lua/std_map.i +++ b/Lib/lua/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/lua/std_pair.i b/Lib/lua/std_pair.i index 1b20f74e0..c76361554 100644 --- a/Lib/lua/std_pair.i +++ b/Lib/lua/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * std::pair typemaps for LUA diff --git a/Lib/lua/std_string.i b/Lib/lua/std_string.i index fa58f10bb..92f27d738 100644 --- a/Lib/lua/std_string.i +++ b/Lib/lua/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * std::string typemaps for LUA diff --git a/Lib/lua/std_vector.i b/Lib/lua/std_vector.i index c6778087f..f248f0340 100644 --- a/Lib/lua/std_vector.i +++ b/Lib/lua/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * std::vector typemaps for LUA diff --git a/Lib/lua/stl.i b/Lib/lua/stl.i index b8d7a654c..04f86014f 100644 --- a/Lib/lua/stl.i +++ b/Lib/lua/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/lua/typemaps.i b/Lib/lua/typemaps.i index fa0c0d0e5..084726e58 100644 --- a/Lib/lua/typemaps.i +++ b/Lib/lua/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.swg * * SWIG Library file containing the main typemap code to support Lua modules. diff --git a/Lib/lua/wchar.i b/Lib/lua/wchar.i index 5b206eb71..5021c1604 100644 --- a/Lib/lua/wchar.i +++ b/Lib/lua/wchar.i @@ -1,12 +1,8 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * wchar.i * * Typemaps for the wchar_t type * These are mapped to a Lua string and are passed around by value. - * * ----------------------------------------------------------------------------- */ // note: only support for pointer right now, not fixed length strings @@ -43,4 +39,4 @@ if ($1==0) {lua_pushfstring(L,"Error in converting to wchar (arg %d)",$input);go free($1); %} -%typemap(typecheck) wchar_t * = char *; \ No newline at end of file +%typemap(typecheck) wchar_t * = char *; diff --git a/Lib/math.i b/Lib/math.i index be931d71b..a37c92d19 100644 --- a/Lib/math.i +++ b/Lib/math.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * math.i * * SWIG library file for floating point operations. diff --git a/Lib/modula3/modula3.swg b/Lib/modula3/modula3.swg index 6a1b4d94d..599a12e5a 100644 --- a/Lib/modula3/modula3.swg +++ b/Lib/modula3/modula3.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * modula3.swg * * Modula3 typemaps diff --git a/Lib/modula3/modula3head.swg b/Lib/modula3/modula3head.swg index b2426be5f..af96a78d1 100644 --- a/Lib/modula3/modula3head.swg +++ b/Lib/modula3/modula3head.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * modula3head.swg * * Modula3 support code diff --git a/Lib/modula3/typemaps.i b/Lib/modula3/typemaps.i index 79ddfda0f..1d76ab5e0 100644 --- a/Lib/modula3/typemaps.i +++ b/Lib/modula3/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Pointer and reference handling typemap library diff --git a/Lib/mzscheme/mzrun.swg b/Lib/mzscheme/mzrun.swg index 3b05d2406..a5128da56 100644 --- a/Lib/mzscheme/mzrun.swg +++ b/Lib/mzscheme/mzrun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * mzrun.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/mzscheme/mzscheme.swg b/Lib/mzscheme/mzscheme.swg index ed4b2ec9d..9ae242845 100644 --- a/Lib/mzscheme/mzscheme.swg +++ b/Lib/mzscheme/mzscheme.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * mzscheme.swg * * SWIG Configuration File for MzScheme. diff --git a/Lib/mzscheme/std_common.i b/Lib/mzscheme/std_common.i index 8732f811c..1f1ae1ab7 100644 --- a/Lib/mzscheme/std_common.i +++ b/Lib/mzscheme/std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/mzscheme/std_map.i b/Lib/mzscheme/std_map.i index aff720db6..b2c894509 100644 --- a/Lib/mzscheme/std_map.i +++ b/Lib/mzscheme/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/mzscheme/std_pair.i b/Lib/mzscheme/std_pair.i index 2ac331e71..d5a65470d 100644 --- a/Lib/mzscheme/std_pair.i +++ b/Lib/mzscheme/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/mzscheme/std_string.i b/Lib/mzscheme/std_string.i index c9a82efe4..b8b99d9ad 100644 --- a/Lib/mzscheme/std_string.i +++ b/Lib/mzscheme/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string types diff --git a/Lib/mzscheme/std_vector.i b/Lib/mzscheme/std_vector.i index 90a52fc0a..22e1fa96b 100644 --- a/Lib/mzscheme/std_vector.i +++ b/Lib/mzscheme/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * SWIG typemaps for std::vector diff --git a/Lib/mzscheme/stl.i b/Lib/mzscheme/stl.i index 946e4b7f0..b19eae58b 100644 --- a/Lib/mzscheme/stl.i +++ b/Lib/mzscheme/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/mzscheme/typemaps.i b/Lib/mzscheme/typemaps.i index 334893242..b9f22440c 100644 --- a/Lib/mzscheme/typemaps.i +++ b/Lib/mzscheme/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/ocaml/cstring.i b/Lib/ocaml/cstring.i index e56258264..0d6aa4b69 100644 --- a/Lib/ocaml/cstring.i +++ b/Lib/ocaml/cstring.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cstring.i * * This file provides typemaps and macros for dealing with various forms diff --git a/Lib/ocaml/director.swg b/Lib/ocaml/director.swg index 87333168f..a21f62102 100644 --- a/Lib/ocaml/director.swg +++ b/Lib/ocaml/director.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/ocaml/ocaml.i b/Lib/ocaml/ocaml.i index a46e239d1..e099f7c10 100644 --- a/Lib/ocaml/ocaml.i +++ b/Lib/ocaml/ocaml.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * ocaml.i * * SWIG Configuration File for Ocaml diff --git a/Lib/ocaml/ocamldec.swg b/Lib/ocaml/ocamldec.swg index 3b5290fa1..8e452d3f9 100644 --- a/Lib/ocaml/ocamldec.swg +++ b/Lib/ocaml/ocamldec.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * ocamldec.swg * * Ocaml runtime code -- declarations diff --git a/Lib/ocaml/std_common.i b/Lib/ocaml/std_common.i index b2dff61d2..1c397050c 100644 --- a/Lib/ocaml/std_common.i +++ b/Lib/ocaml/std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/ocaml/std_deque.i b/Lib/ocaml/std_deque.i index baadb4e53..5b38962bf 100644 --- a/Lib/ocaml/std_deque.i +++ b/Lib/ocaml/std_deque.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_deque.i * * Default std_deque wrapper diff --git a/Lib/ocaml/std_list.i b/Lib/ocaml/std_list.i index 0aea90767..06181cca8 100644 --- a/Lib/ocaml/std_list.i +++ b/Lib/ocaml/std_list.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_list.i * * SWIG typemaps for std::list types diff --git a/Lib/ocaml/std_map.i b/Lib/ocaml/std_map.i index f174f2872..f202e74ed 100644 --- a/Lib/ocaml/std_map.i +++ b/Lib/ocaml/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/ocaml/std_pair.i b/Lib/ocaml/std_pair.i index dc0604dc5..fe45ee676 100644 --- a/Lib/ocaml/std_pair.i +++ b/Lib/ocaml/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/ocaml/std_string.i b/Lib/ocaml/std_string.i index 7add3a070..e75e95304 100644 --- a/Lib/ocaml/std_string.i +++ b/Lib/ocaml/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/ocaml/std_vector.i b/Lib/ocaml/std_vector.i index 91c335562..53d107447 100644 --- a/Lib/ocaml/std_vector.i +++ b/Lib/ocaml/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * SWIG typemaps for std::vector types diff --git a/Lib/ocaml/stl.i b/Lib/ocaml/stl.i index 66b72e073..9d2e91eee 100644 --- a/Lib/ocaml/stl.i +++ b/Lib/ocaml/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/ocaml/typecheck.i b/Lib/ocaml/typecheck.i index 51e66061b..4c3500690 100644 --- a/Lib/ocaml/typecheck.i +++ b/Lib/ocaml/typecheck.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typecheck.i * * Typechecking rules diff --git a/Lib/ocaml/typemaps.i b/Lib/ocaml/typemaps.i index 7f978bf7f..39544de94 100644 --- a/Lib/ocaml/typemaps.i +++ b/Lib/ocaml/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * The Ocaml module handles all types uniformly via typemaps. Here diff --git a/Lib/octave/octcontainer.swg b/Lib/octave/octcontainer.swg index afc3ed147..6613fcfff 100644 --- a/Lib/octave/octcontainer.swg +++ b/Lib/octave/octcontainer.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * octcontainer.swg * * Octave cell <-> C++ container wrapper diff --git a/Lib/octave/octiterators.swg b/Lib/octave/octiterators.swg index 926361e10..0e3fe7033 100644 --- a/Lib/octave/octiterators.swg +++ b/Lib/octave/octiterators.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * octiterators.swg * * Users can derive form the OctSwigIterator to implemet their diff --git a/Lib/perl5/perlmain.i b/Lib/perl5/perlmain.i index f224b9c75..18ecb7eb5 100644 --- a/Lib/perl5/perlmain.i +++ b/Lib/perl5/perlmain.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * perlmain.i * * Code to statically rebuild perl5. diff --git a/Lib/perl5/reference.i b/Lib/perl5/reference.i index d3d745cfc..06712bbd5 100644 --- a/Lib/perl5/reference.i +++ b/Lib/perl5/reference.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * reference.i * * Accept Perl references as pointers diff --git a/Lib/perl5/std_common.i b/Lib/perl5/std_common.i index bc25b353f..c36513912 100644 --- a/Lib/perl5/std_common.i +++ b/Lib/perl5/std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/perl5/std_list.i b/Lib/perl5/std_list.i index 633e40d9a..c6bca18f6 100644 --- a/Lib/perl5/std_list.i +++ b/Lib/perl5/std_list.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_list.i * * SWIG typemaps for std::list types diff --git a/Lib/perl5/std_map.i b/Lib/perl5/std_map.i index c35f21dc7..b19414597 100644 --- a/Lib/perl5/std_map.i +++ b/Lib/perl5/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/perl5/std_pair.i b/Lib/perl5/std_pair.i index 78142ffa6..0712ad762 100644 --- a/Lib/perl5/std_pair.i +++ b/Lib/perl5/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/perl5/std_vector.i b/Lib/perl5/std_vector.i index 7c4f72919..0a61c31e0 100644 --- a/Lib/perl5/std_vector.i +++ b/Lib/perl5/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * SWIG typemaps for std::vector types diff --git a/Lib/perl5/stl.i b/Lib/perl5/stl.i index 946e4b7f0..b19eae58b 100644 --- a/Lib/perl5/stl.i +++ b/Lib/perl5/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/perl5/typemaps.i b/Lib/perl5/typemaps.i index fc6d8f874..7d96f2ace 100644 --- a/Lib/perl5/typemaps.i +++ b/Lib/perl5/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * The SWIG typemap library provides a language independent mechanism for diff --git a/Lib/php/const.i b/Lib/php/const.i index 6ddd403d0..08096c98b 100644 --- a/Lib/php/const.i +++ b/Lib/php/const.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * const.i * * Typemaps for constants diff --git a/Lib/php/globalvar.i b/Lib/php/globalvar.i index df8cfade7..34bd5f994 100644 --- a/Lib/php/globalvar.i +++ b/Lib/php/globalvar.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * globalvar.i * * Global variables - add the variable to PHP diff --git a/Lib/php/php.swg b/Lib/php/php.swg index 087525be4..99181472d 100644 --- a/Lib/php/php.swg +++ b/Lib/php/php.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * php.swg * * PHP configuration file diff --git a/Lib/php/phpkw.swg b/Lib/php/phpkw.swg index 3d1a62511..e7d4f2fda 100644 --- a/Lib/php/phpkw.swg +++ b/Lib/php/phpkw.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * phpkw.swg * * The 'keywords' in PHP are global, ie, the following names are fine diff --git a/Lib/php/phprun.swg b/Lib/php/phprun.swg index 5196b95b4..22f23f729 100644 --- a/Lib/php/phprun.swg +++ b/Lib/php/phprun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * phprun.swg * * PHP runtime library diff --git a/Lib/php/std_common.i b/Lib/php/std_common.i index a779649dd..092bf012b 100644 --- a/Lib/php/std_common.i +++ b/Lib/php/std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/php/std_map.i b/Lib/php/std_map.i index c6721806b..ede5fbe30 100644 --- a/Lib/php/std_map.i +++ b/Lib/php/std_map.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/php/std_pair.i b/Lib/php/std_pair.i index dc0604dc5..fe45ee676 100644 --- a/Lib/php/std_pair.i +++ b/Lib/php/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/php/std_string.i b/Lib/php/std_string.i index 08a7cdac9..22c953bf5 100644 --- a/Lib/php/std_string.i +++ b/Lib/php/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string types diff --git a/Lib/php/std_vector.i b/Lib/php/std_vector.i index b54181618..4cfc94f74 100644 --- a/Lib/php/std_vector.i +++ b/Lib/php/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * * SWIG typemaps for std::vector types diff --git a/Lib/php/stl.i b/Lib/php/stl.i index 66b72e073..9d2e91eee 100644 --- a/Lib/php/stl.i +++ b/Lib/php/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/php/typemaps.i b/Lib/php/typemaps.i index 7af301d0d..7bb8c9fa3 100644 --- a/Lib/php/typemaps.i +++ b/Lib/php/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i. * * SWIG Typemap library for PHP. diff --git a/Lib/pike/pike.swg b/Lib/pike/pike.swg index e72da8fba..2ba27671e 100644 --- a/Lib/pike/pike.swg +++ b/Lib/pike/pike.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pike.swg * * Pike configuration module. diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg index 875fcf4e2..451a4e092 100644 --- a/Lib/pike/pikerun.swg +++ b/Lib/pike/pikerun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pikerun.swg * * This file contains the runtime support for Pike modules diff --git a/Lib/pike/std_string.i b/Lib/pike/std_string.i index ca1fad822..0694035bf 100644 --- a/Lib/pike/std_string.i +++ b/Lib/pike/std_string.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/pointer.i b/Lib/pointer.i index 16e11b7d1..8015317d7 100644 --- a/Lib/pointer.i +++ b/Lib/pointer.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pointer.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/python/ccomplex.i b/Lib/python/ccomplex.i index 30f797d74..28872b985 100644 --- a/Lib/python/ccomplex.i +++ b/Lib/python/ccomplex.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * ccomplex.i * * C complex typemaps diff --git a/Lib/python/director.swg b/Lib/python/director.swg index 836d107ce..090da0205 100644 --- a/Lib/python/director.swg +++ b/Lib/python/director.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/python/embed15.i b/Lib/python/embed15.i index f677d166e..4abfbba75 100644 --- a/Lib/python/embed15.i +++ b/Lib/python/embed15.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * embed15.i * * SWIG file embedding the Python interpreter in something else. diff --git a/Lib/python/file.i b/Lib/python/file.i index 294ab9178..359c34d2c 100644 --- a/Lib/python/file.i +++ b/Lib/python/file.i @@ -1,11 +1,7 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * file.i * * Typemaps for FILE* - * From the ideas of Luigi Ballabio * ----------------------------------------------------------------------------- */ %types(FILE *); diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index 6fd1d56f9..39a91522e 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pycontainer.swg * * Python sequence <-> C++ container wrapper diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg index 9cd795d7c..3ff822d35 100644 --- a/Lib/python/pyiterators.swg +++ b/Lib/python/pyiterators.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pyiterators.swg * * Implement a python 'output' iterator for Python 2.2 or higher. diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index 5a1b1230e..cab7dd468 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * pyrun.swg * * This file contains the runtime support for Python modules diff --git a/Lib/python/typemaps.i b/Lib/python/typemaps.i index 1c87de61d..5d438ecab 100644 --- a/Lib/python/typemaps.i +++ b/Lib/python/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Pointer handling diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg index 9a6371ad9..60c086f5b 100644 --- a/Lib/ruby/director.swg +++ b/Lib/ruby/director.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/ruby/rubyautodoc.swg b/Lib/ruby/rubyautodoc.swg index ade4bde1d..1e6b0d9dc 100644 --- a/Lib/ruby/rubyautodoc.swg +++ b/Lib/ruby/rubyautodoc.swg @@ -1,13 +1,8 @@ -/** - * @file rubyautodoc.swg - * @author gga - * @date Wed May 2 16:41:59 2007 - * - * @brief This file implements autodoc typemaps for some common - * ruby methods. - * - * - */ +/* ----------------------------------------------------------------------------- + * rubyautodoc.swg + * + * This file implements autodoc typemaps for some common ruby methods. + * ----------------------------------------------------------------------------- */ %define AUTODOC(func, str) %feature("autodoc", str) func; diff --git a/Lib/ruby/rubycontainer.swg b/Lib/ruby/rubycontainer.swg index 919695ec2..c93094aeb 100644 --- a/Lib/ruby/rubycontainer.swg +++ b/Lib/ruby/rubycontainer.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * rubycontainer.swg * * Ruby sequence <-> C++ container wrapper diff --git a/Lib/ruby/rubycontainer_extended.swg b/Lib/ruby/rubycontainer_extended.swg index 360e399ce..09be64aee 100644 --- a/Lib/ruby/rubycontainer_extended.swg +++ b/Lib/ruby/rubycontainer_extended.swg @@ -1,17 +1,13 @@ -/** - * @file rubycontainer_extended.swg - * @author gga - * @date Sat May 5 05:36:01 2007 - * - * @brief This file contains additional functions that make containers - * behave closer to ruby primitive types. - * However, some of these functions place some restrictions on - * the underlying object inside of the container and the iterator - * (that it has to have an == comparison function, that it has to have - * an = assignment operator, etc). - * - */ - +/* ----------------------------------------------------------------------------- + * rubycontainer_extended.swg + * + * This file contains additional functions that make containers + * behave closer to ruby primitive types. + * However, some of these functions place some restrictions on + * the underlying object inside of the container and the iterator + * (that it has to have an == comparison function, that it has to have + * an = assignment operator, etc). + * ----------------------------------------------------------------------------- */ /** * Macro used to add extend functions that require operator== in object. diff --git a/Lib/ruby/rubyiterators.swg b/Lib/ruby/rubyiterators.swg index 466ae221b..aba156a2b 100644 --- a/Lib/ruby/rubyiterators.swg +++ b/Lib/ruby/rubyiterators.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * rubyiterators.swg * * Implement a C++ 'output' iterator for Ruby. diff --git a/Lib/ruby/rubyprimtypes.swg b/Lib/ruby/rubyprimtypes.swg index c2d577995..aff35dcf1 100644 --- a/Lib/ruby/rubyprimtypes.swg +++ b/Lib/ruby/rubyprimtypes.swg @@ -1,9 +1,5 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * rubyprimtypes.swg - * * ----------------------------------------------------------------------------- */ /* ------------------------------------------------------------ * Primitive Types diff --git a/Lib/ruby/rubyrun.swg b/Lib/ruby/rubyrun.swg index 24d861d5a..ccc997a71 100644 --- a/Lib/ruby/rubyrun.swg +++ b/Lib/ruby/rubyrun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * rubyrun.swg * * This file contains the runtime support for Ruby modules diff --git a/Lib/ruby/rubystdautodoc.swg b/Lib/ruby/rubystdautodoc.swg index ad70f7f8b..e14f65902 100644 --- a/Lib/ruby/rubystdautodoc.swg +++ b/Lib/ruby/rubystdautodoc.swg @@ -1,12 +1,8 @@ -/** - * @file rubystdautodoc.swg - * @author gga - * @date Wed May 2 17:20:39 2007 +/* ----------------------------------------------------------------------------- + * rubystdautodoc.swg * - * @brief This file contains autodocs for standard STL functions. - * - * - */ + * This file contains autodocs for standard STL functions. + * ----------------------------------------------------------------------------- */ // // For STL autodocumentation diff --git a/Lib/ruby/rubytracking.swg b/Lib/ruby/rubytracking.swg index 959d2087e..0a36f4a05 100644 --- a/Lib/ruby/rubytracking.swg +++ b/Lib/ruby/rubytracking.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * rubytracking.swg * * This file contains support for tracking mappings from diff --git a/Lib/ruby/rubywstrings.swg b/Lib/ruby/rubywstrings.swg index 862928c95..bb44fbc6e 100644 --- a/Lib/ruby/rubywstrings.swg +++ b/Lib/ruby/rubywstrings.swg @@ -1,15 +1,11 @@ -/** - * @file rubywstrings.swg - * @author - * @date Fri May 4 17:49:40 2007 - * - * @brief Currently, Ruby does not support Unicode or WChar properly, so these - * are still treated as char arrays for now. - * There are other libraries available that add support to this in - * ruby including WString, FXString, etc. - * - * - */ +/* ----------------------------------------------------------------------------- + * rubywstrings.swg + * + * Currently, Ruby does not support Unicode or WChar properly, so these + * are still treated as char arrays for now. + * There are other libraries available that add support to this in + * ruby including WString, FXString, etc. + * ----------------------------------------------------------------------------- */ /* ------------------------------------------------------------ * utility methods for wchar_t strings diff --git a/Lib/ruby/stl.i b/Lib/ruby/stl.i index 66b72e073..9d2e91eee 100644 --- a/Lib/ruby/stl.i +++ b/Lib/ruby/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/ruby/typemaps.i b/Lib/ruby/typemaps.i index 2492e2e03..c4db82161 100644 --- a/Lib/ruby/typemaps.i +++ b/Lib/ruby/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Pointer handling diff --git a/Lib/std/_std_deque.i b/Lib/std/_std_deque.i index 026f373d6..c30523c0d 100644 --- a/Lib/std/_std_deque.i +++ b/Lib/std/_std_deque.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * _std_deque.i * * This file contains a generic definition of std::deque along with diff --git a/Lib/std_except.i b/Lib/std_except.i index af9803a62..769a68995 100644 --- a/Lib/std_except.i +++ b/Lib/std_except.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_except.i * * SWIG library file with typemaps to handle and throw STD exceptions in a diff --git a/Lib/stdint.i b/Lib/stdint.i index 7b48ca388..14fe6195e 100644 --- a/Lib/stdint.i +++ b/Lib/stdint.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stdint.i * * SWIG library file for ISO C99 types: 7.18 Integer types diff --git a/Lib/stl.i b/Lib/stl.i index c3ade01ea..0b236afda 100644 --- a/Lib/stl.i +++ b/Lib/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/swigarch.i b/Lib/swigarch.i index 260b60880..f5aea4678 100644 --- a/Lib/swigarch.i +++ b/Lib/swigarch.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * swigarch.i * * SWIG library file for 32bit/64bit code specialization and checking. diff --git a/Lib/swigrun.i b/Lib/swigrun.i index 17a140968..6026a9151 100644 --- a/Lib/swigrun.i +++ b/Lib/swigrun.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * swigrun.i * * Empty module (for now). Placeholder for runtime libs diff --git a/Lib/tcl/mactclinit.c b/Lib/tcl/mactclinit.c deleted file mode 100644 index 5dcf8e7f3..000000000 --- a/Lib/tcl/mactclinit.c +++ /dev/null @@ -1,93 +0,0 @@ -/* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * mactclinit.c - * ----------------------------------------------------------------------------- */ - -/* - * tclMacAppInit.c -- - * - * Provides a version of the Tcl_AppInit procedure for the example shell. - * - * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center - * Copyright (c) 1995-1997 Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * SCCS: @(#) tclMacAppInit.c 1.17 97/01/21 18:13:34 - */ - -#include "tcl.h" -#include "tclInt.h" -#include "tclMacInt.h" - -#if defined(THINK_C) -# include -#elif defined(__MWERKS__) -# include -short InstallConsole _ANSI_ARGS_((short fd)); -#endif - - - -/* - *---------------------------------------------------------------------- - * - * MacintoshInit -- - * - * This procedure calls initalization routines to set up a simple - * console on a Macintosh. This is necessary as the Mac doesn't - * have a stdout & stderr by default. - * - * Results: - * Returns TCL_OK if everything went fine. If it didn't the - * application should probably fail. - * - * Side effects: - * Inits the appropiate console package. - * - *---------------------------------------------------------------------- - */ - -#ifdef __cplusplus -extern "C" -#endif -extern int -MacintoshInit() -{ -#if defined(THINK_C) - - /* Set options for Think C console package */ - /* The console package calls the Mac init calls */ - console_options.pause_atexit = 0; - console_options.title = "\pTcl Interpreter"; - -#elif defined(__MWERKS__) - - /* Set options for CodeWarrior SIOUX package */ - SIOUXSettings.autocloseonquit = true; - SIOUXSettings.showstatusline = true; - SIOUXSettings.asktosaveonclose = false; - InstallConsole(0); - SIOUXSetTitle("\pTcl Interpreter"); - -#elif defined(applec) - - /* Init packages used by MPW SIOW package */ - InitGraf((Ptr)&qd.thePort); - InitFonts(); - InitWindows(); - InitMenus(); - TEInit(); - InitDialogs(nil); - InitCursor(); - -#endif - - TclMacSetEventProc((TclMacConvertEventPtr) SIOUXHandleOneEvent); - - /* No problems with initialization */ - return TCL_OK; -} diff --git a/Lib/tcl/mactkinit.c b/Lib/tcl/mactkinit.c index bfe74029c..78391d445 100644 --- a/Lib/tcl/mactkinit.c +++ b/Lib/tcl/mactkinit.c @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * mactkinit.c * * This is a support file needed to build a new version of Wish. diff --git a/Lib/tcl/std_common.i b/Lib/tcl/std_common.i index 3a6f47042..0718facb8 100644 --- a/Lib/tcl/std_common.i +++ b/Lib/tcl/std_common.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/tcl/std_pair.i b/Lib/tcl/std_pair.i index 52e96674f..1448d6524 100644 --- a/Lib/tcl/std_pair.i +++ b/Lib/tcl/std_pair.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_pair.i * * Typemaps for std::pair diff --git a/Lib/tcl/std_vector.i b/Lib/tcl/std_vector.i index d913f00cc..3c8dd24b7 100644 --- a/Lib/tcl/std_vector.i +++ b/Lib/tcl/std_vector.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * std_vector.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/tcl/stl.i b/Lib/tcl/stl.i index afd121341..40c7584ec 100644 --- a/Lib/tcl/stl.i +++ b/Lib/tcl/stl.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/tcl/tcl8.swg b/Lib/tcl/tcl8.swg index c33cc7681..5da1bc07c 100644 --- a/Lib/tcl/tcl8.swg +++ b/Lib/tcl/tcl8.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tcl8.swg * * Tcl configuration module. diff --git a/Lib/tcl/tclinterp.i b/Lib/tcl/tclinterp.i index 48cdb6066..3b45b6d4b 100644 --- a/Lib/tcl/tclinterp.i +++ b/Lib/tcl/tclinterp.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tclinterp.i * * Tcl_Interp *interp diff --git a/Lib/tcl/tclopers.swg b/Lib/tcl/tclopers.swg index 26b74203d..f113ccd19 100644 --- a/Lib/tcl/tclopers.swg +++ b/Lib/tcl/tclopers.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tclopers.swg * * C++ overloaded operators. diff --git a/Lib/tcl/tclresult.i b/Lib/tcl/tclresult.i index ca0106432..c63b3ee19 100644 --- a/Lib/tcl/tclresult.i +++ b/Lib/tcl/tclresult.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tclresult.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/tcl/tclrun.swg b/Lib/tcl/tclrun.swg index 6387fb008..eb8bd253c 100644 --- a/Lib/tcl/tclrun.swg +++ b/Lib/tcl/tclrun.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tclrun.swg * * This file contains the runtime support for Tcl modules and includes diff --git a/Lib/tcl/tclsh.i b/Lib/tcl/tclsh.i index 2e8ed3316..160ba8d8f 100644 --- a/Lib/tcl/tclsh.i +++ b/Lib/tcl/tclsh.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tclsh.i * * SWIG File for building new tclsh program diff --git a/Lib/tcl/tclwstrings.swg b/Lib/tcl/tclwstrings.swg index 2d344c20f..b3b682e30 100644 --- a/Lib/tcl/tclwstrings.swg +++ b/Lib/tcl/tclwstrings.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * tclwstrings.wg * * Utility methods for wchar strings diff --git a/Lib/tcl/typemaps.i b/Lib/tcl/typemaps.i index 7c9e04a8b..8bee672cc 100644 --- a/Lib/tcl/typemaps.i +++ b/Lib/tcl/typemaps.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.i * * Swig typemap library for Tcl8. This file contains various sorts diff --git a/Lib/tcl/wish.i b/Lib/tcl/wish.i index 077ded61f..260032a81 100644 --- a/Lib/tcl/wish.i +++ b/Lib/tcl/wish.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * wish.i * * SWIG File for making wish diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg index 4bc6315b7..4dcf15e2d 100644 --- a/Lib/typemaps/attribute.swg +++ b/Lib/typemaps/attribute.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * attribute.swg * * Attribute implementation diff --git a/Lib/typemaps/carrays.swg b/Lib/typemaps/carrays.swg index 27ca11779..cdeab36b7 100644 --- a/Lib/typemaps/carrays.swg +++ b/Lib/typemaps/carrays.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * carrays.swg * * This library file contains macros that can be used to manipulate simple diff --git a/Lib/typemaps/cdata.swg b/Lib/typemaps/cdata.swg index 32b3f5a77..5baf7904c 100644 --- a/Lib/typemaps/cdata.swg +++ b/Lib/typemaps/cdata.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cdata.swg * * This library file contains macros for manipulating raw C data as strings. diff --git a/Lib/typemaps/cmalloc.swg b/Lib/typemaps/cmalloc.swg index 15f962930..45a6ab990 100644 --- a/Lib/typemaps/cmalloc.swg +++ b/Lib/typemaps/cmalloc.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cmalloc.swg * * This library file contains macros that can be used to create objects using diff --git a/Lib/typemaps/cpointer.swg b/Lib/typemaps/cpointer.swg index ce1af169e..f797a6895 100644 --- a/Lib/typemaps/cpointer.swg +++ b/Lib/typemaps/cpointer.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cpointer.swg * * This library file contains macros that can be used to manipulate simple diff --git a/Lib/typemaps/cstrings.swg b/Lib/typemaps/cstrings.swg index 9144da790..c60ef6496 100644 --- a/Lib/typemaps/cstrings.swg +++ b/Lib/typemaps/cstrings.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * cstrings.swg * * This file provides typemaps and macros for dealing with various forms diff --git a/Lib/typemaps/exception.swg b/Lib/typemaps/exception.swg index 17a819cd7..12c4ea658 100644 --- a/Lib/typemaps/exception.swg +++ b/Lib/typemaps/exception.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * exceptions.swg * * This SWIG library file provides language independent exception handling diff --git a/Lib/typemaps/ptrtypes.swg b/Lib/typemaps/ptrtypes.swg index 803377afe..e1bc476ed 100644 --- a/Lib/typemaps/ptrtypes.swg +++ b/Lib/typemaps/ptrtypes.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * ptrtypes.swg * * Value typemaps (Type, const Type&) for "Ptr" types, such as swig diff --git a/Lib/typemaps/swigtypemaps.swg b/Lib/typemaps/swigtypemaps.swg index 08abab028..0e39afe4c 100644 --- a/Lib/typemaps/swigtypemaps.swg +++ b/Lib/typemaps/swigtypemaps.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * swigtypemaps.swg * * Unified Typemap Library frontend diff --git a/Lib/typemaps/typemaps.swg b/Lib/typemaps/typemaps.swg index 6e7505765..4629e8dfa 100644 --- a/Lib/typemaps/typemaps.swg +++ b/Lib/typemaps/typemaps.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * typemaps.swg * * Tcl Pointer handling diff --git a/Lib/uffi/uffi.swg b/Lib/uffi/uffi.swg index 78bd23534..41b085998 100644 --- a/Lib/uffi/uffi.swg +++ b/Lib/uffi/uffi.swg @@ -27,8 +27,6 @@ typedef long size_t; %wrapper %{ -;; $Id$ - (eval-when (compile eval) ;;; You can define your own identifier converter if you want. diff --git a/Lib/wchar.i b/Lib/wchar.i index f106a3529..14de34634 100644 --- a/Lib/wchar.i +++ b/Lib/wchar.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * wchar.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/windows.i b/Lib/windows.i index 08ddc2b22..2c093dacc 100644 --- a/Lib/windows.i +++ b/Lib/windows.i @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * windows.i * * SWIG library file to support types found in windows.h as well as Microsoft diff --git a/Makefile.in b/Makefile.in index b56272b11..a540ceb68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -188,51 +188,6 @@ java.actionexample: (cd Examples/$(LANGUAGE)/java && $(MAKE) -s $(chk-set-env) $(ACTION)) \ fi; \ -gifplot-library: - @echo $(ACTION)ing Examples/GIFPlot/Lib - @cd Examples/GIFPlot/Lib && $(MAKE) -k -s $(ACTION) - -check-gifplot: \ - check-tcl-gifplot \ - check-perl5-gifplot \ - check-python-gifplot \ - check-java-gifplot \ - check-guile-gifplot \ - check-mzscheme-gifplot \ - check-ruby-gifplot \ - check-ocaml-gifplot \ - check-octave-gifplot \ - check-php-gifplot \ - check-pike-gifplot \ - check-chicken-gifplot \ -# check-lua-gifplot \ -# check-csharp-gifplot \ -# check-modula3-gifplot \ -# check-c-gifplot - -check-%-gifplot: gifplot-library - @if test -z "$(skip-$*)"; then \ - echo $* unknown; \ - exit 1; \ - fi - @passed=true; \ - up=`$(srcdir)/Tools/capitalize $*`; \ - dir="Examples/GIFPlot/$$up"; \ - if $(skip-$*); then \ - echo skipping $$up $(ACTION); \ - elif [ ! -f $$dir/check.list ]; then \ - echo skipping $$up $(ACTION) "(no $$dir/check.list)"; \ - else \ - all=`sed '/^#/d' $$dir/check.list`; \ - for a in $$all; do \ - echo $(ACTION)ing $$dir/$$a; \ - (cd $$dir/$$a && \ - $(MAKE) -k -s $(chk-set-env) $(ACTION)) \ - || passed=false; \ - done; \ - fi; \ - test $$passed = true - # Checks testcases in the test-suite excluding those which are known to be broken check-test-suite: \ check-tcl-test-suite \ @@ -283,7 +238,7 @@ partialcheck-test-suite: partialcheck-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck NOSKIP=1 -check: check-aliveness check-ccache check-examples check-gifplot check-test-suite +check: check-aliveness check-ccache check-examples check-test-suite # Run known-to-be-broken as well as not broken testcases in the test-suite all-test-suite: \ @@ -345,7 +300,7 @@ broken-%-test-suite: # CLEAN ##################################################################### -clean: clean-objects clean-libfiles clean-examples clean-gifplot clean-test-suite clean-docs +clean: clean-objects clean-libfiles clean-examples clean-test-suite clean-docs clean-objects: clean-source clean-ccache @@ -360,9 +315,6 @@ clean-libfiles: clean-examples: @$(MAKE) -k -s check-examples ACTION=clean -clean-gifplot: - @$(MAKE) -k -s check-gifplot ACTION=clean - clean-test-suite: @$(MAKE) -k -s check-test-suite ACTION=clean NOSKIP=1 @@ -372,9 +324,6 @@ clean-%-examples: clean-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=clean NOSKIP=1 -clean-%-gifplot: - @$(MAKE) -k -s check-$*-gifplot ACTION=clean - clean-ccache: test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s clean) @@ -396,7 +345,7 @@ maintainer-clean: clean-libfiles DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool -distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite clean-docs distclean-dead distclean-ccache +distclean: distclean-objects clean-examples distclean-test-suite clean-docs distclean-dead distclean-ccache distclean-objects: distclean-source diff --git a/README b/README index 3df9e506a..e7b79d2d2 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 1.3.40 (in progress) +Version: 2.0.0 (in progress) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, @@ -13,61 +13,6 @@ the listed languages, or to extend C/C++ programs with a scripting language. This distribution represents the latest development release of SWIG. -The guilty parties working on this are: - -Active Developers: - William Fulton (wsf@fultondesigns.co.uk) (SWIG core, Java, C#, Windows, Cygwin) - Olly Betts (olly@survex.com) (PHP) - John Lenz (Guile, MzScheme updates, Chicken module, runtime system) - Mark Gossage (mark@gossage.cjb.net) (Lua) - Joseph Wang (joe@gnacademy.org) (R) - Gonzalo Garramuno (ggarra@advancedsl.com.ar) (Ruby, Ruby's UTL) - Xavier Delacour (xavier.delacour@gmail.com) (Octave) - -Major contributors include: - Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) - Henning Thielemann (swig@henning-thielemann.de) (Modula3) - Matthias Köppe (mkoeppe@mail.math.uni-magdeburg.de) (Guile, MzScheme) - Luigi Ballabio (luigi.ballabio@fastwebnet.it) (STL wrapping) - Mikel Bancroft (mikel@franz.com) (Allegro CL) - Surendra Singhi (efuzzyone@netscape.net) (CLISP, CFFI) - Marcelo Matus (mmatus@acms.arizona.edu) (SWIG core, Python, UTL[python,perl,tcl,ruby]) - Art Yerkes (ayerkes@speakeasy.net) (Ocaml) - Lyle Johnson (lyle@users.sourceforge.net) (Ruby) - Charlie Savage (cfis@interserv.com) (Ruby) - Thien-Thi Nguyen (ttn@glug.org) (build/test/misc) - Richard Palmer (richard@magicality.org) (PHP) - Sam Liddicott - Anonova Ltd (saml@liddicott.com) (PHP) - Tim Hockin - Sun Microsystems (thockin@sun.com) (PHP) - Kevin Ruland (PHP) - Shibukawa Yoshiki (Japanese Translation) - Jason Stewart (jason@openinformatics.com) (Perl5) - Loic Dachary (Perl5) - David Fletcher (Perl5) - Gary Holt (Perl5) - Masaki Fukushima (Ruby) - Scott Michel (scottm@cs.ucla.edu) (Java directors) - Tiger Feng (songyanf@cs.uchicago.edu) (SWIG core) - Mark Rose (mrose@stm.lbl.gov) (Directors) - Jonah Beckford (beckford@usermail.com) (CHICKEN) - Ahmon Dancy (dancy@franz.com) (Allegro CL) - Dirk Gerrits (Allegro CL) - Neil Cawse (C#) - Harco de Hilster (Java) - Alexey Dyachenko (dyachenko@fromru.com) (Tcl) - Bob Techentin (Tcl) - Martin Froehlich (Guile) - Marcio Luis Teixeira (Guile) - Duncan Temple Lang (R) - -Past contributors include: - James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran - Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn - (See CHANGES for a more complete list). - -Portions also copyrighted by companies/corporations; - Network Applied Communication Laboratory, Inc - Information-technology Promotion Agency, Japan Up-to-date SWIG related information can be found at diff --git a/Source/CParse/cparse.h b/Source/CParse/cparse.h index 9be41c60e..c17577d8c 100644 --- a/Source/CParse/cparse.h +++ b/Source/CParse/cparse.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * cparse.h * diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index 8734c7d0e..36c5f7d6c 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * scanner.c * diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 0babfbbb8..b365cfc08 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * parser.y * diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index 14886605f..d3b9b3d99 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * templ.c * diff --git a/Source/CParse/util.c b/Source/CParse/util.c index efae41051..fa934ffc0 100644 --- a/Source/CParse/util.c +++ b/Source/CParse/util.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * util.c * diff --git a/Source/DOH/base.c b/Source/DOH/base.c index 15827f328..245004f87 100644 --- a/Source/DOH/base.c +++ b/Source/DOH/base.c @@ -1,13 +1,15 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * base.c * * This file contains the function entry points for dispatching methods on * DOH objects. A number of small utility functions are also included. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_base_c[] = "$Id$"; diff --git a/Source/DOH/doh.h b/Source/DOH/doh.h index 766e12a34..1ed196058 100644 --- a/Source/DOH/doh.h +++ b/Source/DOH/doh.h @@ -1,14 +1,14 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * doh.h * * This file describes of the externally visible functions in DOH. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. - * - * $Id$ * ----------------------------------------------------------------------------- */ #ifndef _DOH_H diff --git a/Source/DOH/dohint.h b/Source/DOH/dohint.h index 1fc5eb7c9..661bed075 100644 --- a/Source/DOH/dohint.h +++ b/Source/DOH/dohint.h @@ -1,15 +1,14 @@ - /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * dohint.h * * This file describes internally managed objects. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. - * - * $Id$ * ----------------------------------------------------------------------------- */ #ifndef _DOHINT_H diff --git a/Source/DOH/file.c b/Source/DOH/file.c index 65c2336a4..a9ee332bf 100644 --- a/Source/DOH/file.c +++ b/Source/DOH/file.c @@ -1,13 +1,15 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * file.c * * This file implements a file-like object that can be built around an * ordinary FILE * or integer file descriptor. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_file_c[] = "$Id$"; diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index f544cee64..2ef605c32 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -1,13 +1,15 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * fio.c * * This file implements a number of standard I/O operations included * formatted output, readline, and splitting. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_fio_c[] = "$Id$"; diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 045de8b5b..87f8e3c40 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -1,12 +1,14 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * hash.c * * Implements a simple hash table object. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_hash_c[] = "$Id$"; diff --git a/Source/DOH/list.c b/Source/DOH/list.c index 7a1786299..a08cadb5a 100644 --- a/Source/DOH/list.c +++ b/Source/DOH/list.c @@ -1,12 +1,14 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * list.c * * Implements a simple list object. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_list_c[] = "$Id$"; diff --git a/Source/DOH/memory.c b/Source/DOH/memory.c index 1c6063ef3..fcacd6170 100644 --- a/Source/DOH/memory.c +++ b/Source/DOH/memory.c @@ -1,13 +1,15 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * memory.c * * This file implements all of DOH's memory management including allocation * of objects and checking of objects. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_memory_c[] = "$Id$"; diff --git a/Source/DOH/string.c b/Source/DOH/string.c index 141cd58e8..bd36c4094 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -1,13 +1,15 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * string.c * * Implements a string object that supports both sequence operations and * file semantics. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_string_c[] = "$Id$"; diff --git a/Source/DOH/void.c b/Source/DOH/void.c index 0be01561a..2d684b9cd 100644 --- a/Source/DOH/void.c +++ b/Source/DOH/void.c @@ -1,13 +1,15 @@ /* ----------------------------------------------------------------------------- + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. + * * void.c * * Implements a "void" object that is really just a DOH container around * an arbitrary C object represented as a void *. - * - * Author(s) : David Beazley (beazley@cs.uchicago.edu) - * - * Copyright (C) 1999-2000. The University of Chicago - * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_void_c[] = "$Id$"; diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index ebcd2fe7c..481f67da3 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigwarn.h * @@ -16,8 +20,6 @@ * numbers in this file. * ----------------------------------------------------------------------------- */ -/* $Id$ */ - #ifndef SWIGWARN_H_ #define SWIGWARN_H_ diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 878e30a67..36441b1fe 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * allegrocl.cxx * diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx index e8397e6a6..31f27e1eb 100644 --- a/Source/Modules/allocate.cxx +++ b/Source/Modules/allocate.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * allocate.cxx * diff --git a/Source/Modules/browser.cxx b/Source/Modules/browser.cxx index b1bc7349c..592e12783 100644 --- a/Source/Modules/browser.cxx +++ b/Source/Modules/browser.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * browser.cxx * diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 0aa933c56..c8c431e47 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * cffi.cxx * diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index 12ef4b454..1d9e9c620 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * chicken.cxx * diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index fa73b3a0b..95ee66bc9 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * clisp.cxx * diff --git a/Source/Modules/contract.cxx b/Source/Modules/contract.cxx index 518dc2997..7a8543928 100644 --- a/Source/Modules/contract.cxx +++ b/Source/Modules/contract.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * contract.cxx * diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 2730b55d4..06cec96ac 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * csharp.cxx * diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 158b53502..6064e1758 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * directors.cxx * diff --git a/Source/Modules/emit.cxx b/Source/Modules/emit.cxx index a4cf8cebc..fde3b2457 100644 --- a/Source/Modules/emit.cxx +++ b/Source/Modules/emit.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * emit.cxx * diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 0c72de8d0..05ceced22 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * guile.cxx * diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 8dfa19624..e12c9072b 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * java.cxx * diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 38658ce9c..479615908 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * lang.cxx * diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 78cd7ce96..4640d9ed7 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * lua.cxx * diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index c824db6f9..2437b35c7 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * main.cxx * diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index b3568c0bf..e650edcb2 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * modula3.cxx * diff --git a/Source/Modules/module.cxx b/Source/Modules/module.cxx index 6a0d6bbb9..f4ab560dd 100644 --- a/Source/Modules/module.cxx +++ b/Source/Modules/module.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * module.cxx * diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index 28dd8ecd2..d17ccd33c 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * mzscheme.cxx * diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index b925328a3..7108484b3 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * ocaml.cxx * diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index c5ff2eb44..d9483c974 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * octave.cxx * diff --git a/Source/Modules/overload.cxx b/Source/Modules/overload.cxx index 511e55004..57d7fac90 100644 --- a/Source/Modules/overload.cxx +++ b/Source/Modules/overload.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * overload.cxx * diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index eace179a7..d0c019195 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -1,10 +1,10 @@ -/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=2:tabstop=8:smarttab: - */ - /* ---------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * perl5.cxx * diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index ee69c1864..9f91f12d4 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * php.cxx * diff --git a/Source/Modules/pike.cxx b/Source/Modules/pike.cxx index 98f63056c..e59248e95 100644 --- a/Source/Modules/pike.cxx +++ b/Source/Modules/pike.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * pike.cxx * diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index ffeea430d..f3735ff00 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * python.cxx * diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 8e9aa557d..f1fdff662 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * r.cxx * diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 1c13747e5..9badc0d0a 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * ruby.cxx * diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 90791ec70..62b93f7c7 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * s-exp.cxx * diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx index b121dc9b7..3a28fbdde 100644 --- a/Source/Modules/swigmain.cxx +++ b/Source/Modules/swigmain.cxx @@ -1,11 +1,15 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * Simplified Wrapper and Interface Generator (SWIG) + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigmain.cxx * + * Simplified Wrapper and Interface Generator (SWIG) + * * This file is the main entry point to SWIG. It collects the command * line options, registers built-in language modules, and instantiates * a module for code generation. If adding new language modules diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h index 8dec8d0af..075a209d2 100644 --- a/Source/Modules/swigmod.h +++ b/Source/Modules/swigmod.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigmod.h * diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 015ac5e45..efbe28c50 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * tcl8.cxx * diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index d663aed6e..e972cea05 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * typepass.cxx * diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index d3f8401f0..f793b5643 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * uffi.cxx * diff --git a/Source/Modules/utils.cxx b/Source/Modules/utils.cxx index bf8211903..3fe7a2709 100644 --- a/Source/Modules/utils.cxx +++ b/Source/Modules/utils.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * utils.cxx * diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index 2edd01cf0..bcfac1acc 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * xml.cxx * diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 81646171a..bcb1061c8 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * cpp.c * diff --git a/Source/Preprocessor/expr.c b/Source/Preprocessor/expr.c index 4da24a774..3e3f39480 100644 --- a/Source/Preprocessor/expr.c +++ b/Source/Preprocessor/expr.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * expr.c * diff --git a/Source/Preprocessor/preprocessor.h b/Source/Preprocessor/preprocessor.h index 3579eede2..8f98dae15 100644 --- a/Source/Preprocessor/preprocessor.h +++ b/Source/Preprocessor/preprocessor.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * preprocessor.h * diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 7c6837a2b..208842121 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * cwrap.c * diff --git a/Source/Swig/deprecate.c b/Source/Swig/deprecate.c index 475d2c6cf..f25b9a650 100644 --- a/Source/Swig/deprecate.c +++ b/Source/Swig/deprecate.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * deprecate.c * diff --git a/Source/Swig/error.c b/Source/Swig/error.c index 156fe06a7..80eede4e3 100644 --- a/Source/Swig/error.c +++ b/Source/Swig/error.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * error.c * diff --git a/Source/Swig/fragment.c b/Source/Swig/fragment.c index 510a01875..896461b30 100644 --- a/Source/Swig/fragment.c +++ b/Source/Swig/fragment.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * fragment.c * diff --git a/Source/Swig/getopt.c b/Source/Swig/getopt.c index cbd051d9f..f6f196bfd 100644 --- a/Source/Swig/getopt.c +++ b/Source/Swig/getopt.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * getopt.c * diff --git a/Source/Swig/include.c b/Source/Swig/include.c index f42eb5d45..710a7ad71 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * include.c * diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 050e5357a..3a78fe7ab 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * misc.c * diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 013ce5929..9af0354e2 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * naming.c * diff --git a/Source/Swig/parms.c b/Source/Swig/parms.c index 9b58f5fcb..cb8176377 100644 --- a/Source/Swig/parms.c +++ b/Source/Swig/parms.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * parms.c * diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 53f1ad4a0..72984b27e 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * scanner.c * diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index 8a7700bec..023148f8d 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * stype.c * diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 2b2c797c9..a7b90c4aa 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swig.h * diff --git a/Source/Swig/swigfile.h b/Source/Swig/swigfile.h index 92c7945e6..632e821e2 100644 --- a/Source/Swig/swigfile.h +++ b/Source/Swig/swigfile.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigfile.h * diff --git a/Source/Swig/swigopt.h b/Source/Swig/swigopt.h index 11eb5ba99..586f8bbc4 100644 --- a/Source/Swig/swigopt.h +++ b/Source/Swig/swigopt.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigopt.h * diff --git a/Source/Swig/swigparm.h b/Source/Swig/swigparm.h index 49ae7992e..3e6269eae 100644 --- a/Source/Swig/swigparm.h +++ b/Source/Swig/swigparm.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigparm.h * diff --git a/Source/Swig/swigscan.h b/Source/Swig/swigscan.h index 3403098df..faec4fe48 100644 --- a/Source/Swig/swigscan.h +++ b/Source/Swig/swigscan.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigscan.h * diff --git a/Source/Swig/swigtree.h b/Source/Swig/swigtree.h index 5b43006a9..6799398c9 100644 --- a/Source/Swig/swigtree.h +++ b/Source/Swig/swigtree.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigtree.h * diff --git a/Source/Swig/swigwrap.h b/Source/Swig/swigwrap.h index 0dcf88059..b1f596f72 100644 --- a/Source/Swig/swigwrap.h +++ b/Source/Swig/swigwrap.h @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * swigwrap.h * diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 055af854f..50dde9159 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * symbol.c * diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index 14d231afa..c80c61081 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * tree.c * diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 401a99801..a44ecdf6d 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * typemap.c * diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 8ff31bc0b..cafecb9a6 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * typeobj.c * diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 2562e12f8..3eb21b57b 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * typesys.c * diff --git a/Source/Swig/wrapfunc.c b/Source/Swig/wrapfunc.c index 11518bfc2..2c9f7c86a 100644 --- a/Source/Swig/wrapfunc.c +++ b/Source/Swig/wrapfunc.c @@ -1,6 +1,10 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * This file is part of SWIG, which is licensed as a whole under version 3 + * (or any later version) of the GNU General Public License. Some additional + * terms also apply to certain portions of SWIG. The full details of the SWIG + * license and copyrights can be found in the LICENSE and COPYRIGHT files + * included with the SWIG source code as distributed by the SWIG developers + * and at http://www.swig.org/legal.html. * * wrapfunc.c * diff --git a/configure.in b/configure.in index c6f2c2970..738db1281 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[1.3.40],[http://www.swig.org]) +AC_INIT([swig],[2.0.0],[http://www.swig.org]) AC_PREREQ(2.58) AC_CONFIG_SRCDIR([Source/Swig/swig.h]) AC_CONFIG_AUX_DIR([Tools/config]) @@ -2186,8 +2186,6 @@ AC_CONFIG_FILES([ \ Examples/Makefile \ Examples/guile/Makefile \ Examples/xml/Makefile \ - Examples/GIFPlot/Makefile \ - Examples/GIFPlot/Lib/Makefile \ Examples/test-suite/chicken/Makefile \ Examples/test-suite/csharp/Makefile \ Examples/test-suite/guile/Makefile \ From 34a628c7c791ddf5f3cfeb0dcace7b1efc72378c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 6 May 2012 00:49:56 +0000 Subject: [PATCH 056/508] Revert rev 11918 "merge revisions 11872:11876 from trunk to gsoc2008-maciekd branch - license changes" This reverts commit ec942f04ca8b33520442f079e2ea2d8d3e4be73c. From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13032 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 10 +- COPYRIGHT | 63 - Doc/Manual/Sections.html | 2 +- Examples/GIFPlot/C/Makefile | 17 + Examples/GIFPlot/C/gifplot.i | 15 + Examples/GIFPlot/Chicken/check.list | 3 + Examples/GIFPlot/Chicken/full/Makefile | 28 + Examples/GIFPlot/Chicken/full/README | 6 + Examples/GIFPlot/Chicken/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Chicken/full/gifplot.i | 26 + .../GIFPlot/Chicken/full/test-gifplot.scm | 66 + Examples/GIFPlot/Chicken/simple/Makefile | 28 + Examples/GIFPlot/Chicken/simple/README | 5 + Examples/GIFPlot/Chicken/simple/simple.i | 34 + .../GIFPlot/Chicken/simple/test-simple.scm | 29 + Examples/GIFPlot/Common-Lisp/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Common-Lisp/full/gifplot.i | 21 + Examples/GIFPlot/Common-Lisp/full/runme.lisp | 59 + Examples/GIFPlot/Guile/check.list | 3 + Examples/GIFPlot/Guile/full/Makefile | 28 + Examples/GIFPlot/Guile/full/README | 8 + Examples/GIFPlot/Guile/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Guile/full/gifplot.i | 21 + Examples/GIFPlot/Guile/full/runme.scm | 66 + Examples/GIFPlot/Guile/simple/Makefile | 28 + Examples/GIFPlot/Guile/simple/README | 11 + Examples/GIFPlot/Guile/simple/runme.scm | 30 + Examples/GIFPlot/Guile/simple/simple.i | 34 + Examples/GIFPlot/Include/gifplot.h | 333 +++ Examples/GIFPlot/Interface/gifplot.i | 264 ++ Examples/GIFPlot/Java/check.list | 4 + Examples/GIFPlot/Java/full/Makefile | 20 + Examples/GIFPlot/Java/full/README | 8 + Examples/GIFPlot/Java/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Java/full/gifplot.i | 15 + Examples/GIFPlot/Java/full/runme.java | 75 + Examples/GIFPlot/Java/shadow/Makefile | 21 + Examples/GIFPlot/Java/shadow/README | 5 + Examples/GIFPlot/Java/shadow/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Java/shadow/runme.java | 76 + Examples/GIFPlot/Java/simple/Makefile | 21 + Examples/GIFPlot/Java/simple/README | 5 + Examples/GIFPlot/Java/simple/runme.java | 41 + Examples/GIFPlot/Java/simple/simple.i | 38 + Examples/GIFPlot/Lib/Makefile.in | 22 + Examples/GIFPlot/Lib/color.c | 143 ++ Examples/GIFPlot/Lib/font.c | 705 ++++++ Examples/GIFPlot/Lib/frame.c | 924 +++++++ Examples/GIFPlot/Lib/gif.c | 672 +++++ Examples/GIFPlot/Lib/matrix.c | 343 +++ Examples/GIFPlot/Lib/pixmap.c | 159 ++ Examples/GIFPlot/Lib/plot2d.c | 445 ++++ Examples/GIFPlot/Lib/plot3d.c | 2181 +++++++++++++++++ Examples/GIFPlot/Makefile.in | 23 + Examples/GIFPlot/Ocaml/check.list | 3 + Examples/GIFPlot/Ocaml/full/Makefile | 33 + Examples/GIFPlot/Ocaml/full/README | 8 + Examples/GIFPlot/Ocaml/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Ocaml/full/gifplot.i | 15 + Examples/GIFPlot/Ocaml/full/runme.ml | 87 + Examples/GIFPlot/Ocaml/simple/Makefile | 33 + Examples/GIFPlot/Ocaml/simple/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Ocaml/simple/runme.ml | 35 + Examples/GIFPlot/Ocaml/simple/simple.i | 33 + Examples/GIFPlot/Perl5/check.list | 4 + Examples/GIFPlot/Perl5/full/Makefile | 24 + Examples/GIFPlot/Perl5/full/README | 8 + Examples/GIFPlot/Perl5/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Perl5/full/gifplot.i | 15 + Examples/GIFPlot/Perl5/full/runme.pl | 68 + Examples/GIFPlot/Perl5/shadow/Makefile | 25 + Examples/GIFPlot/Perl5/shadow/README | 2 + Examples/GIFPlot/Perl5/shadow/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Perl5/shadow/runme.pl | 68 + Examples/GIFPlot/Perl5/simple/Makefile | 24 + Examples/GIFPlot/Perl5/simple/README | 5 + Examples/GIFPlot/Perl5/simple/runme.pl | 28 + Examples/GIFPlot/Perl5/simple/simple.i | 38 + Examples/GIFPlot/Php/check.list | 3 + Examples/GIFPlot/Php/full/Makefile | 20 + Examples/GIFPlot/Php/full/README | 4 + Examples/GIFPlot/Php/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Php/full/gifplot.i | 15 + Examples/GIFPlot/Php/full/runme.php | 78 + Examples/GIFPlot/Php/shadow/Makefile | 19 + Examples/GIFPlot/Php/shadow/README | 2 + Examples/GIFPlot/Php/shadow/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Php/shadow/runme.php | 79 + Examples/GIFPlot/Php/simple/Makefile | 20 + Examples/GIFPlot/Php/simple/README | 5 + Examples/GIFPlot/Php/simple/runme.php | 32 + Examples/GIFPlot/Php/simple/simple.i | 38 + Examples/GIFPlot/Pike/check.list | 2 + Examples/GIFPlot/Pike/simple/Makefile | 24 + Examples/GIFPlot/Pike/simple/README | 5 + Examples/GIFPlot/Pike/simple/runme.pike | 30 + Examples/GIFPlot/Pike/simple/simple.i | 38 + Examples/GIFPlot/Python/check.list | 4 + Examples/GIFPlot/Python/full/Makefile | 26 + Examples/GIFPlot/Python/full/README | 8 + Examples/GIFPlot/Python/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Python/full/gifplot.i | 15 + Examples/GIFPlot/Python/full/runme.py | 64 + Examples/GIFPlot/Python/shadow/Makefile | 27 + Examples/GIFPlot/Python/shadow/README | 8 + Examples/GIFPlot/Python/shadow/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Python/shadow/runme.py | 62 + Examples/GIFPlot/Python/simple/Makefile | 26 + Examples/GIFPlot/Python/simple/README | 5 + Examples/GIFPlot/Python/simple/runme.py | 27 + Examples/GIFPlot/Python/simple/simple.i | 38 + Examples/GIFPlot/README | 59 + Examples/GIFPlot/Ruby/check.list | 4 + Examples/GIFPlot/Ruby/full/Makefile | 24 + Examples/GIFPlot/Ruby/full/README | 8 + Examples/GIFPlot/Ruby/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Ruby/full/gifplot.i | 15 + Examples/GIFPlot/Ruby/full/runme.rb | 66 + Examples/GIFPlot/Ruby/shadow/Makefile | 25 + Examples/GIFPlot/Ruby/shadow/README | 5 + Examples/GIFPlot/Ruby/shadow/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Ruby/shadow/runme.rb | 66 + Examples/GIFPlot/Ruby/simple/Makefile | 24 + Examples/GIFPlot/Ruby/simple/README | 5 + Examples/GIFPlot/Ruby/simple/runme.rb | 27 + Examples/GIFPlot/Ruby/simple/simple.i | 38 + Examples/GIFPlot/Tcl/check.list | 4 + Examples/GIFPlot/Tcl/full/Makefile | 24 + Examples/GIFPlot/Tcl/full/README | 8 + Examples/GIFPlot/Tcl/full/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Tcl/full/gifplot.i | 15 + Examples/GIFPlot/Tcl/full/runme.tcl | 67 + Examples/GIFPlot/Tcl/mandel/Makefile | 24 + Examples/GIFPlot/Tcl/mandel/README | 6 + Examples/GIFPlot/Tcl/mandel/cmap | Bin 0 -> 768 bytes Examples/GIFPlot/Tcl/mandel/display.tcl | 68 + Examples/GIFPlot/Tcl/mandel/mandel.i | 47 + Examples/GIFPlot/Tcl/mandel/mandel.tcl | 170 ++ Examples/GIFPlot/Tcl/simple/Makefile | 24 + Examples/GIFPlot/Tcl/simple/README | 5 + Examples/GIFPlot/Tcl/simple/runme.tcl | 27 + Examples/GIFPlot/Tcl/simple/simple.i | 38 + Examples/chicken/zlib/Makefile | 28 + Examples/chicken/zlib/README.html | 1666 +++++++++++++ Examples/chicken/zlib/example.i | 76 + Examples/chicken/zlib/test-zlib.scm | 41 + Examples/guile/check.list | 1 + Examples/lua/lua.c | 1 + Examples/test-suite/li_std_queue.i | 11 +- Examples/test-suite/li_std_set.i | 22 +- Examples/test-suite/li_std_stack.i | 11 +- .../ruby/ruby_li_std_speed_runme.rb | 3 + Examples/test-suite/ruby_li_std_speed.i | 11 +- Examples/xml/example_gif.i | 329 +++ LICENSE | 109 +- LICENSE-GPL | 674 ----- LICENSE-UNIVERSITIES | 95 - Lib/allegrocl/allegrocl.swg | 2 + Lib/allegrocl/longlongs.i | 3 + Lib/allegrocl/std_list.i | 3 + Lib/allegrocl/std_string.i | 3 + Lib/attribute.i | 3 + Lib/carrays.i | 3 + Lib/cdata.i | 3 + Lib/chicken/chicken.swg | 3 + Lib/chicken/chickenrun.swg | 4 + Lib/chicken/multi-generic.scm | 2 +- Lib/chicken/std_string.i | 3 + Lib/chicken/typemaps.i | 3 + Lib/clisp/clisp.swg | 3 + Lib/cmalloc.i | 3 + Lib/constraints.i | 3 + Lib/cpointer.i | 3 + Lib/csharp/arrays_csharp.i | 3 + Lib/csharp/csharp.swg | 3 + Lib/csharp/csharphead.swg | 3 + Lib/csharp/director.swg | 3 + Lib/csharp/enums.swg | 3 + Lib/csharp/enumsimple.swg | 3 + Lib/csharp/enumtypesafe.swg | 3 + Lib/csharp/std_except.i | 3 + Lib/csharp/std_map.i | 3 + Lib/csharp/std_pair.i | 3 + Lib/csharp/std_string.i | 3 + Lib/csharp/std_vector.i | 3 + Lib/csharp/std_wstring.i | 3 + Lib/csharp/stl.i | 3 + Lib/csharp/typemaps.i | 3 + Lib/csharp/wchar.i | 3 + Lib/cstring.i | 3 + Lib/cwstring.i | 3 + Lib/exception.i | 3 + Lib/gcj/cni.swg | 3 + Lib/guile/common.scm | 6 + Lib/guile/cplusplus.i | 3 + Lib/guile/guile.i | 3 + Lib/guile/guile_gh.swg | 3 + Lib/guile/guile_gh_run.swg | 3 + Lib/guile/guile_scm.swg | 3 + Lib/guile/guile_scm_run.swg | 3 + Lib/guile/guilemain.i | 3 + Lib/guile/interpreter.i | 3 + Lib/guile/list-vector.i | 3 + Lib/guile/pointer-in-out.i | 3 + Lib/guile/ports.i | 3 + Lib/guile/std_common.i | 3 + Lib/guile/std_map.i | 3 + Lib/guile/std_pair.i | 3 + Lib/guile/std_string.i | 3 + Lib/guile/std_vector.i | 3 + Lib/guile/stl.i | 3 + Lib/guile/typemaps.i | 3 + Lib/inttypes.i | 3 + Lib/java/arrays_java.i | 3 + Lib/java/director.swg | 3 + Lib/java/enums.swg | 3 + Lib/java/enumsimple.swg | 3 + Lib/java/enumtypesafe.swg | 3 + Lib/java/enumtypeunsafe.swg | 3 + Lib/java/java.swg | 3 + Lib/java/javahead.swg | 3 + Lib/java/std_except.i | 3 + Lib/java/std_map.i | 3 + Lib/java/std_pair.i | 3 + Lib/java/std_string.i | 3 + Lib/java/std_vector.i | 3 + Lib/java/std_wstring.i | 3 + Lib/java/stl.i | 3 + Lib/java/typemaps.i | 3 + Lib/java/various.i | 3 + Lib/lua/_std_common.i | 3 + Lib/lua/lua.swg | 3 + Lib/lua/lua_fnptr.i | 3 + Lib/lua/luarun.swg | 3 + Lib/lua/luaruntime.swg | 3 + Lib/lua/luatypemaps.swg | 3 + Lib/lua/std_except.i | 3 + Lib/lua/std_map.i | 3 + Lib/lua/std_pair.i | 3 + Lib/lua/std_string.i | 3 + Lib/lua/std_vector.i | 3 + Lib/lua/stl.i | 3 + Lib/lua/typemaps.i | 3 + Lib/lua/wchar.i | 6 +- Lib/math.i | 3 + Lib/modula3/modula3.swg | 3 + Lib/modula3/modula3head.swg | 3 + Lib/modula3/typemaps.i | 3 + Lib/mzscheme/mzrun.swg | 3 + Lib/mzscheme/mzscheme.swg | 3 + Lib/mzscheme/std_common.i | 3 + Lib/mzscheme/std_map.i | 3 + Lib/mzscheme/std_pair.i | 3 + Lib/mzscheme/std_string.i | 3 + Lib/mzscheme/std_vector.i | 3 + Lib/mzscheme/stl.i | 3 + Lib/mzscheme/typemaps.i | 3 + Lib/ocaml/cstring.i | 3 + Lib/ocaml/director.swg | 3 + Lib/ocaml/ocaml.i | 3 + Lib/ocaml/ocamldec.swg | 3 + Lib/ocaml/std_common.i | 3 + Lib/ocaml/std_deque.i | 3 + Lib/ocaml/std_list.i | 3 + Lib/ocaml/std_map.i | 3 + Lib/ocaml/std_pair.i | 3 + Lib/ocaml/std_string.i | 3 + Lib/ocaml/std_vector.i | 3 + Lib/ocaml/stl.i | 3 + Lib/ocaml/typecheck.i | 3 + Lib/ocaml/typemaps.i | 3 + Lib/octave/octcontainer.swg | 3 + Lib/octave/octiterators.swg | 3 + Lib/perl5/perlmain.i | 3 + Lib/perl5/reference.i | 3 + Lib/perl5/std_common.i | 3 + Lib/perl5/std_list.i | 3 + Lib/perl5/std_map.i | 3 + Lib/perl5/std_pair.i | 3 + Lib/perl5/std_vector.i | 3 + Lib/perl5/stl.i | 3 + Lib/perl5/typemaps.i | 3 + Lib/php/const.i | 3 + Lib/php/globalvar.i | 3 + Lib/php/php.swg | 3 + Lib/php/phpkw.swg | 3 + Lib/php/phprun.swg | 3 + Lib/php/std_common.i | 3 + Lib/php/std_map.i | 3 + Lib/php/std_pair.i | 3 + Lib/php/std_string.i | 3 + Lib/php/std_vector.i | 3 + Lib/php/stl.i | 3 + Lib/php/typemaps.i | 3 + Lib/pike/pike.swg | 3 + Lib/pike/pikerun.swg | 3 + Lib/pike/std_string.i | 3 + Lib/pointer.i | 3 + Lib/python/ccomplex.i | 3 + Lib/python/director.swg | 3 + Lib/python/embed15.i | 3 + Lib/python/file.i | 4 + Lib/python/pycontainer.swg | 3 + Lib/python/pyiterators.swg | 3 + Lib/python/pyrun.swg | 3 + Lib/python/typemaps.i | 3 + Lib/ruby/director.swg | 3 + Lib/ruby/rubyautodoc.swg | 15 +- Lib/ruby/rubycontainer.swg | 3 + Lib/ruby/rubycontainer_extended.swg | 24 +- Lib/ruby/rubyiterators.swg | 3 + Lib/ruby/rubyprimtypes.swg | 4 + Lib/ruby/rubyrun.swg | 3 + Lib/ruby/rubystdautodoc.swg | 12 +- Lib/ruby/rubytracking.swg | 3 + Lib/ruby/rubywstrings.swg | 20 +- Lib/ruby/stl.i | 3 + Lib/ruby/typemaps.i | 3 + Lib/std/_std_deque.i | 3 + Lib/std_except.i | 3 + Lib/stdint.i | 3 + Lib/stl.i | 3 + Lib/swigarch.i | 3 + Lib/swigrun.i | 3 + Lib/tcl/mactclinit.c | 93 + Lib/tcl/mactkinit.c | 3 + Lib/tcl/std_common.i | 3 + Lib/tcl/std_pair.i | 3 + Lib/tcl/std_vector.i | 3 + Lib/tcl/stl.i | 3 + Lib/tcl/tcl8.swg | 3 + Lib/tcl/tclinterp.i | 3 + Lib/tcl/tclopers.swg | 3 + Lib/tcl/tclresult.i | 3 + Lib/tcl/tclrun.swg | 3 + Lib/tcl/tclsh.i | 3 + Lib/tcl/tclwstrings.swg | 3 + Lib/tcl/typemaps.i | 3 + Lib/tcl/wish.i | 3 + Lib/typemaps/attribute.swg | 3 + Lib/typemaps/carrays.swg | 3 + Lib/typemaps/cdata.swg | 3 + Lib/typemaps/cmalloc.swg | 3 + Lib/typemaps/cpointer.swg | 3 + Lib/typemaps/cstrings.swg | 3 + Lib/typemaps/exception.swg | 3 + Lib/typemaps/ptrtypes.swg | 3 + Lib/typemaps/swigtypemaps.swg | 3 + Lib/typemaps/typemaps.swg | 3 + Lib/uffi/uffi.swg | 2 + Lib/wchar.i | 3 + Lib/windows.i | 3 + Makefile.in | 57 +- README | 57 +- Source/CParse/cparse.h | 8 +- Source/CParse/cscanner.c | 8 +- Source/CParse/parser.y | 8 +- Source/CParse/templ.c | 8 +- Source/CParse/util.c | 8 +- Source/DOH/base.c | 12 +- Source/DOH/doh.h | 14 +- Source/DOH/dohint.h | 15 +- Source/DOH/file.c | 12 +- Source/DOH/fio.c | 12 +- Source/DOH/hash.c | 12 +- Source/DOH/list.c | 12 +- Source/DOH/memory.c | 12 +- Source/DOH/string.c | 12 +- Source/DOH/void.c | 12 +- Source/Include/swigwarn.h | 10 +- Source/Modules/allegrocl.cxx | 8 +- Source/Modules/allocate.cxx | 8 +- Source/Modules/browser.cxx | 8 +- Source/Modules/cffi.cxx | 8 +- Source/Modules/chicken.cxx | 8 +- Source/Modules/clisp.cxx | 8 +- Source/Modules/contract.cxx | 8 +- Source/Modules/csharp.cxx | 8 +- Source/Modules/directors.cxx | 8 +- Source/Modules/emit.cxx | 8 +- Source/Modules/guile.cxx | 8 +- Source/Modules/java.cxx | 8 +- Source/Modules/lang.cxx | 8 +- Source/Modules/lua.cxx | 8 +- Source/Modules/main.cxx | 8 +- Source/Modules/modula3.cxx | 8 +- Source/Modules/module.cxx | 8 +- Source/Modules/mzscheme.cxx | 8 +- Source/Modules/ocaml.cxx | 8 +- Source/Modules/octave.cxx | 8 +- Source/Modules/overload.cxx | 8 +- Source/Modules/perl5.cxx | 12 +- Source/Modules/php.cxx | 8 +- Source/Modules/pike.cxx | 8 +- Source/Modules/python.cxx | 8 +- Source/Modules/r.cxx | 8 +- Source/Modules/ruby.cxx | 8 +- Source/Modules/s-exp.cxx | 8 +- Source/Modules/swigmain.cxx | 12 +- Source/Modules/swigmod.h | 8 +- Source/Modules/tcl8.cxx | 8 +- Source/Modules/typepass.cxx | 8 +- Source/Modules/uffi.cxx | 8 +- Source/Modules/utils.cxx | 8 +- Source/Modules/xml.cxx | 8 +- Source/Preprocessor/cpp.c | 8 +- Source/Preprocessor/expr.c | 8 +- Source/Preprocessor/preprocessor.h | 8 +- Source/Swig/cwrap.c | 8 +- Source/Swig/deprecate.c | 8 +- Source/Swig/error.c | 8 +- Source/Swig/fragment.c | 8 +- Source/Swig/getopt.c | 8 +- Source/Swig/include.c | 8 +- Source/Swig/misc.c | 8 +- Source/Swig/naming.c | 8 +- Source/Swig/parms.c | 8 +- Source/Swig/scanner.c | 8 +- Source/Swig/stype.c | 8 +- Source/Swig/swig.h | 8 +- Source/Swig/swigfile.h | 8 +- Source/Swig/swigopt.h | 8 +- Source/Swig/swigparm.h | 8 +- Source/Swig/swigscan.h | 8 +- Source/Swig/swigtree.h | 8 +- Source/Swig/swigwrap.h | 8 +- Source/Swig/symbol.c | 8 +- Source/Swig/tree.c | 8 +- Source/Swig/typemap.c | 8 +- Source/Swig/typeobj.c | 8 +- Source/Swig/typesys.c | 8 +- Source/Swig/wrapfunc.c | 8 +- configure.in | 4 +- 433 files changed, 12591 insertions(+), 1381 deletions(-) delete mode 100644 COPYRIGHT create mode 100644 Examples/GIFPlot/C/Makefile create mode 100644 Examples/GIFPlot/C/gifplot.i create mode 100644 Examples/GIFPlot/Chicken/check.list create mode 100644 Examples/GIFPlot/Chicken/full/Makefile create mode 100644 Examples/GIFPlot/Chicken/full/README create mode 100644 Examples/GIFPlot/Chicken/full/cmap create mode 100644 Examples/GIFPlot/Chicken/full/gifplot.i create mode 100644 Examples/GIFPlot/Chicken/full/test-gifplot.scm create mode 100644 Examples/GIFPlot/Chicken/simple/Makefile create mode 100644 Examples/GIFPlot/Chicken/simple/README create mode 100644 Examples/GIFPlot/Chicken/simple/simple.i create mode 100644 Examples/GIFPlot/Chicken/simple/test-simple.scm create mode 100644 Examples/GIFPlot/Common-Lisp/full/cmap create mode 100644 Examples/GIFPlot/Common-Lisp/full/gifplot.i create mode 100644 Examples/GIFPlot/Common-Lisp/full/runme.lisp create mode 100644 Examples/GIFPlot/Guile/check.list create mode 100644 Examples/GIFPlot/Guile/full/Makefile create mode 100644 Examples/GIFPlot/Guile/full/README create mode 100644 Examples/GIFPlot/Guile/full/cmap create mode 100644 Examples/GIFPlot/Guile/full/gifplot.i create mode 100644 Examples/GIFPlot/Guile/full/runme.scm create mode 100644 Examples/GIFPlot/Guile/simple/Makefile create mode 100644 Examples/GIFPlot/Guile/simple/README create mode 100644 Examples/GIFPlot/Guile/simple/runme.scm create mode 100644 Examples/GIFPlot/Guile/simple/simple.i create mode 100644 Examples/GIFPlot/Include/gifplot.h create mode 100644 Examples/GIFPlot/Interface/gifplot.i create mode 100644 Examples/GIFPlot/Java/check.list create mode 100644 Examples/GIFPlot/Java/full/Makefile create mode 100644 Examples/GIFPlot/Java/full/README create mode 100644 Examples/GIFPlot/Java/full/cmap create mode 100644 Examples/GIFPlot/Java/full/gifplot.i create mode 100644 Examples/GIFPlot/Java/full/runme.java create mode 100644 Examples/GIFPlot/Java/shadow/Makefile create mode 100644 Examples/GIFPlot/Java/shadow/README create mode 100644 Examples/GIFPlot/Java/shadow/cmap create mode 100644 Examples/GIFPlot/Java/shadow/runme.java create mode 100644 Examples/GIFPlot/Java/simple/Makefile create mode 100644 Examples/GIFPlot/Java/simple/README create mode 100644 Examples/GIFPlot/Java/simple/runme.java create mode 100644 Examples/GIFPlot/Java/simple/simple.i create mode 100644 Examples/GIFPlot/Lib/Makefile.in create mode 100644 Examples/GIFPlot/Lib/color.c create mode 100644 Examples/GIFPlot/Lib/font.c create mode 100644 Examples/GIFPlot/Lib/frame.c create mode 100644 Examples/GIFPlot/Lib/gif.c create mode 100644 Examples/GIFPlot/Lib/matrix.c create mode 100644 Examples/GIFPlot/Lib/pixmap.c create mode 100644 Examples/GIFPlot/Lib/plot2d.c create mode 100644 Examples/GIFPlot/Lib/plot3d.c create mode 100644 Examples/GIFPlot/Makefile.in create mode 100644 Examples/GIFPlot/Ocaml/check.list create mode 100644 Examples/GIFPlot/Ocaml/full/Makefile create mode 100644 Examples/GIFPlot/Ocaml/full/README create mode 100644 Examples/GIFPlot/Ocaml/full/cmap create mode 100644 Examples/GIFPlot/Ocaml/full/gifplot.i create mode 100644 Examples/GIFPlot/Ocaml/full/runme.ml create mode 100644 Examples/GIFPlot/Ocaml/simple/Makefile create mode 100644 Examples/GIFPlot/Ocaml/simple/cmap create mode 100644 Examples/GIFPlot/Ocaml/simple/runme.ml create mode 100644 Examples/GIFPlot/Ocaml/simple/simple.i create mode 100644 Examples/GIFPlot/Perl5/check.list create mode 100644 Examples/GIFPlot/Perl5/full/Makefile create mode 100644 Examples/GIFPlot/Perl5/full/README create mode 100644 Examples/GIFPlot/Perl5/full/cmap create mode 100644 Examples/GIFPlot/Perl5/full/gifplot.i create mode 100644 Examples/GIFPlot/Perl5/full/runme.pl create mode 100644 Examples/GIFPlot/Perl5/shadow/Makefile create mode 100644 Examples/GIFPlot/Perl5/shadow/README create mode 100644 Examples/GIFPlot/Perl5/shadow/cmap create mode 100644 Examples/GIFPlot/Perl5/shadow/runme.pl create mode 100644 Examples/GIFPlot/Perl5/simple/Makefile create mode 100644 Examples/GIFPlot/Perl5/simple/README create mode 100644 Examples/GIFPlot/Perl5/simple/runme.pl create mode 100644 Examples/GIFPlot/Perl5/simple/simple.i create mode 100644 Examples/GIFPlot/Php/check.list create mode 100644 Examples/GIFPlot/Php/full/Makefile create mode 100644 Examples/GIFPlot/Php/full/README create mode 100644 Examples/GIFPlot/Php/full/cmap create mode 100644 Examples/GIFPlot/Php/full/gifplot.i create mode 100644 Examples/GIFPlot/Php/full/runme.php create mode 100644 Examples/GIFPlot/Php/shadow/Makefile create mode 100644 Examples/GIFPlot/Php/shadow/README create mode 100644 Examples/GIFPlot/Php/shadow/cmap create mode 100644 Examples/GIFPlot/Php/shadow/runme.php create mode 100644 Examples/GIFPlot/Php/simple/Makefile create mode 100644 Examples/GIFPlot/Php/simple/README create mode 100644 Examples/GIFPlot/Php/simple/runme.php create mode 100644 Examples/GIFPlot/Php/simple/simple.i create mode 100644 Examples/GIFPlot/Pike/check.list create mode 100644 Examples/GIFPlot/Pike/simple/Makefile create mode 100644 Examples/GIFPlot/Pike/simple/README create mode 100644 Examples/GIFPlot/Pike/simple/runme.pike create mode 100644 Examples/GIFPlot/Pike/simple/simple.i create mode 100644 Examples/GIFPlot/Python/check.list create mode 100644 Examples/GIFPlot/Python/full/Makefile create mode 100644 Examples/GIFPlot/Python/full/README create mode 100644 Examples/GIFPlot/Python/full/cmap create mode 100644 Examples/GIFPlot/Python/full/gifplot.i create mode 100644 Examples/GIFPlot/Python/full/runme.py create mode 100644 Examples/GIFPlot/Python/shadow/Makefile create mode 100644 Examples/GIFPlot/Python/shadow/README create mode 100644 Examples/GIFPlot/Python/shadow/cmap create mode 100644 Examples/GIFPlot/Python/shadow/runme.py create mode 100644 Examples/GIFPlot/Python/simple/Makefile create mode 100644 Examples/GIFPlot/Python/simple/README create mode 100644 Examples/GIFPlot/Python/simple/runme.py create mode 100644 Examples/GIFPlot/Python/simple/simple.i create mode 100644 Examples/GIFPlot/README create mode 100644 Examples/GIFPlot/Ruby/check.list create mode 100644 Examples/GIFPlot/Ruby/full/Makefile create mode 100644 Examples/GIFPlot/Ruby/full/README create mode 100644 Examples/GIFPlot/Ruby/full/cmap create mode 100644 Examples/GIFPlot/Ruby/full/gifplot.i create mode 100644 Examples/GIFPlot/Ruby/full/runme.rb create mode 100644 Examples/GIFPlot/Ruby/shadow/Makefile create mode 100644 Examples/GIFPlot/Ruby/shadow/README create mode 100644 Examples/GIFPlot/Ruby/shadow/cmap create mode 100644 Examples/GIFPlot/Ruby/shadow/runme.rb create mode 100644 Examples/GIFPlot/Ruby/simple/Makefile create mode 100644 Examples/GIFPlot/Ruby/simple/README create mode 100644 Examples/GIFPlot/Ruby/simple/runme.rb create mode 100644 Examples/GIFPlot/Ruby/simple/simple.i create mode 100644 Examples/GIFPlot/Tcl/check.list create mode 100644 Examples/GIFPlot/Tcl/full/Makefile create mode 100644 Examples/GIFPlot/Tcl/full/README create mode 100644 Examples/GIFPlot/Tcl/full/cmap create mode 100644 Examples/GIFPlot/Tcl/full/gifplot.i create mode 100644 Examples/GIFPlot/Tcl/full/runme.tcl create mode 100644 Examples/GIFPlot/Tcl/mandel/Makefile create mode 100644 Examples/GIFPlot/Tcl/mandel/README create mode 100644 Examples/GIFPlot/Tcl/mandel/cmap create mode 100644 Examples/GIFPlot/Tcl/mandel/display.tcl create mode 100644 Examples/GIFPlot/Tcl/mandel/mandel.i create mode 100644 Examples/GIFPlot/Tcl/mandel/mandel.tcl create mode 100644 Examples/GIFPlot/Tcl/simple/Makefile create mode 100644 Examples/GIFPlot/Tcl/simple/README create mode 100644 Examples/GIFPlot/Tcl/simple/runme.tcl create mode 100644 Examples/GIFPlot/Tcl/simple/simple.i create mode 100644 Examples/chicken/zlib/Makefile create mode 100644 Examples/chicken/zlib/README.html create mode 100644 Examples/chicken/zlib/example.i create mode 100644 Examples/chicken/zlib/test-zlib.scm create mode 100644 Examples/xml/example_gif.i delete mode 100644 LICENSE-GPL delete mode 100644 LICENSE-UNIVERSITIES create mode 100644 Lib/tcl/mactclinit.c diff --git a/ANNOUNCE b/ANNOUNCE index 2595f7a55..9ef41142a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,10 +1,10 @@ -*** ANNOUNCE: SWIG 2.0.0 (in progress) *** +*** ANNOUNCE: SWIG 1.3.40 (in progress) *** http://www.swig.org -We're pleased to announce SWIG-2.0.0, the latest installment in the -SWIG development effort. SWIG-2.0.0 includes a number of bug fixes +We're pleased to announce SWIG-1.3.40, the latest installment in the +SWIG development effort. SWIG-1.3.40 includes a number of bug fixes and enhancements. What is SWIG? @@ -24,11 +24,11 @@ Availability: ------------- The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-2.0.0.tar.gz + http://prdownloads.sourceforge.net/swig/swig-1.3.40.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-2.0.0.zip + http://prdownloads.sourceforge.net/swig/swigwin-1.3.40.zip Please report problems with this release to the swig-dev mailing list, details at http://www.swig.org/mail.html. diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index 45f9d6b45..000000000 --- a/COPYRIGHT +++ /dev/null @@ -1,63 +0,0 @@ -SWIG Copyright and Authors --------------------------- - -Copyright (c) 1995-2010 The SWIG Developers -Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona). -Copyright (c) 1998-2005 University of Chicago. -Copyright (c) 1995-1998 The University of Utah and the Regents of the University of California - -Portions also copyrighted by: - Network Applied Communication Laboratory, Inc - Information-technology Promotion Agency, Japan - -Active SWIG Developers: - William Fulton (wsf@fultondesigns.co.uk) (SWIG core, Java, C#, Windows, Cygwin) - Olly Betts (olly@survex.com) (PHP) - Joseph Wang (joequant@gmail.com) (R) - Xavier Delacour (xavier.delacour@gmail.com) (Octave) - -Past SWIG developers and major contributors include: - Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) - Henning Thielemann (swig@henning-thielemann.de) (Modula3) - Matthias Köppe (mkoeppe@mail.math.uni-magdeburg.de) (Guile, MzScheme) - Luigi Ballabio (luigi.ballabio@fastwebnet.it) (STL wrapping) - Mikel Bancroft (mikel@franz.com) (Allegro CL) - Surendra Singhi (efuzzyone@netscape.net) (CLISP, CFFI) - Marcelo Matus (mmatus@acms.arizona.edu) (SWIG core, Python, UTL[python,perl,tcl,ruby]) - Art Yerkes (ayerkes@speakeasy.net) (Ocaml) - Lyle Johnson (lyle@users.sourceforge.net) (Ruby) - Charlie Savage (cfis@interserv.com) (Ruby) - Thien-Thi Nguyen (ttn@glug.org) (build/test/misc) - Richard Palmer (richard@magicality.org) (PHP) - Sam Liddicott - Anonova Ltd (saml@liddicott.com) (PHP) - Tim Hockin - Sun Microsystems (thockin@sun.com) (PHP) - Kevin Ruland (PHP) - Shibukawa Yoshiki (Japanese Translation) - Jason Stewart (jason@openinformatics.com) (Perl5) - Loic Dachary (Perl5) - David Fletcher (Perl5) - Gary Holt (Perl5) - Masaki Fukushima (Ruby) - Scott Michel (scottm@cs.ucla.edu) (Java directors) - Tiger Feng (songyanf@cs.uchicago.edu) (SWIG core) - Mark Rose (mrose@stm.lbl.gov) (Directors) - Jonah Beckford (beckford@usermail.com) (CHICKEN) - Ahmon Dancy (dancy@franz.com) (Allegro CL) - Dirk Gerrits (Allegro CL) - Neil Cawse (C#) - Harco de Hilster (Java) - Alexey Dyachenko (dyachenko@fromru.com) (Tcl) - Bob Techentin (Tcl) - Martin Froehlich (Guile) - Marcio Luis Teixeira (Guile) - Duncan Temple Lang (R) - Miklos Vajna (PHP directors) - Mark Gossage (mark@gossage.cjb.net) (Lua) - Gonzalo Garramuno (ggarra@advancedsl.com.ar) (Ruby, Ruby's UTL) - John Lenz (Guile, MzScheme updates, Chicken module, runtime system) - -Past contributors include: - James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran - Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn - (See CHANGES and CHANGES.current for a more complete list). - diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html index ab47ed8ee..789efc129 100644 --- a/Doc/Manual/Sections.html +++ b/Doc/Manual/Sections.html @@ -6,7 +6,7 @@

        SWIG-1.3 Development Documentation

        -Last update : SWIG-2.0.0 (in progress) +Last update : SWIG-1.3.40 (in progress)

        Sections

        diff --git a/Examples/GIFPlot/C/Makefile b/Examples/GIFPlot/C/Makefile new file mode 100644 index 000000000..f45d360cf --- /dev/null +++ b/Examples/GIFPlot/C/Makefile @@ -0,0 +1,17 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SWIGOPT = -I../Include +SRCS = +TARGET = gifplot +INTERFACE = gifplot.i +LIBS = -L.. -lgifplot +INCLUDES = -I../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' LIBS='$(LIBS)' \ + SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c + +clean: + rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme + +check: all diff --git a/Examples/GIFPlot/C/gifplot.i b/Examples/GIFPlot/C/gifplot.i new file mode 100644 index 000000000..356edd7f1 --- /dev/null +++ b/Examples/GIFPlot/C/gifplot.i @@ -0,0 +1,15 @@ +/* Oh what the heck, let's just grab the whole darn header file + and see what happens. */ + +%module gifplot +%{ + +/* Note: You still need this part because the %include directive + merely causes SWIG to interpret the contents of a file. It doesn't + include the right include headers for the resulting C code */ + +#include "../Include/gifplot.h" + +%} + +%include gifplot.h diff --git a/Examples/GIFPlot/Chicken/check.list b/Examples/GIFPlot/Chicken/check.list new file mode 100644 index 000000000..e75ee586a --- /dev/null +++ b/Examples/GIFPlot/Chicken/check.list @@ -0,0 +1,3 @@ +# see top-level Makefile.in +full +simple diff --git a/Examples/GIFPlot/Chicken/full/Makefile b/Examples/GIFPlot/Chicken/full/Makefile new file mode 100644 index 000000000..2ae4fd7ea --- /dev/null +++ b/Examples/GIFPlot/Chicken/full/Makefile @@ -0,0 +1,28 @@ +TOP = ../../.. +SWIG = $(TOP)/../preinst-swig +INTERFACE = gifplot.i +SRCS = +CXXSRCS = +TARGET = gifplot +INCLUDE = -I. -I../../Include +SWIGOPT = -I../../Include +CFLAGS = +VARIANT = +LIBS = -L../.. -lgifplot -lm + +# comment the following two lines to build a dynamic so file +CHICKEN_MAIN = test-gifplot.scm +VARIANT = _static + +all:: $(TARGET) + +$(TARGET): $(INTERFACE) $(SRCS) + $(MAKE) -f $(TOP)/Makefile \ + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) + +clean:: + $(MAKE) -f $(TOP)/Makefile chicken_clean + rm -f gifplot.scm image.gif + rm -f $(TARGET) diff --git a/Examples/GIFPlot/Chicken/full/README b/Examples/GIFPlot/Chicken/full/README new file mode 100644 index 000000000..e5ddd7af1 --- /dev/null +++ b/Examples/GIFPlot/Chicken/full/README @@ -0,0 +1,6 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The Scheme program 'test-gifplot.scm' does something a +little more interesting. You'll have to go look at the header file to +get a complete listing of the functions. + +`make' will build a static binary. Run ./gifplot to test it. diff --git a/Examples/GIFPlot/Chicken/full/cmap b/Examples/GIFPlot/Chicken/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9ICexact (round (max (min cc 239) 0))))) + (gifplot:Plot3D-solidquad p3 x y z1 (+ x dx) y z2 (+ x dx) (+ y dy) + z3 x (+ y dy) z4 + (gifplot:int->Pixel (+ c 16)))) + (y-loop (+ y dy) (+ j 1))))) + (x-loop (+ x dx) (+ i 1))))))) + +(display "Making a nice 3D plot...\n") +(drawsolid) + +(gifplot:FrameBuffer-writeGIF frame cmap "image.gif") +(display "Wrote image.gif\n") diff --git a/Examples/GIFPlot/Chicken/simple/Makefile b/Examples/GIFPlot/Chicken/simple/Makefile new file mode 100644 index 000000000..484e58390 --- /dev/null +++ b/Examples/GIFPlot/Chicken/simple/Makefile @@ -0,0 +1,28 @@ +TOP = ../../.. +SWIG = $(TOP)/../preinst-swig +INTERFACE = simple.i +SRCS = +CXXSRCS = +TARGET = simple +INCLUDE = -I. -I../../Include +SWIGOPT = -I../../Include +CFLAGS = +VARIANT = +LIBS = -L../.. -lgifplot -lm + +# comment the following two lines to build a dynamic so file +CHICKEN_MAIN = test-simple.scm +VARIANT = _static + +all:: $(TARGET) + +$(TARGET): $(INTERFACE) $(SRCS) + $(MAKE) -f $(TOP)/Makefile \ + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) + +clean:: + $(MAKE) -f $(TOP)/Makefile chicken_clean + rm -f simple.scm image.gif + rm -f $(TARGET) diff --git a/Examples/GIFPlot/Chicken/simple/README b/Examples/GIFPlot/Chicken/simple/README new file mode 100644 index 000000000..3b138f381 --- /dev/null +++ b/Examples/GIFPlot/Chicken/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. + +`make' will build an exe. Run ./simple to test it. diff --git a/Examples/GIFPlot/Chicken/simple/simple.i b/Examples/GIFPlot/Chicken/simple/simple.i new file mode 100644 index 000000000..23ac8a856 --- /dev/null +++ b/Examples/GIFPlot/Chicken/simple/simple.i @@ -0,0 +1,34 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned int Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants, which we redefine (from gifplot.h) so + that SWIG sees them */ +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + diff --git a/Examples/GIFPlot/Chicken/simple/test-simple.scm b/Examples/GIFPlot/Chicken/simple/test-simple.scm new file mode 100644 index 000000000..43250d8e9 --- /dev/null +++ b/Examples/GIFPlot/Chicken/simple/test-simple.scm @@ -0,0 +1,29 @@ +;;; Draw some simple shapes + +(declare (uses simple)) + +(display "Drawing some basic shapes\n") + +(define cmap (simple:new-ColorMap #f)) +(define f (simple:new-FrameBuffer 400 400)) + +;; Clear the picture +(simple:FrameBuffer-clear f (simple:BLACK)) + +;; Make a red box +(simple:FrameBuffer-box f 40 40 200 200 (simple:RED)) + +;; Make a blue circle +(simple:FrameBuffer-circle f 200 200 40 (simple:BLUE)) + +;; Make green line +(simple:FrameBuffer-line f 10 390 390 200 (simple:GREEN)) + +;; Write an image out to disk + +(simple:FrameBuffer-writeGIF f cmap "image.gif") +(display "Wrote image.gif\n") + +(simple:delete-FrameBuffer f) +(simple:delete-ColorMap cmap) + diff --git a/Examples/GIFPlot/Common-Lisp/full/cmap b/Examples/GIFPlot/Common-Lisp/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC +#include +#include +#include +#include +#include + +#ifndef GIFPLOT_H + +#ifdef SWIG +%nodefault; +#endif + +/* Pixel is 8-bits */ + +typedef unsigned char Pixel; +typedef float Zvalue; + +/* ------------------------------------------------------------------------ + ColorMap + + Definition and methods for colormaps + ------------------------------------------------------------------------ */ + +typedef struct ColorMap { + unsigned char *cmap; + char *name; +} ColorMap; + +extern ColorMap *new_ColorMap(char *filename); +extern void delete_ColorMap(ColorMap *c); +extern void ColorMap_default(ColorMap *c); +extern void ColorMap_assign(ColorMap *c, int index, int r, int g, int b); +extern int ColorMap_getitem(ColorMap *c, int index); +extern void ColorMap_setitem(ColorMap *c, int index, int value); +extern int ColorMap_write(ColorMap *c, char *filename); + +/* Some default colors */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + +/*------------------------------------------------------------------------- + FrameBuffer + + This structure defines a simple 8 bit framebuffer. + ------------------------------------------------------------------------- */ + +typedef struct FrameBuffer { + Pixel **pixels; + Zvalue **zbuffer; + unsigned int height; + unsigned int width; + int xmin; /* These are used for clipping */ + int ymin; + int xmax; + int ymax; +} FrameBuffer; + +#define ZMIN 1e+36 + +/* FrameBuffer Methods */ + +extern FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +extern void delete_FrameBuffer(FrameBuffer *frame); +extern int FrameBuffer_resize(FrameBuffer *frame, int width, int height); +extern void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +extern void FrameBuffer_plot(FrameBuffer *frame, int x, int y, Pixel color); +extern void FrameBuffer_horizontal(FrameBuffer *frame, int xmin, int xmax, int y, Pixel color); +extern void FrameBuffer_horizontalinterp(FrameBuffer *f, int xmin, int xmax, int y, Pixel c1, Pixel c2); +extern void FrameBuffer_vertical(FrameBuffer *frame, int ymin, int ymax, int x, Pixel color); +extern void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +extern void FrameBuffer_solidbox(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +extern void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); +extern void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +extern void FrameBuffer_solidcircle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +extern void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +extern void FrameBuffer_setclip(FrameBuffer *frame, int xmin, int ymin, int xmax, int ymax); +extern void FrameBuffer_noclip(FrameBuffer *frame); +extern int FrameBuffer_makeGIF(FrameBuffer *frame, ColorMap *cmap, void *buffer, unsigned int maxsize); +extern int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); +extern void FrameBuffer_zresize(FrameBuffer *f, int width, int height); +extern void FrameBuffer_zclear(FrameBuffer *f); +extern void FrameBuffer_solidtriangle(FrameBuffer *f, int x1, int y1, int x2, int y2, int x3, int y3, Pixel c); +extern void FrameBuffer_interptriangle(FrameBuffer *f, int tx1, int ty1, Pixel c1, + int tx2, int ty2, Pixel c2, int tx3, int ty3, Pixel c3); + +#define HORIZONTAL 1 +#define VERTICAL 2 + +extern void FrameBuffer_drawchar(FrameBuffer *frame, int x, int y, int fgcolor, int bgcolor, char chr, int orientation); +extern void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, int bgcolor, char *text, int orientation); + +/* ------------------------------------------------------------------------ + PixMap + + The equivalent of "bit-maps". + ------------------------------------------------------------------------ */ + +typedef struct PixMap { + int width; + int height; + int centerx; + int centery; + int *map; +} PixMap; + +/* PIXMAP methods */ + +extern PixMap *new_PixMap(int width, int height, int centerx, int centery); +extern void delete_PixMap(PixMap *pm); +extern void PixMap_set(PixMap *pm, int x, int y, int pix); +extern void FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor); + +#define GIFPLOT_TRANSPARENT 0 +#define GIFPLOT_FOREGROUND 1 +#define GIFPLOT_BACKGROUND 2 + +/* ------------------------------------------------------------------------ + Plot2D + + Definition and methods for 2D plots. + ------------------------------------------------------------------------ */ + +typedef struct Plot2D { + FrameBuffer *frame; /* what frame buffer are we using */ + int view_xmin; /* Minimum coordinates of view region */ + int view_ymin; + int view_xmax; /* Maximum coordinates of view region */ + int view_ymax; + double xmin; /* Minimum coordinates of plot region */ + double ymin; + double xmax; /* Maximum coordinates of plot region */ + double ymax; + int xscale; /* Type of scaling (LINEAR, LOG, etc..) */ + int yscale; + double dx; /* Private scaling parameters */ + double dy; +} Plot2D; + +/* 2D Plot methods */ + +extern Plot2D *new_Plot2D(FrameBuffer *frame,double xmin,double ymin, double xmax, double ymax); +extern void delete_Plot2D(Plot2D *p2); +extern Plot2D *Plot2D_copy(Plot2D *p2); +extern void Plot2D_clear(Plot2D *p2, Pixel c); +extern void Plot2D_setview(Plot2D *p2, int vxmin, int vymin, int vxmax, int vymax); +extern void Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax); +extern void Plot2D_setscale(Plot2D *p2, int xscale, int yscale); +extern void Plot2D_plot(Plot2D *p2, double x, double y, Pixel color); +extern void Plot2D_box(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); +extern void Plot2D_solidbox(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color); +extern void Plot2D_interpbox(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); +extern void Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color); +extern void Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color); +extern void Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); +extern void Plot2D_start(Plot2D *p2); +extern void Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor); +extern void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel c); +extern void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel c); +extern void Plot2D_triangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); +extern void Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); +extern void Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, + double x2, double y2, Pixel c2, + double x3, double y3, Pixel c3); + +#define LINEAR 10 +#define LOG 11 + +/* ----------------------------------------------------------------------- + Matrix + + Operations on 4x4 transformation matrices and vectors. + Matrices are represented as a double array of 16 elements + ----------------------------------------------------------------------- */ + +typedef double *Matrix; +typedef struct GL_Vector { + double x; + double y; + double z; + double w; +} GL_Vector; + +extern Matrix new_Matrix(); +extern void delete_Matrix(Matrix a); +extern Matrix Matrix_copy(Matrix a); +extern void Matrix_multiply(Matrix a, Matrix b, Matrix c); +extern void Matrix_identity(Matrix a); +extern void Matrix_zero(Matrix a); +extern void Matrix_transpose(Matrix a, Matrix result); +extern void Matrix_invert(Matrix a, Matrix inva); +extern void Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t); +extern void Matrix_transform4(Matrix a, double rx, double ry, double rz, + double rw, GL_Vector *t); + +extern void Matrix_print(Matrix a); +extern void Matrix_translate(Matrix a, double tx, double ty, double tz); +extern void Matrix_rotatex(Matrix a, double deg); +extern void Matrix_rotatey(Matrix a, double deg); +extern void Matrix_rotatez(Matrix a, double deg); + +/* ----------------------------------------------------------------------- + Plot3D + + Data Structure for 3-D plots + ------------------------------------------------------------------------ */ + +typedef struct Plot3D { + FrameBuffer *frame; /* Frame buffer being used */ + int view_xmin; /* Viewing region */ + int view_ymin; + int view_xmax; + int view_ymax; + double xmin; /* Bounding box */ + double ymin; + double zmin; + double xmax; + double ymax; + double zmax; + double xcenter; /* Center point */ + double ycenter; + double zcenter; + double fovy; /* Field of view */ + double aspect; /* Aspect ratio */ + double znear; /* near "clipping" plane */ + double zfar; /* far "clipping" plane */ + Matrix center_mat; /* Matrix used for centering the model */ + Matrix model_mat; /* Model rotation matrix */ + Matrix view_mat; /* Viewing matrix */ + Matrix fullmodel_mat; /* Full model matrix. Used by sphere plot */ + Matrix trans_mat; /* Total transformation matrix */ + double lookatz; /* Where is the z-lookat point */ + double xshift; /* Used for translation and stuff */ + double yshift; + double zoom; + int width; + int height; + int pers_mode; /* Perspective mode (private) */ + double ortho_left,ortho_right,ortho_bottom,ortho_top; +} Plot3D; + +extern Plot3D *new_Plot3D(FrameBuffer *frame, double xmin, double ymin, double zmin, + double xmax, double ymax, double zmax); +extern void delete_Plot3D(Plot3D *p3); +extern Plot3D *Plot3D_copy(Plot3D *p3); +extern void Plot3D_clear(Plot3D *p3, Pixel Color); +extern void Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar); +extern void Plot3D_ortho(Plot3D *p3, double left, double right, double top, double bottom); +extern void Plot3D_lookat(Plot3D *p3, double z); +extern void Plot3D_autoperspective(Plot3D *p3, double fovy); +extern void Plot3D_autoortho(Plot3D *p3); +extern void Plot3D_rotx(Plot3D *p3, double deg); +extern void Plot3D_roty(Plot3D *p3, double deg); +extern void Plot3D_rotz(Plot3D *p3, double deg); +extern void Plot3D_rotl(Plot3D *p3, double deg); +extern void Plot3D_rotr(Plot3D *p3, double deg); +extern void Plot3D_rotd(Plot3D *p3, double deg); +extern void Plot3D_rotu(Plot3D *p3, double deg); +extern void Plot3D_rotc(Plot3D *p3, double deg); +extern void Plot3D_zoom(Plot3D *p3, double percent); +extern void Plot3D_left(Plot3D *p3, double percent); +extern void Plot3D_right(Plot3D *p3, double percent); +extern void Plot3D_down(Plot3D *p3, double percent); +extern void Plot3D_up(Plot3D *p3, double percent); +extern void Plot3D_center(Plot3D *p3, double cx, double cy); + +extern void Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel Color); + +extern void Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax); +extern void Plot3D_start(Plot3D *p3); +extern void Plot3D_line(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, Pixel color); +extern void Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color); +extern void Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color); + +extern void Plot3D_interptriangle(Plot3D *p3, + double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3); + +extern void Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color); + +extern void Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color); + +extern void Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3, + double x4, double y4, double z4, Pixel c4); + + +extern void Plot3D_solidsphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c); + +extern void Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c, Pixel bc); + +extern PixMap PixMap_SQUARE; +extern PixMap PixMap_TRIANGLE; +extern PixMap PixMap_CROSS; + +#endif +#define GIFPLOT_H + + + diff --git a/Examples/GIFPlot/Interface/gifplot.i b/Examples/GIFPlot/Interface/gifplot.i new file mode 100644 index 000000000..fdf661c5e --- /dev/null +++ b/Examples/GIFPlot/Interface/gifplot.i @@ -0,0 +1,264 @@ +// +// Graphics module +// +%module gifplot +%{ +#include "gifplot.h" +%} + +#if defined(SWIGJAVA ) || defined(SWIGPHP) + %rename(make_default) ColorMap::default(); +#endif + +%rename(__getitem__) ColorMap::getitem(int index); +%rename(__setitem__) ColorMap::setitem(int index, int value); + +/* Pixel is 8-bits */ + +typedef unsigned char Pixel; +typedef float Zvalue; + +/* ------------------------------------------------------------------------ + ColorMap + + Definition and methods for colormaps + ------------------------------------------------------------------------ */ + +typedef struct ColorMap { + char *name; + +// +// %extend adds some C methods to this structure to make it +// look like a C++ class in Python. +// These are really named things like ColorMap_default, ColorMap_assign, etc... + + %extend { + ColorMap(char *filename); + ~ColorMap(); + void default(); + void assign(int index,int r, int g, int b); + int getitem(int index); + void setitem(int index, int value); + int write(char *filename); + } +} ColorMap; + +/* Some default colors */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + +/*------------------------------------------------------------------------- + FrameBuffer + + This structure defines a simple 8 bit framebuffer. + ------------------------------------------------------------------------- */ + +typedef struct FrameBuffer { + unsigned int height; + unsigned int width; + int xmin; /* These are used for clipping */ + int ymin; + int xmax; + int ymax; + %extend { + FrameBuffer(unsigned int width, unsigned int height); + ~FrameBuffer(); + void resize(int width, int height); + void clear(Pixel color); + void plot(int x, int y, Pixel color); + void horizontal(int xmin, int xmax, int y, Pixel color); + void horizontalinterp(int xmin, int xmax, int y, Pixel c1, Pixel c2); + void vertical(int ymin, int ymax, int x, Pixel color); + void box(int x1, int y1, int x2, int y2, Pixel color); + void solidbox(int x1, int y1, int x2, int y2, Pixel color); + void interpbox(int x1, int y1, int x2, int y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); + void circle(int x1, int y1, int radius, Pixel color); + void solidcircle(int x1, int y1, int radius, Pixel color); + void line(int x1, int y1, int x2, int y2, Pixel color); + void setclip(int xmin, int ymin, int xmax, int ymax); + void noclip(); + int makeGIF(ColorMap *cmap, void *buffer, unsigned int maxsize); + void zresize(int width, int height); + void zclear(); + void drawchar(int x, int y, int fgcolor, int bgcolor, char chr, int orientation); + void drawstring(int x, int y, int fgcolor, int bgcolor, char *text, int orientation); + void drawpixmap(PixMap *pm, int x, int y, int fgcolor, int bgcolor); + int writeGIF(ColorMap *cmap, char *filename); + } +} FrameBuffer; + +#define HORIZONTAL 1 +#define VERTICAL 2 + +/* -------------------------------------------------------------------------- + PixMap + + The equivalent of "bit-maps". + -------------------------------------------------------------------------- */ + +/* PIXMAP methods */ + +extern PixMap *new_PixMap(int width, int height, int centerx, int centery); +extern void delete_PixMap(PixMap *pm); +extern void PixMap_set(PixMap *pm, int x, int y, int pix); + +#define GIFPLOT_TRANSPARENT 0 +#define GIFPLOT_FOREGROUND 1 +#define GIFPLOT_BACKGROUND 2 + +/* -------------------------------------------------------------------------- + Plot2D + + Definition and methods for 2D plots. + --------------------------------------------------------------------------- */ + +typedef struct Plot2D { + FrameBuffer *frame; + int view_xmin; /* Minimum coordinates of view region */ + int view_ymin; + int view_xmax; /* Maximum coordinates of view region */ + int view_ymax; + double xmin; /* Minimum coordinates of plot region */ + double ymin; + double xmax; /* Maximum coordinates of plot region */ + double ymax; + int xscale; /* Type of scaling (LINEAR, LOG, etc..) */ + int yscale; + %extend { + Plot2D(FrameBuffer *frame,double xmin,double ymin, double xmax, double ymax); + ~Plot2D(); + Plot2D *copy(); + void clear(Pixel c); + void setview(int vxmin, int vymin, int vxmax, int vymax); + void setrange(double xmin, double ymin, double xmax, double ymax); + void setscale(int xscale, int yscale); + void plot(double x, double y, Pixel color); + void box(double x1, double y1, double x2, double y2, Pixel color); + void solidbox(double x1, double y1, double x2, double y2, Pixel color); + void interpbox(double x1, double y1, double x2, double y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); + + void circle(double x, double y, double radius, Pixel color); + void solidcircle(double x, double y, double radius, Pixel color); + void line(double x1, double y1, double x2, double y2, Pixel color); + void start(); + void drawpixmap(PixMap *pm, double x, double y, Pixel color, Pixel bgcolor); + void xaxis(double x, double y, double xtick, int ticklength, Pixel color); + void yaxis(double x, double y, double ytick, int ticklength, Pixel color); + void triangle(double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); + + void solidtriangle(double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); + + void interptriangle(double x1, double y1, Pixel c1, + double x2, double y2, Pixel c2, + double x3, double y3, Pixel c3); + + } +} Plot2D; + +#define LINEAR 10 +#define LOG 11 + +/* ------------------------------------------------------------------------------ + Plot3D + + Data Structure for 3-D plots + ------------------------------------------------------------------------------ */ + +typedef struct Plot3D { + FrameBuffer *frame; + int view_xmin; /* Viewing region */ + int view_ymin; + int view_xmax; + int view_ymax; + double xmin; /* Bounding box */ + double ymin; + double zmin; + double xmax; + double ymax; + double zmax; + double xcenter; /* Center point */ + double ycenter; + double zcenter; + double fovy; /* Field of view */ + double aspect; /* Aspect ratio */ + double znear; /* near "clipping" plane */ + double zfar; /* far "clipping" plane */ + double lookatz; /* Where is the z-lookat point */ + double xshift; /* Used for translation and stuff */ + double yshift; + %extend { + Plot3D(FrameBuffer *frame, double xmin, double ymin, double zmin, double xmax, double ymax, double zmax); + ~Plot3D(); + Plot3D *copy(); + void clear(Pixel bgcolor); + void perspective( double fovy, double znear, double zfar); + void lookat( double z); + void autoperspective( double fovy); + void ortho(double left, double right, double bottom, double top); + void autoortho(); + void rotx( double deg); + void roty( double deg); + void rotz( double deg); + void rotl( double deg); + void rotr( double deg); + void rotd( double deg); + void rotu( double deg); + void rotc( double deg); + void zoom( double percent); + void left( double percent); + void right( double percent); + void down( double percent); + void up( double percent); + void center( double cx, double cy); + void plot( double x, double y, double z, Pixel Color); + void setview( int vxmin, int vymin, int vxmax, int vymax); + void start(); + void line( double x1, double y1, double z1, + double x2, double y2, double z2, Pixel color); + void triangle( double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color); + void solidtriangle( double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color); + void interptriangle(double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3); + void quad( double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color); + void solidquad( double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color); + void interpquad( double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3, + double x4, double y4, double z4, Pixel c4); + void solidsphere( double x, double y, double z, double radius,Pixel c); + void outlinesphere( double x, double y, double z, double radius,Pixel c, Pixel bc); + } +} Plot3D; + +#ifndef SWIGJAVA +/* These directives create constants of a specific type. They + do not correspond to any C variable or declared constant in the + header file */ +%constant PixMap * SQUARE = &PixMap_SQUARE; +%constant PixMap * TRIANGLE = &PixMap_TRIANGLE; +%constant PixMap * CROSS = &PixMap_CROSS; +#endif + + + + diff --git a/Examples/GIFPlot/Java/check.list b/Examples/GIFPlot/Java/check.list new file mode 100644 index 000000000..13de977af --- /dev/null +++ b/Examples/GIFPlot/Java/check.list @@ -0,0 +1,4 @@ +# see top-level Makefile.in +full +shadow +simple diff --git a/Examples/GIFPlot/Java/full/Makefile b/Examples/GIFPlot/Java/full/Makefile new file mode 100644 index 000000000..8f167237d --- /dev/null +++ b/Examples/GIFPlot/Java/full/Makefile @@ -0,0 +1,20 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Include -noproxy +SRCS = +TARGET = gifplot +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java + javac *.java + +clean:: + $(MAKE) -f $(TOP)/Makefile java_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Java/full/README b/Examples/GIFPlot/Java/full/README new file mode 100644 index 000000000..93463ea30 --- /dev/null +++ b/Examples/GIFPlot/Java/full/README @@ -0,0 +1,8 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The program 'runme.java' does something a little more +interesting. After doing a make, run it using 'java runme'. You'll have to go +look at the header file to get a complete listing of the functions. + +Note the differences in the runme.java files between this example and the +'full' example. This example does not use shadow classes. + diff --git a/Examples/GIFPlot/Java/full/cmap b/Examples/GIFPlot/Java/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) c = 239; + gifplot.Plot3D_solidquad(p3,x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,(short)(c+16)); + y = y + dy; + } + x = x + dx; + } + + gifplot.FrameBuffer_writeGIF(frame,cmap,"image.gif"); + System.out.println( "Wrote image.gif" ); + } + + // Here is the function to plot + public static double func(double x, double y) { + return 5*java.lang.Math.cos(2*java.lang.Math.sqrt(x*x+y*y))*java.lang.Math.exp(-0.3*java.lang.Math.sqrt(x*x+y*y)); + } +} diff --git a/Examples/GIFPlot/Java/shadow/Makefile b/Examples/GIFPlot/Java/shadow/Makefile new file mode 100644 index 000000000..8062c2700 --- /dev/null +++ b/Examples/GIFPlot/Java/shadow/Makefile @@ -0,0 +1,21 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -outcurrentdir +SRCS = +TARGET = gifplot +INTERFACEDIR = ../../Interface/ +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java + javac *.java + +clean:: + $(MAKE) -f $(TOP)/Makefile java_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Java/shadow/README b/Examples/GIFPlot/Java/shadow/README new file mode 100644 index 000000000..b06c5a8f1 --- /dev/null +++ b/Examples/GIFPlot/Java/shadow/README @@ -0,0 +1,5 @@ +This example uses the file in ../../Interface/gifplot.i to build +an interface with shadow classes. After doing a make, run the program runme, ie: 'java runme'. + +Note the differences in the runme.java files between this example and the +'full' example. This example uses the shadow classes. diff --git a/Examples/GIFPlot/Java/shadow/cmap b/Examples/GIFPlot/Java/shadow/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) c = 239; + p3.solidquad(x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,(short)(c+16)); + y = y + dy; + } + x = x + dx; + } + + frame.writeGIF(cmap,"image.gif"); + System.out.println( "Wrote image.gif" ); + } + + // Here is the function to plot + public static double func(double x, double y) { + return 5*java.lang.Math.cos(2*java.lang.Math.sqrt(x*x+y*y))*java.lang.Math.exp(-0.3*java.lang.Math.sqrt(x*x+y*y)); + } +} diff --git a/Examples/GIFPlot/Java/simple/Makefile b/Examples/GIFPlot/Java/simple/Makefile new file mode 100644 index 000000000..d707fd458 --- /dev/null +++ b/Examples/GIFPlot/Java/simple/Makefile @@ -0,0 +1,21 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -noproxy +SRCS = +TARGET = simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java + javac *.java + + +clean:: + $(MAKE) -f $(TOP)/Makefile java_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Java/simple/README b/Examples/GIFPlot/Java/simple/README new file mode 100644 index 000000000..13ff49611 --- /dev/null +++ b/Examples/GIFPlot/Java/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. After doing a make, run the java program, ie 'java runme'. + + diff --git a/Examples/GIFPlot/Java/simple/runme.java b/Examples/GIFPlot/Java/simple/runme.java new file mode 100644 index 000000000..2d8d2bb48 --- /dev/null +++ b/Examples/GIFPlot/Java/simple/runme.java @@ -0,0 +1,41 @@ + +public class runme { + + static { + try { + System.loadLibrary("simple"); + } catch (UnsatisfiedLinkError e) { + System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); + System.exit(1); + } + } + + public static void main(String argv[]) { + + // Draw some simple shapes + System.out.println( "Drawing some basic shapes" ); + + SWIGTYPE_p_ColorMap cmap = simple.new_ColorMap(null); + SWIGTYPE_p_FrameBuffer f = simple.new_FrameBuffer(400,400); + + // Clear the picture + simple.FrameBuffer_clear(f,(short)simple.BLACK); + + // Make a red box + simple.FrameBuffer_box(f,40,40,200,200,(short)simple.RED); + + // Make a blue circle + simple.FrameBuffer_circle(f,200,200,40,(short)simple.BLUE); + + // Make green line + simple.FrameBuffer_line(f,10,390,390,200, (short)simple.GREEN); + + // Write an image out to disk + + simple.FrameBuffer_writeGIF(f,cmap,"image.gif"); + System.out.println( "Wrote image.gif" ); + + simple.delete_FrameBuffer(f); + simple.delete_ColorMap(cmap); + } +} diff --git a/Examples/GIFPlot/Java/simple/simple.i b/Examples/GIFPlot/Java/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Java/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/GIFPlot/Lib/Makefile.in b/Examples/GIFPlot/Lib/Makefile.in new file mode 100644 index 000000000..9db828eb2 --- /dev/null +++ b/Examples/GIFPlot/Lib/Makefile.in @@ -0,0 +1,22 @@ +CC = @CC@ +CCSHARED= @CCSHARED@ +INCLUDES= -I../Include +CFLAGS = -O +SRCS = frame.c color.c plot2d.c plot3d.c font.c pixmap.c matrix.c gif.c +OBJS = $(SRCS:.c=.@OBJEXT@) +AR = @AR@ +RANLIB = @RANLIB@ +TARGET = ../libgifplot.a + +.c.@OBJEXT@: + $(CC) $(CCSHARED) $(INCLUDES) $(CFLAGS) -c -o $*.@OBJEXT@ $< + +all: $(OBJS) + @rm -f ../libgifplot.a + $(AR) cr $(TARGET) $(OBJS) + $(RANLIB) $(TARGET) + +clean: + rm -f *.@OBJEXT@ *~ $(TARGET) + +check: all diff --git a/Examples/GIFPlot/Lib/color.c b/Examples/GIFPlot/Lib/color.c new file mode 100644 index 000000000..7d79baca9 --- /dev/null +++ b/Examples/GIFPlot/Lib/color.c @@ -0,0 +1,143 @@ +/* ----------------------------------------------------------------------------- + * color.c + * + * Colormaps + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define COLORMAP +#include "gifplot.h" +#include + +/* ------------------------------------------------------------------------ + ColorMap *new_ColorMap(char *filename) + + Read a colormap from a file. + ------------------------------------------------------------------------ */ + +ColorMap *new_ColorMap(char *filename) { + ColorMap *c; + FILE *cm; + void ColorMap_default(ColorMap *); + + if (!filename) { + c = (ColorMap *) malloc(sizeof(ColorMap)); + c->cmap = (unsigned char *) malloc(768*sizeof(char)); + c->name = 0; + ColorMap_default(c); + return c; + } + if (strlen(filename) == 0) { + c = (ColorMap *) malloc(sizeof(ColorMap)); + c->cmap = (unsigned char *) malloc(768*sizeof(char)); + ColorMap_default(c); + return c; + } + if ((cm = fopen(filename,"rb")) == NULL) { + return (ColorMap *) 0; + } + c = (ColorMap *) malloc(sizeof(ColorMap)); + c->cmap = (unsigned char *) malloc(768*sizeof(char)); + if (fread(c->cmap, 768, 1, cm) != 1) { + free((char *)c->cmap); + free((char *)c); + fclose(cm); + return (ColorMap *) 0; + } + fclose(cm); + c->name = (char *) malloc(strlen(filename)+1); + strcpy(c->name, filename); + ColorMap_default(c); + return c; +} + +/* -------------------------------------------------------------------------- + delete_ColorMap(ColorMap *cm) + + Destroy a ColorMap + -------------------------------------------------------------------------- */ + +void delete_ColorMap(ColorMap *cm) { + if (cm) { + free((char *)cm->cmap); + if (cm->name) + free((char *)cm->name); + free((char *)cm); + } +} + +/* -------------------------------------------------------------------------- + ColorMap_default(ColorMap *cm) + + This function fills in default values for the first 8 entries of the + colormap. These are *fixed* values---used internally. + -------------------------------------------------------------------------- */ + +void ColorMap_default(ColorMap *cm) { + unsigned char *r,*g,*b; + if (cm) { + r = cm->cmap; + g = cm->cmap+256; + b = cm->cmap+512; + + r[0] = 0; g[0] = 0; b[0] = 0; /* BLACK */ + r[1] = 255; g[1] = 255; b[1] = 255; /* WHITE */ + r[2] = 255; g[2] = 0; b[2] = 0; /* RED */ + r[3] = 0; g[3] = 255; b[3] = 0; /* GREEN */ + r[4] = 0; g[4] = 0; b[4] = 255; /* BLUE */ + r[5] = 255; g[5] = 255; b[5] = 0; /* YELLOW */ + r[6] = 0; g[6] = 255; b[6] = 255; /* CYAN */ + r[7] = 255; g[7] = 0; b[7] = 255; /* MAGENTA */ + } +} + +void ColorMap_assign(ColorMap *cm, int index, int r, int g, int b) { + unsigned char *rb,*gb,*bb; + + rb = cm->cmap; + gb = cm->cmap+256; + bb = cm->cmap+512; + + rb[index] = r; + gb[index] = g; + bb[index] = b; +} + +int ColorMap_getitem(ColorMap *cm, int index) { + if ((index < 0) && (index >= 768)) return -1; + return cm->cmap[index]; +} + +void ColorMap_setitem(ColorMap *cm, int index, int value) { + if ((index < 0) && (index >= 768)) return; + cm->cmap[index]=value; +} + +/* -------------------------------------------------------------------- + ColorMap_write(ColorMap *cm, char *filename) + + Write out a colormap to disk. + -------------------------------------------------------------------- */ + +int ColorMap_write(ColorMap *cm, char *filename) { + + FILE *f; + if (!cm) return -1; + if (!filename) return -1; + if (strlen(filename) == 0) return -1; + + f = fopen(filename,"w"); + + if (fwrite(cm->cmap,768,1,f) != 1) { + fclose(f); + return -1; + } + fclose(f); + return 0; +} + +#undef COLORMAP diff --git a/Examples/GIFPlot/Lib/font.c b/Examples/GIFPlot/Lib/font.c new file mode 100644 index 000000000..b30ee9b14 --- /dev/null +++ b/Examples/GIFPlot/Lib/font.c @@ -0,0 +1,705 @@ +/* ----------------------------------------------------------------------------- + * font.c + * + * Some basic fonts. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define FONT +#include "gifplot.h" + +static char Char_A[80] = "\ +...x....\ +...x....\ +..x.x...\ +..x.x...\ +.x...x..\ +.xxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +........"; + +static char Char_B[80] = "\ +xxxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +xxxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +xxxxxx..\ +........"; + +static char Char_C[80] = "\ +..xxxx..\ +.x....x.\ +x.......\ +x.......\ +x.......\ +x.......\ +x.......\ +.x....x.\ +..xxxx..\ +........"; + +static char Char_D[80] = "\ +xxxxx...\ +x....x..\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x....x..\ +xxxxx...\ +........"; +static char Char_E[80] = "\ +xxxxxxx.\ +x.......\ +x.......\ +x.......\ +xxxxx...\ +x.......\ +x.......\ +x.......\ +xxxxxxx.\ +........"; +static char Char_F[80] = "\ +xxxxxxx.\ +x.......\ +x.......\ +x.......\ +xxxxx...\ +x.......\ +x.......\ +x.......\ +x.......\ +........"; +static char Char_G[80] = "\ +.xxxxx..\ +x.....x.\ +x.......\ +x.......\ +x...xxx.\ +x.....x.\ +x.....x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_H[80] = "\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +xxxxxxx.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +........"; +static char Char_I[80] = "\ +xxxxxxx.\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +xxxxxxx.\ +........"; +static char Char_J[80] = "\ +......x.\ +......x.\ +......x.\ +......x.\ +......x.\ +......x.\ +x.....x.\ +.x...x..\ +..xxx...\ +........"; +static char Char_K[80] = "\ +x.....x.\ +x....x..\ +x...x...\ +x..x....\ +xxx.....\ +x..x....\ +x...x...\ +x....x..\ +x.....x.\ +........"; +static char Char_L[80] = "\ +x.......\ +x.......\ +x.......\ +x.......\ +x.......\ +x.......\ +x.......\ +x.......\ +xxxxxxx.\ +........"; +static char Char_M[80] = "\ +x.....x.\ +xx...xx.\ +xx...xx.\ +x.x.x.x.\ +x.x.x.x.\ +x..x..x.\ +x..x..x.\ +x.....x.\ +x.....x.\ +........"; +static char Char_N[80] = "\ +x.....x.\ +xx....x.\ +x.x...x.\ +x.x...x.\ +x..x..x.\ +x...x.x.\ +x...x.x.\ +x....xx.\ +x.....x.\ +........"; +static char Char_O[80] = "\ +.xxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_P[80] = "\ +xxxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +xxxxxx..\ +x.......\ +x.......\ +x.......\ +x.......\ +........"; +static char Char_Q[80] = "\ +.xxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x...x.x.\ +x....x..\ +.xxxx.x.\ +........"; +static char Char_R[80] = "\ +xxxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +xxxxxx..\ +x..x....\ +x...x...\ +x....x..\ +x.....x.\ +........"; +static char Char_S[80] = "\ +.xxxxx..\ +x.....x.\ +x.......\ +x.......\ +.xxxxx..\ +......x.\ +......x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_T[80] = "\ +xxxxxxx.\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +........"; +static char Char_U[80] = "\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_V[80] = "\ +x.....x.\ +x.....x.\ +.x...x..\ +.x...x..\ +..x.x...\ +..x.x...\ +...x....\ +...x....\ +...x....\ +........"; +static char Char_W[80] = "\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x.....x.\ +x..x..x.\ +x..x..x.\ +x.x.x.x.\ +.x...x..\ +........"; +static char Char_X[80] = "\ +x.....x.\ +x.....x.\ +.x...x..\ +..x.x...\ +...x....\ +..x.x...\ +.x...x..\ +x.....x.\ +x.....x.\ +........"; +static char Char_Y[80] = "\ +x.....x.\ +x.....x.\ +.x...x..\ +..x.x...\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +........"; +static char Char_Z[80] = "\ +xxxxxxx.\ +......x.\ +.....x..\ +....x...\ +...x....\ +..x.....\ +.x......\ +x.......\ +xxxxxxx.\ +........"; +static char Char_0[80] = "\ +.xxxxx..\ +x....xx.\ +x...x.x.\ +x..x..x.\ +x..x..x.\ +x.x...x.\ +x.x...x.\ +xx....x.\ +.xxxxx..\ +........"; +static char Char_1[80] = "\ +...x....\ +..xx....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +...x....\ +..xxx...\ +........"; +static char Char_2[80] = "\ +..xxxx..\ +.x....x.\ +x.....x.\ +.....x..\ +....x...\ +...x....\ +..x.....\ +.x......\ +xxxxxxx.\ +........"; +static char Char_3[80] = "\ +.xxxxx..\ +x.....x.\ +......x.\ +......x.\ +...xxx..\ +......x.\ +......x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_4[80] = "\ +....xx..\ +...x.x..\ +..x..x..\ +.x...x..\ +xxxxxxx.\ +.....x..\ +.....x..\ +.....x..\ +.....x..\ +........"; +static char Char_5[80] = "\ +xxxxxxx.\ +x.......\ +x.......\ +x.......\ +xxxxxx..\ +......x.\ +......x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_6[80] = "\ +....xxx.\ +..xx....\ +.x......\ +x.......\ +x.xxx...\ +xx...x..\ +x.....x.\ +.x...x..\ +..xxx...\ +........"; +static char Char_7[80] = "\ +xxxxxxx.\ +x.....x.\ +.....x..\ +....x...\ +...x....\ +..x.....\ +.x......\ +x.......\ +x.......\ +........"; +static char Char_8[80] = "\ +.xxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +.xxxxx..\ +x.....x.\ +x.....x.\ +x.....x.\ +.xxxxx..\ +........"; +static char Char_9[80] = "\ +..xxxx..\ +.x....x.\ +x.....x.\ +x....xx.\ +.xxxx.x.\ +......x.\ +......x.\ +....xx..\ +.xxx....\ +........"; +static char Char_MINUS[80] = "\ +........\ +........\ +........\ +........\ +.xxxxxx.\ +........\ +........\ +........\ +........\ +........"; +static char Char_PLUS[80] = "\ +........\ +........\ +...x....\ +...x....\ +.xxxxx..\ +...x....\ +...x....\ +........\ +........\ +........"; +static char Char_EQUAL[80] = "\ +........\ +........\ +........\ +.xxxxx..\ +........\ +.xxxxx..\ +........\ +........\ +........\ +........"; +static char Char_LPAREN[80] = "\ +....x...\ +...x....\ +..x.....\ +.x......\ +.x......\ +.x......\ +..x.....\ +...x....\ +....x...\ +........"; +static char Char_RPAREN[80] = "\ +...x....\ +....x...\ +.....x..\ +......x.\ +......x.\ +......x.\ +.....x..\ +....x...\ +...x....\ +........"; +static char Char_QUOTE[80] = "\ +..x.x...\ +..x.x...\ +........\ +........\ +........\ +........\ +........\ +........\ +........\ +........"; +static char Char_COLON[80] = "\ +........\ +........\ +...xx...\ +...xx...\ +........\ +...xx...\ +...xx...\ +........\ +........\ +........"; +static char Char_PERIOD[80] = "\ +........\ +........\ +........\ +........\ +........\ +........\ +........\ +...xx...\ +...xx...\ +........"; +static char Char_COMMA[80] = "\ +........\ +........\ +........\ +........\ +........\ +........\ +...xx...\ +...xx...\ +....x...\ +...x...."; + +static char Char_SLASH[80] = "\ +........\ +......x.\ +.....x..\ +....x...\ +...x....\ +..x.....\ +.x......\ +x.......\ +........\ +........"; + +static char Char_SPACE[80] = "\ +........\ +........\ +........\ +........\ +........\ +........\ +........\ +........\ +........\ +........"; + +static char *GP_Font[128]; +static int InitGP_Font = 0; + +static void initGP_Fonts(void) { + + int i; + for (i = 0; i < 128; i++) + GP_Font[i] = (char *) 0; + + GP_Font['A'] = GP_Font['a'] = Char_A; + GP_Font['B'] = GP_Font['b'] = Char_B; + GP_Font['C'] = GP_Font['c'] = Char_C; + GP_Font['D'] = GP_Font['d'] = Char_D; + GP_Font['E'] = GP_Font['e'] = Char_E; + GP_Font['F'] = GP_Font['f'] = Char_F; + GP_Font['G'] = GP_Font['g'] = Char_G; + GP_Font['H'] = GP_Font['h'] = Char_H; + GP_Font['I'] = GP_Font['i'] = Char_I; + GP_Font['J'] = GP_Font['j'] = Char_J; + GP_Font['K'] = GP_Font['k'] = Char_K; + GP_Font['L'] = GP_Font['l'] = Char_L; + GP_Font['M'] = GP_Font['m'] = Char_M; + GP_Font['N'] = GP_Font['n'] = Char_N; + GP_Font['O'] = GP_Font['o'] = Char_O; + GP_Font['P'] = GP_Font['p'] = Char_P; + GP_Font['Q'] = GP_Font['q'] = Char_Q; + GP_Font['R'] = GP_Font['r'] = Char_R; + GP_Font['S'] = GP_Font['s'] = Char_S; + GP_Font['T'] = GP_Font['t'] = Char_T; + GP_Font['U'] = GP_Font['u'] = Char_U; + GP_Font['V'] = GP_Font['v'] = Char_V; + GP_Font['W'] = GP_Font['w'] = Char_W; + GP_Font['X'] = GP_Font['x'] = Char_X; + GP_Font['Y'] = GP_Font['y'] = Char_Y; + GP_Font['Z'] = GP_Font['z'] = Char_Z; + GP_Font['0'] = Char_0; + GP_Font['1'] = Char_1; + GP_Font['2'] = Char_2; + GP_Font['3'] = Char_3; + GP_Font['4'] = Char_4; + GP_Font['5'] = Char_5; + GP_Font['6'] = Char_6; + GP_Font['7'] = Char_7; + GP_Font['8'] = Char_8; + GP_Font['9'] = Char_9; + GP_Font['.'] = Char_PERIOD; + GP_Font[','] = Char_COMMA; + GP_Font['='] = Char_EQUAL; + GP_Font['-'] = Char_MINUS; + GP_Font['+'] = Char_PLUS; + GP_Font['\"'] = Char_QUOTE; + GP_Font['('] = Char_LPAREN; + GP_Font[')'] = Char_RPAREN; + GP_Font[':'] = Char_COLON; + GP_Font['/'] = Char_SLASH; + GP_Font[' '] = Char_SPACE; + InitGP_Font = 1; +} + +/* ----------------------------------------------------------------------- + void FrameBuffer_drawchar(FrameBuffer *f, int x, int y, Pixel fgcolor, Pixel bgcolor, char chr, int orientation) + + Draws a character at location x, y with given color and orientation parameters. + Orientation can either be HORIZONTAL or VERTICAL + ----------------------------------------------------------------------- */ +void FrameBuffer_drawchar(FrameBuffer *f, int x, int y, int fgcolor, + int bgcolor, char chr, int orientation) { + + Pixel c, bc,*p,*p1; + char *ch; + int i,j; + int xpixels,ypixels; + + if (!InitGP_Font) initGP_Fonts(); + + c = (Pixel) fgcolor; + bc = (Pixel) bgcolor; + xpixels = f->width; + ypixels = f->height; + + if (orientation == HORIZONTAL) { + if ((x < f->xmin) || (x > f->xmax-8) || + (y < f->ymin) || (y > f->ymax-10)) return; + + ch = GP_Font[(int) chr]; + if (!ch) return; + p = &f->pixels[y+9][x]; + for (i = 0; i < 10; i++) { + p1 = p; + for (j = 0; j< 8; j++) { + if (*(ch++) == 'x') *p= c; + else if (bgcolor >= 0) + *p = bc; + p++; + } + p = (p1 - xpixels); + } + } else { + if ((x < f->xmin+10) || (x >= f->xmax) || + (y < f->ymin) || (y > f->ymax-8)) return; + + ch = GP_Font[(int) chr]; + if (!ch) return; + p = &f->pixels[y][x-9]; + for (i = 0; i < 10; i++) { + p1 = p; + for (j = 0; j< 8; j++) { + if (*(ch++) == 'x') *p= c; + else if (bgcolor >= 0) + *p = bc; + p+=xpixels; + } + p = p1 + 1; + } + } +} + +/* ---------------------------------------------------------------------- + void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, + int bgcolor, char *text, int orientation) + + Draws an ASCII string on the framebuffer. Can be oriented either horizontally + or vertically. + ---------------------------------------------------------------------- */ + +void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, int bgcolor, char *text, int orientation) { + + char *c; + int x1, y1; + int xpixels, ypixels; + + x1 = x; + y1 = y; + xpixels = f->width; + ypixels = f->height; + c = text; + while (*c) { + if (*c == '\n') { + if (orientation == HORIZONTAL) { + x1 = x; y1= y1- 10*xpixels; + } else { + y1 = y; x1= x1 + 10*ypixels; + } + } else { + FrameBuffer_drawchar(f, x1,y1,fgcolor, bgcolor,*c, orientation); + if (orientation == HORIZONTAL) { + x1+=8; + if (x1 >= (xpixels-8)) { + x1 = x; y1= y1- 10;} + if (y1 < 0) return; + } else { + y1 += 8; + if (y1 >= (ypixels-8)) { + y1 = y; x1 = x1 + 10;} + if (x1 > (xpixels-10)) return; + } + } + c++; + } +} + + + + + + + + diff --git a/Examples/GIFPlot/Lib/frame.c b/Examples/GIFPlot/Lib/frame.c new file mode 100644 index 000000000..e006f0daf --- /dev/null +++ b/Examples/GIFPlot/Lib/frame.c @@ -0,0 +1,924 @@ +/* ----------------------------------------------------------------------------- + * frame.c + * + * Frame buffer management + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define FRAME +#include "gifplot.h" +#include + +/* ------------------------------------------------------------------------ + FrameBuffer *new_FrameBuffer(int width, int height) + + Creates a new framebuffer for storing data. + ------------------------------------------------------------------------ */ + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height) { + + FrameBuffer *f; + int FrameBuffer_resize(FrameBuffer *f, int width, int height); + + /* Create a new frame buffer */ + + f = (FrameBuffer *) malloc(sizeof(FrameBuffer)); + f->pixels = (Pixel **) 0; + f->zbuffer = (Zvalue **) 0; + /* Set its size */ + + if (FrameBuffer_resize(f, width, height) == -1) { + free((char *) f); + return (FrameBuffer *) 0; + } + + f->xmin = 0; + f->ymin = 0; + f->xmax = width; + f->ymax = height; + return f; +} + +/* ------------------------------------------------------------------------ + void delete_FrameBuffer(FrameBuffer *f) + + Destroys the given framebuffer + ------------------------------------------------------------------------ */ + +void delete_FrameBuffer(FrameBuffer *f) { + + if (f) { + if (f->pixels) { + free((char *) f->pixels[0]); + free((char *) f->pixels); + } + if (f->zbuffer) { + free((char *) f->zbuffer[0]); + free((char *) f->zbuffer); + } + free((char *)f); + } +} + +/* ------------------------------------------------------------------------ + int *FrameBuffer_resize(FrameBuffer *f, int width, int height) + + Resize the given framebuffer. Returns 0 on success, -1 on failure. + ------------------------------------------------------------------------ */ + +int FrameBuffer_resize(FrameBuffer *f, int width, int height) { + int i; + if ((f) && (width > 0) && (height > 0)) { + if (f->pixels) { + free((char *)f->pixels[0]); + free((char *)f->pixels); + } + f->pixels = (Pixel **) malloc (height*sizeof(Pixel *)); + if (!f->pixels) return -1; + f->pixels[0] = (Pixel *) malloc(height*width*sizeof(Pixel)); + if (!f->pixels[0]) { + free((char *)f->pixels); + return -1; + } + for (i = 0; i < height; i++) + f->pixels[i] = f->pixels[0] + i*width; + f->width = width; + f->height = height; + if (f->zbuffer) { + FrameBuffer_zresize(f,width,height); + } + return 0; + } else { + return -1; + } +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_clear(FrameBuffer *f, Pixel color) + + Clears the current FrameBuffer + ------------------------------------------------------------------------ */ + +void FrameBuffer_clear(FrameBuffer *f, Pixel color) { + Pixel *p; + unsigned int i; + p = &f->pixels[0][0]; + + for (i = 0; i < f->width*f->height; i++, p++) + *p = color; +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_plot(FrameBuffer *f, int x1, int y1, Pixel color) + + Plots a point and does a bounds check. + ------------------------------------------------------------------------ */ + +void FrameBuffer_plot(FrameBuffer *f, int x1, int y1, Pixel color) { + + if ((x1 < f->xmin) || (x1 >= f->xmax) || (y1 < f->ymin) || (y1 >= f->ymax)) + return; + f->pixels[y1][x1] = color; + +} + +/* ------------------------------------------------------------------------ + FrameBuffer_horizontal(Framebuffer *f, int xmin, int xmax, int y, Pixel color) + + Draw a horizontal line (clipped) + ------------------------------------------------------------------------ */ + +void FrameBuffer_horizontal(FrameBuffer *f, int xmin, int xmax, int y, Pixel color) { + + Pixel *p; + int i; + + if ((y < f->ymin) || (y >= f->ymax)) return; + if (xmin < f->xmin) xmin = f->xmin; + if (xmax >= f->xmax) xmax = f->xmax - 1; + + p = &f->pixels[y][xmin]; + for (i = xmin; i <= xmax; i++, p++) + *p = color; + +} + +/* ------------------------------------------------------------------------ + FrameBuffer_horizontalinterp(Framebuffer *f, int xmin, int xmax, int y, + Pixel c1, Pixel c2) + + Draw a horizontal line (clipped) with color interpolation. + ------------------------------------------------------------------------ */ + +void FrameBuffer_horizontalinterp(FrameBuffer *f, int xmin, int xmax, int y, + Pixel c1, Pixel c2) { + + Pixel *p; + int i; + double mc; + int x1; + if ((y < f->ymin) || (y >= f->ymax)) return; + + x1 = xmin; + if (xmin < f->xmin) xmin = f->xmin; + if (xmax >= f->xmax) xmax = f->xmax - 1; + if (xmax < f->xmin) return; + if (xmin >= f->xmax) return; + + if (xmin != xmax) + mc = (double)(c2 - c1)/(double) (xmax - xmin); + else + mc = 0.0; + + p = &f->pixels[y][xmin]; + for (i = xmin; i <= xmax; i++, p++) + *p = (Pixel) (mc*(i-x1) + c1); + +} + + +/* ------------------------------------------------------------------------ + FrameBuffer_vertical(Framebuffer *f, int xmin, int xmax, int y, Pixel color) + + Draw a Vertical line (clipped) + ------------------------------------------------------------------------ */ + +void FrameBuffer_vertical(FrameBuffer *f, int ymin, int ymax, int x, Pixel color) { + + Pixel *p; + int i; + + if ((x < f->xmin) || (x >= f->xmax)) return; + if (ymax < f->ymin) return; + if (ymin > f->ymax) return; + if (ymin < f->ymin) ymin = f->ymin; + if (ymax >= f->ymax) ymax = f->ymax - 1; + + p = &f->pixels[ymin][x]; + for (i = 0; i <= (ymax - ymin); i++, p+=f->width) + *p = color; + +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_box(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) + + Makes an outline box. + ------------------------------------------------------------------------ */ + +void FrameBuffer_box(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) { + + int xt, yt; + + /* Make sure points are in correct order */ + + if (x2 < x1) { + xt = x2; + x2 = x1; + x1 = xt; + } + if (y2 < y1) { + yt = y2; + y2 = y1; + y1 = yt; + } + + /* Draw lower edge */ + + FrameBuffer_horizontal(f,x1,x2,y1,color); + + /* Draw upper edge */ + + FrameBuffer_horizontal(f,x1,x2,y2,color); + + /* Draw left side */ + + FrameBuffer_vertical(f,y1,y2,x1,color); + + /* Draw right side */ + + FrameBuffer_vertical(f,y1,y2,x2,color); + +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_solidbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) + + Makes an solid box. + ------------------------------------------------------------------------ */ + +void FrameBuffer_solidbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel color) { + + int xt, yt; + + /* Make sure points are in correct order */ + + if (x2 < x1) { + xt = x2; + x2 = x1; + x1 = xt; + } + if (y2 < y1) { + yt = y2; + y2 = y1; + y1 = yt; + } + + /* Now perform some clipping */ + + if (y1 < f->ymin) y1 = f->ymin; + if (y2 >= f->ymax) y2 = f->ymax - 1; + + /* Fill it in using horizontal lines */ + + for (yt = y1; yt <= y2; yt++) + FrameBuffer_horizontal(f,x1,x2,yt,color); + +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2 + Pixel c1, Pixel c2, Pixel c3, Pixel c4) + + Makes a box with interpolated color. Colors are assigned as follows : + (x1,y1) = c1 + (x1,y2) = c2 + (x2,y1) = c3 + (x2,y2) = c4 + ------------------------------------------------------------------------ */ + +void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2, + Pixel c1, Pixel c2, Pixel c3, Pixel c4) { + + int xt, yt; + Pixel ct; + double mc1,mc2; + int ystart; + /* Make sure points are in correct order */ + + if (x2 < x1) { + xt = x2; + x2 = x1; + x1 = xt; + ct = c1; + c1 = c3; + c3 = ct; + ct = c2; + c2 = c4; + c4 = ct; + } + if (y2 < y1) { + yt = y2; + y2 = y1; + y1 = yt; + ct = c1; + c1 = c2; + c2 = ct; + ct = c3; + c3 = c4; + c4 = ct; + } + + /* Now perform some clipping */ + + ystart = y1; + mc1 = (double) (c2 - c1)/(double) (y2 - y1); + mc2 = (double) (c4 - c3)/(double) (y2 - y1); + if (y1 < f->ymin) y1 = f->ymin; + if (y2 >= f->ymax) y2 = f->ymax - 1; + + /* Fill it in using horizontal lines */ + + for (yt = y1; yt <= y2; yt++) + FrameBuffer_horizontalinterp(f,x1,x2,yt,(Pixel) ((mc1*(yt - ystart)) + c1), + (Pixel) ((mc2*(yt-ystart))+c3)); + +} + +/* --------------------------------------------------------------------------- + FrameBuffer_line(FrameBuffer *f, int x1, int y1, int x2, int y2, color) + + Draws a line on the framebuffer using the Bresenham line algorithm. The + line is clipped to fit within the current view window. + ---------------------------------------------------------------------------- */ + +void FrameBuffer_line(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel c) { + + int dx,dy,dxneg,dyneg, inc1,inc2,di; + int x, y, xpixels, ypixels, xt, yt; + Pixel *p; + double m; + int end1 = 0, end2 = 0; + + /* Need to figure out where in the heck this line is */ + + dx = x2 - x1; + dy = y2 - y1; + + if (dx == 0) { + /* Draw a Vertical Line */ + if (y1 < y2) + FrameBuffer_vertical(f,y1,y2,x1,c); + else + FrameBuffer_vertical(f,y2,y1,x1,c); + return; + } + if (dy == 0) { + /* Draw a Horizontal Line */ + if (x1 < x2) + FrameBuffer_horizontal(f,x1,x2,y1,c); + else + FrameBuffer_horizontal(f,x2,x1,y1,c); + return; + } + + /* Figure out where in the heck these lines are using the + Cohen-Sutherland Line Clipping Scheme. */ + + end1 = ((x1 - f->xmin) < 0) | + (((f->xmax- 1 - x1) < 0) << 1) | + (((y1 - f->ymin) < 0) << 2) | + (((f->ymax-1 - y1) < 0) << 3); + + end2 = ((x2 - f->xmin) < 0) | + (((f->xmax-1 - x2) < 0) << 1) | + (((y2 - f->ymin) < 0) << 2) | + (((f->ymax-1 - y2) < 0) << 3); + + if (end1 & end2) return; /* Nope : Not visible */ + + /* Make sure points have a favorable orientation */ + + if (x1 > x2) { + xt = x1; + x1 = x2; + x2 = xt; + yt = y1; + y1 = y2; + y2 = yt; + } + + /* Clip against the boundaries */ + m = (y2 - y1)/(double) (x2-x1); + if (x1 < f->xmin) { + y1 = (int) ((f->xmin - x1)*m + y1); + x1 = (int) f->xmin; + } + if (x2 >= f->xmax) { + y2 = (int) ((f->xmax -1 -x1)*m + y1); + x2 = (int) (f->xmax - 1); + } + + if (y1 > y2) { + xt = x1; + x1 = x2; + x2 = xt; + yt = y1; + y1 = y2; + y2 = yt; + } + + m = 1/m; + if (y1 < f->ymin) { + x1 = (int) ((f->ymin - y1)*m + x1); + y1 = (int) f->ymin; + } + if (y2 >= f->ymax) { + x2 = (int) ((f->ymax-1-y1)*m + x1); + y2 = (int) (f->ymax-1); + } + + if ((x1 < f->xmin) || (x1 >= f->xmax) || (y1 < f->ymin) || (y1 >= f->ymax) || + (x2 < f->xmin) || (x2 >= f->xmax) || (y2 < f->ymin) || (y2 >= f->ymax)) return; + + dx = x2 - x1; + dy = y2 - y1; + xpixels = f->width; + ypixels = f->height; + + dxneg = (dx < 0) ? 1 : 0; + dyneg = (dy < 0) ? 1 : 0; + + dx = abs(dx); + dy = abs(dy); + if (dx >= dy) { + /* Slope between -1 and 1. */ + if (dxneg) { + x = x1; + y = y1; + x1 = x2; + y1 = y2; + x2 = x; + y2 = y; + dyneg = !dyneg; + } + inc1 = 2*dy; + inc2 = 2*(dy-dx); + di = 2*dy-dx; + + /* Draw a line using x as independent variable */ + + p = &f->pixels[y1][x1]; + x = x1; + while (x <= x2) { + *(p++) = c; + if (di < 0) { + di = di + inc1; + } else { + if (dyneg) { + p = p - xpixels; + di = di + inc2; + } else { + p = p + xpixels; + di = di + inc2; + } + } + x++; + } + } else { + /* Slope < -1 or > 1 */ + if (dyneg) { + x = x1; + y = y1; + x1 = x2; + y1 = y2; + x2 = x; + y2 = y; + dxneg = !dxneg; + } + inc1 = 2*dx; + inc2 = 2*(dx-dy); + di = 2*dx-dy; + + /* Draw a line using y as independent variable */ + + p = &f->pixels[y1][x1]; + y = y1; + while (y <= y2) { + *p = c; + p = p + xpixels; + if (di < 0) { + di = di + inc1; + } else { + if (dxneg) { + p = p - 1; + di = di + inc2; + } else { + p = p + 1; + di = di + inc2; + } + } + y++; + } + } +} + + +/* ------------------------------------------------------------------------- + FrameBuffer_circle(FrameBuffer f, int xc, int yc, int radius, Pixel c) + + Create an outline circle + ------------------------------------------------------------------------- */ + +#define plot_circle(x,y,c) \ + if ((x >= xmin) && (x < xmax) && \ + (y >= ymin) && (y < ymax)) \ + pixels[y][x] = c; + +void FrameBuffer_circle(FrameBuffer *f, int xc, int yc, int radius, Pixel c) { + + int xpixels, ypixels, x, y, p; + int xmin, ymin, xmax, ymax; + Pixel **pixels; + + if (radius <= 0) return; + xpixels = f->width; + ypixels = f->height; + pixels = f->pixels; + xmin = f->xmin; + ymin = f->ymin; + xmax = f->xmax; + ymax = f->ymax; + x = 0; + y = radius; + p = 3-2*radius; + while (x <= y) { + plot_circle(xc+x,yc+y,c); + plot_circle(xc-x,yc+y,c); + plot_circle(xc+x,yc-y,c); + plot_circle(xc-x,yc-y,c); + plot_circle(xc+y,yc+x,c); + plot_circle(xc-y,yc+x,c); + plot_circle(xc+y,yc-x,c); + plot_circle(xc-y,yc-x,c); + if (p < 0) p = p + 4*x + 6; + else { + p = p + 4*(x-y) + 10; + y = y -1; + } + x++; + } +} + + +/* ------------------------------------------------------------------------- + FrameBuffer_solidcircle(FrameBuffer f, int xc, int yc, int radius, Pixel c) + + Create an filled circle + ------------------------------------------------------------------------- */ + + +#define fill_circle(x,y,c) \ + x1 = xc - x; \ + x2 = xc + x; \ + FrameBuffer_horizontal(f,x1,x2,y,c); + +void FrameBuffer_solidcircle(FrameBuffer *f, int xc, int yc, int radius, Pixel c) { + + int xpixels, ypixels, x, y, p; + int x1,x2; + int xmin, ymin, xmax, ymax; + Pixel **pixels; + + if (radius <= 0) return; + xpixels = f->width; + ypixels = f->height; + pixels = f->pixels; + xmin = f->xmin; + ymin = f->ymin; + xmax = f->xmax; + ymax = f->ymax; + x = 0; + y = radius; + p = 3-2*radius; + while (x <= y) { + fill_circle(x,yc+y,c); + fill_circle(x,yc-y,c); + fill_circle(y,yc+x,c); + fill_circle(y,yc-x,c); + if (p < 0) p = p + 4*x + 6; + else { + p = p + 4*(x-y) + 10; + y = y -1; + } + x++; + } +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_setclip(f,xmin,ymin,xmax,ymax) + + Set clipping region for plotting + ------------------------------------------------------------------------ */ + +void FrameBuffer_setclip(FrameBuffer *f, int xmin, int ymin, int xmax, int ymax) { + + if (xmin >= xmax) return; + if (ymin >= ymax) return; + + if (xmin < 0) xmin = 0; + if (ymin < 0) ymin = 0; + if (xmax > (int) f->width) xmax = f->width; + if (ymax > (int) f->height) ymax = f->height; + + f->xmin = xmin; + f->ymin = ymin; + f->xmax = xmax; + f->ymax = ymax; +} + +/* ------------------------------------------------------------------------ + void FrameBuffer_noclip(f) + + Disable clipping region + ------------------------------------------------------------------------ */ + +void FrameBuffer_noclip(FrameBuffer *f) { + f->xmin = 0; + f->ymin = 0; + f->xmax = f->width; + f->ymax = f->height; +} + + +/* ------------------------------------------------------------------------ + FrameBuffer_zresize(FrameBuffer *f, int width, int height) + + This function resizes the framebuffer's zbuffer. If none exist, it + creates a new one. + ------------------------------------------------------------------------ */ + +void FrameBuffer_zresize(FrameBuffer *f, int width, int height) { + int i; + + if (f->zbuffer) { + free((char *)f->zbuffer[0]); + free((char *)f->zbuffer); + } + f->zbuffer = (Zvalue **) malloc(height*sizeof(Zvalue *)); + f->zbuffer[0] = (Zvalue *) malloc(height*width*sizeof(Zvalue)); + for (i = 0; i < height; i++) + f->zbuffer[i] = f->zbuffer[0]+i*width; +} + +/* ------------------------------------------------------------------------ + FrameBuffer_zclear(FrameBuffer *f) + + Clears the z-buffer for a particular frame. Sets all of the z-values to + ZMIN. + ------------------------------------------------------------------------- */ + +void FrameBuffer_zclear(FrameBuffer *f) { + unsigned int i,j; + if (f) { + if (f->zbuffer) { + for (i = 0; i < f->width; i++) + for (j = 0; j < f->height; j++) + f->zbuffer[j][i] = ZMIN; + } + } +} + + + +/* ------------------------------------------------------------------------- + FrameBuffer_solidtriangle(FrameBuffer *f, int tx1, int ty2, + int tx2, int ty2, + int tx3, int ty3, Pixel color) + + This function draws a 2D filled triangle. + + General idea : + 1. Transform the three points into screen coordinates + 2. Order three points vertically on screen. + 3. Check for degenerate cases (where 3 points are colinear). + 4. Fill in the resulting triangle using horizontal lines. + -------------------------------------------------------------------------- */ + +void FrameBuffer_solidtriangle(FrameBuffer *f, int tx1, int ty1, + int tx2, int ty2, + int tx3, int ty3, Pixel color) { + int tempx, tempy; + double m1,m2,m3; + int y; + int ix1, ix2; + + /* Figure out which point has the greatest "y" value */ + + if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ + tempx = tx1; + tempy = ty1; + tx1 = tx2; + ty1 = ty2; + tx2 = tempx; + ty2 = tempy; + } + if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ + tempx = tx1; + tempy = ty1; + tx1 = tx3; + ty1 = ty3; + tx3 = tempx; + ty3 = tempy; + } + if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ + tempx = tx2; + tempy = ty2; + tx2 = tx3; + ty2 = ty3; + tx3 = tempx; + ty3 = tempy; + } + + /* Points are now order so that t_1 is the highest point, t_2 is the + middle point, and t_3 is the lowest point */ + + /* Check for degenerate cases here */ + + if ((ty1 == ty2) && (ty2 == ty3)) { + + /* Points are aligned horizontally. Handle as a special case */ + /* Just draw three lines using the outline color */ + + FrameBuffer_line(f,tx1,ty1,tx2,ty2,color); + FrameBuffer_line(f,tx1,ty1,tx3,ty3,color); + FrameBuffer_line(f,tx2,ty2,tx3,ty3,color); + + } else { + + if (ty2 < ty1) { + /* First process line segments between (x1,y1)-(x2,y2) + And between (x1,y1),(x3,y3) */ + + m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + + y = ty1; + while (y >= ty2) { + /* Calculate x values from slope */ + ix1 = (int) (m1*(y-ty1)+0.5) + tx1; + ix2 = (int) (m2*(y-ty1)+0.5) + tx1; + if (ix1 > ix2) + FrameBuffer_horizontal(f,ix2,ix1,y,color); + else + FrameBuffer_horizontal(f,ix1,ix2,y,color); + y--; + } + } + if (ty3 < ty2) { + /* Draw lower half of the triangle */ + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); + y = ty2; + while (y >= ty3) { + ix1 = (int) (m3*(y-ty2)+0.5)+tx2; + ix2 = (int) (m2*(y-ty1)+0.5)+tx1; + if (ix1 > ix2) + FrameBuffer_horizontal(f,ix2,ix1,y,color); + else + FrameBuffer_horizontal(f,ix1,ix2,y,color); + y--; + } + } + } +} + +/* ------------------------------------------------------------------------- + FrameBuffer_interptriangle(FrameBuffer *f, + int tx1, int ty2, Pixel c1, + int tx2, int ty2, Pixel c2, + int tx3, int ty3, Pixel c3) + + This function draws a filled triangle with color + interpolation. + + General idea : + 1. Transform the three points into screen coordinates + 2. Order three points vertically on screen. + 3. Check for degenerate cases (where 3 points are colinear). + 4. Fill in the resulting triangle using horizontal lines. + 5. Colors are interpolated between end points + -------------------------------------------------------------------------- */ + +void FrameBuffer_interptriangle(FrameBuffer *f, + int tx1, int ty1, Pixel c1, + int tx2, int ty2, Pixel c2, + int tx3, int ty3, Pixel c3) { + int tempx, tempy; + double m1,m2,m3; + double mc1,mc2,mc3; + Pixel ic1,ic2,tempc; + int y; + int ix1, ix2; + + /* Figure out which point has the greatest "y" value */ + + if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ + tempx = tx1; + tempy = ty1; + tempc = c1; + tx1 = tx2; + ty1 = ty2; + c1 = c2; + tx2 = tempx; + ty2 = tempy; + c2 = tempc; + } + if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ + tempx = tx1; + tempy = ty1; + tempc = c1; + tx1 = tx3; + ty1 = ty3; + c1 = c3; + tx3 = tempx; + ty3 = tempy; + c3 = tempc; + } + if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ + tempx = tx2; + tempy = ty2; + tempc = c2; + tx2 = tx3; + ty2 = ty3; + c2 = c3; + tx3 = tempx; + ty3 = tempy; + c3 = tempc; + } + + /* Points are now order so that t_1 is the highest point, t_2 is the + middle point, and t_3 is the lowest point */ + + /* Check for degenerate cases here */ + + if ((ty1 == ty2) && (ty2 == ty3)) { + + /* Points are aligned horizontally. Handle as a special case */ + /* Just draw three lines using the outline color */ + + if (tx2 > tx1) + FrameBuffer_horizontalinterp(f,tx1,tx2,ty1,c1,c2); + else + FrameBuffer_horizontalinterp(f,tx2,tx1,ty1,c2,c1); + if (tx3 > tx1) + FrameBuffer_horizontalinterp(f,tx1,tx3,ty1,c1,c3); + else + FrameBuffer_horizontalinterp(f,tx3,tx1,ty1,c3,c1); + if (tx3 > tx2) + FrameBuffer_horizontalinterp(f,tx2,tx3,ty2,c2,c3); + else + FrameBuffer_horizontalinterp(f,tx3,tx2,ty2,c3,c2); + + } else { + + /* First process line segments between (x1,y1)-(x2,y2) + And between (x1,y1),(x3,y3) */ + + if (ty2 < ty1) { + m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + mc1 = (c2 - c1)/(double) (ty2 - ty1); + mc2 = (c3 - c1)/(double) (ty3 - ty1); + + y = ty1; + while (y >= ty2) { + /* Calculate x values from slope */ + ix1 = (int) (m1*(y-ty1)+0.5) + tx1; + ix2 = (int) (m2*(y-ty1)+0.5) + tx1; + ic1 = (int) (mc1*(y-ty1) + c1); + ic2 = (int) (mc2*(y-ty1) + c1); + if (ix1 > ix2) + FrameBuffer_horizontalinterp(f,ix2,ix1,y,ic2,ic1); + else + FrameBuffer_horizontalinterp(f,ix1,ix2,y,ic1,ic2); + y--; + } + } + if (ty3 < ty2) { + /* Draw lower half of the triangle */ + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + mc2 = (c3 - c1)/(double) (ty3 - ty1); + m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); + mc3 = (c3 - c2)/(double) (ty3 - ty2); + y = ty2; + while (y >= ty3) { + ix1 = (int) (m3*(y-ty2)+0.5)+tx2; + ix2 = (int) (m2*(y-ty1)+0.5)+tx1; + ic1 = (int) (mc3*(y-ty2)+c2); + ic2 = (int) (mc2*(y-ty1)+c1); + if (ix1 > ix2) + FrameBuffer_horizontalinterp(f,ix2,ix1,y,ic2,ic1); + else + FrameBuffer_horizontalinterp(f,ix1,ix2,y,ic1,ic2); + y--; + } + } + } +} + + diff --git a/Examples/GIFPlot/Lib/gif.c b/Examples/GIFPlot/Lib/gif.c new file mode 100644 index 000000000..7953e5ce9 --- /dev/null +++ b/Examples/GIFPlot/Lib/gif.c @@ -0,0 +1,672 @@ + +/********************************************************************** + * GIFPlot 0.0 + * + * Dave Beazley + * + * Department of Computer Science Theoretical Division (T-11) + * University of Utah Los Alamos National Laboratory + * Salt Lake City, Utah 84112 Los Alamos, New Mexico 87545 + * beazley@cs.utah.edu beazley@lanl.gov + * + * Copyright (c) 1996 + * The Regents of the University of California and the University of Utah + * All Rights Reserved + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that + * (1) The above copyright notice and the following two paragraphs + * appear in all copies of the source code and (2) redistributions + * including binaries reproduces these notices in the supporting + * documentation. Substantial modifications to this software may be + * copyrighted by their authors and need not follow the licensing terms + * described here, provided that the new terms are clearly indicated in + * all files where they apply. + * + * IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE + * UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY + * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL + * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, + * EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + * THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH + * SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND + * THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, + * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + **************************************************************************/ + +/******************************************************************* + * Creates a GIF format file. + * + * Dave Beazley (T-11) + * August 11, 1995 + * + * Rather than writing directly to files, this module fills out + * output buffer. + * + * Note : To save memory, this routine uses approximately 50K of the + * output buffer as temporary storage (for hash tables and compression codes). + * The remainder of the output buffer is used to store the final image. + * This feature allows GIF images to be created with no additional + * memory overhead. + * + * -- Revision History + * $Log$ + * Revision 1.2 2003/09/01 16:23:31 beazley + * Restored the 'mojo'. + * + * Revision 1.2 1996/09/25 22:39:30 dmb + * Fixed prototypes and use of void pointers for compatibility with the Cray T3D + * + * Revision 1.1 1996/09/10 17:44:00 dmb + * Initial revision + * + * Revision 1.2 1995/08/31 14:46:07 beazley + * Minor changes to support comments and a few bug fixes. + * + * + ******************************************************************/ + + +/* + * xvgifwr.c - handles writing of GIF files. based on flgife.c and + * flgifc.c from the FBM Library, by Michael Maudlin + * + * Contains: + * WriteGIF(fp, pic, ptype, w, h, rmap, gmap, bmap, numcols, colorstyle, + * comment) + * + * Note: slightly brain-damaged, in that it'll only write non-interlaced + * GIF files (in the interests of speed, or something) + * + */ + + + +/***************************************************************** + * Portions of this code Copyright (C) 1989 by Michael Mauldin. + * Permission is granted to use this file in whole or in + * part for any purpose, educational, recreational or commercial, + * provided that this copyright notice is retained unchanged. + * This software is available to all free of charge by anonymous + * FTP and in the UUNET archives. + * + * + * Authors: Michael Mauldin (mlm@cs.cmu.edu) + * David Rowley (mgardi@watdcsu.waterloo.edu) + * + * Based on: compress.c - File compression ala IEEE Computer, June 1984. + * + * Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas) + * Jim McKie (decvax!mcvax!jim) + * Steve Davies (decvax!vax135!petsd!peora!srd) + * Ken Turkowski (decvax!decwrl!turtlevax!ken) + * James A. Woods (decvax!ihnp4!ames!jaw) + * Joe Orost (decvax!vax135!petsd!joe) + *****************************************************************/ + +#include "gifplot.h" +#include +typedef long int count_int; +typedef unsigned char byte; + +static int gif_error; +static unsigned char *op; +static int Width, Height; +static int curx, cury; +static int Interlace; + +static void putgifword(int); +static void compress(int, byte **, int); +static void output_GIF(int); +static void cl_block(void); +static void cl_hash(count_int); +static void char_init(void); +static void char_out(int); +static void flush_char(void); +static void *OutBuffer; +static int OutBufSize; +static FrameBuffer *GIF_frame; + +static unsigned char pc2nc[256],r1[256],g1[256],b1[256]; + +/*************************************************************/ +int FrameBuffer_makeGIF(FrameBuffer *f, ColorMap *c, void *outbuffer, unsigned int outbufsize) +{ + int RWidth, RHeight; + int LeftOfs, TopOfs; + int ColorMapSize, InitCodeSize, Background, BitsPerPixel; + int i,j,nc; + char *rmap, *gmap, *bmap; + char *cmap; + int count; + + Interlace = 0; + Background = 0; + OutBuffer = outbuffer; + OutBufSize = outbufsize; + GIF_frame = f; + cmap = (char *) c->cmap; + + op = (unsigned char *) outbuffer; + gif_error = 0; + for (i=0; i<256; i++) { pc2nc[i] = r1[i] = g1[i] = b1[i] = 0; } + + /* compute number of unique colors */ + nc = 0; + rmap = &cmap[0]; + gmap = &cmap[256]; + bmap = &cmap[512]; + + for (i=0; i<256; i++) { + /* see if color #i is already used */ + for (j=0; j= nc) break; + + BitsPerPixel = i; + + ColorMapSize = 1 << BitsPerPixel; + + RWidth = Width = f->width; + RHeight = Height = f->height; + LeftOfs = TopOfs = 0; + + if (BitsPerPixel <= 1) InitCodeSize = 2; + else InitCodeSize = BitsPerPixel; + + curx = 0; + cury = f->height - 1; + + strcpy((char *) op,"GIF89a"); /* Put in GIF magic number */ + op+=6; + putgifword(RWidth); /* screen descriptor */ + putgifword(RHeight); + + i = 0x80; /* Yes, there is a color map */ + i |= (8-1)<<4; /* OR in the color resolution (hardwired 8) */ + i |= (BitsPerPixel - 1); /* OR in the # of bits per pixel */ + *(op++) = i; + *(op++) = Background; /* background color */ + *(op++) = 0; + for (i=0; ipixels, f->width*f->height); + + *(op++) = 0; + *(op++) = ';'; + + count = (op - (unsigned char *) OutBuffer); + if (gif_error) return -1; + else return count; +} + +/******************************/ +static void putgifword(w) +int w; +{ + /* writes a 16-bit integer in GIF order (LSB first) */ + *(op++) = w & 0xff; + *(op++) = (w>>8)&0xff; +} + +/***********************************************************************/ + + +static unsigned long cur_accum = 0; +static int cur_bits = 0; + + + + +#define GP_BITS 12 /* BITS was already defined on some systems */ + +#define HSIZE 5003 /* 80% occupancy */ + +typedef unsigned char char_type; + +static int n_bits; /* number of bits/code */ +static int maxbits = GP_BITS; /* user settable max # bits/code */ +static int maxcode; /* maximum code, given n_bits */ +static int maxmaxcode = 1 << GP_BITS; /* NEVER generate this */ + +#define MAXCODE(n_bits) ( (1 << (n_bits)) - 1) + +static count_int *htab; +static unsigned short *codetab; +static int GIFOutBufSize; + +/* static count_int htab [HSIZE]; +static unsigned short codetab [HSIZE]; */ + +#define HashTabOf(i) htab[i] +#define CodeTabOf(i) codetab[i] + +static int hsize = HSIZE; /* for dynamic table sizing */ + +/* + * To save much memory, we overlay the table used by compress() with those + * used by decompress(). The tab_prefix table is the same size and type + * as the codetab. The tab_suffix table needs 2**BITS characters. We + * get this from the beginning of htab. The output stack uses the rest + * of htab, and contains characters. There is plenty of room for any + * possible stack (stack used to be 8000 characters). + */ + +#define tab_prefixof(i) CodeTabOf(i) +#define tab_suffixof(i) ((char_type *)(htab))[i] +#define de_stack ((char_type *)&tab_suffixof(1<= GIF_frame->width) { + curx = 0; + cury--; + } + len--; + + hshift = 0; + for ( fcode = (long) hsize; fcode < 65536L; fcode *= 2L ) + hshift++; + hshift = 8 - hshift; /* set hash code range bound */ + + hsize_reg = hsize; + cl_hash( (count_int) hsize_reg); /* clear hash table */ + + output_GIF(ClearCode); + while (len) { + c = pc2nc[data[cury][curx]]; + curx++; + if (curx >= GIF_frame->width) { + curx = 0; + cury--; + } + len--; + + fcode = (long) ( ( (long) c << maxbits) + ent); + i = (((int) c << hshift) ^ ent); /* xor hashing */ + + if ( HashTabOf (i) == fcode ) { + ent = CodeTabOf (i); + continue; + } + + if ( (long)HashTabOf (i) < 0 ) /* empty slot */ + goto nomatch; + + disp = hsize_reg - i; /* secondary hash (after G. Knott) */ + if ( i == 0 ) + disp = 1; + +probe: + if ( (i -= disp) < 0 ) + i += hsize_reg; + + if ( HashTabOf (i) == fcode ) { + ent = CodeTabOf (i); + continue; + } + + if ( (long)HashTabOf (i) >= 0 ) + goto probe; + +nomatch: + output_GIF(ent); + out_count++; + ent = c; + + if ( free_ent < maxmaxcode ) { + CodeTabOf (i) = free_ent++; /* code -> hashtable */ + HashTabOf (i) = fcode; + } + else + cl_block(); + + } + /* Put out the final code */ + output_GIF(ent); + output_GIF(EOFCode); +} + + +/***************************************************************** + * TAG( output_GIF ) + * + * Output the given code. + * Inputs: + * code: A n_bits-bit integer. If == -1, then EOF. This assumes + * that n_bits =< (long)wordsize - 1. + * Outputs: + * Outputs code to the file. + * Assumptions: + * Chars are 8 bits long. + * Algorithm: + * Maintain a BITS character long buffer (so that 8 codes will + * fit in it exactly). Use the VAX insv instruction to insert each + * code in turn. When the buffer fills up empty it and start over. + */ + +static +unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, + 0x001F, 0x003F, 0x007F, 0x00FF, + 0x01FF, 0x03FF, 0x07FF, 0x0FFF, + 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF }; + +static void output_GIF(code) +int code; +{ + cur_accum &= masks[cur_bits]; + + if (cur_bits > 0) + cur_accum |= ((long)code << cur_bits); + else + cur_accum = code; + + cur_bits += n_bits; + + while( cur_bits >= 8 ) { + char_out( (int) (cur_accum & 0xff) ); + cur_accum >>= 8; + cur_bits -= 8; + } + + /* + * If the next entry is going to be too big for the code size, + * then increase it, if possible. + */ + + if (free_ent > maxcode || clear_flg) { + + if( clear_flg ) { + maxcode = MAXCODE (n_bits = g_init_bits); + clear_flg = 0; + } + else { + n_bits++; + if ( n_bits == maxbits ) + maxcode = maxmaxcode; + else + maxcode = MAXCODE(n_bits); + } + } + + if( code == EOFCode ) { + /* At EOF, write the rest of the buffer */ + while( cur_bits > 0 ) { + char_out( (int)(cur_accum & 0xff) ); + cur_accum >>= 8; + cur_bits -= 8; + } + + flush_char(); + } +} + + +/********************************/ +static void cl_block () /* table clear for block compress */ +{ + /* Clear out the hash table */ + + cl_hash ( (count_int) hsize ); + free_ent = ClearCode + 2; + clear_flg = 1; + + output_GIF(ClearCode); +} + + +/********************************/ +static void cl_hash(hsize) /* reset code table */ +register count_int hsize; +{ + register count_int *htab_p = htab+hsize; + register long i; + register long m1 = -1; + + i = hsize - 16; + do { /* might use Sys V memset(3) here */ + *(htab_p-16) = m1; + *(htab_p-15) = m1; + *(htab_p-14) = m1; + *(htab_p-13) = m1; + *(htab_p-12) = m1; + *(htab_p-11) = m1; + *(htab_p-10) = m1; + *(htab_p-9) = m1; + *(htab_p-8) = m1; + *(htab_p-7) = m1; + *(htab_p-6) = m1; + *(htab_p-5) = m1; + *(htab_p-4) = m1; + *(htab_p-3) = m1; + *(htab_p-2) = m1; + *(htab_p-1) = m1; + htab_p -= 16; + } while ((i -= 16) >= 0); + + for ( i += 16; i > 0; i-- ) + *--htab_p = m1; +} + + +/****************************************************************************** + * + * GIF Specific routines + * + ******************************************************************************/ + +/* + * Number of characters so far in this 'packet' + */ +static int a_count; + +/* + * Set up the 'byte output' routine + */ +static void char_init() +{ + a_count = 0; +} + +/* + * Define the storage for the packet accumulator + */ +static char accum[ 256 ]; + +/* + * Add a character to the end of the current packet, and if it is 254 + * characters, flush the packet to disk. + */ +static void char_out(c) +int c; +{ + accum[ a_count++ ] = c; + if( a_count >= 254 ) + flush_char(); +} + +/* + * Flush the packet to disk, and reset the accumulator + */ +static void flush_char() +{ + if (gif_error) return; + if( a_count > 0 ) { + *(op++) = a_count; + memcpy(op,accum,a_count); + op+=a_count; + a_count = 0; + + if (op > (unsigned char *) ((char *) OutBuffer + (GIFOutBufSize - 2048))) { + gif_error = 1; + } + } +} + + +/* ---------------------------------------------------------------------- + int FrameBuffer_writeGIF(char *filename) + + Write a GIF file to filename + ----------------------------------------------------------------------- */ + +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename) { + + FILE *file; + void *buffer; + int nbytes; + int bufsize; + + file = fopen(filename,"wb"); + if (file == NULL) return -1; + + bufsize = (f->width*f->height*3)/2; + buffer = (void *) malloc(bufsize); + nbytes = FrameBuffer_makeGIF(f,c,buffer,bufsize); + if (nbytes == -1) { + free(buffer); + fclose(file); + return -1; + } + if (fwrite(buffer,nbytes,1,file) != 1) { + free(buffer); + fclose(file); + return -1; + } + fclose(file); + free(buffer); + return 0; +} + + + + + diff --git a/Examples/GIFPlot/Lib/matrix.c b/Examples/GIFPlot/Lib/matrix.c new file mode 100644 index 000000000..ef0cf3aab --- /dev/null +++ b/Examples/GIFPlot/Lib/matrix.c @@ -0,0 +1,343 @@ +/* ----------------------------------------------------------------------------- + * matrix.c + * + * Some 4x4 matrix operations + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define MATRIX +#include "gifplot.h" +#include + +/* ------------------------------------------------------------------------ + Matrix new_Matrix() + + Create a new 4x4 matrix. + ------------------------------------------------------------------------ */ +Matrix +new_Matrix() { + Matrix m; + m = (Matrix) malloc(16*sizeof(double)); + return m; +} + +/* ------------------------------------------------------------------------ + delete_Matrix(Matrix *m); + + Destroy a matrix + ------------------------------------------------------------------------ */ + +void +delete_Matrix(Matrix m) { + if (m) + free((char *) m); +} + +/* ------------------------------------------------------------------------ + Matrix Matrix_copy(Matrix a) + + Makes a copy of matrix a and returns it. + ------------------------------------------------------------------------ */ + +Matrix Matrix_copy(Matrix a) { + int i; + Matrix r = 0; + if (a) { + r = new_Matrix(); + if (r) { + for (i = 0; i < 16; i++) + r[i] = a[i]; + } + } + return r; +} + +/* ------------------------------------------------------------------------ + Matrix_multiply(Matrix a, Matrix b, Matrix c) + + Multiplies a*b = c + c may be one of the source matrices + ------------------------------------------------------------------------ */ +void +Matrix_multiply(Matrix a, Matrix b, Matrix c) { + double temp[16]; + int i,j,k; + + for (i =0; i < 4; i++) + for (j = 0; j < 4; j++) { + temp[i*4+j] = 0.0; + for (k = 0; k < 4; k++) + temp[i*4+j] += a[i*4+k]*b[k*4+j]; + } + for (i = 0; i < 16; i++) + c[i] = temp[i]; +} + +/* ------------------------------------------------------------------------ + Matrix_identity(Matrix a) + + Puts an identity matrix in matrix a + ------------------------------------------------------------------------ */ + +void +Matrix_identity(Matrix a) { + int i; + for (i = 0; i < 16; i++) a[i] = 0; + a[0] = 1; + a[5] = 1; + a[10] = 1; + a[15] = 1; +} + +/* ------------------------------------------------------------------------ + Matrix_zero(Matrix a) + + Puts a zero matrix in matrix a + ------------------------------------------------------------------------ */ +void +Matrix_zero(Matrix a) { + int i; + for (i = 0; i < 16; i++) a[i] = 0; +} + +/* ------------------------------------------------------------------------ + Matrix_transpose(Matrix a, Matrix result) + + Transposes matrix a and puts it in result. + ------------------------------------------------------------------------ */ +void +Matrix_transpose(Matrix a, Matrix result) { + double temp[16]; + int i,j; + + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + temp[4*i+j] = a[4*j+i]; + + for (i = 0; i < 16; i++) + result[i] = temp[i]; +} + + +/* ------------------------------------------------------------------------ + Matrix_gauss(Matrix a, Matrix b) + + Solves ax=b for x, using Gaussian elimination. Destroys a. + Really only used for calculating inverses of 4x4 transformation + matrices. + ------------------------------------------------------------------------ */ + +void Matrix_gauss(Matrix a, Matrix b) { + int ipiv[4], indxr[4], indxc[4]; + int i,j,k,l,ll; + int irow=0, icol=0; + double big, pivinv; + double dum; + for (j = 0; j < 4; j++) + ipiv[j] = 0; + for (i = 0; i < 4; i++) { + big = 0; + for (j = 0; j < 4; j++) { + if (ipiv[j] != 1) { + for (k = 0; k < 4; k++) { + if (ipiv[k] == 0) { + if (fabs(a[4*j+k]) >= big) { + big = fabs(a[4*j+k]); + irow = j; + icol = k; + } + } else if (ipiv[k] > 1) + return; /* Singular matrix */ + } + } + } + ipiv[icol] = ipiv[icol]+1; + if (irow != icol) { + for (l = 0; l < 4; l++) { + dum = a[4*irow+l]; + a[4*irow+l] = a[4*icol+l]; + a[4*icol+l] = dum; + } + for (l = 0; l < 4; l++) { + dum = b[4*irow+l]; + b[4*irow+l] = b[4*icol+l]; + b[4*icol+l] = dum; + } + } + indxr[i] = irow; + indxc[i] = icol; + if (a[4*icol+icol] == 0) return; + pivinv = 1.0/a[4*icol+icol]; + a[4*icol+icol] = 1.0; + for (l = 0; l < 4; l++) + a[4*icol+l] = a[4*icol+l]*pivinv; + for (l = 0; l < 4; l++) + b[4*icol+l] = b[4*icol+l]*pivinv; + for (ll = 0; ll < 4; ll++) { + if (ll != icol) { + dum = a[4*ll+icol]; + a[4*ll+icol] = 0; + for (l = 0; l < 4; l++) + a[4*ll+l] = a[4*ll+l] - a[4*icol+l]*dum; + for (l = 0; l < 4; l++) + b[4*ll+l] = b[4*ll+l] - b[4*icol+l]*dum; + } + } + } + for (l = 3; l >= 0; l--) { + if (indxr[l] != indxc[l]) { + for (k = 0; k < 4; k++) { + dum = a[4*k+indxr[l]]; + a[4*k+indxr[l]] = a[4*k+indxc[l]]; + a[4*k+indxc[l]] = dum; + } + } + } +} + +/* ------------------------------------------------------------------------ + Matrix_invert(Matrix a, Matrix inva) + + Inverts Matrix a and places the result in inva. + Relies on the Gaussian Elimination code above. (See Numerical recipes). + ------------------------------------------------------------------------ */ +void +Matrix_invert(Matrix a, Matrix inva) { + + double temp[16]; + int i; + + for (i = 0; i < 16; i++) + temp[i] = a[i]; + Matrix_identity(inva); + Matrix_gauss(temp,inva); +} + +/* ------------------------------------------------------------------------ + Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t) + + Transform a vector. a*r ----> t + ------------------------------------------------------------------------ */ + +void Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t) { + + double rx, ry, rz, rw; + + rx = r->x; + ry = r->y; + rz = r->z; + rw = r->w; + t->x = a[0]*rx + a[1]*ry + a[2]*rz + a[3]*rw; + t->y = a[4]*rx + a[5]*ry + a[6]*rz + a[7]*rw; + t->z = a[8]*rx + a[9]*ry + a[10]*rz + a[11]*rw; + t->w = a[12]*rx + a[13]*ry + a[14]*rz + a[15]*rw; +} + +/* ------------------------------------------------------------------------ + Matrix_transform4(Matrix a, double x, double y, double z, double w, GL_Vector *t) + + Transform a vector from a point specified as 4 doubles + ------------------------------------------------------------------------ */ + +void Matrix_transform4(Matrix a, double rx, double ry, double rz, double rw, + GL_Vector *t) { + + t->x = a[0]*rx + a[1]*ry + a[2]*rz + a[3]*rw; + t->y = a[4]*rx + a[5]*ry + a[6]*rz + a[7]*rw; + t->z = a[8]*rx + a[9]*ry + a[10]*rz + a[11]*rw; + t->w = a[12]*rx + a[13]*ry + a[14]*rz + a[15]*rw; +} + +/* --------------------------------------------------------------------- + Matrix_translate(Matrix a, double tx, double ty, double tz) + + Put a translation matrix in Matrix a + ---------------------------------------------------------------------- */ + +void Matrix_translate(Matrix a, double tx, double ty, double tz) { + Matrix_identity(a); + a[3] = tx; + a[7] = ty; + a[11] = tz; + a[15] = 1; +} + +/* ----------------------------------------------------------------------- + Matrix_rotatex(Matrix a, double deg) + + Produce an x-rotation matrix for given angle in degrees. + ----------------------------------------------------------------------- */ +void +Matrix_rotatex(Matrix a, double deg) { + double r; + + r = 3.1415926*deg/180.0; + Matrix_zero(a); + a[0] = 1.0; + a[5] = cos(r); + a[6] = -sin(r); + a[9] = sin(r); + a[10] = cos(r); + a[15] = 1.0; +} + +/* ----------------------------------------------------------------------- + Matrix_rotatey(Matrix a, double deg) + + Produce an y-rotation matrix for given angle in degrees. + ----------------------------------------------------------------------- */ +void +Matrix_rotatey(Matrix a, double deg) { + double r; + + r = 3.1415926*deg/180.0; + Matrix_zero(a); + a[0] = cos(r); + a[2] = sin(r); + a[5] = 1.0; + a[8] = -sin(r); + a[10] = cos(r); + a[15] = 1; + +} +/* ----------------------------------------------------------------------- + Matrix_RotateZ(Matrix a, double deg) + + Produce an z-rotation matrix for given angle in degrees. + ----------------------------------------------------------------------- */ +void +Matrix_rotatez(Matrix a, double deg) { + double r; + + r = 3.1415926*deg/180.0; + Matrix_zero(a); + a[0] = cos(r); + a[1] = -sin(r); + a[4] = sin(r); + a[5] = cos(r); + a[10] = 1.0; + a[15] = 1.0; +} + + +/* A debugging routine */ + +void Matrix_set(Matrix a, int i, int j, double val) { + a[4*j+i] = val; +} + +void Matrix_print(Matrix a) { + int i,j; + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + fprintf(stdout,"%10f ",a[4*i+j]); + } + fprintf(stdout,"\n"); + } + fprintf(stdout,"\n"); +} + diff --git a/Examples/GIFPlot/Lib/pixmap.c b/Examples/GIFPlot/Lib/pixmap.c new file mode 100644 index 000000000..a55cf041f --- /dev/null +++ b/Examples/GIFPlot/Lib/pixmap.c @@ -0,0 +1,159 @@ +/* ----------------------------------------------------------------------------- + * pixmap.c + * + * Pixel maps (i.e., bitmaps) + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define PIXMAP +#include "gifplot.h" + +/* ----------------------------------------------------------------------- + PixMap *new_PixMap(int width, int height, int centerx, int centery) + + Create a new pixmap of given size + ----------------------------------------------------------------------- */ +PixMap *new_PixMap(int width, int height, int centerx, int centery) { + PixMap *pm; + if ((width > 0) && (height > 0)) { + pm = (PixMap *) malloc(sizeof(PixMap)); + pm->width = width; + pm->height = height; + pm->centerx = centerx; + pm->centery = centery; + pm->map = (int *) malloc(height*width*sizeof(int)); + return pm; + } + return (PixMap *) 0; +} + +/* -------------------------------------------------------------------------- + void delete_PixMap(PixMap *pm) + + Destroy a pixmap + -------------------------------------------------------------------------- */ + +void delete_PixMap(PixMap *pm) { + if (pm) { + free((char *) pm->map); + free((char *) pm); + } +} + +/* --------------------------------------------------------------------------- + void PixMap_set(PixMap *pm, int x, int y, int pix) + + Set a pixel in the bitmap + --------------------------------------------------------------------------- */ +void +PixMap_set(PixMap *pm, int x, int y, int pix) { + if ((x < 0) || (x>=pm->width)) return; + if ((y < 0) || (y>=pm->height)) return; + + pm->map[pm->width*y + x] = pix; +} + +/* ----------------------------------------------------------------------------- + void FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor) + + Draw a pixmap onto the framebuffer. This is somewhat optimized for speed. + ------------------------------------------------------------------------------ */ + +void +FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor) { + + int startx, starty; /* Starting location on framebuffer */ + int startpixx = 0, startpixy = 0; /* Starting location in pixmap */ + int endx, endy; /* Ending location on framebuffer */ + int i,j, px, py; + int c; + + startx = x - pm->centerx; + starty = y + pm->centery; + endx = startx + pm->width; + endy = starty - pm->height; + + /* Figure out if we need to clip */ + + if (startx < f->xmin) { + startpixx = f->xmin - startx; + startx = f->xmin; + } + if (starty >= f->ymax) { + startpixy = starty - f->ymax; + starty = f->ymax-1; + } + if (endx >= f->xmax) { + endx = f->xmax-1; + } + if (endy < f->ymin) { + endy = f->ymin; + } + py = startpixy; + for (j = starty; j >= endy; j--) { + px = startpixx; + for (i = startx; i < endx; i++) { + c = pm->map[py*pm->width + px]; + switch (c) { + case GIFPLOT_FOREGROUND: + f->pixels[j][i] = fgcolor; + break; + case GIFPLOT_BACKGROUND: + f->pixels[j][i] = bgcolor; + break; + default: + break; + } + px++; + } + py++; + } +} + +/************************************************************************** + * Some common PixMaps (for plotting) + * + **************************************************************************/ + +int _SQUARE_MAP[] = { + 0,1,1,1,1,1,1,1, + 0,1,1,1,1,1,1,1, + 0,1,1,1,1,1,1,1, + 0,1,1,1,1,1,1,1, + 0,1,1,1,1,1,1,1, + 0,1,1,1,1,1,1,1, + 0,1,1,1,1,1,1,1, + 0,0,0,0,0,0,0,0 }; + +PixMap PixMap_SQUARE = { 8,8,4,4, _SQUARE_MAP}; + +int _TRIANGLE_MAP[] = { + 0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0, + 0,0,1,1,1,0,0,0, + 0,0,1,1,1,0,0,0, + 0,1,1,1,1,1,0,0, + 0,1,1,1,1,1,0,0, + 1,1,1,1,1,1,1,0, + 0,0,0,0,0,0,0,0 }; + +PixMap PixMap_TRIANGLE = { 8,8,4,4,_TRIANGLE_MAP}; + +int _CROSS_MAP[] = { + 0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0, + 1,1,1,1,1,1,1,0, + 0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0, + 0,0,0,0,0,0,0,0 }; + +PixMap PixMap_CROSS = { 8,8,4,4,_CROSS_MAP}; + + + diff --git a/Examples/GIFPlot/Lib/plot2d.c b/Examples/GIFPlot/Lib/plot2d.c new file mode 100644 index 000000000..e78107bf1 --- /dev/null +++ b/Examples/GIFPlot/Lib/plot2d.c @@ -0,0 +1,445 @@ +/* ----------------------------------------------------------------------------- + * plot2d.c + * + * 2-Dimensional plotting + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define PLOT2D + +#include "gifplot.h" + +/* ------------------------------------------------------------------------ + Plot2D *new_Plot2D(FrameBuffer *frame, xmin, ymin, xmax, ymax) + + Create a new 2D plot with given minimum and maximum coordinates. + ------------------------------------------------------------------------ */ +Plot2D *new_Plot2D(FrameBuffer *frame,double xmin,double ymin,double xmax,double ymax) { + Plot2D *p2; + if (frame) { + if (xmax <= xmin) return (Plot2D *) 0; + if (ymax <= ymin) return (Plot2D *) 0; + p2 = (Plot2D *) malloc(sizeof(Plot2D)); + p2->frame = frame; + p2->xmin = xmin; + p2->ymin = ymin; + p2->xmax = xmax; + p2->ymax = ymax; + p2->view_xmin = 0; + p2->view_xmax = frame->width; + p2->view_ymin = 0; + p2->view_ymax = frame->height; + p2->xscale = LINEAR; + p2->yscale = LINEAR; + p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); + p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); + return p2; + } + return (Plot2D *) 0; +} + +/* ---------------------------------------------------------------------------- + delete_Plot2D(Plot2D *p2) + + Delete a 2D plot + ---------------------------------------------------------------------------- */ +void +delete_Plot2D(Plot2D *p2) { + if (p2) + free((char *) p2); +} + +/* ----------------------------------------------------------------------------- + Plot2D *Plot2D_copy(Plot2D *p2) + + Makes a copy of the Plot2D data structure. + ----------------------------------------------------------------------------- */ + +Plot2D *Plot2D_copy(Plot2D *p2) { + Plot2D *c2; + if (p2) { + c2 = (Plot2D *) malloc(sizeof(Plot2D)); + if (c2) { + c2->frame = p2->frame; + c2->view_xmin = p2->view_xmin; + c2->view_ymin = p2->view_ymin; + c2->view_xmax = p2->view_xmax; + c2->view_ymax = p2->view_ymax; + c2->xmin = p2->xmin; + c2->ymin = p2->ymin; + c2->xmax = p2->xmax; + c2->ymax = p2->ymax; + c2->xscale = p2->xscale; + c2->yscale = p2->yscale; + c2->dx = p2->dx; + c2->dy = p2->dy; + } + return c2; + } else { + return (Plot2D *) 0; + } +} + +/* ----------------------------------------------------------------------------- + Plot2D_clear(Plot2D *p2, Pixel c) + + Clear the region assigned to this plot to the given color. + -------------------------------------------------------------------------- */ + +void Plot2D_clear(Plot2D *p2, Pixel c) { + int i,j; + for (i = p2->view_xmin; i < p2->view_xmax; i++) + for (j = p2->view_ymin; j < p2->view_ymax; j++) { + p2->frame->pixels[j][i] = c; + } +} + +/* ------------------------------------------------------------------------------ + Plot2D_setview + + Sets the plot region on the framebuffer + ------------------------------------------------------------------------------ */ + +void +Plot2D_setview(Plot2D *p2, int vxmin, int vymin, int vxmax, int vymax) { + if (p2) { + p2->view_xmin = vxmin; + p2->view_ymin = vymin; + p2->view_xmax = vxmax; + p2->view_ymax = vymax; + p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); + p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); + FrameBuffer_setclip(p2->frame,vxmin,vymin,vxmax,vymax); + } +} + +/* ------------------------------------------------------------------------------- + Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax) + + Sets the plotting range. + ------------------------------------------------------------------------------- */ + +void +Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax) { + if (p2) { + p2->xmin = xmin; + p2->ymin = ymin; + p2->xmax = xmax; + p2->ymax = ymax; + p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); + p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); + } +} + +/* ------------------------------------------------------------------------------- + Plot2D_setscale(Plot2D *p2, int xscale, int yscale) + + Sets the plotting scaling method + ------------------------------------------------------------------------------- */ + +void +Plot2D_setscale(Plot2D *p2, int xscale, int yscale) { + if (p2) { + p2->xscale = xscale; + p2->yscale = yscale; + } +} + +/* ---------------------------------------------------------------------------- + Plot2D_transform(Plot2D *p2, double x, double y, int *px, int *py) + + Transforms x,y into screen coordinates px and py. Result is returned + in px and py. Rounds to the nearest pixel instead of truncating. + ----------------------------------------------------------------------------- */ + +void +Plot2D_transform(Plot2D *p2, double x, double y, int *px, int *py) { + if (p2) { + *px = p2->view_xmin + (int) (p2->dx*(x-p2->xmin) + 0.5); + *py = p2->view_ymin + (int) (p2->dy*(y-p2->ymin) + 0.5); + } +} + +/* ------------------------------------------------------------------------------- + Plot2D_plot(Plot2D *p2, double x, double y, Pixel color) + + Plot a 2D Point of a given color + ------------------------------------------------------------------------------- */ +void +Plot2D_plot(Plot2D *p2, double x, double y, Pixel color) { + int px, py; + + Plot2D_transform(p2,x,y,&px,&py); + FrameBuffer_plot(p2->frame, px, py, color); +} + +/* ------------------------------------------------------------------------------- + Plot2D_box(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel Color) + + Plot an outline box on the 2D plot + ------------------------------------------------------------------------------- */ +void +Plot2D_box(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color) { + int ix1, ix2,iy1, iy2; + + Plot2D_transform(p2,x1,y1,&ix1,&iy1); + Plot2D_transform(p2,x2,y2,&ix2,&iy2); + FrameBuffer_box(p2->frame,ix1,iy1,ix2,iy2,color); +} + +/* ------------------------------------------------------------------------------- + Plot2D_solidbox(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel Color) + + Plot a solid box box on the 2D plot + ------------------------------------------------------------------------------- */ +void +Plot2D_solidbox(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color) { + int ix1, ix2,iy1, iy2; + + Plot2D_transform(p2,x1,y1,&ix1,&iy1); + Plot2D_transform(p2,x2,y2,&ix2,&iy2); + FrameBuffer_solidbox(p2->frame,ix1,iy1,ix2,iy2,color); +} + +/* ------------------------------------------------------------------------------- + Plot2D_interpbox(Plot2D *p2, double x1, double y1, double x2, double y2, + Pixel c1, Pixel c2, Pixel c3, Pixel c4) + + Plot a color-interpolated box on the 2D plot + ------------------------------------------------------------------------------- */ +void +Plot2D_interpbox(Plot2D *p2, double x1, double y1,double x2, double y2, + Pixel c1, Pixel c2, Pixel c3, Pixel c4) { + int ix1, ix2,iy1, iy2; + + Plot2D_transform(p2,x1,y1,&ix1,&iy1); + Plot2D_transform(p2,x2,y2,&ix2,&iy2); + FrameBuffer_interpbox(p2->frame,ix1,iy1,ix2,iy2,c1,c2,c3,c4); +} + +/* ------------------------------------------------------------------------------- + Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color) + + Make an outline circle on the 2D plot. + ------------------------------------------------------------------------------- */ +void +Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color) { + int ix, iy, ir; + + Plot2D_transform(p2,x,y,&ix,&iy); + ir = p2->dx * radius; /* This is really incorrect. Will need ellipse */ + if (ir > 1) + FrameBuffer_circle(p2->frame,ix,iy,ir,color); + else + FrameBuffer_plot(p2->frame,ix,iy,color); + +} + +/* ------------------------------------------------------------------------------- + Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color) + + Make an solid circle on the 2D plot. + ------------------------------------------------------------------------------- */ +void +Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color) { + int ix, iy, ir; + + Plot2D_transform(p2,x,y,&ix,&iy); + ir = p2->dx * radius; /* This is really incorrect. Will need ellipse */ + if (ir > 1) + FrameBuffer_solidcircle(p2->frame,ix,iy,ir,color); + else + FrameBuffer_plot(p2->frame,ix,iy,color); +} + +/* ------------------------------------------------------------------------------- + Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color) + + Draw a line + ------------------------------------------------------------------------------- */ + +void +Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color) { + int ix1, ix2, iy1, iy2; + + Plot2D_transform(p2,x1,y1,&ix1,&iy1); + Plot2D_transform(p2,x2,y2,&ix2,&iy2); + FrameBuffer_line(p2->frame,ix1,iy1,ix2,iy2,color); +} + + + +/* ------------------------------------------------------------------------------- + Plot2D_start(Plot2D *p2) + + This should be called before starting to make a 2D plot. It will change + the viewport coordinates for the framebuffer and do other stuff. + ------------------------------------------------------------------------------- */ + +void Plot2D_start(Plot2D *p2) { + if (p2) { + FrameBuffer_setclip(p2->frame, p2->view_xmin,p2->view_ymin,p2->view_xmax, p2->view_ymax); + p2->dx = (p2->view_xmax - p2->view_xmin)/(p2->xmax - p2->xmin); + p2->dy = (p2->view_ymax - p2->view_ymin)/(p2->ymax - p2->ymin); + } +} + +/* -------------------------------------------------------------------------- + void Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor) + + Draw a pixel map at the given coordinates. (Used for putting symbols on 2D + plots). + -------------------------------------------------------------------------- */ +void +Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor) { + int ix, iy; + + Plot2D_transform(p2,x,y,&ix,&iy); + FrameBuffer_drawpixmap(p2->frame,pm,ix,iy,color,bgcolor); +} + +/* ---------------------------------------------------------------------------- + void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel color) + + Draw an X axis bar at location x,y with ticks spaced every xtick units. + Ticks are spaced starting at "x" + ----------------------------------------------------------------------------- */ + +void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel color) { + int ix, iy,iy2; + double xt; + + /* Draw a line fox the axis */ + + Plot2D_line(p2,p2->xmin,y,p2->xmax,y,color); + xt = x; + while (xt >= p2->xmin) { + Plot2D_transform(p2,xt,y,&ix,&iy); + iy2 = iy+ticklength; + iy = iy-ticklength; + FrameBuffer_line(p2->frame,ix,iy,ix,iy2,color); + xt = xt - xtick; + } + xt = x + xtick; + while (xt < p2->xmax) { + Plot2D_transform(p2,xt,y,&ix,&iy); + iy2 = iy+ticklength; + iy = iy-ticklength; + FrameBuffer_line(p2->frame,ix,iy,ix,iy2,color); + xt = xt + xtick; + } +} + + +/* ---------------------------------------------------------------------------- + void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel c) + + Draw an Y axis bar at location x,y with ticks spaced every xtick units. + Ticks are spaced starting at "y" + ----------------------------------------------------------------------------- */ + +void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel color) { + int ix, iy, ix2; + double yt; + + /* Draw a line fox the axis */ + + Plot2D_line(p2,x,p2->ymin,x,p2->ymax,color); + yt = y; + while (yt >= p2->ymin) { + Plot2D_transform(p2,x,yt,&ix,&iy); + ix2 = ix+ticklength; + ix = ix-ticklength; + FrameBuffer_line(p2->frame,ix,iy,ix2,iy,color); + yt = yt - ytick; + } + yt = y + ytick; + while (yt < p2->ymax) { + Plot2D_transform(p2,x,yt,&ix,&iy); + ix2 = ix+ticklength; + ix = ix-ticklength; + FrameBuffer_line(p2->frame,ix,iy,ix2,iy,color); + yt = yt + ytick; + } +} + + +/* ------------------------------------------------------------------------- + Plot2D_triangle(Plot2D *p2, double x1, double y1, + double x2, double y2, + double x3, double y3, + Pixel fillcolor) + + This function draws a 2D outline triangle. + -------------------------------------------------------------------------- */ + +void Plot2D_triangle(Plot2D *p2, double x1, double y1, + double x2, double y2, + double x3, double y3, Pixel color) { + + Plot2D_line(p2,x1,y1,x2,y2,color); + Plot2D_line(p2,x2,y2,x3,y3,color); + Plot2D_line(p2,x3,y3,x1,y1,color); + +} + + +/* ------------------------------------------------------------------------- + Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, + double x2, double y2, + double x3, double y3, + Pixel color) + + This function draws a 2D filled triangle. Can be used to + draw other primitives such as quadralaterals, etc... + + -------------------------------------------------------------------------- */ + +void Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, + + double x2, double y2, + double x3, double y3, Pixel color) { + + int tx1, tx2, tx3, ty1, ty2, ty3; + + /* Transform the three points into screen coordinates */ + + Plot2D_transform(p2,x1,y1,&tx1,&ty1); + Plot2D_transform(p2,x2,y2,&tx2,&ty2); + Plot2D_transform(p2,x3,y3,&tx3,&ty3); + + FrameBuffer_solidtriangle(p2->frame,tx1,ty1,tx2,ty2,tx3,ty3,color); + +} + +/* ------------------------------------------------------------------------- + Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, + double x2, double y2, Pixel c2, + double x3, double y3, Pixel c3); + + This function draws a 2D filled triangle with color interpolation. + Can be used to draw other primitives such as quadralaterals, etc... + -------------------------------------------------------------------------- */ + +void Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, + double x2, double y2, Pixel c2, + double x3, double y3, Pixel c3) { + + int tx1, tx2, tx3, ty1, ty2, ty3; + + /* Transform the three points into screen coordinates */ + + Plot2D_transform(p2,x1,y1,&tx1,&ty1); + Plot2D_transform(p2,x2,y2,&tx2,&ty2); + Plot2D_transform(p2,x3,y3,&tx3,&ty3); + + FrameBuffer_interptriangle(p2->frame,tx1,ty1,c1,tx2,ty2,c2,tx3,ty3,c3); + +} + + + diff --git a/Examples/GIFPlot/Lib/plot3d.c b/Examples/GIFPlot/Lib/plot3d.c new file mode 100644 index 000000000..387e420e2 --- /dev/null +++ b/Examples/GIFPlot/Lib/plot3d.c @@ -0,0 +1,2181 @@ +/* ----------------------------------------------------------------------------- + * plot3d.c + * + * Three-dimensional plotting. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#define PLOT3D +#include "gifplot.h" +#include +#include + +#define ORTHO 1 +#define PERSPECTIVE 2 +/* ------------------------------------------------------------------------ + Plot3D *new_Plot3D(FrameBuffer *f, double xmin, double ymin, double zmin, + double xmax, double ymax, double zmax) + + Creates a new 3D plot. Min and max coordinates are primarily used to + pick some default parameters. Returns NULL on failure + ------------------------------------------------------------------------- */ + +Plot3D *new_Plot3D(FrameBuffer *f, double xmin, double ymin, double zmin, + double xmax, double ymax, double zmax) { + + Plot3D *p3; + void Plot3D_maketransform(Plot3D *p3); + + /* Check to make sure the framebuffer and min/max parameters are valid */ + + if (!f) return (Plot3D *) 0; + if ((xmin > xmax) || (ymin > ymax) || (zmin > zmax)) return (Plot3D *) 0; + + p3 = (Plot3D *) malloc(sizeof(Plot3D)); + p3->frame = f; + p3->xmin = xmin; + p3->ymin = ymin; + p3->zmin = zmin; + p3->xmax = xmax; + p3->ymax = ymax; + p3->zmax = zmax; + + /* Set view region to the entire size of the framebuffer */ + + p3->view_xmin = 0; + p3->view_ymin = 0; + p3->view_xmax = f->width; + p3->view_ymax = f->height; + p3->width = f->width; + p3->height = f->height; + + /* Calculate a center point based off the min and max coordinates given */ + + p3->xcenter = (xmax - xmin)/2.0 + xmin; + p3->ycenter = (ymax - ymin)/2.0 + ymin; + p3->zcenter = (zmax - zmin)/2.0 + zmin; + + /* Calculate the aspect ratio of the viewing region */ + + p3->aspect = (double) f->width/(double) f->height; + + /* Set default view parameters */ + p3->xshift = 1.0; + p3->yshift = 1.0; + p3->zoom = 0.5; + p3->fovy = 40.0; /* 40 degree field of view */ + + /* Create matrices */ + + p3->model_mat = new_Matrix(); + p3->view_mat = new_Matrix(); + p3->center_mat = new_Matrix(); + p3->fullmodel_mat = new_Matrix(); + p3->trans_mat = new_Matrix(); + p3->pers_mode = ORTHO; + + FrameBuffer_zresize(p3->frame,p3->width, p3->height); + Matrix_identity(p3->view_mat); + Matrix_identity(p3->model_mat); + Matrix_translate(p3->center_mat, -p3->xcenter,-p3->ycenter,-p3->zcenter); + Plot3D_maketransform(p3); + return p3; +} + +/* --------------------------------------------------------------------- + delete_Plot3D(Plot3D *p3) + + Deletes a 3D plot + --------------------------------------------------------------------- */ + +void delete_Plot3D(Plot3D *p3) { + if (p3) { + delete_Matrix(p3->view_mat); + delete_Matrix(p3->model_mat); + delete_Matrix(p3->trans_mat); + free((char *) p3); + } +} + +/* --------------------------------------------------------------------- + Plot3D *Plot3D_copy(Plot3D *p3) + + This makes a copy of the 3D plot structure and returns a pointer to it. + --------------------------------------------------------------------- */ + +Plot3D *Plot3D_copy(Plot3D *p3) { + Plot3D *c3; + if (p3) { + c3 = (Plot3D *) malloc(sizeof(Plot3D)); + if (c3) { + c3->frame = p3->frame; + c3->view_xmin = p3->view_xmin; + c3->view_ymin = p3->view_ymin; + c3->view_xmax = p3->view_xmax; + c3->view_ymax = p3->view_ymax; + c3->xmin = p3->xmin; + c3->ymin = p3->ymin; + c3->zmin = p3->zmin; + c3->xmax = p3->xmax; + c3->ymax = p3->ymax; + c3->zmax = p3->zmax; + c3->xcenter = p3->xcenter; + c3->ycenter = p3->ycenter; + c3->zcenter = p3->zcenter; + c3->fovy = p3->fovy; + c3->aspect = p3->aspect; + c3->znear = p3->znear; + c3->zfar = p3->zfar; + c3->center_mat = Matrix_copy(p3->center_mat); + c3->model_mat = Matrix_copy(p3->model_mat); + c3->view_mat = Matrix_copy(p3->view_mat); + c3->fullmodel_mat = Matrix_copy(p3->fullmodel_mat); + c3->trans_mat = Matrix_copy(p3->trans_mat); + c3->lookatz = p3->lookatz; + c3->xshift = p3->xshift; + c3->yshift = p3->yshift; + c3->zoom = p3->zoom; + c3->width = p3->width; + c3->height = p3->height; + c3->pers_mode = p3->pers_mode; + } + return c3; + } else { + return (Plot3D *) 0; + } +} + +/* ---------------------------------------------------------------------- + Plot3D_clear(Plot3D *p3, Pixel bgcolor) + + Clear the pixel and zbuffer only for the view region of this image. + ---------------------------------------------------------------------- */ +void +Plot3D_clear(Plot3D *p3, Pixel bgcolor) { + int i,j; + + for (i = p3->view_xmin; i < p3->view_xmax; i++) + for (j = p3->view_ymin; j < p3->view_ymax; j++) { + p3->frame->pixels[j][i] = bgcolor; + p3->frame->zbuffer[j][i] = ZMIN; + } +} + +/* --------------------------------------------------------------------- + Plot3D_maketransform(Plot3D *p3) + + This function builds the total 3D transformation matrix from a + collection of components. + + Trans = View * Rotation * Center + + Where View is the viewing transformation matrix, Rotation is the + model rotation matrix, Center is the translation matrix used to + center the Model at the origin. + --------------------------------------------------------------------- */ + +void +Plot3D_maketransform(Plot3D *p3) { + + Matrix_multiply(p3->model_mat,p3->center_mat, p3->fullmodel_mat); + Matrix_multiply(p3->view_mat,p3->fullmodel_mat, p3->trans_mat); +} + +/* --------------------------------------------------------------------- + Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar) + + Sets up the perspective viewing transformation. Assumes "lookat" + has already been called. + --------------------------------------------------------------------- */ + +void +Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar) { + double theta; + double mat[16]; + + p3->fovy = fovy; + p3->znear = znear; + p3->zfar = zfar; + + theta = 3.1415926*fovy/180.0; + + Matrix_identity(mat); + mat[0] = cos(theta/2.0)/(sin(theta/2.0)*p3->aspect); + mat[5] = cos(theta/2.0)/(sin(theta/2.0)); + mat[10] = -(zfar + znear)/(zfar-znear); + mat[14] = -1.0; + mat[11] = -(2*zfar*znear)/(zfar - znear); + mat[15] = 0.0; + + /* Update the view transformation matrix */ + + Matrix_multiply(mat,p3->view_mat,p3->view_mat); + + /* Update the global transformation matrix */ + + Plot3D_maketransform(p3); + p3->pers_mode = PERSPECTIVE; + +} + +/* --------------------------------------------------------------------- + Plot3D_lookat(Plot3D *p3, double z) + + A greatly simplified version of (lookat). Specifies the position + of the viewpoint. (can be used for moving image in or out). + + Destroys the current viewing transformation matrix, so it will have + to be recalculated. + --------------------------------------------------------------------- */ + +void +Plot3D_lookat(Plot3D *p3, double z) { + if (p3) { + Matrix_translate(p3->view_mat, 0,0,-z); + p3->lookatz = z; + Plot3D_maketransform(p3); + } +} + +/* ------------------------------------------------------------------------- + Plot3D_autoperspective(Plot3D *p3, double fovy) + + Automatically figures out a semi-decent viewpoint given the + min,max parameters currently set for this image + ------------------------------------------------------------------------- */ + +void +Plot3D_autoperspective(Plot3D *p3, double fovy) { + + /* Make a perspective transformation matrix for this system */ + + double zfar; + double znear; + double d, dmax; + double cx,cy,cz; + double xmin,xmax,ymin,ymax,zmin,zmax; + + xmin = p3->xmin; + ymin = p3->ymin; + zmin = p3->zmin; + xmax = p3->xmax; + ymax = p3->ymax; + zmax = p3->zmax; + cx = p3->xcenter; + cy = p3->ycenter; + cz = p3->zcenter; + + /* Calculate longest point from center point */ + + dmax = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); + d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); + if (d > dmax) dmax = d; + d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); + if (d > dmax) dmax = d; + d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); + if (d > dmax) dmax = d; + d = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + + dmax = sqrt(dmax); + d = p3->lookatz; + + znear = d - dmax; + zfar = znear+1.5*dmax; + Plot3D_perspective(p3, fovy,znear,zfar); + +} + + +/* --------------------------------------------------------------------- + Plot3D_ortho(Plot3D *p3, double left, double right, double bottom, double top) + + Sets up an orthographic viewing transformation. + --------------------------------------------------------------------- */ + +void +Plot3D_ortho(Plot3D *p3, double left, double right, double bottom, double top) { + + + Matrix_identity(p3->view_mat); + p3->view_mat[0] = (2.0/(right - left))/p3->aspect; + p3->view_mat[5] = 2.0/(top - bottom); + p3->view_mat[10] = -1; + p3->view_mat[15] = 1.0; + p3->view_mat[3] = -(right+left)/(right-left); + p3->view_mat[7] = -(top+bottom)/(top-bottom); + + /* Update the global transformation matrix */ + + Plot3D_maketransform(p3); + p3->pers_mode = ORTHO; + p3->ortho_left = left; + p3->ortho_right = right; + p3->ortho_bottom = bottom; + p3->ortho_top = top; + +} + +/* --------------------------------------------------------------------- + Plot3D_autoortho(Plot3D *p3) + + Automatically pick an orthographic projection that's probably + pretty good. + --------------------------------------------------------------------- */ + +void +Plot3D_autoortho(Plot3D *p3) { + + /* Make a perspective transformation matrix for this system */ + + double d, dmax; + double cx,cy,cz; + double xmin,xmax,ymin,ymax,zmin,zmax; + + xmin = p3->xmin; + ymin = p3->ymin; + zmin = p3->zmin; + xmax = p3->xmax; + ymax = p3->ymax; + zmax = p3->zmax; + cx = p3->xcenter; + cy = p3->ycenter; + cz = p3->zcenter; + + /* Calculate longest point from center point */ + + dmax = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); + d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmin-cz)*(zmin-cz); + if (d > dmax) dmax = d; + d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); + if (d > dmax) dmax = d; + d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmin-cz)*(zmin-cz); + if (d > dmax) dmax = d; + d = (xmin-cx)*(xmin-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + d = (xmax-cx)*(xmax-cx) + (ymin-cy)*(ymin-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + d = (xmin-cx)*(xmin-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + d = (xmax-cx)*(xmax-cx) + (ymax-cy)*(ymax-cy) + (zmax-cz)*(zmax-cz); + if (d > dmax) dmax = d; + + dmax = sqrt(dmax); + + Plot3D_ortho(p3,-dmax,dmax,-dmax,dmax); + +} + + + +/* ------------------------------------------------------------------------- + Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax) + + Sets the viewport for this 3D graph. Will recalculate all of the + local viewing transformation matrices accordingly. + ------------------------------------------------------------------------- */ +void +Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax) { + if (p3) { + if ((vxmin > vxmax) || (vymin >vymax)) return; + p3->view_xmin = vxmin; + p3->view_ymin = vymin; + p3->view_xmax = vxmax; + p3->view_ymax = vymax; + p3->width = (vxmax - vxmin); + p3->height = (vymax - vymin); + p3->aspect = (double) p3->width/(double) p3->height; + + /* Fix up the viewing transformation matrix */ + + if (p3->pers_mode == PERSPECTIVE) { + Plot3D_lookat(p3,p3->lookatz); + Plot3D_perspective(p3,p3->fovy,p3->znear,p3->zfar); + } else { + Plot3D_ortho(p3,p3->ortho_left,p3->ortho_right,p3->ortho_bottom, p3->ortho_top); + } + FrameBuffer_setclip(p3->frame,vxmin,vymin,vxmax,vymax); + } +} + +/* --------------------------------------------------------------------------- + Plot2D_start(Plot2D *p3) + + Set up viewing region and other parameters for this image. + --------------------------------------------------------------------------- */ + +void +Plot3D_start(Plot3D *p3) { + if (p3) + FrameBuffer_setclip(p3->frame, p3->view_xmin,p3->view_ymin,p3->view_xmax, p3->view_ymax); + +} + +/* ------------------------------------------------------------------------- + Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel Color) + + Plot a 3D point + ------------------------------------------------------------------------- */ + +void +Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel color) { + + GL_Vector t; + int ix, iy; + double invw; + FrameBuffer *f; + + /* Perform a transformation */ + + Matrix_transform4(p3->trans_mat,x,y,z,1,&t); + + /* Scale the coordinates into unit cube */ + + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; +#ifdef GL_DEBUG + fprintf(stdout,"t.x = %g, t.y = %g, t.z = %g\n", t.x,t.y,t.z); +#endif + /* Calculate the x and y coordinates */ + + ix = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5); + iy = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5); + + if ((ix >= 0) && (ix < p3->width) && + (iy >= 0) && (ix < p3->height)) { + ix += p3->view_xmin; + iy += p3->view_ymin; + f = p3->frame; + if (t.z <= f->zbuffer[iy][ix]) { + f->pixels[iy][ix] = color; + f->zbuffer[iy][ix] = t.z; + } + } +} + +/* ---------------------------------------------------------------------- + Plot3D_rotx(Plot3D *p3, double deg) + + Rotate the model around its x axis. + ---------------------------------------------------------------------- */ + +void +Plot3D_rotx(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatex(temp,deg); /* Construct a x rotation matrix */ + Matrix_multiply(p3->model_mat,temp,p3->model_mat); + Plot3D_maketransform(p3); + +} + +/* ---------------------------------------------------------------------- + Plot3D_roty(Plot3D *p3, double deg) + + Rotate the model around its y axis. + ---------------------------------------------------------------------- */ + +void +Plot3D_roty(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatey(temp,deg); /* Construct a y rotation matrix */ + Matrix_multiply(p3->model_mat,temp,p3->model_mat); + Plot3D_maketransform(p3); + +} + +/* ---------------------------------------------------------------------- + Plot3D_rotz(Plot3D *p3, double deg) + + Rotate the model around its z axis. + ---------------------------------------------------------------------- */ + +void +Plot3D_rotz(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatez(temp,deg); /* Construct a z rotation matrix */ + Matrix_multiply(p3->model_mat,temp,p3->model_mat); + Plot3D_maketransform(p3); + +} + + +/* ---------------------------------------------------------------------- + Plot3D_rotd(Plot3D *p3, double deg) + + Rotate the model down + ---------------------------------------------------------------------- */ + +void +Plot3D_rotd(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatex(temp,deg); /* Construct a x rotation matrix */ + Matrix_multiply(temp, p3->model_mat,p3->model_mat); + Plot3D_maketransform(p3); + +} + + +/* ---------------------------------------------------------------------- + Plot3D_rotu(Plot3D *p3, double deg) + + Rotate the model up + ---------------------------------------------------------------------- */ + +void +Plot3D_rotu(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatex(temp,-deg); /* Construct a x rotation matrix */ + Matrix_multiply(temp,p3->model_mat,p3->model_mat); + Plot3D_maketransform(p3); + +} + + +/* ---------------------------------------------------------------------- + Plot3D_rotr(Plot3D *p3, double deg) + + Rotate the model down + ---------------------------------------------------------------------- */ + +void +Plot3D_rotr(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatey(temp,deg); /* Construct a y rotation matrix */ + Matrix_multiply(temp, p3->model_mat,p3->model_mat); + Plot3D_maketransform(p3); + +} + + +/* ---------------------------------------------------------------------- + Plot3D_rotl(Plot3D *p3, double deg) + + Rotate the model left + ---------------------------------------------------------------------- */ + +void +Plot3D_rotl(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatey(temp,-deg); /* Construct a y rotation matrix */ + Matrix_multiply(temp,p3->model_mat,p3->model_mat); + Plot3D_maketransform(p3); + +} + + +/* ---------------------------------------------------------------------- + Plot3D_rotc(Plot3D *p3, double deg) + + Rotate the model around center point + ---------------------------------------------------------------------- */ + +void +Plot3D_rotc(Plot3D *p3, double deg) { + double temp[16]; + + Matrix_rotatez(temp,-deg); /* Construct a z rotation matrix */ + Matrix_multiply(temp,p3->model_mat,p3->model_mat); + Plot3D_maketransform(p3); +} + +/* ------------------------------------------------------------------------- + Plot3D_zoom(Plot3D *p3, double percent) + + Zooms in or out the current image. percent defines a percentage of + zoom. + + Zooming is actually done by adjusting the perspective field of view + instead of scaling the model or moving in the viewpoint. This + seems to work the best. + ------------------------------------------------------------------------- */ + +void +Plot3D_zoom(Plot3D *p3, double percent) { + + double scale; + double dx; + if (percent <= 0) return; + scale = percent/100.0; + + dx = (1.0/scale - 1.0)/(2*p3->zoom); /* Don't even ask where this came from */ + p3->xshift += dx; + p3->yshift += dx; + p3->zoom = p3->zoom*scale; + +#ifdef OLD + p3->fovy = p3->fovy*scale; + if (p3->fovy > 170.0) p3->fovy = 170.0; + if (p3->fovy == 0) p3->fovy = 0.0001; + Plot3D_lookat(p3,p3->lookatz); + Plot3D_perspective(p3,p3->fovy,p3->znear,p3->zfar); +#endif +} + +/* -------------------------------------------------------------------------- + Plot3D_left(Plot3D *p3, double s) + + Shifts the image to the left by s units. This is a little funky. + + s is scaled so that s = 100 equals one full screen. + -------------------------------------------------------------------------- */ +void +Plot3D_left(Plot3D *p3, double s) { + p3->xshift -= (s/100.0)/p3->zoom; +} + +/* -------------------------------------------------------------------------- + Plot3D_right(Plot3D *p3, double s) + + Shifts the image to the right by s units. + + s is scaled so that s = 100 equals one full screen. + -------------------------------------------------------------------------- */ +void +Plot3D_right(Plot3D *p3, double s) { + p3->xshift += (s/100.0)/p3->zoom; +} + +/* -------------------------------------------------------------------------- + Plot3D_up(Plot3D *p3, double s) + + Shifts the image up left by s units. + + s is scaled so that s = 100 equals one full screen. + -------------------------------------------------------------------------- */ +void +Plot3D_up(Plot3D *p3, double s) { + p3->yshift += (s/100.0)/p3->zoom; +} + +/* -------------------------------------------------------------------------- + Plot3D_down(Plot3D *p3, double s) + + Shifts the image down by s units. + + s is scaled so that s = 100 equals one full screen. + -------------------------------------------------------------------------- */ +void +Plot3D_down(Plot3D *p3, double s) { + p3->yshift -= (s/100.0)/p3->zoom; +} + +/* ------------------------------------------------------------------------- + Plot3D_center(Plot3D *p3, double cx, double cy) + + Centers the image on a point in the range (0,0) - (100,100) + ------------------------------------------------------------------------- */ +void +Plot3D_center(Plot3D *p3, double cx, double cy) { + Plot3D_left(p3,cx-50); + Plot3D_down(p3,cy-50); +} + + + +/*************************************************************************** + * 3d Primitives * + ***************************************************************************/ + +/* ------------------------------------------------------------------------- + Plot3D_horizontal(Plot3D *p3, int xmin, int xmax, int y, double z1, double z2, Pixel color) + + Draws a "Horizontal" line on the framebuffer between two screen coordinates, + but also supplies z-values and zbuffering. This function probably isn't + too useful by itself, but will be used by a number of other primitives. + -------------------------------------------------------------------------- */ + +void Plot3D_horizontal(Plot3D *p3, int xmin, int xmax, int y, Zvalue z1, Zvalue z2, Pixel color) { + Pixel *p; + FrameBuffer *f; + int i; + Zvalue *zbuf,z,mz; + int startx, endx; + + f = p3->frame; + if ((y < f->ymin) || (y >= f->ymax)) return; + if (xmin > f->xmax) return; + if (xmin < f->xmin) startx = f->xmin; + else startx = xmin; + if (xmax < f->xmin) return; + if (xmax >= f->xmax) endx = f->xmax - 1; + else endx = xmax; + + /* Calculate z slope */ + + if (xmax != xmin) { + mz = (Zvalue) ((double) (z2 - z1)/(double) (xmax - xmin)); + } else { + mz = 0; + } + + /* Draw it */ + + p = &f->pixels[y][startx]; + zbuf = &f->zbuffer[y][startx]; + z = (Zvalue) (mz*(startx-xmin) + z1); + for (i = startx; i <= endx; i++, p++, zbuf++,z+=mz) { + if (z <= *zbuf) { + *p = color; + *zbuf = z; + } + } +} + + +/* ------------------------------------------------------------------------- + Plot3D_vertical(Plot3D *p3, int ymin, int ymax, int x, double z1, double z2, Pixel color) + + Draws a "Vertical" line on the framebuffer between two screen coordinates, + but also supplies z-values and zbuffering. This function probably isn't + too useful by itself, but will be used by a number of other primitives. + -------------------------------------------------------------------------- */ + +void Plot3D_vertical(Plot3D *p3, int ymin, int ymax, int x, Zvalue z1, Zvalue z2, Pixel color) { + Pixel *p; + FrameBuffer *f; + int i; + Zvalue *zbuf,z,mz; + int starty, endy; + + f = p3->frame; + if ((x < f->xmin) || (x >= f->xmax)) return; + if (ymin >= f->ymax) return; + if (ymin < f->ymin) starty = f->ymin; + else starty = ymin; + if (ymax < f->ymin) return; + if (ymax >= f->ymax) endy = f->ymax - 1; + else endy = ymax; + + /* Calculate z slope */ + + mz = (double) (z2 - z1)/(double) (ymax - ymin); + + /* Draw it */ + + p = &f->pixels[starty][x]; + zbuf = &f->zbuffer[starty][x]; + for (i = starty; i <= endy; i++, p+=f->width, zbuf+=f->width) { + z = (Zvalue) (mz*(i-ymin) + z1); + if (z <= *zbuf) { + *p = color; + *zbuf = z; + } + } +} + +/* ------------------------------------------------------------------------------- + Plot3D_linetransform(Plot3D *p3, int x1, int y1, Zvalue z1, + int x2, int y2, Zvalue z2, Pixel c) + + Draw a 3D line between points that have already been transformed into + 3D space. + + Uses a Bresenham line algorithm, but with linear interpolation between + Zvalues. + ------------------------------------------------------------------------------- */ + +void +Plot3D_linetransform(Plot3D *p3, int x1, int y1, Zvalue z1, int x2, int y2, Zvalue z2, Pixel c) { + + int orig_x1, orig_y1, orig_x2,orig_y2; + Zvalue zt; + + /* Bresenham line drawing parameters */ + FrameBuffer *f; + int dx,dy,dxneg,dyneg, inc1,inc2,di; + int x, y, xpixels, ypixels, xt, yt; + Pixel *p; + double m; + int end1 = 0, end2 = 0; + Zvalue *zbuf,mz,z; + + f = p3->frame; + + /* Need to figure out where in the heck this line is */ + + dx = x2 - x1; + dy = y2 - y1; + + if ((dx == 0) && (dy == 0)) { + if ((x1 < f->xmin) || (x1 >= f->xmax) || + (y1 < f->ymin) || (y1 >= f->ymax)) return; + if (z1 <= f->zbuffer[y1][x1]) { + f->pixels[y1][x1] = c; + } + return; + } + if (dx == 0) { + /* Draw a Vertical Line */ + if (y1 < y2) + Plot3D_vertical(p3,y1,y2,x1,z1,z2,c); + else + Plot3D_vertical(p3,y2,y1,x1,z2,z1,c); + return; + } + if (dy == 0) { + /* Draw a Horizontal Line */ + if (x1 < x2) + Plot3D_horizontal(p3,x1,x2,y1,z1,z2,c); + else + Plot3D_horizontal(p3,x2,x1,y1,z2,z1,c); + return; + } + + /* Figure out where in the heck these lines are using the + Cohen-Sutherland Line Clipping Scheme. */ + + end1 = ((x1 - f->xmin) < 0) | + (((f->xmax- 1 - x1) < 0) << 1) | + (((y1 - f->ymin) < 0) << 2) | + (((f->ymax-1 - y1) < 0) << 3); + + end2 = ((x2 - f->xmin) < 0) | + (((f->xmax-1 - x2) < 0) << 1) | + (((y2 - f->ymin) < 0) << 2) | + (((f->ymax-1 - y2) < 0) << 3); + + if (end1 & end2) return; /* Nope : Not visible */ + + /* Make sure points have a favorable orientation */ + + if (x1 > x2) { + xt = x1; + x1 = x2; + x2 = xt; + yt = y1; + y1 = y2; + y2 = yt; + zt = z1; + z1 = z2; + z2 = zt; + } + + /* Save original points before we clip them off */ + orig_x1 = x1; + orig_y1 = y1; + orig_x2 = x2; + orig_y2 = y2; + + /* Clip against the boundaries */ + m = (y2 - y1)/(double) (x2-x1); + if (x1 < f->xmin) { + y1 = (f->xmin - x1)*m + y1; + x1 = f->xmin; + } + if (x2 >= f->xmax) { + y2 = (f->xmax -1 -x1)*m + y1; + x2 = f->xmax - 1; + } + + if (y1 > y2) { + xt = x1; + x1 = x2; + x2 = xt; + yt = y1; + y1 = y2; + y2 = yt; + zt = z1; + z1 = z2; + z2 = zt; + + /* Swap original points */ + + xt = orig_x1; + orig_x1 = orig_x2; + orig_x2 = xt; + yt = orig_y1; + orig_y1 = orig_y2; + orig_y2 = yt; + } + + m = 1/m; + if (y1 < f->ymin) { + x1 = (f->ymin - y1)*m + x1; + y1 = f->ymin; + } + if (y2 >= f->ymax) { + x2 = (f->ymax-1-y1)*m + x1; + y2 = f->ymax-1; + } + + if ((x1 < f->xmin) || (x1 >= f->xmax) || (y1 < f->ymin) || (y1 >= f->ymax) || + (x2 < f->xmin) || (x2 >= f->xmax) || (y2 < f->ymin) || (y2 >= f->ymax)) return; + + dx = x2 - x1; + dy = y2 - y1; + xpixels = f->width; + ypixels = f->height; + + dxneg = (dx < 0) ? 1 : 0; + dyneg = (dy < 0) ? 1 : 0; + + dx = abs(dx); + dy = abs(dy); + if (dx >= dy) { + /* Slope between -1 and 1. */ + mz = (z2 - z1)/(orig_x2 - orig_x1); /* Z interpolation slope */ + if (dxneg) { + x = x1; + y = y1; + x1 = x2; + y1 = y2; + x2 = x; + y2 = y; + dyneg = !dyneg; + } + inc1 = 2*dy; + inc2 = 2*(dy-dx); + di = 2*dy-dx; + + /* Draw a line using x as independent variable */ + + p = &f->pixels[y1][x1]; + zbuf = &f->zbuffer[y1][x1]; + x = x1; + while (x <= x2) { + /* Do a z-buffer check */ + z = mz*(x-orig_x1)+z1; + if (z <= *zbuf){ + *p = c; + *zbuf = z; + } + p++; + zbuf++; + if (di < 0) { + di = di + inc1; + } else { + if (dyneg) { + p = p - xpixels; + zbuf = zbuf - xpixels; + di = di + inc2; + } else { + p = p + xpixels; + zbuf = zbuf + xpixels; + di = di + inc2; + } + } + x++; + } + } else { + /* Slope < -1 or > 1 */ + mz = (z2 - z1)/(double) (orig_y2 - orig_y1); + if (dyneg) { + x = x1; + y = y1; + x1 = x2; + y1 = y2; + x2 = x; + y2 = y; + dxneg = !dxneg; + } + inc1 = 2*dx; + inc2 = 2*(dx-dy); + di = 2*dx-dy; + + /* Draw a line using y as independent variable */ + + p = &f->pixels[y1][x1]; + zbuf = &f->zbuffer[y1][x1]; + y = y1; + while (y <= y2) { + /* Do a z-buffer check */ + z = mz*(y-orig_y1)+z1; + if (z <= *zbuf) { + *p = c; + *zbuf = z; + } + p = p + xpixels; + zbuf = zbuf + xpixels; + if (di < 0) { + di = di + inc1; + } else { + if (dxneg) { + p = p - 1; + zbuf = zbuf - 1; + di = di + inc2; + } else { + p = p + 1; + zbuf = zbuf + 1; + di = di + inc2; + } + } + y++; + } + } +} + +/* --------------------------------------------------------------------------- + Plot3D_line(Plot3D *p3, double x1, double y1, double z1, double x2, double y2, double z2,int color) + + Draws a line in 3D space. This is done as follows (for lack of a better + method). + + 1. The points (x1,y1,z1) and (x2,y2,z2) are transformed into screen coordinates + 2. We draw the line using a modified Bresenham line algorithm. + 3. Zbuffer values are linearly interpolated between the two points. + ---------------------------------------------------------------------------- */ + +void +Plot3D_line(Plot3D *p3, double fx1, double fy1, double fz1, double fx2, double fy2, + double fz2, Pixel c) { + + /* 3D Transformation parameters */ + GL_Vector t; + double invw; + int x1,y1,x2,y2; + Zvalue z1,z2; + + /* Transform the two points into screen coordinates */ + + Matrix_transform4(p3->trans_mat,fx1,fy1,fz1,1,&t); /* Point 1 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + x1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + y1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + z1 = t.z; + + Matrix_transform4(p3->trans_mat,fx2,fy2,fz2,1,&t); /* Point 2 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + x2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + y2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + z2 = t.z; + Plot3D_linetransform(p3,x1,y1,z1,x2,y2,z2,c); +} + + +/* ------------------------------------------------------------------------- + Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + Pixel fillcolor) + + This function draws a 3D z-buffered outline triangle. + -------------------------------------------------------------------------- */ + +void Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color) { + + int tx1, tx2, tx3, ty1, ty2, ty3; + Zvalue tz1, tz2, tz3; + GL_Vector t; + double invw; + + /* Transform the three points into screen coordinates */ + + Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz1 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz2 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz3 = (Zvalue) t.z; + + + Plot3D_linetransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,color); + Plot3D_linetransform(p3,tx1,ty1,tz1,tx3,ty3,tz3,color); + Plot3D_linetransform(p3,tx2,ty2,tz2,tx3,ty3,tz3,color); +} + + +/* ------------------------------------------------------------------------- + Plot3D_solidtriangletransform(Plot3D *p3, int tx1, int ty2, Zvalue tz1, + int tx2, int ty2, Zvalue tz2, + int tx3, int ty3, Zvalue tz3, Pixel color) + + This function draws a 3D z-buffered filled triangle. Assumes three + points have already been transformed into screen coordinates. + + General idea : + 1. Transform the three points into screen coordinates + 2. Order three points vertically on screen. + 3. Check for degenerate cases (where 3 points are colinear). + 4. Fill in the resulting triangle using horizontal lines. + -------------------------------------------------------------------------- */ + +void Plot3D_solidtriangletransform(Plot3D *p3, int tx1, int ty1, Zvalue tz1, + int tx2, int ty2, Zvalue tz2, + int tx3, int ty3, Zvalue tz3, Pixel color) { + int tempx, tempy; + Zvalue tempz; + double m1,m2,m3, mz1, mz2, mz3; + int y; + int ix1, ix2; + Zvalue zz1, zz2; + FrameBuffer *f; + register double fy1,fy2; + register Zvalue fz1,fz2; + + f = p3->frame; + + /* Check for degenerate cases here */ + + if ((ty1 == ty2) && (ty2 == ty3)) { + if (tx2 < tx1) { /* Swap points 1 and 2 if 2 is higher */ + tempx = tx1; + tempz = tz1; + tx1 = tx2; + tz1 = tz2; + tx2 = tempx; + tz2 = tempz; + } + if (tx3 < tx1) { /* Swap points 1 and 3 if 3 is higher */ + tempx = tx1; + tempz = tz1; + tx1 = tx3; + tz1 = tz3; + tx3 = tempx; + tz3 = tempz; + } + if (tx3 < tx2) { /* Swap points 2 and 3 if 3 is higher */ + tempx = tx2; + tempz = tz2; + tx2 = tx3; + tz2 = tz3; + tx3 = tempx; + tz3 = tempz; + } + + /* Points are aligned horizontally. Handle as a special case */ + /* Just draw three lines using the outline color */ + + Plot3D_horizontal(p3,tx1,tx2,ty1,tz1,tz3,color); + + /* Plot3D_linetransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,color); + Plot3D_linetransform(p3,tx1,ty1,tz1,tx3,ty3,tz3,color); + Plot3D_linetransform(p3,tx2,ty2,tz2,tx3,ty3,tz3,color); + */ + + return; + } + + /* Figure out which point has the greatest "y" value */ + + if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ + tempx = tx1; + tempy = ty1; + tempz = tz1; + tx1 = tx2; + ty1 = ty2; + tz1 = tz2; + tx2 = tempx; + ty2 = tempy; + tz2 = tempz; + } + if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ + tempx = tx1; + tempy = ty1; + tempz = tz1; + tx1 = tx3; + ty1 = ty3; + tz1 = tz3; + tx3 = tempx; + ty3 = tempy; + tz3 = tempz; + } + if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ + tempx = tx2; + tempy = ty2; + tempz = tz2; + tx2 = tx3; + ty2 = ty3; + tz2 = tz3; + tx3 = tempx; + ty3 = tempy; + tz3 = tempz; + } + + /* Points are now order so that t_1 is the highest point, t_2 is the + middle point, and t_3 is the lowest point */ + + if (ty2 < ty1) { + /* First process line segments between (x1,y1)-(x2,y2) + And between (x1,y1),(x3,y3) */ + + m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + mz1 = (tz2 - tz1)/(double) (ty2 - ty1); + mz2 = (tz3 - tz1)/(double) (ty3 - ty1); + + y = ty1; + fy1 = m1*(y-ty1)+0.5 + tx1; + fy2 = m2*(y-ty1)+0.5 + tx1; + fz1 = mz1*(y-ty1) + tz1; + fz2 = mz2*(y-ty1) + tz1; + while (y >= ty2) { + /* Replace with bresenham scheme */ + /* Calculate x values from slope */ + ix1 = (int) fy1; + ix2 = (int) fy2; + zz1 = fz1; + zz2 = fz2; + fy1-= m1; + fy2-= m2; + fz1-= mz1; + fz2-= mz2; + if (ix1 > ix2) + Plot3D_horizontal(p3,ix2,ix1,y,zz2,zz1,color); + else + Plot3D_horizontal(p3,ix1,ix2,y,zz1,zz2,color); + y--; + } + } + if (ty3 < ty2) { + /* Draw lower half of the triangle */ + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); + mz2 = (tz3 - tz1)/(double) (ty3 - ty1); + mz3 = (tz3 - tz2)/(double) (ty3 - ty2); + y = ty2; + while (y >= ty3) { + ix1 = (int) (m3*(y-ty2)+0.5)+tx2; + ix2 = (int) (m2*(y-ty1)+0.5)+tx1; + zz1 = mz3*(y-ty2)+tz2; + zz2 = mz2*(y-ty1)+tz1; + if (ix1 > ix2) + Plot3D_horizontal(p3,ix2,ix1,y,zz2,zz1,color); + else + Plot3D_horizontal(p3,ix1,ix2,y,zz1,zz2,color); + y--; + } + } +} + +/* ------------------------------------------------------------------------- + Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + Pixel color) + + This function draws a 3D z-buffered filled triangle. Can be used to + draw other primitives such as quadralaterals, etc... + + This function simply transforms the given points and calls + Plot3D_SolidTriangleTransform(). + -------------------------------------------------------------------------- */ + +void Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color) { + + int tx1, tx2, tx3, ty1, ty2, ty3; + Zvalue tz1, tz2, tz3; + GL_Vector t; + double invw; + Matrix a; + register double xshift, yshift, zoom, width, height, view_xmin, view_ymin; + + a = p3->trans_mat; + xshift = p3->xshift; + yshift = p3->yshift; + zoom = p3->zoom; + height = p3->height; + width = p3->width; + view_xmin = p3->view_xmin; + view_ymin = p3->view_ymin; + + /* Transform the three points into screen coordinates */ + + t.w = a[12]*x1 + a[13]*y1 + a[14]*z1 + a[15]; + invw = 1.0/t.w; + t.x = (a[0]*x1 + a[1]*y1 + a[2]*z1 + a[3])*invw; + t.y = (a[4]*x1 + a[5]*y1 + a[6]*z1 + a[7])*invw; + t.z = (a[8]*x1 + a[9]*y1 + a[10]*z1 + a[11])*invw; + + tx1 = (int) ((t.x +xshift)*zoom*width + 0.5) + view_xmin; + ty1 = (int) ((t.y +yshift)*zoom*height + 0.5) + view_ymin; + tz1 = (Zvalue) t.z; + + + t.w = a[12]*x2 + a[13]*y2 + a[14]*z2 + a[15]; + invw = 1.0/t.w; + t.x = (a[0]*x2 + a[1]*y2 + a[2]*z2 + a[3])*invw; + t.y = (a[4]*x2 + a[5]*y2 + a[6]*z2 + a[7])*invw; + t.z = (a[8]*x2 + a[9]*y2 + a[10]*z2 + a[11])*invw; + tx2 = (int) ((t.x +xshift)*zoom*width + 0.5) + view_xmin; + ty2 = (int) ((t.y +yshift)*zoom*height + 0.5) + view_ymin; + tz2 = (Zvalue) t.z; + + t.w = a[12]*x3 + a[13]*y3 + a[14]*z3 + a[15]; + invw = 1.0/t.w; + t.x = (a[0]*x3 + a[1]*y3 + a[2]*z3 + a[3])*invw; + t.y = (a[4]*x3 + a[5]*y3 + a[6]*z3 + a[7])*invw; + t.z = (a[8]*x3 + a[9]*y3 + a[10]*z3 + a[11])*invw; + tx3 = (int) ((t.x +xshift)*zoom*width + 0.5) + view_xmin; + ty3 = (int) ((t.y +yshift)*zoom*height + 0.5) + view_ymin; + tz3 = (Zvalue) t.z; + + Plot3D_solidtriangletransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,tx3,ty3,tz3,color); + +} + + +/* ------------------------------------------------------------------------- + Plot3D_horizontalinterp(Plot3D *p3, int xmin, int xmax, int y, + double z1, double z2, Pixel c1, Pixel c2) + + Draws a "Horizontal" line on the framebuffer between two screen coordinates, + but also supplies z-values and zbuffering. Performs a color interpolation + between c1 and c2. This is primarily used by the SolidTriangleInterp() + function to give the illusion of smooth surfaces. + -------------------------------------------------------------------------- */ + +void Plot3D_horizontalinterp(Plot3D *p3, int xmin, int xmax, int y, + Zvalue z1, Zvalue z2, Pixel c1, Pixel c2) { + Pixel *p; + FrameBuffer *f; + int i; + Zvalue *zbuf,z,mz; + double mc; + int startx, endx; + double invdx; + + f = p3->frame; + if ((y < f->ymin) || (y >= f->ymax)) return; + if (xmin >= f->xmax) return; + if (xmin < f->xmin) startx = f->xmin; + else startx = xmin; + if (xmax < f->xmin) return; + if (xmax >= f->xmax) endx = f->xmax - 1; + else endx = xmax; + + /* Calculate z slope */ + if (xmax != xmin) { + invdx = 1.0/(double) (xmax-xmin); + } else { + invdx = 0; + } + + mz = (Zvalue) (z2 - z1)*invdx; + + /* Calculate c slope */ + + mc = (double) (c2 - c1)*invdx; + + /* Draw it */ + + p = &f->pixels[y][startx]; + zbuf = &f->zbuffer[y][startx]; + for (i = startx; i <= endx; i++, p++, zbuf++) { + z = (Zvalue) (mz*(i-xmin) + z1); + if (z <= *zbuf) { + *p = (Pixel) (mc*(i-xmin)+c1); + *zbuf = z; + } + } +} + +/* ------------------------------------------------------------------------- + Plot3D_interptriangletransform(Plot3D *p3, + int tx1, int ty2, Zvalue tz1, Pixel c1, + int tx2, int ty2, Zvalue tz2, Pixel c2, + int tx3, int ty3, Zvalue tz3, Pixel c3) + + This function draws a 3D z-buffered filled triangle with color + interpolation. Assumes three points have already been transformed + into screen coordinates. + + General idea : + 1. Transform the three points into screen coordinates + 2. Order three points vertically on screen. + 3. Check for degenerate cases (where 3 points are colinear). + 4. Fill in the resulting triangle using horizontal lines. + 5. Colors are interpolated between end points + -------------------------------------------------------------------------- */ + +void Plot3D_interptriangletransform(Plot3D *p3, + int tx1, int ty1, Zvalue tz1, Pixel c1, + int tx2, int ty2, Zvalue tz2, Pixel c2, + int tx3, int ty3, Zvalue tz3, Pixel c3) { + int tempx, tempy; + Zvalue tempz; + double m1,m2,m3, mz1, mz2, mz3; + double mc1,mc2,mc3; + Pixel ic1,ic2,tempc; + int y; + int ix1, ix2; + Zvalue zz1, zz2; + FrameBuffer *f; + + f = p3->frame; + + /* Figure out which point has the greatest "y" value */ + + if (ty2 > ty1) { /* Swap points 1 and 2 if 2 is higher */ + tempx = tx1; + tempy = ty1; + tempz = tz1; + tempc = c1; + tx1 = tx2; + ty1 = ty2; + tz1 = tz2; + c1 = c2; + tx2 = tempx; + ty2 = tempy; + tz2 = tempz; + c2 = tempc; + } + if (ty3 > ty1) { /* Swap points 1 and 3 if 3 is higher */ + tempx = tx1; + tempy = ty1; + tempz = tz1; + tempc = c1; + tx1 = tx3; + ty1 = ty3; + tz1 = tz3; + c1 = c3; + tx3 = tempx; + ty3 = tempy; + tz3 = tempz; + c3 = tempc; + } + if (ty3 > ty2) { /* Swap points 2 and 3 if 3 is higher */ + tempx = tx2; + tempy = ty2; + tempz = tz2; + tempc = c2; + tx2 = tx3; + ty2 = ty3; + tz2 = tz3; + c2 = c3; + tx3 = tempx; + ty3 = tempy; + tz3 = tempz; + c3 = tempc; + } + + /* Points are now order so that t_1 is the highest point, t_2 is the + middle point, and t_3 is the lowest point */ + + /* Check for degenerate cases here */ + + if ((ty1 == ty2) && (ty2 == ty3)) { + + /* Points are aligned horizontally. Handle as a special case */ + /* Just draw three lines using the outline color */ + + if (tx2 > tx1) + Plot3D_horizontalinterp(p3,tx1,tx2,ty1,tz1,tz2,c1,c2); + else + Plot3D_horizontalinterp(p3,tx2,tx1,ty1,tz2,tz1,c2,c1); + if (tx3 > tx1) + Plot3D_horizontalinterp(p3,tx1,tx3,ty1,tz1,tz3,c1,c3); + else + Plot3D_horizontalinterp(p3,tx3,tx1,ty1,tz3,tz1,c3,c1); + if (tx3 > tx2) + Plot3D_horizontalinterp(p3,tx2,tx3,ty2,tz2,tz3,c2,c3); + else + Plot3D_horizontalinterp(p3,tx3,tx2,ty2,tz3,tz2,c3,c2); + + } else { + + /* First process line segments between (x1,y1)-(x2,y2) + And between (x1,y1),(x3,y3) */ + + if (ty2 < ty1) { + m1 = (double) (tx2 - tx1)/(double) (ty2 - ty1); + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + mz1 = (tz2 - tz1)/(double) (ty2 - ty1); + mz2 = (tz3 - tz1)/(double) (ty3 - ty1); + mc1 = (c2 - c1)/(double) (ty2 - ty1); + mc2 = (c3 - c1)/(double) (ty3 - ty1); + + y = ty1; + while (y >= ty2) { + /* Calculate x values from slope */ + ix1 = (int) (m1*(y-ty1)+0.5) + tx1; + ix2 = (int) (m2*(y-ty1)+0.5) + tx1; + zz1 = mz1*(y-ty1) + tz1; + zz2 = mz2*(y-ty1) + tz1; + ic1 = mc1*(y-ty1) + c1; + ic2 = mc2*(y-ty1) + c1; + if (ix1 > ix2) + Plot3D_horizontalinterp(p3,ix2,ix1,y,zz2,zz1,ic2,ic1); + else + Plot3D_horizontalinterp(p3,ix1,ix2,y,zz1,zz2,ic1,ic2); + y--; + } + } + if (ty3 < ty2) { + /* Draw lower half of the triangle */ + m2 = (double) (tx3 - tx1)/(double) (ty3 - ty1); + mz2 = (tz3 - tz1)/(double) (ty3 - ty1); + mc2 = (c3 - c1)/(double) (ty3 - ty1); + m3 = (double) (tx3 - tx2)/(double)(ty3 - ty2); + mz3 = (tz3 - tz2)/(double) (ty3 - ty2); + mc3 = (c3 - c2)/(double) (ty3 - ty2); + y = ty2; + while (y >= ty3) { + ix1 = (int) (m3*(y-ty2)+0.5)+tx2; + ix2 = (int) (m2*(y-ty1)+0.5)+tx1; + zz1 = mz3*(y-ty2)+tz2; + zz2 = mz2*(y-ty1)+tz1; + ic1 = mc3*(y-ty2)+c2; + ic2 = mc2*(y-ty1)+c1; + if (ix1 > ix2) + Plot3D_horizontalinterp(p3,ix2,ix1,y,zz2,zz1,ic2,ic1); + else + Plot3D_horizontalinterp(p3,ix1,ix2,y,zz1,zz2,ic1,ic2); + y--; + } + } + } +} + +/* ------------------------------------------------------------------------- + Plot3D_interptriangle(Plot3D *p3, + double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3) + + This function draws a 3D z-buffered filled triangle with color + interpolation. + + This function simply transforms the given points and calls + Plot3D_InterpTriangleTransform(). + -------------------------------------------------------------------------- */ + +void Plot3D_interptriangle(Plot3D *p3, + double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3) { + + int tx1, tx2, tx3, ty1, ty2, ty3; + Zvalue tz1, tz2, tz3; + GL_Vector t; + double invw; + + /* Transform the three points into screen coordinates */ + + Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz1 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz2 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz3 = (Zvalue) t.z; + + Plot3D_interptriangletransform(p3,tx1,ty1,tz1,c1,tx2,ty2,tz2,c2,tx3,ty3,tz3,c3); +} + +/* ------------------------------------------------------------------------- + Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel fillcolor) + + This function draws a 3D outlined Quadralateral. Used primarily for + drawing meshes and other things. + + Plotting is done in the following order : + (x1,y1,z1) --> (x2,y2,z2) + (x2,y2,z2) --> (x3,y3,z3) + (x3,y3,z3) --> (x4,y4,z4) + (x4,y4,z4) --> (x1,y1,z1) + -------------------------------------------------------------------------- */ + +void Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color) { + + int tx1, tx2, tx3, tx4, ty1, ty2, ty3, ty4; + Zvalue tz1, tz2, tz3, tz4; + GL_Vector t; + double invw; + + /* Transform the three points into screen coordinates */ + + Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz1 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz2 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz3 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x4,y4,z4,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx4 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty4 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz4 = (Zvalue) t.z; + + Plot3D_linetransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,color); + Plot3D_linetransform(p3,tx2,ty2,tz2,tx3,ty3,tz3,color); + Plot3D_linetransform(p3,tx3,ty3,tz3,tx4,ty4,tz4,color); + Plot3D_linetransform(p3,tx4,ty4,tz4,tx1,ty1,tz1,color); + +} + + +/* ------------------------------------------------------------------------- + Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel fillcolor) + + This function draws a 3D solid Quadralateral. Uses the function + Plot3D_SolidTriangleTransform() to fill in the region. + + Plotting is done in the following order : + (x1,y1,z1) --> (x2,y2,z2) + (x2,y2,z2) --> (x3,y3,z3) + (x3,y3,z3) --> (x4,y4,z4) + (x4,y4,z4) --> (x1,y1,z1) + -------------------------------------------------------------------------- */ + +void Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color) { + + int tx1, tx2, tx3, tx4, ty1, ty2, ty3, ty4; + Zvalue tz1, tz2, tz3, tz4; + GL_Vector t; + double invw; + + /* Transform the three points into screen coordinates */ + + Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz1 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz2 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz3 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x4,y4,z4,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx4 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty4 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz4 = (Zvalue) t.z; + + Plot3D_solidtriangletransform(p3,tx1,ty1,tz1,tx2,ty2,tz2,tx3,ty3,tz3,color); + Plot3D_solidtriangletransform(p3,tx1,ty1,tz1,tx4,ty4,tz4,tx3,ty3,tz3,color); +} + +/* ------------------------------------------------------------------------- + Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3, + double x4, double y4, double z4, Pixel c4) + + This function draws a 3D color-interpolated Quadralateral. Uses the function + Plot3D_InterpTriangleTransform() to fill in the region. + + Plotting is done in the following order : + (x1,y1,z1) --> (x2,y2,z2) + (x2,y2,z2) --> (x3,y3,z3) + (x3,y3,z3) --> (x4,y4,z4) + (x4,y4,z4) --> (x1,y1,z1) + -------------------------------------------------------------------------- */ + +void Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3, + double x4, double y4, double z4, Pixel c4) { + + + int tx1, tx2, tx3, tx4, ty1, ty2, ty3, ty4; + Zvalue tz1, tz2, tz3, tz4; + GL_Vector t; + double invw; + + /* Transform the three points into screen coordinates */ + + Matrix_transform4(p3->trans_mat,x1,y1,z1,1,&t); /* Point 1 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx1 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty1 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz1 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x2,y2,z2,1,&t); /* Point 2 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx2 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty2 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz2 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x3,y3,z3,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx3 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty3 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz3 = (Zvalue) t.z; + + Matrix_transform4(p3->trans_mat,x4,y4,z4,1,&t); /* Point 3 */ + invw = 1.0/t.w; + t.x = t.x *invw; + t.y = t.y *invw; + t.z = t.z *invw; + tx4 = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty4 = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz4 = (Zvalue) t.z; + + Plot3D_interptriangletransform(p3,tx1,ty1,tz1,c1,tx2,ty2,tz2,c2,tx3,ty3,tz3,c3); + Plot3D_interptriangletransform(p3,tx1,ty1,tz1,c1,tx4,ty4,tz4,c4,tx3,ty3,tz3,c3); + +} + +/* -------------------------------------------------------------------------- + Plot3D_solidsphere(Plot3 *p3, double x, double y, double z, double radius, + Pixel c) + + Makes a 3D sphere at x,y,z with given radius and color. + + Basic strategy : + 1. Transform point to screen coordinates + 2. Figure out what the radius is in screen coordinates + 3. Use bresenham algorithm for large spheres + 4. Use bitmaps for small spheres + -------------------------------------------------------------------------- */ + +/* This is used to fill in spheres */ +static int s_xmin; +static int s_ymin; +static int s_xmax; +static int s_ymax; +static Pixel **s_pixels; +static Zvalue **s_zbuffer; + +void Plot3D_spherehorizontal(int xmin, int xmax, int y, Zvalue z, Pixel color) { + int i; + int startx, endx; + Pixel *p; + Zvalue *zbuf; + + if ((y < s_ymin) || (y >= s_ymax)) return; + if (xmin < s_xmin) startx = s_xmin; + else startx = xmin; + if (xmax >= s_xmax) endx = s_xmax - 1; + else endx = xmax; + + /* Draw it */ + + p = &s_pixels[y][xmin]; + zbuf = &s_zbuffer[y][xmin]; + for (i = startx; i <= endx; i++, p++, zbuf++) { + if (z <= *zbuf) { + *p = color; + *zbuf = z; + } + } +} + +void Plot3D_solidsphere(Plot3D *p3, double x, double y, double z, double radius, + Pixel c) { + + GL_Vector t,r; + double rad; + int tx,ty, irad; + Zvalue tz; + double invw; + int ix, iy, ix1,ix2,p; + FrameBuffer *f; + + /* First transform the point into model coordinates */ + + Matrix_transform4(p3->fullmodel_mat,x,y,z,1,&t); + + /* Now transform two points in order to find proper sphere radius */ + + Matrix_transform4(p3->view_mat,t.x+radius,t.y,t.z,t.w,&r); /* transform radius */ + Matrix_transform4(p3->view_mat,t.x,t.y,t.z,t.w,&t); + + invw = 1.0/t.w; + t.x = t.x*invw; + t.y = t.y*invw; + t.z = t.z*invw; + invw = 1.0/r.w; + r.x = r.x*invw; + r.y = r.y*invw; + r.z = r.z*invw; + invw = 1.0/r.w; + + rad = fabs(t.x - r.x); + + /* Transform everything into screen coordinates */ + + tx = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz = (Zvalue) t.z; + irad = (int) (p3->zoom*(rad*p3->width + 0.5)); + + /* This is only a temporary solution (maybe). */ + +#define fill_zcircle(x,y,c) \ + ix1 = tx - x; \ + ix2 = tx + x; \ + if (ix1 < s_xmin) ix1 = s_xmin; \ + if (ix2 >= s_xmax) ix2 = s_xmax; \ + Plot3D_spherehorizontal(ix1,ix2,y,tz,c); + + f = p3->frame; + s_xmin = f->xmin; + s_ymin = f->ymin; + s_xmax = f->xmax; + s_ymax = f->ymax; + s_pixels = f->pixels; + s_zbuffer = f->zbuffer; + if (irad <= 1) { + /* Plot a single pixel */ + if ((tx >= f->xmin) && (tx < f->xmax)) { + if ((ty >= f->ymin) && (ty ymax)) { + if (tz <= f->zbuffer[ty][tx]) { + f->pixels[ty][tx] = c; + f->zbuffer[ty][tx] = tz; + } + } + } + return; + } + ix = 0; + iy = irad; + p = 3-2*irad; + while (ix <= iy) { + fill_zcircle(ix,ty+iy,c); + fill_zcircle(ix,ty-iy,c); + fill_zcircle(iy,ty+ix,c); + fill_zcircle(iy,ty-ix,c); + if (p < 0) p = p + 4*ix + 6; + else { + p = p + 4*(ix-iy) + 10; + iy = iy -1; + } + ix++; + } +} + + +/* -------------------------------------------------------------------- + Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, + double radius, Pixel color, Pixel bc) + + Draws an outlined sphere. + -------------------------------------------------------------------- */ + +void Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, + double radius, Pixel c, Pixel bc) +{ + GL_Vector t,r; + double rad; + int tx,ty, irad; + Zvalue tz; + double invw; + int ix, iy, ix1,ix2,p; + + FrameBuffer *f; + + /* First transform the point into model coordinates */ + + Matrix_transform4(p3->fullmodel_mat,x,y,z,1,&t); + + /* Now transform two points in order to find proper sphere radius */ + + Matrix_transform4(p3->view_mat,t.x+radius,t.y,t.z,t.w,&r); /* transform radius */ + Matrix_transform4(p3->view_mat,t.x,t.y,t.z,t.w,&t); + + invw = 1.0/t.w; + t.x = t.x*invw; + t.y = t.y*invw; + t.z = t.z*invw; + invw = 1.0/r.w; + r.x = r.x*invw; + r.y = r.y*invw; + r.z = r.z*invw; + invw = 1.0/r.w; + + rad = fabs(t.x - r.x); + + /* Transform everything into screen coordinates */ + + tx = (int) ((t.x +p3->xshift)*p3->zoom*p3->width + 0.5) + p3->view_xmin; + ty = (int) ((t.y +p3->yshift)*p3->zoom*p3->height + 0.5) + p3->view_ymin; + tz = (Zvalue) t.z; + irad = (int) (p3->zoom*(rad*p3->width + 0.5)); + + /* This is only a temporary solution (maybe). */ +#define plot_zcircle(x,y,c) \ + if ((x >= s_xmin) && (x < s_xmax) && \ + (y >= s_ymin) && (y < s_ymax)) {\ + if (tz <= s_zbuffer[y][x]) { \ + s_pixels[y][x] = c; \ + s_zbuffer[y][x] = tz; } \ + } + + f = p3->frame; + s_xmin = f->xmin; + s_ymin = f->ymin; + s_xmax = f->xmax; + s_ymax = f->ymax; + s_pixels = f->pixels; + s_zbuffer = f->zbuffer; + + if (irad <= 1) { + /* Plot a single pixel */ + if ((tx >= f->xmin) && (tx < f->xmax)) { + if ((ty >= f->ymin) && (ty ymax)) { + if (tz <= f->zbuffer[ty][tx]) { + f->pixels[ty][tx] = c; + f->zbuffer[ty][tx] = tz; + } + } + } + return; + } + ix = 0; + iy = irad; + p = 3-2*irad; + while (ix <= iy) { + fill_zcircle(ix,ty+iy,c); + fill_zcircle(ix,ty-iy,c); + fill_zcircle(iy,ty+ix,c); + fill_zcircle(iy,ty-ix,c); + + plot_zcircle(tx+ix,ty+iy,bc); + plot_zcircle(tx-ix,ty+iy,bc); + plot_zcircle(tx+ix,ty-iy,bc); + plot_zcircle(tx-ix,ty-iy,bc); + plot_zcircle(tx+iy,ty+ix,bc); + plot_zcircle(tx-iy,ty+ix,bc); + plot_zcircle(tx+iy,ty-ix,bc); + plot_zcircle(tx-iy,ty-ix,bc); + if (p < 0) p = p + 4*ix + 6; + else { + p = p + 4*(ix-iy) + 10; + iy = iy -1; + } + ix++; + } +} + +/* QUAD Test + Test out quad functions for graphing */ + +double zf(double x, double y) { + return cos(sqrt(x*x + y*y)*10.0)/(sqrt(x*x+y*y)+1); +} + +void Quad_Test(Plot3D *p3, int npoints) { + int i,j; + double dx; + double x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,za; + int c; + dx = 2.0/npoints; + + + for (i = 0; i < npoints; i++) + for (j = 0; j < npoints; j++) { + x1 = i*dx + -1.0; + y1 = j*dx + -1.0; + x2 = x1 + dx; + x3 = x1 + dx; + x4 = x1; + y2 = y1; + y3 = y1 + dx; + y4 = y1 + dx; + z1 = zf(x1,y1); + z2 = zf(x2,y2); + z3 = zf(x3,y3); + z4 = zf(x4,y4); + za = 0.25*(z1+z2+z3+z4); + c = 16+((za + 1)*120); + if (c > 254) c = 254; + Plot3D_quad(p3,x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,(Pixel) c); + } +} + + +void Quad_SolidTest(Plot3D *p3, int npoints) { + int i,j; + double dx; + double x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,za; + int c; + dx = 2.0/npoints; + + + for (i = 0; i < npoints; i++) + for (j = 0; j < npoints; j++) { + x1 = i*dx + -1.0; + y1 = j*dx + -1.0; + x2 = x1 + dx; + x3 = x1 + dx; + x4 = x1; + y2 = y1; + y3 = y1 + dx; + y4 = y1 + dx; + z1 = zf(x1,y1); + z2 = zf(x2,y2); + z3 = zf(x3,y3); + z4 = zf(x4,y4); + za = 0.25*(z1+z2+z3+z4); + c = 16+((za + 1)*120); + if (c > 254) c = 254; + Plot3D_solidquad(p3,x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4,(Pixel) c); + } +} + + + +void Quad_InterpTest(Plot3D *p3, int npoints) { + int i,j; + double dx; + double x1,y1,z1,x2,y2,z2,x3,y3,z3,x4,y4,z4; + int c1,c2,c3,c4; + dx = 2.0/npoints; + + + for (i = 0; i < npoints; i++) + for (j = 0; j < npoints; j++) { + x1 = i*dx + -1.0; + y1 = j*dx + -1.0; + x2 = x1 + dx; + x3 = x1 + dx; + x4 = x1; + y2 = y1; + y3 = y1 + dx; + y4 = y1 + dx; + z1 = zf(x1,y1); + z2 = zf(x2,y2); + z3 = zf(x3,y3); + z4 = zf(x4,y4); + c1 = 16+((z1 + 1)*120); + c2 = 16+((z2 + 1)*120); + c3 = 16+((z3 + 1)*120); + c4 = 16+((z4 + 1)*120); + if (c1 > 254) c1 = 254; + if (c2 > 254) c2 = 254; + if (c3 > 254) c3 = 254; + if (c4 > 254) c4 = 254; + Plot3D_interpquad(p3,x1,y1,z1,(Pixel) c1,x2,y2,z2,(Pixel) c2,x3,y3,z3,(Pixel) c3,x4,y4,z4,(Pixel) c4); + } +} + + + + + + + + + + + + diff --git a/Examples/GIFPlot/Makefile.in b/Examples/GIFPlot/Makefile.in new file mode 100644 index 000000000..4e51360c8 --- /dev/null +++ b/Examples/GIFPlot/Makefile.in @@ -0,0 +1,23 @@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +RANLIB = @RANLIB@ +OPT = + +INSTALL = ../install-sh -c +INSTALL_DATA = ${INSTALL} -m 644 +SHELL = /bin/sh + +all: + cd Lib && $(MAKE) OPT="$(OPT)" + +install: + $(INSTALL_DATA) Include/gifplot.h $(prefix)/include/gifplot.h + $(INSTALL_DATA) libgifplot.a $(exec_prefix)/lib/libgifplot.a + $(RANLIB) $(exec_prefix)/lib/libgifplot.a + +clean:: + rm -f *.@OBJEXT@ *~ libgifplot.a *_wrap* *_man* + cd Lib && $(MAKE) clean + rm -f config.log config.status config.cache + +check: all diff --git a/Examples/GIFPlot/Ocaml/check.list b/Examples/GIFPlot/Ocaml/check.list new file mode 100644 index 000000000..e75ee586a --- /dev/null +++ b/Examples/GIFPlot/Ocaml/check.list @@ -0,0 +1,3 @@ +# see top-level Makefile.in +full +simple diff --git a/Examples/GIFPlot/Ocaml/full/Makefile b/Examples/GIFPlot/Ocaml/full/Makefile new file mode 100644 index 000000000..4f35c43f9 --- /dev/null +++ b/Examples/GIFPlot/Ocaml/full/Makefile @@ -0,0 +1,33 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Include +SRCS = +TARGET = gifcaml +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot -lm +INCLUDES = -I../../Include +MLFILE = gifplot.ml +IOBJS = runme.cmo +PROGFILE = runme.ml + +all:: static + +static:: + $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ + IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ + SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_static + +dynamic:: + $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ + IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ + SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_dynamic + +clean:: + $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Ocaml/full/README b/Examples/GIFPlot/Ocaml/full/README new file mode 100644 index 000000000..4a2b400b5 --- /dev/null +++ b/Examples/GIFPlot/Ocaml/full/README @@ -0,0 +1,8 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The ocaml program 'runme.ml' does something a little more +interesting. You'll have to go look at the header file to get a complete +listing of the functions. + + + + diff --git a/Examples/GIFPlot/Ocaml/full/cmap b/Examples/GIFPlot/Ocaml/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC C_float x) + [ x ; y ; z1 ; + (x +. dx) ; y ; z2 ; + (x +. dx) ; (y +. dy) ; z3 ; + x ; (y +. dx) ; z4 ; + (float_of_int (c + 16)) ]))) ; + y_loop (y +. dy) (j + 1) + end in + begin + y_loop ymin 0 ; + x_loop (x +. dx) (i + 1) + end + end in + x_loop xmin 0 + end + +let _ = print_endline "Making a nice 3D plot..." +let _ = drawsolid () + +let _ = _FrameBuffer_writeGIF (C_list [ frame ; cmap ; C_string "image.gif" ]) +let _ = print_endline "Write image.gif" diff --git a/Examples/GIFPlot/Ocaml/simple/Makefile b/Examples/GIFPlot/Ocaml/simple/Makefile new file mode 100644 index 000000000..50492efc7 --- /dev/null +++ b/Examples/GIFPlot/Ocaml/simple/Makefile @@ -0,0 +1,33 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Include +SRCS = +TARGET = gifsimple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot -lm +INCLUDES = -I../../Include +MLFILE = simple.ml +IOBJS = simple_wrap.o simple.cmo runme.cmo +PROGFILE = runme.ml + +all:: static + +static:: + $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ + IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ + SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_static + +dynamic:: + $(MAKE) -f $(TOP)/Makefile TOP='$(TOP)' \ + IOBJS='$(IOBJS)' PROGFILE='$(PROGFILE)' \ + SRCS='$(SRCS)' SWIG='$(SWIG)' MLFILE='$(MLFILE)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_static + +clean:: + $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Ocaml/simple/cmap b/Examples/GIFPlot/Ocaml/simple/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) { $c = 239; } + Plot3D_solidquad($p3,$x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); + $y = $y + $dy; + } + $x = $x + $dx; + } +} + +print "Making a nice 3D plot...\n"; +drawsolid(); + +FrameBuffer_writeGIF($frame,$cmap,"image.gif"); +print "Wrote image.gif\n"; + diff --git a/Examples/GIFPlot/Perl5/shadow/Makefile b/Examples/GIFPlot/Perl5/shadow/Makefile new file mode 100644 index 000000000..c39eac52c --- /dev/null +++ b/Examples/GIFPlot/Perl5/shadow/Makefile @@ -0,0 +1,25 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -outcurrentdir +SRCS = +TARGET = gifplot +INTERFACEDIR = ../../Interface/ +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot -lm +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5 + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static + +clean:: + $(MAKE) -f $(TOP)/Makefile perl5_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Perl5/shadow/README b/Examples/GIFPlot/Perl5/shadow/README new file mode 100644 index 000000000..ab12e344e --- /dev/null +++ b/Examples/GIFPlot/Perl5/shadow/README @@ -0,0 +1,2 @@ +This example use the file in ../../Interface/gifplot.i to build +an interface with shadow classes. Run the script 'runme.pl'. diff --git a/Examples/GIFPlot/Perl5/shadow/cmap b/Examples/GIFPlot/Perl5/shadow/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9ICclear($BLACK); + +$p3 = new gifplot::Plot3D($frame,$xmin,$ymin,$zmin,$xmax,$ymax,$zmax); +$p3->lookat(2*($zmax-$zmin)); +$p3->autoperspective(40); +$p3->rotu(60); +$p3->rotr(30); +$p3->rotd(10); + +sub drawsolid { + $p3->clear($BLACK); + $p3->start(); + my $dx = 1.0*($xmax-$xmin)/$nxpoints; + my $dy = 1.0*($ymax-$ymin)/$nypoints; + my $cscale = 240.0/($zmax-$zmin); + my $x = $xmin; + for ($i = 0; $i < $nxpoints; $i++) { + my $y = $ymin; + for ($j = 0; $j < $nypoints; $j++) { + my $z1 = func($x,$y); + my $z2 = func($x+$dx,$y); + my $z3 = func($x+$dx,$y+$dy); + my $z4 = func($x,$y+$dy); + my $c1 = $cscale*($z1-$zmin); + my $c2 = $cscale*($z2-$zmin); + my $c3 = $cscale*($z3-$zmin); + my $c4 = $cscale*($z4-$zmin); + my $c = ($c1+$c2+$c3+$c4)/4; + if ($c < 0) { $c = 0; } + if ($c > 239) { $c = 239; } + $p3->solidquad($x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); + $y = $y + $dy; + } + $x = $x + $dx; + } +} + +print "Making a nice 3D plot...\n"; +drawsolid(); + +$frame->writeGIF($cmap,"image.gif"); +print "Wrote image.gif\n"; + diff --git a/Examples/GIFPlot/Perl5/simple/Makefile b/Examples/GIFPlot/Perl5/simple/Makefile new file mode 100644 index 000000000..36a8fa938 --- /dev/null +++ b/Examples/GIFPlot/Perl5/simple/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = +SRCS = +TARGET = simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static + +clean:: + $(MAKE) -f $(TOP)/Makefile perl5_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Perl5/simple/README b/Examples/GIFPlot/Perl5/simple/README new file mode 100644 index 000000000..c2c799a70 --- /dev/null +++ b/Examples/GIFPlot/Perl5/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. The script 'runme.pl' runs the example. + + diff --git a/Examples/GIFPlot/Perl5/simple/runme.pl b/Examples/GIFPlot/Perl5/simple/runme.pl new file mode 100644 index 000000000..f28255e7c --- /dev/null +++ b/Examples/GIFPlot/Perl5/simple/runme.pl @@ -0,0 +1,28 @@ +# Draw some simple shapes +print "Drawing some basic shapes\n"; + +use simple; + +$cmap = simple::new_ColorMap(); +$f = simple::new_FrameBuffer(400,400); + +# Clear the picture +simple::FrameBuffer_clear($f,$simple::BLACK); + +# Make a red box +simple::FrameBuffer_box($f,40,40,200,200,$simple::RED); + +# Make a blue circle +simple::FrameBuffer_circle($f,200,200,40,$simple::BLUE); + +# Make green line +simple::FrameBuffer_line($f,10,390,390,200, $simple::GREEN); + +# Write an image out to disk + +simple::FrameBuffer_writeGIF($f,$cmap,"image.gif"); +print "Wrote image.gif\n"; + +simple::delete_FrameBuffer($f); +simple::delete_ColorMap($cmap); + diff --git a/Examples/GIFPlot/Perl5/simple/simple.i b/Examples/GIFPlot/Perl5/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Perl5/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/GIFPlot/Php/check.list b/Examples/GIFPlot/Php/check.list new file mode 100644 index 000000000..e75ee586a --- /dev/null +++ b/Examples/GIFPlot/Php/check.list @@ -0,0 +1,3 @@ +# see top-level Makefile.in +full +simple diff --git a/Examples/GIFPlot/Php/full/Makefile b/Examples/GIFPlot/Php/full/Makefile new file mode 100644 index 000000000..e33e7a730 --- /dev/null +++ b/Examples/GIFPlot/Php/full/Makefile @@ -0,0 +1,20 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Include -noproxy +SRCS = +TARGET = php_gifplot +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot -lm +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php + +clean:: + $(MAKE) -f $(TOP)/Makefile php_clean + rm -f *.gif + rm -f php_gifplot.h + +check: all diff --git a/Examples/GIFPlot/Php/full/README b/Examples/GIFPlot/Php/full/README new file mode 100644 index 000000000..f8d38d9af --- /dev/null +++ b/Examples/GIFPlot/Php/full/README @@ -0,0 +1,4 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The script 'runme.php3' does something a little more +interesting. You'll have to go look at the header file to get a complete +listing of the functions. diff --git a/Examples/GIFPlot/Php/full/cmap b/Examples/GIFPlot/Php/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239) { $c = 239; } + Plot3D_solidquad($p3, $x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); + $y = $y + $dy; + } + $x = $x + $dx; + } +} + +print "Making a nice 3D plot...\n"; +drawsolid(); + +FrameBuffer_writeGIF($frame, $cmap,"image.gif"); +print "Wrote image.gif\n"; + +?> diff --git a/Examples/GIFPlot/Php/shadow/Makefile b/Examples/GIFPlot/Php/shadow/Makefile new file mode 100644 index 000000000..df8ee30c0 --- /dev/null +++ b/Examples/GIFPlot/Php/shadow/Makefile @@ -0,0 +1,19 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Interface +SRCS = +TARGET = php_gifplot +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot -lm +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php + +clean:: + $(MAKE) -f $(TOP)/Makefile php_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Php/shadow/README b/Examples/GIFPlot/Php/shadow/README new file mode 100644 index 000000000..3e91f7d59 --- /dev/null +++ b/Examples/GIFPlot/Php/shadow/README @@ -0,0 +1,2 @@ +This example use the file in ../../Interface/gifplot.i to build +an interface with shadow classes. Run the script 'runme.php3'. diff --git a/Examples/GIFPlot/Php/shadow/cmap b/Examples/GIFPlot/Php/shadow/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9ICclear(BLACK); + + +$p3 = new Plot3D($frame,$xmin,$ymin,$zmin,$xmax,$ymax,$zmax); +$p3->lookat(2*($zmax-$zmin)); +$p3->autoperspective(40); +$p3->rotu(60); +$p3->rotr(30); +$p3->rotd(10); + +function drawsolid() { + global $xmax; + global $xmin; + global $ymax; + global $ymin; + global $zmin; + global $zmax; + global $nxpoints; + global $nypoints; + global $p3; + + $p3->clear(BLACK); + $p3->start(); + $dx = 1.0*($xmax-$xmin)/$nxpoints; + $dy = 1.0*($ymax-$ymin)/$nypoints; + $cscale = 240.0/($zmax-$zmin); + $x = $xmin; + for ($i = 0; $i < $nxpoints; $i++) { + $y = $ymin; + for ($j = 0; $j < $nypoints; $j++) { + $z1 = func($x,$y); + $z2 = func($x+$dx,$y); + $z3 = func($x+$dx,$y+$dy); + $z4 = func($x,$y+$dy); + $c1 = $cscale*($z1-$zmin); + $c2 = $cscale*($z2-$zmin); + $c3 = $cscale*($z3-$zmin); + $c4 = $cscale*($z4-$zmin); + $c = ($c1+$c2+$c3+$c4)/4; + if ($c < 0) { $c = 0; } + if ($c > 239) { $c = 239; } + $p3->solidquad($x,$y,$z1,$x+$dx,$y,$z2,$x+$dx,$y+$dy,$z3,$x,$y+$dy,$z4,$c+16); + $y = $y + $dy; + } + $x = $x + $dx; + } +} + +print "Making a nice 3D plot...\n"; +drawsolid(); + +$frame->writeGIF($cmap,"image.gif"); +print "Wrote image.gif\n"; + +?> diff --git a/Examples/GIFPlot/Php/simple/Makefile b/Examples/GIFPlot/Php/simple/Makefile new file mode 100644 index 000000000..e60b641fa --- /dev/null +++ b/Examples/GIFPlot/Php/simple/Makefile @@ -0,0 +1,20 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -noproxy +SRCS = +TARGET = php_simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php + +clean:: + $(MAKE) -f $(TOP)/Makefile php_clean + rm -f *.gif + rm -f php_simple.h + +check: all diff --git a/Examples/GIFPlot/Php/simple/README b/Examples/GIFPlot/Php/simple/README new file mode 100644 index 000000000..c2c799a70 --- /dev/null +++ b/Examples/GIFPlot/Php/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. The script 'runme.pl' runs the example. + + diff --git a/Examples/GIFPlot/Php/simple/runme.php b/Examples/GIFPlot/Php/simple/runme.php new file mode 100644 index 000000000..cf21a0927 --- /dev/null +++ b/Examples/GIFPlot/Php/simple/runme.php @@ -0,0 +1,32 @@ + + diff --git a/Examples/GIFPlot/Php/simple/simple.i b/Examples/GIFPlot/Php/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Php/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/GIFPlot/Pike/check.list b/Examples/GIFPlot/Pike/check.list new file mode 100644 index 000000000..d38998cab --- /dev/null +++ b/Examples/GIFPlot/Pike/check.list @@ -0,0 +1,2 @@ +# see top-level Makefile.in +simple diff --git a/Examples/GIFPlot/Pike/simple/Makefile b/Examples/GIFPlot/Pike/simple/Makefile new file mode 100644 index 000000000..d339e0333 --- /dev/null +++ b/Examples/GIFPlot/Pike/simple/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = +SRCS = +TARGET = simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mypike' INTERFACE='$(INTERFACE)' pike_static + +clean:: + $(MAKE) -f $(TOP)/Makefile pike_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Pike/simple/README b/Examples/GIFPlot/Pike/simple/README new file mode 100644 index 000000000..177b3633b --- /dev/null +++ b/Examples/GIFPlot/Pike/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. The script 'runme.pike' runs the example. + + diff --git a/Examples/GIFPlot/Pike/simple/runme.pike b/Examples/GIFPlot/Pike/simple/runme.pike new file mode 100644 index 000000000..0e70235f1 --- /dev/null +++ b/Examples/GIFPlot/Pike/simple/runme.pike @@ -0,0 +1,30 @@ +int main() +{ + // Draw some simple shapes + write("Drawing some basic shapes\n"); + + .simple.ColorMap cmap = .simple.new_ColorMap(); + .simple.FrameBuffer f = .simple.new_FrameBuffer(400, 400); + + // Clear the picture + .simple.FrameBuffer_clear(f, .simple.BLACK); + + // Make a red box + .simple.FrameBuffer_box(f, 40, 40, 200, 200, .simple.RED); + + // Make a blue circle + .simple.FrameBuffer_circle(f, 200, 200, 40, .simple.BLUE); + + // Make green line + .simple.FrameBuffer_line(f, 10, 390, 390, 200, .simple.GREEN); + + // Write an image out to disk + .simple.FrameBuffer_writeGIF(f, cmap, "image.gif"); + write("Wrote image.gif\n"); + + .simple.delete_FrameBuffer(f); + .simple.delete_ColorMap(cmap); + + return 0; +} + diff --git a/Examples/GIFPlot/Pike/simple/simple.i b/Examples/GIFPlot/Pike/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Pike/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/GIFPlot/Python/check.list b/Examples/GIFPlot/Python/check.list new file mode 100644 index 000000000..13de977af --- /dev/null +++ b/Examples/GIFPlot/Python/check.list @@ -0,0 +1,4 @@ +# see top-level Makefile.in +full +shadow +simple diff --git a/Examples/GIFPlot/Python/full/Makefile b/Examples/GIFPlot/Python/full/Makefile new file mode 100644 index 000000000..83a7c864b --- /dev/null +++ b/Examples/GIFPlot/Python/full/Makefile @@ -0,0 +1,26 @@ +TOP = ../../.. +SWIG = $(TOP)/../preinst-swig +SWIGOPT = -I../../Include +SRCS = +TARGET = gifplot +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mypython' INTERFACE='$(INTERFACE)' python_static + +clean:: + $(MAKE) -f $(TOP)/Makefile python_clean + rm -f $(TARGET).py + rm -f *.gif + +check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/full/README b/Examples/GIFPlot/Python/full/README new file mode 100644 index 000000000..52971e40a --- /dev/null +++ b/Examples/GIFPlot/Python/full/README @@ -0,0 +1,8 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The script 'runme.py' does something a little more +interesting. You'll have to go look at the header file to get a complete +listing of the functions. + + + + diff --git a/Examples/GIFPlot/Python/full/cmap b/Examples/GIFPlot/Python/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 : c = 239 + Plot3D_solidquad(p3,x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) + y = y + dy + x = x + dx + +print "Making a nice 3D plot..." +drawsolid() + +FrameBuffer_writeGIF(frame,cmap,"image.gif") +print "Wrote image.gif" + diff --git a/Examples/GIFPlot/Python/shadow/Makefile b/Examples/GIFPlot/Python/shadow/Makefile new file mode 100644 index 000000000..3ae9a9897 --- /dev/null +++ b/Examples/GIFPlot/Python/shadow/Makefile @@ -0,0 +1,27 @@ +TOP = ../../.. +SWIG = $(TOP)/../preinst-swig +SWIGOPT = -outcurrentdir +SRCS = +TARGET = gifplot +INTERFACEDIR = ../../Interface/ +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static + +clean:: + $(MAKE) -f $(TOP)/Makefile python_clean + rm -f $(TARGET).py + rm -f *.gif + +check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/shadow/README b/Examples/GIFPlot/Python/shadow/README new file mode 100644 index 000000000..aa761e240 --- /dev/null +++ b/Examples/GIFPlot/Python/shadow/README @@ -0,0 +1,8 @@ +This example illustrates Python shadow classes. Take a look at +the file GIFPlot/Interface/gifplot.i + + + + + + diff --git a/Examples/GIFPlot/Python/shadow/cmap b/Examples/GIFPlot/Python/shadow/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 : c = 239 + p3.solidquad(x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) + y = y + dy + x = x + dx + +print "Making a nice 3D plot..." +drawsolid() + +frame.writeGIF(cmap,"image.gif") +print "Wrote image.gif" + diff --git a/Examples/GIFPlot/Python/simple/Makefile b/Examples/GIFPlot/Python/simple/Makefile new file mode 100644 index 000000000..9fc9a6c72 --- /dev/null +++ b/Examples/GIFPlot/Python/simple/Makefile @@ -0,0 +1,26 @@ +TOP = ../../.. +SWIG = $(TOP)/../preinst-swig +SWIGOPT = +SRCS = +TARGET = simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mypython' INTERFACE='$(INTERFACE)' python_static + +clean:: + $(MAKE) -f $(TOP)/Makefile python_clean + rm -f $(TARGET).py + rm -f *.gif + +check: all + $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/simple/README b/Examples/GIFPlot/Python/simple/README new file mode 100644 index 000000000..22152c665 --- /dev/null +++ b/Examples/GIFPlot/Python/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. The script 'runme.py' runs the example. + + diff --git a/Examples/GIFPlot/Python/simple/runme.py b/Examples/GIFPlot/Python/simple/runme.py new file mode 100644 index 000000000..dade67767 --- /dev/null +++ b/Examples/GIFPlot/Python/simple/runme.py @@ -0,0 +1,27 @@ +# Draw some simple shapes +print "Drawing some basic shapes" +import simple + +cmap = simple.new_ColorMap() +f = simple.new_FrameBuffer(400,400) + +# Clear the picture +simple.FrameBuffer_clear(f,simple.BLACK) + +# Make a red box +simple.FrameBuffer_box(f,40,40,200,200,simple.RED) + +# Make a blue circle +simple.FrameBuffer_circle(f,200,200,40,simple.BLUE) + +# Make green line +simple.FrameBuffer_line(f,10,390,390,200, simple.GREEN) + +# Write an image out to disk + +simple.FrameBuffer_writeGIF(f,cmap,"image.gif") +print "Wrote image.gif" + +simple.delete_FrameBuffer(f) +simple.delete_ColorMap(cmap) + diff --git a/Examples/GIFPlot/Python/simple/simple.i b/Examples/GIFPlot/Python/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Python/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/GIFPlot/README b/Examples/GIFPlot/README new file mode 100644 index 000000000..ac1025a42 --- /dev/null +++ b/Examples/GIFPlot/README @@ -0,0 +1,59 @@ +GIFPlot +======= + +To illustrate various SWIG features, the following examples involve +building an interface to a small, but somewhat useful graphics library +for creating 2D and 3D images in the form of GIF files. The Perl, +Python, Tcl, Java, Ruby etc. directories contain various examples specific to +those languages. + +This library was originally developed as part of the SPaSM molecular +dynamics project at Los Alamos National Laboratory. However, due to +patent enforcement issues related to LZW encoding and a general lack +of time on the part of the author, the library was never officially +released. On the plus side, a number of people have found it to be a +useful easter egg within the SWIG distribution :-). + + +DUE TO PATENT RESTRICTIONS ON THE LZW COMPRESSION ALGORITHM, THIS +LIBRARY ONLY PRODUCES UNCOMPRESSED GIF FILES. SO THERE. + + +Building the Library +==================== + +In order to run the examples, it is first necessary to build the GIFPlot +C library. To do this, simply run make: + + make + +Running the Examples +==================== + +Once the library has been built, go to your chosen language directory, +that is, Perl, Python, Tcl, Java, Ruby etc. Each example should have a +README file with a description. + +Each example can be compiled using the makefile in each example directory. This +makefile uses the top level makefile in the "Examples" directory of the distribution. +If the example doesn't compile, you will need to adjust the settings in this file. + +Documentation +============= + +Read the source Luke. The examples should be pretty much self-explanatory. +The header file Include/gifplot.h contains the full API. + +The original documentation for the library can be found online at: + + http://www.dabeaz.com/gifplot/index.html + + +Let me know what you think! +=========================== +If you found this example to be useful, confusing, or otherwise, I would like to know +about it. Suggestions for improvement are welcome. + +-- Dave (dave@dabeaz.com) + + diff --git a/Examples/GIFPlot/Ruby/check.list b/Examples/GIFPlot/Ruby/check.list new file mode 100644 index 000000000..13de977af --- /dev/null +++ b/Examples/GIFPlot/Ruby/check.list @@ -0,0 +1,4 @@ +# see top-level Makefile.in +full +shadow +simple diff --git a/Examples/GIFPlot/Ruby/full/Makefile b/Examples/GIFPlot/Ruby/full/Makefile new file mode 100644 index 000000000..5af8bc832 --- /dev/null +++ b/Examples/GIFPlot/Ruby/full/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Include +SRCS = +TARGET = gifplot +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static + +clean:: + $(MAKE) -f $(TOP)/Makefile ruby_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Ruby/full/README b/Examples/GIFPlot/Ruby/full/README new file mode 100644 index 000000000..22af6cb06 --- /dev/null +++ b/Examples/GIFPlot/Ruby/full/README @@ -0,0 +1,8 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The script 'runme.rb' does something a little more +interesting. You'll have to go look at the header file to get a complete +listing of the functions. + + + + diff --git a/Examples/GIFPlot/Ruby/full/cmap b/Examples/GIFPlot/Ruby/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 + Plot3D_solidquad(P3,x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) + y = y + dy + end + x = x + dx + end +end + +puts "Making a nice 3D plot..." +drawsolid() + +FrameBuffer_writeGIF(frame,cmap,"image.gif") +puts "Wrote image.gif" diff --git a/Examples/GIFPlot/Ruby/shadow/Makefile b/Examples/GIFPlot/Ruby/shadow/Makefile new file mode 100644 index 000000000..8cbea2a57 --- /dev/null +++ b/Examples/GIFPlot/Ruby/shadow/Makefile @@ -0,0 +1,25 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -outcurrentdir +SRCS = +TARGET = gifplot +INTERFACEDIR = ../../Interface/ +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static + +clean:: + $(MAKE) -f $(TOP)/Makefile ruby_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Ruby/shadow/README b/Examples/GIFPlot/Ruby/shadow/README new file mode 100644 index 000000000..7a33e137f --- /dev/null +++ b/Examples/GIFPlot/Ruby/shadow/README @@ -0,0 +1,5 @@ +This example illustrates Ruby shadow classes. Take a look at +the file GIFPlot/Interface/gifplot.i + +Actually Ruby module of SWIG needs no shadow class. But this example +is named "shadow" in order to be consistent with other languages. diff --git a/Examples/GIFPlot/Ruby/shadow/cmap b/Examples/GIFPlot/Ruby/shadow/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239 + P3.solidquad(x,y,z1,x+dx,y,z2,x+dx,y+dy,z3,x,y+dy,z4,c+16) + y = y + dy + end + x = x + dx + end +end + +puts "Making a nice 3D plot..." +drawsolid() + +frame.writeGIF(cmap,"image.gif") +puts "Wrote image.gif" + diff --git a/Examples/GIFPlot/Ruby/simple/Makefile b/Examples/GIFPlot/Ruby/simple/Makefile new file mode 100644 index 000000000..f7ca1a7d8 --- /dev/null +++ b/Examples/GIFPlot/Ruby/simple/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = +SRCS = +TARGET = simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static + +clean:: + $(MAKE) -f $(TOP)/Makefile ruby_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Ruby/simple/README b/Examples/GIFPlot/Ruby/simple/README new file mode 100644 index 000000000..9b51038bf --- /dev/null +++ b/Examples/GIFPlot/Ruby/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. The script 'runme.rb' runs the example. + + diff --git a/Examples/GIFPlot/Ruby/simple/runme.rb b/Examples/GIFPlot/Ruby/simple/runme.rb new file mode 100644 index 000000000..e8bf5a40f --- /dev/null +++ b/Examples/GIFPlot/Ruby/simple/runme.rb @@ -0,0 +1,27 @@ +# Draw some simple shapes +puts "Drawing some basic shapes" +require 'simple' + +cmap = Simple.new_ColorMap() +f = Simple.new_FrameBuffer(400,400) + +# Clear the picture +Simple.FrameBuffer_clear(f,Simple::BLACK) + +# Make a red box +Simple.FrameBuffer_box(f,40,40,200,200,Simple::RED) + +# Make a blue circle +Simple.FrameBuffer_circle(f,200,200,40,Simple::BLUE) + +# Make green line +Simple.FrameBuffer_line(f,10,390,390,200, Simple::GREEN) + +# Write an image out to disk + +Simple.FrameBuffer_writeGIF(f,cmap,"image.gif") +puts "Wrote image.gif" + +Simple.delete_FrameBuffer(f) +Simple.delete_ColorMap(cmap) + diff --git a/Examples/GIFPlot/Ruby/simple/simple.i b/Examples/GIFPlot/Ruby/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Ruby/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/GIFPlot/Tcl/check.list b/Examples/GIFPlot/Tcl/check.list new file mode 100644 index 000000000..2b6e3d28a --- /dev/null +++ b/Examples/GIFPlot/Tcl/check.list @@ -0,0 +1,4 @@ +# see top-level Makefile.in +full +mandel +simple diff --git a/Examples/GIFPlot/Tcl/full/Makefile b/Examples/GIFPlot/Tcl/full/Makefile new file mode 100644 index 000000000..0c016e364 --- /dev/null +++ b/Examples/GIFPlot/Tcl/full/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Include +SRCS = +TARGET = gifplot +INTERFACE = gifplot.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh + +clean:: + $(MAKE) -f $(TOP)/Makefile tcl_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Tcl/full/README b/Examples/GIFPlot/Tcl/full/README new file mode 100644 index 000000000..bdba4e8b0 --- /dev/null +++ b/Examples/GIFPlot/Tcl/full/README @@ -0,0 +1,8 @@ +This example runs the entire gifplot.h header file through SWIG without +any changes. The script 'runme.tcl' does something a little more +interesting. You'll have to go look at the header file to get a complete +listing of the functions. + + + + diff --git a/Examples/GIFPlot/Tcl/full/cmap b/Examples/GIFPlot/Tcl/full/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC 239} { set c 239 } + Plot3D_solidquad $p3 $x $y $z1 [expr {$x+$dx}] $y $z2 [expr {$x+$dx}] [expr {$y+$dy}] $z3 $x [expr {$y+$dy}] $z4 [expr {$c+16}] + set y [expr {$y + $dy}] + } + set x [expr {$x + $dx}] + } +} + +puts "Making a nice 3D plot..." +drawsolid + +FrameBuffer_writeGIF $frame $cmap "image.gif" +puts "Wrote image.gif" + diff --git a/Examples/GIFPlot/Tcl/mandel/Makefile b/Examples/GIFPlot/Tcl/mandel/Makefile new file mode 100644 index 000000000..9280d7bb2 --- /dev/null +++ b/Examples/GIFPlot/Tcl/mandel/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Interface +SRCS = +TARGET = gifplot +INTERFACE = mandel.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mywish' INTERFACE='$(INTERFACE)' wish + +clean:: + $(MAKE) -f $(TOP)/Makefile tcl_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Tcl/mandel/README b/Examples/GIFPlot/Tcl/mandel/README new file mode 100644 index 000000000..a533d09b8 --- /dev/null +++ b/Examples/GIFPlot/Tcl/mandel/README @@ -0,0 +1,6 @@ +Kill lots of time exploring the Mandelbrot set. This example uses +the full SWIG interface file located in ../../Interface. To run +the program, type 'wish mandel.tcl'. + + + diff --git a/Examples/GIFPlot/Tcl/mandel/cmap b/Examples/GIFPlot/Tcl/mandel/cmap new file mode 100644 index 0000000000000000000000000000000000000000..a20c331a9573dd8443380680bfe2cc428780d8a9 GIT binary patch literal 768 zcmZQzpd(=A5)hSEP}Mdtvvzdz4h)M)OwTDSuW4%Uoiu&!q7`d5@7R0z#JS5i?>&C` z?#s{r^Z@9-XXO?YlTlLFHMX#G@$?UkN=VBFxv-;m^2~WlR;}N<`@pd?7q8!a^y1xT znmh34m-nxpKDd4D;+bOy_iW#^cE#d(Gbi_Tw$xXZ7G$R-M27|XxI5We80l&#%Snpx zbFrd(h8Vt}lCeu@T6xFJRlCpJeMef510DGC$^DyG&YwK8f9IC {BoxBegin %W %x %y} + bind $c {BoxDrag %W %x %y} + bind $c "BoxFinish %W %x %y $p2 $mxmin $mymin $mxmax $mymax $func" +} + +proc BoxBegin {w x y} { + global box + set box(anchor) [list $x $y] + catch {unset box(last)} +} + +proc BoxDrag { w x y} { + global box + catch {$w delete $box(last)} + set box(last) [eval {$w create rect} $box(anchor) {$x $y -tag box -outline white}] +} + +proc BoxFinish {w x y p2 mxmin mymin mxmax mymax func } { + global box + set start $box(anchor) + set x1 [lrange $start 0 0] + set y1 [lrange $start 1 1] + catch {$w delete $box(last)} +# Call the handler function + $func $p2 $mxmin $mymin $mxmax $mymax $x1 $y1 $x $y +} + +proc display_image {filename p2 handler} { + global __imageno __images + set i [image create photo -file $filename] + set tl .image$__imageno + toplevel $tl + frame $tl.img + frame $tl.button + + set width [image width $i] + set height [image height $i] + canvas $tl.img.c -width [expr {$width+0}] -height [expr {$height+0}] + pack $tl.img.c + $tl.img.c create image 0 0 -image $i -anchor nw + label $tl.button.label -text $filename + pack $tl.button.label -side left + button $tl.button.dismiss -text "Dismiss" -command "dismiss $tl $i" -width 10 + pack $tl.button.dismiss -side right + pack $tl.img $tl.button -side top -fill x + BoxInit $tl.img.c $p2 [$p2 cget -xmin] [$p2 cget -ymin] [$p2 cget -xmax] [$p2 cget -ymax] $handler + bind $tl "dismiss $tl $i" + bind $tl "dismiss $tl $i" + + # Bind some actions to the canvas + + incr __imageno 1 +} + +proc test {} { + puts "hello" +} + diff --git a/Examples/GIFPlot/Tcl/mandel/mandel.i b/Examples/GIFPlot/Tcl/mandel/mandel.i new file mode 100644 index 000000000..0b19f4727 --- /dev/null +++ b/Examples/GIFPlot/Tcl/mandel/mandel.i @@ -0,0 +1,47 @@ +// Special module to run the mandlebrot set +%module gifplot +%include gifplot.i + +%inline %{ + +void mandel(Plot2D *p2, int tol) { + double scalingx; + double scalingy; + double zr,zi,ztr,zti,cr,ci; + double cscale; + int i,j,n; + FrameBuffer *f; + + f = p2->frame; + scalingx = (p2->xmax-p2->xmin)/f->width; + scalingy = (p2->ymax-p2->ymin)/f->height; + + cscale = 239.0/tol; + printf("working...\n"); + for (i = 0; i < f->width; i++) { + for (j = 0; j < f->height; j++) { + zr = scalingx*i + p2->xmin; + zi = scalingy*j + p2->ymin; + cr = zr; + ci = zi; + n = 0; + while (n < tol) { + ztr = zr*zr-zi*zi + cr; + zti = 2*zr*zi + ci; + zr = ztr; + zi = zti; + if (ztr*ztr + zti*zti > 20) break; + n = n + 1; + } + + if (n >= tol) FrameBuffer_plot(f,i,j,BLACK); + else FrameBuffer_plot(f,i,j,16+(int) (n*cscale)); + } + if ((i % 10) == 0) printf("%d\n",i); + } + +} + +%} + + diff --git a/Examples/GIFPlot/Tcl/mandel/mandel.tcl b/Examples/GIFPlot/Tcl/mandel/mandel.tcl new file mode 100644 index 000000000..3e1600bc1 --- /dev/null +++ b/Examples/GIFPlot/Tcl/mandel/mandel.tcl @@ -0,0 +1,170 @@ +catch { load ./gifplot[info sharedlibextension] } +source display.tcl +set tcl_precision 17 +set f [FrameBuffer -args 400 400] +set cmap [ColorMap -args cmap] +set p2 [Plot2D -args $f -3 -2 1 2] + +set xmin -3 +set xmax 1 +set ymin -2.0 +set ymax 2.0 +set tolerance 240 +set filename mandel.gif + +# Make a plot from the above parms + +proc make_plot {} { + global p2 cmap tolerance + global xmin ymin xmax ymax filename + $p2 setrange $xmin $ymin $xmax $ymax + $p2 start + . config -cursor watch + update + mandel $p2 $tolerance + . config -cursor arrow + [$p2 cget -frame] writeGIF $cmap $filename + display_image $filename $p2 set_zoom +} + + +# Take some screen coordinates and set global min and max values + +proc set_zoom {p2 mxmin mymin mxmax mymax x1 y1 x2 y2} { + global xmin ymin xmax ymax + + set frame [$p2 cget -frame] + set width [$frame cget -width] + set height [$frame cget -height] + + if {$x1 < 0} {set x1 0} + if {$x1 > ($width)} {set x1 $width} + if {$x2 < 0} {set x2 0} + if {$x2 > ($width)} {set x2 $width} + if {$x1 < $x2} {set ixmin $x1; set ixmax $x2} {set ixmin $x2; set ixmax $x1} + + if {$y1 < 0} {set y1 0} + if {$y1 > ($height)} {set y1 $height} + if {$y2 < 0} {set y2 0} + if {$y2 > ($height)} {set y2 $height} + if {$y1 < $y2} {set iymin $y1; set iymax $y2} {set iymin $y2; set iymax $y1} + + # Now determine new min and max values based on screen location + + set xmin [expr {$mxmin + ($mxmax-$mxmin)*($ixmin)/($width)}] + set xmax [expr {$mxmin + ($mxmax-$mxmin)*($ixmax)/($width)}] + set ymin [expr {$mymin + ($mymax-$mymin)*(($height)-($iymax))/($height)}] + set ymax [expr {$mymin + ($mymax-$mymin)*(($height)-($iymin))/($height)}] + + catch {make_plot} +} + +# Box drag constrained to a square +proc BoxDrag { w x y} { + global box + catch {$w delete $box(last)} + set x1 [lrange $box(anchor) 0 0] + set y1 [lrange $box(anchor) 1 1] + set dx [expr {$x - $x1}] + set dy [expr {$y - $y1}] + if {abs($dy) > abs($dx)} {set dx $dy} + set newx [expr {$x1 + $dx}] + set newy [expr {$y1 + $dx}] + set box(last) [eval {$w create rect} $box(anchor) {$newx $newy -tag box -outline white}] +} + + +proc BoxFinish {w x y p2 mxmin mymin mxmax mymax func } { + global box + set start $box(anchor) + set x1 [lrange $box(anchor) 0 0] + set y1 [lrange $box(anchor) 1 1] + set dx [expr {$x - $x1}] + set dy [expr {$y - $y1}] + if {($dx == 0) || ($dy == 0)} { + catch {$w delete $box(last)} + return + } + if {abs($dy) > abs($dx)} {set dx $dy} + set newx [expr {$x1 + $dx}] + set newy [expr {$y1 + $dx}] + $w config -cursor watch + update +# Call the handler function + $func $p2 $mxmin $mymin $mxmax $mymax $x1 $y1 $newx $newy + catch {$w delete $box(last)} + $w config -cursor arrow +} + + +# Create a few frames + +wm title . Mandelbrot +frame .title -relief groove -borderwidth 1 +label .title.name -text "Mandelbrot Set" +button .title.quit -text "Quit" -command "exit" +button .title.about -text "About" -command "about" +pack .title.name -side left +pack .title.quit .title.about -side right + +frame .func -relief groove -borderwidth 1 + +frame .func.xrange +label .func.xrange.xrlabel -text "X range" -width 12 +entry .func.xrange.xmin -textvar xmin -width 8 +label .func.xrange.xtolabel -text "to" +entry .func.xrange.xmax -textvar xmax -width 8 +pack .func.xrange.xrlabel .func.xrange.xmin .func.xrange.xtolabel .func.xrange.xmax -side left + +frame .func.yrange +label .func.yrange.yrlabel -text "Y range" -width 12 +entry .func.yrange.ymin -textvar ymin -width 8 +label .func.yrange.ytolabel -text "to" +entry .func.yrange.ymax -textvar ymax -width 8 +pack .func.yrange.yrlabel .func.yrange.ymin .func.yrange.ytolabel .func.yrange.ymax -side left + +frame .func.npoints +label .func.npoints.label -text "Tolerance " -width 12 +entry .func.npoints.npoints -textvar tolerance -width 8 +scale .func.npoints.scale -from 0 -to 2500 -variable tolerance -orient horizontal -showvalue false \ + -sliderlength 13 -bigincrement 10 -resolution 10 +pack .func.npoints.label .func.npoints.npoints .func.npoints.scale -side left + +pack .func.xrange .func.yrange .func.npoints -side top -fill x + +# Filename dialog + +frame .save -relief groove -borderwidth 1 + +frame .save.file +label .save.file.label -text "Save as" -width 12 +entry .save.file.filename -textvar filename -width 20 +pack .save.file.label .save.file.filename -side left +pack .save.file -side left -fill x +button .save.go -text "Plot" -command "make_plot" +pack .save.go -side right + +bind .save.file.filename {make_plot} + +pack .title .func .save -side top -fill both + +proc about { } { + toplevel .about -width 350 + + message .about.m -text "\ +Mandelbrot Set\n\n\ +Copyright (c) 1997\n\ +Dave Beazley\n\ +University of Utah\n\n\ +Creates a plot of the Mandelbrot set. Any displayed image can be zoomed by clicking and \ +dragging. Although the main calculation is written in C, it may take awhile for each \ +image to be calculated (be patient). Image quality can be improved at the expense of speed \ +by increasing the tolerance value.\n" + +button .about.okay -text "Ok" -command {destroy .about} + +pack .about.m .about.okay -side top +focus .about.okay +} + +make_plot diff --git a/Examples/GIFPlot/Tcl/simple/Makefile b/Examples/GIFPlot/Tcl/simple/Makefile new file mode 100644 index 000000000..752d79c10 --- /dev/null +++ b/Examples/GIFPlot/Tcl/simple/Makefile @@ -0,0 +1,24 @@ +TOP = ../../.. +SWIG = $(TOP)/../swig +SWIGOPT = +SRCS = +TARGET = simple +INTERFACE = simple.i +LIBS = -L../.. -lgifplot +INCLUDES = -I../../Include + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ + TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh + +clean:: + $(MAKE) -f $(TOP)/Makefile tcl_clean + rm -f *.gif + +check: all diff --git a/Examples/GIFPlot/Tcl/simple/README b/Examples/GIFPlot/Tcl/simple/README new file mode 100644 index 000000000..d6b291c92 --- /dev/null +++ b/Examples/GIFPlot/Tcl/simple/README @@ -0,0 +1,5 @@ +This is a very minimalistic example in which just a few functions +and constants from library are wrapped and used to draw some simple +shapes. The script 'runme.tcl' runs the example. + + diff --git a/Examples/GIFPlot/Tcl/simple/runme.tcl b/Examples/GIFPlot/Tcl/simple/runme.tcl new file mode 100644 index 000000000..e3f41266c --- /dev/null +++ b/Examples/GIFPlot/Tcl/simple/runme.tcl @@ -0,0 +1,27 @@ +# Draw some simple shapes +puts "Drawing some basic shapes" + +catch { load ./simple[info sharedlibextension] simple} + +set cmap [new_ColorMap] +set f [new_FrameBuffer 400 400] + +# Clear the picture +FrameBuffer_clear $f $BLACK + +# Make a red box +FrameBuffer_box $f 40 40 200 200 $RED + +# Make a blue circle +FrameBuffer_circle $f 200 200 40 $BLUE + +# Make green line +FrameBuffer_line $f 10 390 390 200 $GREEN + +# Write an image out to disk +FrameBuffer_writeGIF $f $cmap image.gif +puts "Wrote image.gif" + +delete_FrameBuffer $f +delete_ColorMap $cmap + diff --git a/Examples/GIFPlot/Tcl/simple/simple.i b/Examples/GIFPlot/Tcl/simple/simple.i new file mode 100644 index 000000000..457bc4c09 --- /dev/null +++ b/Examples/GIFPlot/Tcl/simple/simple.i @@ -0,0 +1,38 @@ +/* This example shows a very simple interface wrapping a few + primitive declarations */ + +%module simple +%{ +#include "gifplot.h" +%} + +typedef unsigned char Pixel; + +/* Here are a few useful functions */ + +ColorMap *new_ColorMap(char *filename = 0); +void delete_ColorMap(ColorMap *cmap); + +FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +void delete_FrameBuffer(FrameBuffer *frame); +void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); + +/* And some useful constants */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + + + + + diff --git a/Examples/chicken/zlib/Makefile b/Examples/chicken/zlib/Makefile new file mode 100644 index 000000000..720701444 --- /dev/null +++ b/Examples/chicken/zlib/Makefile @@ -0,0 +1,28 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +INTERFACE = example.i +SRCS = +CXXSRCS = +TARGET = zlib +INCLUDE = +SWIGOPT = -I/usr/include +CFLAGS = +VARIANT = +LIBS = -lz +VARIANT = _direct + +all:: $(TARGET) + +$(TARGET): $(INTERFACE) $(SRCS) + $(MAKE) -f $(TOP)/Makefile \ + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) + +clean:: + $(MAKE) -f $(TOP)/Makefile chicken_clean + rm -f example.scm + rm -f $(TARGET) + +check:: + csi test-zlib.scm diff --git a/Examples/chicken/zlib/README.html b/Examples/chicken/zlib/README.html new file mode 100644 index 000000000..b082a310c --- /dev/null +++ b/Examples/chicken/zlib/README.html @@ -0,0 +1,1666 @@ + + + + zlib - Chicken - SWIG example + + +

        zlib - Chicken - SWIG

        + +

        Table of Contents

        + Building the example
        + zlib.h
        + How the zlib wrapper was developed
        + +

        Building the example

        + + zlib must be installed for this example to work.
        + + Just type make to build this example.
        + + If zlib is not installed in /usr/lib and /usr/include, then do + something similar to the following: + +
        + 
        make SWIGOPT="-I/usr/local/include" LIBS="-L/usr/local/lib -lz"
        +
        + +

        zlib.h

        +
        + 
        +001: /* zlib.h -- interface of the 'zlib' general purpose compression library
+002:   version 1.1.4, March 11th, 2002
+003: 
+004:   Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
+005: 
+006:   This software is provided 'as-is', without any express or implied
+007:   warranty.  In no event will the authors be held liable for any damages
+008:   arising from the use of this software.
+009: 
+010:   Permission is granted to anyone to use this software for any purpose,
+011:   including commercial applications, and to alter it and redistribute it
+012:   freely, subject to the following restrictions:
+013: 
+014:   1. The origin of this software must not be misrepresented; you must not
+015:      claim that you wrote the original software. If you use this software
+016:      in a product, an acknowledgment in the product documentation would be
+017:      appreciated but is not required.
+018:   2. Altered source versions must be plainly marked as such, and must not be
+019:      misrepresented as being the original software.
+020:   3. This notice may not be removed or altered from any source distribution.
+021: 
+022:   Jean-loup Gailly        Mark Adler
+023:   jloup@gzip.org          madler@alumni.caltech.edu
+024: 
+025: 
+026:   The data format used by the zlib library is described by RFCs (Request for
+027:   Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
+028:   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+029: */
+030: 
+031: #ifndef _ZLIB_H
+032: #define _ZLIB_H
+033: 
+034: #include "zconf.h"
+035: 
+036: #ifdef __cplusplus
+037: extern "C" {
+038: #endif
+039: 
+040: #define ZLIB_VERSION "1.1.4"
+041: 
+042: /* 
+043:      The 'zlib' compression library provides in-memory compression and
+044:   decompression functions, including integrity checks of the uncompressed
+045:   data.  This version of the library supports only one compression method
+046:   (deflation) but other algorithms will be added later and will have the same
+047:   stream interface.
+048: 
+049:      Compression can be done in a single step if the buffers are large
+050:   enough (for example if an input file is mmap'ed), or can be done by
+051:   repeated calls of the compression function.  In the latter case, the
+052:   application must provide more input and/or consume the output
+053:   (providing more output space) before each call.
+054: 
+055:      The library also supports reading and writing files in gzip (.gz) format
+056:   with an interface similar to that of stdio.
+057: 
+058:      The library does not install any signal handler. The decoder checks
+059:   the consistency of the compressed data, so the library should never
+060:   crash even in case of corrupted input.
+061: */
+062: 
+063: typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+064: typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+065: 
+066: struct internal_state;
+067: 
+068: typedef struct z_stream_s {
+069:     Bytef    *next_in;  /* next input byte */
+070:     uInt     avail_in;  /* number of bytes available at next_in */
+071:     uLong    total_in;  /* total nb of input bytes read so far */
+072: 
+073:     Bytef    *next_out; /* next output byte should be put there */
+074:     uInt     avail_out; /* remaining free space at next_out */
+075:     uLong    total_out; /* total nb of bytes output so far */
+076: 
+077:     char     *msg;      /* last error message, NULL if no error */
+078:     struct internal_state FAR *state; /* not visible by applications */
+079: 
+080:     alloc_func zalloc;  /* used to allocate the internal state */
+081:     free_func  zfree;   /* used to free the internal state */
+082:     voidpf     opaque;  /* private data object passed to zalloc and zfree */
+083: 
+084:     int     data_type;  /* best guess about the data type: ascii or binary */
+085:     uLong   adler;      /* adler32 value of the uncompressed data */
+086:     uLong   reserved;   /* reserved for future use */
+087: } z_stream;
+088: 
+089: typedef z_stream FAR *z_streamp;
+090: 
+091: /*
+092:    The application must update next_in and avail_in when avail_in has
+093:    dropped to zero. It must update next_out and avail_out when avail_out
+094:    has dropped to zero. The application must initialize zalloc, zfree and
+095:    opaque before calling the init function. All other fields are set by the
+096:    compression library and must not be updated by the application.
+097: 
+098:    The opaque value provided by the application will be passed as the first
+099:    parameter for calls of zalloc and zfree. This can be useful for custom
+100:    memory management. The compression library attaches no meaning to the
+101:    opaque value.
+102: 
+103:    zalloc must return Z_NULL if there is not enough memory for the object.
+104:    If zlib is used in a multi-threaded application, zalloc and zfree must be
+105:    thread safe.
+106: 
+107:    On 16-bit systems, the functions zalloc and zfree must be able to allocate
+108:    exactly 65536 bytes, but will not be required to allocate more than this
+109:    if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+110:    pointers returned by zalloc for objects of exactly 65536 bytes *must*
+111:    have their offset normalized to zero. The default allocation function
+112:    provided by this library ensures this (see zutil.c). To reduce memory
+113:    requirements and avoid any allocation of 64K objects, at the expense of
+114:    compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+115: 
+116:    The fields total_in and total_out can be used for statistics or
+117:    progress reports. After compression, total_in holds the total size of
+118:    the uncompressed data and may be saved for use in the decompressor
+119:    (particularly if the decompressor wants to decompress everything in
+120:    a single step).
+121: */
+122: 
+123:                         /* constants */
+124: 
+125: #define Z_NO_FLUSH      0
+126: #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+127: #define Z_SYNC_FLUSH    2
+128: #define Z_FULL_FLUSH    3
+129: #define Z_FINISH        4
+130: /* Allowed flush values; see deflate() below for details */
+131: 
+132: #define Z_OK            0
+133: #define Z_STREAM_END    1
+134: #define Z_NEED_DICT     2
+135: #define Z_ERRNO        (-1)
+136: #define Z_STREAM_ERROR (-2)
+137: #define Z_DATA_ERROR   (-3)
+138: #define Z_MEM_ERROR    (-4)
+139: #define Z_BUF_ERROR    (-5)
+140: #define Z_VERSION_ERROR (-6)
+141: /* Return codes for the compression/decompression functions. Negative
+142:  * values are errors, positive values are used for special but normal events.
+143:  */
+144: 
+145: #define Z_NO_COMPRESSION         0
+146: #define Z_BEST_SPEED             1
+147: #define Z_BEST_COMPRESSION       9
+148: #define Z_DEFAULT_COMPRESSION  (-1)
+149: /* compression levels */
+150: 
+151: #define Z_FILTERED            1
+152: #define Z_HUFFMAN_ONLY        2
+153: #define Z_DEFAULT_STRATEGY    0
+154: /* compression strategy; see deflateInit2() below for details */
+155: 
+156: #define Z_BINARY   0
+157: #define Z_ASCII    1
+158: #define Z_UNKNOWN  2
+159: /* Possible values of the data_type field */
+160: 
+161: #define Z_DEFLATED   8
+162: /* The deflate compression method (the only one supported in this version) */
+163: 
+164: #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+165: 
+166: #define zlib_version zlibVersion()
+167: /* for compatibility with versions < 1.0.2 */
+168: 
+169:                         /* basic functions */
+170: 
+171: ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+172: /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+173:    If the first character differs, the library code actually used is
+174:    not compatible with the zlib.h header file used by the application.
+175:    This check is automatically made by deflateInit and inflateInit.
+176:  */
+177: 
+178: /* 
+179: ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+180: 
+181:      Initializes the internal stream state for compression. The fields
+182:    zalloc, zfree and opaque must be initialized before by the caller.
+183:    If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+184:    use default allocation functions.
+185: 
+186:      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+187:    1 gives best speed, 9 gives best compression, 0 gives no compression at
+188:    all (the input data is simply copied a block at a time).
+189:    Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+190:    compression (currently equivalent to level 6).
+191: 
+192:      deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+193:    enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+194:    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+195:    with the version assumed by the caller (ZLIB_VERSION).
+196:    msg is set to null if there is no error message.  deflateInit does not
+197:    perform any compression: this will be done by deflate().
+198: */
+199: 
+200: 
+201: ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+202: /*
+203:     deflate compresses as much data as possible, and stops when the input
+204:   buffer becomes empty or the output buffer becomes full. It may introduce some
+205:   output latency (reading input without producing any output) except when
+206:   forced to flush.
+207: 
+208:     The detailed semantics are as follows. deflate performs one or both of the
+209:   following actions:
+210: 
+211:   - Compress more input starting at next_in and update next_in and avail_in
+212:     accordingly. If not all input can be processed (because there is not
+213:     enough room in the output buffer), next_in and avail_in are updated and
+214:     processing will resume at this point for the next call of deflate().
+215: 
+216:   - Provide more output starting at next_out and update next_out and avail_out
+217:     accordingly. This action is forced if the parameter flush is non zero.
+218:     Forcing flush frequently degrades the compression ratio, so this parameter
+219:     should be set only when necessary (in interactive applications).
+220:     Some output may be provided even if flush is not set.
+221: 
+222:   Before the call of deflate(), the application should ensure that at least
+223:   one of the actions is possible, by providing more input and/or consuming
+224:   more output, and updating avail_in or avail_out accordingly; avail_out
+225:   should never be zero before the call. The application can consume the
+226:   compressed output when it wants, for example when the output buffer is full
+227:   (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+228:   and with zero avail_out, it must be called again after making room in the
+229:   output buffer because there might be more output pending.
+230: 
+231:     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+232:   flushed to the output buffer and the output is aligned on a byte boundary, so
+233:   that the decompressor can get all input data available so far. (In particular
+234:   avail_in is zero after the call if enough output space has been provided
+235:   before the call.)  Flushing may degrade compression for some compression
+236:   algorithms and so it should be used only when necessary.
+237: 
+238:     If flush is set to Z_FULL_FLUSH, all output is flushed as with
+239:   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+240:   restart from this point if previous compressed data has been damaged or if
+241:   random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+242:   the compression.
+243: 
+244:     If deflate returns with avail_out == 0, this function must be called again
+245:   with the same value of the flush parameter and more output space (updated
+246:   avail_out), until the flush is complete (deflate returns with non-zero
+247:   avail_out).
+248: 
+249:     If the parameter flush is set to Z_FINISH, pending input is processed,
+250:   pending output is flushed and deflate returns with Z_STREAM_END if there
+251:   was enough output space; if deflate returns with Z_OK, this function must be
+252:   called again with Z_FINISH and more output space (updated avail_out) but no
+253:   more input data, until it returns with Z_STREAM_END or an error. After
+254:   deflate has returned Z_STREAM_END, the only possible operations on the
+255:   stream are deflateReset or deflateEnd.
+256:   
+257:     Z_FINISH can be used immediately after deflateInit if all the compression
+258:   is to be done in a single step. In this case, avail_out must be at least
+259:   0.1% larger than avail_in plus 12 bytes.  If deflate does not return
+260:   Z_STREAM_END, then it must be called again as described above.
+261: 
+262:     deflate() sets strm->adler to the adler32 checksum of all input read
+263:   so far (that is, total_in bytes).
+264: 
+265:     deflate() may update data_type if it can make a good guess about
+266:   the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+267:   binary. This field is only for information purposes and does not affect
+268:   the compression algorithm in any manner.
+269: 
+270:     deflate() returns Z_OK if some progress has been made (more input
+271:   processed or more output produced), Z_STREAM_END if all input has been
+272:   consumed and all output has been produced (only when flush is set to
+273:   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+274:   if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+275:   (for example avail_in or avail_out was zero).
+276: */
+277: 
+278: 
+279: ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+280: /*
+281:      All dynamically allocated data structures for this stream are freed.
+282:    This function discards any unprocessed input and does not flush any
+283:    pending output.
+284: 
+285:      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+286:    stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+287:    prematurely (some input or output was discarded). In the error case,
+288:    msg may be set but then points to a static string (which must not be
+289:    deallocated).
+290: */
+291: 
+292: 
+293: /* 
+294: ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+295: 
+296:      Initializes the internal stream state for decompression. The fields
+297:    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+298:    the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+299:    value depends on the compression method), inflateInit determines the
+300:    compression method from the zlib header and allocates all data structures
+301:    accordingly; otherwise the allocation will be deferred to the first call of
+302:    inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+303:    use default allocation functions.
+304: 
+305:      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+306:    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+307:    version assumed by the caller.  msg is set to null if there is no error
+308:    message. inflateInit does not perform any decompression apart from reading
+309:    the zlib header if present: this will be done by inflate().  (So next_in and
+310:    avail_in may be modified, but next_out and avail_out are unchanged.)
+311: */
+312: 
+313: 
+314: ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+315: /*
+316:     inflate decompresses as much data as possible, and stops when the input
+317:   buffer becomes empty or the output buffer becomes full. It may some
+318:   introduce some output latency (reading input without producing any output)
+319:   except when forced to flush.
+320: 
+321:   The detailed semantics are as follows. inflate performs one or both of the
+322:   following actions:
+323: 
+324:   - Decompress more input starting at next_in and update next_in and avail_in
+325:     accordingly. If not all input can be processed (because there is not
+326:     enough room in the output buffer), next_in is updated and processing
+327:     will resume at this point for the next call of inflate().
+328: 
+329:   - Provide more output starting at next_out and update next_out and avail_out
+330:     accordingly.  inflate() provides as much output as possible, until there
+331:     is no more input data or no more space in the output buffer (see below
+332:     about the flush parameter).
+333: 
+334:   Before the call of inflate(), the application should ensure that at least
+335:   one of the actions is possible, by providing more input and/or consuming
+336:   more output, and updating the next_* and avail_* values accordingly.
+337:   The application can consume the uncompressed output when it wants, for
+338:   example when the output buffer is full (avail_out == 0), or after each
+339:   call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+340:   must be called again after making room in the output buffer because there
+341:   might be more output pending.
+342: 
+343:     If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
+344:   output as possible to the output buffer. The flushing behavior of inflate is
+345:   not specified for values of the flush parameter other than Z_SYNC_FLUSH
+346:   and Z_FINISH, but the current implementation actually flushes as much output
+347:   as possible anyway.
+348: 
+349:     inflate() should normally be called until it returns Z_STREAM_END or an
+350:   error. However if all decompression is to be performed in a single step
+351:   (a single call of inflate), the parameter flush should be set to
+352:   Z_FINISH. In this case all pending input is processed and all pending
+353:   output is flushed; avail_out must be large enough to hold all the
+354:   uncompressed data. (The size of the uncompressed data may have been saved
+355:   by the compressor for this purpose.) The next operation on this stream must
+356:   be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+357:   is never required, but can be used to inform inflate that a faster routine
+358:   may be used for the single inflate() call.
+359: 
+360:      If a preset dictionary is needed at this point (see inflateSetDictionary
+361:   below), inflate sets strm-adler to the adler32 checksum of the
+362:   dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
+363:   it sets strm->adler to the adler32 checksum of all output produced
+364:   so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
+365:   an error code as described below. At the end of the stream, inflate()
+366:   checks that its computed adler32 checksum is equal to that saved by the
+367:   compressor and returns Z_STREAM_END only if the checksum is correct.
+368: 
+369:     inflate() returns Z_OK if some progress has been made (more input processed
+370:   or more output produced), Z_STREAM_END if the end of the compressed data has
+371:   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+372:   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+373:   corrupted (input stream not conforming to the zlib format or incorrect
+374:   adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
+375:   (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
+376:   enough memory, Z_BUF_ERROR if no progress is possible or if there was not
+377:   enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
+378:   case, the application may then call inflateSync to look for a good
+379:   compression block.
+380: */
+381: 
+382: 
+383: ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+384: /*
+385:      All dynamically allocated data structures for this stream are freed.
+386:    This function discards any unprocessed input and does not flush any
+387:    pending output.
+388: 
+389:      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+390:    was inconsistent. In the error case, msg may be set but then points to a
+391:    static string (which must not be deallocated).
+392: */
+393: 
+394:                         /* Advanced functions */
+395: 
+396: /*
+397:     The following functions are needed only in some special applications.
+398: */
+399: 
+400: /*   
+401: ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+402:                                      int  level,
+403:                                      int  method,
+404:                                      int  windowBits,
+405:                                      int  memLevel,
+406:                                      int  strategy));
+407: 
+408:      This is another version of deflateInit with more compression options. The
+409:    fields next_in, zalloc, zfree and opaque must be initialized before by
+410:    the caller.
+411: 
+412:      The method parameter is the compression method. It must be Z_DEFLATED in
+413:    this version of the library.
+414: 
+415:      The windowBits parameter is the base two logarithm of the window size
+416:    (the size of the history buffer).  It should be in the range 8..15 for this
+417:    version of the library. Larger values of this parameter result in better
+418:    compression at the expense of memory usage. The default value is 15 if
+419:    deflateInit is used instead.
+420: 
+421:      The memLevel parameter specifies how much memory should be allocated
+422:    for the internal compression state. memLevel=1 uses minimum memory but
+423:    is slow and reduces compression ratio; memLevel=9 uses maximum memory
+424:    for optimal speed. The default value is 8. See zconf.h for total memory
+425:    usage as a function of windowBits and memLevel.
+426: 
+427:      The strategy parameter is used to tune the compression algorithm. Use the
+428:    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+429:    filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
+430:    string match).  Filtered data consists mostly of small values with a
+431:    somewhat random distribution. In this case, the compression algorithm is
+432:    tuned to compress them better. The effect of Z_FILTERED is to force more
+433:    Huffman coding and less string matching; it is somewhat intermediate
+434:    between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
+435:    the compression ratio but not the correctness of the compressed output even
+436:    if it is not set appropriately.
+437: 
+438:       deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+439:    memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+440:    method). msg is set to null if there is no error message.  deflateInit2 does
+441:    not perform any compression: this will be done by deflate().
+442: */
+443:                             
+444: ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+445:                                              const Bytef *dictionary,
+446:                                              uInt  dictLength));
+447: /*
+448:      Initializes the compression dictionary from the given byte sequence
+449:    without producing any compressed output. This function must be called
+450:    immediately after deflateInit, deflateInit2 or deflateReset, before any
+451:    call of deflate. The compressor and decompressor must use exactly the same
+452:    dictionary (see inflateSetDictionary).
+453: 
+454:      The dictionary should consist of strings (byte sequences) that are likely
+455:    to be encountered later in the data to be compressed, with the most commonly
+456:    used strings preferably put towards the end of the dictionary. Using a
+457:    dictionary is most useful when the data to be compressed is short and can be
+458:    predicted with good accuracy; the data can then be compressed better than
+459:    with the default empty dictionary.
+460: 
+461:      Depending on the size of the compression data structures selected by
+462:    deflateInit or deflateInit2, a part of the dictionary may in effect be
+463:    discarded, for example if the dictionary is larger than the window size in
+464:    deflate or deflate2. Thus the strings most likely to be useful should be
+465:    put at the end of the dictionary, not at the front.
+466: 
+467:      Upon return of this function, strm->adler is set to the Adler32 value
+468:    of the dictionary; the decompressor may later use this value to determine
+469:    which dictionary has been used by the compressor. (The Adler32 value
+470:    applies to the whole dictionary even if only a subset of the dictionary is
+471:    actually used by the compressor.)
+472: 
+473:      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+474:    parameter is invalid (such as NULL dictionary) or the stream state is
+475:    inconsistent (for example if deflate has already been called for this stream
+476:    or if the compression method is bsort). deflateSetDictionary does not
+477:    perform any compression: this will be done by deflate().
+478: */
+479: 
+480: ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+481:                                     z_streamp source));
+482: /*
+483:      Sets the destination stream as a complete copy of the source stream.
+484: 
+485:      This function can be useful when several compression strategies will be
+486:    tried, for example when there are several ways of pre-processing the input
+487:    data with a filter. The streams that will be discarded should then be freed
+488:    by calling deflateEnd.  Note that deflateCopy duplicates the internal
+489:    compression state which can be quite large, so this strategy is slow and
+490:    can consume lots of memory.
+491: 
+492:      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+493:    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+494:    (such as zalloc being NULL). msg is left unchanged in both source and
+495:    destination.
+496: */
+497: 
+498: ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+499: /*
+500:      This function is equivalent to deflateEnd followed by deflateInit,
+501:    but does not free and reallocate all the internal compression state.
+502:    The stream will keep the same compression level and any other attributes
+503:    that may have been set by deflateInit2.
+504: 
+505:       deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+506:    stream state was inconsistent (such as zalloc or state being NULL).
+507: */
+508: 
+509: ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+510: 				      int level,
+511: 				      int strategy));
+512: /*
+513:      Dynamically update the compression level and compression strategy.  The
+514:    interpretation of level and strategy is as in deflateInit2.  This can be
+515:    used to switch between compression and straight copy of the input data, or
+516:    to switch to a different kind of input data requiring a different
+517:    strategy. If the compression level is changed, the input available so far
+518:    is compressed with the old level (and may be flushed); the new level will
+519:    take effect only at the next call of deflate().
+520: 
+521:      Before the call of deflateParams, the stream state must be set as for
+522:    a call of deflate(), since the currently available input may have to
+523:    be compressed and flushed. In particular, strm->avail_out must be non-zero.
+524: 
+525:      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+526:    stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+527:    if strm->avail_out was zero.
+528: */
+529: 
+530: /*   
+531: ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+532:                                      int  windowBits));
+533: 
+534:      This is another version of inflateInit with an extra parameter. The
+535:    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+536:    before by the caller.
+537: 
+538:      The windowBits parameter is the base two logarithm of the maximum window
+539:    size (the size of the history buffer).  It should be in the range 8..15 for
+540:    this version of the library. The default value is 15 if inflateInit is used
+541:    instead. If a compressed stream with a larger window size is given as
+542:    input, inflate() will return with the error code Z_DATA_ERROR instead of
+543:    trying to allocate a larger window.
+544: 
+545:       inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+546:    memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
+547:    memLevel). msg is set to null if there is no error message.  inflateInit2
+548:    does not perform any decompression apart from reading the zlib header if
+549:    present: this will be done by inflate(). (So next_in and avail_in may be
+550:    modified, but next_out and avail_out are unchanged.)
+551: */
+552: 
+553: ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+554:                                              const Bytef *dictionary,
+555:                                              uInt  dictLength));
+556: /*
+557:      Initializes the decompression dictionary from the given uncompressed byte
+558:    sequence. This function must be called immediately after a call of inflate
+559:    if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
+560:    can be determined from the Adler32 value returned by this call of
+561:    inflate. The compressor and decompressor must use exactly the same
+562:    dictionary (see deflateSetDictionary).
+563: 
+564:      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+565:    parameter is invalid (such as NULL dictionary) or the stream state is
+566:    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+567:    expected one (incorrect Adler32 value). inflateSetDictionary does not
+568:    perform any decompression: this will be done by subsequent calls of
+569:    inflate().
+570: */
+571: 
+572: ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+573: /* 
+574:     Skips invalid compressed data until a full flush point (see above the
+575:   description of deflate with Z_FULL_FLUSH) can be found, or until all
+576:   available input is skipped. No output is provided.
+577: 
+578:     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+579:   if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+580:   or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+581:   case, the application may save the current current value of total_in which
+582:   indicates where valid compressed data was found. In the error case, the
+583:   application may repeatedly call inflateSync, providing more input each time,
+584:   until success or end of the input data.
+585: */
+586: 
+587: ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+588: /*
+589:      This function is equivalent to inflateEnd followed by inflateInit,
+590:    but does not free and reallocate all the internal decompression state.
+591:    The stream will keep attributes that may have been set by inflateInit2.
+592: 
+593:       inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+594:    stream state was inconsistent (such as zalloc or state being NULL).
+595: */
+596: 
+597: 
+598:                         /* utility functions */
+599: 
+600: /*
+601:      The following utility functions are implemented on top of the
+602:    basic stream-oriented functions. To simplify the interface, some
+603:    default options are assumed (compression level and memory usage,
+604:    standard memory allocation functions). The source code of these
+605:    utility functions can easily be modified if you need special options.
+606: */
+607: 
+608: ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+609:                                  const Bytef *source, uLong sourceLen));
+610: /*
+611:      Compresses the source buffer into the destination buffer.  sourceLen is
+612:    the byte length of the source buffer. Upon entry, destLen is the total
+613:    size of the destination buffer, which must be at least 0.1% larger than
+614:    sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+615:    compressed buffer.
+616:      This function can be used to compress a whole file at once if the
+617:    input file is mmap'ed.
+618:      compress returns Z_OK if success, Z_MEM_ERROR if there was not
+619:    enough memory, Z_BUF_ERROR if there was not enough room in the output
+620:    buffer.
+621: */
+622: 
+623: ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+624:                                   const Bytef *source, uLong sourceLen,
+625:                                   int level));
+626: /*
+627:      Compresses the source buffer into the destination buffer. The level
+628:    parameter has the same meaning as in deflateInit.  sourceLen is the byte
+629:    length of the source buffer. Upon entry, destLen is the total size of the
+630:    destination buffer, which must be at least 0.1% larger than sourceLen plus
+631:    12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+632: 
+633:      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+634:    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+635:    Z_STREAM_ERROR if the level parameter is invalid.
+636: */
+637: 
+638: ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+639:                                    const Bytef *source, uLong sourceLen));
+640: /*
+641:      Decompresses the source buffer into the destination buffer.  sourceLen is
+642:    the byte length of the source buffer. Upon entry, destLen is the total
+643:    size of the destination buffer, which must be large enough to hold the
+644:    entire uncompressed data. (The size of the uncompressed data must have
+645:    been saved previously by the compressor and transmitted to the decompressor
+646:    by some mechanism outside the scope of this compression library.)
+647:    Upon exit, destLen is the actual size of the compressed buffer.
+648:      This function can be used to decompress a whole file at once if the
+649:    input file is mmap'ed.
+650: 
+651:      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+652:    enough memory, Z_BUF_ERROR if there was not enough room in the output
+653:    buffer, or Z_DATA_ERROR if the input data was corrupted.
+654: */
+655: 
+656: 
+657: typedef voidp gzFile;
+658: 
+659: ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
+660: /*
+661:      Opens a gzip (.gz) file for reading or writing. The mode parameter
+662:    is as in fopen ("rb" or "wb") but can also include a compression level
+663:    ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+664:    Huffman only compression as in "wb1h". (See the description
+665:    of deflateInit2 for more information about the strategy parameter.)
+666: 
+667:      gzopen can be used to read a file which is not in gzip format; in this
+668:    case gzread will directly read from the file without decompression.
+669: 
+670:      gzopen returns NULL if the file could not be opened or if there was
+671:    insufficient memory to allocate the (de)compression state; errno
+672:    can be checked to distinguish the two cases (if errno is zero, the
+673:    zlib error is Z_MEM_ERROR).  */
+674: 
+675: ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+676: /*
+677:      gzdopen() associates a gzFile with the file descriptor fd.  File
+678:    descriptors are obtained from calls like open, dup, creat, pipe or
+679:    fileno (in the file has been previously opened with fopen).
+680:    The mode parameter is as in gzopen.
+681:      The next call of gzclose on the returned gzFile will also close the
+682:    file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+683:    descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+684:      gzdopen returns NULL if there was insufficient memory to allocate
+685:    the (de)compression state.
+686: */
+687: 
+688: ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+689: /*
+690:      Dynamically update the compression level or strategy. See the description
+691:    of deflateInit2 for the meaning of these parameters.
+692:      gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+693:    opened for writing.
+694: */
+695: 
+696: ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+697: /*
+698:      Reads the given number of uncompressed bytes from the compressed file.
+699:    If the input file was not in gzip format, gzread copies the given number
+700:    of bytes into the buffer.
+701:      gzread returns the number of uncompressed bytes actually read (0 for
+702:    end of file, -1 for error). */
+703: 
+704: ZEXTERN int ZEXPORT    gzwrite OF((gzFile file, 
+705: 				   const voidp buf, unsigned len));
+706: /*
+707:      Writes the given number of uncompressed bytes into the compressed file.
+708:    gzwrite returns the number of uncompressed bytes actually written
+709:    (0 in case of error).
+710: */
+711: 
+712: ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+713: /*
+714:      Converts, formats, and writes the args to the compressed file under
+715:    control of the format string, as in fprintf. gzprintf returns the number of
+716:    uncompressed bytes actually written (0 in case of error).
+717: */
+718: 
+719: ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+720: /*
+721:       Writes the given null-terminated string to the compressed file, excluding
+722:    the terminating null character.
+723:       gzputs returns the number of characters written, or -1 in case of error.
+724: */
+725: 
+726: ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+727: /*
+728:       Reads bytes from the compressed file until len-1 characters are read, or
+729:    a newline character is read and transferred to buf, or an end-of-file
+730:    condition is encountered.  The string is then terminated with a null
+731:    character.
+732:       gzgets returns buf, or Z_NULL in case of error.
+733: */
+734: 
+735: ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+736: /*
+737:       Writes c, converted to an unsigned char, into the compressed file.
+738:    gzputc returns the value that was written, or -1 in case of error.
+739: */
+740: 
+741: ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+742: /*
+743:       Reads one byte from the compressed file. gzgetc returns this byte
+744:    or -1 in case of end of file or error.
+745: */
+746: 
+747: ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+748: /*
+749:      Flushes all pending output into the compressed file. The parameter
+750:    flush is as in the deflate() function. The return value is the zlib
+751:    error number (see function gzerror below). gzflush returns Z_OK if
+752:    the flush parameter is Z_FINISH and all output could be flushed.
+753:      gzflush should be called only when strictly necessary because it can
+754:    degrade compression.
+755: */
+756: 
+757: ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+758: 				      z_off_t offset, int whence));
+759: /* 
+760:       Sets the starting position for the next gzread or gzwrite on the
+761:    given compressed file. The offset represents a number of bytes in the
+762:    uncompressed data stream. The whence parameter is defined as in lseek(2);
+763:    the value SEEK_END is not supported.
+764:      If the file is opened for reading, this function is emulated but can be
+765:    extremely slow. If the file is opened for writing, only forward seeks are
+766:    supported; gzseek then compresses a sequence of zeroes up to the new
+767:    starting position.
+768: 
+769:       gzseek returns the resulting offset location as measured in bytes from
+770:    the beginning of the uncompressed stream, or -1 in case of error, in
+771:    particular if the file is opened for writing and the new starting position
+772:    would be before the current position.
+773: */
+774: 
+775: ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+776: /*
+777:      Rewinds the given file. This function is supported only for reading.
+778: 
+779:    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+780: */
+781: 
+782: ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+783: /*
+784:      Returns the starting position for the next gzread or gzwrite on the
+785:    given compressed file. This position represents a number of bytes in the
+786:    uncompressed data stream.
+787: 
+788:    gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+789: */
+790: 
+791: ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+792: /*
+793:      Returns 1 when EOF has previously been detected reading the given
+794:    input stream, otherwise zero.
+795: */
+796: 
+797: ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+798: /*
+799:      Flushes all pending output if necessary, closes the compressed file
+800:    and deallocates all the (de)compression state. The return value is the zlib
+801:    error number (see function gzerror below).
+802: */
+803: 
+804: ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+805: /*
+806:      Returns the error message for the last error which occurred on the
+807:    given compressed file. errnum is set to zlib error number. If an
+808:    error occurred in the file system and not in the compression library,
+809:    errnum is set to Z_ERRNO and the application may consult errno
+810:    to get the exact error code.
+811: */
+812: 
+813:                         /* checksum functions */
+814: 
+815: /*
+816:      These functions are not related to compression but are exported
+817:    anyway because they might be useful in applications using the
+818:    compression library.
+819: */
+820: 
+821: ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+822: 
+823: /*
+824:      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+825:    return the updated checksum. If buf is NULL, this function returns
+826:    the required initial value for the checksum.
+827:    An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+828:    much faster. Usage example:
+829: 
+830:      uLong adler = adler32(0L, Z_NULL, 0);
+831: 
+832:      while (read_buffer(buffer, length) != EOF) {
+833:        adler = adler32(adler, buffer, length);
+834:      }
+835:      if (adler != original_adler) error();
+836: */
+837: 
+838: ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+839: /*
+840:      Update a running crc with the bytes buf[0..len-1] and return the updated
+841:    crc. If buf is NULL, this function returns the required initial value
+842:    for the crc. Pre- and post-conditioning (one's complement) is performed
+843:    within this function so it shouldn't be done by the application.
+844:    Usage example:
+845: 
+846:      uLong crc = crc32(0L, Z_NULL, 0);
+847: 
+848:      while (read_buffer(buffer, length) != EOF) {
+849:        crc = crc32(crc, buffer, length);
+850:      }
+851:      if (crc != original_crc) error();
+852: */
+853: 
+854: 
+855:                         /* various hacks, don't look :) */
+856: 
+857: /* deflateInit and inflateInit are macros to allow checking the zlib version
+858:  * and the compiler's view of z_stream:
+859:  */
+860: ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+861:                                      const char *version, int stream_size));
+862: ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+863:                                      const char *version, int stream_size));
+864: ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+865:                                       int windowBits, int memLevel,
+866:                                       int strategy, const char *version,
+867:                                       int stream_size));
+868: ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+869:                                       const char *version, int stream_size));
+870: #define deflateInit(strm, level) \
+871:         deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+872: #define inflateInit(strm) \
+873:         inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+874: #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+875:         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+876:                       (strategy),           ZLIB_VERSION, sizeof(z_stream))
+877: #define inflateInit2(strm, windowBits) \
+878:         inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+879: 
+880: 
+881: #if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
+882:     struct internal_state {int dummy;}; /* hack for buggy compilers */
+883: #endif
+884: 
+885: ZEXTERN const char   * ZEXPORT zError           OF((int err));
+886: ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+887: ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+888: 
+889: #ifdef __cplusplus
+890: }
+891: #endif
+892: 
+893: #endif /* _ZLIB_H */
+
        +
        + +

        How the zlib wrapper was developed

        + +

        Attempt #1

        +
        + 
        +/* File : example.i */
+%module example
+%{
+/* Put headers and other declarations here */
+#include "zlib.h"
+%}
+
+%include typemaps.i
+
+%include "zlib.h"
+
        +
        + + The result is: + +
        + 
        +% swig -chicken -I/usr/include example.i
+/usr/include/zlib.h:63: Syntax error in input.
+/usr/include/zlib.h:78: Syntax error in input.
+/usr/include/zlib.h:80: Syntax error in input.
+
        +
        + + The first problem we see is that the macro OF(...) is + not defined. + +

        Attempt #2

        + + We make sure to include zconf.h so that SWIG can see the + definition of OF(...). We try again. + +
        + 
        +/* File : example.i */
+%module example
+%{
+/* Put headers and other declarations here */
+#include "zlib.h"
+%}
+
+%include typemaps.i
+
+%include "zconf.h"
+%include "zlib.h"
+
        +
        + + The result is: + +
        + 
        +% swig -chicken -I/usr/include example.i
+
        +
        + + This seems to work! But we should take a peek inside the generated + example_wrap.c to see what the names of the Scheme + procedures will be. + +
        + 
        +% grep C_intern example_wrap.c
+  C_word err = C_intern2 (&a, errorhook);
+    sym = C_intern (&a, 21, "example:max-mem-level");
+    sym = C_intern (&a, 17, "example:max-wbits");
+    sym = C_intern (&a, 16, "example:seek-set");
+    sym = C_intern (&a, 16, "example:seek-cur");
+    sym = C_intern (&a, 16, "example:seek-end");
+    sym = C_intern (&a, 20, "example:zlib-version");
+    sym = C_intern (&a, 28, "example:z-stream-next-in-set");
+    sym = C_intern (&a, 28, "example:z-stream-next-in-get");
+    sym = C_intern (&a, 29, "example:z-stream-avail-in-set");
+    sym = C_intern (&a, 29, "example:z-stream-avail-in-get");
+    sym = C_intern (&a, 29, "example:z-stream-total-in-set");
+    sym = C_intern (&a, 29, "example:z-stream-total-in-get");
+    sym = C_intern (&a, 29, "example:z-stream-next-out-set");
+    sym = C_intern (&a, 29, "example:z-stream-next-out-get");
+    sym = C_intern (&a, 30, "example:z-stream-avail-out-set");
+    sym = C_intern (&a, 30, "example:z-stream-avail-out-get");
+    sym = C_intern (&a, 30, "example:z-stream-total-out-set");
+    sym = C_intern (&a, 30, "example:z-stream-total-out-get");
+    sym = C_intern (&a, 24, "example:z-stream-msg-set");
+    sym = C_intern (&a, 24, "example:z-stream-msg-get");
+    sym = C_intern (&a, 26, "example:z-stream-state-set");
+    sym = C_intern (&a, 26, "example:z-stream-state-get");
+    sym = C_intern (&a, 27, "example:z-stream-zalloc-set");
+    sym = C_intern (&a, 27, "example:z-stream-zalloc-get");
+    sym = C_intern (&a, 26, "example:z-stream-zfree-set");
+    sym = C_intern (&a, 26, "example:z-stream-zfree-get");
+    sym = C_intern (&a, 27, "example:z-stream-opaque-set");
+    sym = C_intern (&a, 27, "example:z-stream-opaque-get");
+    sym = C_intern (&a, 30, "example:z-stream-data-type-set");
+    sym = C_intern (&a, 30, "example:z-stream-data-type-get");
+    sym = C_intern (&a, 26, "example:z-stream-adler-set");
+    sym = C_intern (&a, 26, "example:z-stream-adler-get");
+    sym = C_intern (&a, 29, "example:z-stream-reserved-set");
+    sym = C_intern (&a, 29, "example:z-stream-reserved-get");
+    sym = C_intern (&a, 20, "example:new-z-stream");
+    sym = C_intern (&a, 23, "example:delete-z-stream");
+    sym = C_intern (&a, 18, "example:z-no-flush");
+    sym = C_intern (&a, 23, "example:z-partial-flush");
+    sym = C_intern (&a, 20, "example:z-sync-flush");
+    sym = C_intern (&a, 20, "example:z-full-flush");
+    sym = C_intern (&a, 16, "example:z-finish");
+    sym = C_intern (&a, 12, "example:z-ok");
+    sym = C_intern (&a, 20, "example:z-stream-end");
+    sym = C_intern (&a, 19, "example:z-need-dict");
+    sym = C_intern (&a, 15, "example:z-errno");
+    sym = C_intern (&a, 22, "example:z-stream-error");
+    sym = C_intern (&a, 20, "example:z-data-error");
+    sym = C_intern (&a, 19, "example:z-mem-error");
+    sym = C_intern (&a, 19, "example:z-buf-error");
+    sym = C_intern (&a, 23, "example:z-version-error");
+    sym = C_intern (&a, 24, "example:z-no-compression");
+    sym = C_intern (&a, 20, "example:z-best-speed");
+    sym = C_intern (&a, 26, "example:z-best-compression");
+    sym = C_intern (&a, 29, "example:z-default-compression");
+    sym = C_intern (&a, 18, "example:z-filtered");
+    sym = C_intern (&a, 22, "example:z-huffman-only");
+    sym = C_intern (&a, 26, "example:z-default-strategy");
+    sym = C_intern (&a, 16, "example:z-binary");
+    sym = C_intern (&a, 15, "example:z-ascii");
+    sym = C_intern (&a, 17, "example:z-unknown");
+    sym = C_intern (&a, 18, "example:z-deflated");
+    sym = C_intern (&a, 14, "example:z-null");
+    sym = C_intern (&a, 19, "example:zlibversion");
+    sym = C_intern (&a, 15, "example:deflate");
+    sym = C_intern (&a, 18, "example:deflateend");
+    sym = C_intern (&a, 15, "example:inflate");
+    sym = C_intern (&a, 18, "example:inflateend");
+    sym = C_intern (&a, 28, "example:deflatesetdictionary");
+    sym = C_intern (&a, 19, "example:deflatecopy");
+    sym = C_intern (&a, 20, "example:deflatereset");
+    sym = C_intern (&a, 21, "example:deflateparams");
+    sym = C_intern (&a, 28, "example:inflatesetdictionary");
+    sym = C_intern (&a, 19, "example:inflatesync");
+    sym = C_intern (&a, 20, "example:inflatereset");
+    sym = C_intern (&a, 16, "example:compress");
+    sym = C_intern (&a, 17, "example:compress2");
+    sym = C_intern (&a, 18, "example:uncompress");
+    sym = C_intern (&a, 14, "example:gzopen");
+    sym = C_intern (&a, 15, "example:gzdopen");
+    sym = C_intern (&a, 19, "example:gzsetparams");
+    sym = C_intern (&a, 14, "example:gzread");
+    sym = C_intern (&a, 15, "example:gzwrite");
+    sym = C_intern (&a, 16, "example:gzprintf");
+    sym = C_intern (&a, 14, "example:gzputs");
+    sym = C_intern (&a, 14, "example:gzgets");
+    sym = C_intern (&a, 14, "example:gzputc");
+    sym = C_intern (&a, 14, "example:gzgetc");
+    sym = C_intern (&a, 15, "example:gzflush");
+    sym = C_intern (&a, 14, "example:gzseek");
+    sym = C_intern (&a, 16, "example:gzrewind");
+    sym = C_intern (&a, 14, "example:gztell");
+    sym = C_intern (&a, 13, "example:gzeof");
+    sym = C_intern (&a, 15, "example:gzclose");
+    sym = C_intern (&a, 15, "example:gzerror");
+    sym = C_intern (&a, 15, "example:adler32");
+    sym = C_intern (&a, 13, "example:crc32");
+    sym = C_intern (&a, 20, "example:deflateinit-");
+    sym = C_intern (&a, 20, "example:inflateinit-");
+    sym = C_intern (&a, 21, "example:deflateinit2-");
+    sym = C_intern (&a, 21, "example:inflateinit2-");
+    sym = C_intern (&a, 32, "example:internal-state-dummy-set");
+    sym = C_intern (&a, 32, "example:internal-state-dummy-get");
+    sym = C_intern (&a, 26, "example:new-internal-state");
+    sym = C_intern (&a, 29, "example:delete-internal-state");
+    sym = C_intern (&a, 14, "example:zerror");
+    sym = C_intern (&a, 24, "example:inflatesyncpoint");
+    sym = C_intern (&a, 21, "example:get-crc-table");
+
        +
        + + In fact, we want the Scheme procedure names to begin with + zlib instead of example. For + example:zlib-version, we want + zlib-version. And we want dashes when the case + switches to/from upper/lowercase; ex. the function + deflateEnd() should be the Scheme procedure + zlib-deflate-end. + +

        Attempt #3

        + + We make sure to add -prefix zlib -mixed to the + swig command line, and we rename + ZLIB_VERSION to VERSION. We try again. + +
        + 
        +/* File : example.i */
+%module example
+%{
+/* Put headers and other declarations here */
+#include "zlib.h"
+%}
+
+%include typemaps.i
+
+%rename(VERSION) ZLIB_VERSION;
+
+%include "zconf.h"
+%include "zlib.h"
+
        +
        + + The result is: + +
        + 
        +% swig -chicken -prefix zlib -mixed -I/usr/include example.i
+% grep C_intern example_wrap.c
+  C_word err = C_intern2 (&a, errorhook);
+    sym = C_intern (&a, 18, "zlib:max-mem-level");
+    sym = C_intern (&a, 14, "zlib:max-wbits");
+    sym = C_intern (&a, 13, "zlib:seek-set");
+    sym = C_intern (&a, 13, "zlib:seek-cur");
+    sym = C_intern (&a, 13, "zlib:seek-end");
+    sym = C_intern (&a, 12, "zlib:version");
+    sym = C_intern (&a, 25, "zlib:z-stream-next-in-set");
+    sym = C_intern (&a, 25, "zlib:z-stream-next-in-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-total-in-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-total-in-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-next-out-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-next-out-get");
+    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-set");
+    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-get");
+    sym = C_intern (&a, 27, "zlib:z-stream-total-out-set");
+    sym = C_intern (&a, 27, "zlib:z-stream-total-out-get");
+    sym = C_intern (&a, 21, "zlib:z-stream-msg-set");
+    sym = C_intern (&a, 21, "zlib:z-stream-msg-get");
+    sym = C_intern (&a, 23, "zlib:z-stream-state-set");
+    sym = C_intern (&a, 23, "zlib:z-stream-state-get");
+    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-set");
+    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-get");
+    sym = C_intern (&a, 23, "zlib:z-stream-zfree-set");
+    sym = C_intern (&a, 23, "zlib:z-stream-zfree-get");
+    sym = C_intern (&a, 24, "zlib:z-stream-opaque-set");
+    sym = C_intern (&a, 24, "zlib:z-stream-opaque-get");
+    sym = C_intern (&a, 27, "zlib:z-stream-data-type-set");
+    sym = C_intern (&a, 27, "zlib:z-stream-data-type-get");
+    sym = C_intern (&a, 23, "zlib:z-stream-adler-set");
+    sym = C_intern (&a, 23, "zlib:z-stream-adler-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-reserved-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-reserved-get");
+    sym = C_intern (&a, 17, "zlib:new-z-stream");
+    sym = C_intern (&a, 20, "zlib:delete-z-stream");
+    sym = C_intern (&a, 15, "zlib:z-no-flush");
+    sym = C_intern (&a, 20, "zlib:z-partial-flush");
+    sym = C_intern (&a, 17, "zlib:z-sync-flush");
+    sym = C_intern (&a, 17, "zlib:z-full-flush");
+    sym = C_intern (&a, 13, "zlib:z-finish");
+    sym = C_intern (&a, 9, "zlib:z-ok");
+    sym = C_intern (&a, 17, "zlib:z-stream-end");
+    sym = C_intern (&a, 16, "zlib:z-need-dict");
+    sym = C_intern (&a, 12, "zlib:z-errno");
+    sym = C_intern (&a, 19, "zlib:z-stream-error");
+    sym = C_intern (&a, 17, "zlib:z-data-error");
+    sym = C_intern (&a, 16, "zlib:z-mem-error");
+    sym = C_intern (&a, 16, "zlib:z-buf-error");
+    sym = C_intern (&a, 20, "zlib:z-version-error");
+    sym = C_intern (&a, 21, "zlib:z-no-compression");
+    sym = C_intern (&a, 17, "zlib:z-best-speed");
+    sym = C_intern (&a, 23, "zlib:z-best-compression");
+    sym = C_intern (&a, 26, "zlib:z-default-compression");
+    sym = C_intern (&a, 15, "zlib:z-filtered");
+    sym = C_intern (&a, 19, "zlib:z-huffman-only");
+    sym = C_intern (&a, 23, "zlib:z-default-strategy");
+    sym = C_intern (&a, 13, "zlib:z-binary");
+    sym = C_intern (&a, 12, "zlib:z-ascii");
+    sym = C_intern (&a, 14, "zlib:z-unknown");
+    sym = C_intern (&a, 15, "zlib:z-deflated");
+    sym = C_intern (&a, 11, "zlib:z-null");
+    sym = C_intern (&a, 17, "zlib:zlib-version");
+    sym = C_intern (&a, 12, "zlib:deflate");
+    sym = C_intern (&a, 16, "zlib:deflate-end");
+    sym = C_intern (&a, 12, "zlib:inflate");
+    sym = C_intern (&a, 16, "zlib:inflate-end");
+    sym = C_intern (&a, 27, "zlib:deflate-set-dictionary");
+    sym = C_intern (&a, 17, "zlib:deflate-copy");
+    sym = C_intern (&a, 18, "zlib:deflate-reset");
+    sym = C_intern (&a, 19, "zlib:deflate-params");
+    sym = C_intern (&a, 27, "zlib:inflate-set-dictionary");
+    sym = C_intern (&a, 17, "zlib:inflate-sync");
+    sym = C_intern (&a, 18, "zlib:inflate-reset");
+    sym = C_intern (&a, 13, "zlib:compress");
+    sym = C_intern (&a, 14, "zlib:compress2");
+    sym = C_intern (&a, 15, "zlib:uncompress");
+    sym = C_intern (&a, 11, "zlib:gzopen");
+    sym = C_intern (&a, 12, "zlib:gzdopen");
+    sym = C_intern (&a, 16, "zlib:gzsetparams");
+    sym = C_intern (&a, 11, "zlib:gzread");
+    sym = C_intern (&a, 12, "zlib:gzwrite");
+    sym = C_intern (&a, 13, "zlib:gzprintf");
+    sym = C_intern (&a, 11, "zlib:gzputs");
+    sym = C_intern (&a, 11, "zlib:gzgets");
+    sym = C_intern (&a, 11, "zlib:gzputc");
+    sym = C_intern (&a, 11, "zlib:gzgetc");
+    sym = C_intern (&a, 12, "zlib:gzflush");
+    sym = C_intern (&a, 11, "zlib:gzseek");
+    sym = C_intern (&a, 13, "zlib:gzrewind");
+    sym = C_intern (&a, 11, "zlib:gztell");
+    sym = C_intern (&a, 10, "zlib:gzeof");
+    sym = C_intern (&a, 12, "zlib:gzclose");
+    sym = C_intern (&a, 12, "zlib:gzerror");
+    sym = C_intern (&a, 12, "zlib:adler32");
+    sym = C_intern (&a, 10, "zlib:crc32");
+    sym = C_intern (&a, 18, "zlib:deflate-init-");
+    sym = C_intern (&a, 18, "zlib:inflate-init-");
+    sym = C_intern (&a, 19, "zlib:deflate-init2-");
+    sym = C_intern (&a, 19, "zlib:inflate-init2-");
+    sym = C_intern (&a, 29, "zlib:internal-state-dummy-set");
+    sym = C_intern (&a, 29, "zlib:internal-state-dummy-get");
+    sym = C_intern (&a, 23, "zlib:new-internal-state");
+    sym = C_intern (&a, 26, "zlib:delete-internal-state");
+    sym = C_intern (&a, 12, "zlib:ze-rror");
+    sym = C_intern (&a, 23, "zlib:inflate-sync-point");
+    sym = C_intern (&a, 18, "zlib:get-crc-table");
+
        +
        + + Much better. The only problem is the identifier + zlib:ze-rror, and we are missing + zlib:deflate-init and zlib:inflate-init + because they are defined as macros (see macro definitions). + +

        Attempt #4

        + + We make sure to rename zError to + z_error, and we inline some helper functions for the + zlib:...-init macros. We try again. + +
        + 
        +/* File : example.i */
+%module example
+%{
+/* Put headers and other declarations here */
+#include "zlib.h"
+%}
+
+%include typemaps.i
+
+%rename(VERSION) ZLIB_VERSION;
+%rename(z_error) zError;
+
+%include "zconf.h"
+%include "zlib.h"
+
+%inline %{
+/* %inline blocks are seen by SWIG and are inserted into the header
+   portion of example_wrap.c, so that they are also seen by the C
+   compiler. */
+int deflate_init(z_streamp strm, int level) {
+  return deflateInit(strm,level); /* call macro */
+}
+int inflate_init(z_streamp strm) {
+  return inflateInit(strm); /* call macro */
+}
+%}
+
+
+
        +
        + + The result is: + +
        + 
        +% swig -chicken -prefix zlib -mixed -I/usr/include example.i
+% grep C_intern example_wrap.c
+  C_word err = C_intern2 (&a, errorhook);
+    sym = C_intern (&a, 18, "zlib:max-mem-level");
+    sym = C_intern (&a, 14, "zlib:max-wbits");
+    sym = C_intern (&a, 13, "zlib:seek-set");
+    sym = C_intern (&a, 13, "zlib:seek-cur");
+    sym = C_intern (&a, 13, "zlib:seek-end");
+    sym = C_intern (&a, 12, "zlib:version");
+    sym = C_intern (&a, 25, "zlib:z-stream-next-in-set");
+    sym = C_intern (&a, 25, "zlib:z-stream-next-in-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-avail-in-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-total-in-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-total-in-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-next-out-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-next-out-get");
+    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-set");
+    sym = C_intern (&a, 27, "zlib:z-stream-avail-out-get");
+    sym = C_intern (&a, 27, "zlib:z-stream-total-out-set");
+    sym = C_intern (&a, 27, "zlib:z-stream-total-out-get");
+    sym = C_intern (&a, 21, "zlib:z-stream-msg-set");
+    sym = C_intern (&a, 21, "zlib:z-stream-msg-get");
+    sym = C_intern (&a, 23, "zlib:z-stream-state-set");
+    sym = C_intern (&a, 23, "zlib:z-stream-state-get");
+    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-set");
+    sym = C_intern (&a, 24, "zlib:z-stream-zalloc-get");
+    sym = C_intern (&a, 23, "zlib:z-stream-zfree-set");
+    sym = C_intern (&a, 23, "zlib:z-stream-zfree-get");
+    sym = C_intern (&a, 24, "zlib:z-stream-opaque-set");
+    sym = C_intern (&a, 24, "zlib:z-stream-opaque-get");
+    sym = C_intern (&a, 27, "zlib:z-stream-data-type-set");
+    sym = C_intern (&a, 27, "zlib:z-stream-data-type-get");
+    sym = C_intern (&a, 23, "zlib:z-stream-adler-set");
+    sym = C_intern (&a, 23, "zlib:z-stream-adler-get");
+    sym = C_intern (&a, 26, "zlib:z-stream-reserved-set");
+    sym = C_intern (&a, 26, "zlib:z-stream-reserved-get");
+    sym = C_intern (&a, 17, "zlib:new-z-stream");
+    sym = C_intern (&a, 20, "zlib:delete-z-stream");
+    sym = C_intern (&a, 15, "zlib:z-no-flush");
+    sym = C_intern (&a, 20, "zlib:z-partial-flush");
+    sym = C_intern (&a, 17, "zlib:z-sync-flush");
+    sym = C_intern (&a, 17, "zlib:z-full-flush");
+    sym = C_intern (&a, 13, "zlib:z-finish");
+    sym = C_intern (&a, 9, "zlib:z-ok");
+    sym = C_intern (&a, 17, "zlib:z-stream-end");
+    sym = C_intern (&a, 16, "zlib:z-need-dict");
+    sym = C_intern (&a, 12, "zlib:z-errno");
+    sym = C_intern (&a, 19, "zlib:z-stream-error");
+    sym = C_intern (&a, 17, "zlib:z-data-error");
+    sym = C_intern (&a, 16, "zlib:z-mem-error");
+    sym = C_intern (&a, 16, "zlib:z-buf-error");
+    sym = C_intern (&a, 20, "zlib:z-version-error");
+    sym = C_intern (&a, 21, "zlib:z-no-compression");
+    sym = C_intern (&a, 17, "zlib:z-best-speed");
+    sym = C_intern (&a, 23, "zlib:z-best-compression");
+    sym = C_intern (&a, 26, "zlib:z-default-compression");
+    sym = C_intern (&a, 15, "zlib:z-filtered");
+    sym = C_intern (&a, 19, "zlib:z-huffman-only");
+    sym = C_intern (&a, 23, "zlib:z-default-strategy");
+    sym = C_intern (&a, 13, "zlib:z-binary");
+    sym = C_intern (&a, 12, "zlib:z-ascii");
+    sym = C_intern (&a, 14, "zlib:z-unknown");
+    sym = C_intern (&a, 15, "zlib:z-deflated");
+    sym = C_intern (&a, 11, "zlib:z-null");
+    sym = C_intern (&a, 17, "zlib:zlib-version");
+    sym = C_intern (&a, 12, "zlib:deflate");
+    sym = C_intern (&a, 16, "zlib:deflate-end");
+    sym = C_intern (&a, 12, "zlib:inflate");
+    sym = C_intern (&a, 16, "zlib:inflate-end");
+    sym = C_intern (&a, 27, "zlib:deflate-set-dictionary");
+    sym = C_intern (&a, 17, "zlib:deflate-copy");
+    sym = C_intern (&a, 18, "zlib:deflate-reset");
+    sym = C_intern (&a, 19, "zlib:deflate-params");
+    sym = C_intern (&a, 27, "zlib:inflate-set-dictionary");
+    sym = C_intern (&a, 17, "zlib:inflate-sync");
+    sym = C_intern (&a, 18, "zlib:inflate-reset");
+    sym = C_intern (&a, 13, "zlib:compress");
+    sym = C_intern (&a, 14, "zlib:compress2");
+    sym = C_intern (&a, 15, "zlib:uncompress");
+    sym = C_intern (&a, 11, "zlib:gzopen");
+    sym = C_intern (&a, 12, "zlib:gzdopen");
+    sym = C_intern (&a, 16, "zlib:gzsetparams");
+    sym = C_intern (&a, 11, "zlib:gzread");
+    sym = C_intern (&a, 12, "zlib:gzwrite");
+    sym = C_intern (&a, 13, "zlib:gzprintf");
+    sym = C_intern (&a, 11, "zlib:gzputs");
+    sym = C_intern (&a, 11, "zlib:gzgets");
+    sym = C_intern (&a, 11, "zlib:gzputc");
+    sym = C_intern (&a, 11, "zlib:gzgetc");
+    sym = C_intern (&a, 12, "zlib:gzflush");
+    sym = C_intern (&a, 11, "zlib:gzseek");
+    sym = C_intern (&a, 13, "zlib:gzrewind");
+    sym = C_intern (&a, 11, "zlib:gztell");
+    sym = C_intern (&a, 10, "zlib:gzeof");
+    sym = C_intern (&a, 12, "zlib:gzclose");
+    sym = C_intern (&a, 12, "zlib:gzerror");
+    sym = C_intern (&a, 12, "zlib:adler32");
+    sym = C_intern (&a, 10, "zlib:crc32");
+    sym = C_intern (&a, 18, "zlib:deflate-init-");
+    sym = C_intern (&a, 18, "zlib:inflate-init-");
+    sym = C_intern (&a, 19, "zlib:deflate-init2-");
+    sym = C_intern (&a, 19, "zlib:inflate-init2-");
+    sym = C_intern (&a, 29, "zlib:internal-state-dummy-set");
+    sym = C_intern (&a, 29, "zlib:internal-state-dummy-get");
+    sym = C_intern (&a, 23, "zlib:new-internal-state");
+    sym = C_intern (&a, 26, "zlib:delete-internal-state");
+    sym = C_intern (&a, 12, "zlib:z-error");
+    sym = C_intern (&a, 23, "zlib:inflate-sync-point");
+    sym = C_intern (&a, 18, "zlib:get-crc-table");
+    sym = C_intern (&a, 17, "zlib:deflate-init");
+    sym = C_intern (&a, 17, "zlib:inflate-init");
+
        +
        + + Perfect! Now let's integrate this zlib extension into a + CHICKEN interpreter. To save some time, in this + Examples/chicken/zlib directory: +
          +
        1. Backup the original example.i.
          2. +
        2. Copy and paste the example.i text from above and + put it into the file called example.i
          3. +
        3. Run 'make' as per Building the + example.
          4. +
        4. Run the resultant executable zlib.
          5. +
        + + The interpreter interaction is as follows: + +
        + 
        +% ./zlib
+zlib
+
+  A SWIG example for the CHICKEN compiler
+  Author: Jonah Beckford, February 2003
+
+Scheme Procedures:
+
+zlib:max-mem-level
+zlib:max-wbits
+zlib:seek-set
+zlib:seek-cur
+zlib:seek-end
+zlib:version
+zlib:z-stream-next-in-set
+zlib:z-stream-next-in-get
+zlib:z-stream-avail-in-set
+...
+zlib:get-crc-table
+zlib:deflate-init
+zlib:inflate-init
+; This is the CHICKEN interpreter - Version 0, Build 1095 - windows-cygwin-x86
+; (c)2000-2003 Felix L. Winkelmann
+>>> (define s (zlib:new-z-stream))
+>>> s
+#<tagged pointer #<c++ "z_stream *">(#<pointer 6d9290>)>
+>>> (zlib:z-stream-next-in-get s)
+#f
+>>> (zlib:z-stream-next-in-set s "some dummy stream data")
+Error: Type error. Expected _p_Bytef: "bad argument type"
+>>> (exit)
+
        +
        + + Apparently we cannot use Scheme strings as Bytef *. The SWIG + manual shows many ways how to handle strings and byte arrays, but + to be simplistic, let's just make the Bytef * look + like a char *, which is automatically handled as a + string by SWIG CHICKEN. + +

        Attempt #5

        + + We make sure to add an %apply construct so that Bytef + * is handled the same as char * to SWIG. We + try again. + +
        + 
        +/* File : example.i */
+%module example
+%{
+/* Put headers and other declarations here */
+#include "zlib.h"
+%}
+
+%include typemaps.i
+
+%rename(VERSION) ZLIB_VERSION;
+%rename(z_error) zError;
+%apply char * { Bytef * };
+
+%include "zconf.h"
+%include "zlib.h"
+
+%inline %{
+/* %inline blocks are seen by SWIG and are inserted into the header
+   portion of example_wrap.c, so that they are also seen by the C
+   compiler. */
+int deflate_init(z_streamp strm, int level) {
+  return deflateInit(strm,level); /* call macro */
+}
+int inflate_init(z_streamp strm) {
+  return inflateInit(strm); /* call macro */
+}
+%}
+
        +
        + + Build the example once more.
        + + The interpreter interaction is as follows: + +
        + 
        +% ./zlib
+zlib
+
+  A SWIG example for the CHICKEN compiler
+  Author: Jonah Beckford, February 2003
+
+Scheme Procedures:
+
+zlib:max-mem-level
+zlib:max-wbits
+zlib:seek-set
+zlib:seek-cur
+zlib:seek-end
+zlib:version
+zlib:z-stream-next-in-set
+zlib:z-stream-next-in-get
+zlib:z-stream-avail-in-set
+...
+zlib:get-crc-table
+zlib:deflate-init
+zlib:inflate-init
+; This is the CHICKEN interpreter - Version 0, Build 1095 - windows-cygwin-x86
+; (c)2000-2003 Felix L. Winkelmann
+>>> (define s (zlib:new-z-stream))
+Init zstream
+>>> (zlib:z-stream-zalloc-set s #f) 
+>>> (zlib:z-stream-zfree-set s #f)
+>>> (zlib:z-stream-opaque-set s #f)
+>>> (zlib:deflate-init s (zlib:z-default-compression))
+0
+Deflate something small so we don't need to loop/stream data
+>>> (define in "some dummy data")
+>>> (define out (make-string 1000))
+>>> (zlib:z-stream-next-in-set s in)
+>>> (zlib:z-stream-avail-in-set s (string-length in))
+>>> (zlib:z-stream-next-out-set s out)
+>>> (zlib:z-stream-avail-out-set s (string-length out))
+>>> (zlib:deflate s (zlib:z-finish))
+1 ;; (zlib:z-stream-end) == 1, which is good
+>>> (zlib:z-stream-total-out-get s)
+23.
+>>> out
+"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        "
+
        +
        + + We see the problem ... the compression is occurring as it should, + but we cannot see any of the compressed output. This is because + when SWIG CHICKEN passes a Scheme string to a C function, it + duplicates the string before calling the C function. We want to + save the memory address that + zlib:z-stream-next-out-set is using, so we can + display this later. While we are at it, we can foresee that + compress, compress2 and + uncompress will all need some finessing to work with + mutating strings. + +

        Attempt #6

        + + When we have to finesse strings, we must use typemaps. As well, + we define some functions to save and restore the + next_out element. We try again. + +
        + 
        +/* File : example.i */
+%module example
+%{
+/* Put headers and other declarations here */
+#include "zlib.h"
+%}
+
+%include typemaps.i
+
+%rename(VERSION) ZLIB_VERSION;
+%rename(z_error) zError;
+%apply char * { Bytef * };
+	
+/* Allow the sourceLen to be automatically filled in from the length
+   of the 'source' string */
+%typemap(in) (const Bytef *source, uLong sourceLen)
+%{  if (!C_swig_is_string ($input)) {
+    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a string");
+  }
+  $2 = (uLong) C_header_size ($input);
+  $1 = C_c_string ($input);
+%}
+
+/* Allocate space the size of which is determined by the Scheme
+   integer argument, and make a temporary integer so we can set
+   destLen. */
+%typemap(in) (Bytef *dest, uLongf *destLen) (uLong len)
+%{  if (!C_swig_is_fixnum ($input)) {
+    swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a integer");
+  }
+  len = (uLong) C_unfix ($input);
+  $2 = &len;
+  $1 = (char *) malloc (*$2);
+%}
+
+/* Return the mutated string as a new object. */
+%typemap(argout) (Bytef *dest, uLongf *destLen) 
+(C_word *scmstr) 
+%{  scmstr = C_alloc (C_SIZEOF_STRING (*$2));
+  SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1));
+  free ($1);
+%}
+	
+%include "zconf.h"
+%include "zlib.h"
+	
+/* Ignore destLen as an input argument, and make a temporary integer so
+   we can set destLen. */
+%typemap(in, numinputs=0) uLongf *destLen (uLong len)
+"$1 = &len;";
+
+/* Return a sized string as a new object. */
+%typemap(argout)
+(void *outstr, uLongf *destLen) (C_word *scmstr) 
+%{  scmstr = C_alloc (C_SIZEOF_STRING (*$2));
+  SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1));
+%}
+	
+%inline %{
+/* %inline blocks are seen by SWIG and are inserted into the header
+   portion of example_wrap.c, so that they are also seen by the C
+   compiler. */
+int deflate_init(z_streamp strm, int level) {
+  return deflateInit(strm,level); /* call macro */
+}
+int inflate_init(z_streamp strm) {
+  return inflateInit(strm); /* call macro */
+}
+void* z_stream_save_next_out(z_streamp strm) {
+  return (void*) strm->next_out;
+}
+void z_stream_get_next_chunk(z_streamp strm, void *outstr, uLongf *destLen) {
+  *destLen = strm->next_out - (Bytef*)outstr;
+}
+%}
+
        +
        + + And that's it. Try building the entire example from the + Makefile. Run ./zlib test-zlib.scm to test it out. + + + diff --git a/Examples/chicken/zlib/example.i b/Examples/chicken/zlib/example.i new file mode 100644 index 000000000..dd962ad56 --- /dev/null +++ b/Examples/chicken/zlib/example.i @@ -0,0 +1,76 @@ +/* File : example.i */ +%module example +%{ +/* Put headers and other declarations here */ +#include "zlib.h" +%} + +%include typemaps.i + +%rename(VERSION) ZLIB_VERSION; +%rename(z_error) zError; +%apply char * { Bytef * }; + +/* Allow the sourceLen to be automatically filled in from the length + of the 'source' string */ +%typemap(in) (const Bytef *source, uLong sourceLen) +%{ if (!C_swig_is_string ($input)) { + swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a string"); + } + $2 = (uLong) C_header_size ($input); + $1 = C_c_string ($input); +%} + +/* Allocate space the size of which is determined by the Scheme + integer argument, and make a temporary integer so we can set + destLen. */ +%typemap(in) (Bytef *dest, uLongf *destLen) (uLong len) +%{ if (!C_swig_is_fixnum ($input)) { + swig_barf (SWIG_BARF1_BAD_ARGUMENT_TYPE, "Argument $input is not a integer"); + } + len = (uLong) C_unfix ($input); + $2 = &len; + $1 = (char *) malloc (*$2); +%} + +/* Return the mutated string as a new object. */ +%typemap(argout) (Bytef *dest, uLongf *destLen) +(C_word *scmstr) +%{ scmstr = C_alloc (C_SIZEOF_STRING (*$2)); + SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1)); + free ($1); +%} + +%include "zconf.h" +%include "zlib.h" + +/* Ignore destLen as an input argument, and make a temporary integer so + we can set destLen. */ +%typemap(numinputs=0) uLongf *destLen (uLong len) +"$1 = &len;"; + +/* Return a sized string as a new object. */ +%typemap(argout) +(void *outstr, uLongf *destLen) (C_word *scmstr) +%{ scmstr = C_alloc (C_SIZEOF_STRING (*$2)); + SWIG_APPEND_VALUE(C_string (&scmstr, *$2, $1)); +%} + +%inline %{ +/* %inline blocks are seen by SWIG and are inserted into the header + portion of example_wrap.c, so that they are also seen by the C + compiler. */ +int deflate_init(z_streamp strm, int level) { + return deflateInit(strm,level); /* call macro */ +} +int inflate_init(z_streamp strm) { + return inflateInit(strm); /* call macro */ +} +void* z_stream_save_next_out(z_streamp strm) { + return (void*) strm->next_out; +} +void z_stream_get_next_chunk(z_streamp strm, void *outstr, uLongf *destLen) { + *destLen = strm->next_out - (Bytef*)outstr; +} +%} + diff --git a/Examples/chicken/zlib/test-zlib.scm b/Examples/chicken/zlib/test-zlib.scm new file mode 100644 index 000000000..a13d801b8 --- /dev/null +++ b/Examples/chicken/zlib/test-zlib.scm @@ -0,0 +1,41 @@ +(load-library 'example "./zlib.so") + +;; Init zstream +(define s (new-z-stream)) +(z-stream-zalloc-set s #f) +(z-stream-zfree-set s #f) +(z-stream-opaque-set s #f) +(deflate-init s (Z-DEFAULT-COMPRESSION)) + +;; Deflate something small so we don't need to loop/stream data +(define in "some pony et jumping et jack et flash et had a jack pony") +(define out (make-string 1000)) +(printf "to be compressed: ~A~%to be compressed bytes: ~A~%~%" in (string-length in)) +(z-stream-next-in-set s in) +(z-stream-avail-in-set s (string-length in)) +(z-stream-next-out-set s out) +(z-stream-avail-out-set s (string-length out)) +(let* + ((saved-out (z-stream-save-next-out s)) + (ret (deflate s (Z-FINISH)))) + (cond + ((= ret (Z-STREAM-END)) + (printf "deflated properly!~%compressed bytes: ~A~%compressed stream: ~A~%" + (z-stream-total-out-get s) (z-stream-get-next-chunk s saved-out))) + ((= ret (Z-OK)) + (display "only partial deflation ... not enough output space\n")) + (else + (printf "deflate error(~D): ~A ~%" ret (z-stream-msg-get s))))) + +;; Use simple compress routine, and set max output size to 100 +(newline) +(call-with-values (lambda () (compress 100 in)) + (lambda (ret compressed) + (cond + ((= ret (Z-OK)) + (printf "compressed properly!~%compressed bytes: ~A~%compressed stream: ~A~%" + (string-length compressed) compressed)) + (else + (printf "compress error(~D): ~A ~%" ret (z-error ret)))))) + +(exit 0) diff --git a/Examples/guile/check.list b/Examples/guile/check.list index 7ccd0730a..d35b2d693 100644 --- a/Examples/guile/check.list +++ b/Examples/guile/check.list @@ -1,5 +1,6 @@ # see top-level Makefile.in constants +matrix simple port multimap diff --git a/Examples/lua/lua.c b/Examples/lua/lua.c index 8cffaa503..e06e2c5fc 100644 --- a/Examples/lua/lua.c +++ b/Examples/lua/lua.c @@ -1,4 +1,5 @@ /* +** $Id$ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ diff --git a/Examples/test-suite/li_std_queue.i b/Examples/test-suite/li_std_queue.i index 6bf71afca..2d322b4d9 100644 --- a/Examples/test-suite/li_std_queue.i +++ b/Examples/test-suite/li_std_queue.i @@ -1,4 +1,13 @@ -// test of std::queue +/** + * @file std_queue.i + * @author gga + * @date Sun May 6 01:52:44 2007 + * + * @brief test of std::queue + * + * + */ + %module li_std_queue %include std_queue.i diff --git a/Examples/test-suite/li_std_set.i b/Examples/test-suite/li_std_set.i index 2dcc2f17c..8c335b24c 100644 --- a/Examples/test-suite/li_std_set.i +++ b/Examples/test-suite/li_std_set.i @@ -1,12 +1,18 @@ -/* - * a test of set containers. - * Languages should define swig::LANGUAGE_OBJ to be - * an entity of their native pointer type which can be - * included in a STL container. +/** + * @file li_std_set.i + * @author gga + * @date Tue May 1 02:52:47 2007 + * + * @brief a test of set containers. + * Languages should define swig::LANGUAGE_OBJ to be + * an entity of their native pointer type which can be + * included in a STL container. * - * For example: - * swig::LANGUAGE_OBJ is GC_VALUE in Ruby - * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python + * For example: + * swig::LANGUAGE_OBJ is GC_VALUE in Ruby + * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python + * + * */ %module li_std_set diff --git a/Examples/test-suite/li_std_stack.i b/Examples/test-suite/li_std_stack.i index 19b45d46f..d29254089 100644 --- a/Examples/test-suite/li_std_stack.i +++ b/Examples/test-suite/li_std_stack.i @@ -1,4 +1,13 @@ -// test of std::stack +/** + * @file std_stack.i + * @author gga + * @date Sun May 6 01:52:44 2007 + * + * @brief test of std::stack + * + * + */ + %module li_std_stack %include std_stack.i diff --git a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb index e79cb46a8..825f3c593 100755 --- a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb +++ b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb @@ -3,6 +3,9 @@ # This is a simple speed benchmark suite for std containers, # to verify their O(n) performance. # It is not part of the standard tests. +# +# License:: SWIG +# require 'benchmark' diff --git a/Examples/test-suite/ruby_li_std_speed.i b/Examples/test-suite/ruby_li_std_speed.i index bfb0b2776..3c8e60643 100644 --- a/Examples/test-suite/ruby_li_std_speed.i +++ b/Examples/test-suite/ruby_li_std_speed.i @@ -1,4 +1,13 @@ -// A speed test of the ruby stl +/** + * @file ruby_li_std_speed.i + * @author gga + * @date Fri May 18 18:03:15 2007 + * + * @brief A speed test of the ruby stl + * + * + */ + %module ruby_li_std_speed %include diff --git a/Examples/xml/example_gif.i b/Examples/xml/example_gif.i new file mode 100644 index 000000000..f0fb3b183 --- /dev/null +++ b/Examples/xml/example_gif.i @@ -0,0 +1,329 @@ +/* ----------------------------------------------------------------------------- + * gifplot.h + * + * Main header file for the GIFPlot library. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * Copyright (C) 1995-1996 + * + * See the file LICENSE for information on usage and redistribution. + * ----------------------------------------------------------------------------- */ + +#include +#include +#include +#include +#include +#include + +#ifndef GIFPLOT_H + +/* Pixel is 8-bits */ + +typedef unsigned char Pixel; +typedef float Zvalue; + +/* ------------------------------------------------------------------------ + ColorMap + + Definition and methods for colormaps + ------------------------------------------------------------------------ */ + +typedef struct ColorMap { + unsigned char *cmap; + char *name; +} ColorMap; + +extern ColorMap *new_ColorMap(char *filename); +extern void delete_ColorMap(ColorMap *c); +extern void ColorMap_default(ColorMap *c); +extern void ColorMap_assign(ColorMap *c, int index, int r, int g, int b); +extern int ColorMap_getitem(ColorMap *c, int index); +extern void ColorMap_setitem(ColorMap *c, int index, int value); +extern int ColorMap_write(ColorMap *c, char *filename); + +/* Some default colors */ + +#define BLACK 0 +#define WHITE 1 +#define RED 2 +#define GREEN 3 +#define BLUE 4 +#define YELLOW 5 +#define CYAN 6 +#define MAGENTA 7 + +/*------------------------------------------------------------------------- + FrameBuffer + + This structure defines a simple 8 bit framebuffer. + ------------------------------------------------------------------------- */ + +typedef struct FrameBuffer { + Pixel **pixels; + Zvalue **zbuffer; + unsigned int height; + unsigned int width; + int xmin; /* These are used for clipping */ + int ymin; + int xmax; + int ymax; +} FrameBuffer; + +#define ZMIN 1e+36 + +/* FrameBuffer Methods */ + +extern FrameBuffer *new_FrameBuffer(unsigned int width, unsigned int height); +extern void delete_FrameBuffer(FrameBuffer *frame); +extern int FrameBuffer_resize(FrameBuffer *frame, int width, int height); +extern void FrameBuffer_clear(FrameBuffer *frame, Pixel color); +extern void FrameBuffer_plot(FrameBuffer *frame, int x, int y, Pixel color); +extern void FrameBuffer_horizontal(FrameBuffer *frame, int xmin, int xmax, int y, Pixel color); +extern void FrameBuffer_horizontalinterp(FrameBuffer *f, int xmin, int xmax, int y, Pixel c1, Pixel c2); +extern void FrameBuffer_vertical(FrameBuffer *frame, int ymin, int ymax, int x, Pixel color); +extern void FrameBuffer_box(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +extern void FrameBuffer_solidbox(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +extern void FrameBuffer_interpbox(FrameBuffer *f, int x1, int y1, int x2, int y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); +extern void FrameBuffer_circle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +extern void FrameBuffer_solidcircle(FrameBuffer *frame, int x1, int y1, int radius, Pixel color); +extern void FrameBuffer_line(FrameBuffer *frame, int x1, int y1, int x2, int y2, Pixel color); +extern void FrameBuffer_setclip(FrameBuffer *frame, int xmin, int ymin, int xmax, int ymax); +extern void FrameBuffer_noclip(FrameBuffer *frame); +extern int FrameBuffer_makeGIF(FrameBuffer *frame, ColorMap *cmap, void *buffer, unsigned int maxsize); +extern int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename); +extern void FrameBuffer_zresize(FrameBuffer *f, int width, int height); +extern void FrameBuffer_zclear(FrameBuffer *f); +extern void FrameBuffer_solidtriangle(FrameBuffer *f, int x1, int y1, int x2, int y2, int x3, int y3, Pixel c); +extern void FrameBuffer_interptriangle(FrameBuffer *f, int tx1, int ty1, Pixel c1, + int tx2, int ty2, Pixel c2, int tx3, int ty3, Pixel c3); + +#define HORIZONTAL 1 +#define VERTICAL 2 + +extern void FrameBuffer_drawchar(FrameBuffer *frame, int x, int y, int fgcolor, int bgcolor, char chr, int orientation); +extern void FrameBuffer_drawstring(FrameBuffer *f, int x, int y, int fgcolor, int bgcolor, char *text, int orientation); + +/* ------------------------------------------------------------------------ + PixMap + + The equivalent of "bit-maps". + ------------------------------------------------------------------------ */ + +typedef struct PixMap { + int width; + int height; + int centerx; + int centery; + int *map; +} PixMap; + +/* PIXMAP methods */ + +extern PixMap *new_PixMap(int width, int height, int centerx, int centery); +extern void delete_PixMap(PixMap *pm); +extern void PixMap_set(PixMap *pm, int x, int y, int pix); +extern void FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, int bgcolor); + +#define TRANSPARENT 0 +#define FOREGROUND 1 +#define BACKGROUND 2 + +/* ------------------------------------------------------------------------ + Plot2D + + Definition and methods for 2D plots. + ------------------------------------------------------------------------ */ + +typedef struct Plot2D { + FrameBuffer *frame; /* what frame buffer are we using */ + int view_xmin; /* Minimum coordinates of view region */ + int view_ymin; + int view_xmax; /* Maximum coordinates of view region */ + int view_ymax; + double xmin; /* Minimum coordinates of plot region */ + double ymin; + double xmax; /* Maximum coordinates of plot region */ + double ymax; + int xscale; /* Type of scaling (LINEAR, LOG, etc..) */ + int yscale; + double dx; /* Private scaling parameters */ + double dy; +} Plot2D; + +/* 2D Plot methods */ + +extern Plot2D *new_Plot2D(FrameBuffer *frame,double xmin,double ymin, double xmax, double ymax); +extern void delete_Plot2D(Plot2D *p2); +extern Plot2D *Plot2D_copy(Plot2D *p2); +extern void Plot2D_clear(Plot2D *p2, Pixel c); +extern void Plot2D_setview(Plot2D *p2, int vxmin, int vymin, int vxmax, int vymax); +extern void Plot2D_setrange(Plot2D *p2, double xmin, double ymin, double xmax, double ymax); +extern void Plot2D_setscale(Plot2D *p2, int xscale, int yscale); +extern void Plot2D_plot(Plot2D *p2, double x, double y, Pixel color); +extern void Plot2D_box(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); +extern void Plot2D_solidbox(Plot2D *p2, double x1, double y1,double x2, double y2, Pixel color); +extern void Plot2D_interpbox(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel c1, Pixel c2, Pixel c3, Pixel c4); +extern void Plot2D_circle(Plot2D *p2, double x, double y, double radius, Pixel color); +extern void Plot2D_solidcircle(Plot2D *p2, double x, double y, double radius, Pixel color); +extern void Plot2D_line(Plot2D *p2, double x1, double y1, double x2, double y2, Pixel color); +extern void Plot2D_start(Plot2D *p2); +extern void Plot2D_drawpixmap(Plot2D *p2, PixMap *pm, double x, double y, Pixel color, Pixel bgcolor); +extern void Plot2D_xaxis(Plot2D *p2, double x, double y, double xtick, int ticklength, Pixel c); +extern void Plot2D_yaxis(Plot2D *p2, double x, double y, double ytick, int ticklength, Pixel c); +extern void Plot2D_triangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); +extern void Plot2D_solidtriangle(Plot2D *p2, double x1, double y1, double x2, double y2, double x3, double y3, Pixel c); +extern void Plot2D_interptriangle(Plot2D *p2, double x1, double y1, Pixel c1, + double x2, double y2, Pixel c2, + double x3, double y3, Pixel c3); + +#define LINEAR 10 +#define LOG 11 + +/* ----------------------------------------------------------------------- + Matrix + + Operations on 4x4 transformation matrices and vectors. + Matrices are represented as a double array of 16 elements + ----------------------------------------------------------------------- */ + +typedef double *Matrix; +typedef struct GL_Vector { + double x; + double y; + double z; + double w; +} GL_Vector; + +extern Matrix new_Matrix(); +extern void delete_Matrix(Matrix a); +extern Matrix Matrix_copy(Matrix a); +extern void Matrix_multiply(Matrix a, Matrix b, Matrix c); +extern void Matrix_identity(Matrix a); +extern void Matrix_zero(Matrix a); +extern void Matrix_transpose(Matrix a, Matrix result); +extern void Matrix_invert(Matrix a, Matrix inva); +extern void Matrix_transform(Matrix a, GL_Vector *r, GL_Vector *t); +extern void Matrix_transform4(Matrix a, double rx, double ry, double rz, + double rw, GL_Vector *t); + +extern void Matrix_print(Matrix a); +extern void Matrix_translate(Matrix a, double tx, double ty, double tz); +extern void Matrix_rotatex(Matrix a, double deg); +extern void Matrix_rotatey(Matrix a, double deg); +extern void Matrix_rotatez(Matrix a, double deg); + +/* ----------------------------------------------------------------------- + Plot3D + + Data Structure for 3-D plots + ------------------------------------------------------------------------ */ + +typedef struct Plot3D { + FrameBuffer *frame; /* Frame buffer being used */ + int view_xmin; /* Viewing region */ + int view_ymin; + int view_xmax; + int view_ymax; + double xmin; /* Bounding box */ + double ymin; + double zmin; + double xmax; + double ymax; + double zmax; + double xcenter; /* Center point */ + double ycenter; + double zcenter; + double fovy; /* Field of view */ + double aspect; /* Aspect ratio */ + double znear; /* near "clipping" plane */ + double zfar; /* far "clipping" plane */ + Matrix center_mat; /* Matrix used for centering the model */ + Matrix model_mat; /* Model rotation matrix */ + Matrix view_mat; /* Viewing matrix */ + Matrix fullmodel_mat; /* Full model matrix. Used by sphere plot */ + Matrix trans_mat; /* Total transformation matrix */ + double lookatz; /* Where is the z-lookat point */ + double xshift; /* Used for translation and stuff */ + double yshift; + double zoom; + int width; + int height; + int pers_mode; /* Perspective mode (private) */ + double ortho_left,ortho_right,ortho_bottom,ortho_top; +} Plot3D; + +extern Plot3D *new_Plot3D(FrameBuffer *frame, double xmin, double ymin, double zmin, + double xmax, double ymax, double zmax); +extern void delete_Plot3D(Plot3D *p3); +extern Plot3D *Plot3D_copy(Plot3D *p3); +extern void Plot3D_clear(Plot3D *p3, Pixel Color); +extern void Plot3D_perspective(Plot3D *p3, double fovy, double znear, double zfar); +extern void Plot3D_ortho(Plot3D *p3, double left, double right, double top, double bottom); +extern void Plot3D_lookat(Plot3D *p3, double z); +extern void Plot3D_autoperspective(Plot3D *p3, double fovy); +extern void Plot3D_autoortho(Plot3D *p3); +extern void Plot3D_rotx(Plot3D *p3, double deg); +extern void Plot3D_roty(Plot3D *p3, double deg); +extern void Plot3D_rotz(Plot3D *p3, double deg); +extern void Plot3D_rotl(Plot3D *p3, double deg); +extern void Plot3D_rotr(Plot3D *p3, double deg); +extern void Plot3D_rotd(Plot3D *p3, double deg); +extern void Plot3D_rotu(Plot3D *p3, double deg); +extern void Plot3D_rotc(Plot3D *p3, double deg); +extern void Plot3D_zoom(Plot3D *p3, double percent); +extern void Plot3D_left(Plot3D *p3, double percent); +extern void Plot3D_right(Plot3D *p3, double percent); +extern void Plot3D_down(Plot3D *p3, double percent); +extern void Plot3D_up(Plot3D *p3, double percent); +extern void Plot3D_center(Plot3D *p3, double cx, double cy); + +extern void Plot3D_plot(Plot3D *p3, double x, double y, double z, Pixel Color); + +extern void Plot3D_setview(Plot3D *p3, int vxmin, int vymin, int vxmax, int vymax); +extern void Plot3D_start(Plot3D *p3); +extern void Plot3D_line(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, Pixel color); +extern void Plot3D_triangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color); +extern void Plot3D_solidtriangle(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, Pixel color); + +extern void Plot3D_interptriangle(Plot3D *p3, + double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3); + +extern void Plot3D_quad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color); + +extern void Plot3D_solidquad(Plot3D *p3, double x1, double y1, double z1, + double x2, double y2, double z2, + double x3, double y3, double z3, + double x4, double y4, double z4, + Pixel color); + +extern void Plot3D_interpquad(Plot3D *p3, double x1, double y1, double z1, Pixel c1, + double x2, double y2, double z2, Pixel c2, + double x3, double y3, double z3, Pixel c3, + double x4, double y4, double z4, Pixel c4); + + +extern void Plot3D_solidsphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c); + +extern void Plot3D_outlinesphere(Plot3D *p3, double x, double y, double z, double radius,Pixel c, Pixel bc); + +extern PixMap PixMap_SQUARE; +extern PixMap PixMap_TRIANGLE; +extern PixMap PixMap_CROSS; + +#endif +#define GIFPLOT_H + + + diff --git a/LICENSE b/LICENSE index d7a422fda..fdb73d916 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,95 @@ -SWIG is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. See the LICENSE-GPL file for -the full terms of the GNU General Public license version 3. +SWIG is distributed under the following terms: -Portions of SWIG are also licensed under the terms of the licenses -in the file LICENSE-UNIVERSITIES. You must observe the terms of -these licenses, as well as the terms of the GNU General Public License, -when you distribute SWIG. +I. -The SWIG library and examples, under the Lib and Examples top level -directories, are distributed under the following terms: +Copyright (c) 1995-1998 +The University of Utah and the Regents of the University of California +All Rights Reserved - You may copy, modify, distribute, and make derivative works based on - this software, in source code or object code form, without - restriction. If you distribute the software to others, you may do - so according to the terms of your choice. This software is offered as - is, without warranty of any kind. +Permission is hereby granted, without written agreement and without +license or royalty fees, to use, copy, modify, and distribute this +software and its documentation for any purpose, provided that +(1) The above copyright notice and the following two paragraphs +appear in all copies of the source code and (2) redistributions +including binaries reproduces these notices in the supporting +documentation. Substantial modifications to this software may be +copyrighted by their authors and need not follow the licensing terms +described here, provided that the new terms are clearly indicated in +all files where they apply. + +IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE +UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY +PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, +EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH +SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND +THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, +SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + + +II. + +This software includes contributions that are Copyright (c) 1998-2005 +University of Chicago. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. Redistributions +in binary form must reproduce the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. Neither the name of +the University of Chicago nor the names of its contributors may be +used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF CHICAGO AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF +CHICAGO OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +III. + +This software includes contributions that are Copyright (c) 2005-2006 +Arizona Board of Regents (University of Arizona). +All Rights Reserved + +Permission is hereby granted, without written agreement and without +license or royalty fees, to use, copy, modify, and distribute this +software and its documentation for any purpose, provided that +(1) The above copyright notice and the following two paragraphs +appear in all copies of the source code and (2) redistributions +including binaries reproduces these notices in the supporting +documentation. Substantial modifications to this software may be +copyrighted by their authors and need not follow the licensing terms +described here, provided that the new terms are clearly indicated in +all files where they apply. + +THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF ARIZONA AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF +ARIZONA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -See the COPYRIGHT file for a list of contributors to SWIG and their -copyright notices. diff --git a/LICENSE-GPL b/LICENSE-GPL deleted file mode 100644 index 94a9ed024..000000000 --- a/LICENSE-GPL +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/LICENSE-UNIVERSITIES b/LICENSE-UNIVERSITIES deleted file mode 100644 index fdb73d916..000000000 --- a/LICENSE-UNIVERSITIES +++ /dev/null @@ -1,95 +0,0 @@ -SWIG is distributed under the following terms: - -I. - -Copyright (c) 1995-1998 -The University of Utah and the Regents of the University of California -All Rights Reserved - -Permission is hereby granted, without written agreement and without -license or royalty fees, to use, copy, modify, and distribute this -software and its documentation for any purpose, provided that -(1) The above copyright notice and the following two paragraphs -appear in all copies of the source code and (2) redistributions -including binaries reproduces these notices in the supporting -documentation. Substantial modifications to this software may be -copyrighted by their authors and need not follow the licensing terms -described here, provided that the new terms are clearly indicated in -all files where they apply. - -IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE -UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY -PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, -EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH -SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND -THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, -SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - - -II. - -This software includes contributions that are Copyright (c) 1998-2005 -University of Chicago. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. Redistributions -in binary form must reproduce the above copyright notice, this list of -conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. Neither the name of -the University of Chicago nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF CHICAGO AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF -CHICAGO OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -III. - -This software includes contributions that are Copyright (c) 2005-2006 -Arizona Board of Regents (University of Arizona). -All Rights Reserved - -Permission is hereby granted, without written agreement and without -license or royalty fees, to use, copy, modify, and distribute this -software and its documentation for any purpose, provided that -(1) The above copyright notice and the following two paragraphs -appear in all copies of the source code and (2) redistributions -including binaries reproduces these notices in the supporting -documentation. Substantial modifications to this software may be -copyrighted by their authors and need not follow the licensing terms -described here, provided that the new terms are clearly indicated in -all files where they apply. - -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF ARIZONA AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF -ARIZONA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/Lib/allegrocl/allegrocl.swg b/Lib/allegrocl/allegrocl.swg index 266303113..4479f6ac2 100644 --- a/Lib/allegrocl/allegrocl.swg +++ b/Lib/allegrocl/allegrocl.swg @@ -289,6 +289,8 @@ $body)" #endif %insert("lisphead") %{ +;; $Id$ + (eval-when (:compile-toplevel :load-toplevel :execute) ;; avoid compiling ef-templates at runtime diff --git a/Lib/allegrocl/longlongs.i b/Lib/allegrocl/longlongs.i index 4aa54660b..b887a8a0a 100644 --- a/Lib/allegrocl/longlongs.i +++ b/Lib/allegrocl/longlongs.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * longlongs.i * * Typemap addition for support of 'long long' type and 'unsigned long long diff --git a/Lib/allegrocl/std_list.i b/Lib/allegrocl/std_list.i index 4e260897f..c8ab45649 100644 --- a/Lib/allegrocl/std_list.i +++ b/Lib/allegrocl/std_list.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_list.i * * SWIG typemaps for std::list types diff --git a/Lib/allegrocl/std_string.i b/Lib/allegrocl/std_string.i index becc322e9..4da0148fe 100644 --- a/Lib/allegrocl/std_string.i +++ b/Lib/allegrocl/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/attribute.i b/Lib/attribute.i index 0cc3ff1a3..45c3c5b64 100644 --- a/Lib/attribute.i +++ b/Lib/attribute.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * attribute.i * * SWIG library file for implementing attributes. diff --git a/Lib/carrays.i b/Lib/carrays.i index 5fc78877c..738b4577a 100644 --- a/Lib/carrays.i +++ b/Lib/carrays.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * carrays.i * * SWIG library file containing macros that can be used to manipulate simple diff --git a/Lib/cdata.i b/Lib/cdata.i index 41e8f86ce..67601f737 100644 --- a/Lib/cdata.i +++ b/Lib/cdata.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cdata.i * * SWIG library file containing macros for manipulating raw C data as strings. diff --git a/Lib/chicken/chicken.swg b/Lib/chicken/chicken.swg index 68f022570..a8d1b5a57 100644 --- a/Lib/chicken/chicken.swg +++ b/Lib/chicken/chicken.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * chicken.swg * * CHICKEN configuration module. diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg index f4e94d6f6..8703ea65a 100644 --- a/Lib/chicken/chickenrun.swg +++ b/Lib/chicken/chickenrun.swg @@ -1,5 +1,9 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * chickenrun.swg + * * ----------------------------------------------------------------------------- */ #include diff --git a/Lib/chicken/multi-generic.scm b/Lib/chicken/multi-generic.scm index 9d2e31d34..ae822f37b 100644 --- a/Lib/chicken/multi-generic.scm +++ b/Lib/chicken/multi-generic.scm @@ -21,7 +21,7 @@ ;; which functions are used when. ;; Comments, bugs, suggestions: send either to chicken-users@nongnu.org or to -;; Most code copied from TinyCLOS +;; Author: John Lenz , most code copied from TinyCLOS (define (make 'name "multi-generic" diff --git a/Lib/chicken/std_string.i b/Lib/chicken/std_string.i index ce24cba32..2955d0e2f 100644 --- a/Lib/chicken/std_string.i +++ b/Lib/chicken/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/chicken/typemaps.i b/Lib/chicken/typemaps.i index 56cd18a5d..d79e20184 100644 --- a/Lib/chicken/typemaps.i +++ b/Lib/chicken/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Pointer handling diff --git a/Lib/clisp/clisp.swg b/Lib/clisp/clisp.swg index e1d330cb3..fb6cdbf2a 100644 --- a/Lib/clisp/clisp.swg +++ b/Lib/clisp/clisp.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * clisp.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/cmalloc.i b/Lib/cmalloc.i index 9f58bc03c..03a61351c 100644 --- a/Lib/cmalloc.i +++ b/Lib/cmalloc.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cmalloc.i * * SWIG library file containing macros that can be used to create objects using diff --git a/Lib/constraints.i b/Lib/constraints.i index 8bc7f9159..2deb1168a 100644 --- a/Lib/constraints.i +++ b/Lib/constraints.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * constraints.i * * SWIG constraints library. diff --git a/Lib/cpointer.i b/Lib/cpointer.i index 6b15a8417..1a6e51741 100644 --- a/Lib/cpointer.i +++ b/Lib/cpointer.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cpointer.i * * SWIG library file containing macros that can be used to manipulate simple diff --git a/Lib/csharp/arrays_csharp.i b/Lib/csharp/arrays_csharp.i index 513330e4e..ea22da584 100644 --- a/Lib/csharp/arrays_csharp.i +++ b/Lib/csharp/arrays_csharp.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * arrays_csharp.i * * This file contains a two approaches to marshaling arrays. The first uses diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg index 4ca55fa77..94f76a3ad 100644 --- a/Lib/csharp/csharp.swg +++ b/Lib/csharp/csharp.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * csharp.swg * * C# typemaps diff --git a/Lib/csharp/csharphead.swg b/Lib/csharp/csharphead.swg index eec4a2f2c..ffff70372 100644 --- a/Lib/csharp/csharphead.swg +++ b/Lib/csharp/csharphead.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * csharphead.swg * * Support code for exceptions if the SWIG_CSHARP_NO_EXCEPTION_HELPER is not defined diff --git a/Lib/csharp/director.swg b/Lib/csharp/director.swg index 7768d8c02..8957ecf42 100644 --- a/Lib/csharp/director.swg +++ b/Lib/csharp/director.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * director.swg * * This file contains support for director classes so that C# proxy diff --git a/Lib/csharp/enums.swg b/Lib/csharp/enums.swg index 6605da8c8..be2a6063b 100644 --- a/Lib/csharp/enums.swg +++ b/Lib/csharp/enums.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enums.swg * * Include this file in order for C/C++ enums to be wrapped by proper C# enums. diff --git a/Lib/csharp/enumsimple.swg b/Lib/csharp/enumsimple.swg index 2b1cb182b..f50849892 100644 --- a/Lib/csharp/enumsimple.swg +++ b/Lib/csharp/enumsimple.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enumsimple.swg * * This file provides backwards compatible enum wrapping. SWIG versions 1.3.21 diff --git a/Lib/csharp/enumtypesafe.swg b/Lib/csharp/enumtypesafe.swg index a6bf64b9a..8ba7838ef 100644 --- a/Lib/csharp/enumtypesafe.swg +++ b/Lib/csharp/enumtypesafe.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enumtypesafe.swg * * Include this file in order for C/C++ enums to be wrapped by the so called diff --git a/Lib/csharp/std_except.i b/Lib/csharp/std_except.i index 27eb84bc2..c86e97a54 100644 --- a/Lib/csharp/std_except.i +++ b/Lib/csharp/std_except.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_except.i * * Typemaps used by the STL wrappers that throw exceptions. These typemaps are diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i index b19414597..c35f21dc7 100644 --- a/Lib/csharp/std_map.i +++ b/Lib/csharp/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/csharp/std_pair.i b/Lib/csharp/std_pair.i index 0712ad762..78142ffa6 100644 --- a/Lib/csharp/std_pair.i +++ b/Lib/csharp/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/csharp/std_string.i b/Lib/csharp/std_string.i index 0d804518b..d29692717 100644 --- a/Lib/csharp/std_string.i +++ b/Lib/csharp/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * Typemaps for std::string and const std::string& diff --git a/Lib/csharp/std_vector.i b/Lib/csharp/std_vector.i index 448226860..f4ad88bae 100644 --- a/Lib/csharp/std_vector.i +++ b/Lib/csharp/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * SWIG typemaps for std::vector diff --git a/Lib/csharp/std_wstring.i b/Lib/csharp/std_wstring.i index 9142d36a5..938070e4b 100644 --- a/Lib/csharp/std_wstring.i +++ b/Lib/csharp/std_wstring.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_wstring.i * * Typemaps for std::wstring and const std::wstring& diff --git a/Lib/csharp/stl.i b/Lib/csharp/stl.i index 9d2e91eee..66b72e073 100644 --- a/Lib/csharp/stl.i +++ b/Lib/csharp/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/csharp/typemaps.i b/Lib/csharp/typemaps.i index ac8398021..ddfbd1b0c 100644 --- a/Lib/csharp/typemaps.i +++ b/Lib/csharp/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Pointer and reference handling typemap library diff --git a/Lib/csharp/wchar.i b/Lib/csharp/wchar.i index f02c09a53..be87560c3 100644 --- a/Lib/csharp/wchar.i +++ b/Lib/csharp/wchar.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * wchar.i * * Typemaps for the wchar_t type diff --git a/Lib/cstring.i b/Lib/cstring.i index 6829f7597..4ebdf6857 100644 --- a/Lib/cstring.i +++ b/Lib/cstring.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cstring.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/cwstring.i b/Lib/cwstring.i index f0631d328..a6b08ae40 100644 --- a/Lib/cwstring.i +++ b/Lib/cwstring.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cwstring.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/exception.i b/Lib/exception.i index e9ba189a1..18b08994f 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * exception.i * * SWIG library file providing language independent exception handling diff --git a/Lib/gcj/cni.swg b/Lib/gcj/cni.swg index 4bd07df06..247909a4a 100644 --- a/Lib/gcj/cni.swg +++ b/Lib/gcj/cni.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cni.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/guile/common.scm b/Lib/guile/common.scm index 17c9ab580..a51d3a71d 100644 --- a/Lib/guile/common.scm +++ b/Lib/guile/common.scm @@ -3,6 +3,12 @@ ;;;* ;;;* This file contains generic SWIG GOOPS classes for generated ;;;* GOOPS file support +;;;* +;;;* Copyright (C) 2003 John Lenz (jelenz@wisc.edu) +;;;* Copyright (C) 2004 Matthias Koeppe (mkoeppe@mail.math.uni-magdeburg.de) +;;;* +;;;* This file may be freely redistributed without license or fee provided +;;;* this copyright message remains intact. ;;;************************************************************************ (define-module (Swig swigrun)) diff --git a/Lib/guile/cplusplus.i b/Lib/guile/cplusplus.i index 0dfe71754..cb4cf7434 100644 --- a/Lib/guile/cplusplus.i +++ b/Lib/guile/cplusplus.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cplusplus.i * * SWIG typemaps for C++ diff --git a/Lib/guile/guile.i b/Lib/guile/guile.i index ef270d74b..1bf28d6f3 100644 --- a/Lib/guile/guile.i +++ b/Lib/guile/guile.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * guile.i * * SWIG Configuration File for Guile. diff --git a/Lib/guile/guile_gh.swg b/Lib/guile/guile_gh.swg index 3b65af897..6412a4c61 100644 --- a/Lib/guile/guile_gh.swg +++ b/Lib/guile/guile_gh.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * guile_gh.swg * * This SWIG interface file is processed if the Guile module is run diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg index 0eba1f97e..5b1fca0aa 100644 --- a/Lib/guile/guile_gh_run.swg +++ b/Lib/guile/guile_gh_run.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * guile_gh_run.swg * * Guile GH runtime file diff --git a/Lib/guile/guile_scm.swg b/Lib/guile/guile_scm.swg index d12401451..caded728d 100644 --- a/Lib/guile/guile_scm.swg +++ b/Lib/guile/guile_scm.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * guile_scm.swg * * This SWIG interface file is processed if the Guile module is run diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg index 91b74095d..5da8558fc 100644 --- a/Lib/guile/guile_scm_run.swg +++ b/Lib/guile/guile_scm_run.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * guile_scm_run.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/guile/guilemain.i b/Lib/guile/guilemain.i index 925b81fee..6f4e4d94d 100644 --- a/Lib/guile/guilemain.i +++ b/Lib/guile/guilemain.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * guilemain.i * * The main functions for a user augmented guile diff --git a/Lib/guile/interpreter.i b/Lib/guile/interpreter.i index 524e0694a..7e8f0777a 100644 --- a/Lib/guile/interpreter.i +++ b/Lib/guile/interpreter.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * interpreter.i * * SWIG file for a simple Guile interpreter diff --git a/Lib/guile/list-vector.i b/Lib/guile/list-vector.i index c2cd1aea2..d98cae59a 100644 --- a/Lib/guile/list-vector.i +++ b/Lib/guile/list-vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * list_vector.i * * Guile typemaps for converting between arrays and Scheme lists or vectors diff --git a/Lib/guile/pointer-in-out.i b/Lib/guile/pointer-in-out.i index d8a631ca9..bc6438759 100644 --- a/Lib/guile/pointer-in-out.i +++ b/Lib/guile/pointer-in-out.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pointer-in-out.i * * Guile typemaps for passing pointers indirectly diff --git a/Lib/guile/ports.i b/Lib/guile/ports.i index 5940b4d3b..0d0e142e1 100644 --- a/Lib/guile/ports.i +++ b/Lib/guile/ports.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * ports.i * * Guile typemaps for handling ports diff --git a/Lib/guile/std_common.i b/Lib/guile/std_common.i index a46c42c69..ace5d65a8 100644 --- a/Lib/guile/std_common.i +++ b/Lib/guile/std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i index 19c863096..cc53e1560 100644 --- a/Lib/guile/std_map.i +++ b/Lib/guile/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/guile/std_pair.i b/Lib/guile/std_pair.i index 35f0cfad5..f8c2ea688 100644 --- a/Lib/guile/std_pair.i +++ b/Lib/guile/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/guile/std_string.i b/Lib/guile/std_string.i index c10806e98..f80a65ca5 100644 --- a/Lib/guile/std_string.i +++ b/Lib/guile/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/guile/std_vector.i b/Lib/guile/std_vector.i index 6801daee8..145db945b 100644 --- a/Lib/guile/std_vector.i +++ b/Lib/guile/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * SWIG typemaps for std::vector diff --git a/Lib/guile/stl.i b/Lib/guile/stl.i index 9d2e91eee..66b72e073 100644 --- a/Lib/guile/stl.i +++ b/Lib/guile/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i index 4f306f7f8..d9f972850 100644 --- a/Lib/guile/typemaps.i +++ b/Lib/guile/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Guile-specific typemaps diff --git a/Lib/inttypes.i b/Lib/inttypes.i index 8450cb840..0cc81948e 100644 --- a/Lib/inttypes.i +++ b/Lib/inttypes.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * inttypes.i * * SWIG library file for ISO C99 types: 7.8 Format conversion of integer types diff --git a/Lib/java/arrays_java.i b/Lib/java/arrays_java.i index ddaf7408c..95510c3f9 100644 --- a/Lib/java/arrays_java.i +++ b/Lib/java/arrays_java.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * arrays_java.i * * These typemaps give more natural support for arrays. The typemaps are not efficient diff --git a/Lib/java/director.swg b/Lib/java/director.swg index 07e5a1af1..fa588671d 100644 --- a/Lib/java/director.swg +++ b/Lib/java/director.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/java/enums.swg b/Lib/java/enums.swg index edb67c417..1a8f89b3a 100644 --- a/Lib/java/enums.swg +++ b/Lib/java/enums.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enums.swg * * Include this file in order for C/C++ enums to be wrapped by proper Java enums. diff --git a/Lib/java/enumsimple.swg b/Lib/java/enumsimple.swg index e08401869..f45774d0c 100644 --- a/Lib/java/enumsimple.swg +++ b/Lib/java/enumsimple.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enumsimple.swg * * This file provides backwards compatible enum wrapping. SWIG versions 1.3.21 diff --git a/Lib/java/enumtypesafe.swg b/Lib/java/enumtypesafe.swg index d6c6e5190..a49a9d134 100644 --- a/Lib/java/enumtypesafe.swg +++ b/Lib/java/enumtypesafe.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enumtypesafe.swg * * Include this file in order for C/C++ enums to be wrapped by the so called diff --git a/Lib/java/enumtypeunsafe.swg b/Lib/java/enumtypeunsafe.swg index d9a7c4d29..bda055113 100644 --- a/Lib/java/enumtypeunsafe.swg +++ b/Lib/java/enumtypeunsafe.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * enumtypeunsafe.swg * * Include this file in order for C/C++ enums to be wrapped by integers values. diff --git a/Lib/java/java.swg b/Lib/java/java.swg index 6173502ca..bd2357a86 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * java.swg * * Java typemaps diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index d2ea560b6..fc4c4e267 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * javahead.swg * * Java support code diff --git a/Lib/java/std_except.i b/Lib/java/std_except.i index 9e23d50e6..15be1deb8 100644 --- a/Lib/java/std_except.i +++ b/Lib/java/std_except.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_except.i * * Typemaps used by the STL wrappers that throw exceptions. diff --git a/Lib/java/std_map.i b/Lib/java/std_map.i index a7020532c..00967d3f9 100644 --- a/Lib/java/std_map.i +++ b/Lib/java/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/java/std_pair.i b/Lib/java/std_pair.i index fe45ee676..dc0604dc5 100644 --- a/Lib/java/std_pair.i +++ b/Lib/java/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i index f0d837696..789e17a65 100644 --- a/Lib/java/std_string.i +++ b/Lib/java/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * Typemaps for std::string and const std::string& diff --git a/Lib/java/std_vector.i b/Lib/java/std_vector.i index 3f29b19c7..29439606b 100644 --- a/Lib/java/std_vector.i +++ b/Lib/java/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/java/std_wstring.i b/Lib/java/std_wstring.i index 12d8fc14f..989176500 100644 --- a/Lib/java/std_wstring.i +++ b/Lib/java/std_wstring.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_wstring.i * * Typemaps for std::wstring and const std::wstring& diff --git a/Lib/java/stl.i b/Lib/java/stl.i index 04f86014f..b8d7a654c 100644 --- a/Lib/java/stl.i +++ b/Lib/java/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i index 74ed99374..59f7af99a 100644 --- a/Lib/java/typemaps.i +++ b/Lib/java/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Pointer and reference handling typemap library diff --git a/Lib/java/various.i b/Lib/java/various.i index 7c396de3e..733b8fa79 100644 --- a/Lib/java/various.i +++ b/Lib/java/various.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * various.i * * SWIG Typemap library for Java. diff --git a/Lib/lua/_std_common.i b/Lib/lua/_std_common.i index e552d0c8f..33cc513c3 100644 --- a/Lib/lua/_std_common.i +++ b/Lib/lua/_std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * _std_common.i * * std::helpers for LUA diff --git a/Lib/lua/lua.swg b/Lib/lua/lua.swg index c3f5cecc5..b6d888670 100644 --- a/Lib/lua/lua.swg +++ b/Lib/lua/lua.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * lua.swg * * SWIG Configuration File for Lua. diff --git a/Lib/lua/lua_fnptr.i b/Lib/lua/lua_fnptr.i index 7e9facdf3..c7df6f5a3 100644 --- a/Lib/lua/lua_fnptr.i +++ b/Lib/lua/lua_fnptr.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * lua_fnptr.i * * SWIG Library file containing the main typemap code to support Lua modules. diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg index 4c9aa5144..32e1b1617 100644 --- a/Lib/lua/luarun.swg +++ b/Lib/lua/luarun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * luarun.swg * * This file contains the runtime support for Lua modules diff --git a/Lib/lua/luaruntime.swg b/Lib/lua/luaruntime.swg index 5823d4fcf..b82cd56d7 100644 --- a/Lib/lua/luaruntime.swg +++ b/Lib/lua/luaruntime.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * luaruntime.swg * * all the runtime code for . diff --git a/Lib/lua/luatypemaps.swg b/Lib/lua/luatypemaps.swg index 401541267..caa2a6ce1 100644 --- a/Lib/lua/luatypemaps.swg +++ b/Lib/lua/luatypemaps.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * luatypemaps.swg * * basic typemaps for Lua. diff --git a/Lib/lua/std_except.i b/Lib/lua/std_except.i index 9c736b9ef..ce148ef63 100644 --- a/Lib/lua/std_except.i +++ b/Lib/lua/std_except.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * Typemaps used by the STL wrappers that throw exceptions. * These typemaps are used when methods are declared with an STL exception * specification, such as: diff --git a/Lib/lua/std_map.i b/Lib/lua/std_map.i index 84b0c74ff..dd22443d5 100644 --- a/Lib/lua/std_map.i +++ b/Lib/lua/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/lua/std_pair.i b/Lib/lua/std_pair.i index c76361554..1b20f74e0 100644 --- a/Lib/lua/std_pair.i +++ b/Lib/lua/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * std::pair typemaps for LUA diff --git a/Lib/lua/std_string.i b/Lib/lua/std_string.i index 92f27d738..fa58f10bb 100644 --- a/Lib/lua/std_string.i +++ b/Lib/lua/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * std::string typemaps for LUA diff --git a/Lib/lua/std_vector.i b/Lib/lua/std_vector.i index f248f0340..c6778087f 100644 --- a/Lib/lua/std_vector.i +++ b/Lib/lua/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * std::vector typemaps for LUA diff --git a/Lib/lua/stl.i b/Lib/lua/stl.i index 04f86014f..b8d7a654c 100644 --- a/Lib/lua/stl.i +++ b/Lib/lua/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/lua/typemaps.i b/Lib/lua/typemaps.i index 084726e58..fa0c0d0e5 100644 --- a/Lib/lua/typemaps.i +++ b/Lib/lua/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.swg * * SWIG Library file containing the main typemap code to support Lua modules. diff --git a/Lib/lua/wchar.i b/Lib/lua/wchar.i index 5021c1604..5b206eb71 100644 --- a/Lib/lua/wchar.i +++ b/Lib/lua/wchar.i @@ -1,8 +1,12 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * wchar.i * * Typemaps for the wchar_t type * These are mapped to a Lua string and are passed around by value. + * * ----------------------------------------------------------------------------- */ // note: only support for pointer right now, not fixed length strings @@ -39,4 +43,4 @@ if ($1==0) {lua_pushfstring(L,"Error in converting to wchar (arg %d)",$input);go free($1); %} -%typemap(typecheck) wchar_t * = char *; +%typemap(typecheck) wchar_t * = char *; \ No newline at end of file diff --git a/Lib/math.i b/Lib/math.i index a37c92d19..be931d71b 100644 --- a/Lib/math.i +++ b/Lib/math.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * math.i * * SWIG library file for floating point operations. diff --git a/Lib/modula3/modula3.swg b/Lib/modula3/modula3.swg index 599a12e5a..6a1b4d94d 100644 --- a/Lib/modula3/modula3.swg +++ b/Lib/modula3/modula3.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * modula3.swg * * Modula3 typemaps diff --git a/Lib/modula3/modula3head.swg b/Lib/modula3/modula3head.swg index af96a78d1..b2426be5f 100644 --- a/Lib/modula3/modula3head.swg +++ b/Lib/modula3/modula3head.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * modula3head.swg * * Modula3 support code diff --git a/Lib/modula3/typemaps.i b/Lib/modula3/typemaps.i index 1d76ab5e0..79ddfda0f 100644 --- a/Lib/modula3/typemaps.i +++ b/Lib/modula3/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Pointer and reference handling typemap library diff --git a/Lib/mzscheme/mzrun.swg b/Lib/mzscheme/mzrun.swg index a5128da56..3b05d2406 100644 --- a/Lib/mzscheme/mzrun.swg +++ b/Lib/mzscheme/mzrun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * mzrun.swg * ----------------------------------------------------------------------------- */ diff --git a/Lib/mzscheme/mzscheme.swg b/Lib/mzscheme/mzscheme.swg index 9ae242845..ed4b2ec9d 100644 --- a/Lib/mzscheme/mzscheme.swg +++ b/Lib/mzscheme/mzscheme.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * mzscheme.swg * * SWIG Configuration File for MzScheme. diff --git a/Lib/mzscheme/std_common.i b/Lib/mzscheme/std_common.i index 1f1ae1ab7..8732f811c 100644 --- a/Lib/mzscheme/std_common.i +++ b/Lib/mzscheme/std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/mzscheme/std_map.i b/Lib/mzscheme/std_map.i index b2c894509..aff720db6 100644 --- a/Lib/mzscheme/std_map.i +++ b/Lib/mzscheme/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/mzscheme/std_pair.i b/Lib/mzscheme/std_pair.i index d5a65470d..2ac331e71 100644 --- a/Lib/mzscheme/std_pair.i +++ b/Lib/mzscheme/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/mzscheme/std_string.i b/Lib/mzscheme/std_string.i index b8b99d9ad..c9a82efe4 100644 --- a/Lib/mzscheme/std_string.i +++ b/Lib/mzscheme/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string types diff --git a/Lib/mzscheme/std_vector.i b/Lib/mzscheme/std_vector.i index 22e1fa96b..90a52fc0a 100644 --- a/Lib/mzscheme/std_vector.i +++ b/Lib/mzscheme/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * SWIG typemaps for std::vector diff --git a/Lib/mzscheme/stl.i b/Lib/mzscheme/stl.i index b19eae58b..946e4b7f0 100644 --- a/Lib/mzscheme/stl.i +++ b/Lib/mzscheme/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/mzscheme/typemaps.i b/Lib/mzscheme/typemaps.i index b9f22440c..334893242 100644 --- a/Lib/mzscheme/typemaps.i +++ b/Lib/mzscheme/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/ocaml/cstring.i b/Lib/ocaml/cstring.i index 0d6aa4b69..e56258264 100644 --- a/Lib/ocaml/cstring.i +++ b/Lib/ocaml/cstring.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cstring.i * * This file provides typemaps and macros for dealing with various forms diff --git a/Lib/ocaml/director.swg b/Lib/ocaml/director.swg index a21f62102..87333168f 100644 --- a/Lib/ocaml/director.swg +++ b/Lib/ocaml/director.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/ocaml/ocaml.i b/Lib/ocaml/ocaml.i index e099f7c10..a46e239d1 100644 --- a/Lib/ocaml/ocaml.i +++ b/Lib/ocaml/ocaml.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * ocaml.i * * SWIG Configuration File for Ocaml diff --git a/Lib/ocaml/ocamldec.swg b/Lib/ocaml/ocamldec.swg index 8e452d3f9..3b5290fa1 100644 --- a/Lib/ocaml/ocamldec.swg +++ b/Lib/ocaml/ocamldec.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * ocamldec.swg * * Ocaml runtime code -- declarations diff --git a/Lib/ocaml/std_common.i b/Lib/ocaml/std_common.i index 1c397050c..b2dff61d2 100644 --- a/Lib/ocaml/std_common.i +++ b/Lib/ocaml/std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/ocaml/std_deque.i b/Lib/ocaml/std_deque.i index 5b38962bf..baadb4e53 100644 --- a/Lib/ocaml/std_deque.i +++ b/Lib/ocaml/std_deque.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_deque.i * * Default std_deque wrapper diff --git a/Lib/ocaml/std_list.i b/Lib/ocaml/std_list.i index 06181cca8..0aea90767 100644 --- a/Lib/ocaml/std_list.i +++ b/Lib/ocaml/std_list.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_list.i * * SWIG typemaps for std::list types diff --git a/Lib/ocaml/std_map.i b/Lib/ocaml/std_map.i index f202e74ed..f174f2872 100644 --- a/Lib/ocaml/std_map.i +++ b/Lib/ocaml/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/ocaml/std_pair.i b/Lib/ocaml/std_pair.i index fe45ee676..dc0604dc5 100644 --- a/Lib/ocaml/std_pair.i +++ b/Lib/ocaml/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/ocaml/std_string.i b/Lib/ocaml/std_string.i index e75e95304..7add3a070 100644 --- a/Lib/ocaml/std_string.i +++ b/Lib/ocaml/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/ocaml/std_vector.i b/Lib/ocaml/std_vector.i index 53d107447..91c335562 100644 --- a/Lib/ocaml/std_vector.i +++ b/Lib/ocaml/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * SWIG typemaps for std::vector types diff --git a/Lib/ocaml/stl.i b/Lib/ocaml/stl.i index 9d2e91eee..66b72e073 100644 --- a/Lib/ocaml/stl.i +++ b/Lib/ocaml/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/ocaml/typecheck.i b/Lib/ocaml/typecheck.i index 4c3500690..51e66061b 100644 --- a/Lib/ocaml/typecheck.i +++ b/Lib/ocaml/typecheck.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typecheck.i * * Typechecking rules diff --git a/Lib/ocaml/typemaps.i b/Lib/ocaml/typemaps.i index 39544de94..7f978bf7f 100644 --- a/Lib/ocaml/typemaps.i +++ b/Lib/ocaml/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * The Ocaml module handles all types uniformly via typemaps. Here diff --git a/Lib/octave/octcontainer.swg b/Lib/octave/octcontainer.swg index 6613fcfff..afc3ed147 100644 --- a/Lib/octave/octcontainer.swg +++ b/Lib/octave/octcontainer.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * octcontainer.swg * * Octave cell <-> C++ container wrapper diff --git a/Lib/octave/octiterators.swg b/Lib/octave/octiterators.swg index 0e3fe7033..926361e10 100644 --- a/Lib/octave/octiterators.swg +++ b/Lib/octave/octiterators.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * octiterators.swg * * Users can derive form the OctSwigIterator to implemet their diff --git a/Lib/perl5/perlmain.i b/Lib/perl5/perlmain.i index 18ecb7eb5..f224b9c75 100644 --- a/Lib/perl5/perlmain.i +++ b/Lib/perl5/perlmain.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * perlmain.i * * Code to statically rebuild perl5. diff --git a/Lib/perl5/reference.i b/Lib/perl5/reference.i index 06712bbd5..d3d745cfc 100644 --- a/Lib/perl5/reference.i +++ b/Lib/perl5/reference.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * reference.i * * Accept Perl references as pointers diff --git a/Lib/perl5/std_common.i b/Lib/perl5/std_common.i index c36513912..bc25b353f 100644 --- a/Lib/perl5/std_common.i +++ b/Lib/perl5/std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/perl5/std_list.i b/Lib/perl5/std_list.i index c6bca18f6..633e40d9a 100644 --- a/Lib/perl5/std_list.i +++ b/Lib/perl5/std_list.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_list.i * * SWIG typemaps for std::list types diff --git a/Lib/perl5/std_map.i b/Lib/perl5/std_map.i index b19414597..c35f21dc7 100644 --- a/Lib/perl5/std_map.i +++ b/Lib/perl5/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/perl5/std_pair.i b/Lib/perl5/std_pair.i index 0712ad762..78142ffa6 100644 --- a/Lib/perl5/std_pair.i +++ b/Lib/perl5/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/perl5/std_vector.i b/Lib/perl5/std_vector.i index 0a61c31e0..7c4f72919 100644 --- a/Lib/perl5/std_vector.i +++ b/Lib/perl5/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * SWIG typemaps for std::vector types diff --git a/Lib/perl5/stl.i b/Lib/perl5/stl.i index b19eae58b..946e4b7f0 100644 --- a/Lib/perl5/stl.i +++ b/Lib/perl5/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/perl5/typemaps.i b/Lib/perl5/typemaps.i index 7d96f2ace..fc6d8f874 100644 --- a/Lib/perl5/typemaps.i +++ b/Lib/perl5/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * The SWIG typemap library provides a language independent mechanism for diff --git a/Lib/php/const.i b/Lib/php/const.i index 08096c98b..6ddd403d0 100644 --- a/Lib/php/const.i +++ b/Lib/php/const.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * const.i * * Typemaps for constants diff --git a/Lib/php/globalvar.i b/Lib/php/globalvar.i index 34bd5f994..df8cfade7 100644 --- a/Lib/php/globalvar.i +++ b/Lib/php/globalvar.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * globalvar.i * * Global variables - add the variable to PHP diff --git a/Lib/php/php.swg b/Lib/php/php.swg index 99181472d..087525be4 100644 --- a/Lib/php/php.swg +++ b/Lib/php/php.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * php.swg * * PHP configuration file diff --git a/Lib/php/phpkw.swg b/Lib/php/phpkw.swg index e7d4f2fda..3d1a62511 100644 --- a/Lib/php/phpkw.swg +++ b/Lib/php/phpkw.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * phpkw.swg * * The 'keywords' in PHP are global, ie, the following names are fine diff --git a/Lib/php/phprun.swg b/Lib/php/phprun.swg index 22f23f729..5196b95b4 100644 --- a/Lib/php/phprun.swg +++ b/Lib/php/phprun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * phprun.swg * * PHP runtime library diff --git a/Lib/php/std_common.i b/Lib/php/std_common.i index 092bf012b..a779649dd 100644 --- a/Lib/php/std_common.i +++ b/Lib/php/std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/php/std_map.i b/Lib/php/std_map.i index ede5fbe30..c6721806b 100644 --- a/Lib/php/std_map.i +++ b/Lib/php/std_map.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_map.i * * SWIG typemaps for std::map diff --git a/Lib/php/std_pair.i b/Lib/php/std_pair.i index fe45ee676..dc0604dc5 100644 --- a/Lib/php/std_pair.i +++ b/Lib/php/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * SWIG typemaps for std::pair diff --git a/Lib/php/std_string.i b/Lib/php/std_string.i index 22c953bf5..08a7cdac9 100644 --- a/Lib/php/std_string.i +++ b/Lib/php/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string types diff --git a/Lib/php/std_vector.i b/Lib/php/std_vector.i index 4cfc94f74..b54181618 100644 --- a/Lib/php/std_vector.i +++ b/Lib/php/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * * SWIG typemaps for std::vector types diff --git a/Lib/php/stl.i b/Lib/php/stl.i index 9d2e91eee..66b72e073 100644 --- a/Lib/php/stl.i +++ b/Lib/php/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/php/typemaps.i b/Lib/php/typemaps.i index 7bb8c9fa3..7af301d0d 100644 --- a/Lib/php/typemaps.i +++ b/Lib/php/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i. * * SWIG Typemap library for PHP. diff --git a/Lib/pike/pike.swg b/Lib/pike/pike.swg index 2ba27671e..e72da8fba 100644 --- a/Lib/pike/pike.swg +++ b/Lib/pike/pike.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pike.swg * * Pike configuration module. diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg index 451a4e092..875fcf4e2 100644 --- a/Lib/pike/pikerun.swg +++ b/Lib/pike/pikerun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pikerun.swg * * This file contains the runtime support for Pike modules diff --git a/Lib/pike/std_string.i b/Lib/pike/std_string.i index 0694035bf..ca1fad822 100644 --- a/Lib/pike/std_string.i +++ b/Lib/pike/std_string.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_string.i * * SWIG typemaps for std::string diff --git a/Lib/pointer.i b/Lib/pointer.i index 8015317d7..16e11b7d1 100644 --- a/Lib/pointer.i +++ b/Lib/pointer.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pointer.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/python/ccomplex.i b/Lib/python/ccomplex.i index 28872b985..30f797d74 100644 --- a/Lib/python/ccomplex.i +++ b/Lib/python/ccomplex.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * ccomplex.i * * C complex typemaps diff --git a/Lib/python/director.swg b/Lib/python/director.swg index 090da0205..836d107ce 100644 --- a/Lib/python/director.swg +++ b/Lib/python/director.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/python/embed15.i b/Lib/python/embed15.i index 4abfbba75..f677d166e 100644 --- a/Lib/python/embed15.i +++ b/Lib/python/embed15.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * embed15.i * * SWIG file embedding the Python interpreter in something else. diff --git a/Lib/python/file.i b/Lib/python/file.i index 359c34d2c..294ab9178 100644 --- a/Lib/python/file.i +++ b/Lib/python/file.i @@ -1,7 +1,11 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * file.i * * Typemaps for FILE* + * From the ideas of Luigi Ballabio * ----------------------------------------------------------------------------- */ %types(FILE *); diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index 39a91522e..6fd1d56f9 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pycontainer.swg * * Python sequence <-> C++ container wrapper diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg index 3ff822d35..9cd795d7c 100644 --- a/Lib/python/pyiterators.swg +++ b/Lib/python/pyiterators.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pyiterators.swg * * Implement a python 'output' iterator for Python 2.2 or higher. diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index cab7dd468..5a1b1230e 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * pyrun.swg * * This file contains the runtime support for Python modules diff --git a/Lib/python/typemaps.i b/Lib/python/typemaps.i index 5d438ecab..1c87de61d 100644 --- a/Lib/python/typemaps.i +++ b/Lib/python/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Pointer handling diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg index 60c086f5b..9a6371ad9 100644 --- a/Lib/ruby/director.swg +++ b/Lib/ruby/director.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * director.swg * * This file contains support for director classes that proxy diff --git a/Lib/ruby/rubyautodoc.swg b/Lib/ruby/rubyautodoc.swg index 1e6b0d9dc..ade4bde1d 100644 --- a/Lib/ruby/rubyautodoc.swg +++ b/Lib/ruby/rubyautodoc.swg @@ -1,8 +1,13 @@ -/* ----------------------------------------------------------------------------- - * rubyautodoc.swg - * - * This file implements autodoc typemaps for some common ruby methods. - * ----------------------------------------------------------------------------- */ +/** + * @file rubyautodoc.swg + * @author gga + * @date Wed May 2 16:41:59 2007 + * + * @brief This file implements autodoc typemaps for some common + * ruby methods. + * + * + */ %define AUTODOC(func, str) %feature("autodoc", str) func; diff --git a/Lib/ruby/rubycontainer.swg b/Lib/ruby/rubycontainer.swg index c93094aeb..919695ec2 100644 --- a/Lib/ruby/rubycontainer.swg +++ b/Lib/ruby/rubycontainer.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * rubycontainer.swg * * Ruby sequence <-> C++ container wrapper diff --git a/Lib/ruby/rubycontainer_extended.swg b/Lib/ruby/rubycontainer_extended.swg index 09be64aee..360e399ce 100644 --- a/Lib/ruby/rubycontainer_extended.swg +++ b/Lib/ruby/rubycontainer_extended.swg @@ -1,13 +1,17 @@ -/* ----------------------------------------------------------------------------- - * rubycontainer_extended.swg - * - * This file contains additional functions that make containers - * behave closer to ruby primitive types. - * However, some of these functions place some restrictions on - * the underlying object inside of the container and the iterator - * (that it has to have an == comparison function, that it has to have - * an = assignment operator, etc). - * ----------------------------------------------------------------------------- */ +/** + * @file rubycontainer_extended.swg + * @author gga + * @date Sat May 5 05:36:01 2007 + * + * @brief This file contains additional functions that make containers + * behave closer to ruby primitive types. + * However, some of these functions place some restrictions on + * the underlying object inside of the container and the iterator + * (that it has to have an == comparison function, that it has to have + * an = assignment operator, etc). + * + */ + /** * Macro used to add extend functions that require operator== in object. diff --git a/Lib/ruby/rubyiterators.swg b/Lib/ruby/rubyiterators.swg index aba156a2b..466ae221b 100644 --- a/Lib/ruby/rubyiterators.swg +++ b/Lib/ruby/rubyiterators.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * rubyiterators.swg * * Implement a C++ 'output' iterator for Ruby. diff --git a/Lib/ruby/rubyprimtypes.swg b/Lib/ruby/rubyprimtypes.swg index aff35dcf1..c2d577995 100644 --- a/Lib/ruby/rubyprimtypes.swg +++ b/Lib/ruby/rubyprimtypes.swg @@ -1,5 +1,9 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * rubyprimtypes.swg + * * ----------------------------------------------------------------------------- */ /* ------------------------------------------------------------ * Primitive Types diff --git a/Lib/ruby/rubyrun.swg b/Lib/ruby/rubyrun.swg index ccc997a71..24d861d5a 100644 --- a/Lib/ruby/rubyrun.swg +++ b/Lib/ruby/rubyrun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * rubyrun.swg * * This file contains the runtime support for Ruby modules diff --git a/Lib/ruby/rubystdautodoc.swg b/Lib/ruby/rubystdautodoc.swg index e14f65902..ad70f7f8b 100644 --- a/Lib/ruby/rubystdautodoc.swg +++ b/Lib/ruby/rubystdautodoc.swg @@ -1,8 +1,12 @@ -/* ----------------------------------------------------------------------------- - * rubystdautodoc.swg +/** + * @file rubystdautodoc.swg + * @author gga + * @date Wed May 2 17:20:39 2007 * - * This file contains autodocs for standard STL functions. - * ----------------------------------------------------------------------------- */ + * @brief This file contains autodocs for standard STL functions. + * + * + */ // // For STL autodocumentation diff --git a/Lib/ruby/rubytracking.swg b/Lib/ruby/rubytracking.swg index 0a36f4a05..959d2087e 100644 --- a/Lib/ruby/rubytracking.swg +++ b/Lib/ruby/rubytracking.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * rubytracking.swg * * This file contains support for tracking mappings from diff --git a/Lib/ruby/rubywstrings.swg b/Lib/ruby/rubywstrings.swg index bb44fbc6e..862928c95 100644 --- a/Lib/ruby/rubywstrings.swg +++ b/Lib/ruby/rubywstrings.swg @@ -1,11 +1,15 @@ -/* ----------------------------------------------------------------------------- - * rubywstrings.swg - * - * Currently, Ruby does not support Unicode or WChar properly, so these - * are still treated as char arrays for now. - * There are other libraries available that add support to this in - * ruby including WString, FXString, etc. - * ----------------------------------------------------------------------------- */ +/** + * @file rubywstrings.swg + * @author + * @date Fri May 4 17:49:40 2007 + * + * @brief Currently, Ruby does not support Unicode or WChar properly, so these + * are still treated as char arrays for now. + * There are other libraries available that add support to this in + * ruby including WString, FXString, etc. + * + * + */ /* ------------------------------------------------------------ * utility methods for wchar_t strings diff --git a/Lib/ruby/stl.i b/Lib/ruby/stl.i index 9d2e91eee..66b72e073 100644 --- a/Lib/ruby/stl.i +++ b/Lib/ruby/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * * Initial STL definition. extended as needed in each language diff --git a/Lib/ruby/typemaps.i b/Lib/ruby/typemaps.i index c4db82161..2492e2e03 100644 --- a/Lib/ruby/typemaps.i +++ b/Lib/ruby/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Pointer handling diff --git a/Lib/std/_std_deque.i b/Lib/std/_std_deque.i index c30523c0d..026f373d6 100644 --- a/Lib/std/_std_deque.i +++ b/Lib/std/_std_deque.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * _std_deque.i * * This file contains a generic definition of std::deque along with diff --git a/Lib/std_except.i b/Lib/std_except.i index 769a68995..af9803a62 100644 --- a/Lib/std_except.i +++ b/Lib/std_except.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_except.i * * SWIG library file with typemaps to handle and throw STD exceptions in a diff --git a/Lib/stdint.i b/Lib/stdint.i index 14fe6195e..7b48ca388 100644 --- a/Lib/stdint.i +++ b/Lib/stdint.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stdint.i * * SWIG library file for ISO C99 types: 7.18 Integer types diff --git a/Lib/stl.i b/Lib/stl.i index 0b236afda..c3ade01ea 100644 --- a/Lib/stl.i +++ b/Lib/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/swigarch.i b/Lib/swigarch.i index f5aea4678..260b60880 100644 --- a/Lib/swigarch.i +++ b/Lib/swigarch.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * swigarch.i * * SWIG library file for 32bit/64bit code specialization and checking. diff --git a/Lib/swigrun.i b/Lib/swigrun.i index 6026a9151..17a140968 100644 --- a/Lib/swigrun.i +++ b/Lib/swigrun.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * swigrun.i * * Empty module (for now). Placeholder for runtime libs diff --git a/Lib/tcl/mactclinit.c b/Lib/tcl/mactclinit.c new file mode 100644 index 000000000..5dcf8e7f3 --- /dev/null +++ b/Lib/tcl/mactclinit.c @@ -0,0 +1,93 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * mactclinit.c + * ----------------------------------------------------------------------------- */ + +/* + * tclMacAppInit.c -- + * + * Provides a version of the Tcl_AppInit procedure for the example shell. + * + * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center + * Copyright (c) 1995-1997 Sun Microsystems, Inc. + * + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * + * SCCS: @(#) tclMacAppInit.c 1.17 97/01/21 18:13:34 + */ + +#include "tcl.h" +#include "tclInt.h" +#include "tclMacInt.h" + +#if defined(THINK_C) +# include +#elif defined(__MWERKS__) +# include +short InstallConsole _ANSI_ARGS_((short fd)); +#endif + + + +/* + *---------------------------------------------------------------------- + * + * MacintoshInit -- + * + * This procedure calls initalization routines to set up a simple + * console on a Macintosh. This is necessary as the Mac doesn't + * have a stdout & stderr by default. + * + * Results: + * Returns TCL_OK if everything went fine. If it didn't the + * application should probably fail. + * + * Side effects: + * Inits the appropiate console package. + * + *---------------------------------------------------------------------- + */ + +#ifdef __cplusplus +extern "C" +#endif +extern int +MacintoshInit() +{ +#if defined(THINK_C) + + /* Set options for Think C console package */ + /* The console package calls the Mac init calls */ + console_options.pause_atexit = 0; + console_options.title = "\pTcl Interpreter"; + +#elif defined(__MWERKS__) + + /* Set options for CodeWarrior SIOUX package */ + SIOUXSettings.autocloseonquit = true; + SIOUXSettings.showstatusline = true; + SIOUXSettings.asktosaveonclose = false; + InstallConsole(0); + SIOUXSetTitle("\pTcl Interpreter"); + +#elif defined(applec) + + /* Init packages used by MPW SIOW package */ + InitGraf((Ptr)&qd.thePort); + InitFonts(); + InitWindows(); + InitMenus(); + TEInit(); + InitDialogs(nil); + InitCursor(); + +#endif + + TclMacSetEventProc((TclMacConvertEventPtr) SIOUXHandleOneEvent); + + /* No problems with initialization */ + return TCL_OK; +} diff --git a/Lib/tcl/mactkinit.c b/Lib/tcl/mactkinit.c index 78391d445..bfe74029c 100644 --- a/Lib/tcl/mactkinit.c +++ b/Lib/tcl/mactkinit.c @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * mactkinit.c * * This is a support file needed to build a new version of Wish. diff --git a/Lib/tcl/std_common.i b/Lib/tcl/std_common.i index 0718facb8..3a6f47042 100644 --- a/Lib/tcl/std_common.i +++ b/Lib/tcl/std_common.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_common.i * * SWIG typemaps for STL - common utilities diff --git a/Lib/tcl/std_pair.i b/Lib/tcl/std_pair.i index 1448d6524..52e96674f 100644 --- a/Lib/tcl/std_pair.i +++ b/Lib/tcl/std_pair.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_pair.i * * Typemaps for std::pair diff --git a/Lib/tcl/std_vector.i b/Lib/tcl/std_vector.i index 3c8dd24b7..d913f00cc 100644 --- a/Lib/tcl/std_vector.i +++ b/Lib/tcl/std_vector.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * std_vector.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/tcl/stl.i b/Lib/tcl/stl.i index 40c7584ec..afd121341 100644 --- a/Lib/tcl/stl.i +++ b/Lib/tcl/stl.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * stl.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/tcl/tcl8.swg b/Lib/tcl/tcl8.swg index 5da1bc07c..c33cc7681 100644 --- a/Lib/tcl/tcl8.swg +++ b/Lib/tcl/tcl8.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tcl8.swg * * Tcl configuration module. diff --git a/Lib/tcl/tclinterp.i b/Lib/tcl/tclinterp.i index 3b45b6d4b..48cdb6066 100644 --- a/Lib/tcl/tclinterp.i +++ b/Lib/tcl/tclinterp.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tclinterp.i * * Tcl_Interp *interp diff --git a/Lib/tcl/tclopers.swg b/Lib/tcl/tclopers.swg index f113ccd19..26b74203d 100644 --- a/Lib/tcl/tclopers.swg +++ b/Lib/tcl/tclopers.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tclopers.swg * * C++ overloaded operators. diff --git a/Lib/tcl/tclresult.i b/Lib/tcl/tclresult.i index c63b3ee19..ca0106432 100644 --- a/Lib/tcl/tclresult.i +++ b/Lib/tcl/tclresult.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tclresult.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/tcl/tclrun.swg b/Lib/tcl/tclrun.swg index eb8bd253c..6387fb008 100644 --- a/Lib/tcl/tclrun.swg +++ b/Lib/tcl/tclrun.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tclrun.swg * * This file contains the runtime support for Tcl modules and includes diff --git a/Lib/tcl/tclsh.i b/Lib/tcl/tclsh.i index 160ba8d8f..2e8ed3316 100644 --- a/Lib/tcl/tclsh.i +++ b/Lib/tcl/tclsh.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tclsh.i * * SWIG File for building new tclsh program diff --git a/Lib/tcl/tclwstrings.swg b/Lib/tcl/tclwstrings.swg index b3b682e30..2d344c20f 100644 --- a/Lib/tcl/tclwstrings.swg +++ b/Lib/tcl/tclwstrings.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * tclwstrings.wg * * Utility methods for wchar strings diff --git a/Lib/tcl/typemaps.i b/Lib/tcl/typemaps.i index 8bee672cc..7c9e04a8b 100644 --- a/Lib/tcl/typemaps.i +++ b/Lib/tcl/typemaps.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.i * * Swig typemap library for Tcl8. This file contains various sorts diff --git a/Lib/tcl/wish.i b/Lib/tcl/wish.i index 260032a81..077ded61f 100644 --- a/Lib/tcl/wish.i +++ b/Lib/tcl/wish.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * wish.i * * SWIG File for making wish diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg index 4dcf15e2d..4bc6315b7 100644 --- a/Lib/typemaps/attribute.swg +++ b/Lib/typemaps/attribute.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * attribute.swg * * Attribute implementation diff --git a/Lib/typemaps/carrays.swg b/Lib/typemaps/carrays.swg index cdeab36b7..27ca11779 100644 --- a/Lib/typemaps/carrays.swg +++ b/Lib/typemaps/carrays.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * carrays.swg * * This library file contains macros that can be used to manipulate simple diff --git a/Lib/typemaps/cdata.swg b/Lib/typemaps/cdata.swg index 5baf7904c..32b3f5a77 100644 --- a/Lib/typemaps/cdata.swg +++ b/Lib/typemaps/cdata.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cdata.swg * * This library file contains macros for manipulating raw C data as strings. diff --git a/Lib/typemaps/cmalloc.swg b/Lib/typemaps/cmalloc.swg index 45a6ab990..15f962930 100644 --- a/Lib/typemaps/cmalloc.swg +++ b/Lib/typemaps/cmalloc.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cmalloc.swg * * This library file contains macros that can be used to create objects using diff --git a/Lib/typemaps/cpointer.swg b/Lib/typemaps/cpointer.swg index f797a6895..ce1af169e 100644 --- a/Lib/typemaps/cpointer.swg +++ b/Lib/typemaps/cpointer.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cpointer.swg * * This library file contains macros that can be used to manipulate simple diff --git a/Lib/typemaps/cstrings.swg b/Lib/typemaps/cstrings.swg index c60ef6496..9144da790 100644 --- a/Lib/typemaps/cstrings.swg +++ b/Lib/typemaps/cstrings.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * cstrings.swg * * This file provides typemaps and macros for dealing with various forms diff --git a/Lib/typemaps/exception.swg b/Lib/typemaps/exception.swg index 12c4ea658..17a819cd7 100644 --- a/Lib/typemaps/exception.swg +++ b/Lib/typemaps/exception.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * exceptions.swg * * This SWIG library file provides language independent exception handling diff --git a/Lib/typemaps/ptrtypes.swg b/Lib/typemaps/ptrtypes.swg index e1bc476ed..803377afe 100644 --- a/Lib/typemaps/ptrtypes.swg +++ b/Lib/typemaps/ptrtypes.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * ptrtypes.swg * * Value typemaps (Type, const Type&) for "Ptr" types, such as swig diff --git a/Lib/typemaps/swigtypemaps.swg b/Lib/typemaps/swigtypemaps.swg index 0e39afe4c..08abab028 100644 --- a/Lib/typemaps/swigtypemaps.swg +++ b/Lib/typemaps/swigtypemaps.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * swigtypemaps.swg * * Unified Typemap Library frontend diff --git a/Lib/typemaps/typemaps.swg b/Lib/typemaps/typemaps.swg index 4629e8dfa..6e7505765 100644 --- a/Lib/typemaps/typemaps.swg +++ b/Lib/typemaps/typemaps.swg @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * typemaps.swg * * Tcl Pointer handling diff --git a/Lib/uffi/uffi.swg b/Lib/uffi/uffi.swg index 41b085998..78bd23534 100644 --- a/Lib/uffi/uffi.swg +++ b/Lib/uffi/uffi.swg @@ -27,6 +27,8 @@ typedef long size_t; %wrapper %{ +;; $Id$ + (eval-when (compile eval) ;;; You can define your own identifier converter if you want. diff --git a/Lib/wchar.i b/Lib/wchar.i index 14de34634..f106a3529 100644 --- a/Lib/wchar.i +++ b/Lib/wchar.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * wchar.i * ----------------------------------------------------------------------------- */ diff --git a/Lib/windows.i b/Lib/windows.i index 2c093dacc..08ddc2b22 100644 --- a/Lib/windows.i +++ b/Lib/windows.i @@ -1,4 +1,7 @@ /* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * * windows.i * * SWIG library file to support types found in windows.h as well as Microsoft diff --git a/Makefile.in b/Makefile.in index a540ceb68..b56272b11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -188,6 +188,51 @@ java.actionexample: (cd Examples/$(LANGUAGE)/java && $(MAKE) -s $(chk-set-env) $(ACTION)) \ fi; \ +gifplot-library: + @echo $(ACTION)ing Examples/GIFPlot/Lib + @cd Examples/GIFPlot/Lib && $(MAKE) -k -s $(ACTION) + +check-gifplot: \ + check-tcl-gifplot \ + check-perl5-gifplot \ + check-python-gifplot \ + check-java-gifplot \ + check-guile-gifplot \ + check-mzscheme-gifplot \ + check-ruby-gifplot \ + check-ocaml-gifplot \ + check-octave-gifplot \ + check-php-gifplot \ + check-pike-gifplot \ + check-chicken-gifplot \ +# check-lua-gifplot \ +# check-csharp-gifplot \ +# check-modula3-gifplot \ +# check-c-gifplot + +check-%-gifplot: gifplot-library + @if test -z "$(skip-$*)"; then \ + echo $* unknown; \ + exit 1; \ + fi + @passed=true; \ + up=`$(srcdir)/Tools/capitalize $*`; \ + dir="Examples/GIFPlot/$$up"; \ + if $(skip-$*); then \ + echo skipping $$up $(ACTION); \ + elif [ ! -f $$dir/check.list ]; then \ + echo skipping $$up $(ACTION) "(no $$dir/check.list)"; \ + else \ + all=`sed '/^#/d' $$dir/check.list`; \ + for a in $$all; do \ + echo $(ACTION)ing $$dir/$$a; \ + (cd $$dir/$$a && \ + $(MAKE) -k -s $(chk-set-env) $(ACTION)) \ + || passed=false; \ + done; \ + fi; \ + test $$passed = true + # Checks testcases in the test-suite excluding those which are known to be broken check-test-suite: \ check-tcl-test-suite \ @@ -238,7 +283,7 @@ partialcheck-test-suite: partialcheck-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck NOSKIP=1 -check: check-aliveness check-ccache check-examples check-test-suite +check: check-aliveness check-ccache check-examples check-gifplot check-test-suite # Run known-to-be-broken as well as not broken testcases in the test-suite all-test-suite: \ @@ -300,7 +345,7 @@ broken-%-test-suite: # CLEAN ##################################################################### -clean: clean-objects clean-libfiles clean-examples clean-test-suite clean-docs +clean: clean-objects clean-libfiles clean-examples clean-gifplot clean-test-suite clean-docs clean-objects: clean-source clean-ccache @@ -315,6 +360,9 @@ clean-libfiles: clean-examples: @$(MAKE) -k -s check-examples ACTION=clean +clean-gifplot: + @$(MAKE) -k -s check-gifplot ACTION=clean + clean-test-suite: @$(MAKE) -k -s check-test-suite ACTION=clean NOSKIP=1 @@ -324,6 +372,9 @@ clean-%-examples: clean-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=clean NOSKIP=1 +clean-%-gifplot: + @$(MAKE) -k -s check-$*-gifplot ACTION=clean + clean-ccache: test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s clean) @@ -345,7 +396,7 @@ maintainer-clean: clean-libfiles DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool -distclean: distclean-objects clean-examples distclean-test-suite clean-docs distclean-dead distclean-ccache +distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite clean-docs distclean-dead distclean-ccache distclean-objects: distclean-source diff --git a/README b/README index e7b79d2d2..3df9e506a 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 2.0.0 (in progress) +Version: 1.3.40 (in progress) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, @@ -13,6 +13,61 @@ the listed languages, or to extend C/C++ programs with a scripting language. This distribution represents the latest development release of SWIG. +The guilty parties working on this are: + +Active Developers: + William Fulton (wsf@fultondesigns.co.uk) (SWIG core, Java, C#, Windows, Cygwin) + Olly Betts (olly@survex.com) (PHP) + John Lenz (Guile, MzScheme updates, Chicken module, runtime system) + Mark Gossage (mark@gossage.cjb.net) (Lua) + Joseph Wang (joe@gnacademy.org) (R) + Gonzalo Garramuno (ggarra@advancedsl.com.ar) (Ruby, Ruby's UTL) + Xavier Delacour (xavier.delacour@gmail.com) (Octave) + +Major contributors include: + Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) + Henning Thielemann (swig@henning-thielemann.de) (Modula3) + Matthias Köppe (mkoeppe@mail.math.uni-magdeburg.de) (Guile, MzScheme) + Luigi Ballabio (luigi.ballabio@fastwebnet.it) (STL wrapping) + Mikel Bancroft (mikel@franz.com) (Allegro CL) + Surendra Singhi (efuzzyone@netscape.net) (CLISP, CFFI) + Marcelo Matus (mmatus@acms.arizona.edu) (SWIG core, Python, UTL[python,perl,tcl,ruby]) + Art Yerkes (ayerkes@speakeasy.net) (Ocaml) + Lyle Johnson (lyle@users.sourceforge.net) (Ruby) + Charlie Savage (cfis@interserv.com) (Ruby) + Thien-Thi Nguyen (ttn@glug.org) (build/test/misc) + Richard Palmer (richard@magicality.org) (PHP) + Sam Liddicott - Anonova Ltd (saml@liddicott.com) (PHP) + Tim Hockin - Sun Microsystems (thockin@sun.com) (PHP) + Kevin Ruland (PHP) + Shibukawa Yoshiki (Japanese Translation) + Jason Stewart (jason@openinformatics.com) (Perl5) + Loic Dachary (Perl5) + David Fletcher (Perl5) + Gary Holt (Perl5) + Masaki Fukushima (Ruby) + Scott Michel (scottm@cs.ucla.edu) (Java directors) + Tiger Feng (songyanf@cs.uchicago.edu) (SWIG core) + Mark Rose (mrose@stm.lbl.gov) (Directors) + Jonah Beckford (beckford@usermail.com) (CHICKEN) + Ahmon Dancy (dancy@franz.com) (Allegro CL) + Dirk Gerrits (Allegro CL) + Neil Cawse (C#) + Harco de Hilster (Java) + Alexey Dyachenko (dyachenko@fromru.com) (Tcl) + Bob Techentin (Tcl) + Martin Froehlich (Guile) + Marcio Luis Teixeira (Guile) + Duncan Temple Lang (R) + +Past contributors include: + James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran + Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn + (See CHANGES for a more complete list). + +Portions also copyrighted by companies/corporations; + Network Applied Communication Laboratory, Inc + Information-technology Promotion Agency, Japan Up-to-date SWIG related information can be found at diff --git a/Source/CParse/cparse.h b/Source/CParse/cparse.h index c17577d8c..9be41c60e 100644 --- a/Source/CParse/cparse.h +++ b/Source/CParse/cparse.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * cparse.h * diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index 36c5f7d6c..8734c7d0e 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * scanner.c * diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index b365cfc08..0babfbbb8 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * parser.y * diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index d3b9b3d99..14886605f 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * templ.c * diff --git a/Source/CParse/util.c b/Source/CParse/util.c index fa934ffc0..efae41051 100644 --- a/Source/CParse/util.c +++ b/Source/CParse/util.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * util.c * diff --git a/Source/DOH/base.c b/Source/DOH/base.c index 245004f87..15827f328 100644 --- a/Source/DOH/base.c +++ b/Source/DOH/base.c @@ -1,15 +1,13 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * base.c * * This file contains the function entry points for dispatching methods on * DOH objects. A number of small utility functions are also included. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_base_c[] = "$Id$"; diff --git a/Source/DOH/doh.h b/Source/DOH/doh.h index 1ed196058..766e12a34 100644 --- a/Source/DOH/doh.h +++ b/Source/DOH/doh.h @@ -1,14 +1,14 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * doh.h * * This file describes of the externally visible functions in DOH. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. + * + * $Id$ * ----------------------------------------------------------------------------- */ #ifndef _DOH_H diff --git a/Source/DOH/dohint.h b/Source/DOH/dohint.h index 661bed075..1fc5eb7c9 100644 --- a/Source/DOH/dohint.h +++ b/Source/DOH/dohint.h @@ -1,14 +1,15 @@ + /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * dohint.h * * This file describes internally managed objects. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. + * + * $Id$ * ----------------------------------------------------------------------------- */ #ifndef _DOHINT_H diff --git a/Source/DOH/file.c b/Source/DOH/file.c index a9ee332bf..65c2336a4 100644 --- a/Source/DOH/file.c +++ b/Source/DOH/file.c @@ -1,15 +1,13 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * file.c * * This file implements a file-like object that can be built around an * ordinary FILE * or integer file descriptor. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_file_c[] = "$Id$"; diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index 2ef605c32..f544cee64 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -1,15 +1,13 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * fio.c * * This file implements a number of standard I/O operations included * formatted output, readline, and splitting. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_fio_c[] = "$Id$"; diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 87f8e3c40..045de8b5b 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -1,14 +1,12 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * hash.c * * Implements a simple hash table object. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_hash_c[] = "$Id$"; diff --git a/Source/DOH/list.c b/Source/DOH/list.c index a08cadb5a..7a1786299 100644 --- a/Source/DOH/list.c +++ b/Source/DOH/list.c @@ -1,14 +1,12 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * list.c * * Implements a simple list object. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_list_c[] = "$Id$"; diff --git a/Source/DOH/memory.c b/Source/DOH/memory.c index fcacd6170..1c6063ef3 100644 --- a/Source/DOH/memory.c +++ b/Source/DOH/memory.c @@ -1,15 +1,13 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * memory.c * * This file implements all of DOH's memory management including allocation * of objects and checking of objects. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_memory_c[] = "$Id$"; diff --git a/Source/DOH/string.c b/Source/DOH/string.c index bd36c4094..141cd58e8 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -1,15 +1,13 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * string.c * * Implements a string object that supports both sequence operations and * file semantics. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_string_c[] = "$Id$"; diff --git a/Source/DOH/void.c b/Source/DOH/void.c index 2d684b9cd..0be01561a 100644 --- a/Source/DOH/void.c +++ b/Source/DOH/void.c @@ -1,15 +1,13 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * * void.c * * Implements a "void" object that is really just a DOH container around * an arbitrary C object represented as a void *. + * + * Author(s) : David Beazley (beazley@cs.uchicago.edu) + * + * Copyright (C) 1999-2000. The University of Chicago + * See the file LICENSE for information on usage and redistribution. * ----------------------------------------------------------------------------- */ char cvsroot_void_c[] = "$Id$"; diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index 481f67da3..ebcd2fe7c 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigwarn.h * @@ -20,6 +16,8 @@ * numbers in this file. * ----------------------------------------------------------------------------- */ +/* $Id$ */ + #ifndef SWIGWARN_H_ #define SWIGWARN_H_ diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 36441b1fe..878e30a67 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * allegrocl.cxx * diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx index 31f27e1eb..e8397e6a6 100644 --- a/Source/Modules/allocate.cxx +++ b/Source/Modules/allocate.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * allocate.cxx * diff --git a/Source/Modules/browser.cxx b/Source/Modules/browser.cxx index 592e12783..b1bc7349c 100644 --- a/Source/Modules/browser.cxx +++ b/Source/Modules/browser.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * browser.cxx * diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index c8c431e47..0aa933c56 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * cffi.cxx * diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index 1d9e9c620..12ef4b454 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * chicken.cxx * diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index 95ee66bc9..fa73b3a0b 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * clisp.cxx * diff --git a/Source/Modules/contract.cxx b/Source/Modules/contract.cxx index 7a8543928..518dc2997 100644 --- a/Source/Modules/contract.cxx +++ b/Source/Modules/contract.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * contract.cxx * diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 06cec96ac..2730b55d4 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * csharp.cxx * diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 6064e1758..158b53502 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * directors.cxx * diff --git a/Source/Modules/emit.cxx b/Source/Modules/emit.cxx index fde3b2457..a4cf8cebc 100644 --- a/Source/Modules/emit.cxx +++ b/Source/Modules/emit.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * emit.cxx * diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 05ceced22..0c72de8d0 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * guile.cxx * diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index e12c9072b..8dfa19624 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * java.cxx * diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 479615908..38658ce9c 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * lang.cxx * diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 4640d9ed7..78cd7ce96 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * lua.cxx * diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index 2437b35c7..c824db6f9 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * main.cxx * diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index e650edcb2..b3568c0bf 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * modula3.cxx * diff --git a/Source/Modules/module.cxx b/Source/Modules/module.cxx index f4ab560dd..6a0d6bbb9 100644 --- a/Source/Modules/module.cxx +++ b/Source/Modules/module.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * module.cxx * diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index d17ccd33c..28dd8ecd2 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * mzscheme.cxx * diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 7108484b3..b925328a3 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * ocaml.cxx * diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index d9483c974..c5ff2eb44 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * octave.cxx * diff --git a/Source/Modules/overload.cxx b/Source/Modules/overload.cxx index 57d7fac90..511e55004 100644 --- a/Source/Modules/overload.cxx +++ b/Source/Modules/overload.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * overload.cxx * diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index d0c019195..eace179a7 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -1,10 +1,10 @@ +/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=2:tabstop=8:smarttab: + */ + /* ---------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * perl5.cxx * diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 9f91f12d4..ee69c1864 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * php.cxx * diff --git a/Source/Modules/pike.cxx b/Source/Modules/pike.cxx index e59248e95..98f63056c 100644 --- a/Source/Modules/pike.cxx +++ b/Source/Modules/pike.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * pike.cxx * diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index f3735ff00..ffeea430d 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * python.cxx * diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index f1fdff662..8e9aa557d 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * r.cxx * diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 9badc0d0a..1c13747e5 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * ruby.cxx * diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 62b93f7c7..90791ec70 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * s-exp.cxx * diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx index 3a28fbdde..b121dc9b7 100644 --- a/Source/Modules/swigmain.cxx +++ b/Source/Modules/swigmain.cxx @@ -1,15 +1,11 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * - * swigmain.cxx + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * Simplified Wrapper and Interface Generator (SWIG) * + * swigmain.cxx + * * This file is the main entry point to SWIG. It collects the command * line options, registers built-in language modules, and instantiates * a module for code generation. If adding new language modules diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h index 075a209d2..8dec8d0af 100644 --- a/Source/Modules/swigmod.h +++ b/Source/Modules/swigmod.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigmod.h * diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index efbe28c50..015ac5e45 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * tcl8.cxx * diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index e972cea05..d663aed6e 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * typepass.cxx * diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index f793b5643..d3f8401f0 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * uffi.cxx * diff --git a/Source/Modules/utils.cxx b/Source/Modules/utils.cxx index 3fe7a2709..bf8211903 100644 --- a/Source/Modules/utils.cxx +++ b/Source/Modules/utils.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * utils.cxx * diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index bcfac1acc..2edd01cf0 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * xml.cxx * diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index bcb1061c8..81646171a 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * cpp.c * diff --git a/Source/Preprocessor/expr.c b/Source/Preprocessor/expr.c index 3e3f39480..4da24a774 100644 --- a/Source/Preprocessor/expr.c +++ b/Source/Preprocessor/expr.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * expr.c * diff --git a/Source/Preprocessor/preprocessor.h b/Source/Preprocessor/preprocessor.h index 8f98dae15..3579eede2 100644 --- a/Source/Preprocessor/preprocessor.h +++ b/Source/Preprocessor/preprocessor.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * preprocessor.h * diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 208842121..7c6837a2b 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * cwrap.c * diff --git a/Source/Swig/deprecate.c b/Source/Swig/deprecate.c index f25b9a650..475d2c6cf 100644 --- a/Source/Swig/deprecate.c +++ b/Source/Swig/deprecate.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * deprecate.c * diff --git a/Source/Swig/error.c b/Source/Swig/error.c index 80eede4e3..156fe06a7 100644 --- a/Source/Swig/error.c +++ b/Source/Swig/error.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * error.c * diff --git a/Source/Swig/fragment.c b/Source/Swig/fragment.c index 896461b30..510a01875 100644 --- a/Source/Swig/fragment.c +++ b/Source/Swig/fragment.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * fragment.c * diff --git a/Source/Swig/getopt.c b/Source/Swig/getopt.c index f6f196bfd..cbd051d9f 100644 --- a/Source/Swig/getopt.c +++ b/Source/Swig/getopt.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * getopt.c * diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 710a7ad71..f42eb5d45 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * include.c * diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 3a78fe7ab..050e5357a 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * misc.c * diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 9af0354e2..013ce5929 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * naming.c * diff --git a/Source/Swig/parms.c b/Source/Swig/parms.c index cb8176377..9b58f5fcb 100644 --- a/Source/Swig/parms.c +++ b/Source/Swig/parms.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * parms.c * diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 72984b27e..53f1ad4a0 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * scanner.c * diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index 023148f8d..8a7700bec 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * stype.c * diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index a7b90c4aa..2b2c797c9 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swig.h * diff --git a/Source/Swig/swigfile.h b/Source/Swig/swigfile.h index 632e821e2..92c7945e6 100644 --- a/Source/Swig/swigfile.h +++ b/Source/Swig/swigfile.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigfile.h * diff --git a/Source/Swig/swigopt.h b/Source/Swig/swigopt.h index 586f8bbc4..11eb5ba99 100644 --- a/Source/Swig/swigopt.h +++ b/Source/Swig/swigopt.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigopt.h * diff --git a/Source/Swig/swigparm.h b/Source/Swig/swigparm.h index 3e6269eae..49ae7992e 100644 --- a/Source/Swig/swigparm.h +++ b/Source/Swig/swigparm.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigparm.h * diff --git a/Source/Swig/swigscan.h b/Source/Swig/swigscan.h index faec4fe48..3403098df 100644 --- a/Source/Swig/swigscan.h +++ b/Source/Swig/swigscan.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigscan.h * diff --git a/Source/Swig/swigtree.h b/Source/Swig/swigtree.h index 6799398c9..5b43006a9 100644 --- a/Source/Swig/swigtree.h +++ b/Source/Swig/swigtree.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigtree.h * diff --git a/Source/Swig/swigwrap.h b/Source/Swig/swigwrap.h index b1f596f72..0dcf88059 100644 --- a/Source/Swig/swigwrap.h +++ b/Source/Swig/swigwrap.h @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * swigwrap.h * diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 50dde9159..055af854f 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * symbol.c * diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index c80c61081..14d231afa 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * tree.c * diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index a44ecdf6d..401a99801 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * typemap.c * diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index cafecb9a6..8ff31bc0b 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * typeobj.c * diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 3eb21b57b..2562e12f8 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * typesys.c * diff --git a/Source/Swig/wrapfunc.c b/Source/Swig/wrapfunc.c index 2c9f7c86a..11518bfc2 100644 --- a/Source/Swig/wrapfunc.c +++ b/Source/Swig/wrapfunc.c @@ -1,10 +1,6 @@ /* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * * wrapfunc.c * diff --git a/configure.in b/configure.in index 738db1281..c6f2c2970 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[2.0.0],[http://www.swig.org]) +AC_INIT([swig],[1.3.40],[http://www.swig.org]) AC_PREREQ(2.58) AC_CONFIG_SRCDIR([Source/Swig/swig.h]) AC_CONFIG_AUX_DIR([Tools/config]) @@ -2186,6 +2186,8 @@ AC_CONFIG_FILES([ \ Examples/Makefile \ Examples/guile/Makefile \ Examples/xml/Makefile \ + Examples/GIFPlot/Makefile \ + Examples/GIFPlot/Lib/Makefile \ Examples/test-suite/chicken/Makefile \ Examples/test-suite/csharp/Makefile \ Examples/test-suite/guile/Makefile \ From d6b81eb8319babf5900882db90e12d44d8628859 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 6 May 2012 01:13:16 +0000 Subject: [PATCH 057/508] Revert rev 11187 "Merged with recent changes from trunk." This reverts commit c595e4d90ebfd63eb55430c735bb121cf690bd59. Conflicts: Source/Modules/c.cxx From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13033 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 22 +- CCache/COPYING | 339 ---- CCache/Makefile.in | 73 - CCache/README | 31 - CCache/README.swig | 8 - CCache/args.c | 91 - CCache/ccache.c | 1388 -------------- CCache/ccache.h | 205 -- CCache/ccache.yo | 422 ----- CCache/ccache_swig_config.h.in | 1 - CCache/cleanup.c | 193 -- CCache/configure.in | 87 - CCache/debian/NEWS | 22 - CCache/debian/README.Debian | 59 - CCache/debian/changelog | 221 --- CCache/debian/compat | 1 - CCache/debian/control | 20 - CCache/debian/copyright | 29 - CCache/debian/dirs | 3 - CCache/debian/docs | 1 - CCache/debian/examples | 2 - CCache/debian/patches/01_no_home.diff | 100 - .../debian/patches/02_ccache-compressed.diff | 1026 ---------- CCache/debian/patches/03_long_options.diff | 133 -- CCache/debian/patches/04_ignore_profile.diff | 13 - CCache/debian/patches/05_nfs_fix.diff | 45 - CCache/debian/patches/06_md.diff | 77 - CCache/debian/patches/07_cachedirtag.diff | 75 - CCache/debian/patches/08_manpage_hyphens.diff | 89 - CCache/debian/patches/09_respect_ldflags.diff | 11 - CCache/debian/patches/10_lru_cleanup.diff | 23 - CCache/debian/patches/11_utimes.diff | 85 - .../patches/12_cachesize_permissions.diff | 83 - CCache/debian/patches/13_html_links.diff | 33 - CCache/debian/patches/14_hardlink_doc.diff | 48 - CCache/debian/patches/CREDITS | 47 - CCache/debian/rules | 141 -- CCache/debian/update-ccache | 43 - CCache/debian/watch | 2 - CCache/execute.c | 286 --- CCache/hash.c | 80 - CCache/install-sh | 238 --- CCache/mdfour.c | 284 --- CCache/mdfour.h | 36 - CCache/packaging/README | 5 - CCache/packaging/ccache.spec | 37 - CCache/snprintf.c | 962 ---------- CCache/stats.c | 361 ---- CCache/test.sh | 452 ----- CCache/unify.c | 307 --- CCache/util.c | 884 --------- CCache/web/index.html | 158 -- CHANGES | 508 +---- CHANGES.current | 19 +- Doc/Manual/Allegrocl.html | 112 +- Doc/Manual/CSharp.html | 377 +--- Doc/Manual/Chicken.html | 40 +- Doc/Manual/Contents.html | 111 +- Doc/Manual/Customization.html | 14 - Doc/Manual/Extending.html | 108 +- Doc/Manual/Guile.html | 42 +- Doc/Manual/Introduction.html | 3 +- Doc/Manual/Java.html | 244 ++- Doc/Manual/Library.html | 6 +- Doc/Manual/Lisp.html | 26 +- Doc/Manual/Lua.html | 356 +--- Doc/Manual/Makefile | 13 +- Doc/Manual/Modula3.html | 54 +- Doc/Manual/Modules.html | 77 +- Doc/Manual/Mzscheme.html | 4 +- Doc/Manual/Ocaml.html | 62 +- Doc/Manual/Octave.html | 46 +- Doc/Manual/Perl5.html | 94 +- Doc/Manual/Php.html | 227 ++- Doc/Manual/Pike.html | 24 +- Doc/Manual/Preprocessor.html | 11 +- Doc/Manual/Python.html | 410 +--- Doc/Manual/R.html | 16 +- Doc/Manual/Ruby.html | 198 +- Doc/Manual/SWIG.html | 42 +- Doc/Manual/Sections.html | 3 +- Doc/Manual/Tcl.html | 90 +- Doc/Manual/Typemaps.html | 62 +- Doc/Manual/Warnings.html | 2 +- Doc/Manual/Windows.html | 2 +- Doc/Manual/chapters | 2 +- Doc/Manual/swig16.png | Bin Doc/README | 3 +- Examples/GIFPlot/Java/full/README | 6 +- .../Java/full/{runme.java => main.java} | 2 +- Examples/GIFPlot/Java/shadow/Makefile | 5 +- Examples/GIFPlot/Java/shadow/README | 4 +- .../Java/shadow/{runme.java => main.java} | 2 +- Examples/GIFPlot/Java/simple/README | 2 +- .../Java/simple/{runme.java => main.java} | 2 +- Examples/GIFPlot/Lib/color.c | 5 +- Examples/GIFPlot/Lib/gif.c | 8 +- Examples/GIFPlot/Perl5/shadow/Makefile | 7 +- Examples/GIFPlot/{Php => Php4}/check.list | 0 Examples/GIFPlot/{Php => Php4}/full/Makefile | 4 +- Examples/GIFPlot/{Php => Php4}/full/README | 0 Examples/GIFPlot/{Php => Php4}/full/cmap | Bin Examples/GIFPlot/{Php => Php4}/full/gifplot.i | 0 .../full/runme.php => Php4/full/runme.php4} | 0 .../GIFPlot/{Php => Php4}/shadow/Makefile | 4 +- Examples/GIFPlot/{Php => Php4}/shadow/README | 0 Examples/GIFPlot/{Php => Php4}/shadow/cmap | Bin .../runme.php => Php4/shadow/runme.php4} | 0 .../GIFPlot/{Php => Php4}/simple/Makefile | 4 +- Examples/GIFPlot/{Php => Php4}/simple/README | 0 .../runme.php => Php4/simple/runme.php4} | 0 .../GIFPlot/{Php => Php4}/simple/simple.i | 0 Examples/GIFPlot/Python/full/Makefile | 3 +- Examples/GIFPlot/Python/shadow/Makefile | 10 +- Examples/GIFPlot/Python/simple/Makefile | 3 +- Examples/GIFPlot/Ruby/shadow/Makefile | 7 +- Examples/Makefile.in | 260 ++- Examples/csharp/arrays/Makefile | 20 - Examples/csharp/arrays/example.c | 22 - Examples/csharp/arrays/example.h | 4 - Examples/csharp/arrays/example.i | 45 - Examples/csharp/arrays/runme.cs | 43 - Examples/csharp/check.list | 1 - Examples/guile/matrix/matrix.scm | 0 .../java/callback/{runme.java => main.java} | 2 +- Examples/java/class/index.html | 2 +- Examples/java/class/{runme.java => main.java} | 2 +- Examples/java/constants/index.html | 2 +- .../java/constants/{runme.java => main.java} | 2 +- Examples/java/enum/index.html | 2 +- Examples/java/enum/{runme.java => main.java} | 2 +- .../java/extend/{runme.java => main.java} | 2 +- Examples/java/funcptr/index.html | 2 +- .../java/funcptr/{runme.java => main.java} | 2 +- Examples/java/index.html | 4 +- .../java/multimap/{runme.java => main.java} | 2 +- Examples/java/native/index.html | 2 +- .../java/native/{runme.java => main.java} | 2 +- Examples/java/pointer/index.html | 2 +- .../java/pointer/{runme.java => main.java} | 2 +- Examples/java/reference/index.html | 2 +- .../java/reference/{runme.java => main.java} | 2 +- Examples/java/simple/index.html | 8 +- .../java/simple/{runme.java => main.java} | 2 +- Examples/java/template/index.html | 2 +- .../java/template/{runme.java => main.java} | 2 +- Examples/java/typemap/index.html | 2 +- .../java/typemap/{runme.java => main.java} | 2 +- Examples/java/variables/index.html | 2 +- .../java/variables/{runme.java => main.java} | 2 +- Examples/lua/embed3/embed3.cpp | 7 +- Examples/perl5/class/example.dsp | 4 +- Examples/perl5/import/bar.dsp | 4 +- Examples/perl5/import/base.dsp | 4 +- Examples/perl5/import/foo.dsp | 4 +- Examples/perl5/import/spam.dsp | 4 +- Examples/perl5/multimap/example.dsp | 4 +- Examples/perl5/simple/example.dsp | 4 +- Examples/php/variables/Makefile | 24 - Examples/{php => php4}/check.list | 0 Examples/{php => php4}/class/Makefile | 10 +- Examples/{php => php4}/class/example.cxx | 0 Examples/{php => php4}/class/example.h | 0 Examples/{php => php4}/class/example.i | 0 .../class/runme.php => php4/class/runme.php4} | 0 .../{php/pragmas => php4/constants}/Makefile | 10 +- Examples/{php => php4}/constants/example.i | 0 .../runme.php => php4/constants/runme.php4} | 0 .../{php/funcptr => php4/cpointer}/Makefile | 10 +- Examples/{php => php4}/cpointer/example.c | 0 Examples/{php => php4}/cpointer/example.i | 0 .../runme.php => php4/cpointer/runme.php4} | 0 Examples/{php/proxy => php4/disown}/Makefile | 10 +- Examples/{php => php4}/disown/example.cxx | 0 Examples/{php => php4}/disown/example.h | 0 Examples/{php => php4}/disown/example.i | 0 .../runme.php => php4/disown/runme.php4} | 0 Examples/{php => php4}/enum/Makefile | 10 +- Examples/{php => php4}/enum/example.cxx | 0 Examples/{php => php4}/enum/example.h | 0 Examples/{php => php4}/enum/example.i | 0 .../enum/runme.php => php4/enum/runme.php4} | 0 .../{php/simple => php4/funcptr}/Makefile | 10 +- Examples/{php => php4}/funcptr/example.c | 0 Examples/{php => php4}/funcptr/example.h | 0 Examples/{php => php4}/funcptr/example.i | 0 .../runme.php => php4/funcptr/runme.php4} | 0 .../{php/sync => php4/overloading}/Makefile | 10 +- .../{php => php4}/overloading/example.cxx | 10 +- Examples/{php => php4}/overloading/example.h | 10 +- Examples/{php => php4}/overloading/example.i | 0 .../runme.php => php4/overloading/runme.php4} | 0 Examples/{php => php4}/pointer/Makefile | 10 +- Examples/{php => php4}/pointer/example.c | 0 Examples/{php => php4}/pointer/example.i | 0 .../runme.php => php4/pointer/runme.php4} | 0 .../{php/constants => php4/pragmas}/Makefile | 10 +- Examples/{php => php4}/pragmas/example.i | 8 +- Examples/{php => php4}/pragmas/include.php | 0 .../runme.php => php4/pragmas/runme.php4} | 0 Examples/{php/disown => php4/proxy}/Makefile | 10 +- Examples/{php => php4}/proxy/example.cxx | 0 Examples/{php => php4}/proxy/example.h | 0 Examples/{php => php4}/proxy/example.i | 0 .../proxy/runme.php => php4/proxy/runme.php4} | 0 Examples/php4/reference/BUILD-proxy.sh | 5 + Examples/{php => php4}/reference/Makefile | 10 +- Examples/{php => php4}/reference/example.cxx | 0 Examples/{php => php4}/reference/example.h | 0 Examples/{php => php4}/reference/example.i | 0 .../{php => php4}/reference/runme-proxy.php4 | 0 .../runme.php => php4/reference/runme.php4} | 0 .../{php/cpointer => php4/simple}/Makefile | 10 +- Examples/{php => php4}/simple/example.c | 0 Examples/{php => php4}/simple/example.i | 0 .../runme.php => php4/simple/runme.php4} | 0 .../{php/overloading => php4/sync}/Makefile | 10 +- Examples/{php => php4}/sync/example.cxx | 2 +- Examples/{php => php4}/sync/example.h | 0 Examples/{php => php4}/sync/example.i | 0 .../sync/runme.php => php4/sync/runme.php4} | 0 Examples/{php => php4}/value/Makefile | 10 +- Examples/{php => php4}/value/example.c | 0 Examples/{php => php4}/value/example.h | 0 Examples/{php => php4}/value/example.i | 0 .../value/runme.php => php4/value/runme.php4} | 0 Examples/php4/variables/Makefile | 24 + Examples/{php => php4}/variables/example.c | 0 Examples/{php => php4}/variables/example.h | 0 Examples/{php => php4}/variables/example.i | 0 .../runme.php => php4/variables/runme.php4} | 0 .../{php => php4}/variables/runme.php4.old | 0 Examples/pike/class/Makefile | 0 Examples/pike/class/example.cxx | 0 Examples/pike/class/example.h | 0 Examples/pike/class/example.i | 0 Examples/pike/constants/Makefile | 0 Examples/pike/constants/example.i | 0 Examples/pike/overload/example.cxx | 0 Examples/pike/overload/example.h | 0 Examples/pike/template/Makefile | 0 Examples/pike/template/example.h | 0 Examples/pike/template/example.i | 0 Examples/python/callback/Makefile | 1 - Examples/python/class/Makefile | 1 - Examples/python/class/example.dsp | 4 +- Examples/python/class/example.i | 4 + Examples/python/constants/Makefile | 1 - Examples/python/contract/Makefile | 1 - Examples/python/contract/example.dsp | 4 +- Examples/python/docstrings/Makefile | 1 - Examples/python/enum/Makefile | 1 - Examples/python/exception/Makefile | 1 - Examples/python/exceptproxy/Makefile | 1 - Examples/python/extend/Makefile | 1 - Examples/python/funcptr/Makefile | 1 - Examples/python/funcptr2/Makefile | 1 - Examples/python/functor/Makefile | 1 - Examples/python/import/Makefile | 1 - Examples/python/import/bar.dsp | 4 +- Examples/python/import/base.dsp | 4 +- Examples/python/import/foo.dsp | 4 +- Examples/python/import/spam.dsp | 4 +- Examples/python/import_template/Makefile | 1 - Examples/python/libffi/Makefile | 1 - Examples/python/multimap/Makefile | 1 - Examples/python/multimap/example.dsp | 4 +- Examples/python/multimap/example.i | 34 +- Examples/python/operator/Makefile | 1 - Examples/python/pointer/Makefile | 1 - Examples/python/reference/Makefile | 1 - Examples/python/simple/Makefile | 1 - Examples/python/simple/example.dsp | 4 +- Examples/python/smartptr/Makefile | 1 - Examples/python/std_map/Makefile | 1 - Examples/python/std_map/example.i | 4 +- Examples/python/std_vector/Makefile | 1 - Examples/python/swigrun/Makefile | 1 - Examples/python/template/Makefile | 1 - Examples/python/varargs/Makefile | 1 - Examples/python/variables/Makefile | 1 - Examples/python/weave/Makefile | 1 - Examples/r/class/example.dsp | 4 +- Examples/r/simple/example.dsp | 4 +- Examples/ruby/class/example.dsp | 4 +- Examples/ruby/free_function/example.dsp | 4 +- Examples/ruby/free_function/example.i | 4 +- Examples/ruby/hashargs/Makefile | 0 Examples/ruby/hashargs/example.i | 0 Examples/ruby/import/bar.dsp | 4 +- Examples/ruby/import/base.dsp | 4 +- Examples/ruby/import/foo.dsp | 4 +- Examples/ruby/import/spam.dsp | 4 +- Examples/ruby/mark_function/example.dsp | 4 +- Examples/ruby/multimap/example.dsp | 4 +- Examples/ruby/simple/example.dsp | 4 +- Examples/ruby/std_vector/runme.rb | 8 +- Examples/tcl/class/example.dsp | 4 +- Examples/tcl/contract/example.dsp | 4 +- Examples/tcl/import/bar.dsp | 4 +- Examples/tcl/import/base.dsp | 4 +- Examples/tcl/import/foo.dsp | 4 +- Examples/tcl/import/spam.dsp | 4 +- Examples/tcl/multimap/example.dsp | 4 +- Examples/tcl/simple/example.dsp | 4 +- Examples/test-suite/abstract_virtual.i | 4 +- Examples/test-suite/allegrocl/Makefile.in | 114 +- Examples/test-suite/allowexcept.i | 14 +- Examples/test-suite/c/Makefile.in | 2 - Examples/test-suite/char_strings.i | 6 - Examples/test-suite/chicken/Makefile.in | 2 +- .../ext_test.i} | 2 +- ...en_ext_test_runme.ss => ext_test_runme.ss} | 2 +- Examples/test-suite/common.mk | 25 +- Examples/test-suite/contract.i | 32 +- Examples/test-suite/csharp/Makefile.in | 13 +- .../csharp/csharp_lib_arrays_runme.cs | 70 - .../test-suite/csharp/director_basic_runme.cs | 74 - .../test-suite/csharp/li_attribute_runme.cs | 78 - .../csharp/li_boost_shared_ptr_runme.cs | 10 - .../test-suite/csharp/li_std_vector_runme.cs | 34 +- Examples/test-suite/csharp_lib_arrays.i | 61 - Examples/test-suite/csharp_prepost.i | 101 +- Examples/test-suite/default_constructor.i | 4 +- Examples/test-suite/director_basic.i | 6 +- Examples/test-suite/director_classic.i | 0 Examples/test-suite/director_ignore.i | 0 .../director_protected_overloaded.i | 21 - Examples/test-suite/director_thread.i | 19 +- Examples/test-suite/evil_diamond.i | 2 +- Examples/test-suite/evil_diamond_ns.i | 2 +- Examples/test-suite/evil_diamond_prop.i | 2 +- Examples/test-suite/features.i | 17 - Examples/test-suite/global_namespace.i | 60 - Examples/test-suite/guile/Makefile.in | 2 +- Examples/test-suite/guilescm/Makefile.in | 4 +- .../ext_test.i} | 2 +- ..._ext_test_runme.scm => ext_test_runme.scm} | 2 +- .../test-suite/ignore_template_constructor.i | 6 - Examples/test-suite/import_nomodule.i | 3 - Examples/test-suite/imports_b.i | 9 +- Examples/test-suite/insert_directive.i | 38 - Examples/test-suite/intermediary_classname.i | 1 - Examples/test-suite/java/Makefile.in | 4 +- .../test-suite/java/allprotected_runme.java | 0 .../test-suite/java/director_basic_runme.java | 57 +- .../java/director_classic_runme.java | 0 .../java/director_ignore_runme.java | 0 .../java/global_namespace_runme.java | 25 - .../test-suite/java/java_throws_runme.java | 15 - .../java/li_boost_intrusive_ptr_runme.java | 701 ------- .../java/li_boost_shared_ptr_runme.java | 10 - .../java/overload_complicated_runme.java | 0 Examples/test-suite/java_throws.i | 38 - Examples/test-suite/li_attribute.i | 31 - Examples/test-suite/li_boost_intrusive_ptr.i | 494 ----- Examples/test-suite/li_boost_shared_ptr.i | 38 +- Examples/test-suite/li_cstring.i | 8 +- Examples/test-suite/li_cwstring.i | 8 +- Examples/test-suite/li_std_map.i | 9 +- Examples/test-suite/li_std_set.i | 8 +- Examples/test-suite/li_std_vector.i | 2 - Examples/test-suite/li_std_vector_ptr.i | 29 - Examples/test-suite/minherit2.i | 2 +- Examples/test-suite/multiple_inheritance.i | 4 +- Examples/test-suite/name_warnings.i | 3 +- Examples/test-suite/namespace_typemap.i | 2 +- Examples/test-suite/nested_comment.i | 27 +- Examples/test-suite/nested_structs.i | 22 - Examples/test-suite/ocaml/Makefile.in | 2 +- Examples/test-suite/octave/Makefile.in | 4 +- .../cell_deref.i} | 2 +- ..._cell_deref_runme.m => cell_deref_runme.m} | 2 +- .../test-suite/{ => octave}/implicittest.i | 0 .../test-suite/octave/li_attribute_runme.m | 38 +- .../li_std_pair.i} | 2 +- .../octave/li_std_pair_extra_runme.m | 69 - .../test-suite/octave/li_std_pair_runme.m | 69 + .../li_std_string.i} | 4 +- .../octave/li_std_string_extra_runme.m | 162 -- .../test-suite/octave/li_std_string_runme.m | 162 ++ Examples/test-suite/operator_overload.i | 6 - Examples/test-suite/operbool.i | 12 - Examples/test-suite/packageoption.h | 9 +- Examples/test-suite/packageoption.list | 1 - Examples/test-suite/packageoption_a.i | 10 +- Examples/test-suite/packageoption_b.i | 2 +- Examples/test-suite/packageoption_c.i | 13 - .../test-suite/perl5/char_strings_runme.pl | 5 +- Examples/test-suite/{ => perl5}/li_std_list.i | 0 .../test-suite/perl5/li_typemaps_runme.pl | 39 +- .../test-suite/perl5/packageoption_runme.pl | 8 +- Examples/test-suite/{php => php4}/Makefile.in | 25 +- .../abstract_inherit_ok_runme.php4} | 2 +- .../abstract_inherit_runme.php4} | 2 +- .../add_link_runme.php4} | 2 +- .../argout_runme.php4} | 2 +- .../arrayptr_runme.php4} | 2 +- .../arrays_global_runme.php4} | 12 +- .../arrays_global_twodim_runme.php4} | 2 +- .../arrays_runme.php4} | 2 +- .../arrays_scope_runme.php4} | 2 +- .../casts_runme.php => php4/casts_runme.php4} | 2 +- .../class_ignore_runme.php4} | 2 +- .../conversion_namespace_runme.php4} | 2 +- .../conversion_ns_template_runme.php4} | 2 +- .../conversion_runme.php4} | 2 +- .../cpp_static_runme.php4} | 2 +- .../enum_scope_template_runme.php4} | 2 +- .../evil_diamond_ns_runme.php4} | 2 +- .../evil_diamond_prop_runme.php4} | 2 +- .../evil_diamond_runme.php4} | 2 +- .../extend_template_ns_runme.php4} | 2 +- .../extend_template_runme.php4} | 2 +- .../grouping_runme.php4} | 2 +- .../ignore_parameter_runme.php4} | 2 +- .../li_carrays_runme.php4} | 2 +- .../li_std_string_runme.php4} | 2 +- .../namewarn_rename.i} | 2 +- .../rename_scope_runme.php4} | 2 +- .../{php/skel.php => php4/skel.php4} | 2 +- .../smart_pointer_rename_runme.php4} | 2 +- .../sym_runme.php => php4/sym_runme.php4} | 2 +- .../template_arg_typename_runme.php4} | 2 +- .../template_construct_runme.php4} | 2 +- .../{php/tests.php => php4/tests.php4} | 4 +- .../typedef_reference_runme.php4} | 2 +- .../typemap_ns_using_runme.php4} | 2 +- .../using1_runme.php4} | 2 +- .../using2_runme.php4} | 2 +- .../valuewrapper_base_runme.php4} | 2 +- Examples/test-suite/preproc.i | 5 - Examples/test-suite/pure_virtual.i | 6 +- Examples/test-suite/python/Makefile.in | 83 +- Examples/test-suite/python/README | 6 +- .../test-suite/{ => python}/argcargvtest.i | 0 .../{python_autodoc.i => python/autodoc.i} | 2 +- Examples/test-suite/{ => python}/callback.i | 0 .../test-suite/{ => python}/complextest.i | 0 Examples/test-suite/python/contract_runme.py | 8 - .../test-suite/python/cpp_namespace_runme.py | 20 +- .../test-suite/python/cpp_static_runme.py | 7 - .../python/director_classic_runme.py | 68 +- .../python/director_exception_runme.py | 50 +- .../{ => python}/director_profile.i | 0 .../test-suite/{ => python}/director_stl.i | 0 .../python/director_thread_runme.py | 2 - Examples/test-suite/python/file_test_runme.py | 3 +- Examples/test-suite/python/hugemod.pl | 8 +- Examples/test-suite/{iadd.i => python/iadd.h} | 11 - Examples/test-suite/python/iadd.i | 12 + Examples/test-suite/python/implicittest.i | 68 + Examples/test-suite/{ => python}/inout.i | 0 Examples/test-suite/{ => python}/inplaceadd.i | 0 Examples/test-suite/{ => python}/input.i | 0 .../{python_kwargs.i => python/kwargs.i} | 2 +- ...python_kwargs_runme.py => kwargs_runme.py} | 2 +- .../test-suite/python/li_attribute_runme.py | 36 +- .../python/li_boost_shared_ptr_runme.py | 9 - .../test-suite/{ => python}/li_std_carray.i | 0 Examples/test-suite/python/li_std_map.i | 58 + Examples/test-suite/python/li_std_pair.i | 210 +++ .../python/li_std_pair_extra_runme.py | 59 - .../test-suite/python/li_std_pair_runme.py | 59 + Examples/test-suite/python/li_std_set.i | 17 + Examples/test-suite/python/li_std_stream.i | 59 + Examples/test-suite/python/li_std_string.i | 55 + ..._extra_runme.py => li_std_string_runme.py} | 66 +- .../li_std_vector.i} | 12 +- .../python/li_std_vector_ptr_runme.py | 8 - ..._extra_runme.py => li_std_vector_runme.py} | 23 +- .../test-suite/{ => python}/li_std_vectora.i | 0 .../test-suite/{ => python}/li_std_wstream.i | 0 Examples/test-suite/python/li_std_wstring.i | 89 + .../nondynamic.i} | 2 +- ...ondynamic_runme.py => nondynamic_runme.py} | 10 +- Examples/test-suite/python/operbool_runme.py | 4 - .../overload_simple_cast.i} | 2 +- ...runme.py => overload_simple_cast_runme.py} | 2 +- .../python/python_abstractbase_runme3.py | 8 - .../test-suite/python/python_append_runme.py | 4 - .../test-suite/python/python_pybuf_runme3.py | 42 - .../python/rename_strip_encoder_runme.py | 6 - Examples/test-suite/{ => python}/simutry.i | 0 Examples/test-suite/python/std_containers.i | 199 ++ Examples/test-suite/{ => python}/swigobject.i | 2 +- .../test-suite/python/swigobject_runme.py | 10 +- .../python/tag_no_clash_with_variable_runme.i | 3 + .../test-suite/{ => python}/template_matrix.i | 0 .../python/template_typedef_cplx2_runme.py | 13 +- .../python/template_typedef_cplx_runme.py | 13 +- Examples/test-suite/python/vector.i | 51 + Examples/test-suite/python_abstractbase.i | 18 - Examples/test-suite/python_append.i | 32 - Examples/test-suite/python_pybuf.i | 64 - Examples/test-suite/r/Makefile.in | 4 +- .../test-suite/r/arrays_dimensionless_runme.R | 20 - .../{r_copy_struct.i => r/copy_struct.i} | 2 +- ...opy_struct_runme.R => copy_struct_runme.R} | 9 +- .../{r_double_delete.i => r/double_delete.i} | 3 +- Examples/test-suite/r/double_delete_runme.R | 12 + Examples/test-suite/r/integers_runme.R | 20 - .../test-suite/{r_legacy.i => r/legacy.i} | 2 +- .../r/{r_legacy_runme.R => legacy_runme.R} | 4 +- Examples/test-suite/r/r_double_delete_runme.R | 9 - Examples/test-suite/{ => r}/simple_array.i | 0 Examples/test-suite/rename_strip_encoder.i | 16 - Examples/test-suite/ruby/Makefile.in | 14 +- .../{ruby_keywords.i => ruby/keywords.i} | 2 +- ...by_keywords_runme.rb => keywords_runme.rb} | 4 +- .../test-suite/{ => ruby}/li_std_functors.i | 0 .../{ => ruby}/li_std_pair_lang_object.i | 0 Examples/test-suite/{ => ruby}/li_std_queue.i | 0 .../li_std_speed.i} | 4 +- ...d_speed_runme.rb => li_std_speed_runme.rb} | 4 +- Examples/test-suite/{ => ruby}/li_std_stack.i | 0 .../{ruby_naming.i => ruby/naming.i} | 2 +- .../{ruby_naming_runme.rb => naming_runme.rb} | 40 +- Examples/test-suite/{ => ruby}/stl_new.i | 0 .../track_objects.i} | 2 +- .../track_objects_directors.i} | 2 +- ...me.rb => track_objects_directors_runme.rb} | 8 +- ...bjects_runme.rb => track_objects_runme.rb} | 24 +- Examples/test-suite/swig_examples_lock.h | 17 +- Examples/test-suite/tcl/Makefile.in | 5 +- .../{union_parameter.i => tcl/union.i} | 2 +- ...on_parameter_runme.tcl => union_runme.tcl} | 2 +- .../test-suite/template_inherit_abstract.i | 4 +- .../test-suite/template_typedef_funcptr.i | 5 - Examples/test-suite/typemap_namespace.i | 2 +- Examples/test-suite/types_directive.i | 8 - Examples/test-suite/using_composition.i | 6 +- Examples/test-suite/using_extend.i | 2 +- Examples/test-suite/using_namespace.i | 2 +- Lib/allegrocl/allegrocl.swg | 199 +- Lib/allegrocl/inout_typemaps.i | 0 Lib/allegrocl/longlongs.i | 0 Lib/allegrocl/std_list.i | 0 Lib/allegrocl/std_string.i | 0 Lib/allkw.swg | 2 +- Lib/cdata.i | 9 +- Lib/chicken/chicken.swg | 1 - Lib/chicken/chickenrun.swg | 1 - Lib/csharp/arrays_csharp.i | 140 -- Lib/csharp/boost_shared_ptr.i | 22 +- Lib/csharp/csharp.swg | 25 +- Lib/csharp/std_vector.i | 83 +- Lib/csharp/std_wstring.i | 0 Lib/csharp/wchar.i | 0 Lib/intrusive_ptr.i | 96 - Lib/java/boost_intrusive_ptr.i | 460 ----- Lib/java/boost_shared_ptr.i | 22 +- Lib/java/java.swg | 34 +- Lib/java/javahead.swg | 2 +- Lib/java/std_vector.i | 34 - Lib/lua/luatypemaps.swg | 25 +- Lib/ocaml/std_deque.i | 2 +- Lib/octave/carrays.i | 2 +- Lib/octave/octcontainer.swg | 10 +- Lib/octave/octopers.swg | 116 +- Lib/octave/octrun.swg | 117 +- Lib/octave/octruntime.swg | 1 - Lib/octave/octstdcommon.swg | 2 +- Lib/octave/std_basic_string.i | 38 +- Lib/octave/std_carray.i | 6 +- Lib/octave/std_map.i | 14 +- Lib/perl5/noembed.h | 6 - Lib/perl5/perlrun.swg | 25 +- Lib/perl5/perlstrings.swg | 5 - Lib/perl5/perltypemaps.swg | 1 - Lib/perl5/std_vector.i | 4 +- Lib/{php => php4}/const.i | 0 Lib/{php => php4}/globalvar.i | 2 +- Lib/{php/php.swg => php4/php4.swg} | 47 +- Lib/{php/phpinit.swg => php4/php4init.swg} | 0 Lib/{php/phpkw.swg => php4/php4kw.swg} | 4 +- Lib/{php/phprun.swg => php4/php4run.swg} | 12 +- Lib/{php => php4}/phppointers.i | 0 Lib/{php => php4}/std_common.i | 0 Lib/{php => php4}/std_deque.i | 0 Lib/{php => php4}/std_map.i | 4 - Lib/{php => php4}/std_pair.i | 0 Lib/{php => php4}/std_string.i | 0 Lib/{php => php4}/std_vector.i | 2 - Lib/{php => php4}/stl.i | 0 Lib/{php => php4}/typemaps.i | 96 +- Lib/{php => php4}/utils.i | 12 +- Lib/python/boost_shared_ptr.i | 14 +- Lib/python/director.swg | 9 +- Lib/python/file.i | 4 +- Lib/python/pyabc.i | 10 - Lib/python/pyapi.swg | 14 - Lib/python/pybuffer.i | 107 -- Lib/python/pyclasses.swg | 62 +- Lib/python/pycontainer.swg | 219 +-- Lib/python/pyerrors.swg | 7 +- Lib/python/pyhead.swg | 64 +- Lib/python/pyinit.swg | 76 +- Lib/python/pyiterators.swg | 172 +- Lib/python/pyname_compat.i | 88 - Lib/python/pyopers.swg | 8 +- Lib/python/pyrun.swg | 420 ++--- Lib/python/pystdcommon.swg | 2 +- Lib/python/pystrings.swg | 34 +- Lib/python/pytypemaps.swg | 2 +- Lib/python/pywstrings.swg | 4 +- Lib/python/std_carray.i | 6 +- Lib/python/std_map.i | 48 +- Lib/python/std_multimap.i | 14 +- Lib/python/std_multiset.i | 12 +- Lib/python/std_pair.i | 8 +- Lib/python/std_set.i | 12 +- Lib/r/r.swg | 82 +- Lib/r/rrun.swg | 2 + Lib/r/rstdcommon.swg | 2 +- Lib/r/rtype.swg | 101 +- Lib/ruby/file.i | 7 - Lib/ruby/rubyhead.swg | 3 - Lib/ruby/rubywstrings.swg | 2 +- Lib/shared_ptr.i | 12 +- Lib/swig.swg | 66 +- Lib/swigrun.swg | 98 +- Lib/typemaps/attribute.swg | 87 +- Lib/typemaps/swigtype.swg | 20 +- Makefile.in | 131 +- README | 23 +- Source/CParse/cparse.h | 8 +- Source/CParse/cscanner.c | 43 +- Source/CParse/parser.y | 141 +- Source/CParse/templ.c | 25 +- Source/DOH/README | 12 +- Source/DOH/base.c | 4 +- Source/DOH/doh.h | 15 +- Source/DOH/file.c | 11 +- Source/DOH/hash.c | 2 +- Source/DOH/list.c | 2 +- Source/DOH/string.c | 2 +- Source/Include/swigwarn.h | 15 +- Source/Makefile.am | 4 +- Source/Modules/allegrocl.cxx | 388 ++-- Source/Modules/c.cxx | 24 +- Source/Modules/cffi.cxx | 51 +- Source/Modules/chicken.cxx | 41 +- Source/Modules/clisp.cxx | 13 +- Source/Modules/contract.cxx | 8 - Source/Modules/csharp.cxx | 99 +- Source/Modules/directors.cxx | 4 +- Source/Modules/guile.cxx | 41 +- Source/Modules/java.cxx | 51 +- Source/Modules/lang.cxx | 79 +- Source/Modules/lua.cxx | 30 +- Source/Modules/main.cxx | 204 +- Source/Modules/modula3.cxx | 50 +- Source/Modules/mzscheme.cxx | 24 +- Source/Modules/ocaml.cxx | 112 +- Source/Modules/octave.cxx | 44 +- Source/Modules/overload.cxx | 8 +- Source/Modules/perl5.cxx | 35 +- Source/Modules/{php.cxx => php4.cxx} | 979 ++++++++-- Source/Modules/pike.cxx | 28 +- Source/Modules/python.cxx | 678 ++----- Source/Modules/r.cxx | 36 +- Source/Modules/ruby.cxx | 94 +- Source/Modules/s-exp.cxx | 12 +- Source/Modules/swigmain.cxx | 8 +- Source/Modules/swigmod.h | 21 +- Source/Modules/tcl8.cxx | 30 +- Source/Modules/uffi.cxx | 25 +- Source/Modules/xml.cxx | 6 +- Source/Preprocessor/cpp.c | 35 +- Source/Preprocessor/preprocessor.h | 4 +- Source/README | 9 +- Source/Swig/cwrap.c | 53 +- Source/Swig/error.c | 10 +- Source/Swig/getopt.c | 2 +- Source/Swig/include.c | 57 +- Source/Swig/misc.c | 95 +- Source/Swig/naming.c | 32 +- Source/Swig/parms.c | 2 +- Source/Swig/scanner.c | 25 +- Source/Swig/stype.c | 22 +- Source/Swig/swig.h | 138 +- Source/Swig/swigfile.h | 31 +- Source/Swig/swigopt.h | 2 +- Source/Swig/swigparm.h | 2 +- Source/Swig/swigscan.h | 4 +- Source/Swig/swigtree.h | 2 +- Source/Swig/swigwrap.h | 12 +- Source/Swig/symbol.c | 34 +- Source/Swig/tree.c | 2 +- Source/Swig/typemap.c | 30 +- Source/Swig/typeobj.c | 10 +- Source/Swig/typesys.c | 17 +- Source/Swig/wrapfunc.c | 12 +- TODO | 10 +- Tools/config/config.guess | 1542 +++++++++++++++ Tools/config/config.sub | 1677 +++++++++++++++++ Tools/mkdist.py | 10 +- Tools/mkrelease.py | 2 +- Tools/mkwindows.sh | 5 +- Tools/pyname_patch.py | 123 -- autogen.sh | 6 +- configure.in | 379 ++-- 703 files changed, 9266 insertions(+), 21128 deletions(-) delete mode 100644 CCache/COPYING delete mode 100644 CCache/Makefile.in delete mode 100644 CCache/README delete mode 100644 CCache/README.swig delete mode 100644 CCache/args.c delete mode 100644 CCache/ccache.c delete mode 100644 CCache/ccache.h delete mode 100644 CCache/ccache.yo delete mode 100644 CCache/ccache_swig_config.h.in delete mode 100644 CCache/cleanup.c delete mode 100644 CCache/configure.in delete mode 100644 CCache/debian/NEWS delete mode 100644 CCache/debian/README.Debian delete mode 100644 CCache/debian/changelog delete mode 100644 CCache/debian/compat delete mode 100644 CCache/debian/control delete mode 100644 CCache/debian/copyright delete mode 100644 CCache/debian/dirs delete mode 100644 CCache/debian/docs delete mode 100644 CCache/debian/examples delete mode 100644 CCache/debian/patches/01_no_home.diff delete mode 100644 CCache/debian/patches/02_ccache-compressed.diff delete mode 100644 CCache/debian/patches/03_long_options.diff delete mode 100644 CCache/debian/patches/04_ignore_profile.diff delete mode 100644 CCache/debian/patches/05_nfs_fix.diff delete mode 100644 CCache/debian/patches/06_md.diff delete mode 100644 CCache/debian/patches/07_cachedirtag.diff delete mode 100644 CCache/debian/patches/08_manpage_hyphens.diff delete mode 100644 CCache/debian/patches/09_respect_ldflags.diff delete mode 100644 CCache/debian/patches/10_lru_cleanup.diff delete mode 100644 CCache/debian/patches/11_utimes.diff delete mode 100644 CCache/debian/patches/12_cachesize_permissions.diff delete mode 100644 CCache/debian/patches/13_html_links.diff delete mode 100644 CCache/debian/patches/14_hardlink_doc.diff delete mode 100644 CCache/debian/patches/CREDITS delete mode 100644 CCache/debian/rules delete mode 100644 CCache/debian/update-ccache delete mode 100644 CCache/debian/watch delete mode 100644 CCache/execute.c delete mode 100644 CCache/hash.c delete mode 100755 CCache/install-sh delete mode 100644 CCache/mdfour.c delete mode 100644 CCache/mdfour.h delete mode 100644 CCache/packaging/README delete mode 100644 CCache/packaging/ccache.spec delete mode 100644 CCache/snprintf.c delete mode 100644 CCache/stats.c delete mode 100755 CCache/test.sh delete mode 100644 CCache/unify.c delete mode 100644 CCache/util.c delete mode 100644 CCache/web/index.html mode change 100644 => 100755 Doc/Manual/Allegrocl.html mode change 100644 => 100755 Doc/Manual/swig16.png rename Examples/GIFPlot/Java/full/{runme.java => main.java} (99%) rename Examples/GIFPlot/Java/shadow/{runme.java => main.java} (99%) rename Examples/GIFPlot/Java/simple/{runme.java => main.java} (98%) rename Examples/GIFPlot/{Php => Php4}/check.list (100%) rename Examples/GIFPlot/{Php => Php4}/full/Makefile (81%) rename Examples/GIFPlot/{Php => Php4}/full/README (100%) rename Examples/GIFPlot/{Php => Php4}/full/cmap (100%) rename Examples/GIFPlot/{Php => Php4}/full/gifplot.i (100%) rename Examples/GIFPlot/{Php/full/runme.php => Php4/full/runme.php4} (100%) rename Examples/GIFPlot/{Php => Php4}/shadow/Makefile (80%) rename Examples/GIFPlot/{Php => Php4}/shadow/README (100%) rename Examples/GIFPlot/{Php => Php4}/shadow/cmap (100%) rename Examples/GIFPlot/{Php/shadow/runme.php => Php4/shadow/runme.php4} (100%) rename Examples/GIFPlot/{Php => Php4}/simple/Makefile (80%) rename Examples/GIFPlot/{Php => Php4}/simple/README (100%) rename Examples/GIFPlot/{Php/simple/runme.php => Php4/simple/runme.php4} (100%) rename Examples/GIFPlot/{Php => Php4}/simple/simple.i (100%) delete mode 100644 Examples/csharp/arrays/Makefile delete mode 100644 Examples/csharp/arrays/example.c delete mode 100644 Examples/csharp/arrays/example.h delete mode 100644 Examples/csharp/arrays/example.i delete mode 100644 Examples/csharp/arrays/runme.cs mode change 100644 => 100755 Examples/guile/matrix/matrix.scm rename Examples/java/callback/{runme.java => main.java} (98%) rename Examples/java/class/{runme.java => main.java} (99%) rename Examples/java/constants/{runme.java => main.java} (98%) rename Examples/java/enum/{runme.java => main.java} (98%) rename Examples/java/extend/{runme.java => main.java} (99%) rename Examples/java/funcptr/{runme.java => main.java} (98%) rename Examples/java/multimap/{runme.java => main.java} (97%) rename Examples/java/native/{runme.java => main.java} (96%) rename Examples/java/pointer/{runme.java => main.java} (98%) rename Examples/java/reference/{runme.java => main.java} (99%) rename Examples/java/simple/{runme.java => main.java} (97%) rename Examples/java/template/{runme.java => main.java} (98%) rename Examples/java/typemap/{runme.java => main.java} (96%) rename Examples/java/variables/{runme.java => main.java} (99%) delete mode 100644 Examples/php/variables/Makefile rename Examples/{php => php4}/check.list (100%) rename Examples/{php => php4}/class/Makefile (71%) rename Examples/{php => php4}/class/example.cxx (100%) rename Examples/{php => php4}/class/example.h (100%) rename Examples/{php => php4}/class/example.i (100%) rename Examples/{php/class/runme.php => php4/class/runme.php4} (100%) rename Examples/{php/pragmas => php4/constants}/Makefile (70%) rename Examples/{php => php4}/constants/example.i (100%) rename Examples/{php/constants/runme.php => php4/constants/runme.php4} (100%) rename Examples/{php/funcptr => php4/cpointer}/Makefile (71%) rename Examples/{php => php4}/cpointer/example.c (100%) rename Examples/{php => php4}/cpointer/example.i (100%) rename Examples/{php/cpointer/runme.php => php4/cpointer/runme.php4} (100%) rename Examples/{php/proxy => php4/disown}/Makefile (70%) rename Examples/{php => php4}/disown/example.cxx (100%) rename Examples/{php => php4}/disown/example.h (100%) rename Examples/{php => php4}/disown/example.i (100%) rename Examples/{php/disown/runme.php => php4/disown/runme.php4} (100%) rename Examples/{php => php4}/enum/Makefile (71%) rename Examples/{php => php4}/enum/example.cxx (100%) rename Examples/{php => php4}/enum/example.h (100%) rename Examples/{php => php4}/enum/example.i (100%) rename Examples/{php/enum/runme.php => php4/enum/runme.php4} (100%) rename Examples/{php/simple => php4/funcptr}/Makefile (71%) rename Examples/{php => php4}/funcptr/example.c (100%) rename Examples/{php => php4}/funcptr/example.h (100%) rename Examples/{php => php4}/funcptr/example.i (100%) rename Examples/{php/funcptr/runme.php => php4/funcptr/runme.php4} (100%) rename Examples/{php/sync => php4/overloading}/Makefile (70%) rename Examples/{php => php4}/overloading/example.cxx (78%) rename Examples/{php => php4}/overloading/example.h (77%) rename Examples/{php => php4}/overloading/example.i (100%) rename Examples/{php/overloading/runme.php => php4/overloading/runme.php4} (100%) rename Examples/{php => php4}/pointer/Makefile (71%) rename Examples/{php => php4}/pointer/example.c (100%) rename Examples/{php => php4}/pointer/example.i (100%) rename Examples/{php/pointer/runme.php => php4/pointer/runme.php4} (100%) rename Examples/{php/constants => php4/pragmas}/Makefile (70%) rename Examples/{php => php4}/pragmas/example.i (70%) rename Examples/{php => php4}/pragmas/include.php (100%) rename Examples/{php/pragmas/runme.php => php4/pragmas/runme.php4} (100%) rename Examples/{php/disown => php4/proxy}/Makefile (70%) rename Examples/{php => php4}/proxy/example.cxx (100%) rename Examples/{php => php4}/proxy/example.h (100%) rename Examples/{php => php4}/proxy/example.i (100%) rename Examples/{php/proxy/runme.php => php4/proxy/runme.php4} (100%) create mode 100755 Examples/php4/reference/BUILD-proxy.sh rename Examples/{php => php4}/reference/Makefile (71%) rename Examples/{php => php4}/reference/example.cxx (100%) rename Examples/{php => php4}/reference/example.h (100%) rename Examples/{php => php4}/reference/example.i (100%) rename Examples/{php => php4}/reference/runme-proxy.php4 (100%) rename Examples/{php/reference/runme.php => php4/reference/runme.php4} (100%) rename Examples/{php/cpointer => php4/simple}/Makefile (71%) rename Examples/{php => php4}/simple/example.c (100%) rename Examples/{php => php4}/simple/example.i (100%) rename Examples/{php/simple/runme.php => php4/simple/runme.php4} (100%) rename Examples/{php/overloading => php4/sync}/Makefile (70%) rename Examples/{php => php4}/sync/example.cxx (91%) rename Examples/{php => php4}/sync/example.h (100%) rename Examples/{php => php4}/sync/example.i (100%) rename Examples/{php/sync/runme.php => php4/sync/runme.php4} (100%) rename Examples/{php => php4}/value/Makefile (71%) rename Examples/{php => php4}/value/example.c (100%) rename Examples/{php => php4}/value/example.h (100%) rename Examples/{php => php4}/value/example.i (100%) rename Examples/{php/value/runme.php => php4/value/runme.php4} (100%) create mode 100644 Examples/php4/variables/Makefile rename Examples/{php => php4}/variables/example.c (100%) rename Examples/{php => php4}/variables/example.h (100%) rename Examples/{php => php4}/variables/example.i (100%) rename Examples/{php/variables/runme.php => php4/variables/runme.php4} (100%) rename Examples/{php => php4}/variables/runme.php4.old (100%) mode change 100644 => 100755 Examples/pike/class/Makefile mode change 100644 => 100755 Examples/pike/class/example.cxx mode change 100644 => 100755 Examples/pike/class/example.h mode change 100644 => 100755 Examples/pike/class/example.i mode change 100644 => 100755 Examples/pike/constants/Makefile mode change 100644 => 100755 Examples/pike/constants/example.i mode change 100644 => 100755 Examples/pike/overload/example.cxx mode change 100644 => 100755 Examples/pike/overload/example.h mode change 100644 => 100755 Examples/pike/template/Makefile mode change 100644 => 100755 Examples/pike/template/example.h mode change 100644 => 100755 Examples/pike/template/example.i mode change 100644 => 100755 Examples/ruby/hashargs/Makefile mode change 100644 => 100755 Examples/ruby/hashargs/example.i rename Examples/test-suite/{chicken_ext_test.i => chicken/ext_test.i} (94%) rename Examples/test-suite/chicken/{chicken_ext_test_runme.ss => ext_test_runme.ss} (57%) delete mode 100644 Examples/test-suite/csharp/csharp_lib_arrays_runme.cs delete mode 100644 Examples/test-suite/csharp/director_basic_runme.cs delete mode 100644 Examples/test-suite/csharp/li_attribute_runme.cs delete mode 100644 Examples/test-suite/csharp_lib_arrays.i mode change 100644 => 100755 Examples/test-suite/director_classic.i mode change 100644 => 100755 Examples/test-suite/director_ignore.i delete mode 100644 Examples/test-suite/director_protected_overloaded.i delete mode 100644 Examples/test-suite/global_namespace.i rename Examples/test-suite/{guilescm_ext_test.i => guilescm/ext_test.i} (93%) rename Examples/test-suite/guilescm/{guilescm_ext_test_runme.scm => ext_test_runme.scm} (82%) delete mode 100644 Examples/test-suite/insert_directive.i mode change 100644 => 100755 Examples/test-suite/java/allprotected_runme.java mode change 100644 => 100755 Examples/test-suite/java/director_classic_runme.java mode change 100644 => 100755 Examples/test-suite/java/director_ignore_runme.java delete mode 100644 Examples/test-suite/java/global_namespace_runme.java delete mode 100644 Examples/test-suite/java/li_boost_intrusive_ptr_runme.java mode change 100644 => 100755 Examples/test-suite/java/overload_complicated_runme.java delete mode 100644 Examples/test-suite/li_boost_intrusive_ptr.i delete mode 100644 Examples/test-suite/li_std_vector_ptr.i delete mode 100644 Examples/test-suite/nested_structs.i rename Examples/test-suite/{octave_cell_deref.i => octave/cell_deref.i} (86%) rename Examples/test-suite/octave/{octave_cell_deref_runme.m => cell_deref_runme.m} (85%) rename Examples/test-suite/{ => octave}/implicittest.i (100%) rename Examples/test-suite/{li_std_pair_extra.i => octave/li_std_pair.i} (99%) delete mode 100644 Examples/test-suite/octave/li_std_pair_extra_runme.m create mode 100644 Examples/test-suite/octave/li_std_pair_runme.m rename Examples/test-suite/{li_std_string_extra.i => octave/li_std_string.i} (93%) delete mode 100644 Examples/test-suite/octave/li_std_string_extra_runme.m create mode 100644 Examples/test-suite/octave/li_std_string_runme.m delete mode 100644 Examples/test-suite/operbool.i delete mode 100644 Examples/test-suite/packageoption_c.i rename Examples/test-suite/{ => perl5}/li_std_list.i (100%) rename Examples/test-suite/{php => php4}/Makefile.in (69%) rename Examples/test-suite/{php/abstract_inherit_ok_runme.php => php4/abstract_inherit_ok_runme.php4} (88%) rename Examples/test-suite/{php/abstract_inherit_runme.php => php4/abstract_inherit_runme.php4} (93%) rename Examples/test-suite/{php/add_link_runme.php => php4/add_link_runme.php4} (95%) rename Examples/test-suite/{php/argout_runme.php => php4/argout_runme.php4} (97%) rename Examples/test-suite/{php/arrayptr_runme.php => php4/arrayptr_runme.php4} (90%) rename Examples/test-suite/{php/arrays_global_runme.php => php4/arrays_global_runme.php4} (60%) rename Examples/test-suite/{php/arrays_global_twodim_runme.php => php4/arrays_global_twodim_runme.php4} (97%) rename Examples/test-suite/{php/arrays_runme.php => php4/arrays_runme.php4} (95%) rename Examples/test-suite/{php/arrays_scope_runme.php => php4/arrays_scope_runme.php4} (92%) rename Examples/test-suite/{php/casts_runme.php => php4/casts_runme.php4} (93%) rename Examples/test-suite/{php/class_ignore_runme.php => php4/class_ignore_runme.php4} (93%) rename Examples/test-suite/{php/conversion_namespace_runme.php => php4/conversion_namespace_runme.php4} (90%) rename Examples/test-suite/{php/conversion_ns_template_runme.php => php4/conversion_ns_template_runme.php4} (89%) rename Examples/test-suite/{php/conversion_runme.php => php4/conversion_runme.php4} (90%) rename Examples/test-suite/{php/cpp_static_runme.php => php4/cpp_static_runme.php4} (91%) rename Examples/test-suite/{php/enum_scope_template_runme.php => php4/enum_scope_template_runme.php4} (96%) rename Examples/test-suite/{php/evil_diamond_ns_runme.php => php4/evil_diamond_ns_runme.php4} (94%) rename Examples/test-suite/{php/evil_diamond_prop_runme.php => php4/evil_diamond_prop_runme.php4} (97%) rename Examples/test-suite/{php/evil_diamond_runme.php => php4/evil_diamond_runme.php4} (93%) rename Examples/test-suite/{php/extend_template_ns_runme.php => php4/extend_template_ns_runme.php4} (91%) rename Examples/test-suite/{php/extend_template_runme.php => php4/extend_template_runme.php4} (90%) rename Examples/test-suite/{php/grouping_runme.php => php4/grouping_runme.php4} (96%) rename Examples/test-suite/{php/ignore_parameter_runme.php => php4/ignore_parameter_runme.php4} (98%) rename Examples/test-suite/{php/li_carrays_runme.php => php4/li_carrays_runme.php4} (92%) rename Examples/test-suite/{php/li_std_string_runme.php => php4/li_std_string_runme.php4} (98%) rename Examples/test-suite/{php_namewarn_rename.i => php4/namewarn_rename.i} (81%) rename Examples/test-suite/{php/rename_scope_runme.php => php4/rename_scope_runme.php4} (96%) rename Examples/test-suite/{php/skel.php => php4/skel.php4} (90%) rename Examples/test-suite/{php/smart_pointer_rename_runme.php => php4/smart_pointer_rename_runme.php4} (97%) rename Examples/test-suite/{php/sym_runme.php => php4/sym_runme.php4} (95%) rename Examples/test-suite/{php/template_arg_typename_runme.php => php4/template_arg_typename_runme.php4} (94%) rename Examples/test-suite/{php/template_construct_runme.php => php4/template_construct_runme.php4} (88%) rename Examples/test-suite/{php/tests.php => php4/tests.php4} (96%) rename Examples/test-suite/{php/typedef_reference_runme.php => php4/typedef_reference_runme.php4} (93%) rename Examples/test-suite/{php/typemap_ns_using_runme.php => php4/typemap_ns_using_runme.php4} (89%) rename Examples/test-suite/{php/using1_runme.php => php4/using1_runme.php4} (88%) rename Examples/test-suite/{php/using2_runme.php => php4/using2_runme.php4} (88%) rename Examples/test-suite/{php/valuewrapper_base_runme.php => php4/valuewrapper_base_runme.php4} (91%) rename Examples/test-suite/{ => python}/argcargvtest.i (100%) rename Examples/test-suite/{python_autodoc.i => python/autodoc.i} (97%) rename Examples/test-suite/{ => python}/callback.i (100%) rename Examples/test-suite/{ => python}/complextest.i (100%) delete mode 100644 Examples/test-suite/python/cpp_static_runme.py rename Examples/test-suite/{ => python}/director_profile.i (100%) rename Examples/test-suite/{ => python}/director_stl.i (100%) rename Examples/test-suite/{iadd.i => python/iadd.h} (79%) create mode 100644 Examples/test-suite/python/iadd.i create mode 100644 Examples/test-suite/python/implicittest.i rename Examples/test-suite/{ => python}/inout.i (100%) rename Examples/test-suite/{ => python}/inplaceadd.i (100%) rename Examples/test-suite/{ => python}/input.i (100%) rename Examples/test-suite/{python_kwargs.i => python/kwargs.i} (98%) rename Examples/test-suite/python/{python_kwargs_runme.py => kwargs_runme.py} (97%) rename Examples/test-suite/{ => python}/li_std_carray.i (100%) create mode 100644 Examples/test-suite/python/li_std_map.i create mode 100644 Examples/test-suite/python/li_std_pair.i delete mode 100644 Examples/test-suite/python/li_std_pair_extra_runme.py create mode 100644 Examples/test-suite/python/li_std_pair_runme.py create mode 100644 Examples/test-suite/python/li_std_set.i create mode 100644 Examples/test-suite/python/li_std_stream.i create mode 100644 Examples/test-suite/python/li_std_string.i rename Examples/test-suite/python/{li_std_string_extra_runme.py => li_std_string_runme.py} (54%) rename Examples/test-suite/{li_std_vector_extra.i => python/li_std_vector.i} (85%) delete mode 100644 Examples/test-suite/python/li_std_vector_ptr_runme.py rename Examples/test-suite/python/{li_std_vector_extra_runme.py => li_std_vector_runme.py} (84%) rename Examples/test-suite/{ => python}/li_std_vectora.i (100%) rename Examples/test-suite/{ => python}/li_std_wstream.i (100%) create mode 100644 Examples/test-suite/python/li_std_wstring.i rename Examples/test-suite/{python_nondynamic.i => python/nondynamic.i} (96%) rename Examples/test-suite/python/{python_nondynamic_runme.py => nondynamic_runme.py} (67%) delete mode 100644 Examples/test-suite/python/operbool_runme.py rename Examples/test-suite/{python_overload_simple_cast.i => python/overload_simple_cast.i} (58%) rename Examples/test-suite/python/{python_overload_simple_cast_runme.py => overload_simple_cast_runme.py} (98%) delete mode 100644 Examples/test-suite/python/python_abstractbase_runme3.py delete mode 100644 Examples/test-suite/python/python_append_runme.py delete mode 100644 Examples/test-suite/python/python_pybuf_runme3.py delete mode 100644 Examples/test-suite/python/rename_strip_encoder_runme.py rename Examples/test-suite/{ => python}/simutry.i (100%) create mode 100644 Examples/test-suite/python/std_containers.i rename Examples/test-suite/{ => python}/swigobject.i (81%) create mode 100644 Examples/test-suite/python/tag_no_clash_with_variable_runme.i rename Examples/test-suite/{ => python}/template_matrix.i (100%) create mode 100644 Examples/test-suite/python/vector.i delete mode 100644 Examples/test-suite/python_abstractbase.i delete mode 100644 Examples/test-suite/python_append.i delete mode 100644 Examples/test-suite/python_pybuf.i delete mode 100644 Examples/test-suite/r/arrays_dimensionless_runme.R rename Examples/test-suite/{r_copy_struct.i => r/copy_struct.i} (97%) rename Examples/test-suite/r/{r_copy_struct_runme.R => copy_struct_runme.R} (81%) rename Examples/test-suite/{r_double_delete.i => r/double_delete.i} (67%) create mode 100644 Examples/test-suite/r/double_delete_runme.R delete mode 100644 Examples/test-suite/r/integers_runme.R rename Examples/test-suite/{r_legacy.i => r/legacy.i} (98%) rename Examples/test-suite/r/{r_legacy_runme.R => legacy_runme.R} (86%) delete mode 100644 Examples/test-suite/r/r_double_delete_runme.R rename Examples/test-suite/{ => r}/simple_array.i (100%) delete mode 100644 Examples/test-suite/rename_strip_encoder.i rename Examples/test-suite/{ruby_keywords.i => ruby/keywords.i} (98%) rename Examples/test-suite/ruby/{ruby_keywords_runme.rb => keywords_runme.rb} (98%) rename Examples/test-suite/{ => ruby}/li_std_functors.i (100%) rename Examples/test-suite/{ => ruby}/li_std_pair_lang_object.i (100%) rename Examples/test-suite/{ => ruby}/li_std_queue.i (100%) rename Examples/test-suite/{ruby_li_std_speed.i => ruby/li_std_speed.i} (90%) rename Examples/test-suite/ruby/{ruby_li_std_speed_runme.rb => li_std_speed_runme.rb} (97%) rename Examples/test-suite/{ => ruby}/li_std_stack.i (100%) rename Examples/test-suite/{ruby_naming.i => ruby/naming.i} (98%) rename Examples/test-suite/ruby/{ruby_naming_runme.rb => naming_runme.rb} (68%) rename Examples/test-suite/{ => ruby}/stl_new.i (100%) rename Examples/test-suite/{ruby_track_objects.i => ruby/track_objects.i} (98%) rename Examples/test-suite/{ruby_track_objects_directors.i => ruby/track_objects_directors.i} (88%) rename Examples/test-suite/ruby/{ruby_track_objects_directors_runme.rb => track_objects_directors_runme.rb} (74%) rename Examples/test-suite/ruby/{ruby_track_objects_runme.rb => track_objects_runme.rb} (78%) rename Examples/test-suite/{union_parameter.i => tcl/union.i} (97%) rename Examples/test-suite/tcl/{union_parameter_runme.tcl => union_runme.tcl} (92%) mode change 100644 => 100755 mode change 100644 => 100755 Lib/allegrocl/inout_typemaps.i mode change 100644 => 100755 Lib/allegrocl/longlongs.i mode change 100644 => 100755 Lib/allegrocl/std_list.i mode change 100644 => 100755 Lib/allegrocl/std_string.i delete mode 100644 Lib/csharp/arrays_csharp.i mode change 100644 => 100755 Lib/csharp/std_vector.i mode change 100644 => 100755 Lib/csharp/std_wstring.i mode change 100644 => 100755 Lib/csharp/wchar.i delete mode 100644 Lib/intrusive_ptr.i delete mode 100644 Lib/java/boost_intrusive_ptr.i rename Lib/{php => php4}/const.i (100%) rename Lib/{php => php4}/globalvar.i (99%) rename Lib/{php/php.swg => php4/php4.swg} (89%) rename Lib/{php/phpinit.swg => php4/php4init.swg} (100%) rename Lib/{php/phpkw.swg => php4/php4kw.swg} (99%) rename Lib/{php/phprun.swg => php4/php4run.swg} (96%) rename Lib/{php => php4}/phppointers.i (100%) rename Lib/{php => php4}/std_common.i (100%) rename Lib/{php => php4}/std_deque.i (100%) rename Lib/{php => php4}/std_map.i (97%) rename Lib/{php => php4}/std_pair.i (100%) rename Lib/{php => php4}/std_string.i (100%) rename Lib/{php => php4}/std_vector.i (98%) rename Lib/{php => php4}/stl.i (100%) rename Lib/{php => php4}/typemaps.i (62%) rename Lib/{php => php4}/utils.i (86%) delete mode 100644 Lib/python/pyabc.i delete mode 100644 Lib/python/pybuffer.i delete mode 100644 Lib/python/pyname_compat.i mode change 100644 => 100755 Source/Modules/ocaml.cxx rename Source/Modules/{php.cxx => php4.cxx} (64%) create mode 100755 Tools/config/config.guess create mode 100755 Tools/config/config.sub delete mode 100644 Tools/pyname_patch.py diff --git a/ANNOUNCE b/ANNOUNCE index 9ef41142a..7c0e95e3f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,11 +1,11 @@ -*** ANNOUNCE: SWIG 1.3.40 (in progress) *** +*** ANNOUNCE: SWIG 1.3.36 (24 June 2008) *** http://www.swig.org -We're pleased to announce SWIG-1.3.40, the latest installment in the -SWIG development effort. SWIG-1.3.40 includes a number of bug fixes -and enhancements. +We're pleased to announce SWIG-1.3.36, the latest installment in the +SWIG development effort. SWIG-1.3.36 includes a number of bug fixes +and large number of enhancements throughout. What is SWIG? ------------- @@ -24,11 +24,21 @@ Availability: ------------- The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-1.3.40.tar.gz + http://prdownloads.sourceforge.net/swig/swig-1.3.36.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-1.3.40.zip + http://prdownloads.sourceforge.net/swig/swigwin-1.3.36.zip + +Release numbers +--------------- +With SWIG-1.3, we are adopting an odd/even version numbering scheme for +SWIG. Odd version numbers (1.3, 1.5, 1.7, etc...) are considered to +be development releases. Even numbers (1.4,1.6,1.8) are stable +releases. The current 1.3 effort is working to produce a stable 2.0 +release. A stable 2.0 release will not be made until it can +accompanied by fully updated documentation. In the meantime, we will +continue to make periodic 1.3.x releases. Please report problems with this release to the swig-dev mailing list, details at http://www.swig.org/mail.html. diff --git a/CCache/COPYING b/CCache/COPYING deleted file mode 100644 index a43ea2126..000000000 --- a/CCache/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/CCache/Makefile.in b/CCache/Makefile.in deleted file mode 100644 index ec55ccaf5..000000000 --- a/CCache/Makefile.in +++ /dev/null @@ -1,73 +0,0 @@ -datarootdir = @datarootdir@ -srcdir=@srcdir@ -VPATH=@srcdir@ - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -mandir=@mandir@ -INSTALLCMD=@INSTALL@ -PACKAGE_NAME=@PACKAGE_NAME@ -# Soft link test can be skipped on systems that don't support soft linking -NOSOFTLINKSTEST= - -CC=@CC@ -CFLAGS=@CFLAGS@ -I. -SWIG=swig -SWIG_LIB=../../Lib -EXEEXT=@EXEEXT@ - -# Use standard autoconf approach to transform executable name using --program-prefix and --program-suffix -transform = @program_transform_name@ - -LIBS= @LIBS@ -OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \ - cleanup.o snprintf.o unify.o -HEADERS = ccache.h mdfour.h - -all: $(PACKAGE_NAME)$(EXEEXT) - -# Note that HTML documentation is actually generated and used from the main SWIG documentation Makefile -docs: $(PACKAGE_NAME).1 web/ccache-man.html - -$(PACKAGE_NAME)$(EXEEXT): $(OBJS) $(HEADERS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - -$(PACKAGE_NAME).1: ccache.yo - -yodl2man -o $(PACKAGE_NAME).1 ccache.yo - -web/ccache-man.html: ccache.yo - mkdir -p man - yodl2html -o web/ccache-man.html ccache.yo - -install: $(PACKAGE_NAME)$(EXEEXT) $(PACKAGE_NAME).1 - ${INSTALLCMD} -d $(DESTDIR)${bindir} - ${INSTALLCMD} -m 755 $(PACKAGE_NAME)$(EXEEXT) $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT) - ${INSTALLCMD} -d $(DESTDIR)${mandir}/man1 - ${INSTALLCMD} -m 644 ${srcdir}/$(PACKAGE_NAME).1 $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1 - -uninstall: $(PACKAGE_NAME)$(EXEEXT) $(PACKAGE_NAME).1 - rm -f $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT) - rm -f $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1 - -clean: - /bin/rm -f $(OBJS) *~ $(PACKAGE_NAME)$(EXEEXT) - -clean-docs: - rm -f $(PACKAGE_NAME).1 web/ccache-man.html - -check : test - -test: test.sh - SWIG_LIB='$(SWIG_LIB)' PATH=../..:$$PATH SWIG='$(SWIG)' CC='$(CC)' NOSOFTLINKSTEST='$(NOSOFTLINKSTEST)' ./test.sh - -check: test - -distclean: clean - /bin/rm -f Makefile config.h config.sub config.log build-stamp config.status configure config.h - -# FIXME: To fix this, test.sh needs to be able to take ccache from the -# installed prefix, not from the source dir. -installcheck: - @echo "WARNING! This is not really \"installcheck\" yet." - $(MAKE) check diff --git a/CCache/README b/CCache/README deleted file mode 100644 index 6e68a6eb0..000000000 --- a/CCache/README +++ /dev/null @@ -1,31 +0,0 @@ -This is a re-implementation of "compilercache" in C - -The original compilercache scripts were by Erik Thiele -(erikyyy@erikyyy.de) and I would like to thank him for an excellent -piece of work. See http://www.erikyyy.de/compilercache/ for the -original shell scripts. - -I wrote ccache because I wanted to get a bit more speed out of a -compiler cache and I wanted to remove some of the limitations of the -shell-script version. - -Please see the manual page and documentation at -http://ccache.samba.org/ - -INSTALLATION ------------- - -Please run: - - ./configure - make - make install - -then read the ccache manual page - ------------ - -Andrew Tridgell -http://samba.org/~tridge/ -bugs@ccache.samba.org - diff --git a/CCache/README.swig b/CCache/README.swig deleted file mode 100644 index aea0f3d82..000000000 --- a/CCache/README.swig +++ /dev/null @@ -1,8 +0,0 @@ -This directory contains a version of ccache. The initial version was based on ccache-2.4 plus -debian patches 01-02, 04-14, see the debian/patches subdirectory. The ccache-win32-2.4 modifications -to ccache-2.4 have also been merged in. - -Changes have been made to support cacheing the output from SWIG. The ability to cache c/c++ compiler -output has been retained. - -Additional features added are the CCACHE_VERBOSE and CCACHE_SWIG environment variables, see docs. diff --git a/CCache/args.c b/CCache/args.c deleted file mode 100644 index 31e5471c1..000000000 --- a/CCache/args.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - convenient routines for argument list handling - - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "ccache.h" - -ARGS *args_init(int init_argc, char **init_args) -{ - ARGS *args; - int i; - args = (ARGS *)x_malloc(sizeof(ARGS)); - args->argc = 0; - args->argv = (char **)x_malloc(sizeof(char *)); - args->argv[0] = NULL; - for (i=0;iargv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *)); - args->argv[args->argc] = x_strdup(s); - args->argc++; - args->argv[args->argc] = NULL; -} - -/* pop the last element off the args list */ -void args_pop(ARGS *args, int n) -{ - while (n--) { - args->argc--; - free(args->argv[args->argc]); - args->argv[args->argc] = NULL; - } -} - -/* remove the first element of the argument list */ -void args_remove_first(ARGS *args) -{ - free(args->argv[0]); - memmove(&args->argv[0], - &args->argv[1], - args->argc * sizeof(args->argv[0])); - args->argc--; -} - -/* add an argument into the front of the argument list */ -void args_add_prefix(ARGS *args, const char *s) -{ - args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *)); - memmove(&args->argv[1], &args->argv[0], - (args->argc+1) * sizeof(args->argv[0])); - args->argv[0] = x_strdup(s); - args->argc++; -} - -/* strip any arguments beginning with the specified prefix */ -void args_strip(ARGS *args, const char *prefix) -{ - int i; - for (i=0; iargc; ) { - if (strncmp(args->argv[i], prefix, strlen(prefix)) == 0) { - free(args->argv[i]); - memmove(&args->argv[i], - &args->argv[i+1], - args->argc * sizeof(args->argv[i])); - args->argc--; - } else { - i++; - } - } -} diff --git a/CCache/ccache.c b/CCache/ccache.c deleted file mode 100644 index d1696da88..000000000 --- a/CCache/ccache.c +++ /dev/null @@ -1,1388 +0,0 @@ -/* - a re-implementation of the compilercache scripts in C - - The idea is based on the shell-script compilercache by Erik Thiele - - Copyright (C) Andrew Tridgell 2002 - Copyright (C) Martin Pool 2003 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "ccache.h" - -/* verbose mode */ -int ccache_verbose = 0; - -/* the base cache directory */ -char *cache_dir = NULL; - -/* the directory for temporary files */ -static char *temp_dir = NULL; - -/* the debug logfile name, if set */ -char *cache_logfile = NULL; - -/* the argument list after processing */ -static ARGS *stripped_args; - -/* the original argument list */ -static ARGS *orig_args; - -/* the output filename being compiled to */ -static char *output_file; - -/* the source file */ -static char *input_file; - -/* the name of the file containing the cached object code */ -static char *hashname; - -/* the extension of the file after pre-processing */ -static const char *i_extension; - -/* the name of the temporary pre-processor file */ -static char *i_tmpfile; - -/* are we compiling a .i or .ii file directly? */ -static int direct_i_file; - -/* the name of the cpp stderr file */ -static char *cpp_stderr; - -/* the name of the statistics file */ -char *stats_file = NULL; - -/* can we safely use the unification hashing backend? */ -static int enable_unify; - -/* should we strip -c when running the preprocessor only? */ -static int strip_c_option; - -/* customisation for using the SWIG compiler */ -static int swig; - -/* a list of supported file extensions, and the equivalent - extension for code that has been through the pre-processor -*/ -static struct { - char *extension; - char *i_extension; -} extensions[] = { - {"c", "i"}, - {"C", "ii"}, - {"m", "mi"}, - {"cc", "ii"}, - {"CC", "ii"}, - {"cpp", "ii"}, - {"CPP", "ii"}, - {"cxx", "ii"}, - {"CXX", "ii"}, - {"c++", "ii"}, - {"C++", "ii"}, - {"i", "i"}, - {"ii", "ii"}, - {NULL, NULL}}; - -/* - something went badly wrong - just execute the real compiler -*/ -static void failed(void) -{ - char *e; - - /* delete intermediate pre-processor file if needed */ - if (i_tmpfile) { - if (!direct_i_file) { - unlink(i_tmpfile); - } - free(i_tmpfile); - i_tmpfile = NULL; - } - - /* delete the cpp stderr file if necessary */ - if (cpp_stderr) { - unlink(cpp_stderr); - free(cpp_stderr); - cpp_stderr = NULL; - } - - /* strip any local args */ - args_strip(orig_args, "--ccache-"); - - if ((e=getenv("CCACHE_PREFIX"))) { - char *p = find_executable(e, MYNAME); - if (!p) { - cc_log("could not find executable (%s)\n", e); - perror(e); - exit(1); - } - args_add_prefix(orig_args, p); - } - - if (ccache_verbose) { - display_execute_args(orig_args->argv); - } - - if (swig) { - putenv("CCACHE_OUTFILES"); - } - -#ifndef _WIN32 - execv(orig_args->argv[0], orig_args->argv); - cc_log("execv returned (%s)!\n", strerror(errno)); - perror(orig_args->argv[0]); - exit(1); -#else - /* execv on Windows causes the 'non-regular' testcase to fail, so use Win32 API instead */ - { - PROCESS_INFORMATION pinfo; - STARTUPINFO sinfo; - BOOL ret; - DWORD exitcode; - char *args; - - ZeroMemory(&pinfo, sizeof(PROCESS_INFORMATION)); - ZeroMemory(&sinfo, sizeof(STARTUPINFO)); - sinfo.cb = sizeof(STARTUPINFO); - args = argvtos(orig_args->argv); - ret = CreateProcessA(orig_args->argv[0], args, NULL, NULL, TRUE, 0, NULL, NULL, - &sinfo, &pinfo); - if (!ret) { - exitcode = 1; - cc_log("CreateProcessA failed starting %s\n", orig_args->argv[0]); - perror_win32(orig_args->argv[0]); - } else { - WaitForSingleObject(pinfo.hProcess, INFINITE); - GetExitCodeProcess(pinfo.hProcess, &exitcode); - CloseHandle(pinfo.hProcess); - CloseHandle(pinfo.hThread); - } - free(args); - exit(exitcode); - } -#endif -} - - -/* return a string to be used to distinguish temporary files - this also tries to cope with NFS by adding the local hostname -*/ -static const char *tmp_string(void) -{ - static char *ret; - - if (!ret) { - char hostname[200]; - strcpy(hostname, "unknown"); -#if HAVE_GETHOSTNAME - gethostname(hostname, sizeof(hostname)-1); -#endif - hostname[sizeof(hostname)-1] = 0; - if (asprintf(&ret, "%s.%u", hostname, (unsigned)getpid()) == -1) { - fatal("could not allocate tmp_string"); - } - } - - return ret; -} - -/* update cached file sizes and count helper function for to_cache() */ -static void to_cache_stats_helper(struct stat *pstat, char *cached_filename, char *tmp_outfiles, int *files_size, int *cached_files_count) -{ -#if ENABLE_ZLIB - /* do an extra stat on the cache file for the size statistics */ - if (stat(cached_filename, pstat) != 0) { - cc_log("failed to stat cache files - %s\n", strerror(errno)); - stats_update(STATS_ERROR); - if (tmp_outfiles) { - unlink(tmp_outfiles); - } - failed(); - } -#else - (void)cached_filename; - (void)tmp_outfiles; -#endif - (*files_size) += file_size(pstat); - (*cached_files_count)++; -} - -/* run the real compiler and put the result in cache */ -static void to_cache(ARGS *args) -{ - char *path_stderr; - char *tmp_stdout, *tmp_stderr, *tmp_outfiles; - struct stat st1; - int status; - int cached_files_count = 0; - int files_size = 0; - - x_asprintf(&tmp_stdout, "%s/tmp.stdout.%s", temp_dir, tmp_string()); - x_asprintf(&tmp_stderr, "%s/tmp.stderr.%s", temp_dir, tmp_string()); - x_asprintf(&tmp_outfiles, "%s/tmp.outfiles.%s", temp_dir, tmp_string()); - - if (strip_c_option && !swig) { - args_add(stripped_args, "-c"); - } - - if (output_file) { - args_add(args, "-o"); - args_add(args, output_file); - } - - /* Turn off DEPENDENCIES_OUTPUT when running cc1, because - * otherwise it will emit a line like - * - * tmp.stdout.vexed.732.o: /home/mbp/.ccache/tmp.stdout.vexed.732.i - * - * unsetenv() is on BSD and Linux but not portable. */ - putenv("DEPENDENCIES_OUTPUT"); - - /* Give SWIG a filename for it to create and populate with a list of files that it generates */ - if (swig) { - char *ccache_outfiles; - x_asprintf(&ccache_outfiles, "CCACHE_OUTFILES=%s", tmp_outfiles); - unlink(tmp_outfiles); - if (getenv("CCACHE_OUTFILES") || putenv(ccache_outfiles) == -1) { - cc_log("CCACHE_OUTFILES env variable already set or could not be set\n"); - stats_update(STATS_ERROR); - failed(); - } - } - - if (getenv("CCACHE_CPP2")) { - args_add(args, input_file); - } else { - if (swig) { - args_add(args, "-nopreprocess"); - } - args_add(args, i_tmpfile); - } - status = execute(args->argv, tmp_stdout, tmp_stderr); - args_pop(args, 3); - - if (stat(tmp_stdout, &st1) != 0 || st1.st_size != 0) { - cc_log("compiler produced stdout for %s\n", input_file); - stats_update(STATS_STDOUT); - unlink(tmp_stdout); - unlink(tmp_stderr); - unlink(tmp_outfiles); - if (!swig) unlink(output_file); - failed(); - } - unlink(tmp_stdout); - - if (status != 0) { - int fd; - cc_log("compile of %s gave status = %d\n", input_file, status); - stats_update(STATS_STATUS); - - fd = open(tmp_stderr, O_RDONLY | O_BINARY); - if (fd != -1) { - if (cpp_stderr) { - /* we might have some stderr from cpp */ - int fd2 = open(cpp_stderr, O_RDONLY | O_BINARY); - if (fd2 != -1) { - copy_fd(fd2, 2); - close(fd2); - unlink(cpp_stderr); - cpp_stderr = NULL; - } - } - - /* we can use a quick method of - getting the failed output */ - copy_fd(fd, 2); - close(fd); - unlink(tmp_stderr); - if (i_tmpfile && !direct_i_file) { - unlink(i_tmpfile); - } - exit(status); - } - - unlink(tmp_stderr); - unlink(tmp_outfiles); - if (!swig) unlink(output_file); - failed(); - } else { - int hardlink = (getenv("CCACHE_NOCOMPRESS") != 0) && (getenv("CCACHE_HARDLINK") != 0); - if (swig) { - /* read the list of generated files and copy each of them into the cache */ - FILE *file; - file = fopen(tmp_outfiles, "r"); - if (file) { - char out_filename[FILENAME_MAX + 1]; - char out_filename_cache[FILENAME_MAX + 1]; - while (fgets(out_filename, FILENAME_MAX, file)) { - char *linefeed = strchr(out_filename, '\n'); - if (linefeed) { - char *potential_cr = linefeed - 1; - if (potential_cr >= out_filename && *potential_cr == '\r') - *potential_cr = 0; - *linefeed = 0; - - if (cached_files_count == 0) { - strcpy(out_filename_cache, hashname); - } else { - sprintf(out_filename_cache, "%s.%d", hashname, cached_files_count); - } - - if (commit_to_cache(out_filename, out_filename_cache, hardlink) != 0) { - fclose(file); - unlink(tmp_outfiles); - failed(); - } - to_cache_stats_helper(&st1, out_filename_cache, tmp_outfiles, &files_size, &cached_files_count); - } else { - cached_files_count = 0; - break; - } - } - fclose(file); - if (cached_files_count == 0) { - cc_log("failed to copy output files to cache - internal error\n"); - stats_update(STATS_ERROR); - unlink(tmp_outfiles); - failed(); - } - - /* also copy the (uncompressed) file containing the list of generated files into the cache */ - sprintf(out_filename_cache, "%s.outfiles", hashname); - if (stat(tmp_outfiles, &st1) != 0 || - safe_rename(tmp_outfiles, out_filename_cache) != 0) { - cc_log("failed to copy outfiles file to cache - %s\n", strerror(errno)); - stats_update(STATS_ERROR); - unlink(tmp_outfiles); - failed(); - } - to_cache_stats_helper(&st1, out_filename_cache, tmp_outfiles, &files_size, &cached_files_count); - unlink(tmp_outfiles); - } else { - cc_log("failed to open temp outfiles file - %s\n", strerror(errno)); - stats_update(STATS_ERROR); - failed(); - } - } else { - if (commit_to_cache(output_file, hashname, hardlink) != 0) { - failed(); - } - to_cache_stats_helper(&st1, hashname, 0, &files_size, &cached_files_count); - } - } - - x_asprintf(&path_stderr, "%s.stderr", hashname); - - if (stat(tmp_stderr, &st1) != 0 || - move_file(tmp_stderr, path_stderr) != 0) { - cc_log("failed to rename tmp files - %s\n", strerror(errno)); - stats_update(STATS_ERROR); - failed(); - } - - to_cache_stats_helper(&st1, path_stderr, 0, &files_size, &cached_files_count); - - cc_log("Placed %d files for %s into cache\n", cached_files_count, input_file); - stats_tocache(files_size, cached_files_count); - - free(tmp_stderr); - free(tmp_stdout); - free(tmp_outfiles); - free(path_stderr); -} - -/* find the hash for a command. The hash includes all argument lists, - plus the output from running the compiler with -E */ -static void find_hash(ARGS *args) -{ - int i; - char *path_stdout, *path_stderr; - char *hash_dir; - char *s; - struct stat st; - int status; - int nlevels = 2; - char *input_base; - char *tmp; - - if ((s = getenv("CCACHE_NLEVELS"))) { - nlevels = atoi(s); - if (nlevels < 1) nlevels = 1; - if (nlevels > 8) nlevels = 8; - } - - hash_start(); - - /* when we are doing the unifying tricks we need to include - the input file name in the hash to get the warnings right */ - if (enable_unify || swig) { - hash_string(input_file); - } - - if (swig) { - if (output_file) { - hash_string(output_file); - } - } else { - /* we have to hash the extension, as a .i file isn't treated the same - by the compiler as a .ii file */ - hash_string(i_extension); - } - - /* first the arguments */ - for (i=1;iargc;i++) { - /* some arguments don't contribute to the hash. The - theory is that these arguments will change the - output of -E if they are going to have any effect - at all, or they only affect linking */ - if (i < args->argc-1) { - if (strcmp(args->argv[i], "-I") == 0 || - strcmp(args->argv[i], "-include") == 0 || - strcmp(args->argv[i], "-L") == 0 || - strcmp(args->argv[i], "-D") == 0 || - strcmp(args->argv[i], "-idirafter") == 0 || - strcmp(args->argv[i], "-isystem") == 0) { - i++; - continue; - } - } - if (strncmp(args->argv[i], "-I", 2) == 0 || - strncmp(args->argv[i], "-L", 2) == 0 || - strncmp(args->argv[i], "-D", 2) == 0 || - strncmp(args->argv[i], "-idirafter", 10) == 0 || - strncmp(args->argv[i], "-isystem", 8) == 0) { - continue; - } - - if (strncmp(args->argv[i], "--specs=", 8) == 0 && - stat(args->argv[i]+8, &st) == 0) { - /* if given a explicit specs file, then hash that file, but - don't include the path to it in the hash */ - hash_file(args->argv[i]+8); - continue; - } - - /* all other arguments are included in the hash */ - hash_string(args->argv[i]); - } - - /* the compiler driver size and date. This is a simple minded way - to try and detect compiler upgrades. It is not 100% reliable */ - if (stat(args->argv[0], &st) != 0) { - cc_log("Couldn't stat the compiler!? (argv[0]='%s')\n", args->argv[0]); - stats_update(STATS_COMPILER); - failed(); - } - - /* also include the hash of the compiler name - as some compilers - use hard links and behave differently depending on the real name */ - if (st.st_nlink > 1) { - hash_string(str_basename(args->argv[0])); - } - - hash_int(st.st_size); - hash_int(st.st_mtime); - - /* possibly hash the current working directory */ - if (getenv("CCACHE_HASHDIR")) { - char *cwd = gnu_getcwd(); - if (cwd) { - hash_string(cwd); - free(cwd); - } - } - - /* ~/hello.c -> tmp.hello.123.i - limit the basename to 10 - characters in order to cope with filesystem with small - maximum filename length limits */ - input_base = str_basename(input_file); - tmp = strchr(input_base, '.'); - if (tmp != NULL) { - *tmp = 0; - } - if (strlen(input_base) > 10) { - input_base[10] = 0; - } - - /* now the run */ - x_asprintf(&path_stdout, "%s/%s.tmp.%s.%s", temp_dir, - input_base, tmp_string(), - i_extension); - x_asprintf(&path_stderr, "%s/tmp.cpp_stderr.%s", temp_dir, tmp_string()); - - if (!direct_i_file) { - /* run cpp on the input file to obtain the .i */ - args_add(args, "-E"); - args_add(args, input_file); - status = execute(args->argv, path_stdout, path_stderr); - args_pop(args, 2); - } else { - /* we are compiling a .i or .ii file - that means we - can skip the cpp stage and directly form the - correct i_tmpfile */ - path_stdout = x_strdup(input_file); - if (create_empty_file(path_stderr) != 0) { - cc_log("failed to create empty stderr file\n"); - stats_update(STATS_ERROR); - failed(); - } - status = 0; - } - - if (status != 0) { - if (!direct_i_file) { - unlink(path_stdout); - } - unlink(path_stderr); - cc_log("the preprocessor gave %d\n", status); - stats_update(STATS_PREPROCESSOR); - failed(); - } - - /* if the compilation is with -g then we have to include the whole of the - preprocessor output, which means we are sensitive to line number - information. Otherwise we can discard line number info, which makes - us less sensitive to reformatting changes - - Note! I have now disabled the unification code by default - as it gives the wrong line numbers for warnings. Pity. - */ - if (!enable_unify) { - hash_file(path_stdout); - } else { - if (unify_hash(path_stdout) != 0) { - stats_update(STATS_ERROR); - failed(); - } - } - hash_file(path_stderr); - - i_tmpfile = path_stdout; - - if (!getenv("CCACHE_CPP2")) { - /* if we are using the CPP trick then we need to remember this stderr - data and output it just before the main stderr from the compiler - pass */ - cpp_stderr = path_stderr; - } else { - unlink(path_stderr); - free(path_stderr); - } - - /* we use a N level subdir for the cache path to reduce the impact - on filesystems which are slow for large directories - */ - s = hash_result(); - x_asprintf(&hash_dir, "%s/%c", cache_dir, s[0]); - x_asprintf(&stats_file, "%s/stats", hash_dir); - for (i=1; i= out_filename && *potential_cr == '\r') - *potential_cr = 0; - *linefeed = 0; - - if (retrieved_files_count == 0) { - strcpy(out_filename_cache, hashname); - } else { - sprintf(out_filename_cache, "%s.%d", hashname, retrieved_files_count); - } - - passfail = retrieve_from_cache(out_filename_cache, out_filename, hardlink); - if (passfail == -1) { - break; - } - - retrieved_files_count++; - } else { - cc_log("failed to copy output files from cache - internal error\n"); - stats_update(STATS_ERROR); - passfail = -1; - break; - } - } - if (retrieved_files_count == 0) { - cc_log("failed to copy output files from cache - internal error\n"); - stats_update(STATS_ERROR); - passfail = -1; - } - fclose(file); - } else { - cc_log("failed to open cached outfiles file - %s\n", strerror(errno)); - stats_update(STATS_ERROR); - } - } else { - passfail = retrieve_from_cache(hashname, output_file, hardlink); - } - - free(stderr_file); - if (passfail == -1) { - close(fd_stderr); - unlink(stderr_file); - return; - } - } - - /* get rid of the intermediate preprocessor file */ - if (i_tmpfile) { - if (!direct_i_file) { - unlink(i_tmpfile); - } - free(i_tmpfile); - i_tmpfile = NULL; - } - - /* send the cpp stderr, if applicable */ - fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY); - if (fd_cpp_stderr != -1) { - copy_fd(fd_cpp_stderr, 2); - close(fd_cpp_stderr); - unlink(cpp_stderr); - free(cpp_stderr); - cpp_stderr = NULL; - } - - /* send the stderr */ - copy_fd(fd_stderr, 2); - close(fd_stderr); - - /* and exit with the right status code */ - if (first) { - cc_log("got cached result for %s\n", input_file); - stats_update(STATS_CACHED); - } - - exit(0); -} - -/* find the real compiler. We just search the PATH to find a executable of the - same name that isn't a link to ourselves */ -static void find_compiler(int argc, char **argv) -{ - char *base; - char *path; - - orig_args = args_init(argc, argv); - - base = str_basename(argv[0]); - - /* we might be being invoked like "ccache gcc -c foo.c" */ - if (strcmp(base, MYNAME) == 0) { - args_remove_first(orig_args); - free(base); - if (strchr(argv[1],'/') -#ifdef _WIN32 - || strchr(argv[1],'\\') -#endif - ) { - /* a full path was given */ - return; - } - base = str_basename(argv[1]); - } - - /* support user override of the compiler */ - if ((path=getenv("CCACHE_CC"))) { - base = x_strdup(path); - } - - orig_args->argv[0] = find_executable(base, MYNAME); - - /* can't find the compiler! */ - if (!orig_args->argv[0]) { - stats_update(STATS_COMPILER); - cc_log("could not find compiler (%s)\n", base); - perror(base); - exit(1); - } -} - - -/* check a filename for C/C++ extension. Return the pre-processor - extension */ -static const char *check_extension(const char *fname, int *direct_i) -{ - int i; - const char *p; - - if (direct_i) { - *direct_i = 0; - } - - if (swig) return "ii"; /* any file extension is acceptable as input for SWIG */ - - p = strrchr(fname, '.'); - if (!p) return NULL; - p++; - for (i=0; extensions[i].extension; i++) { - if (strcmp(p, extensions[i].extension) == 0) { - if (direct_i && strcmp(p, extensions[i].i_extension) == 0) { - *direct_i = 1; - } - p = getenv("CCACHE_EXTENSION"); - if (p) return p; - return extensions[i].i_extension; - } - } - return NULL; -} - - -/* - process the compiler options to form the correct set of options - for obtaining the preprocessor output -*/ -static void process_args(int argc, char **argv) -{ - int i; - int found_c_opt = 0; - int found_S_opt = 0; - struct stat st; - char *e; - /* is gcc being asked to output dependencies? */ - int generating_dependencies = 0; - /* is the dependency makefile name overridden with -MF? */ - int dependency_filename_specified = 0; - /* is the dependency makefile target name specified with -MQ or -MF? */ - int dependency_target_specified = 0; - - - stripped_args = args_init(0, NULL); - - args_add(stripped_args, argv[0]); - - /* -c not required for SWIG */ - if (swig) { - found_c_opt = 1; - } - - for (i=1; iargv[0]); - if (strstr(basename, "swig") || getenv("CCACHE_SWIG")) { - swig = 1; - } - free(basename); -} - -/* the main ccache driver function */ -static void ccache(int argc, char *argv[]) -{ - /* find the real compiler */ - find_compiler(argc, argv); - - /* use the real compiler if HOME is not set */ - if (!cache_dir) { - cc_log("Unable to determine home directory\n"); - cc_log("ccache is disabled\n"); - failed(); - } - - /* we might be disabled */ - if (getenv("CCACHE_DISABLE")) { - cc_log("ccache is disabled\n"); - failed(); - } - - if (getenv("CCACHE_STRIPC")) { - strip_c_option = 1; - } - - if (getenv("CCACHE_UNIFY")) { - enable_unify = 1; - } - - detect_swig(); - - /* process argument list, returning a new set of arguments for pre-processing */ - process_args(orig_args->argc, orig_args->argv); - - /* run with -E to find the hash */ - find_hash(stripped_args); - - /* if we can return from cache at this point then do */ - from_cache(1); - - if (getenv("CCACHE_READONLY")) { - cc_log("read-only set - doing real compile\n"); - failed(); - } - - /* run real compiler, sending output to cache */ - to_cache(stripped_args); - - /* return from cache */ - from_cache(0); - - /* oh oh! */ - cc_log("secondary from_cache failed!\n"); - stats_update(STATS_ERROR); - failed(); -} - - -static void usage(void) -{ - printf("%s, a compiler cache including support for SWIG. Version %s\n", MYNAME, CCACHE_VERSION); - printf("Copyright Andrew Tridgell, 2002\n\n"); - - printf("Usage:\n"); - printf("\t" MYNAME " [options]\n"); - printf("\t" MYNAME " compiler [compile options]\n"); - printf("\tcompiler [compile options] (via symbolic link)\n"); - printf("\nOptions:\n"); - - printf("-s show statistics summary\n"); - printf("-z zero statistics\n"); - printf("-c run a cache cleanup\n"); - printf("-C clear the cache completely\n"); - printf("-F set maximum files in cache\n"); - printf("-M set maximum size of cache (use G, M or K)\n"); - printf("-h this help page\n"); - printf("-V print version number\n"); -} - -static void check_cache_dir(void) -{ - if (!cache_dir) { - fatal("Unable to determine home directory"); - } -} - -/* the main program when not doing a compile */ -static int ccache_main(int argc, char *argv[]) -{ - int c; - size_t v; - - while ((c = getopt(argc, argv, "hszcCF:M:V")) != -1) { - switch (c) { - case 'V': - printf("%s version %s\n", MYNAME, CCACHE_VERSION); - printf("Copyright Andrew Tridgell 2002\n"); - printf("Released under the GNU GPL v2 or later\n"); - exit(0); - - case 'h': - usage(); - exit(0); - - case 's': - check_cache_dir(); - stats_summary(); - break; - - case 'c': - check_cache_dir(); - cleanup_all(cache_dir); - printf("Cleaned cache\n"); - break; - - case 'C': - check_cache_dir(); - wipe_all(cache_dir); - printf("Cleared cache\n"); - break; - - case 'z': - check_cache_dir(); - stats_zero(); - printf("Statistics cleared\n"); - break; - - case 'F': - check_cache_dir(); - v = atoi(optarg); - if (stats_set_limits(v, -1) == 0) { - printf("Set cache file limit to %u\n", (unsigned)v); - } else { - printf("Could not set cache file limit.\n"); - exit(1); - } - break; - - case 'M': - check_cache_dir(); - v = value_units(optarg); - if (stats_set_limits(-1, v) == 0) { - printf("Set cache size limit to %uk\n", (unsigned)v); - } else { - printf("Could not set cache size limit.\n"); - exit(1); - } - break; - - default: - usage(); - exit(1); - } - } - - return 0; -} - - -/* Make a copy of stderr that will not be cached, so things like - distcc can send networking errors to it. */ -static void setup_uncached_err(void) -{ - char *buf; - int uncached_fd; - - uncached_fd = dup(2); - if (uncached_fd == -1) { - cc_log("dup(2) failed\n"); - stats_update(STATS_ERROR); - failed(); - } - - /* leak a pointer to the environment */ - x_asprintf(&buf, "UNCACHED_ERR_FD=%d", uncached_fd); - - if (putenv(buf) == -1) { - cc_log("putenv failed\n"); - stats_update(STATS_ERROR); - failed(); - } -} - - -int main(int argc, char *argv[]) -{ - char *p; - - cache_dir = getenv("CCACHE_DIR"); - if (!cache_dir) { - const char *home_directory = get_home_directory(); - if (home_directory) { - x_asprintf(&cache_dir, "%s/.ccache", home_directory); - } - } - - cache_logfile = getenv("CCACHE_LOGFILE"); - - if (getenv("CCACHE_VERBOSE")) { - ccache_verbose = 1; - } - - setup_uncached_err(); - - - /* the user might have set CCACHE_UMASK */ - p = getenv("CCACHE_UMASK"); - if (p) { - mode_t mask; - errno = 0; - mask = strtol(p, NULL, 8); - if (errno == 0) { - umask(mask); - } - } - - - /* check if we are being invoked as "ccache" */ - if (strlen(argv[0]) >= strlen(MYNAME) && - strcmp(argv[0] + strlen(argv[0]) - strlen(MYNAME), MYNAME) == 0) { - if (argc < 2) { - usage(); - exit(1); - } - /* if the first argument isn't an option, then assume we are - being passed a compiler name and options */ - if (argv[1][0] == '-') { - return ccache_main(argc, argv); - } - } - - /* make sure the cache dir exists */ - if (cache_dir && (create_dir(cache_dir) != 0)) { - fprintf(stderr,"ccache: failed to create %s (%s)\n", - cache_dir, strerror(errno)); - exit(1); - } - - temp_dir = getenv("CCACHE_TEMPDIR"); - if (!temp_dir) { - x_asprintf(&temp_dir, "%s/temp", cache_dir); - /* make sure temp dir exists if not supplied by user */ - if (temp_dir && create_dir(temp_dir) != 0) { - fprintf(stderr,"ccache: failed to create %s (%s)\n", - temp_dir, strerror(errno)); - exit(1); - } - } - - if (!getenv("CCACHE_READONLY")) { - if (create_cachedirtag(cache_dir) != 0) { - fprintf(stderr,"ccache: failed to create %s/CACHEDIR.TAG (%s)\n", - cache_dir, strerror(errno)); - exit(1); - } - } - - ccache(argc, argv); - return 1; -} diff --git a/CCache/ccache.h b/CCache/ccache.h deleted file mode 100644 index 668ce8288..000000000 --- a/CCache/ccache.h +++ /dev/null @@ -1,205 +0,0 @@ -#include "ccache_swig_config.h" - -#define CCACHE_VERSION SWIG_VERSION - -#ifndef _WIN32 -#include "config.h" -#else -#include -#define PACKAGE_NAME "ccache-swig.exe" -#endif - -#include -#include -#include -#include -#include -#include - -#ifndef _WIN32 - #include - #include -#else -#define _WIN32_WINNT 0x0500 - #include - #include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_PWD_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif - -#ifdef ENABLE_ZLIB -#include -#endif - -#define STATUS_NOTFOUND 3 -#define STATUS_FATAL 4 -#define STATUS_NOCACHE 5 - -#define MYNAME PACKAGE_NAME - -#define LIMIT_MULTIPLE 0.8 - -/* default maximum cache size */ -#ifndef DEFAULT_MAXSIZE -#define DEFAULT_MAXSIZE (1000*1000) -#endif - -/* file copy mode */ -#ifdef ENABLE_ZLIB -#define COPY_UNCOMPRESSED 0 -#define COPY_FROM_CACHE 1 -#define COPY_TO_CACHE 2 -#endif - -enum stats { - STATS_NONE=0, - STATS_STDOUT, - STATS_STATUS, - STATS_ERROR, - STATS_TOCACHE, - STATS_PREPROCESSOR, - STATS_COMPILER, - STATS_MISSING, - STATS_CACHED, - STATS_ARGS, - STATS_LINK, - STATS_NUMFILES, - STATS_TOTALSIZE, - STATS_MAXFILES, - STATS_MAXSIZE, - STATS_NOTC, - STATS_DEVICE, - STATS_NOINPUT, - STATS_ENVIRONMMENT, - STATS_MULTIPLE, - STATS_CONFTEST, - STATS_UNSUPPORTED, - STATS_OUTSTDOUT, - - STATS_END -}; - -typedef unsigned uint32; - -#include "mdfour.h" - -void hash_start(void); -void hash_string(const char *s); -void hash_int(int x); -void hash_file(const char *fname); -char *hash_result(void); -void hash_buffer(const char *s, int len); - -void cc_log(const char *format, ...); -void fatal(const char *msg); - -void copy_fd(int fd_in, int fd_out); -int safe_rename(const char* oldpath, const char* newpath); -int move_file(const char *src, const char *dest); -int test_if_compressed(const char *filename); - -int commit_to_cache(const char *src, const char *dest, int hardlink); -int retrieve_from_cache(const char *src, const char *dest, int hardlink); - -int create_dir(const char *dir); -int create_cachedirtag(const char *dir); -void x_asprintf(char **ptr, const char *format, ...); -char *x_strdup(const char *s); -void *x_realloc(void *ptr, size_t size); -void *x_malloc(size_t size); -void traverse(const char *dir, void (*fn)(const char *, struct stat *)); -char *str_basename(const char *s); -char *dirname(char *s); -int lock_fd(int fd); -size_t file_size(struct stat *st); -int safe_open(const char *fname); -char *x_realpath(const char *path); -char *gnu_getcwd(void); -int create_empty_file(const char *fname); -const char *get_home_directory(void); -int x_utimes(const char *filename); -#ifdef _WIN32 -void perror_win32(LPTSTR pszFunction); -#endif - -void stats_update(enum stats stat); -void stats_zero(void); -void stats_summary(void); -void stats_tocache(size_t size, size_t numfiles); -void stats_read(const char *stats_file, unsigned counters[STATS_END]); -int stats_set_limits(long maxfiles, long maxsize); -size_t value_units(const char *s); -void display_size(unsigned v); -void stats_set_sizes(const char *dir, size_t num_files, size_t total_size); - -int unify_hash(const char *fname); - -#ifndef HAVE_VASPRINTF -int vasprintf(char **, const char *, va_list ); -#endif -#ifndef HAVE_ASPRINTF -int asprintf(char **ptr, const char *format, ...); -#endif - -#ifndef HAVE_SNPRINTF -int snprintf(char *,size_t ,const char *, ...); -#endif - -void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize); -void cleanup_all(const char *dir); -void wipe_all(const char *dir); - -#ifdef _WIN32 -char *argvtos(char **argv); -#endif -int execute(char **argv, - const char *path_stdout, - const char *path_stderr); -char *find_executable(const char *name, const char *exclude_name); -void display_execute_args(char **argv); - -typedef struct { - char **argv; - int argc; -} ARGS; - - -ARGS *args_init(int , char **); -void args_add(ARGS *args, const char *s); -void args_add_prefix(ARGS *args, const char *s); -void args_pop(ARGS *args, int n); -void args_strip(ARGS *args, const char *prefix); -void args_remove_first(ARGS *args); - -extern int ccache_verbose; - -#if HAVE_COMPAR_FN_T -#define COMPAR_FN_T __compar_fn_t -#else -typedef int (*COMPAR_FN_T)(const void *, const void *); -#endif - -/* work with silly DOS binary open */ -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* mkstemp() on some versions of cygwin don't handle binary files, so - override */ -#ifdef __CYGWIN__ -#undef HAVE_MKSTEMP -#endif diff --git a/CCache/ccache.yo b/CCache/ccache.yo deleted file mode 100644 index 2477662dc..000000000 --- a/CCache/ccache.yo +++ /dev/null @@ -1,422 +0,0 @@ -whenman( -COMMENT(html output not great if included when using html2doc) -manpage(ccache-swig)(1)()()() -) - -whenhtml(htmlcommand( - - - - -ccache-swig(1) manpage - - - - -

        Using SWIG with ccache - ccache-swig(1) manpage

        - -
        - - -)) - - -manpagename(ccache-swig)(a fast compiler cache) - -whenhtml(htmlcommand( -ccache-swig - a fast compiler cache -)) - -manpagesynopsis() - -ccache-swig [OPTION] - -ccache-swig [COMPILER OPTIONS] - - [COMPILER OPTIONS] - -manpagedescription() - -ccache-swig is a compiler cache. It speeds up re-compilation of C/C++/SWIG code -by caching previous compiles and detecting when the same compile is -being done again. ccache-swig is ccache plus support for SWIG. ccache -and ccache-swig are used interchangeably in this document. - -manpagesection(OPTIONS SUMMARY) - -Here is a summary of the options to ccache-swig. - -verb( --s show statistics summary --z zero statistics --c run a cache cleanup --C clear the cache completely --F set maximum files in cache --M set maximum size of cache (use G, M or K) --h this help page --V print version number -) - -manpageoptions() - -These options only apply when you invoke ccache as "ccache-swig". When -invoked as a compiler none of these options apply. In that case your -normal compiler options apply and you should refer to your compilers -documentation. - -startdit() -dit(bf(-h)) Print a options summary page - -dit(bf(-s)) Print the current statistics summary for the cache. The -statistics are stored spread across the subdirectories of the -cache. Using "ccache-swig -s" adds up the statistics across all -subdirectories and prints the totals. - -dit(bf(-z)) Zero the cache statistics. - -dit(bf(-V)) Print the ccache version number - -dit(bf(-c)) Clean the cache and re-calculate the cache file count and -size totals. Normally the -c option should not be necessary as ccache -keeps the cache below the specified limits at runtime and keeps -statistics up to date on each compile. This option is mostly useful -if you manually modify the cache contents or believe that the cache -size statistics may be inaccurate. - -dit(bf(-C)) Clear the entire cache, removing all cached files. - -dit(bf(-F )) This sets the maximum number of files allowed in -the cache. The value is stored inside the cache directory and applies -to all future compiles. Due to the way the value is stored the actual -value used is always rounded down to the nearest multiple of 16. - -dit(bf(-M )) This sets the maximum cache size. You can specify -a value in gigabytes, megabytes or kilobytes by appending a G, M or K -to the value. The default is gigabytes. The actual value stored is -rounded down to the nearest multiple of 16 kilobytes. - -enddit() - -manpagesection(INSTALLATION) - -There are two ways to use ccache. You can either prefix your compile -commands with "ccache-swig" or you can create a symbolic link between -ccache-swig and the names of your compilers. The first method is most -convenient if you just want to try out ccache or wish to use it for -some specific projects. The second method is most useful for when you -wish to use ccache for all your compiles. - -To install for usage by the first method just copy ccache-swig to somewhere -in your path. - -To install for the second method do something like this: -verb( - cp ccache-swig /usr/local/bin/ - ln -s /usr/local/bin/ccache-swig /usr/local/bin/gcc - ln -s /usr/local/bin/ccache-swig /usr/local/bin/g++ - ln -s /usr/local/bin/ccache-swig /usr/local/bin/cc - ln -s /usr/local/bin/ccache-swig /usr/local/bin/swig -) -This will work as long as /usr/local/bin comes before the path to gcc -(which is usually in /usr/bin). After installing you may wish to run -"which gcc" to make sure that the correct link is being used. - -Note! Do not use a hard link, use a symbolic link. A hardlink will -cause "interesting" problems. - -manpagesection(EXTRA OPTIONS) - -When run as a compiler front end ccache usually just takes the same -command line options as the compiler you are using. The only exception -to this is the option '--ccache-skip'. That option can be used to tell -ccache that the next option is definitely not a input filename, and -should be passed along to the compiler as-is. - -The reason this can be important is that ccache does need to parse the -command line and determine what is an input filename and what is a -compiler option, as it needs the input filename to determine the name -of the resulting object file (among other things). The heuristic -ccache uses in this parse is that any string on the command line that -exists as a file is treated as an input file name (usually a C -file). By using --ccache-skip you can force an option to not be -treated as an input file name and instead be passed along to the -compiler as a command line option. - -manpagesection(ENVIRONMENT VARIABLES) - -ccache uses a number of environment variables to control operation. In -most cases you won't need any of these as the defaults will be fine. - -startdit() - -dit(bf(CCACHE_DIR)) the CCACHE_DIR environment variable specifies -where ccache will keep its cached compiler output. The default is -"$HOME/.ccache". - -dit(bf(CCACHE_TEMPDIR)) the CCACHE_TEMPDIR environment variable specifies -where ccache will put temporary files. The default is the same as -CCACHE_DIR. Note that the CCACHE_TEMPDIR path must be on the same -filesystem as the CCACHE_DIR path, so that renames of files between -the two directories can work. - -dit(bf(CCACHE_LOGFILE)) If you set the CCACHE_LOGFILE environment -variable then ccache will write some log information on cache hits -and misses in that file. This is useful for tracking down problems. - -dit(bf(CCACHE_VERBOSE)) If you set the CCACHE_VERBOSE environment -variable then ccache will display on stdout all the compiler invocations -that it makes. This can useful for debugging unexpected problems. - -dit(bf(CCACHE_PATH)) You can optionally set CCACHE_PATH to a colon -separated path where ccache will look for the real compilers. If you -don't do this then ccache will look for the first executable matching -the compiler name in the normal PATH that isn't a symbolic link to -ccache itself. - -dit(bf(CCACHE_CC)) You can optionally set CCACHE_CC to force the name -of the compiler to use. If you don't do this then ccache works it out -from the command line. - -dit(bf(CCACHE_PREFIX)) This option adds a prefix to the command line -that ccache runs when invoking the compiler. Also see the section -below on using ccache with distcc. - -dit(bf(CCACHE_DISABLE)) If you set the environment variable -CCACHE_DISABLE then ccache will just call the real compiler, -bypassing the cache completely. - -dit(bf(CCACHE_READONLY)) the CCACHE_READONLY environment variable -tells ccache to attempt to use existing cached object files, but not -to try to add anything new to the cache. If you are using this because -your CCACHE_DIR is read-only, then you may find that you also need to -set CCACHE_TEMPDIR as otherwise ccache will fail to create the -temporary files. - -dit(bf(CCACHE_CPP2)) If you set the environment variable CCACHE_CPP2 -then ccache will not use the optimisation of avoiding the 2nd call to -the pre-processor by compiling the pre-processed output that was used -for finding the hash in the case of a cache miss. This is primarily a -debugging option, although it is possible that some unusual compilers -will have problems with the intermediate filename extensions used in -this optimisation, in which case this option could allow ccache to be -used. - -dit(bf(CCACHE_NOCOMPRESS)) If you set the environment variable -CCACHE_NOCOMPRESS then there is no compression used on files that go -into the cache. However, this setting has no effect on how files are -retrieved from the cache, compressed results will still be usable. - -dit(bf(CCACHE_NOSTATS)) If you set the environment variable -CCACHE_NOSTATS then ccache will not update the statistics files on -each compile. - -dit(bf(CCACHE_NLEVELS)) The environment variable CCACHE_NLEVELS allows -you to choose the number of levels of hash in the cache directory. The -default is 2. The minimum is 1 and the maximum is 8. - -dit(bf(CCACHE_HARDLINK)) If you set the environment variable -CCACHE_HARDLINK then ccache will attempt to use hard links from the -cache directory when creating the compiler output rather than using a -file copy. Using hard links is faster, but can confuse programs like -'make' that rely on modification times. Hard links are never made for -compressed cache files. - -dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached -results, even if it finds them. New results are still cached, but -existing cache entries are ignored. - -dit(bf(CCACHE_UMASK)) This sets the umask for ccache and all child -processes (such as the compiler). This is mostly useful when you wish -to share your cache with other users. Note that this also affects the -file permissions set on the object files created from your -compilations. - -dit(bf(CCACHE_HASHDIR)) This tells ccache to hash the current working -directory when calculating the hash that is used to distinguish two -compiles. This prevents a problem with the storage of the current -working directory in the debug info of a object file, which can lead -ccache to give a cached object file that has the working directory in -the debug info set incorrectly. This option is off by default as the -incorrect setting of this debug info rarely causes problems. If you -strike problems with gdb not using the correct directory then enable -this option. - -dit(bf(CCACHE_UNIFY)) If you set the environment variable CCACHE_UNIFY -then ccache will use the C/C++ unifier when hashing the pre-processor -output if -g is not used in the compile. The unifier is slower than a -normal hash, so setting this environment variable loses a little bit -of speed, but it means that ccache can take advantage of not -recompiling when the changes to the source code consist of -reformatting only. Note that using CCACHE_UNIFY changes the hash, so -cached compiles with CCACHE_UNIFY set cannot be used when -CCACHE_UNIFY is not set and vice versa. The reason the unifier is off -by default is that it can give incorrect line number information in -compiler warning messages. - -dit(bf(CCACHE_EXTENSION)) Normally ccache tries to automatically -determine the extension to use for intermediate C pre-processor files -based on the type of file being compiled. Unfortunately this sometimes -doesn't work, for example when using the aCC compiler on HP-UX. On -systems like this you can use the CCACHE_EXTENSION option to override -the default. On HP-UX set this environment variable to "i" if you use -the aCC compiler. - -dit(bf(CCACHE_STRIPC)) If you set the environment variable -CCACHE_STRIPC then ccache will strip the -c option when invoking -the preprocessor. This option is primarily for the Sun Workshop -C++ compiler as without this option an unwarranted warning is displayed: -CC: Warning: "-E" redefines product from "object" to "source (stdout)" -when -E and -c is used together. - -dit(bf(CCACHE_SWIG)) When using SWIG as the compiler and it does not -have 'swig' in the executable name, then the CCACHE_SWIG environment -variable needs to be set in order for ccache to work correctly with -SWIG. The use of CCACHE_CPP2 is also recommended for SWIG due to some -preprocessor quirks, however, use of CCACHE_CPP2 can often be skipped --- check your generated code with and without this option set. Known -problems are using preprocessor directives within %inline blocks and -the use of '#pragma SWIG'. - -enddit() - -manpagesection(CACHE SIZE MANAGEMENT) - -By default ccache has a one gigabyte limit on the cache size and no -maximum number of files. You can set a different limit using the -"ccache -M" and "ccache -F" options, which set the size and number of -files limits. - -When these limits are reached ccache will reduce the cache to 20% -below the numbers you specified in order to avoid doing the cache -clean operation too often. - -manpagesection(CACHE COMPRESSION) - -By default on most platforms ccache will compress all files it puts -into the cache -using the zlib compression. While this involves a negligible -performance slowdown, it significantly increases the number of files -that fit in the cache. You can turn off compression setting the -CCACHE_NOCOMPRESS environment variable. - -manpagesection(HOW IT WORKS) - -The basic idea is to detect when you are compiling exactly the same -code a 2nd time and use the previously compiled output. You detect -that it is the same code by forming a hash of: - -itemization( - it() the pre-processor output from running the compiler with -E - it() the command line options - it() the real compilers size and modification time - it() any stderr output generated by the compiler -) - -These are hashed using md4 (a strong hash) and a cache file is formed -based on that hash result. When the same compilation is done a second -time ccache is able to supply the correct compiler output (including -all warnings etc) from the cache. - -ccache has been carefully written to always produce exactly the same -compiler output that you would get without the cache. If you ever -discover a case where ccache changes the output of your compiler then -please let me know. - -manpagesection(USING CCACHE WITH DISTCC) - -distcc is a very useful program for distributing compilation across a -range of compiler servers. It is often useful to combine distcc with -ccache, so that compiles that are done are sped up by distcc, but that -ccache avoids the compile completely where possible. - -To use distcc with ccache I recommend using the CCACHE_PREFIX -option. You just need to set the environment variable CCACHE_PREFIX to -'distcc' and ccache will prefix the command line used with the -compiler with the command 'distcc'. - -manpagesection(SHARING A CACHE) - -A group of developers can increase the cache hit rate by sharing a -cache directory. The hard links however cause unwanted side effects, -as all links to a cached file share the file's modification timestamp. -This results in false dependencies to be triggered by timestamp-based -build systems whenever another user links to an existing -file. Typically, users will see that their libraries and binaries are -relinked without reason. To share a cache without side effects, the -following conditions need to be met: - -itemization( - it() Use the same bf(CCACHE_DIR) environment variable setting - it() Unset the bf(CCACHE_HARDLINK) environment variable - it() Make sure everyone sets the CCACHE_UMASK environment variable - to 002, this ensures that cached files are accessible to everyone in - the group. - it() Make sure that all users have write permission in the entire - cache directory (and that you trust all users of the shared cache). - it() Make sure that the setgid bit is set on all directories in the - cache. This tells the filesystem to inherit group ownership for new - directories. The command "chmod g+s `find $CCACHE_DIR -type d`" might - be useful for this. - it() Set bf(CCACHE_NOCOMPRESS) for all users, if there are users with - versions of ccache that do not support compression. -) - -manpagesection(HISTORY) - -ccache was inspired by the compilercache shell script script written -by Erik Thiele and I would like to thank him for an excellent piece of -work. See -url(http://www.erikyyy.de/compilercache/)(http://www.erikyyy.de/compilercache/) -for the Erik's scripts. -ccache-swig is a port of the original ccache with support added for use -with SWIG. - -I wrote ccache because I wanted to get a bit more speed out of a -compiler cache and I wanted to remove some of the limitations of the -shell-script version. - -manpagesection(DIFFERENCES FROM COMPILERCACHE) - -The biggest differences between Erik's compilercache script and ccache -are: -itemization( -it() ccache is written in C, which makes it a bit faster (calling out to - external programs is mostly what slowed down the scripts). -it() ccache can automatically find the real compiler -it() ccache keeps statistics on hits/misses -it() ccache can do automatic cache management -it() ccache can cache compiler output that includes warnings. In many - cases this gives ccache a much higher cache hit rate. -it() ccache can handle a much wider ranger of compiler options -it() ccache avoids a double call to cpp on a cache miss -) - -manpagesection(CREDITS) - -Thanks to the following people for their contributions to ccache -itemization( - it() Erik Thiele for the original compilercache script - it() Luciano Rocha for the idea of compiling the pre-processor output - to avoid a 2nd cpp pass - it() Paul Russell for many suggestions and the debian packaging -) - -manpageauthor() - -ccache was written by Andrew Tridgell -url(http://samba.org/~tridge/)(http://samba.org/~tridge/). -ccache was adapted to create ccache-swig for use with SWIG by William Fulton. - -If you wish to report a problem or make a suggestion then please email -the SWIG developers on the swig-devel mailing list, see -url(http://www.swig.org/mail.html)(http://www.swig.org/mail.html) - -ccache is released under the GNU General Public License version 2 or -later. Please see the file COPYING for license details. - -whenhtml(htmlcommand( - - - - -)) diff --git a/CCache/ccache_swig_config.h.in b/CCache/ccache_swig_config.h.in deleted file mode 100644 index bbb205f77..000000000 --- a/CCache/ccache_swig_config.h.in +++ /dev/null @@ -1 +0,0 @@ -#define SWIG_VERSION "@PACKAGE_VERSION@" diff --git a/CCache/cleanup.c b/CCache/cleanup.c deleted file mode 100644 index 99312283e..000000000 --- a/CCache/cleanup.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -/* - functions to cleanup the cache directory when it gets too large - */ - -#include "ccache.h" - -static struct files { - char *fname; - time_t mtime; - size_t size; -} **files; -static unsigned allocated; -static unsigned num_files; -static size_t total_size; -static size_t total_files; -static size_t size_threshold; -static size_t files_threshold; - -/* file comparison function to try to delete the oldest files first */ -static int files_compare(struct files **f1, struct files **f2) -{ - if ((*f2)->mtime == (*f1)->mtime) { - return strcmp((*f2)->fname, (*f1)->fname); - } - if ((*f2)->mtime > (*f1)->mtime) { - return -1; - } - return 1; -} - -/* this builds the list of files in the cache */ -static void traverse_fn(const char *fname, struct stat *st) -{ - char *p; - - if (!S_ISREG(st->st_mode)) return; - - p = str_basename(fname); - if (strcmp(p, "stats") == 0) { - free(p); - return; - } - free(p); - - if (num_files == allocated) { - allocated = 10000 + num_files*2; - files = (struct files **)x_realloc(files, - sizeof(struct files *)*allocated); - } - - files[num_files] = (struct files *)x_malloc(sizeof(struct files)); - files[num_files]->fname = x_strdup(fname); - files[num_files]->mtime = st->st_mtime; - files[num_files]->size = file_size(st) / 1024; - total_size += files[num_files]->size; - num_files++; -} - -/* sort the files we've found and delete the oldest ones until we are - below the thresholds */ -static void sort_and_clean(void) -{ - unsigned i; - - if (num_files > 1) { - /* sort in ascending data order */ - qsort(files, num_files, sizeof(struct files *), - (COMPAR_FN_T)files_compare); - } - - /* delete enough files to bring us below the threshold */ - for (i=0;ifname) != 0 && errno != ENOENT) { - fprintf(stderr, "unlink %s - %s\n", - files[i]->fname, strerror(errno)); - continue; - } - - total_size -= files[i]->size; - } - - total_files = num_files - i; -} - -/* cleanup in one cache subdir */ -void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize) -{ - unsigned i; - - size_threshold = maxsize * LIMIT_MULTIPLE; - files_threshold = maxfiles * LIMIT_MULTIPLE; - - num_files = 0; - total_size = 0; - - /* build a list of files */ - traverse(dir, traverse_fn); - - /* clean the cache */ - sort_and_clean(); - - stats_set_sizes(dir, total_files, total_size); - - /* free it up */ - for (i=0;ifname); - free(files[i]); - files[i] = NULL; - } - if (files) free(files); - allocated = 0; - files = NULL; - - num_files = 0; - total_size = 0; -} - -/* cleanup in all cache subdirs */ -void cleanup_all(const char *dir) -{ - unsigned counters[STATS_END]; - char *dname, *sfile; - int i; - - for (i=0;i<=0xF;i++) { - x_asprintf(&dname, "%s/%1x", dir, i); - x_asprintf(&sfile, "%s/%1x/stats", dir, i); - - memset(counters, 0, sizeof(counters)); - stats_read(sfile, counters); - - cleanup_dir(dname, - counters[STATS_MAXFILES], - counters[STATS_MAXSIZE]); - free(dname); - free(sfile); - } -} - - -/* traverse function for wiping files */ -static void wipe_fn(const char *fname, struct stat *st) -{ - char *p; - - if (!S_ISREG(st->st_mode)) return; - - p = str_basename(fname); - if (strcmp(p, "stats") == 0) { - free(p); - return; - } - free(p); - - unlink(fname); -} - - -/* wipe all cached files in all subdirs */ -void wipe_all(const char *dir) -{ - char *dname; - int i; - - for (i=0;i<=0xF;i++) { - x_asprintf(&dname, "%s/%1x", dir, i); - traverse(dir, wipe_fn); - free(dname); - } - - /* and fix the counters */ - cleanup_all(dir); -} diff --git a/CCache/configure.in b/CCache/configure.in deleted file mode 100644 index dfbf86dbc..000000000 --- a/CCache/configure.in +++ /dev/null @@ -1,87 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT([ccache-swig], [0.0]) # Get version from SWIG in ccache_swig_config.h.in -AC_PREREQ(2.52) -AC_CONFIG_SRCDIR([ccache.h]) - -AC_MSG_NOTICE([Configuring ccache]) - -AC_CONFIG_HEADER(config.h) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_INSTALL -AC_ARG_PROGRAM # for program_transform_name - -AC_DEFINE([_GNU_SOURCE], 1, - [Define _GNU_SOURCE so that we get all necessary prototypes]) - -# If GCC, turn on warnings. -if test "x$GCC" = "xyes" -then - CFLAGS="$CFLAGS -Wall -W" -else - CFLAGS="$CFLAGS -O" -fi - -AC_HEADER_DIRENT -AC_HEADER_TIME -AC_HEADER_SYS_WAIT - -AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h) - -AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp) -AC_CHECK_FUNCS(gethostname getpwuid) -AC_CHECK_FUNCS(utimes) - -AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ - AC_TRY_COMPILE( -[#include ], -[ -void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); } -], - ccache_cv_COMPAR_FN_T=yes,ccache_cv_COMPAR_FN_T=no)]) -if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then - AC_DEFINE(HAVE_COMPAR_FN_T, 1, [ ]) -fi - -dnl Note: This could be replaced by AC_FUNC_SNPRINTF() in the autoconf macro archive -AC_CACHE_CHECK([for C99 vsnprintf],ccache_cv_HAVE_C99_VSNPRINTF,[ -AC_TRY_RUN([ -#include -#include -void foo(const char *format, ...) { - va_list ap; - int len; - char buf[5]; - - va_start(ap, format); - len = vsnprintf(0, 0, format, ap); - va_end(ap); - if (len != 5) exit(1); - - if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1); - - exit(0); -} -main() { foo("hello"); } -], -ccache_cv_HAVE_C99_VSNPRINTF=yes,ccache_cv_HAVE_C99_VSNPRINTF=no,ccache_cv_HAVE_C99_VSNPRINTF=cross)]) -if test x"$ccache_cv_HAVE_C99_VSNPRINTF" = x"yes"; then - AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ]) -fi - -dnl Check for zlib. -dnl Note: This could be replaced by CHECK_ZLIB() in the autoconf macro archive -AC_ARG_ENABLE([zlib], - AS_HELP_STRING([--enable-zlib], [enable zlib support for ccache compression]),, - [enable_zlib=yes]) - -if test x"$enable_zlib" = x"yes"; then - AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzdopen, [LIBS="-lz $LIBS" - AC_DEFINE([ENABLE_ZLIB], 1, [Define to 1 if you would like to have zlib compression for ccache.]) ] )) -fi - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/CCache/debian/NEWS b/CCache/debian/NEWS deleted file mode 100644 index be245dc7d..000000000 --- a/CCache/debian/NEWS +++ /dev/null @@ -1,22 +0,0 @@ -ccache (2.4-8) unstable; urgency=high - - zlib compression is now enabled by default in order to increase the amount - of object files that can fit in the cache. - - The impact on performance is supposed to be almost negligible - (see http://www.gustaebel.de/lars/ccache/). If you do want to disable - it however, simply export the CCACHE_NOCOMPRESS environment variable. - - Note that a zlib-enabled ccache will still read your existing - uncompressed cache. If you want to compress/uncompress your cache, - see the manage-cache.sh script under /usr/share/doc/ccache/examples/. - - -- Francois Marier Sun, 20 May 2007 19:45:07 +1200 - -ccache (2.4-1) unstable; urgency=low - - * This release changes the hash input slighly, so you will probably find - that you will not get any hits against your existing cache when you - upgrade. - - -- Francois Marier Sat, 11 Jun 2005 13:54:33 -0400 diff --git a/CCache/debian/README.Debian b/CCache/debian/README.Debian deleted file mode 100644 index 5478bb720..000000000 --- a/CCache/debian/README.Debian +++ /dev/null @@ -1,59 +0,0 @@ -Installing ccache ------------------ - -The recommended way to use this with Debian is to either create "cc" -and "gcc" symlinks to /usr/bin/ccache in your private bin directory -(which must be before the real cc and gcc in your path), or use -CC="ccache gcc" on the make command line. - -Another option is to just prepend /usr/lib/ccache in your PATH -environment variable, like - - export PATH="/usr/lib/ccache:$PATH" - -Note that ccache works with both native and cross compilers. - -Ignoring whitespace -------------------- - -If you wish to set up ccache so that it ignores blank lines, have a -look at the CCACHE_UNIFY option. However, please note that this -option is off by default since the reported line numbers may not -match the source files anymore. - - -NFS Issues ----------- - -(from John Coiner on the ccache mailing list) - -When CCache creates a hardlinked output file, it calls utime() to update -the timestamp on the object, so that Make realizes that the object has -changed. - -On NFS, utime() has no coherency guarantee, AFAIK. When utime() runs on -host A, and our parallel implementation of Make is running on host B, -sometimes Make doesn't see the new timestamp soon enough -- and neglects -to relink the final binary. That's a one-way ticket to Silent Mysterious -Failure Town. - -Instead of relying on the object file timestamp, we create a dummy file -with a reliable timestamp: - -objs/foo.o objs/foo.o.built : - if ( ccache gcc -o foo.o -c foo.c ) ; \ - then touch objs/foo.o.built ; \ - else exit 1; \ - fi - -binary : objs/foo.o.built - gcc -o binary objs/foo.o - -NFS does make a coherency guarantee, that if a file is written and -close()d on host A, and subsequently open()ed on host B, that the second -open() will reflect all modifications and attributes from the close(). -Since Make does open() when checking timestamps, and the dummy file is -close()d when it's created, the binary will always relink after the -object is recompiled. - - -- Francois Marier Sun, 20 May 2007 17:35:36 +1200 diff --git a/CCache/debian/changelog b/CCache/debian/changelog deleted file mode 100644 index 45500d4bd..000000000 --- a/CCache/debian/changelog +++ /dev/null @@ -1,221 +0,0 @@ -ccache (2.4-15) unstable; urgency=low - - * Add a new patch which improve the consistency of timestamps on cached - objects to make sure clean-up is based on least recently used objects. - * Patch the set_limit call so that non-writable cache directories return - an error when attempting to size the max(files|size) (closes: #332527) - - -- Francois Marier Sun, 13 Apr 2008 15:07:05 +1200 - -ccache (2.4-14) unstable; urgency=low - - * Mention the long options everywhere in the manpage - * Merge Gentoo patches: - - respect user's LDFLAGS - - use utimes() for timestamp if possible - - -- Francois Marier Sun, 23 Mar 2008 16:30:11 +1300 - -ccache (2.4-13) unstable; urgency=low - - * Update CACHEDIR.TAG patch to avoid creating the tag file when the - CCACHE_READONLY environment variable is set. (closes: #464356) - * Mention the GNU-style long options in the manpage - - -- Francois Marier Thu, 07 Feb 2008 10:50:42 +1300 - -ccache (2.4-12) unstable; urgency=low - - * Add symlink for gcc 4.3 (closes: #463590) - * Add support for the CACHEDIR.TAG spec, thanks to Karl Chen. - (see http://www.brynosaurus.com/cachedir/) - * Fix hyphens in manpage (lintian notice) - * Bump Standards-Version up to 3.7.3 (no changes) - * Bump debhelper compatibility to 6 - - -- Francois Marier Sat, 02 Feb 2008 10:37:22 +1300 - -ccache (2.4-11) unstable; urgency=low - - * Add the collab-maint repo to debian/control - - -- Francois Marier Tue, 20 Nov 2007 15:26:37 +1300 - -ccache (2.4-10) unstable; urgency=low - - * Document where the patches are from in debian/patches/CREDITS - * debian/rules: - - Fixed "make distclean" lintian warning - - Removed commented-out entries - * Set debhelper compatibility to 5 - * Add homepage field in debian/control - * Add symlinks for MinGW (closes: #445782) - * Bump the version to 5 in the debhelper dependency - - -- Francois Marier Fri, 19 Oct 2007 16:04:37 +1300 - -ccache (2.4-9) unstable; urgency=low - - * Add a symlink for gcc 4.2 (closes: #431007) - * Fix dependencies when using -o (closes: #217713) - - -- Francois Marier Sat, 30 Jun 2007 17:58:44 +1200 - -ccache (2.4-8) unstable; urgency=low - - * Enable zlib compression of the cache by default (closes: #409848). - Thanks to Sami Liedes for suggesting this. - * Disable ccache when profiling (closes: #215849). - Thanks to Ted Percival for the Patch. - * Fix NFS renaming issues and add instructions to the README. - Thanks to John Coiner and instructions. - * Put all patches in debian/patches and apply them at build time. - - -- Francois Marier Sun, 20 May 2007 19:42:34 +1200 - -ccache (2.4-7) unstable; urgency=low - - * Use the real compiler when HOME is not set (closes: #396350) - * Include user script under doc/examples (closes: #392435) - Thanks to Behan Webster! - * Add support for GNU --long options (closes: #297126) - - -- Francois Marier Sat, 18 Nov 2006 00:50:59 -0500 - -ccache (2.4-6) unstable; urgency=low - - * Include symlinks for gcc 4.1 (closes: #372838) - * Update watch file - - -- Francois Marier Tue, 13 Jun 2006 22:17:37 -0400 - -ccache (2.4-5) unstable; urgency=low - - * Document the fact that cross-compiling is supported (closes: #349221) - * Bump Standards-Version up to 3.7.2 (no changes) - - -- Francois Marier Sun, 4 Jun 2006 01:20:07 -0400 - -ccache (2.4-4) unstable; urgency=low - - * Mention another way to use ccache in README.Debian (thanks to Benjamin - Drieu for the suggestion) (closes: #267632) - * Update FSF address - * Fix watch file - - -- Francois Marier Sat, 26 Nov 2005 00:15:13 -0500 - -ccache (2.4-3) unstable; urgency=low - - * Actually use the configuration flags in debian/rules - * Bump Standards-Version up to 3.6.2 (no changes) - - -- Francois Marier Sun, 26 Jun 2005 13:33:19 -0400 - -ccache (2.4-2) unstable; urgency=low - - * Add gcc and g++ symlinks to /usr/lib/ccache (closes: #313490) - * Remove invalid entry from Depends - - -- Francois Marier Wed, 15 Jun 2005 20:51:03 -0400 - -ccache (2.4-1) unstable; urgency=low - - * New maintainer (closes: #312867) - * New upstream version: (closes: #273753, #239640) - - New CCACHE_READONLY and CCACHE_TEMPDIR options - - Fixed handling of hard-linked compilers on AIX - - Fixed handling of HOME environment variable (closes: #299880) - - Show cache directory in stats output - * Fix copyright file - * Add 'distcc' to Suggests (closes: #269158) - * Add a note about whitespace in README.Debian (closes: #229116) - * Update rules to add symmlinks for gcc 3.4 & 4.0 (closes: #261177) - * Acknowledge NMUs (closes: #200185, #177129, #174417) - - -- Francois Marier Sun, 12 Jun 2005 12:05:34 -0400 - -ccache (2.3-1.1) unstable; urgency=low - - * Non-maintainer upload during BSP - * Re-apply patch for - #200185 ccache: Incorrect symlinks in /usr/lib/ccache - (Closes: #200185) - - -- Frank Lichtenheld Fri, 19 Mar 2004 11:14:50 +0100 - -ccache (2.3-1) unstable; urgency=low - - * New upstream release: obsoletes existing caches. - * Tweak package description in arbitrary way (closes: #181721) - - -- Paul Russell Mon, 29 Sep 2003 02:53:20 +0200 - -ccache (2.2-2) unstable; urgency=low - - * Insert more symlinks in ccache dir (closes: #197468) - - -- Paul Russell Mon, 16 Jun 2003 10:52:50 +0100 - -ccache (2.2-1) unstable; urgency=low - - * New upstream release (closes: #150755) - * Insert more symlinks in ccache dir (closes: #144462) - - -- Paul Russell Mon, 17 Feb 2003 07:19:36 +0100 - -ccache (2.1.1-2) unstable; urgency=low - - * Restored /usr/lib/ccache symlinks (closes: #179393) - * Fixed manpage typo (closes: #179564) - * With thanks to Andreas Rottmann. - - -- Paul Russell Wed, 5 Feb 2003 10:01:10 +0100 - -ccache (2.1.1-1) unstable; urgency=low - - * NMU (with maintainer consent). - * New upstream release (closes: #174417, #177129). - * debian/control: - + Build-Depend on and use dephelper 4 (DH_COMPAT = 4). - + Bumped Standards-Version to 3.5.8. - + No full stop on short package description (fixes linda warning). - * debian/copright: - + Make lintian feel comfortable; fixes warnings: - - copyright-should-refer-to-common-license-file-for-gpl - - copyright-lists-upstream-authors-with-dh_make-boilerplate - * Built with g++ 3.2 :-). - - -- Andreas Rottmann Thu, 16 Jan 2003 11:42:38 +0100 - -ccache (1.9-1) unstable; urgency=low - - * New upstream release (closes: #144920) - - -- Paul Russell Mon, 13 May 2002 10:01:09 +0200 - -ccache (1.8-1) unstable; urgency=low - - * New upstream release (closes: #145401) - - -- Paul Russell Fri, 3 May 2002 02:26:32 +0200 - -ccache (1.7-1) unstable; urgency=low - - * New upstream release - * Install symlinks in /usr/lib/ccache (closes: #141337) - - -- Paul Russell Wed, 10 Apr 2002 17:51:21 +0200 - -ccache (1.4-1) unstable; urgency=low - - * New upstream release - - -- Paul Russell Wed, 3 Apr 2002 03:41:46 +0200 - -ccache (1.2-1) unstable; urgency=low - - * Initial Release. - - -- Paul Russell Sun, 31 Mar 2002 14:08:57 +0200 - diff --git a/CCache/debian/compat b/CCache/debian/compat deleted file mode 100644 index 1e8b31496..000000000 --- a/CCache/debian/compat +++ /dev/null @@ -1 +0,0 @@ -6 diff --git a/CCache/debian/control b/CCache/debian/control deleted file mode 100644 index 0b7e57282..000000000 --- a/CCache/debian/control +++ /dev/null @@ -1,20 +0,0 @@ -Source: ccache -Section: devel -Priority: optional -Maintainer: Francois Marier -Build-Depends: debhelper (>> 6), autotools-dev, zlib1g-dev -Standards-Version: 3.7.3 -Homepage: http://ccache.samba.org -Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/ccache/ -Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/ccache/ - -Package: ccache -Architecture: any -Depends: ${shlibs:Depends} -Suggests: distcc -Description: Compiler results cacher, for fast recompiles - ccache is a compiler cache. It speeds up re-compilation of C/C++ code - by caching previous compiles and detecting when the same compile is - being done again. - . - This is similar to, but faster than, the compilercache package. diff --git a/CCache/debian/copyright b/CCache/debian/copyright deleted file mode 100644 index 7ac791dc5..000000000 --- a/CCache/debian/copyright +++ /dev/null @@ -1,29 +0,0 @@ -This package was debianized by Paul Russell on -Sun, 31 Mar 2002 14:08:57 +0200. - -It was downloaded from http://ccache.samba.org/ftp/ccache/ - -The ccache-zlib patch was downloaded from http://www.gustaebel.de/lars/ccache/ - -Upstream Author: Andrew Tridgell - -Copyright: 2002-2005 Andrew Tridgell - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA - -You are free to distribute this software under the terms of the GNU General -Public License. On Debian systems, the complete text of the GNU General -Public License can be found in /usr/share/common-licenses/GPL file. diff --git a/CCache/debian/dirs b/CCache/debian/dirs deleted file mode 100644 index 8ceb4c4e8..000000000 --- a/CCache/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib/ccache -usr/share/man/man1 diff --git a/CCache/debian/docs b/CCache/debian/docs deleted file mode 100644 index e845566c0..000000000 --- a/CCache/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/CCache/debian/examples b/CCache/debian/examples deleted file mode 100644 index fc549228c..000000000 --- a/CCache/debian/examples +++ /dev/null @@ -1,2 +0,0 @@ -debian/update-ccache -manage-cache.sh diff --git a/CCache/debian/patches/01_no_home.diff b/CCache/debian/patches/01_no_home.diff deleted file mode 100644 index 019634c0c..000000000 --- a/CCache/debian/patches/01_no_home.diff +++ /dev/null @@ -1,100 +0,0 @@ ---- ccache.c -+++ ccache.c -@@ -836,6 +836,13 @@ - { - /* find the real compiler */ - find_compiler(argc, argv); -+ -+ /* use the real compiler if HOME is not set */ -+ if (!cache_dir) { -+ cc_log("Unable to determine home directory\n"); -+ cc_log("ccache is disabled\n"); -+ failed(); -+ } - - /* we might be disabled */ - if (getenv("CCACHE_DISABLE")) { -@@ -895,6 +902,13 @@ - printf("-V print version number\n"); - } - -+static void check_cache_dir(void) -+{ -+ if (!cache_dir) { -+ fatal("Unable to determine home directory"); -+ } -+} -+ - /* the main program when not doing a compile */ - static int ccache_main(int argc, char *argv[]) - { -@@ -914,31 +928,37 @@ - exit(0); - - case 's': -+ check_cache_dir(); - stats_summary(); - break; - - case 'c': -+ check_cache_dir(); - cleanup_all(cache_dir); - printf("Cleaned cache\n"); - break; - - case 'C': -+ check_cache_dir(); - wipe_all(cache_dir); - printf("Cleared cache\n"); - break; - - case 'z': -+ check_cache_dir(); - stats_zero(); - printf("Statistics cleared\n"); - break; - - case 'F': -+ check_cache_dir(); - v = atoi(optarg); - stats_set_limits(v, -1); - printf("Set cache file limit to %u\n", (unsigned)v); - break; - - case 'M': -+ check_cache_dir(); - v = value_units(optarg); - stats_set_limits(-1, v); - printf("Set cache size limit to %uk\n", (unsigned)v); -@@ -983,7 +1003,10 @@ - - cache_dir = getenv("CCACHE_DIR"); - if (!cache_dir) { -- x_asprintf(&cache_dir, "%s/.ccache", get_home_directory()); -+ const char *home_directory = get_home_directory(); -+ if (home_directory) { -+ x_asprintf(&cache_dir, "%s/.ccache", home_directory); -+ } - } - - temp_dir = getenv("CCACHE_TEMPDIR"); -@@ -1023,7 +1046,7 @@ - } - - /* make sure the cache dir exists */ -- if (create_dir(cache_dir) != 0) { -+ if (cache_dir && (create_dir(cache_dir) != 0)) { - fprintf(stderr,"ccache: failed to create %s (%s)\n", - cache_dir, strerror(errno)); - exit(1); ---- util.c -+++ util.c -@@ -448,7 +448,7 @@ - } - } - #endif -- fatal("Unable to determine home directory"); -+ cc_log("Unable to determine home directory"); - return NULL; - } - diff --git a/CCache/debian/patches/02_ccache-compressed.diff b/CCache/debian/patches/02_ccache-compressed.diff deleted file mode 100644 index 5740c2ca4..000000000 --- a/CCache/debian/patches/02_ccache-compressed.diff +++ /dev/null @@ -1,1026 +0,0 @@ -Index: ccache.1 -=================================================================== -RCS file: /home/cvsroot/lars/ccache/ccache.1,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.6 -diff -u -r1.1.1.1.2.1 -r1.6 ---- ccache.1 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ ccache.1 21 Nov 2004 18:19:28 -0000 1.6 -@@ -210,7 +210,8 @@ - CCACHE_HARDLINK then ccache will attempt to use hard links from the - cache directory when creating the compiler output rather than using a - file copy\&. Using hard links is faster, but can confuse programs like --\&'make\&' that rely on modification times\&. -+\&'make\&' that rely on modification times\&. Hard links are never made for -+compressed cache files\&. - .IP - .IP "\fBCCACHE_RECACHE\fP" - This forces ccache to not use any cached -@@ -257,6 +258,11 @@ - the default\&. On HP-UX set this environment variable to "i" if you use - the aCC compiler\&. - .IP -+.IP "\fBCCACHE_NOCOMPRESS\fP" -+If you set the environment variable -+CCACHE_NOCOMPRESS then there is no compression used on files that go -+into the cache\&. -+.IP - .PP - .SH "CACHE SIZE MANAGEMENT" - .PP -@@ -269,6 +275,14 @@ - below the numbers you specified in order to avoid doing the cache - clean operation too often\&. - .PP -+.SH "CACHE COMPRESSION" -+.PP -+By default ccache will compress all files it puts into the cache -+using the zlib compression\&. While this involves a negligible -+performance slowdown, it significantly increases the number of files -+that fit in the cache\&. You can turn off compression setting the -+CCACHE_NOCOMPRESS environment variable\&. -+.PP - .SH "HOW IT WORKS" - .PP - The basic idea is to detect when you are compiling exactly the same -Index: ccache.c -=================================================================== -RCS file: /home/cvsroot/lars/ccache/ccache.c,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.9 -diff -u -r1.1.1.1.2.1 -r1.9 ---- ccache.c 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ ccache.c 21 Nov 2004 18:19:28 -0000 1.9 -@@ -199,7 +199,7 @@ - fd = open(tmp_stderr, O_RDONLY | O_BINARY); - if (fd != -1) { - if (strcmp(output_file, "/dev/null") == 0 || -- rename(tmp_hashname, output_file) == 0 || errno == ENOENT) { -+ move_file(tmp_hashname, output_file) == 0 || errno == ENOENT) { - if (cpp_stderr) { - /* we might have some stderr from cpp */ - int fd2 = open(cpp_stderr, O_RDONLY | O_BINARY); -@@ -231,14 +231,25 @@ - x_asprintf(&path_stderr, "%s.stderr", hashname); - - if (stat(tmp_stderr, &st1) != 0 || -- stat(tmp_hashname, &st2) != 0 || -- rename(tmp_hashname, hashname) != 0 || -- rename(tmp_stderr, path_stderr) != 0) { -+ stat(tmp_hashname, &st2) != 0 || -+ move_file(tmp_hashname, hashname) != 0 || -+ move_file(tmp_stderr, path_stderr) != 0) { - cc_log("failed to rename tmp files - %s\n", strerror(errno)); - stats_update(STATS_ERROR); - failed(); - } - -+#if ENABLE_ZLIB -+ /* do an extra stat on the cache files for -+ the size statistics */ -+ if (stat(path_stderr, &st1) != 0 || -+ stat(hashname, &st2) != 0) { -+ cc_log("failed to stat cache files - %s\n", strerror(errno)); -+ stats_update(STATS_ERROR); -+ failed(); -+ } -+#endif -+ - cc_log("Placed %s into cache\n", output_file); - stats_tocache(file_size(&st1) + file_size(&st2)); - -@@ -474,7 +485,13 @@ - } - - /* the user might be disabling cache hits */ -+#ifndef ENABLE_ZLIB -+ /* if the cache file is compressed we must recache */ -+ if ((first && getenv("CCACHE_RECACHE")) || -+ test_if_compressed(hashname) == 1) { -+#else - if (first && getenv("CCACHE_RECACHE")) { -+#endif - close(fd_stderr); - unlink(stderr_file); - free(stderr_file); -@@ -487,7 +504,9 @@ - ret = 0; - } else { - unlink(output_file); -- if (getenv("CCACHE_HARDLINK")) { -+ /* only make a hardlink if the cache file is uncompressed */ -+ if (getenv("CCACHE_HARDLINK") && -+ test_if_compressed(hashname) == 0) { - ret = link(hashname, output_file); - } else { - ret = copy_file(hashname, output_file); -Index: ccache.h -=================================================================== -RCS file: /home/cvsroot/lars/ccache/ccache.h,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.7 -diff -u -r1.1.1.1.2.1 -r1.7 ---- ccache.h 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ ccache.h 21 Nov 2004 18:19:28 -0000 1.7 -@@ -23,6 +23,10 @@ - #include - #endif - -+#ifdef ENABLE_ZLIB -+#include -+#endif -+ - #define STATUS_NOTFOUND 3 - #define STATUS_FATAL 4 - #define STATUS_NOCACHE 5 -@@ -36,6 +40,13 @@ - #define DEFAULT_MAXSIZE (1000*1000) - #endif - -+/* file copy mode */ -+#ifdef ENABLE_ZLIB -+#define COPY_UNCOMPRESSED 0 -+#define COPY_FROM_CACHE 1 -+#define COPY_TO_CACHE 2 -+#endif -+ - enum stats { - STATS_NONE=0, - STATS_STDOUT, -@@ -79,6 +90,8 @@ - - void copy_fd(int fd_in, int fd_out); - int copy_file(const char *src, const char *dest); -+int move_file(const char *src, const char *dest); -+int test_if_compressed(const char *filename); - - int create_dir(const char *dir); - void x_asprintf(char **ptr, const char *format, ...); -Index: ccache.yo -=================================================================== -RCS file: /home/cvsroot/lars/ccache/ccache.yo,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.5 -diff -u -r1.1.1.1.2.1 -r1.5 ---- ccache.yo 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ ccache.yo 21 Nov 2004 18:19:28 -0000 1.5 -@@ -169,6 +169,11 @@ - this optimisation, in which case this option could allow ccache to be - used. - -+dit(bf(CCACHE_NOCOMPRESS)) If you set the environment variable -+CCACHE_NOCOMPRESS then there is no compression used on files that go -+into the cache. However, this setting has no effect on how files are -+retrieved from the cache, compressed results will still be usable. -+ - dit(bf(CCACHE_NOSTATS)) If you set the environment variable - CCACHE_NOSTATS then ccache will not update the statistics files on - each compile. -@@ -181,7 +186,8 @@ - CCACHE_HARDLINK then ccache will attempt to use hard links from the - cache directory when creating the compiler output rather than using a - file copy. Using hard links is faster, but can confuse programs like --'make' that rely on modification times. -+'make' that rely on modification times. Hard links are never made for -+compressed cache files. - - dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached - results, even if it finds them. New results are still cached, but -@@ -236,6 +242,14 @@ - below the numbers you specified in order to avoid doing the cache - clean operation too often. - -+manpagesection(CACHE COMPRESSION) -+ -+By default ccache will compress all files it puts into the cache -+using the zlib compression. While this involves a negligible -+performance slowdown, it significantly increases the number of files -+that fit in the cache. You can turn off compression setting the -+CCACHE_NOCOMPRESS environment variable. -+ - manpagesection(HOW IT WORKS) - - The basic idea is to detect when you are compiling exactly the same -@@ -294,6 +308,8 @@ - cache. This tells the filesystem to inherit group ownership for new - directories. The command "chmod g+s `find $CCACHE_DIR -type d`" might - be useful for this. -+ it() Set bf(CCACHE_NOCOMPRESS) for all users, if there are users with -+ versions of ccache that do not support compression. - ) - - manpagesection(HISTORY) -Index: config.h.in -=================================================================== -RCS file: /home/cvsroot/lars/ccache/config.h.in,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- config.h.in 30 Apr 2004 13:13:41 -0000 1.1.1.1 -+++ config.h.in 4 May 2004 20:49:26 -0000 1.2 -@@ -98,3 +98,6 @@ - - /* Define _GNU_SOURCE so that we get all necessary prototypes */ - #undef _GNU_SOURCE -+ -+/* Define to 1 if you like to have zlib compression for the ccache. */ -+#undef ENABLE_ZLIB -Index: configure -=================================================================== -RCS file: /home/cvsroot/lars/ccache/configure,v -retrieving revision 1.1.1.1.2.1 -diff -u -r1.1.1.1.2.1 configure ---- configure 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ configure 21 Nov 2004 18:24:42 -0000 -@@ -836,6 +836,11 @@ - - cat <<\_ACEOF - -+Optional Features: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --enable-zlib enable zlib support for ccache compression -+ - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags -@@ -936,7 +941,7 @@ - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi -- cd "$ac_popdir" -+ cd $ac_popdir - done - fi - -@@ -1859,7 +1864,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -1917,7 +1923,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2033,7 +2040,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2087,7 +2095,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2132,7 +2141,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2176,7 +2186,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2609,7 +2620,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2681,7 +2693,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2735,7 +2748,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2806,7 +2820,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2860,7 +2875,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2927,7 +2943,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2997,7 +3014,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3078,7 +3096,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3248,7 +3267,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3319,7 +3339,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3509,7 +3530,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3611,7 +3633,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3676,7 +3699,8 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3775,6 +3799,229 @@ - - fi - -+# Check whether --enable-zlib or --disable-zlib was given. -+if test "${enable_zlib+set}" = set; then -+ enableval="$enable_zlib" -+ -+else -+ enable_zlib=yes -+fi; -+ -+if test x"$enable_zlib" = x"yes"; then -+ if test "${ac_cv_header_zlib_h+set}" = set; then -+ echo "$as_me:$LINENO: checking for zlib.h" >&5 -+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 -+if test "${ac_cv_header_zlib_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking zlib.h usability" >&5 -+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking zlib.h presence" >&5 -+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for zlib.h" >&5 -+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 -+if test "${ac_cv_header_zlib_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_zlib_h=$ac_header_preproc -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 -+ -+fi -+if test $ac_cv_header_zlib_h = yes; then -+ echo "$as_me:$LINENO: checking for gzdopen in -lz" >&5 -+echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6 -+if test "${ac_cv_lib_z_gzdopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lz $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char gzdopen (); -+int -+main () -+{ -+gzdopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_z_gzdopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_z_gzdopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzdopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_z_gzdopen" >&6 -+if test $ac_cv_lib_z_gzdopen = yes; then -+ LIBS="-lz $LIBS"; cat >>confdefs.h <<\_ACEOF -+#define ENABLE_ZLIB 1 -+_ACEOF -+ -+fi -+ -+fi -+ -+ -+fi -+ - ac_config_files="$ac_config_files Makefile" - - cat >confcache <<\_ACEOF -@@ -4568,6 +4815,11 @@ - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -@@ -4606,12 +4858,6 @@ - fi;; - esac - done` || { (exit 1); exit 1; } -- -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -Index: configure.in -=================================================================== -RCS file: /home/cvsroot/lars/ccache/configure.in,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.4 -diff -u -r1.1.1.1.2.1 -r1.4 ---- configure.in 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ configure.in 21 Nov 2004 18:19:28 -0000 1.4 -@@ -68,5 +68,14 @@ - AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ]) - fi - -+dnl Check for zlib. -+AC_ARG_ENABLE([zlib], -+ AS_HELP_STRING([--enable-zlib], [enable zlib support for ccache compression]),, -+ [enable_zlib=yes]) -+ -+if test x"$enable_zlib" = x"yes"; then -+ AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, gzdopen, LIBS="-lz $LIBS"; AC_DEFINE(ENABLE_ZLIB))) -+fi -+ - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -Index: util.c -=================================================================== -RCS file: /home/cvsroot/lars/ccache/util.c,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.11 -diff -u -r1.1.1.1.2.1 -r1.11 ---- util.c 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ util.c 21 Nov 2004 18:19:28 -0000 1.11 -@@ -44,6 +44,7 @@ - exit(1); - } - -+#ifndef ENABLE_ZLIB - /* copy all data from one file descriptor to another */ - void copy_fd(int fd_in, int fd_out) - { -@@ -57,6 +58,11 @@ - } - } - -+/* move a file using rename */ -+int move_file(const char *src, const char *dest) { -+ return rename(src, dest); -+} -+ - /* copy a file - used when hard links don't work - the copy is done via a temporary file and atomic rename - */ -@@ -120,6 +126,174 @@ - return 0; - } - -+#else /* ENABLE_ZLIB */ -+ -+/* copy all data from one file descriptor to another -+ possibly decompressing it -+*/ -+void copy_fd(int fd_in, int fd_out) { -+ char buf[10240]; -+ int n; -+ gzFile gz_in; -+ -+ gz_in = gzdopen(dup(fd_in), "rb"); -+ -+ if (!gz_in) { -+ fatal("Failed to copy fd"); -+ } -+ -+ while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { -+ if (write(fd_out, buf, n) != n) { -+ fatal("Failed to copy fd"); -+ } -+ } -+} -+ -+static int _copy_file(const char *src, const char *dest, int mode) { -+ int fd_in, fd_out; -+ gzFile gz_in, gz_out = NULL; -+ char buf[10240]; -+ int n, ret; -+ char *tmp_name; -+ mode_t mask; -+ struct stat st; -+ -+ x_asprintf(&tmp_name, "%s.XXXXXX", dest); -+ -+ if (getenv("CCACHE_NOCOMPRESS")) { -+ mode = COPY_UNCOMPRESSED; -+ } -+ -+ /* open source file */ -+ fd_in = open(src, O_RDONLY); -+ if (fd_in == -1) { -+ return -1; -+ } -+ -+ gz_in = gzdopen(fd_in, "rb"); -+ if (!gz_in) { -+ close(fd_in); -+ return -1; -+ } -+ -+ /* open destination file */ -+ fd_out = mkstemp(tmp_name); -+ if (fd_out == -1) { -+ gzclose(gz_in); -+ free(tmp_name); -+ return -1; -+ } -+ -+ if (mode == COPY_TO_CACHE) { -+ /* The gzip file format occupies at least 20 bytes. So -+ it will always occupy an entire filesystem block, -+ even for empty files. -+ Since most stderr files will be empty, we turn off -+ compression in this case to save space. -+ */ -+ if (fstat(fd_in, &st) != 0) { -+ gzclose(gz_in); -+ close(fd_out); -+ free(tmp_name); -+ return -1; -+ } -+ if (file_size(&st) == 0) { -+ mode = COPY_UNCOMPRESSED; -+ } -+ } -+ -+ if (mode == COPY_TO_CACHE) { -+ gz_out = gzdopen(dup(fd_out), "wb"); -+ if (!gz_out) { -+ gzclose(gz_in); -+ close(fd_out); -+ free(tmp_name); -+ return -1; -+ } -+ } -+ -+ while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { -+ if (mode == COPY_TO_CACHE) { -+ ret = gzwrite(gz_out, buf, n); -+ } else { -+ ret = write(fd_out, buf, n); -+ } -+ if (ret != n) { -+ gzclose(gz_in); -+ if (gz_out) { -+ gzclose(gz_out); -+ } -+ close(fd_out); -+ unlink(tmp_name); -+ free(tmp_name); -+ return -1; -+ } -+ } -+ -+ gzclose(gz_in); -+ if (gz_out) { -+ gzclose(gz_out); -+ } -+ -+ /* get perms right on the tmp file */ -+ mask = umask(0); -+ fchmod(fd_out, 0666 & ~mask); -+ umask(mask); -+ -+ /* the close can fail on NFS if out of space */ -+ if (close(fd_out) == -1) { -+ unlink(tmp_name); -+ free(tmp_name); -+ return -1; -+ } -+ -+ unlink(dest); -+ -+ if (rename(tmp_name, dest) == -1) { -+ unlink(tmp_name); -+ free(tmp_name); -+ return -1; -+ } -+ -+ free(tmp_name); -+ -+ return 0; -+} -+ -+/* move a file to the cache, compressing it */ -+int move_file(const char *src, const char *dest) { -+ int ret; -+ -+ ret = _copy_file(src, dest, COPY_TO_CACHE); -+ if (ret != -1) unlink(src); -+ return ret; -+} -+ -+/* copy a file from the cache, decompressing it */ -+int copy_file(const char *src, const char *dest) { -+ return _copy_file(src, dest, COPY_FROM_CACHE); -+} -+#endif /* ENABLE_ZLIB */ -+ -+/* test if a file is zlib compressed */ -+int test_if_compressed(const char *filename) { -+ FILE *f; -+ -+ f = fopen(filename, "rb"); -+ if (!f) { -+ return 0; -+ } -+ -+ /* test if file starts with 1F8B, which is zlib's -+ * magic number */ -+ if ((fgetc(f) != 0x1f) || (fgetc(f) != 0x8b)) { -+ fclose(f); -+ return 0; -+ } -+ -+ fclose(f); -+ return 1; -+} - - /* make sure a directory exists */ - int create_dir(const char *dir) -Index: manage-cache.sh -=================================================================== -RCS file: manage-cache.sh -diff -N manage-cache.sh ---- manage-cache.sh 1 Jan 1970 00:00:00 -0000 -+++ manage-cache.sh-cache.sh 12 May 2004 19:22:20 -0000 1.1 -@@ -0,0 +1,68 @@ -+#!/bin/bash -+# -+# 2004-05-12 lars@gustaebel.de -+ -+CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} -+ -+echo "Do you want to compress or decompress the ccache in $CCACHE_DIR?" -+read -p "Type c or d: " mode -+ -+if [ "$mode" != "c" ] && [ "$mode" != "d" ] -+then -+ exit 1 -+fi -+ -+is_compressed() { -+ test "$(head -c 2 $1)" = $'\x1f\x8b' -+ return $? -+} -+ -+tmpfile=$(mktemp) -+ -+for dir in 0 1 2 3 4 5 6 7 8 9 a b c d e f -+do -+ # process ccache subdir -+ echo -n "$dir " -+ -+ # find cache files -+ find $CCACHE_DIR/$dir -type f -name '*-*' | -+ sort > $tmpfile -+ -+ oldsize=$(cat $CCACHE_DIR/$dir/stats | cut -d ' ' -f 13) -+ newsize=0 -+ -+ while read file -+ do -+ # empty files will be ignored since compressing -+ # them makes them bigger -+ test $(stat -c %s $file) -eq 0 && continue -+ -+ if [ $mode = c ] -+ then -+ if ! is_compressed $file -+ then -+ gzip $file -+ mv $file.gz $file -+ fi -+ else -+ if is_compressed $file -+ then -+ mv $file $file.gz -+ gzip -d $file.gz -+ fi -+ fi -+ -+ # calculate new size statistic for this subdir -+ let newsize=$newsize+$(stat -c "%B*%b" $file)/1024 -+ done < $tmpfile -+ -+ # update statistic file -+ read -a numbers < $CCACHE_DIR/$dir/stats -+ numbers[12]=$newsize -+ echo "${numbers[*]} " > $CCACHE_DIR/$dir/stats -+done -+echo -+ -+# clean up -+rm $tmpfile -+ -Index: Makefile.in -=================================================================== -RCS file: /home/cvsroot/lars/ccache/Makefile.in,v -retrieving revision 1.1.1.1.2.1 -retrieving revision 1.12 -diff -u -r1.1.1.1.2.1 -r1.12 ---- Makefile.in 21 Nov 2004 17:55:36 -0000 1.1.1.1.2.1 -+++ Makefile.in 21 Nov 2004 18:19:28 -0000 1.12 -@@ -11,6 +11,7 @@ - CFLAGS=@CFLAGS@ -I. - EXEEXT=@EXEEXT@ - -+LIBS= @LIBS@ - OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \ - cleanup.o snprintf.o unify.o - HEADERS = ccache.h mdfour.h -@@ -20,7 +21,7 @@ - docs: ccache.1 web/ccache-man.html - - ccache$(EXEEXT): $(OBJS) $(HEADERS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) -+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) - - ccache.1: ccache.yo - -yodl2man -o ccache.1 ccache.yo diff --git a/CCache/debian/patches/03_long_options.diff b/CCache/debian/patches/03_long_options.diff deleted file mode 100644 index 3235c3806..000000000 --- a/CCache/debian/patches/03_long_options.diff +++ /dev/null @@ -1,133 +0,0 @@ -Index: ccache.c -=================================================================== ---- ccache.c (révision 7695) -+++ ccache.c (copie de travail) -@@ -22,6 +22,7 @@ - */ - - #include "ccache.h" -+#include - - /* the base cache directory */ - char *cache_dir = NULL; -@@ -885,14 +886,14 @@ - printf("\tcompiler [compile options] (via symbolic link)\n"); - printf("\nOptions:\n"); - -- printf("-s show statistics summary\n"); -- printf("-z zero statistics\n"); -- printf("-c run a cache cleanup\n"); -- printf("-C clear the cache completely\n"); -- printf("-F set maximum files in cache\n"); -- printf("-M set maximum size of cache (use G, M or K)\n"); -- printf("-h this help page\n"); -- printf("-V print version number\n"); -+ printf("-s, --show-stats show statistics summary\n"); -+ printf("-z, --zero-stats zero statistics\n"); -+ printf("-c, --cleanup run a cache cleanup\n"); -+ printf("-C, --clear clear the cache completely\n"); -+ printf("-F , --max-files= set maximum files in cache\n"); -+ printf("-M , --max-size= set maximum size of cache (use G, M or K)\n"); -+ printf("-h, --help this help page\n"); -+ printf("-V, --version print version number\n"); - } - - /* the main program when not doing a compile */ -@@ -901,7 +902,21 @@ - int c; - size_t v; - -- while ((c = getopt(argc, argv, "hszcCF:M:V")) != -1) { -+ static struct option long_options[] = -+ { -+ {"show-stats", no_argument, 0, 's'}, -+ {"zero-stats", no_argument, 0, 'z'}, -+ {"cleanup", no_argument, 0, 'c'}, -+ {"clear", no_argument, 0, 'C'}, -+ {"max-files", required_argument, 0, 'F'}, -+ {"max-size", required_argument, 0, 'M'}, -+ {"help", no_argument, 0, 'h'}, -+ {"version", no_argument, 0, 'V'}, -+ {0, 0, 0, 0} -+ }; -+ int option_index = 0; -+ -+ while ((c = getopt_long(argc, argv, "hszcCF:M:V", long_options, &option_index)) != -1) { - switch (c) { - case 'V': - printf("ccache version %s\n", CCACHE_VERSION); -Index: ccache.1 -=================================================================== ---- ccache.1 (révision 7695) -+++ ccache.1 (copie de travail) -@@ -23,14 +23,14 @@ - .nf - - ---s show statistics summary ---z zero statistics ---c run a cache cleanup ---C clear the cache completely ---F set maximum files in cache ---M set maximum size of cache (use G, M or K) ---h this help page ---V print version number -+\-s, \-\-show-stats show statistics summary -+\-z, \-\-zero-stats zero statistics -+\-c, \-\-cleanup run a cache cleanup -+\-C, \-\-clear clear the cache completely -+\-F , \-\-max-files= set maximum files in cache -+\-M , \-\-max-size= set maximum size of cache (use G, M or K) -+\-h, \-\-help this help page -+\-V, \-\-version print version number - - .fi - -@@ -43,22 +43,22 @@ - normal compiler options apply and you should refer to your compilers - documentation\&. - .PP --.IP "\fB-h\fP" -+.IP "\fB-h, --help\fP" - Print a options summary page - .IP --.IP "\fB-s\fP" -+.IP "\fB-s, --show-stats\fP" - Print the current statistics summary for the cache\&. The - statistics are stored spread across the subdirectories of the - cache\&. Using "ccache -s" adds up the statistics across all - subdirectories and prints the totals\&. - .IP --.IP "\fB-z\fP" -+.IP "\fB-z, --zero-stats\fP" - Zero the cache statistics\&. - .IP --.IP "\fB-V\fP" -+.IP "\fB-V, --version\fP" - Print the ccache version number - .IP --.IP "\fB-c\fP" -+.IP "\fB-c, --cleanup\fP" - Clean the cache and re-calculate the cache file count and - size totals\&. Normally the -c option should not be necessary as ccache - keeps the cache below the specified limits at runtime and keeps -@@ -66,16 +66,16 @@ - if you manually modify the cache contents or believe that the cache - size statistics may be inaccurate\&. - .IP --.IP "\fB-C\fP" -+.IP "\fB-C, --clear\fP" - Clear the entire cache, removing all cached files\&. - .IP --.IP "\fB-F maxfiles\fP" -+.IP "\fB-F , --max-files=\fP" - This sets the maximum number of files allowed in - the cache\&. The value is stored inside the cache directory and applies - to all future compiles\&. Due to the way the value is stored the actual - value used is always rounded down to the nearest multiple of 16\&. - .IP --.IP "\fB-M maxsize\fP" -+.IP "\fB-M , --max-size=\fP" - This sets the maximum cache size\&. You can specify - a value in gigabytes, megabytes or kilobytes by appending a G, M or K - to the value\&. The default is gigabytes\&. The actual value stored is diff --git a/CCache/debian/patches/04_ignore_profile.diff b/CCache/debian/patches/04_ignore_profile.diff deleted file mode 100644 index 568375092..000000000 --- a/CCache/debian/patches/04_ignore_profile.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru ccache-2.4/ccache.c ccache-2.4-tp/ccache.c ---- ccache.c 2007-05-20 03:14:19.000000000 +1000 -+++ ccache.c 2007-05-20 03:17:54.000000000 +1000 -@@ -641,6 +641,9 @@ - - /* these are too hard */ - if (strcmp(argv[i], "-fbranch-probabilities")==0 || -+ strcmp(argv[i], "-fprofile-arcs") == 0 || -+ strcmp(argv[i], "-ftest-coverage") == 0 || -+ strcmp(argv[i], "--coverage") == 0 || - strcmp(argv[i], "-M") == 0 || - strcmp(argv[i], "-MM") == 0 || - strcmp(argv[i], "-x") == 0) { diff --git a/CCache/debian/patches/05_nfs_fix.diff b/CCache/debian/patches/05_nfs_fix.diff deleted file mode 100644 index 662d97639..000000000 --- a/CCache/debian/patches/05_nfs_fix.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- ccache.1.orig 2007-05-20 17:30:57.000000000 +1200 -+++ ccache.1 2007-05-20 17:31:27.000000000 +1200 -@@ -367,12 +367,6 @@ - .IP o - ccache avoids a double call to cpp on a cache miss - .PP --.SH "BUGS" --.PP --When the cache is stored on an NFS filesystem, the filesystem must be --exported with the \fBno_subtree_check\fP option to make renames between --directories reliable\&. --.PP - .SH "CREDITS" - .PP - Thanks to the following people for their contributions to ccache ---- util.c.patched 2007-05-20 18:19:11.000000000 +1200 -+++ util.c 2007-05-20 18:20:55.000000000 +1200 -@@ -58,9 +58,26 @@ - } - } - -+static int safe_rename(const char* oldpath, const char* newpath) -+{ -+ /* safe_rename is for creating entries in the cache. -+ -+ Works like rename(), but it never overwrites an existing -+ cache entry. This avoids corruption on NFS. */ -+ int status = link( oldpath, newpath ); -+ if( status == 0 || errno == EEXIST ) -+ { -+ return unlink( oldpath ); -+ } -+ else -+ { -+ return -1; -+ } -+} -+ - /* move a file using rename */ - int move_file(const char *src, const char *dest) { -- return rename(src, dest); -+ return safe_rename(src, dest); - } - - /* copy a file - used when hard links don't work diff --git a/CCache/debian/patches/06_md.diff b/CCache/debian/patches/06_md.diff deleted file mode 100644 index 3f68850ca..000000000 --- a/CCache/debian/patches/06_md.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- ccache.c Mon Sep 13 11:38:30 2004 -+++ ccache.c Thu Jun 21 22:17:32 2007 -@@ -627,6 +627,13 @@ static void process_args(int argc, char - int found_S_opt = 0; - struct stat st; - char *e; -+ /* is gcc being asked to output dependencies? */ -+ int generating_dependencies = 0; -+ /* is the dependency makefile name overridden with -MF? */ -+ int dependency_filename_specified = 0; -+ /* is the dependency makefile target name specified with -MQ or -MF? */ -+ int dependency_target_specified = 0; -+ - - stripped_args = args_init(0, NULL); - -@@ -702,6 +709,18 @@ static void process_args(int argc, char - continue; - } - -+ /* These options require special handling, because they -+ behave differently with gcc -E, when the output -+ file is not specified. */ -+ -+ if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) { -+ generating_dependencies = 1; -+ } else if (strcmp(argv[i], "-MF") == 0) { -+ dependency_filename_specified = 1; -+ } else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) { -+ dependency_target_specified = 1; -+ } -+ - /* options that take an argument */ - { - const char *opts[] = {"-I", "-include", "-imacros", "-iprefix", -@@ -812,6 +831,41 @@ static void process_args(int argc, char - } - p[1] = found_S_opt ? 's' : 'o'; - p[2] = 0; -+ } -+ -+ /* If dependencies are generated, configure the preprocessor */ -+ -+ if (generating_dependencies && output_file) { -+ if (!dependency_filename_specified) { -+ char *default_depfile_name = x_strdup(output_file); -+ char *p = strrchr(default_depfile_name, '.'); -+ -+ if (p) { -+ if (strlen(p) < 2) { -+ stats_update(STATS_ARGS); -+ failed(); -+ return; -+ } -+ *p = 0; -+ } -+ else { -+ int len = p - default_depfile_name; -+ -+ p = x_malloc(len + 3); -+ strncpy(default_depfile_name, p, len - 1); -+ free(default_depfile_name); -+ default_depfile_name = p; -+ } -+ -+ strcat(default_depfile_name, ".d"); -+ args_add(stripped_args, "-MF"); -+ args_add(stripped_args, default_depfile_name); -+ } -+ -+ if (!dependency_target_specified) { -+ args_add(stripped_args, "-MT"); -+ args_add(stripped_args, output_file); -+ } - } - - /* cope with -o /dev/null */ diff --git a/CCache/debian/patches/07_cachedirtag.diff b/CCache/debian/patches/07_cachedirtag.diff deleted file mode 100644 index 683b48d14..000000000 --- a/CCache/debian/patches/07_cachedirtag.diff +++ /dev/null @@ -1,75 +0,0 @@ -Index: ccache.c -=================================================================== ---- ccache.c (révision 7695) -+++ ccache.c (copie de travail) -@@ -1029,6 +1029,14 @@ - exit(1); - } - -+ if (!getenv("CCACHE_READONLY")) { -+ if (create_cachedirtag(cache_dir) != 0) { -+ fprintf(stderr,"ccache: failed to create %s/CACHEDIR.TAG (%s)\n", -+ cache_dir, strerror(errno)); -+ exit(1); -+ } -+ } -+ - ccache(argc, argv); - return 1; - } -Index: ccache.h -=================================================================== ---- ccache.h (révision 7695) -+++ ccache.h (copie de travail) -@@ -81,6 +81,7 @@ - int copy_file(const char *src, const char *dest); - - int create_dir(const char *dir); -+int create_cachedirtag(const char *dir); - void x_asprintf(char **ptr, const char *format, ...); - char *x_strdup(const char *s); - void *x_realloc(void *ptr, size_t size); -Index: util.c -=================================================================== ---- util.c (révision 7695) -+++ util.c (copie de travail) -@@ -138,6 +138,39 @@ - return 0; - } - -+char const CACHEDIR_TAG[] = -+ "Signature: 8a477f597d28d172789f06886806bc55\n" -+ "# This file is a cache directory tag created by ccache.\n" -+ "# For information about cache directory tags, see:\n" -+ "# http://www.brynosaurus.com/cachedir/\n"; -+ -+int create_cachedirtag(const char *dir) -+{ -+ char *filename; -+ struct stat st; -+ FILE *f; -+ x_asprintf(&filename, "%s/CACHEDIR.TAG", dir); -+ if (stat(filename, &st) == 0) { -+ if (S_ISREG(st.st_mode)) { -+ goto success; -+ } -+ errno = EEXIST; -+ goto error; -+ } -+ f = fopen(filename, "w"); -+ if (!f) goto error; -+ if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) { -+ goto error; -+ } -+ if (fclose(f)) goto error; -+success: -+ free(filename); -+ return 0; -+error: -+ free(filename); -+ return 1; -+} -+ - /* - this is like asprintf() but dies if the malloc fails - note that we use vsnprintf in a rather poor way to make this more portable diff --git a/CCache/debian/patches/08_manpage_hyphens.diff b/CCache/debian/patches/08_manpage_hyphens.diff deleted file mode 100644 index 55ced4a23..000000000 --- a/CCache/debian/patches/08_manpage_hyphens.diff +++ /dev/null @@ -1,89 +0,0 @@ -Index: ccache.1 -=================================================================== ---- ccache.1 (révision 7695) -+++ ccache.1 (copie de travail) -@@ -49,7 +49,7 @@ - .IP "\fB-s\fP" - Print the current statistics summary for the cache\&. The - statistics are stored spread across the subdirectories of the --cache\&. Using "ccache -s" adds up the statistics across all -+cache\&. Using "ccache \-s" adds up the statistics across all - subdirectories and prints the totals\&. - .IP - .IP "\fB-z\fP" -@@ -60,7 +60,7 @@ - .IP - .IP "\fB-c\fP" - Clean the cache and re-calculate the cache file count and --size totals\&. Normally the -c option should not be necessary as ccache -+size totals\&. Normally the \-c option should not be necessary as ccache - keeps the cache below the specified limits at runtime and keeps - statistics up to date on each compile\&. This option is mostly useful - if you manually modify the cache contents or believe that the cache -@@ -100,9 +100,9 @@ - - - cp ccache /usr/local/bin/ -- ln -s /usr/local/bin/ccache /usr/local/bin/gcc -- ln -s /usr/local/bin/ccache /usr/local/bin/g++ -- ln -s /usr/local/bin/ccache /usr/local/bin/cc -+ ln \-s /usr/local/bin/ccache /usr/local/bin/gcc -+ ln \-s /usr/local/bin/ccache /usr/local/bin/g++ -+ ln \-s /usr/local/bin/ccache /usr/local/bin/cc - - .fi - -@@ -118,7 +118,7 @@ - .PP - When run as a compiler front end ccache usually just takes the same - command line options as the compiler you are using\&. The only exception --to this is the option \&'--ccache-skip\&'\&. That option can be used to tell -+to this is the option \&'\-\-ccache-skip\&'\&. That option can be used to tell - ccache that the next option is definitely not a input filename, and - should be passed along to the compiler as-is\&. - .PP -@@ -128,7 +128,7 @@ - of the resulting object file (among other things)\&. The heuristic - ccache uses in this parse is that any string on the command line that - exists as a file is treated as an input file name (usually a C --file)\&. By using --ccache-skip you can force an option to not be -+file)\&. By using \-\-ccache-skip you can force an option to not be - treated as an input file name and instead be passed along to the - compiler as a command line option\&. - .PP -@@ -238,7 +238,7 @@ - .IP "\fBCCACHE_UNIFY\fP" - If you set the environment variable CCACHE_UNIFY - then ccache will use the C/C++ unifier when hashing the pre-processor --output if -g is not used in the compile\&. The unifier is slower than a -+output if \-g is not used in the compile\&. The unifier is slower than a - normal hash, so setting this environment variable loses a little bit - of speed, but it means that ccache can take advantage of not - recompiling when the changes to the source code consist of -@@ -262,7 +262,7 @@ - .PP - By default ccache has a one gigabyte limit on the cache size and no - maximum number of files\&. You can set a different limit using the --"ccache -M" and "ccache -F" options, which set the size and number of -+"ccache \-M" and "ccache \-F" options, which set the size and number of - files limits\&. - .PP - When these limits are reached ccache will reduce the cache to 20% -@@ -276,7 +276,7 @@ - that it is the same code by forming a hash of: - .PP - .IP o --the pre-processor output from running the compiler with -E -+the pre-processor output from running the compiler with \-E - .IP o - the command line options - .IP o -@@ -331,7 +331,7 @@ - .IP o - Make sure that the setgid bit is set on all directories in the - cache\&. This tells the filesystem to inherit group ownership for new --directories\&. The command "chmod g+s `find $CCACHE_DIR -type d`" might -+directories\&. The command "chmod g+s `find $CCACHE_DIR \-type d`" might - be useful for this\&. - .PP - .SH "HISTORY" diff --git a/CCache/debian/patches/09_respect_ldflags.diff b/CCache/debian/patches/09_respect_ldflags.diff deleted file mode 100644 index 0ce2c2de3..000000000 --- a/CCache/debian/patches/09_respect_ldflags.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2008-03-23 17:01:19.000000000 +1300 -+++ Makefile.in 2008-03-23 17:03:03.000000000 +1300 -@@ -21,7 +21,7 @@ - docs: ccache.1 web/ccache-man.html - - ccache$(EXEEXT): $(OBJS) $(HEADERS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - ccache.1: ccache.yo - -yodl2man -o ccache.1 ccache.yo diff --git a/CCache/debian/patches/10_lru_cleanup.diff b/CCache/debian/patches/10_lru_cleanup.diff deleted file mode 100644 index 24463e529..000000000 --- a/CCache/debian/patches/10_lru_cleanup.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- ccache.c (révision 8804) -+++ ccache.c (copie de travail) -@@ -481,6 +481,9 @@ - return; - } - -+ /* update timestamps for LRU cleanup -+ also gives output_file a sensible mtime when hard-linking (for make) */ -+ utime(hashname, NULL); - utime(stderr_file, NULL); - - if (strcmp(output_file, "/dev/null") == 0) { -@@ -513,10 +516,6 @@ - failed(); - } - } -- if (ret == 0) { -- /* update the mtime on the file so that make doesn't get confused */ -- utime(output_file, NULL); -- } - - /* get rid of the intermediate preprocessor file */ - if (i_tmpfile) { diff --git a/CCache/debian/patches/11_utimes.diff b/CCache/debian/patches/11_utimes.diff deleted file mode 100644 index 2886bf3d6..000000000 --- a/CCache/debian/patches/11_utimes.diff +++ /dev/null @@ -1,85 +0,0 @@ ---- ccache.c 2004-09-13 03:38:30.000000000 -0700 -+++ ccache.c 2006-06-09 16:29:16.695117780 -0700 -@@ -481,8 +481,13 @@ - - /* update timestamps for LRU cleanup - also gives output_file a sensible mtime when hard-linking (for make) */ -+#ifdef HAVE_UTIMES -+ utimes(hashname, NULL); -+ utimes(stderr_file, NULL); -+#else - utime(hashname, NULL); - utime(stderr_file, NULL); -+#endif - - if (strcmp(output_file, "/dev/null") == 0) { - ret = 0; ---- ccache.h 2004-09-13 03:38:30.000000000 -0700 -+++ ccache.h 2006-06-09 16:28:16.601658626 -0700 -@@ -22,6 +22,9 @@ - #ifdef HAVE_PWD_H - #include - #endif -+#ifdef HAVE_SYS_TIME_H -+#include -+#endif - - #define STATUS_NOTFOUND 3 - #define STATUS_FATAL 4 ---- config.h.in 2003-09-27 21:48:17.000000000 -0700 -+++ config.h.in 2006-06-09 16:25:43.000000000 -0700 -@@ -19,6 +19,9 @@ - /* Define to 1 if you have the `gethostname' function. */ - #undef HAVE_GETHOSTNAME - -+/* Define to 1 if you have the `getpwuid' function. */ -+#undef HAVE_GETPWUID -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H - -@@ -31,6 +34,9 @@ - /* Define to 1 if you have the header file, and it defines `DIR'. */ - #undef HAVE_NDIR_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_PWD_H -+ - /* Define to 1 if you have the `realpath' function. */ - #undef HAVE_REALPATH - -@@ -60,6 +66,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_STAT_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_TIME_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_TYPES_H - -@@ -69,6 +78,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_UNISTD_H - -+/* Define to 1 if you have the `utimes' function. */ -+#undef HAVE_UTIMES -+ - /* Define to 1 if you have the `vasprintf' function. */ - #undef HAVE_VASPRINTF - ---- configure.in 2004-09-13 03:38:30.000000000 -0700 -+++ configure.in 2006-06-09 16:25:15.541288184 -0700 -@@ -27,10 +27,11 @@ - AC_HEADER_TIME - AC_HEADER_SYS_WAIT - --AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h) -+AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h) - - AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp) - AC_CHECK_FUNCS(gethostname getpwuid) -+AC_CHECK_FUNCS(utimes) - - AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ - AC_TRY_COMPILE( diff --git a/CCache/debian/patches/12_cachesize_permissions.diff b/CCache/debian/patches/12_cachesize_permissions.diff deleted file mode 100644 index 28801b771..000000000 --- a/CCache/debian/patches/12_cachesize_permissions.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- stats.c (révision 8804) -+++ stats.c (copie de travail) -@@ -286,7 +286,7 @@ - - - /* set the per directory limits */ --void stats_set_limits(long maxfiles, long maxsize) -+int stats_set_limits(long maxfiles, long maxsize) - { - int dir; - unsigned counters[STATS_END]; -@@ -298,7 +298,9 @@ - maxsize /= 16; - } - -- create_dir(cache_dir); -+ if (create_dir(cache_dir) != 0) { -+ return 1; -+ } - - /* set the limits in each directory */ - for (dir=0;dir<=0xF;dir++) { -@@ -306,7 +308,9 @@ - int fd; - - x_asprintf(&cdir, "%s/%1x", cache_dir, dir); -- create_dir(cdir); -+ if (create_dir(cdir) != 0) { -+ return 1; -+ } - x_asprintf(&fname, "%s/stats", cdir); - free(cdir); - -@@ -326,6 +330,8 @@ - } - free(fname); - } -+ -+ return 0; - } - - /* set the per directory sizes */ ---- ccache.c (révision 8804) -+++ ccache.c (copie de travail) -@@ -935,15 +934,23 @@ - case 'F': - check_cache_dir(); - v = atoi(optarg); -- stats_set_limits(v, -1); -- printf("Set cache file limit to %u\n", (unsigned)v); -+ if (stats_set_limits(v, -1) == 0) { -+ printf("Set cache file limit to %u\n", (unsigned)v); -+ } else { -+ printf("Could not set cache file limit.\n"); -+ exit(1); -+ } - break; - - case 'M': - check_cache_dir(); - v = value_units(optarg); -- stats_set_limits(-1, v); -- printf("Set cache size limit to %uk\n", (unsigned)v); -+ if (stats_set_limits(-1, v) == 0) { -+ printf("Set cache size limit to %uk\n", (unsigned)v); -+ } else { -+ printf("Could not set cache size limit.\n"); -+ exit(1); -+ } - break; - - default: ---- ccache.h (révision 8804) -+++ ccache.h (copie de travail) -@@ -101,7 +101,7 @@ - void stats_summary(void); - void stats_tocache(size_t size); - void stats_read(const char *stats_file, unsigned counters[STATS_END]); --void stats_set_limits(long maxfiles, long maxsize); -+int stats_set_limits(long maxfiles, long maxsize); - size_t value_units(const char *s); - void display_size(unsigned v); - void stats_set_sizes(const char *dir, size_t num_files, size_t total_size); diff --git a/CCache/debian/patches/13_html_links.diff b/CCache/debian/patches/13_html_links.diff deleted file mode 100644 index dadf1b6c2..000000000 --- a/CCache/debian/patches/13_html_links.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- web/index.html~ 2004-09-13 13:38:30.000000000 +0300 -+++ web/index.html 2004-09-26 01:04:38.458008118 +0300 -@@ -29,10 +29,10 @@ -
      • fixed handling of HOME environment variable -
      - --See the manual page for details -+See the manual page for details - on the new options.

      - --You can get this release from the download directory -+You can get this release from the download directory - -

      NOTE! This release changes the hash input slighly, so you will - probably find that you will not get any hits against your existing -@@ -87,7 +87,7 @@ - -

      Documentation

      - --See the manual page -+See the manual page - - -

      Performance

      -@@ -116,7 +116,7 @@ -

      Download

      - - You can download the latest release from the download directory.

      -+href="http://ccache.samba.org/ftp/ccache/">download directory.

      - - For the bleeding edge, you can fetch ccache via CVS or - rsync. To fetch via cvs use the following command: diff --git a/CCache/debian/patches/14_hardlink_doc.diff b/CCache/debian/patches/14_hardlink_doc.diff deleted file mode 100644 index bd9e25ba6..000000000 --- a/CCache/debian/patches/14_hardlink_doc.diff +++ /dev/null @@ -1,48 +0,0 @@ -Index: ccache.1 -=================================================================== -RCS file: /cvsroot/ccache/ccache.1,v -retrieving revision 1.26 -diff -u -r1.26 ccache.1 ---- ccache.1 24 Nov 2005 21:10:08 -0000 1.26 -+++ ccache.1 21 Jul 2007 21:03:32 -0000 -@@ -330,7 +330,7 @@ - .IP o - Use the same \fBCCACHE_DIR\fP environment variable setting - .IP o --Set the \fBCCACHE_NOLINK\fP environment variable -+Unset the \fBCCACHE_HARDLINK\fP environment variable - .IP o - Make sure everyone sets the CCACHE_UMASK environment variable - to 002, this ensures that cached files are accessible to everyone in -Index: ccache.yo -=================================================================== -RCS file: /cvsroot/ccache/ccache.yo,v -retrieving revision 1.27 -diff -u -r1.27 ccache.yo ---- ccache.yo 24 Nov 2005 21:54:09 -0000 1.27 -+++ ccache.yo 21 Jul 2007 21:03:32 -0000 -@@ -289,7 +289,7 @@ - - itemize( - it() Use the same bf(CCACHE_DIR) environment variable setting -- it() Set the bf(CCACHE_NOLINK) environment variable -+ it() Unset the bf(CCACHE_HARDLINK) environment variable - it() Make sure everyone sets the CCACHE_UMASK environment variable - to 002, this ensures that cached files are accessible to everyone in - the group. -Index: web/ccache-man.html -=================================================================== -RCS file: /cvsroot/ccache/web/ccache-man.html,v -retrieving revision 1.25 -diff -u -r1.25 ccache-man.html ---- web/ccache-man.html 13 Sep 2004 10:38:17 -0000 1.25 -+++ web/ccache-man.html 21 Jul 2007 21:03:32 -0000 -@@ -256,7 +256,7 @@ - following conditions need to be met: -

        -
      • Use the same CCACHE_DIR environment variable setting --
      • Set the CCACHE_NOLINK environment variable -+
      • Unset the CCACHE_HARDLINK environment variable -
      • Make sure everyone sets the CCACHE_UMASK environment variable - to 002, this ensures that cached files are accessible to everyone in - the group. diff --git a/CCache/debian/patches/CREDITS b/CCache/debian/patches/CREDITS deleted file mode 100644 index c4e323b7b..000000000 --- a/CCache/debian/patches/CREDITS +++ /dev/null @@ -1,47 +0,0 @@ -01_no_home.diff: - Francois Marier - Made especially for the Debian package. - -02_ccache_compressed.diff: - Lars Gustäbel - http://www.gustaebel.de/lars/ccache/ (downloaded on 2007-05-20) - -03_long_options.diff: - Francois Marier - Made especially for the Debian package. - -04_ignore_profile.diff: - Ted Percival - http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=20;filename=ccache-profile.patch;att=1;bug=215849 - -05_nfs_fix.diff: - John Coiner - http://lists.samba.org/archive/ccache/2007q1/000265.html - -06_md.diff: - Andrea Bittau - http://darkircop.org/ccache/ccache-2.4-md.patch (downloaded on 2007-06-30) - -07_cachedirtag.diff: - Karl Chen - http://lists.samba.org/archive/ccache/2008q1/000316.html (downloaded on 2008-02-02) - -08_manpage_hyphens.diff: - Francois Marier - Made especially for the Debian package. - -09_respect_ldflags.diff: - Lisa Seelye - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ccache/files/ccache-2.4-respectflags.patch?rev=1.1&view=markup - -10_lru_cleanup.diff: - RW - http://lists.samba.org/archive/ccache/2008q2/000339.html (downloaded on 2008-04-11) - -11_utimes.diff: - Robin H. Johnson - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ccache/files/ccache-2.4-utimes.patch?rev=1.1&view=markup - -12_cachesize_permissions.diff: - Francois Marier - Made especially for the Debian package to fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=332527 diff --git a/CCache/debian/rules b/CCache/debian/rules deleted file mode 100644 index c5b538b78..000000000 --- a/CCache/debian/rules +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) -else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -config.status: configure - dh_testdir - - # Apply Debian specific patches - cp $(CURDIR)/ccache.c $(CURDIR)/ccache.c.unpatched - cp $(CURDIR)/util.c $(CURDIR)/util.c.unpatched - cp $(CURDIR)/ccache.1 $(CURDIR)/ccache.1.unpatched - cp $(CURDIR)/ccache.h $(CURDIR)/ccache.h.unpatched - cp $(CURDIR)/ccache.yo $(CURDIR)/ccache.yo.unpatched - cp $(CURDIR)/config.h.in $(CURDIR)/config.h.in.unpatched - cp $(CURDIR)/configure $(CURDIR)/configure.unpatched - cp $(CURDIR)/configure.in $(CURDIR)/configure.in.unpatched - cp $(CURDIR)/Makefile.in $(CURDIR)/Makefile.in.unpatched - if test ! -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo APPLYING PATCH\: $${patch##*/};\ - patch -p0 < $$patch ;\ - done ;\ - touch patch-stamp ;\ - fi - chmod +x $(CURDIR)/manage-cache.sh - - ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - -build: build-stamp - -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Unapply patches - -test -r $(CURDIR)/ccache.c.unpatched && mv $(CURDIR)/ccache.c.unpatched $(CURDIR)/ccache.c - -test -r $(CURDIR)/util.c.unpatched && mv $(CURDIR)/util.c.unpatched $(CURDIR)/util.c - -test -r $(CURDIR)/ccache.1.unpatched && mv $(CURDIR)/ccache.1.unpatched $(CURDIR)/ccache.1 - -test -r $(CURDIR)/ccache.h.unpatched && mv $(CURDIR)/ccache.h.unpatched $(CURDIR)/ccache.h - -test -r $(CURDIR)/ccache.yo.unpatched && mv $(CURDIR)/ccache.yo.unpatched $(CURDIR)/ccache.yo - -test -r $(CURDIR)/config.h.in.unpatched && mv $(CURDIR)/config.h.in.unpatched $(CURDIR)/config.h.in - -test -r $(CURDIR)/configure.unpatched && mv $(CURDIR)/configure.unpatched $(CURDIR)/configure - -test -r $(CURDIR)/configure.in.unpatched && mv $(CURDIR)/configure.in.unpatched $(CURDIR)/configure.in - -test -r $(CURDIR)/Makefile.in.unpatched && mv $(CURDIR)/Makefile.in.unpatched $(CURDIR)/Makefile.in - -rm -f $(CURDIR)/manage-cache.sh - -rm -f patch-stamp - - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean - - # Update config.sub and config.guess - -test -r /usr/share/misc/config.sub && \ - cp -f /usr/share/misc/config.sub config.sub - -test -r /usr/share/misc/config.guess && \ - cp -f /usr/share/misc/config.guess config.guess - - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/ccache. - $(MAKE) install prefix=$(CURDIR)/debian/ccache/usr - - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-gcc - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-g++ - set -e; for ver in 2.95 3.0 3.2 3.3 3.4 4.0 4.1 4.2 4.3; do \ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-gcc-$$ver; \ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/gcc-$$ver; \ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/$(DEB_BUILD_GNU_TYPE)-g++-$$ver; \ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/g++-$$ver; \ - done - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/cc - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/c++ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/gcc - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/g++ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-c++ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-cc - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-g++ - ln -s ../../bin/ccache $(CURDIR)/debian/ccache/usr/lib/ccache/i586-mingw32msvc-gcc - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installmenu - dh_installcron - dh_installman - dh_installinfo - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/CCache/debian/update-ccache b/CCache/debian/update-ccache deleted file mode 100644 index 0ef97a140..000000000 --- a/CCache/debian/update-ccache +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Update compiler links to ccache (in /usr/local/bin) -# -# The idea is that /usr/local/bin is ahead of /usr/bin in your PATH, so adding -# the link /usr/local/bin/cc -> /usr/bin/ccache means that it is run instead of -# /usr/bin/cc -# -# Written by: Behan Webster -# - -DIRECTORY=/usr/local/bin -CCACHE=/usr/bin/ccache -CCDIR=/usr/lib/ccache - -usage() { - echo "Usage: `basename $0` [--directory ] [--remove]" - exit 0 -} - -while [ $# -gt 0 ] ; do - case "$1" in - -d*|--d*|--directory) DIRECTORY=$2; shift; shift;; - -h*|--h*|--help) usage;; - -r*|--r*|--remove) REMOVE=1; shift;; - -t*|--t*|--test) TEST=echo; shift;; - esac -done - -for FILE in `cd $CCDIR; ls` ; do - LINK=$DIRECTORY/$FILE - if [ -z "$REMOVE" ] ; then - # Add link - $TEST ln -fs $CCACHE $LINK - else - # Remove link - if [ -L "$LINK" ] ; then - $TEST rm -f $LINK - fi - fi -done - -# vim: sw=4 ts=4 diff --git a/CCache/debian/watch b/CCache/debian/watch deleted file mode 100644 index a72959e50..000000000 --- a/CCache/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=2 -http://samba.org/ftp/ccache/ccache-(.*)\.tar\.gz diff --git a/CCache/execute.c b/CCache/execute.c deleted file mode 100644 index 165b91e66..000000000 --- a/CCache/execute.c +++ /dev/null @@ -1,286 +0,0 @@ -/* - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "ccache.h" - -#ifdef _WIN32 -char *argvtos(char **argv) -{ - int i, len; - char *ptr, *str; - - for (i = 0, len = 0; argv[i]; i++) { - len += strlen(argv[i]) + 3; - } - - str = ptr = (char *)malloc(len + 1); - if (str == NULL) - return NULL; - - for (i = 0; argv[i]; i++) { - len = strlen(argv[i]); - *ptr++ = '"'; - memcpy(ptr, argv[i], len); - ptr += len; - *ptr++ = '"'; - *ptr++ = ' '; - } - *ptr = 0; - - return str; -} -#endif - -/* - execute a compiler backend, capturing all output to the given paths - the full path to the compiler to run is in argv[0] -*/ -int execute(char **argv, - const char *path_stdout, - const char *path_stderr) -{ -#ifdef _WIN32 - -#if 1 - PROCESS_INFORMATION pinfo; - STARTUPINFO sinfo; - BOOL ret; - DWORD exitcode; - char *args; - HANDLE fd_out, fd_err; - SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - - /* TODO: needs moving after possible exit() below, but before stdout is redirected */ - if (ccache_verbose) { - display_execute_args(argv); - } - - fd_out = CreateFile(path_stdout, GENERIC_WRITE, 0, &sa, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if (fd_out == INVALID_HANDLE_VALUE) { - return STATUS_NOCACHE; - } - - fd_err = CreateFile(path_stderr, GENERIC_WRITE, 0, &sa, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if (fd_err == INVALID_HANDLE_VALUE) { - return STATUS_NOCACHE; - } - - ZeroMemory(&pinfo, sizeof(PROCESS_INFORMATION)); - ZeroMemory(&sinfo, sizeof(STARTUPINFO)); - - sinfo.cb = sizeof(STARTUPINFO); - sinfo.hStdError = fd_err; - sinfo.hStdOutput = fd_out; - sinfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); - sinfo.dwFlags |= STARTF_USESTDHANDLES; - - args = argvtos(argv); - - ret = CreateProcessA(argv[0], args, NULL, NULL, TRUE, 0, NULL, NULL, - &sinfo, &pinfo); - - free(args); - CloseHandle(fd_out); - CloseHandle(fd_err); - - if (ret == 0) - return -1; - - WaitForSingleObject(pinfo.hProcess, INFINITE); - GetExitCodeProcess(pinfo.hProcess, &exitcode); - CloseHandle(pinfo.hProcess); - CloseHandle(pinfo.hThread); - - return exitcode; -#else /* possibly slightly faster */ - /* needs fixing to quote commandline options to handle spaces in CCACHE_DIR etc */ - int status = -2; - int fd, std_od = -1, std_ed = -1; - - /* TODO: needs moving after possible exit() below, but before stdout is redirected */ - if (ccache_verbose) { - display_execute_args(argv); - } - - unlink(path_stdout); - std_od = _dup(1); - fd = _open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); - if (fd == -1) { - exit(STATUS_NOCACHE); - } - _dup2(fd, 1); - _close(fd); - - unlink(path_stderr); - fd = _open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); - std_ed = _dup(2); - if (fd == -1) { - exit(STATUS_NOCACHE); - } - _dup2(fd, 2); - _close(fd); - - /* Spawn process (_exec* familly doesn't return) */ - status = _spawnv(_P_WAIT, argv[0], (const char **)argv); - - /* Restore descriptors */ - if (std_od != -1) _dup2(std_od, 1); - if (std_ed != -1) _dup2(std_ed, 2); - _flushall(); - - return (status>0); - -#endif - -#else - pid_t pid; - int status; - - pid = fork(); - if (pid == -1) fatal("Failed to fork"); - - if (pid == 0) { - int fd; - - /* TODO: needs moving after possible exit() below, but before stdout is redirected */ - if (ccache_verbose) { - display_execute_args(argv); - } - - unlink(path_stdout); - fd = open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); - if (fd == -1) { - exit(STATUS_NOCACHE); - } - dup2(fd, 1); - close(fd); - - unlink(path_stderr); - fd = open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); - if (fd == -1) { - exit(STATUS_NOCACHE); - } - dup2(fd, 2); - close(fd); - - exit(execv(argv[0], argv)); - } - - if (waitpid(pid, &status, 0) != pid) { - fatal("waitpid failed"); - } - - if (WEXITSTATUS(status) == 0 && WIFSIGNALED(status)) { - return -1; - } - - return WEXITSTATUS(status); -#endif -} - - -/* - find an executable by name in $PATH. Exclude any that are links to exclude_name -*/ -char *find_executable(const char *name, const char *exclude_name) -{ -#if _WIN32 - (void)exclude_name; - DWORD ret; - char namebuf[MAX_PATH]; - - ret = SearchPathA(getenv("CCACHE_PATH"), name, ".exe", - sizeof(namebuf), namebuf, NULL); - if (ret != 0) { - return x_strdup(namebuf); - } - - return NULL; -#else - char *path; - char *tok; - struct stat st1, st2; - - if (*name == '/') { - return x_strdup(name); - } - - path = getenv("CCACHE_PATH"); - if (!path) { - path = getenv("PATH"); - } - if (!path) { - cc_log("no PATH variable!?\n"); - stats_update(STATS_ENVIRONMMENT); - return NULL; - } - - path = x_strdup(path); - - /* search the path looking for the first compiler of the right name - that isn't us */ - for (tok=strtok(path,":"); tok; tok = strtok(NULL, ":")) { - char *fname; - x_asprintf(&fname, "%s/%s", tok, name); - /* look for a normal executable file */ - if (access(fname, X_OK) == 0 && - lstat(fname, &st1) == 0 && - stat(fname, &st2) == 0 && - S_ISREG(st2.st_mode)) { - /* if its a symlink then ensure it doesn't - point at something called exclude_name */ - if (S_ISLNK(st1.st_mode)) { - char *buf = x_realpath(fname); - if (buf) { - char *p = str_basename(buf); - if (strcmp(p, exclude_name) == 0) { - /* its a link to "ccache" ! */ - free(p); - free(buf); - continue; - } - free(buf); - free(p); - } - } - - /* found it! */ - free(path); - return fname; - } - free(fname); - } - - return NULL; -#endif -} - -void display_execute_args(char **argv) -{ - if (argv) { - printf("ccache executing: "); - while (*argv) { - printf("%s ", *argv); - ++argv; - } - printf("\n"); - fflush(stdout); - } -} diff --git a/CCache/hash.c b/CCache/hash.c deleted file mode 100644 index d0ce8a6ba..000000000 --- a/CCache/hash.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -/* - simple front-end functions to mdfour code -*/ - -#include "ccache.h" - -static struct mdfour md; - -void hash_buffer(const char *s, int len) -{ - mdfour_update(&md, (unsigned char *)s, len); -} - -void hash_start(void) -{ - mdfour_begin(&md); -} - -void hash_string(const char *s) -{ - hash_buffer(s, strlen(s)); -} - -void hash_int(int x) -{ - hash_buffer((char *)&x, sizeof(x)); -} - -/* add contents of a file to the hash */ -void hash_file(const char *fname) -{ - char buf[1024]; - int fd, n; - - fd = open(fname, O_RDONLY|O_BINARY); - if (fd == -1) { - cc_log("Failed to open %s\n", fname); - fatal("hash_file"); - } - - while ((n = read(fd, buf, sizeof(buf))) > 0) { - hash_buffer(buf, n); - } - close(fd); -} - -/* return the hash result as a static string */ -char *hash_result(void) -{ - unsigned char sum[16]; - static char ret[53]; - int i; - - hash_buffer(NULL, 0); - mdfour_result(&md, sum); - - for (i=0;i<16;i++) { - sprintf(&ret[i*2], "%02x", (unsigned)sum[i]); - } - sprintf(&ret[i*2], "-%u", (unsigned)md.totalN); - - return ret; -} diff --git a/CCache/install-sh b/CCache/install-sh deleted file mode 100755 index 58719246f..000000000 --- a/CCache/install-sh +++ /dev/null @@ -1,238 +0,0 @@ -#! /bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. -# - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/CCache/mdfour.c b/CCache/mdfour.c deleted file mode 100644 index b098e0215..000000000 --- a/CCache/mdfour.c +++ /dev/null @@ -1,284 +0,0 @@ -/* - a implementation of MD4 designed for use in the SMB authentication protocol - Copyright (C) Andrew Tridgell 1997-1998. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "ccache.h" - -/* NOTE: This code makes no attempt to be fast! - - It assumes that a int is at least 32 bits long -*/ - -static struct mdfour *m; - -#define MASK32 (0xffffffff) - -#define F(X,Y,Z) ((((X)&(Y)) | ((~(X))&(Z)))) -#define G(X,Y,Z) ((((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z)))) -#define H(X,Y,Z) (((X)^(Y)^(Z))) -#define lshift(x,s) (((((x)<<(s))&MASK32) | (((x)>>(32-(s)))&MASK32))) - -#define ROUND1(a,b,c,d,k,s) a = lshift((a + F(b,c,d) + M[k])&MASK32, s) -#define ROUND2(a,b,c,d,k,s) a = lshift((a + G(b,c,d) + M[k] + 0x5A827999)&MASK32,s) -#define ROUND3(a,b,c,d,k,s) a = lshift((a + H(b,c,d) + M[k] + 0x6ED9EBA1)&MASK32,s) - -/* this applies md4 to 64 byte chunks */ -static void mdfour64(uint32 *M) -{ - uint32 AA, BB, CC, DD; - uint32 A,B,C,D; - - A = m->A; B = m->B; C = m->C; D = m->D; - AA = A; BB = B; CC = C; DD = D; - - ROUND1(A,B,C,D, 0, 3); ROUND1(D,A,B,C, 1, 7); - ROUND1(C,D,A,B, 2, 11); ROUND1(B,C,D,A, 3, 19); - ROUND1(A,B,C,D, 4, 3); ROUND1(D,A,B,C, 5, 7); - ROUND1(C,D,A,B, 6, 11); ROUND1(B,C,D,A, 7, 19); - ROUND1(A,B,C,D, 8, 3); ROUND1(D,A,B,C, 9, 7); - ROUND1(C,D,A,B, 10, 11); ROUND1(B,C,D,A, 11, 19); - ROUND1(A,B,C,D, 12, 3); ROUND1(D,A,B,C, 13, 7); - ROUND1(C,D,A,B, 14, 11); ROUND1(B,C,D,A, 15, 19); - - - ROUND2(A,B,C,D, 0, 3); ROUND2(D,A,B,C, 4, 5); - ROUND2(C,D,A,B, 8, 9); ROUND2(B,C,D,A, 12, 13); - ROUND2(A,B,C,D, 1, 3); ROUND2(D,A,B,C, 5, 5); - ROUND2(C,D,A,B, 9, 9); ROUND2(B,C,D,A, 13, 13); - ROUND2(A,B,C,D, 2, 3); ROUND2(D,A,B,C, 6, 5); - ROUND2(C,D,A,B, 10, 9); ROUND2(B,C,D,A, 14, 13); - ROUND2(A,B,C,D, 3, 3); ROUND2(D,A,B,C, 7, 5); - ROUND2(C,D,A,B, 11, 9); ROUND2(B,C,D,A, 15, 13); - - ROUND3(A,B,C,D, 0, 3); ROUND3(D,A,B,C, 8, 9); - ROUND3(C,D,A,B, 4, 11); ROUND3(B,C,D,A, 12, 15); - ROUND3(A,B,C,D, 2, 3); ROUND3(D,A,B,C, 10, 9); - ROUND3(C,D,A,B, 6, 11); ROUND3(B,C,D,A, 14, 15); - ROUND3(A,B,C,D, 1, 3); ROUND3(D,A,B,C, 9, 9); - ROUND3(C,D,A,B, 5, 11); ROUND3(B,C,D,A, 13, 15); - ROUND3(A,B,C,D, 3, 3); ROUND3(D,A,B,C, 11, 9); - ROUND3(C,D,A,B, 7, 11); ROUND3(B,C,D,A, 15, 15); - - A += AA; B += BB; - C += CC; D += DD; - - A &= MASK32; B &= MASK32; - C &= MASK32; D &= MASK32; - - m->A = A; m->B = B; m->C = C; m->D = D; -} - -static void copy64(uint32 *M, const unsigned char *in) -{ - int i; - - for (i=0;i<16;i++) - M[i] = (in[i*4+3]<<24) | (in[i*4+2]<<16) | - (in[i*4+1]<<8) | (in[i*4+0]<<0); -} - -static void copy4(unsigned char *out,uint32 x) -{ - out[0] = x&0xFF; - out[1] = (x>>8)&0xFF; - out[2] = (x>>16)&0xFF; - out[3] = (x>>24)&0xFF; -} - -void mdfour_begin(struct mdfour *md) -{ - md->A = 0x67452301; - md->B = 0xefcdab89; - md->C = 0x98badcfe; - md->D = 0x10325476; - md->totalN = 0; - md->tail_len = 0; -} - - -static void mdfour_tail(const unsigned char *in, int n) -{ - unsigned char buf[128]; - uint32 M[16]; - uint32 b; - - m->totalN += n; - - b = m->totalN * 8; - - memset(buf, 0, 128); - if (n) memcpy(buf, in, n); - buf[n] = 0x80; - - if (n <= 55) { - copy4(buf+56, b); - copy64(M, buf); - mdfour64(M); - } else { - copy4(buf+120, b); - copy64(M, buf); - mdfour64(M); - copy64(M, buf+64); - mdfour64(M); - } -} - -void mdfour_update(struct mdfour *md, const unsigned char *in, int n) -{ - uint32 M[16]; - - m = md; - - if (in == NULL) { - mdfour_tail(md->tail, md->tail_len); - return; - } - - if (md->tail_len) { - int len = 64 - md->tail_len; - if (len > n) len = n; - memcpy(md->tail+md->tail_len, in, len); - md->tail_len += len; - n -= len; - in += len; - if (md->tail_len == 64) { - copy64(M, md->tail); - mdfour64(M); - m->totalN += 64; - md->tail_len = 0; - } - } - - while (n >= 64) { - copy64(M, in); - mdfour64(M); - in += 64; - n -= 64; - m->totalN += 64; - } - - if (n) { - memcpy(md->tail, in, n); - md->tail_len = n; - } -} - - -void mdfour_result(struct mdfour *md, unsigned char *out) -{ - m = md; - - copy4(out, m->A); - copy4(out+4, m->B); - copy4(out+8, m->C); - copy4(out+12, m->D); -} - - -void mdfour(unsigned char *out, const unsigned char *in, int n) -{ - struct mdfour md; - mdfour_begin(&md); - mdfour_update(&md, in, n); - mdfour_update(&md, NULL, 0); - mdfour_result(&md, out); -} - -#ifdef TEST_MDFOUR -static void file_checksum1(char *fname) -{ - int fd, i; - struct mdfour md; - unsigned char buf[1024], sum[16]; - unsigned chunk; - - fd = open(fname,O_RDONLY|O_BINARY); - if (fd == -1) { - perror("fname"); - exit(1); - } - - chunk = 1 + random() % (sizeof(buf) - 1); - - mdfour_begin(&md); - - while (1) { - int n = read(fd, buf, chunk); - if (n >= 0) { - mdfour_update(&md, buf, n); - } - if (n < chunk) break; - } - - close(fd); - - mdfour_update(&md, NULL, 0); - - mdfour_result(&md, sum); - - for (i=0;i<16;i++) - printf("%02x", sum[i]); - printf("\n"); -} - -#if 0 -#include "../md4.h" - -static void file_checksum2(char *fname) -{ - int fd, i; - MDstruct md; - unsigned char buf[64], sum[16]; - - fd = open(fname,O_RDONLY|O_BINARY); - if (fd == -1) { - perror("fname"); - exit(1); - } - - MDbegin(&md); - - while (1) { - int n = read(fd, buf, sizeof(buf)); - if (n <= 0) break; - MDupdate(&md, buf, n*8); - } - - if (!md.done) { - MDupdate(&md, buf, 0); - } - - close(fd); - - memcpy(sum, md.buffer, 16); - - for (i=0;i<16;i++) - printf("%02x", sum[i]); - printf("\n"); -} -#endif - - int main(int argc, char *argv[]) -{ - file_checksum1(argv[1]); -#if 0 - file_checksum2(argv[1]); -#endif - return 0; -} -#endif diff --git a/CCache/mdfour.h b/CCache/mdfour.h deleted file mode 100644 index 92ef2f831..000000000 --- a/CCache/mdfour.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Unix SMB/Netbios implementation. - Version 1.9. - a implementation of MD4 designed for use in the SMB authentication protocol - Copyright (C) Andrew Tridgell 1997-1998. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -struct mdfour { - uint32 A, B, C, D; - uint32 totalN; - unsigned char tail[64]; - unsigned tail_len; -}; - -void mdfour_begin(struct mdfour *md); -void mdfour_update(struct mdfour *md, const unsigned char *in, int n); -void mdfour_result(struct mdfour *md, unsigned char *out); -void mdfour(unsigned char *out, const unsigned char *in, int n); - - - - diff --git a/CCache/packaging/README b/CCache/packaging/README deleted file mode 100644 index fadc342c4..000000000 --- a/CCache/packaging/README +++ /dev/null @@ -1,5 +0,0 @@ -These packaging files are contributd by users of ccache. I do not -maintain them, and they may well need updating before you use them. - -I don't distribute binary packages of ccache myself, but if you wish -to add ccache to a distribution then that's OK diff --git a/CCache/packaging/ccache.spec b/CCache/packaging/ccache.spec deleted file mode 100644 index 0972121d7..000000000 --- a/CCache/packaging/ccache.spec +++ /dev/null @@ -1,37 +0,0 @@ -Summary: Compiler Cache -Name: ccache -Version: 2.3 -Release: 1 -Group: Development/Languages -License: GPL -URL: http://ccache.samba.org/ -Source: ccache-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -ccache caches gcc output files - -%prep -%setup -q - -%build -%configure -make - -install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} -install -m 0755 ccache $RPM_BUILD_ROOT%{_bindir} -install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1 - -%files -%defattr(-,root,root) -%doc README -%{_mandir}/man1/ccache.1* -%{_bindir}/ccache - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%changelog -* Mon Apr 01 2002 Peter Jones -- Created the package diff --git a/CCache/snprintf.c b/CCache/snprintf.c deleted file mode 100644 index 32187c1a5..000000000 --- a/CCache/snprintf.c +++ /dev/null @@ -1,962 +0,0 @@ -/* - * Copyright Patrick Powell 1995 - * This code is based on code written by Patrick Powell (papowell@astart.com) - * It may be used for any purpose as long as this notice remains intact - * on all source code distributions - */ - -/************************************************************** - * Original: - * Patrick Powell Tue Apr 11 09:48:21 PDT 1995 - * A bombproof version of doprnt (dopr) included. - * Sigh. This sort of thing is always nasty do deal with. Note that - * the version here does not include floating point... - * - * snprintf() is used instead of sprintf() as it does limit checks - * for string length. This covers a nasty loophole. - * - * The other functions are there to prevent NULL pointers from - * causing nast effects. - * - * More Recently: - * Brandon Long 9/15/96 for mutt 0.43 - * This was ugly. It is still ugly. I opted out of floating point - * numbers, but the formatter understands just about everything - * from the normal C string format, at least as far as I can tell from - * the Solaris 2.5 printf(3S) man page. - * - * Brandon Long 10/22/97 for mutt 0.87.1 - * Ok, added some minimal floating point support, which means this - * probably requires libm on most operating systems. Don't yet - * support the exponent (e,E) and sigfig (g,G). Also, fmtint() - * was pretty badly broken, it just wasn't being exercised in ways - * which showed it, so that's been fixed. Also, formated the code - * to mutt conventions, and removed dead code left over from the - * original. Also, there is now a builtin-test, just compile with: - * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm - * and run snprintf for results. - * - * Thomas Roessler 01/27/98 for mutt 0.89i - * The PGP code was using unsigned hexadecimal formats. - * Unfortunately, unsigned formats simply didn't work. - * - * Michael Elkins 03/05/98 for mutt 0.90.8 - * The original code assumed that both snprintf() and vsnprintf() were - * missing. Some systems only have snprintf() but not vsnprintf(), so - * the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF. - * - * Andrew Tridgell (tridge@samba.org) Oct 1998 - * fixed handling of %.0f - * added test for HAVE_LONG_DOUBLE - * - * tridge@samba.org, idra@samba.org, April 2001 - * got rid of fcvt code (twas buggy and made testing harder) - * added C99 semantics - * - **************************************************************/ - -#ifndef NO_CONFIG_H /* for some tests */ -#include "config.h" -#endif - -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif -#include -#include -#ifdef HAVE_STDLIB_H -#include -#endif - -#if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) && defined(HAVE_C99_VSNPRINTF) -/* only include stdio.h if we are not re-defining snprintf or vsnprintf */ -#include - /* make the compiler happy with an empty file */ - void dummy_snprintf(void) {} -#else - -#ifdef HAVE_LONG_DOUBLE -#define LDOUBLE long double -#else -#define LDOUBLE double -#endif - -#ifdef HAVE_LONG_LONG -#define LLONG long long -#else -#define LLONG long -#endif - -static size_t dopr(char *buffer, size_t maxlen, const char *format, - va_list args); -static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, - char *value, int flags, int min, int max); -static void fmtint(char *buffer, size_t *currlen, size_t maxlen, - long value, int base, int min, int max, int flags); -static void fmtfp(char *buffer, size_t *currlen, size_t maxlen, - LDOUBLE fvalue, int min, int max, int flags); -static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c); - -/* - * dopr(): poor man's version of doprintf - */ - -/* format read states */ -#define DP_S_DEFAULT 0 -#define DP_S_FLAGS 1 -#define DP_S_MIN 2 -#define DP_S_DOT 3 -#define DP_S_MAX 4 -#define DP_S_MOD 5 -#define DP_S_CONV 6 -#define DP_S_DONE 7 - -/* format flags - Bits */ -#define DP_F_MINUS (1 << 0) -#define DP_F_PLUS (1 << 1) -#define DP_F_SPACE (1 << 2) -#define DP_F_NUM (1 << 3) -#define DP_F_ZERO (1 << 4) -#define DP_F_UP (1 << 5) -#define DP_F_UNSIGNED (1 << 6) - -/* Conversion Flags */ -#define DP_C_SHORT 1 -#define DP_C_LONG 2 -#define DP_C_LDOUBLE 3 -#define DP_C_LLONG 4 - -#define char_to_int(p) ((p)- '0') -#ifndef MAX -#define MAX(p,q) (((p) >= (q)) ? (p) : (q)) -#endif - -static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args) -{ - char ch; - LLONG value; - LDOUBLE fvalue; - char *strvalue; - int min; - int max; - int state; - int flags; - int cflags; - size_t currlen; - - state = DP_S_DEFAULT; - currlen = flags = cflags = min = 0; - max = -1; - ch = *format++; - - while (state != DP_S_DONE) { - if (ch == '\0') - state = DP_S_DONE; - - switch(state) { - case DP_S_DEFAULT: - if (ch == '%') - state = DP_S_FLAGS; - else - dopr_outch (buffer, &currlen, maxlen, ch); - ch = *format++; - break; - case DP_S_FLAGS: - switch (ch) { - case '-': - flags |= DP_F_MINUS; - ch = *format++; - break; - case '+': - flags |= DP_F_PLUS; - ch = *format++; - break; - case ' ': - flags |= DP_F_SPACE; - ch = *format++; - break; - case '#': - flags |= DP_F_NUM; - ch = *format++; - break; - case '0': - flags |= DP_F_ZERO; - ch = *format++; - break; - default: - state = DP_S_MIN; - break; - } - break; - case DP_S_MIN: - if (isdigit((unsigned char)ch)) { - min = 10*min + char_to_int (ch); - ch = *format++; - } else if (ch == '*') { - min = va_arg (args, int); - ch = *format++; - state = DP_S_DOT; - } else { - state = DP_S_DOT; - } - break; - case DP_S_DOT: - if (ch == '.') { - state = DP_S_MAX; - ch = *format++; - } else { - state = DP_S_MOD; - } - break; - case DP_S_MAX: - if (isdigit((unsigned char)ch)) { - if (max < 0) - max = 0; - max = 10*max + char_to_int (ch); - ch = *format++; - } else if (ch == '*') { - max = va_arg (args, int); - ch = *format++; - state = DP_S_MOD; - } else { - state = DP_S_MOD; - } - break; - case DP_S_MOD: - switch (ch) { - case 'h': - cflags = DP_C_SHORT; - ch = *format++; - break; - case 'l': - cflags = DP_C_LONG; - ch = *format++; - if (ch == 'l') { /* It's a long long */ - cflags = DP_C_LLONG; - ch = *format++; - } - break; - case 'L': - cflags = DP_C_LDOUBLE; - ch = *format++; - break; - default: - break; - } - state = DP_S_CONV; - break; - case DP_S_CONV: - switch (ch) { - case 'd': - case 'i': - if (cflags == DP_C_SHORT) - value = va_arg (args, int); - else if (cflags == DP_C_LONG) - value = va_arg (args, long int); - else if (cflags == DP_C_LLONG) - value = va_arg (args, LLONG); - else - value = va_arg (args, int); - fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); - break; - case 'o': - flags |= DP_F_UNSIGNED; - if (cflags == DP_C_SHORT) - value = va_arg (args, unsigned int); - else if (cflags == DP_C_LONG) - value = (long)va_arg (args, unsigned long int); - else if (cflags == DP_C_LLONG) - value = (long)va_arg (args, unsigned LLONG); - else - value = (long)va_arg (args, unsigned int); - fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags); - break; - case 'u': - flags |= DP_F_UNSIGNED; - if (cflags == DP_C_SHORT) - value = va_arg (args, unsigned int); - else if (cflags == DP_C_LONG) - value = (long)va_arg (args, unsigned long int); - else if (cflags == DP_C_LLONG) - value = (LLONG)va_arg (args, unsigned LLONG); - else - value = (long)va_arg (args, unsigned int); - fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); - break; - case 'X': - flags |= DP_F_UP; - case 'x': - flags |= DP_F_UNSIGNED; - if (cflags == DP_C_SHORT) - value = va_arg (args, unsigned int); - else if (cflags == DP_C_LONG) - value = (long)va_arg (args, unsigned long int); - else if (cflags == DP_C_LLONG) - value = (LLONG)va_arg (args, unsigned LLONG); - else - value = (long)va_arg (args, unsigned int); - fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags); - break; - case 'f': - if (cflags == DP_C_LDOUBLE) - fvalue = va_arg (args, LDOUBLE); - else - fvalue = va_arg (args, double); - /* um, floating point? */ - fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags); - break; - case 'E': - flags |= DP_F_UP; - case 'e': - if (cflags == DP_C_LDOUBLE) - fvalue = va_arg (args, LDOUBLE); - else - fvalue = va_arg (args, double); - break; - case 'G': - flags |= DP_F_UP; - case 'g': - if (cflags == DP_C_LDOUBLE) - fvalue = va_arg (args, LDOUBLE); - else - fvalue = va_arg (args, double); - break; - case 'c': - dopr_outch (buffer, &currlen, maxlen, va_arg (args, int)); - break; - case 's': - strvalue = va_arg (args, char *); - if (!strvalue) strvalue = "(NULL)"; - if (max == -1) { - max = strlen(strvalue); - } - if (min > 0 && max >= 0 && min > max) max = min; - fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max); - break; - case 'p': - strvalue = (char *)va_arg(args, void *); - fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags); - break; - case 'n': - if (cflags == DP_C_SHORT) { - short int *num; - num = va_arg (args, short int *); - *num = currlen; - } else if (cflags == DP_C_LONG) { - long int *num; - num = va_arg (args, long int *); - *num = (long int)currlen; - } else if (cflags == DP_C_LLONG) { - LLONG *num; - num = va_arg (args, LLONG *); - *num = (LLONG)currlen; - } else { - int *num; - num = va_arg (args, int *); - *num = currlen; - } - break; - case '%': - dopr_outch (buffer, &currlen, maxlen, ch); - break; - case 'w': - /* not supported yet, treat as next char */ - ch = *format++; - break; - default: - /* Unknown, skip */ - break; - } - ch = *format++; - state = DP_S_DEFAULT; - flags = cflags = min = 0; - max = -1; - break; - case DP_S_DONE: - break; - default: - /* hmm? */ - break; /* some picky compilers need this */ - } - } - if (maxlen != 0) { - if (currlen < maxlen - 1) - buffer[currlen] = '\0'; - else if (maxlen > 0) - buffer[maxlen - 1] = '\0'; - } - - return currlen; -} - -static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, - char *value, int flags, int min, int max) -{ - int padlen, strln; /* amount to pad */ - int cnt = 0; - -#ifdef DEBUG_SNPRINTF - printf("fmtstr min=%d max=%d s=[%s]\n", min, max, value); -#endif - if (value == 0) { - value = ""; - } - - for (strln = 0; value[strln]; ++strln); /* strlen */ - padlen = min - strln; - if (padlen < 0) - padlen = 0; - if (flags & DP_F_MINUS) - padlen = -padlen; /* Left Justify */ - - while ((padlen > 0) && (cnt < max)) { - dopr_outch (buffer, currlen, maxlen, ' '); - --padlen; - ++cnt; - } - while (*value && (cnt < max)) { - dopr_outch (buffer, currlen, maxlen, *value++); - ++cnt; - } - while ((padlen < 0) && (cnt < max)) { - dopr_outch (buffer, currlen, maxlen, ' '); - ++padlen; - ++cnt; - } -} - -/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ - -static void fmtint(char *buffer, size_t *currlen, size_t maxlen, - long value, int base, int min, int max, int flags) -{ - int signvalue = 0; - unsigned long uvalue; - char convert[20]; - int place = 0; - int spadlen = 0; /* amount to space pad */ - int zpadlen = 0; /* amount to zero pad */ - int caps = 0; - - if (max < 0) - max = 0; - - uvalue = value; - - if(!(flags & DP_F_UNSIGNED)) { - if( value < 0 ) { - signvalue = '-'; - uvalue = -value; - } else { - if (flags & DP_F_PLUS) /* Do a sign (+/i) */ - signvalue = '+'; - else if (flags & DP_F_SPACE) - signvalue = ' '; - } - } - - if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ - - do { - convert[place++] = - (caps? "0123456789ABCDEF":"0123456789abcdef") - [uvalue % (unsigned)base ]; - uvalue = (uvalue / (unsigned)base ); - } while(uvalue && (place < 20)); - if (place == 20) place--; - convert[place] = 0; - - zpadlen = max - place; - spadlen = min - MAX (max, place) - (signvalue ? 1 : 0); - if (zpadlen < 0) zpadlen = 0; - if (spadlen < 0) spadlen = 0; - if (flags & DP_F_ZERO) { - zpadlen = MAX(zpadlen, spadlen); - spadlen = 0; - } - if (flags & DP_F_MINUS) - spadlen = -spadlen; /* Left Justifty */ - -#ifdef DEBUG_SNPRINTF - printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n", - zpadlen, spadlen, min, max, place); -#endif - - /* Spaces */ - while (spadlen > 0) { - dopr_outch (buffer, currlen, maxlen, ' '); - --spadlen; - } - - /* Sign */ - if (signvalue) - dopr_outch (buffer, currlen, maxlen, signvalue); - - /* Zeros */ - if (zpadlen > 0) { - while (zpadlen > 0) { - dopr_outch (buffer, currlen, maxlen, '0'); - --zpadlen; - } - } - - /* Digits */ - while (place > 0) - dopr_outch (buffer, currlen, maxlen, convert[--place]); - - /* Left Justified spaces */ - while (spadlen < 0) { - dopr_outch (buffer, currlen, maxlen, ' '); - ++spadlen; - } -} - -static LDOUBLE abs_val(LDOUBLE value) -{ - LDOUBLE result = value; - - if (value < 0) - result = -value; - - return result; -} - -static LDOUBLE POW10(int exp) -{ - LDOUBLE result = 1; - - while (exp) { - result *= 10; - exp--; - } - - return result; -} - -static LLONG ROUND(LDOUBLE value) -{ - LLONG intpart; - - intpart = (LLONG)value; - value = value - intpart; - if (value >= 0.5) intpart++; - - return intpart; -} - -/* a replacement for modf that doesn't need the math library. Should - be portable, but slow */ -static double my_modf(double x0, double *iptr) -{ - int i; - long l; - double x = x0; - double f = 1.0; - - for (i=0;i<100;i++) { - l = (long)x; - if (l <= (x+1) && l >= (x-1)) break; - x *= 0.1; - f *= 10.0; - } - - if (i == 100) { - /* yikes! the number is beyond what we can handle. What do we do? */ - (*iptr) = 0; - return 0; - } - - if (i != 0) { - double i2; - double ret; - - ret = my_modf(x0-l*f, &i2); - (*iptr) = l*f + i2; - return ret; - } - - (*iptr) = l; - return x - (*iptr); -} - - -static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, - LDOUBLE fvalue, int min, int max, int flags) -{ - int signvalue = 0; - double ufvalue; - char iconvert[311]; - char fconvert[311]; - int iplace = 0; - int fplace = 0; - int padlen = 0; /* amount to pad */ - int zpadlen = 0; - int caps = 0; - int index; - double intpart; - double fracpart; - double temp; - - /* - * AIX manpage says the default is 0, but Solaris says the default - * is 6, and sprintf on AIX defaults to 6 - */ - if (max < 0) - max = 6; - - ufvalue = abs_val (fvalue); - - if (fvalue < 0) { - signvalue = '-'; - } else { - if (flags & DP_F_PLUS) { /* Do a sign (+/i) */ - signvalue = '+'; - } else { - if (flags & DP_F_SPACE) - signvalue = ' '; - } - } - -#if 0 - if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ -#endif - -#if 0 - if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */ -#endif - - /* - * Sorry, we only support 16 digits past the decimal because of our - * conversion method - */ - if (max > 16) - max = 16; - - /* We "cheat" by converting the fractional part to integer by - * multiplying by a factor of 10 - */ - - temp = ufvalue; - my_modf(temp, &intpart); - - fracpart = ROUND((POW10(max)) * (ufvalue - intpart)); - - if (fracpart >= POW10(max)) { - intpart++; - fracpart -= POW10(max); - } - - - /* Convert integer part */ - do { - temp = intpart; - my_modf(intpart*0.1, &intpart); - temp = temp*0.1; - index = (int) ((temp -intpart +0.05)* 10.0); - /* index = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */ - /* printf ("%llf, %f, %x\n", temp, intpart, index); */ - iconvert[iplace++] = - (caps? "0123456789ABCDEF":"0123456789abcdef")[index]; - } while (intpart && (iplace < 311)); - if (iplace == 311) iplace--; - iconvert[iplace] = 0; - - /* Convert fractional part */ - if (fracpart) - { - do { - temp = fracpart; - my_modf(fracpart*0.1, &fracpart); - temp = temp*0.1; - index = (int) ((temp -fracpart +0.05)* 10.0); - /* index = (int) ((((temp/10) -fracpart) +0.05) *10); */ - /* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */ - fconvert[fplace++] = - (caps? "0123456789ABCDEF":"0123456789abcdef")[index]; - } while(fracpart && (fplace < 311)); - if (fplace == 311) fplace--; - } - fconvert[fplace] = 0; - - /* -1 for decimal point, another -1 if we are printing a sign */ - padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); - zpadlen = max - fplace; - if (zpadlen < 0) zpadlen = 0; - if (padlen < 0) - padlen = 0; - if (flags & DP_F_MINUS) - padlen = -padlen; /* Left Justifty */ - - if ((flags & DP_F_ZERO) && (padlen > 0)) { - if (signvalue) { - dopr_outch (buffer, currlen, maxlen, signvalue); - --padlen; - signvalue = 0; - } - while (padlen > 0) { - dopr_outch (buffer, currlen, maxlen, '0'); - --padlen; - } - } - while (padlen > 0) { - dopr_outch (buffer, currlen, maxlen, ' '); - --padlen; - } - if (signvalue) - dopr_outch (buffer, currlen, maxlen, signvalue); - - while (iplace > 0) - dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]); - -#ifdef DEBUG_SNPRINTF - printf("fmtfp: fplace=%d zpadlen=%d\n", fplace, zpadlen); -#endif - - /* - * Decimal point. This should probably use locale to find the correct - * char to print out. - */ - if (max > 0) { - dopr_outch (buffer, currlen, maxlen, '.'); - - while (fplace > 0) - dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]); - } - - while (zpadlen > 0) { - dopr_outch (buffer, currlen, maxlen, '0'); - --zpadlen; - } - - while (padlen < 0) { - dopr_outch (buffer, currlen, maxlen, ' '); - ++padlen; - } -} - -static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) -{ - if (*currlen < maxlen) { - buffer[(*currlen)] = c; - } - (*currlen)++; -} - -/* yes this really must be a ||. Don't muck with this (tridge) */ -#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) - int vsnprintf (char *str, size_t count, const char *fmt, va_list args) -{ - return dopr(str, count, fmt, args); -} -#endif - -/* yes this really must be a ||. Don't muck wiith this (tridge) - * - * The logic for these two is that we need our own definition if the - * OS *either* has no definition of *sprintf, or if it does have one - * that doesn't work properly according to the autoconf test. Perhaps - * these should really be smb_snprintf to avoid conflicts with buggy - * linkers? -- mbp - */ -#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_SNPRINTF) - int snprintf(char *str,size_t count,const char *fmt,...) -{ - size_t ret; - va_list ap; - - va_start(ap, fmt); - ret = vsnprintf(str, count, fmt, ap); - va_end(ap); - return ret; -} -#endif - -#endif - -#ifndef HAVE_VASPRINTF - int vasprintf(char **ptr, const char *format, va_list ap) -{ - int ret; - - ret = vsnprintf(0, 0, format, ap); - if (ret <= 0) return ret; - - (*ptr) = (char *)malloc(ret+1); - if (!*ptr) return -1; - ret = vsnprintf(*ptr, ret+1, format, ap); - - return ret; -} -#endif - - -#ifndef HAVE_ASPRINTF - int asprintf(char **ptr, const char *format, ...) -{ - va_list ap; - int ret; - - *ptr = 0; - va_start(ap, format); - ret = vasprintf(ptr, format, ap); - va_end(ap); - - return ret; -} -#endif - -#ifndef HAVE_VSYSLOG -#ifdef HAVE_SYSLOG - void vsyslog (int facility_priority, char *format, va_list arglist) -{ - char *msg = 0; - vasprintf(&msg, format, arglist); - if (!msg) - return; - syslog(facility_priority, "%s", msg); - free(msg); -} -#endif /* HAVE_SYSLOG */ -#endif /* HAVE_VSYSLOG */ - -#ifdef TEST_SNPRINTF - - int sprintf(char *str,const char *fmt,...); - - int main (void) -{ - char buf1[1024]; - char buf2[1024]; - char *fp_fmt[] = { - "%1.1f", - "%-1.5f", - "%1.5f", - "%123.9f", - "%10.5f", - "% 10.5f", - "%+22.9f", - "%+4.9f", - "%01.3f", - "%4f", - "%3.1f", - "%3.2f", - "%.0f", - "%f", - "-16.16f", - 0 - }; - double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, - 0.9996, 1.996, 4.136, 0}; - char *int_fmt[] = { - "%-1.5d", - "%1.5d", - "%123.9d", - "%5.5d", - "%10.5d", - "% 10.5d", - "%+22.33d", - "%01.3d", - "%4d", - "%d", - 0 - }; - long int_nums[] = { -1, 134, 91340, 341, 0203, 0}; - char *str_fmt[] = { - "10.5s", - "5.10s", - "10.1s", - "0.10s", - "10.0s", - "1.10s", - "%s", - "%.1s", - "%.10s", - "%10s", - 0 - }; - char *str_vals[] = {"hello", "a", "", "a longer string", 0}; - int x, y; - int fail = 0; - int num = 0; - - printf ("Testing snprintf format codes against system sprintf...\n"); - - for (x = 0; fp_fmt[x] ; x++) { - for (y = 0; fp_nums[y] != 0 ; y++) { - int l1 = snprintf(0, 0, fp_fmt[x], fp_nums[y]); - int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]); - sprintf (buf2, fp_fmt[x], fp_nums[y]); - if (strcmp (buf1, buf2)) { - printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", - fp_fmt[x], buf1, buf2); - fail++; - } - if (l1 != l2) { - printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, fp_fmt[x]); - fail++; - } - num++; - } - } - - for (x = 0; int_fmt[x] ; x++) { - for (y = 0; int_nums[y] != 0 ; y++) { - int l1 = snprintf(0, 0, int_fmt[x], int_nums[y]); - int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]); - sprintf (buf2, int_fmt[x], int_nums[y]); - if (strcmp (buf1, buf2)) { - printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", - int_fmt[x], buf1, buf2); - fail++; - } - if (l1 != l2) { - printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, int_fmt[x]); - fail++; - } - num++; - } - } - - for (x = 0; str_fmt[x] ; x++) { - for (y = 0; str_vals[y] != 0 ; y++) { - int l1 = snprintf(0, 0, str_fmt[x], str_vals[y]); - int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x], str_vals[y]); - sprintf (buf2, str_fmt[x], str_vals[y]); - if (strcmp (buf1, buf2)) { - printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", - str_fmt[x], buf1, buf2); - fail++; - } - if (l1 != l2) { - printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, str_fmt[x]); - fail++; - } - num++; - } - } - - printf ("%d tests failed out of %d.\n", fail, num); - - printf("seeing how many digits we support\n"); - { - double v0 = 0.12345678901234567890123456789012345678901; - for (x=0; x<100; x++) { - snprintf(buf1, sizeof(buf1), "%1.1f", v0*pow(10, x)); - sprintf(buf2, "%1.1f", v0*pow(10, x)); - if (strcmp(buf1, buf2)) { - printf("we seem to support %d digits\n", x-1); - break; - } - } - } - - return 0; -} -#endif /* SNPRINTF_TEST */ diff --git a/CCache/stats.c b/CCache/stats.c deleted file mode 100644 index 92bc4a835..000000000 --- a/CCache/stats.c +++ /dev/null @@ -1,361 +0,0 @@ -/* - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -/* - routines to handle the stats files - - the stats file is stored one per cache subdirectory to make this more - scalable - */ - -#include "ccache.h" - -extern char *stats_file; -extern char *cache_dir; - -#define STATS_VERSION 1 - -#define FLAG_NOZERO 1 /* don't zero with the -z option */ -#define FLAG_ALWAYS 2 /* always show, even if zero */ - -static struct { - enum stats stat; - char *message; - void (*fn)(unsigned ); - unsigned flags; -} stats_info[] = { - { STATS_CACHED, "cache hit ", NULL, FLAG_ALWAYS }, - { STATS_TOCACHE, "cache miss ", NULL, FLAG_ALWAYS }, - { STATS_LINK, "called for link ", NULL, 0 }, - { STATS_MULTIPLE, "multiple source files ", NULL, 0 }, - { STATS_STDOUT, "compiler produced stdout ", NULL, 0 }, - { STATS_STATUS, "compile failed ", NULL, 0 }, - { STATS_ERROR, "ccache internal error ", NULL, 0 }, - { STATS_PREPROCESSOR, "preprocessor error ", NULL, 0 }, - { STATS_COMPILER, "couldn't find the compiler ", NULL, 0 }, - { STATS_MISSING, "cache file missing ", NULL, 0 }, - { STATS_ARGS, "bad compiler arguments ", NULL, 0 }, - { STATS_NOTC, "not a C/C++ file ", NULL, 0 }, - { STATS_CONFTEST, "autoconf compile/link ", NULL, 0 }, - { STATS_UNSUPPORTED, "unsupported compiler option ", NULL, 0 }, - { STATS_OUTSTDOUT, "output to stdout ", NULL, 0 }, - { STATS_DEVICE, "output to a non-regular file ", NULL, 0 }, - { STATS_NOINPUT, "no input file ", NULL, 0 }, - { STATS_ENVIRONMMENT, "error due to bad env variable ", NULL, 0 }, - { STATS_NUMFILES, "files in cache ", NULL, FLAG_NOZERO|FLAG_ALWAYS }, - { STATS_TOTALSIZE, "cache size ", display_size , FLAG_NOZERO|FLAG_ALWAYS }, - { STATS_MAXFILES, "max files ", NULL, FLAG_NOZERO }, - { STATS_MAXSIZE, "max cache size ", display_size, FLAG_NOZERO }, - { STATS_NONE, NULL, NULL, 0 } -}; - -/* parse a stats file from a buffer - adding to the counters */ -static void parse_stats(unsigned counters[STATS_END], char *buf) -{ - int i; - char *p, *p2; - - p = buf; - for (i=0;i= (int)sizeof(buf)-1) fatal("stats too long?!"); - } - len += snprintf(buf+len, sizeof(buf)-(len+1), "\n"); - if (len >= (int)sizeof(buf)-1) fatal("stats too long?!"); - - lseek(fd, 0, SEEK_SET); - if (write(fd, buf, len) == -1) fatal("could not write stats"); -} - - -/* fill in some default stats values */ -static void stats_default(unsigned counters[STATS_END]) -{ - counters[STATS_MAXSIZE] += DEFAULT_MAXSIZE / 16; -} - -/* read in the stats from one dir and add to the counters */ -static void stats_read_fd(int fd, unsigned counters[STATS_END]) -{ - char buf[1024]; - int len; - len = read(fd, buf, sizeof(buf)-1); - if (len <= 0) { - stats_default(counters); - return; - } - buf[len] = 0; - parse_stats(counters, buf); -} - -/* update the stats counter for this compile */ -static void stats_update_size(enum stats stat, size_t size, size_t numfiles) -{ - int fd; - unsigned counters[STATS_END]; - int need_cleanup = 0; - - if (getenv("CCACHE_NOSTATS")) return; - - if (!stats_file) { - if (!cache_dir) return; - x_asprintf(&stats_file, "%s/stats", cache_dir); - } - - /* open safely to try to prevent symlink races */ - fd = safe_open(stats_file); - - /* still can't get it? don't bother ... */ - if (fd == -1) return; - - memset(counters, 0, sizeof(counters)); - - if (lock_fd(fd) != 0) return; - - /* read in the old stats */ - stats_read_fd(fd, counters); - - /* update them */ - counters[stat]++; - - /* on a cache miss we up the file count and size */ - if (stat == STATS_TOCACHE) { - counters[STATS_NUMFILES] += numfiles; - counters[STATS_TOTALSIZE] += size; - } - - /* and write them out */ - write_stats(fd, counters); - close(fd); - - /* we might need to cleanup if the cache has now got too big */ - if (counters[STATS_MAXFILES] != 0 && - counters[STATS_NUMFILES] > counters[STATS_MAXFILES]) { - need_cleanup = 1; - } - if (counters[STATS_MAXSIZE] != 0 && - counters[STATS_TOTALSIZE] > counters[STATS_MAXSIZE]) { - need_cleanup = 1; - } - - if (need_cleanup) { - char *p = dirname(stats_file); - cleanup_dir(p, counters[STATS_MAXFILES], counters[STATS_MAXSIZE]); - free(p); - } -} - -/* record a cache miss */ -void stats_tocache(size_t size, size_t numfiles) -{ - /* convert size to kilobytes */ - size = size / 1024; - - stats_update_size(STATS_TOCACHE, size, numfiles); -} - -/* update a normal stat */ -void stats_update(enum stats stat) -{ - stats_update_size(stat, 0, 0); -} - -/* read in the stats from one dir and add to the counters */ -void stats_read(const char *stats_file, unsigned counters[STATS_END]) -{ - int fd; - - fd = open(stats_file, O_RDONLY|O_BINARY); - if (fd == -1) { - stats_default(counters); - return; - } - lock_fd(fd); - stats_read_fd(fd, counters); - close(fd); -} - -/* sum and display the total stats for all cache dirs */ -void stats_summary(void) -{ - int dir, i; - unsigned counters[STATS_END]; - - memset(counters, 0, sizeof(counters)); - - /* add up the stats in each directory */ - for (dir=-1;dir<=0xF;dir++) { - char *fname; - - if (dir == -1) { - x_asprintf(&fname, "%s/stats", cache_dir); - } else { - x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir); - } - - stats_read(fname, counters); - free(fname); - - /* oh what a nasty hack ... */ - if (dir == -1) { - counters[STATS_MAXSIZE] = 0; - } - - } - - printf("cache directory %s\n", cache_dir); - - /* and display them */ - for (i=0;stats_info[i].message;i++) { - enum stats stat = stats_info[i].stat; - - if (counters[stat] == 0 && - !(stats_info[i].flags & FLAG_ALWAYS)) { - continue; - } - - printf("%s ", stats_info[i].message); - if (stats_info[i].fn) { - stats_info[i].fn(counters[stat]); - printf("\n"); - } else { - printf("%8u\n", counters[stat]); - } - } -} - -/* zero all the stats structures */ -void stats_zero(void) -{ - int dir, fd; - unsigned i; - char *fname; - unsigned counters[STATS_END]; - - x_asprintf(&fname, "%s/stats", cache_dir); - unlink(fname); - free(fname); - - for (dir=0;dir<=0xF;dir++) { - x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir); - fd = safe_open(fname); - if (fd == -1) { - free(fname); - continue; - } - memset(counters, 0, sizeof(counters)); - lock_fd(fd); - stats_read_fd(fd, counters); - for (i=0;stats_info[i].message;i++) { - if (!(stats_info[i].flags & FLAG_NOZERO)) { - counters[stats_info[i].stat] = 0; - } - } - write_stats(fd, counters); - close(fd); - free(fname); - } -} - - -/* set the per directory limits */ -int stats_set_limits(long maxfiles, long maxsize) -{ - int dir; - unsigned counters[STATS_END]; - - if (maxfiles != -1) { - maxfiles /= 16; - } - if (maxsize != -1) { - maxsize /= 16; - } - - if (create_dir(cache_dir) != 0) { - return 1; - } - - /* set the limits in each directory */ - for (dir=0;dir<=0xF;dir++) { - char *fname, *cdir; - int fd; - - x_asprintf(&cdir, "%s/%1x", cache_dir, dir); - if (create_dir(cdir) != 0) { - return 1; - } - x_asprintf(&fname, "%s/stats", cdir); - free(cdir); - - memset(counters, 0, sizeof(counters)); - fd = safe_open(fname); - if (fd != -1) { - lock_fd(fd); - stats_read_fd(fd, counters); - if (maxfiles != -1) { - counters[STATS_MAXFILES] = maxfiles; - } - if (maxsize != -1) { - counters[STATS_MAXSIZE] = maxsize; - } - write_stats(fd, counters); - close(fd); - } - free(fname); - } - - return 0; -} - -/* set the per directory sizes */ -void stats_set_sizes(const char *dir, size_t num_files, size_t total_size) -{ - int fd; - unsigned counters[STATS_END]; - char *stats_file; - - create_dir(dir); - x_asprintf(&stats_file, "%s/stats", dir); - - memset(counters, 0, sizeof(counters)); - - fd = safe_open(stats_file); - if (fd != -1) { - lock_fd(fd); - stats_read_fd(fd, counters); - counters[STATS_NUMFILES] = num_files; - counters[STATS_TOTALSIZE] = total_size; - write_stats(fd, counters); - close(fd); - } - - free(stats_file); -} diff --git a/CCache/test.sh b/CCache/test.sh deleted file mode 100755 index 9581c85e3..000000000 --- a/CCache/test.sh +++ /dev/null @@ -1,452 +0,0 @@ -#!/bin/sh - -# a simple test suite for ccache -# tridge@samba.org - -if test -n "$CC"; then - COMPILER="$CC" -else - COMPILER=cc -fi - -if test -n "$SWIG"; then - SWIG="$SWIG" -else - SWIG=swig -fi - -CCACHE=../ccache-swig -TESTDIR=test.$$ - -test_failed() { - reason="$1" - echo $1 - $CCACHE -s - cd .. - rm -rf $TESTDIR - echo TEST FAILED - exit 1 -} - -randcode() { - outfile="$1" - nlines=$2 - i=0; - ( - while [ $i -lt $nlines ]; do - echo "int foo$nlines$i(int x) { return x; }" - i=`expr $i + 1` - done - ) >> "$outfile" -} - -genswigcode() { - outfile="$1" - nlines=$2 - i=0; - ( - echo "%module swigtest$2;" - while [ $i -lt $nlines ]; do - echo "int foo$nlines$i(int x);" - echo "struct Bar$nlines$i { int y; };" - i=`expr $i + 1` - done - ) >> "$outfile" -} - - -getstat() { - stat="$1" - value=`$CCACHE -s | grep "$stat" | cut -c34-40` - echo $value -} - -checkstat() { - stat="$1" - expected_value="$2" - value=`getstat "$stat"` -# echo "exp: $expected_value got: $value $testname" - if [ "$expected_value" != "$value" ]; then - test_failed "SUITE: $testsuite TEST: $testname - Expected $stat to be $expected_value got $value" - fi -} - - -basetests() { - echo "starting testsuite $testsuite" - rm -rf "$CCACHE_DIR" - checkstat 'cache hit' 0 - checkstat 'cache miss' 0 - - j=1 - rm -f *.c - while [ $j -lt 32 ]; do - randcode test$j.c $j - j=`expr $j + 1` - done - - testname="BASIC" - $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 0 - checkstat 'cache miss' 1 - - testname="BASIC2" - $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 1 - checkstat 'cache miss' 1 - - testname="debug" - $CCACHE_COMPILE -c test1.c -g - checkstat 'cache hit' 1 - checkstat 'cache miss' 2 - - testname="debug2" - $CCACHE_COMPILE -c test1.c -g - checkstat 'cache hit' 2 - checkstat 'cache miss' 2 - - testname="output" - $CCACHE_COMPILE -c test1.c -o foo.o - checkstat 'cache hit' 3 - checkstat 'cache miss' 2 - - testname="link" - $CCACHE_COMPILE test1.c -o test 2> /dev/null - checkstat 'called for link' 1 - - testname="multiple" - $CCACHE_COMPILE -c test1.c test2.c - checkstat 'multiple source files' 1 - - testname="find" - $CCACHE blahblah -c test1.c 2> /dev/null - checkstat "couldn't find the compiler" 1 - - testname="bad" - $CCACHE_COMPILE -c test1.c -I 2> /dev/null - checkstat 'bad compiler arguments' 1 - - testname="c/c++" - ln -f test1.c test1.ccc - $CCACHE_COMPILE -c test1.ccc 2> /dev/null - checkstat 'not a C/C++ file' 1 - - testname="unsupported" - $CCACHE_COMPILE -M foo -c test1.c > /dev/null 2>&1 - checkstat 'unsupported compiler option' 1 - - testname="stdout" - $CCACHE echo foo -c test1.c > /dev/null - checkstat 'compiler produced stdout' 1 - - testname="non-regular" - mkdir testd - $CCACHE_COMPILE -o testd -c test1.c > /dev/null 2>&1 - rmdir testd - checkstat 'output to a non-regular file' 1 - - testname="no-input" - $CCACHE_COMPILE -c -O2 2> /dev/null - checkstat 'no input file' 1 - - - testname="CCACHE_DISABLE" - CCACHE_DISABLE=1 $CCACHE_COMPILE -c test1.c 2> /dev/null - checkstat 'cache hit' 3 - $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 4 - - testname="CCACHE_CPP2" - CCACHE_CPP2=1 $CCACHE_COMPILE -c test1.c -O -O - checkstat 'cache hit' 4 - checkstat 'cache miss' 3 - - CCACHE_CPP2=1 $CCACHE_COMPILE -c test1.c -O -O - checkstat 'cache hit' 5 - checkstat 'cache miss' 3 - - testname="CCACHE_NOSTATS" - CCACHE_NOSTATS=1 $CCACHE_COMPILE -c test1.c -O -O - checkstat 'cache hit' 5 - checkstat 'cache miss' 3 - - testname="CCACHE_RECACHE" - CCACHE_RECACHE=1 $CCACHE_COMPILE -c test1.c -O -O - checkstat 'cache hit' 5 - checkstat 'cache miss' 4 - - # strictly speaking should be 6 - RECACHE causes a double counting! - checkstat 'files in cache' 8 - $CCACHE -c > /dev/null - checkstat 'files in cache' 6 - - - testname="CCACHE_HASHDIR" - CCACHE_HASHDIR=1 $CCACHE_COMPILE -c test1.c -O -O - checkstat 'cache hit' 5 - checkstat 'cache miss' 5 - - CCACHE_HASHDIR=1 $CCACHE_COMPILE -c test1.c -O -O - checkstat 'cache hit' 6 - checkstat 'cache miss' 5 - - checkstat 'files in cache' 8 - - testname="comments" - echo '/* a silly comment */' > test1-comment.c - cat test1.c >> test1-comment.c - $CCACHE_COMPILE -c test1-comment.c - rm -f test1-comment* - checkstat 'cache hit' 6 - checkstat 'cache miss' 6 - - testname="CCACHE_UNIFY" - CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 6 - checkstat 'cache miss' 7 - mv test1.c test1-saved.c - echo '/* another comment */' > test1.c - cat test1-saved.c >> test1.c - CCACHE_UNIFY=1 $CCACHE_COMPILE -c test1.c - mv test1-saved.c test1.c - checkstat 'cache hit' 7 - checkstat 'cache miss' 7 - - testname="cache-size" - for f in *.c; do - $CCACHE_COMPILE -c $f - done - checkstat 'cache hit' 8 - checkstat 'cache miss' 37 - checkstat 'files in cache' 72 - $CCACHE -F 48 -c > /dev/null - if [ `getstat 'files in cache'` -gt 48 ]; then - test_failed '-F test failed' - fi - - testname="cpp call" - $CCACHE_COMPILE -c test1.c -E > test1.i - checkstat 'cache hit' 8 - checkstat 'cache miss' 37 - - testname="direct .i compile" - $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 8 - checkstat 'cache miss' 38 - - $CCACHE_COMPILE -c test1.i - checkstat 'cache hit' 9 - checkstat 'cache miss' 38 - - $CCACHE_COMPILE -c test1.i - checkstat 'cache hit' 10 - checkstat 'cache miss' 38 - - # removed these tests as some compilers (including newer versions of gcc) - # determine which language to use based on .ii/.i extension, and C++ may - # not be installed -# testname="direct .ii file" -# mv test1.i test1.ii -# $CCACHE_COMPILE -c test1.ii -# checkstat 'cache hit' 10 -# checkstat 'cache miss' 39 - -# $CCACHE_COMPILE -c test1.ii -# checkstat 'cache hit' 11 -# checkstat 'cache miss' 39 - - testname="stripc" # This test might not be portable - CCACHE_STRIPC=1 $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 10 - checkstat 'cache miss' 39 - - CCACHE_STRIPC=1 $CCACHE_COMPILE -c test1.c - checkstat 'cache hit' 11 - checkstat 'cache miss' 39 - - testname="zero-stats" - $CCACHE -z > /dev/null - checkstat 'cache hit' 0 - checkstat 'cache miss' 0 - - testname="clear" - $CCACHE -C > /dev/null - checkstat 'files in cache' 0 - - - rm -f test1.c -} - -swigtests() { - echo "starting swig testsuite $testsuite" - rm -rf "$CCACHE_DIR" - checkstat 'cache hit' 0 - checkstat 'cache miss' 0 - - j=1 - rm -f *.i - genswigcode testswig1.i 1 - - testname="BASIC" - $CCACHE_COMPILE -java testswig1.i - checkstat 'cache hit' 0 - checkstat 'cache miss' 1 - - checkstat 'files in cache' 6 - - testname="BASIC2" - $CCACHE_COMPILE -java testswig1.i - checkstat 'cache hit' 1 - checkstat 'cache miss' 1 - - testname="output" - $CCACHE_COMPILE -java testswig1.i -o foo_wrap.c - checkstat 'cache hit' 1 - checkstat 'cache miss' 2 - - testname="bad" - $CCACHE_COMPILE -java testswig1.i -I 2> /dev/null - checkstat 'bad compiler arguments' 1 - - testname="stdout" - $CCACHE_COMPILE -v -java testswig1.i > /dev/null - checkstat 'compiler produced stdout' 1 - - testname="non-regular" - mkdir testd - $CCACHE_COMPILE -o testd -java testswig1.i > /dev/null 2>&1 - rmdir testd - checkstat 'output to a non-regular file' 1 - - testname="no-input" - $CCACHE_COMPILE -java 2> /dev/null - checkstat 'no input file' 1 - - - testname="CCACHE_DISABLE" - CCACHE_DISABLE=1 $CCACHE_COMPILE -java testswig1.i 2> /dev/null - checkstat 'cache hit' 1 - $CCACHE_COMPILE -java testswig1.i - checkstat 'cache hit' 2 - - testname="CCACHE_CPP2" - CCACHE_CPP2=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 2 - checkstat 'cache miss' 3 - - CCACHE_CPP2=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 3 - checkstat 'cache miss' 3 - - testname="CCACHE_NOSTATS" - CCACHE_NOSTATS=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 3 - checkstat 'cache miss' 3 - - testname="CCACHE_RECACHE" - CCACHE_RECACHE=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 3 - checkstat 'cache miss' 4 - - # strictly speaking should be 3x6=18 instead of 4x6=24 - RECACHE causes a double counting! - checkstat 'files in cache' 24 - $CCACHE -c > /dev/null - checkstat 'files in cache' 18 - - - testname="CCACHE_HASHDIR" - CCACHE_HASHDIR=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 3 - checkstat 'cache miss' 5 - - CCACHE_HASHDIR=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 4 - checkstat 'cache miss' 5 - - checkstat 'files in cache' 24 - - testname="cpp call" - $CCACHE_COMPILE -java -E testswig1.i > testswig1-preproc.i - checkstat 'cache hit' 4 - checkstat 'cache miss' 5 - - testname="direct .i compile" - $CCACHE_COMPILE -java testswig1.i - checkstat 'cache hit' 5 - checkstat 'cache miss' 5 - - # No cache hit due to different input file name, -nopreprocess should not be given twice to SWIG - $CCACHE_COMPILE -java -nopreprocess testswig1-preproc.i - checkstat 'cache hit' 5 - checkstat 'cache miss' 6 - - $CCACHE_COMPILE -java -nopreprocess testswig1-preproc.i - checkstat 'cache hit' 6 - checkstat 'cache miss' 6 - - testname="stripc" - CCACHE_STRIPC=1 $CCACHE_COMPILE -java -O -O testswig1.i - checkstat 'cache hit' 7 - checkstat 'cache miss' 6 - - CCACHE_STRIPC=1 $CCACHE_COMPILE -java -O -O -O testswig1.i - checkstat 'cache hit' 7 - checkstat 'cache miss' 7 - - rm -f testswig1-preproc.i - rm -f testswig1.i -} - -###### -# main program -rm -rf $TESTDIR -mkdir $TESTDIR -cd $TESTDIR || exit 1 -CCACHE_DIR="ccache dir" # with space in directory name (like Windows default) -mkdir "$CCACHE_DIR" -export CCACHE_DIR - -testsuite="base" -CCACHE_COMPILE="$CCACHE $COMPILER" -basetests -CCACHE_COMPILE="$CCACHE $SWIG" -swigtests - -if test -z "$NOSOFTLINKSTEST"; then - testsuite="link" - ln -s $CCACHE $COMPILER - CCACHE_COMPILE="./$COMPILER" - basetests - rm "./$COMPILER" - ln -s $CCACHE $SWIG - CCACHE_COMPILE="./$SWIG" - swigtests - rm "./$SWIG" -else - echo "skipping testsuite link" -fi - -testsuite="hardlink" -CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $COMPILER" -basetests -CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $SWIG" -swigtests - -testsuite="cpp2" -CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $COMPILER" -basetests -CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $SWIG" -swigtests - -testsuite="nlevels4" -CCACHE_COMPILE="env CCACHE_NLEVELS=4 $CCACHE $COMPILER" -basetests - -testsuite="nlevels1" -CCACHE_COMPILE="env CCACHE_NLEVELS=1 $CCACHE $COMPILER" -basetests - -cd .. -rm -rf $TESTDIR -echo test done - OK -exit 0 diff --git a/CCache/unify.c b/CCache/unify.c deleted file mode 100644 index a93d48a02..000000000 --- a/CCache/unify.c +++ /dev/null @@ -1,307 +0,0 @@ -/* - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -/* - C/C++ unifier - - the idea is that changes that don't affect the resulting C code - should not change the hash. This is achieved by folding white-space - and other non-semantic fluff in the input into a single unified format. - - This unifier was design to match the output of the unifier in - compilercache, which is flex based. The major difference is that - this unifier is much faster (about 2x) and more forgiving of - syntactic errors. Continuing on syntactic errors is important to - cope with C/C++ extensions in the local compiler (for example, - inline assembly systems). -*/ - -#include "ccache.h" - -static char *s_tokens[] = { - "...", ">>=", "<<=", "+=", "-=", "*=", "/=", "%=", "&=", "^=", - "|=", ">>", "<<", "++", "--", "->", "&&", "||", "<=", ">=", - "==", "!=", ";", "{", "<%", "}", "%>", ",", ":", "=", - "(", ")", "[", "<:", "]", ":>", ".", "&", "!", "~", - "-", "+", "*", "/", "%", "<", ">", "^", "|", "?", - 0 -}; - -#define C_ALPHA 1 -#define C_SPACE 2 -#define C_TOKEN 4 -#define C_QUOTE 8 -#define C_DIGIT 16 -#define C_HEX 32 -#define C_FLOAT 64 -#define C_SIGN 128 - -static struct { - unsigned char type; - unsigned char num_toks; - char *toks[7]; -} tokens[256]; - -/* build up the table used by the unifier */ -static void build_table(void) -{ - unsigned char c; - int i; - static int done; - - if (done) return; - done = 1; - - memset(tokens, 0, sizeof(tokens)); - for (c=0;c<128;c++) { - if (isalpha(c) || c == '_') tokens[c].type |= C_ALPHA; - if (isdigit(c)) tokens[c].type |= C_DIGIT; - if (isspace(c)) tokens[c].type |= C_SPACE; - if (isxdigit(c)) tokens[c].type |= C_HEX; - } - tokens['\''].type |= C_QUOTE; - tokens['"'].type |= C_QUOTE; - tokens['l'].type |= C_FLOAT; - tokens['L'].type |= C_FLOAT; - tokens['f'].type |= C_FLOAT; - tokens['F'].type |= C_FLOAT; - tokens['U'].type |= C_FLOAT; - tokens['u'].type |= C_FLOAT; - - tokens['-'].type |= C_SIGN; - tokens['+'].type |= C_SIGN; - - for (i=0;s_tokens[i];i++) { - c = s_tokens[i][0]; - tokens[c].type |= C_TOKEN; - tokens[c].toks[tokens[c].num_toks] = s_tokens[i]; - tokens[c].num_toks++; - } -} - -/* buffer up characters before hashing them */ -static void pushchar(unsigned char c) -{ - static unsigned char buf[64]; - static int len; - - if (c == 0) { - if (len > 0) { - hash_buffer((char *)buf, len); - len = 0; - } - hash_buffer(NULL, 0); - return; - } - - buf[len++] = c; - if (len == 64) { - hash_buffer((char *)buf, len); - len = 0; - } -} - -/* hash some C/C++ code after unifying */ -static void unify(unsigned char *p, size_t size) -{ - size_t ofs; - unsigned char q; - int i; - - build_table(); - - for (ofs=0; ofs 2 && p[ofs+1] == ' ' && isdigit(p[ofs+2])) { - do { - ofs++; - } while (ofs < size && p[ofs] != '\n'); - ofs++; - } else { - do { - pushchar(p[ofs]); - ofs++; - } while (ofs < size && p[ofs] != '\n'); - pushchar('\n'); - ofs++; - } - continue; - } - - if (tokens[p[ofs]].type & C_ALPHA) { - do { - pushchar(p[ofs]); - ofs++; - } while (ofs < size && - (tokens[p[ofs]].type & (C_ALPHA|C_DIGIT))); - pushchar('\n'); - continue; - } - - if (tokens[p[ofs]].type & C_DIGIT) { - do { - pushchar(p[ofs]); - ofs++; - } while (ofs < size && - ((tokens[p[ofs]].type & C_DIGIT) || p[ofs] == '.')); - if (ofs < size && (p[ofs] == 'x' || p[ofs] == 'X')) { - do { - pushchar(p[ofs]); - ofs++; - } while (ofs < size && (tokens[p[ofs]].type & C_HEX)); - } - if (ofs < size && (p[ofs] == 'E' || p[ofs] == 'e')) { - pushchar(p[ofs]); - ofs++; - while (ofs < size && - (tokens[p[ofs]].type & (C_DIGIT|C_SIGN))) { - pushchar(p[ofs]); - ofs++; - } - } - while (ofs < size && (tokens[p[ofs]].type & C_FLOAT)) { - pushchar(p[ofs]); - ofs++; - } - pushchar('\n'); - continue; - } - - if (tokens[p[ofs]].type & C_SPACE) { - do { - ofs++; - } while (ofs < size && (tokens[p[ofs]].type & C_SPACE)); - continue; - } - - if (tokens[p[ofs]].type & C_QUOTE) { - q = p[ofs]; - pushchar(p[ofs]); - do { - ofs++; - while (ofs < size-1 && p[ofs] == '\\') { - pushchar(p[ofs]); - pushchar(p[ofs+1]); - ofs+=2; - } - pushchar(p[ofs]); - } while (ofs < size && p[ofs] != q); - pushchar('\n'); - ofs++; - continue; - } - - if (tokens[p[ofs]].type & C_TOKEN) { - q = p[ofs]; - for (i=0;i= ofs+len && memcmp(&p[ofs], s, len) == 0) { - int j; - for (j=0;s[j];j++) { - pushchar(s[j]); - ofs++; - } - pushchar('\n'); - break; - } - } - if (i < tokens[q].num_toks) { - continue; - } - } - - pushchar(p[ofs]); - pushchar('\n'); - ofs++; - } - pushchar(0); -} - - -/* hash a file that consists of preprocessor output, but remove any line - number information from the hash -*/ -int unify_hash(const char *fname) -{ -#ifdef _WIN32 - HANDLE file; - HANDLE section; - DWORD filesize_low; - char *map; - int ret = -1; - - file = CreateFileA(fname, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL); - if (file != INVALID_HANDLE_VALUE) { - filesize_low = GetFileSize(file, NULL); - if (!(filesize_low == INVALID_FILE_SIZE && GetLastError() != NO_ERROR)) { - section = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); - CloseHandle(file); - if (section != NULL) { - map = MapViewOfFile(section, FILE_MAP_READ, 0, 0, 0); - CloseHandle(section); - if (map != NULL) - ret = 0; - } - } - } - - if (ret == -1) { - cc_log("Failed to open preprocessor output %s\n", fname); - stats_update(STATS_PREPROCESSOR); - return -1; - } - - /* pass it through the unifier */ - unify((unsigned char *)map, filesize_low); - - UnmapViewOfFile(map); - - return 0; -#else - int fd; - struct stat st; - char *map; - - fd = open(fname, O_RDONLY|O_BINARY); - if (fd == -1 || fstat(fd, &st) != 0) { - cc_log("Failed to open preprocessor output %s\n", fname); - stats_update(STATS_PREPROCESSOR); - return -1; - } - - /* we use mmap() to make it easy to handle arbitrarily long - lines in preprocessor output. I have seen lines of over - 100k in length, so this is well worth it */ - map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (map == (char *)-1) { - cc_log("Failed to mmap %s\n", fname); - stats_update(STATS_PREPROCESSOR); - return -1; - } - close(fd); - - /* pass it through the unifier */ - unify((unsigned char *)map, st.st_size); - - munmap(map, st.st_size); - - return 0; -#endif -} - diff --git a/CCache/util.c b/CCache/util.c deleted file mode 100644 index bba232492..000000000 --- a/CCache/util.c +++ /dev/null @@ -1,884 +0,0 @@ -/* - Copyright (C) Andrew Tridgell 2002 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "ccache.h" - -static FILE *logfile; - -/* log a message to the CCACHE_LOGFILE location */ -void cc_log(const char *format, ...) -{ - va_list ap; - extern char *cache_logfile; - - if (!cache_logfile) return; - - if (!logfile) logfile = fopen(cache_logfile, "a"); - if (!logfile) return; - - va_start(ap, format); - vfprintf(logfile, format, ap); - va_end(ap); - fflush(logfile); -} - -/* something went badly wrong! */ -void fatal(const char *msg) -{ - cc_log("FATAL: %s\n", msg); - exit(1); -} - -int safe_rename(const char* oldpath, const char* newpath) -{ - /* safe_rename is for creating entries in the cache. - - Works like rename(), but it never overwrites an existing - cache entry. This avoids corruption on NFS. */ -#ifndef _WIN32 - int status = link(oldpath, newpath); - if( status == 0 || errno == EEXIST ) -#else - int status = CreateHardLinkA(newpath, oldpath, NULL) ? 0 : -1; - if( status == 0 || GetLastError() == ERROR_ALREADY_EXISTS ) -#endif - { - return unlink( oldpath ); - } - else - { - return -1; - } -} - -#ifndef ENABLE_ZLIB -/* copy all data from one file descriptor to another */ -void copy_fd(int fd_in, int fd_out) -{ - char buf[10240]; - int n; - - while ((n = read(fd_in, buf, sizeof(buf))) > 0) { - if (write(fd_out, buf, n) != n) { - fatal("Failed to copy fd"); - } - } -} - -#ifndef HAVE_MKSTEMP -/* cheap and nasty mkstemp replacement */ -static int mkstemp(char *template) -{ - mktemp(template); - return open(template, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600); -} -#endif - -/* move a file using rename */ -int move_file(const char *src, const char *dest) { - return safe_rename(src, dest); -} - -/* copy a file - used when hard links don't work - the copy is done via a temporary file and atomic rename -*/ -static int copy_file(const char *src, const char *dest) -{ - int fd1, fd2; - char buf[10240]; - int n; - char *tmp_name; - mode_t mask; - - x_asprintf(&tmp_name, "%s.XXXXXX", dest); - - fd1 = open(src, O_RDONLY|O_BINARY); - if (fd1 == -1) { - free(tmp_name); - return -1; - } - - fd2 = mkstemp(tmp_name); - if (fd2 == -1) { - close(fd1); - free(tmp_name); - return -1; - } - - while ((n = read(fd1, buf, sizeof(buf))) > 0) { - if (write(fd2, buf, n) != n) { - close(fd2); - close(fd1); - unlink(tmp_name); - free(tmp_name); - return -1; - } - } - - close(fd1); - - /* get perms right on the tmp file */ -#ifndef _WIN32 - mask = umask(0); - fchmod(fd2, 0666 & ~mask); - umask(mask); -#else - (void)mask; -#endif - - /* the close can fail on NFS if out of space */ - if (close(fd2) == -1) { - unlink(tmp_name); - free(tmp_name); - return -1; - } - - unlink(dest); - - if (rename(tmp_name, dest) == -1) { - unlink(tmp_name); - free(tmp_name); - return -1; - } - - free(tmp_name); - - return 0; -} - -/* copy a file to the cache */ -static int copy_file_to_cache(const char *src, const char *dest) { - return copy_file(src, dest); -} - -/* copy a file from the cache */ -static int copy_file_from_cache(const char *src, const char *dest) { - return copy_file(src, dest); -} - -#else /* ENABLE_ZLIB */ - -/* copy all data from one file descriptor to another - possibly decompressing it -*/ -void copy_fd(int fd_in, int fd_out) { - char buf[10240]; - int n; - gzFile gz_in; - - gz_in = gzdopen(dup(fd_in), "rb"); - - if (!gz_in) { - fatal("Failed to copy fd"); - } - - while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { - if (write(fd_out, buf, n) != n) { - fatal("Failed to copy fd"); - } - } -} - -static int _copy_file(const char *src, const char *dest, int mode) { - int fd_in, fd_out; - gzFile gz_in, gz_out = NULL; - char buf[10240]; - int n, ret; - char *tmp_name; - mode_t mask; - struct stat st; - - x_asprintf(&tmp_name, "%s.XXXXXX", dest); - - if (getenv("CCACHE_NOCOMPRESS")) { - mode = COPY_UNCOMPRESSED; - } - - /* open source file */ - fd_in = open(src, O_RDONLY); - if (fd_in == -1) { - return -1; - } - - gz_in = gzdopen(fd_in, "rb"); - if (!gz_in) { - close(fd_in); - return -1; - } - - /* open destination file */ - fd_out = mkstemp(tmp_name); - if (fd_out == -1) { - gzclose(gz_in); - free(tmp_name); - return -1; - } - - if (mode == COPY_TO_CACHE) { - /* The gzip file format occupies at least 20 bytes. So - it will always occupy an entire filesystem block, - even for empty files. - Since most stderr files will be empty, we turn off - compression in this case to save space. - */ - if (fstat(fd_in, &st) != 0) { - gzclose(gz_in); - close(fd_out); - free(tmp_name); - return -1; - } - if (file_size(&st) == 0) { - mode = COPY_UNCOMPRESSED; - } - } - - if (mode == COPY_TO_CACHE) { - gz_out = gzdopen(dup(fd_out), "wb"); - if (!gz_out) { - gzclose(gz_in); - close(fd_out); - free(tmp_name); - return -1; - } - } - - while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) { - if (mode == COPY_TO_CACHE) { - ret = gzwrite(gz_out, buf, n); - } else { - ret = write(fd_out, buf, n); - } - if (ret != n) { - gzclose(gz_in); - if (gz_out) { - gzclose(gz_out); - } - close(fd_out); - unlink(tmp_name); - free(tmp_name); - return -1; - } - } - - gzclose(gz_in); - if (gz_out) { - gzclose(gz_out); - } - - /* get perms right on the tmp file */ - mask = umask(0); - fchmod(fd_out, 0666 & ~mask); - umask(mask); - - /* the close can fail on NFS if out of space */ - if (close(fd_out) == -1) { - unlink(tmp_name); - free(tmp_name); - return -1; - } - - unlink(dest); - - if (rename(tmp_name, dest) == -1) { - unlink(tmp_name); - free(tmp_name); - return -1; - } - - free(tmp_name); - - return 0; -} - -/* move a file to the cache, compressing it */ -int move_file(const char *src, const char *dest) { - int ret; - - ret = _copy_file(src, dest, COPY_TO_CACHE); - if (ret != -1) unlink(src); - return ret; -} - -/* copy a file to the cache, compressing it */ -static int copy_file_to_cache(const char *src, const char *dest) { - return _copy_file(src, dest, COPY_TO_CACHE); -} - -/* copy a file from the cache, decompressing it */ -static int copy_file_from_cache(const char *src, const char *dest) { - return _copy_file(src, dest, COPY_FROM_CACHE); -} -#endif /* ENABLE_ZLIB */ - -/* test if a file is zlib compressed */ -int test_if_compressed(const char *filename) { - FILE *f; - - f = fopen(filename, "rb"); - if (!f) { - return 0; - } - - /* test if file starts with 1F8B, which is zlib's - * magic number */ - if ((fgetc(f) != 0x1f) || (fgetc(f) != 0x8b)) { - fclose(f); - return 0; - } - - fclose(f); - return 1; -} - -/* copy file to the cache with error checking taking into account compression and hard linking if desired */ -int commit_to_cache(const char *src, const char *dest, int hardlink) -{ - int ret = -1; - struct stat st; - if (stat(src, &st) == 0) { - unlink(dest); - if (hardlink) { -#ifdef _WIN32 - ret = CreateHardLinkA(dest, src, NULL) ? 0 : -1; -#else - ret = link(src, dest); -#endif - } - if (ret == -1) { - ret = copy_file_to_cache(src, dest); - if (ret == -1) { - cc_log("failed to commit %s -> %s (%s)\n", src, dest, strerror(errno)); - stats_update(STATS_ERROR); - } - } - } else { - cc_log("failed to put %s in the cache (%s)\n", src, strerror(errno)); - stats_update(STATS_ERROR); - } - return ret; -} - -/* copy file out of the cache with error checking taking into account compression and hard linking if desired */ -int retrieve_from_cache(const char *src, const char *dest, int hardlink) -{ - int ret = 0; - - x_utimes(src); - - if (strcmp(dest, "/dev/null") == 0) { - ret = 0; - } else { - unlink(dest); - /* only make a hardlink if the cache file is uncompressed */ - if (hardlink && test_if_compressed(src) == 0) { -#ifdef _WIN32 - ret = CreateHardLinkA(dest, src, NULL) ? 0 : -1; -#else - ret = link(src, dest); -#endif - } else { - ret = copy_file_from_cache(src, dest); - } - } - - /* the cached file might have been deleted by some external process */ - if (ret == -1 && errno == ENOENT) { - cc_log("hashfile missing for %s\n", dest); - stats_update(STATS_MISSING); - return -1; - } - - if (ret == -1) { - ret = copy_file_from_cache(src, dest); - if (ret == -1) { - cc_log("failed to retrieve %s -> %s (%s)\n", src, dest, strerror(errno)); - stats_update(STATS_ERROR); - return -1; - } - } - return ret; -} - -/* make sure a directory exists */ -int create_dir(const char *dir) -{ - struct stat st; - if (stat(dir, &st) == 0) { - if (S_ISDIR(st.st_mode)) { - return 0; - } - errno = ENOTDIR; - return 1; - } -#ifdef _WIN32 - if (mkdir(dir) != 0 && errno != EEXIST) { - return 1; - } -#else - if (mkdir(dir, 0777) != 0 && errno != EEXIST) { - return 1; - } -#endif - return 0; -} - -char const CACHEDIR_TAG[] = - "Signature: 8a477f597d28d172789f06886806bc55\n" - "# This file is a cache directory tag created by ccache.\n" - "# For information about cache directory tags, see:\n" - "# http://www.brynosaurus.com/cachedir/\n"; - -int create_cachedirtag(const char *dir) -{ - char *filename; - struct stat st; - FILE *f; - x_asprintf(&filename, "%s/CACHEDIR.TAG", dir); - if (stat(filename, &st) == 0) { - if (S_ISREG(st.st_mode)) { - goto success; - } - errno = EEXIST; - goto error; - } - f = fopen(filename, "w"); - if (!f) goto error; - if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) { - goto error; - } - if (fclose(f)) goto error; -success: - free(filename); - return 0; -error: - free(filename); - return 1; -} - -/* - this is like asprintf() but dies if the malloc fails - note that we use vsnprintf in a rather poor way to make this more portable -*/ -void x_asprintf(char **ptr, const char *format, ...) -{ - va_list ap; - - *ptr = NULL; - va_start(ap, format); - if (vasprintf(ptr, format, ap) == -1) { - fatal("out of memory in x_asprintf"); - } - va_end(ap); - - if (!ptr) fatal("out of memory in x_asprintf"); -} - -/* - this is like strdup() but dies if the malloc fails -*/ -char *x_strdup(const char *s) -{ - char *ret; - ret = strdup(s); - if (!ret) { - fatal("out of memory in strdup\n"); - } - return ret; -} - -/* - this is like malloc() but dies if the malloc fails -*/ -void *x_malloc(size_t size) -{ - void *ret; - ret = malloc(size); - if (!ret) { - fatal("out of memory in malloc\n"); - } - return ret; -} - -/* - this is like realloc() but dies if the malloc fails -*/ -void *x_realloc(void *ptr, size_t size) -{ - void *p2; -#if 1 - /* Avoid invalid read in memcpy below */ - p2 = realloc(ptr, size); - if (!p2) { - fatal("out of memory in x_realloc"); - } -#else - if (!ptr) return x_malloc(size); - p2 = malloc(size); - if (!p2) { - fatal("out of memory in x_realloc"); - } - if (ptr) { - /* Note invalid read as the memcpy reads beyond the memory allocated by ptr */ - memcpy(p2, ptr, size); - free(ptr); - } -#endif - return p2; -} - - -/* - revsusive directory traversal - used for cleanup - fn() is called on all files/dirs in the tree - */ -void traverse(const char *dir, void (*fn)(const char *, struct stat *)) -{ - DIR *d; - struct dirent *de; - - d = opendir(dir); - if (!d) return; - - while ((de = readdir(d))) { - char *fname; - struct stat st; - - if (strcmp(de->d_name,".") == 0) continue; - if (strcmp(de->d_name,"..") == 0) continue; - - if (strlen(de->d_name) == 0) continue; - - x_asprintf(&fname, "%s/%s", dir, de->d_name); -#ifdef _WIN32 - if (stat(fname, &st)) -#else - if (lstat(fname, &st)) -#endif - { - if (errno != ENOENT) { - perror(fname); - } - free(fname); - continue; - } - - if (S_ISDIR(st.st_mode)) { - traverse(fname, fn); - } - - fn(fname, &st); - free(fname); - } - - closedir(d); -} - - -/* return the base name of a file - caller frees */ -char *str_basename(const char *s) -{ - char *p = strrchr(s, '/'); - if (p) { - s = (p+1); - } - -#ifdef _WIN32 - p = strrchr(s, '\\'); - - if (p) { - s = (p+1); - } -#endif - - return x_strdup(s); -} - -/* return the dir name of a file - caller frees */ -char *dirname(char *s) -{ - char *p; - s = x_strdup(s); - p = strrchr(s, '/'); -#ifdef _WIN32 - p = strrchr(s, '\\'); -#endif - if (p) { - *p = 0; - } - return s; -} - -/* - http://www.ecst.csuchico.edu/~beej/guide/ipc/flock.html - http://cvs.php.net/viewvc.cgi/php-src/win32/flock.c?revision=1.2&view=markup - Should return 0 for success, >0 otherwise - */ -int lock_fd(int fd) -{ -#ifdef _WIN32 -# if 1 - return _locking(fd, _LK_NBLCK, 1); -# else - HANDLE fl = (HANDLE)_get_osfhandle(fd); - OVERLAPPED o; - memset(&o, 0, sizeof(o)); - return (LockFileEx(fl, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &o)) - ? 0 : GetLastError(); -# endif -#else - struct flock fl; - int ret; - - fl.l_type = F_WRLCK; - fl.l_whence = SEEK_SET; - fl.l_start = 0; - fl.l_len = 1; - fl.l_pid = 0; - - /* not sure why we would be getting a signal here, - but one user claimed it is possible */ - do { - ret = fcntl(fd, F_SETLKW, &fl); - } while (ret == -1 && errno == EINTR); - return ret; -#endif -} - -/* return size on disk of a file */ -size_t file_size(struct stat *st) -{ -#ifdef _WIN32 - return (st->st_size + 1023) & ~1023; -#else - size_t size = st->st_blocks * 512; - if ((size_t)st->st_size > size) { - /* probably a broken stat() call ... */ - size = (st->st_size + 1023) & ~1023; - } - return size; -#endif -} - - -/* a safe open/create for read-write */ -int safe_open(const char *fname) -{ - int fd = open(fname, O_RDWR|O_BINARY); - if (fd == -1 && errno == ENOENT) { - fd = open(fname, O_RDWR|O_CREAT|O_EXCL|O_BINARY, 0666); - if (fd == -1 && errno == EEXIST) { - fd = open(fname, O_RDWR|O_BINARY); - } - } - return fd; -} - -/* display a kilobyte unsigned value in M, k or G */ -void display_size(unsigned v) -{ - if (v > 1024*1024) { - printf("%8.1f Gbytes", v/((double)(1024*1024))); - } else if (v > 1024) { - printf("%8.1f Mbytes", v/((double)(1024))); - } else { - printf("%8u Kbytes", v); - } -} - -/* return a value in multiples of 1024 give a string that can end - in K, M or G -*/ -size_t value_units(const char *s) -{ - char m; - double v = atof(s); - m = s[strlen(s)-1]; - switch (m) { - case 'G': - case 'g': - default: - v *= 1024*1024; - break; - case 'M': - case 'm': - v *= 1024; - break; - case 'K': - case 'k': - v *= 1; - break; - } - return (size_t)v; -} - - -/* - a sane realpath() function, trying to cope with stupid path limits and - a broken API -*/ -char *x_realpath(const char *path) -{ -#ifdef _WIN32 - char namebuf[MAX_PATH]; - DWORD ret; - - ret = GetFullPathNameA(path, sizeof(namebuf), namebuf, NULL); - if (ret == 0 || ret >= sizeof(namebuf)) { - return NULL; - } - - return x_strdup(namebuf); -#else - int maxlen; - char *ret, *p; -#ifdef PATH_MAX - maxlen = PATH_MAX; -#elif defined(MAXPATHLEN) - maxlen = MAXPATHLEN; -#elif defined(_PC_PATH_MAX) - maxlen = pathconf(path, _PC_PATH_MAX); -#endif - if (maxlen < 4096) maxlen = 4096; - - ret = x_malloc(maxlen); - -#if HAVE_REALPATH - p = realpath(path, ret); -#else - /* yes, there are such systems. This replacement relies on - the fact that when we call x_realpath we only care about symlinks */ - { - int len = readlink(path, ret, maxlen-1); - if (len == -1) { - free(ret); - return NULL; - } - ret[len] = 0; - p = ret; - } -#endif - if (p) { - p = x_strdup(p); - free(ret); - return p; - } - free(ret); - return NULL; -#endif -} - -/* a getcwd that will returns an allocated buffer */ -char *gnu_getcwd(void) -{ - unsigned size = 128; - - while (1) { - char *buffer = (char *)x_malloc(size); - if (getcwd(buffer, size) == buffer) { - return buffer; - } - free(buffer); - if (errno != ERANGE) { - return 0; - } - size *= 2; - } -} - -/* create an empty file */ -int create_empty_file(const char *fname) -{ - int fd; - - fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); - if (fd == -1) { - return -1; - } - close(fd); - return 0; -} - -/* - return current users home directory or die -*/ -const char *get_home_directory(void) -{ -#ifdef _WIN32 - static char home_path[MAX_PATH] = {0}; - HRESULT ret; - - /* we already have the path */ - if (home_path[0] != 0) { - return home_path; - } - - /* get the path to "Application Data" folder */ - ret = SHGetFolderPathA(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, home_path); - if (SUCCEEDED(ret)) { - return home_path; - } - - fprintf(stderr, "ccache: Unable to determine home directory\n"); - return NULL; -#else - const char *p = getenv("HOME"); - if (p) { - return p; - } -#ifdef HAVE_GETPWUID - { - struct passwd *pwd = getpwuid(getuid()); - if (pwd) { - return pwd->pw_dir; - } - } -#endif - fatal("Unable to determine home directory"); - return NULL; -#endif -} - -int x_utimes(const char *filename) -{ -#ifdef HAVE_UTIMES - return utimes(filename, NULL); -#else - return utime(filename, NULL); -#endif -} - -#ifdef _WIN32 -/* perror for Win32 API calls, using GetLastError() instead of errno */ -void perror_win32(LPTSTR pszFunction) -{ - LPTSTR pszMessage; - DWORD dwLastError = GetLastError(); - - FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dwLastError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&pszMessage, - 0, NULL ); - - fprintf(stderr, "%s: %s\n", pszFunction, pszMessage); - LocalFree(pszMessage); -} -#endif diff --git a/CCache/web/index.html b/CCache/web/index.html deleted file mode 100644 index 4af839135..000000000 --- a/CCache/web/index.html +++ /dev/null @@ -1,158 +0,0 @@ - - - -ccache - - -

        ccache

        - -ccache is a compiler cache. It acts as a caching pre-processor to -C/C++ compilers, using the -E compiler switch and a hash to detect -when a compilation can be satisfied from cache. This often results in -a 5 to 10 times speedup in common compilations.

        - -The idea came from Erik Thiele wrote the original compilercache program -as a bourne shell script. ccache is a re-implementation of Erik's idea -in C with more features and better performance.

        - -

        Latest release

        - -The latest release is ccache 2.4. - -
          -
        • Added CCACHE_READONLY option -
        • Added CCACHE_TEMPDIR option -
        • fixed handling of hard-linked compilers on AIX -
        • added O_BINARY support, to try and support win32 compiles -
        • show cache directory in stats output -
        • fixed handling of HOME environment variable -
        - -See the manual page for details -on the new options.

        - -You can get this release from the download directory - -

        NOTE! This release changes the hash input slighly, so you will -probably find that you will not get any hits against your existing -cache when you upgrade. - -

        Why bother?

        - -Why bother with a compiler cache? If you ever run "make clean; make" -then you can probably benefit from ccache. It is very common for -developers to do a clean build of a project for a whole host of -reasons, and this throws away all the information from your previous -compiles.

        - -By using ccache you can get exactly the same effect as "make clean; -make" but much faster. It also helps a lot when doing RPM builds, -as RPM can make doing incremental builds tricky.

        - -I put the effort into writing ccache for 2 reasons. The first is the -Samba build farm -(http://build.samba.org/) -which constantly does clean builds of Samba on about 30 machines after each -CVS commit. On some of those machines the build took over an hour. By -using ccache we get the same effect as clean builds but about 6 times -faster.

        - -The second reason is the autobuild system I used to run for -Quantum. That system builds our whole Linux based OS from scratch -after every CVS commit to catch compilation problems quickly. Using -ccache those builds are much faster. - -

        Is it safe?

        - -Yes. The most important aspect of a compiler cache is to always -produce exactly the same output that the real compiler would -produce. The includes providing exactly the same object files and -exactly the same compiler warnings that would be produced if you use -the real compiler. The only way you should be able to tell that you -are using ccache is the speed.

        - -I have coded ccache very carefully to try to provide these guarantees. - -

        Features

        - -
          -
        • keeps statistics on hits/misses -
        • automatic cache size management -
        • can cache compiles that generate warnings -
        • easy installation -
        • very low overhead -
        • uses hard links where possible to avoid copies -
        - -

        Documentation

        - -See the manual page - - -

        Performance

        - -Here are some results for compiling Samba on my Linux laptop. I have -also included the results of using Erik's compilercache program -(version 1.0.10) for comparison.

        - -

      • - - - - -
          ccache  compilercache
      normal 13m 4s 13m 4s
      uncached 13m 15s 15m 41s
      cached 2m 45s 4m 26s
      - -

      How to use it

      - -You can use ccache in two ways. The first is just to prefix your -compile commands with "ccache". For example, you could change the -"CC=gcc" line in your Makefile to be "CC=ccache gcc".

      - -Alternatively, you can create symbolic links from your compilers name -to ccache. This allows you to use ccache without any changes to your -build system. - -

      Download

      - -You can download the latest release from the download directory.

      - -For the bleeding edge, you can fetch ccache via CVS or -rsync. To fetch via cvs use the following command: - -

      -  cvs -d :pserver:cvs@pserver.samba.org:/cvsroot co ccache
-
      - -To fetch via rsync use this command: - -
      -  rsync -Pavz samba.org::ftp/unpacked/ccache .
-
      - -

      Related projects

      - -Here are some related programs you may find interesting - -
        -
      • distcc - a distributed compilation system -
      • cachecc1 - a gcc specific cache -
      • gocache - a cross platform compiler cache -
      -

      - -

      Mailing list

      - -

      A mailing -list is available for discussion of ccache. - - -

      - -Andrew Tridgell
      -bugs@ccache.samba.org -       - - - diff --git a/CHANGES b/CHANGES index d9426512b..782849c6f 100644 --- a/CHANGES +++ b/CHANGES @@ -2,488 +2,6 @@ SWIG (Simplified Wrapper and Interface Generator) See CHANGES.current for current version. -Version 1.3.39 (21 March 2009) -============================== - -2009-03-19: bhy - [Python] Fix the memory leak related to Python 3 unicode and C char* conversion, - which can be shown in the following example before this fix: - - from li_cstring import * - i=0 - while True: - i += 1 - n = str(i)*10 - test3(n) - - This fix affected SWIG_AsCharPtrAndSize() so you cannot call this function with - a null alloc and non-null cptr argument in Python 3, otherwise a runtime error - will be raised. - -2009-03-18: wsfulton - [C#] std::vector wrapper improvements for .NET 2 and also providing the - necessary machinery to use the std::vector wrappers with more advanced features such - as LINQ - the C# proxy class now derives from IEnumerable<>. The default is now to - generate code requiring .NET 2 as a minimum, although the C# code can be compiled - for .NET 1 by defining the SWIG_DOTNET_1 C# preprocessor constant. See the - std_vector.i file for more details. - - *** POTENTIAL INCOMPATIBILITY *** - -2009-03-12: wsfulton - [Ruby] Fix #2676738 SWIG generated symbol name clashes. - -2009-03-01: bhy - [Python] Some fixes for Python 3.0.1 and higher support. In 3.0.1, the C API function - PyObject_Compare is removed, so PyObject_RichCompareBool is used for replacement. - Struct initilization of SwigPyObject and SwigPyObject_as_number changed to reflect - the drop of tp_compare and nb_long. - -2009-03-01: bhy - [Python] Fix SF#2583160. Now the importer in Python shadow wrapper take care of the - case that module already imported at other place. - -2009-02-28: bhy - [Python] Fix SF#2637352. Move struct declaration of SWIG_module in pyinit.swg before - the method calls, since some C compiler don't allow declaration in middle of function - body. - -2009-02-21: wsfulton - [Allegrocl] Fix seg fault wrapping some constant variable (%constant) types. - -2009-02-20: wsfulton - [CFFI] Fix seg faults when for %extend and using statements. - -2009-02-20: wsfulton - Fix SF #2605955: -co option which broke in 1.3.37. - -2009-02-20: wsfulton - New %insert("begin") section added. Also can be used as %begin. This is a new - code section reserved entirely for users and the code within the section is generated - at the top of the C/C++ wrapper file and so provides a means to put custom code - into the wrapper file before anything else that SWIG generates. - -2009-02-17: wsfulton - 'make clean-test-suite' will now run clean on ALL languages. Previously it only - ran the correctly configured languages. This way it is now possible to clean up - properly after running 'make partialcheck-test-suite'. - -2009-02-14: wsfulton - Extend attribute library support for structs/classes and the accessor functions use - pass/return by value semantics. Two new macros are available and usage is identical - to %attribute. These are %attributeval for structs/classes and %attributestring for - string classes, like std::string. See attribute.swg for more details. - -2009-02-13: wsfulton - Add support for %extend and memberin typemaps. Previously the memberin typemaps were - ignored for member variables within a %extend block. - -2009-02-12: wsfulton - Remove unnecessary temporary variable when wrapping return values that are references. - Example of generated code for wrapping: - - struct XYZ { - std::string& refReturn(); - }; - - used to be: - - std::string *result = 0 ; - ... - { - std::string &_result_ref = (arg1)->refReturn(); - result = (std::string *) &_result_ref; - } - - Now it is: - - std::string *result = 0 ; - ... - result = (std::string *) &(arg1)->refReturn(); - -2009-02-08: bhy - Change the SIZE mapped by %pybuffer_mutable_binary and %pybuffer_binary in pybuffer.i from - the length of the buffer to the number of items in the buffer. - -2009-02-08: wsfulton - Fix %feature not working for conversion operators, reported by Matt Sprague, for example: - %feature("cs:methodmodifiers") operator bool "protected"; - -2009-02-07: wsfulton - [MzScheme] Apply #2081967 configure changes for examples to build with recent PLT versions. - Also fixes Makefile errors building SWIG executable when mzscheme package is installed - (version 3.72 approx and later). - -2009-02-04: talby - [Perl] Fix SF#2564192 reported by David Kolovratnk. - SWIG_AsCharPtrAndSize() now handles "get" magic. - -Version 1.3.38 (31 January 2009) -================================ - -2009-01-31: bhy - [Python] Fix SF#2552488 reported by Gaetan Lehmann. Now %pythonprepend - and %pythonappend have correct indentation. - -2009-01-31: bhy - [Python] Fix SF#2552048 reported by Gaetan Lehmann. The parameter list - of static member function in generated proxy code should not have the - 'self' parameter. - -2009-01-29: wsfulton - Fix regression introduced in 1.3.37 where the default output directory - for target language specific files (in the absence of -outdir) was no - longer the same directory as the generated c/c++ file. - -2009-01-28: wsfulton - [Java, C#] Fix proxy class not being used when the global scope operator - was used for parameters passed by value. Reported by David Piepgrass. - -2009-01-15: wsfulton - [Perl] Fix seg fault when running with -v option, reported by John Ky. - -Version 1.3.37 (13 January 2009) -================================ - -2009-01-13: mgossage - [Lua] Added contract support for requiring that unsigned numbers are >=0 - Rewrote much of Examples/Lua/embed3. - Added a lot to the Lua documentation. - -2009-01-13: wsfulton - Fix compilation error when using directors on protected virtual overloaded - methods reported by Sam Hendley. - -2009-01-12: drjoe - [R] Fixed handling of integer arrays - -2009-01-10: drjoe - [R] Fix integer handling in r to deal correctly with signed - and unsigned issues - -2009-01-10: wsfulton - Patch #1992756 from Colin McDonald - %contract not working for classes - in namespace - -2009-01-05: olly - Mark SWIGPERL5, SWIGPHP5, and SWIGTCL8 as deprecated in the source - code and remove documentation of them. - -2008-12-30: wsfulton - Bug #2430756. All the languages now define a macro in the generated C/C++ - wrapper file indicating which language is being wrapped. The macro name is the - same as those defined when SWIG is run, eg SWIGJAVA, SWIGOCTAVE, SWIGCSHARP etc - and are listed in the "Conditional Compilation" section in the documentation. - -2008-12-23: wsfulton - [Java] Fix #2153773 - %nojavaexception was clearing the exception feature - instead of disabling it. Clearing checked Java exceptions also didn't work. - The new %clearjavaexception can be used for clearing the exception feature. - -2008-12-22: wsfulton - Fix #2432801 - Make SwigValueWrapper exception safe for when copy constructors - throw exceptions. - -2008-12-21: wsfulton - Apply patch #2440046 which fixes possible seg faults for member and global - variable char arrays when the strings are larger than the string array size. - -2008-12-20: wsfulton - The ccache compiler cache has been adapted to work with SWIG and - named ccache-swig. It now works with C/C++ compilers as well as SWIG - and can result in impressive speedups when used to recompile unchanged - code with either a C/C++ compiler or SWIG. Documentation is in CCache.html - or the installed ccache-swig man page. - -2008-12-12: wsfulton - Apply patch from Kalyanov Dmitry which fixes parsing of nested structs - containing comments. - -2008-12-12: wsfulton - Fix error message in some nested struct and %inline parsing error situations - such as unterminated strings and comments. - -2008-12-07: olly - [PHP] Fix warnings when compiling generated wrapper with GCC 4.3. - -2008-12-06: wsfulton - [PHP] Deprecate %pragma(php4). Please use %pragma(php) instead. - The following two warnings have been renamed: - WARN_PHP4_MULTIPLE_INHERITANCE -> WARN_PHP_MULTIPLE_INHERITANCE - WARN_PHP4_UNKNOWN_PRAGMA -> WARN_PHP_UNKNOWN_PRAGMA - - *** POTENTIAL INCOMPATIBILITY *** - -2008-12-04: bhy - [Python] Applied patch SF#2158938: all the SWIG symbol names started with Py - are changed, since they are inappropriate and discouraged in Python - documentation (from http://www.python.org/doc/2.5.2/api/includes.html): - - "All user visible names defined by Python.h (except those defined by - the included standard headers) have one of the prefixes "Py" or "_Py". - Names beginning with "_Py" are for internal use by the Python implementation - and should not be used by extension writers. Structure member names do - not have a reserved prefix. - - Important: user code should never define names that begin with "Py" or "_Py". - This confuses the reader, and jeopardizes the portability of the user - code to future Python versions, which may define additional names beginning - with one of these prefixes." - - Here is a brief list of what changed: - - PySwig* -> SwigPy* - PyObject_ptr -> SwigPtr_PyObject - PyObject_var -> SwigVar_PyObject - PySequence_Base, PySequence_Cont, PySequence_Ref -> - SwigPySequence_Base, SwigPySequence_Cont, SwigPySequence_Ref - PyMap* -> SwigPyMap* - - We provided a pyname_compat.i for backward compatibility. Users whose code having - these symbols and do not want to change it could simply include this file - at front of your code. A better solution is to run the converting tool on - your code, which has been put in SWIG's SVN trunk (Tools/pyname_patch.py) and - you can download it here: - https://swig.svn.sourceforge.net/svnroot/swig/trunk/Tools/pyname_patch.py - - *** POTENTIAL INCOMPATIBILITY *** - -2008-12-02: wsfulton - [Python] Apply patch #2143727 from Serge Monkewitz to fix importing base classes - when the package option is specified in %module and that module is %import'ed. - -2008-11-28: wsfulton - [UTL] Fix #2080497. Some incorrect acceptance of types in the STL, eg a double * element - passed into a vector constructor would be accepted, but the ensuing behaviour - was undefined. Now the type conversion correctly raises an exception. - -2008-11-24: wsfulton - Add -outcurrentdir option. This sets the default output directory to the current - directory instead of the path specified by the input file. This option enables - behaviour similar to c/c++ compilers. Note that this controls the output directory, - but only in the absence of the -o and/or -outdir options. - -2008-11-23: wsfulton - [ruby] Apply patch #2263850 to fix ruby/file.i ... rubyio.h filename change in - ruby 1.9. - -2008-11-23: wsfulton - Apply patch #2319790 from Johan Hake to fix shared_ptr usage in std::tr1 namespace. - -2008-11-21: wsfulton - The use of the include path to find the input file is now deprecated. - This makes the behaviour of SWIG the same as C/C++ compilers in preparation - for use with ccache. - -2008-11-16: wsfulton - Fix -nopreprocess option to: - - correctly report file names in warning and error messages. - - use the original input filename that created the preprocessed output when - determining the C++ wrapper file name (in the absence of -o). Previously - the name of the input file containing the preprocessed output was used. - -2008-11-11: wsfulton - [Java] Add patch #2152691 from MATSUURA Takanori which fixes compiles using the - Intel compiler - -2008-11-01: wsfulton - Add patch #2128249 from Anatoly Techtonik which corrects the C/C++ proxy - class being reported for Python docstrings when %rename is used. - -2008-11-01: wsfulton - Add the strip encoder patch from Anatoly Techtonik #2130016. This enables an - easy way to rename symbols by stripping a commonly used prefix in all the - function/struct names. It works in the same way as the other encoders, such as - title, lower, command etc outlined in CHANGES file dated 12/30/2005. Example - below will rename wxAnotherWidget to AnotherWidget and wxDoSomething to - DoSomething: - - %rename("%(strip:[wx])s") ""; - - struct wxAnotherWidget { - void wxDoSomething(); - }; - -2008-09-26: mutandiz - [allegrocl] - Lots of test-suite work. - - Fix ordering of wrapper output and %{ %} header output. - - Fix declarations of local vars in C wrappers. - - Fix declaration of defined constants in C wrappers. - - Fix declaration of EnumValues in C wrappers. - - add some const typemaps to allegrocl.swg - - add rename for operator bool() overloads. - -2008-09-25: olly - [PHP5] Fill in typemaps for SWIGTYPE and void * (SF#2095186). - -2008-09-22: mutandiz (Mikel Bancroft) - [allegrocl] - - Support wrapping of types whose definitions are not seen by - SWIG. They are treated as forward-referenced classes and if a - definition is not seen are treated as (* :void). - - Don't wrap the contents of unnamed namespaces. - - More code cleanup. Removed some extraneous warnings. - - start work on having the allegrocl mod pass the cpp test-suite. - -2008-09-19: olly - [PHP5] Add typemaps for long long and unsigned long long. - -2008-09-18: wsfulton - [C#] Added C# array typemaps provided by Antti Karanta. - The arrays provide a way to use MarshalAs(UnmanagedType.LPArray) - and pinning the array using 'fixed'. See arrays_csharp.i library file - for details. - -2008-09-18: wsfulton - Document the optional module attribute in the %import directive, - see Modules.html. Add a warning for Python wrappers when the - module name for an imported base class is missing, requiring the - module attribute to be added to %import, eg - - %import(module="FooModule") foo.h - -2008-09-18: olly - [PHP5] Change the default input typemap for char * to turn PHP - Null into C NULL (previously it was converted to an empty string). - The new behaviour is consistent with how the corresponding output - typemap works (SF#2025719). - - If you want to keep the old behaviour, add the following typemap - to your interface file (PHP's convert_to_string_ex() function does - the converting from PHP Null to an empty string): - - %typemap(in) char * { - convert_to_string_ex($input); - $1 = Z_STRVAL_PP($input); - } - -2008-09-18: olly - [PHP5] Fix extra code added to proxy class constructors in the case - where the only constructor takes no arguments. - -2008-09-18: olly - [PHP5] Fix wrapping of a renamed enumerated value of an enum class - member (SF#2095273). - -2008-09-17: mutandiz (Mikel Bancroft) - [allegrocl] - - Fix how forward reference typedefs are handled, so as not to conflict - with other legit typedefs. - - Don't (for now) perform an ffitype typemap lookup when trying to - when calling compose_foreign_type(). This is actually a useful thing - to do in certain cases, the test cases for which I can't currently - locate :/. It's breaking some wrapping behavior that is more commonly - seen, however. I'll readd in a more appropriate way when I can - recreate the needed test case, or a user complains (which means - they probably have a test case). - - document the -isolate command-line arg in the 'swig -help' output. - It was in the html docs, but not there. - - small amount of code cleanup, removed some unused code. - - some minor aesthetic changes. - -2008-09-12: bhy - [Python] Python 3.0 support branch merged into SWIG trunk. Thanks to - Google Summer of Code 2008 for supporting this project! By default - SWIG will generate interface files compatible with both Python 2.x - and 3.0. And there's also some Python 3 new features that can be - enabled by passing a "-py3" command line option to SWIG. These - features are: - - - Function annotation support - Also, the parameter list of proxy function will be generated, - even without the "-py3" option. However, the parameter list - will fallback to *args if the function (or method) is overloaded. - - Buffer interface support - - Abstract base class support - - For details of Python 3 support and these features, please see the - "Python 3 Support" section in the "SWIG and Python" chapter of the SWIG - documentation. - - The "-apply" command line option and support of generating codes - using apply() is removed. Since this is only required by very old - Python. - - This merge also patched SWIG's parser to solve a bug. By this patch, - SWIG features able to be correctly applied on C++ conversion operator, - such like this: - - %feature("shadow") *::operator bool %{ ... %} - -2008-09-02: richardb - [Python] Commit patch #2089149: Director exception handling mangles - returned exception. Exceptions raised by Python code in directors - are now passed through to the caller without change. Also, remove - the ": " prefix which used to be added to other director exceptions - (eg, those due to incorrect return types). - -2008-09-02: wsfulton - [Python] Commit patch #1988296 GCItem multiple module linking issue when using - directors. - -2008-09-02: wsfulton - [C#] Support for 'using' and 'fixed' blocks in the 'csin' typemap is now - possible through the use of the pre attribute and the new terminator attribute, eg - - %typemap(csin, - pre=" using (CDate temp$csinput = new CDate($csinput)) {", - terminator=" } // terminate temp$csinput using block", - ) const CDate & - "$csclassname.getCPtr(temp$csinput)" - - See CSharp.html for more info. - -2008-09-01: wsfulton - [CFFI] Commit patch #2079381 submitted by Boris Smilga - constant exprs put into - no-eval context in DEFCENUM - -2008-08-02: wuzzeb - [Chicken,Allegro] Commit Patch 2019314 - Fixes a build error in chicken, and several build errors and other errors - in Allegro CL - -2008-07-19: wsfulton - Fix building of Tcl examples/test-suite on Mac OSX reported by Gideon Simpson. - -2008-07-17: wsfulton - Fix SF #2019156 Configuring with --without-octave or --without-alllang - did not disable octave. - -2008-07-14: wsfulton - [Java, C#] Fix director typemaps for pointers so that NULL pointers are correctly - marshalled to C#/Java null in director methods. - -2008-07-04: olly - [PHP] For std_vector.i and std_map.i, rename empty() to is_empty() - since "empty" is a PHP reserved word. Based on patch from Mark Klein - in SF#1943417. - -2008-07-04: olly - [PHP] The deprecated command line option "-make" has been removed. - Searches on Google codesearch suggest that nobody is using it now - anyway. - -2008-07-04: olly - [PHP] The SWIG cdata.i library module is now supported. - -2008-07-03: olly - [PHP] The deprecated command line option "-phpfull" has been - removed. We recommend building your extension as a dynamically - loadable module. - -2008-07-02: olly - [PHP4] Support for PHP4 has been removed. The PHP developers are - no longer making new PHP4 releases, and won't even be providing - patches for critical security issues after 2008-08-08. - -2008-07-02: olly - [Python] Import the C extension differently for Python 2.6 and - later so that an implicit relative import doesn't produce a - deprecation warning for 2.6 and a failure for 2.7 and later. - Patch from Richard Boulton in SF#2008229, plus follow-up patches - from Richard and Haoyu Bai. - Version 1.3.36 (24 June 2008) ============================= @@ -959,7 +477,7 @@ Version 1.3.34 (27 February 2008) }; Version 1.3.33 (November 23, 2007) -================================== +================================= 11/21/2007: mikel [allegrocl] omit private slot type info in the classes/types @@ -1891,7 +1409,7 @@ Version 1.3.31 (November 20, 2006) [lua] update to typemap for object by value, to make it c89 compliant Version 1.3.30 (November 13, 2006) -================================== +================================= 11/12/2006: wsfulton [java] Remove DetachCurrentThread patch from 08/11/2006 - it causes segfaults @@ -6214,7 +5732,7 @@ Version 1.3.24 (December 14, 2004) compile with no errors, java shows some problems. Version 1.3.23 (November 11, 2004) -================================== +================================= 11/05/2004: wsfulton Patch #982753 from Fabrice Salvaire: Adds dependencies generation for @@ -8465,8 +7983,7 @@ Version 1.3.22 (September 4, 2004) exception instead. Version 1.3.21 (January 11, 2004) -================================= - +================================== 01/10/2004: cheetah (William Fulton) The output format for both warnings and errors can be selected for integration with your favourite IDE/editor. Editors and IDEs can usually @@ -10240,7 +9757,6 @@ Version 1.3.20 (December 17, 2003) Version 1.3.19 (March 28, 2003) =============================== - 03/28/2003: beazley Variety of minor bug fixes to the 1.3.18 release including: @@ -10827,7 +10343,6 @@ Version 1.3.18 (March 23, 2003) Version 1.3.17 (November 22, 2002) ================================== - 11/19/2002: beazley Fixed [ 613922 ] preprocessor errors with HAVE_LONG_LONG. @@ -11183,7 +10698,6 @@ Version 1.3.16 (October 14, 2002) Version 1.3.15 (September 9, 2002) ================================== - 09/09/2002: beazley Fixed nasty runtime type checking bug with subtypes and inheritance and templates. @@ -12876,7 +12390,6 @@ Version 1.3.14 (August 12, 2002) Version 1.3.13 (June 17, 2002) ============================== - 06/16/2002: beazley Fixed a bug with __FILE__ expansion in the preprocessor. On Windows, the backslash (\) is now converted to (\\) in the string literal @@ -16008,7 +15521,6 @@ Version 1.3.10 (December 10, 2001) Version 1.3.9 (September 25, 2001) ================================== - 9/25/2001: beazley Fixed parsing problem with type declarations like 'char ** const'. SWIG parsed this correctly, but the @@ -16021,7 +15533,6 @@ Version 1.3.9 (September 25, 2001) Version 1.3.8 (September 23, 2001) ================================== - 9/23/2001: beazley Included improved distutils setup.py file in the Tools directory (look for the setup.py.tmpl file). Contributed by @@ -17394,7 +16905,7 @@ Version 1.3 Alpha 5 and function bodies. Preprocessor bug. Version 1.3 Alpha 4 (September 4, 2000) -======================================= +====================================== 9/3/00 : ttn Added instructions for maintainers in Examples/README on how @@ -18480,7 +17991,6 @@ Version 1.3 Alpha 1 (February 11, 2000) Version 1.1 Patch 5 (February 5, 1998) ====================================== - 2/4/98 : Fixed a bug in the configure script when different package locations are specified (--with-tclincl, etc...). @@ -18733,7 +18243,6 @@ Version 1.1 Patch 3 (November 24, 1997) Version 1.1 Patch 2 (September 4, 1997) ======================================= - 9/4/97 : Fixed problem with handling of virtual functions that was introduced by some changes in the C++ module. @@ -19869,7 +19378,7 @@ This release should fix most, if not all, of those problems. it generated alot of unnecessary code). Version 1.1 Beta3 (January 9, 1997) -=================================== +==================================== Note : A *huge* number of changes related to ongoing modifications. @@ -19992,7 +19501,6 @@ Version 1.1 Beta1 (October 30, 1996) Version 1.0 Final (August 31, 1996) =================================== - 1. Fixed minor bug in C++ module 2. Fixed minor bug in pointer type-checker when using @@ -20076,7 +19584,7 @@ number of immediate problems : 3. A few minor fixes were made in the Makefile Version 1.0 Beta 3 (June 14, 1996) -================================== +=================================== There are lots of changes in this release : @@ -20166,7 +19674,6 @@ let me know. Version 1.0 Beta 2 (April 26, 1996) =================================== - This release is identical to Beta1 except a few minor bugs are fixed and the SWIG library has been updated to work with Tcl 7.5/Tk 4.1. A tcl7.5 examples directory is now included. @@ -20181,7 +19688,6 @@ A tcl7.5 examples directory is now included. Version 1.0 Beta 1 (April 10, 1996). ===================================== - This is the first "semi-official" release of SWIG. It has a number of substantial improvements over the Alpha release. These notes are in no particular order--hope I remembered everything.... diff --git a/CHANGES.current b/CHANGES.current index fcf35a6b5..ef3fcca54 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -1,18 +1,3 @@ -Version 1.3.40 (in progress) -============================ +Version 1.3.36 (in progress) +============================= -2009-04-09: wsfulton - Fix #2746858 - C macro expression using floating point numbers - -2009-03-30: olly - [PHP] The default out typemap for char[ANY] now returns the string up to a - zero byte, or the end of the array if there is no zero byte. This - is the same as Python does, and seems more generally useful than - the previous behaviour of returning the whole contents of the array - including any zero bytes. If you want the old behaviour, you can provide - your own typemap to do this: - - %typemap(out) char [ANY] - %{ - RETVAL_STRINGL($1, $1_dim0, 1); - %} diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html old mode 100644 new mode 100755 index cc950db7c..8981f52b5 --- a/Doc/Manual/Allegrocl.html +++ b/Doc/Manual/Allegrocl.html @@ -8,7 +8,7 @@ -

      17 SWIG and Allegro Common Lisp

      +

      16 SWIG and Allegro Common Lisp

        @@ -135,10 +135,10 @@ be unhappy to see some enterprising folk use this work to add to it.

        -

        17.1 Basics

        +

        16.1 Basics

        -

        17.1.1 Running Swig

        +

        16.1.1 Running Swig

        @@ -360,7 +360,7 @@ need to link in the Allegro shared library. The library you create from the C++ wrapper will be what you then load into Allegro CL.

        -

        17.1.2 Command Line Options

        +

        16.1.2 Command Line Options

        @@ -396,7 +396,7 @@ See Section 17.5 Identifier converter functions for more details.

        -

        17.1.3 Inserting user code into generated files

        +

        16.1.3 Inserting user code into generated files

        @@ -411,7 +411,7 @@ using the SWIG %insert(section) %{ ...code... %} directive: 

         %module example
 
-%{
+%insert("runtime") %{
 #include "header.h"
 %}
 
@@ -432,11 +432,11 @@ generated lisp interface file

      Note that the block %{ ... %} is effectively a shortcut for -%insert("header") %{ ... %}. +%insert("runtime") %{ ... %}.

      -

      17.2 Wrapping Overview

      +

      16.2 Wrapping Overview

      @@ -446,7 +446,7 @@ New users to SWIG are encouraged to read interested in generating an interface to C++.

      -

      17.2.1 Function Wrapping

      +

      16.2.1 Function Wrapping

      @@ -499,7 +499,7 @@ interested in generating an interface to C++.

      -

      17.2.2 Foreign Wrappers

      +

      16.2.2 Foreign Wrappers

      @@ -512,7 +512,7 @@ interested in generating an interface to C++. typemap.

      -

      17.2.3 FFI Wrappers

      +

      16.2.3 FFI Wrappers

      @@ -593,7 +593,7 @@ char *xxx(); ff:def-foreign-call's.

      -

      17.2.4 Non-overloaded Defuns

      +

      16.2.4 Non-overloaded Defuns

      @@ -606,7 +606,7 @@ char *xxx(); this function can be manipulated via the lout typemap.

      -

      17.2.5 Overloaded Defuns

      +

      16.2.5 Overloaded Defuns

      @@ -622,7 +622,7 @@ char *xxx(); can be manipulated via the lout typemap.

      -

      17.2.6 What about constant and variable access?

      +

      16.2.6 What about constant and variable access?

      @@ -635,7 +635,7 @@ char *xxx(); into the foreign module.

      -

      17.2.7 Object Wrapping

      +

      16.2.7 Object Wrapping

      @@ -657,7 +657,7 @@ char *xxx(); foreign function interface.

      -

      17.3 Wrapping Details

      +

      16.3 Wrapping Details

      @@ -665,7 +665,7 @@ char *xxx(); translated into lisp.

      -

      17.3.1 Namespaces

      +

      16.3.1 Namespaces

      @@ -742,7 +742,7 @@ namespace car { function such as (car '(1 2 3).

      -

      17.3.2 Constants

      +

      16.3.2 Constants

      @@ -803,7 +803,7 @@ namespace car { not use the -nocwrap command-line option.

      -

      17.3.3 Variables

      +

      16.3.3 Variables

      @@ -881,7 +881,7 @@ globalvar> (globalvar.nnn::glob_float) -

      17.3.4 Enumerations

      +

      16.3.4 Enumerations

      @@ -957,7 +957,7 @@ EXPORT const int ACL_ENUM___FOO3__SWIG_0 = FOO3; -

      17.3.5 Arrays

      +

      16.3.5 Arrays

      @@ -1105,10 +1105,10 @@ namespace BAR { -

      17.3.6 Classes and Structs and Unions (oh my!)

      +

      16.3.6 Classes and Structs and Unions (oh my!)

      -

      17.3.6.1 CLOS wrapping of

      +

      16.3.6.1 CLOS wrapping of

      @@ -1123,7 +1123,7 @@ namespace BAR { integer values.

      -

      17.3.6.2 CLOS Inheritance

      +

      16.3.6.2 CLOS Inheritance

      @@ -1136,7 +1136,7 @@ namespace BAR { parameter.

      -

      17.3.6.3 Member fields and functions

      +

      16.3.6.3 Member fields and functions

      @@ -1152,7 +1152,7 @@ namespace BAR { the interface does nothing for friend directives,

      -

      17.3.6.4 Why not directly access C++ classes using foreign types?

      +

      16.3.6.4 Why not directly access C++ classes using foreign types?

      @@ -1170,11 +1170,11 @@ namespace BAR { use the more robust wrapper functions.

      -

      17.3.7 Templates

      +

      16.3.7 Templates

      -

      17.3.7.1 Generating wrapper code for templates

      +

      16.3.7.1 Generating wrapper code for templates

      @@ -1187,7 +1187,7 @@ namespace BAR { directive.

      -

      17.3.7.2 Implicit Template instantiation

      +

      16.3.7.2 Implicit Template instantiation

      @@ -1197,7 +1197,7 @@ namespace BAR { class schema.

      -

      17.3.8 Typedef, Templates, and Synonym Types

      +

      16.3.8 Typedef, Templates, and Synonym Types

      @@ -1277,7 +1277,7 @@ synonym> -

      17.3.8.1 Choosing a primary type

      +

      16.3.8.1 Choosing a primary type

      @@ -1298,7 +1298,7 @@ synonym>

    -

    17.3.9 Function overloading/Parameter defaulting

    +

    16.3.9 Function overloading/Parameter defaulting

    @@ -1461,7 +1461,7 @@ overload> -

    17.3.10 Operator wrapping and Operator overloading

    +

    16.3.10 Operator wrapping and Operator overloading

    @@ -1607,7 +1607,7 @@ opoverload> -

    17.3.11 Varargs

    +

    16.3.11 Varargs

    @@ -1628,7 +1628,7 @@ opoverload> with other ways such functions can be wrapped.

    -

    17.3.12 C++ Exceptions

    +

    16.3.12 C++ Exceptions

    @@ -1640,7 +1640,7 @@ opoverload> implemented.

    -

    17.3.13 Pass by value, pass by reference

    +

    16.3.13 Pass by value, pass by reference

    @@ -1652,7 +1652,7 @@ opoverload> newly defined types.

    -

    17.4 Typemaps

    +

    16.4 Typemaps

    @@ -1663,7 +1663,7 @@ opoverload> on Typemaps for more information.

    -

    17.4.1 Code Generation in the C++ Wrapper

    +

    16.4.1 Code Generation in the C++ Wrapper

    @@ -1693,7 +1693,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.1.1 IN Typemap

    +

    16.4.1.1 IN Typemap

    @@ -1728,7 +1728,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.1.2 OUT Typemap

    +

    16.4.1.2 OUT Typemap

    @@ -1752,7 +1752,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.1.3 CTYPE Typemap

    +

    16.4.1.3 CTYPE Typemap

    @@ -1784,7 +1784,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) these common typemaps here.

    -

    17.4.2 Code generation in Lisp wrappers

    +

    16.4.2 Code generation in Lisp wrappers

    @@ -1803,7 +1803,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) 16.3.1 Namespaces for details.

    -

    17.4.2.1 LIN Typemap

    +

    16.4.2.1 LIN Typemap

    @@ -1846,7 +1846,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.2.2 LOUT Typemap

    +

    16.4.2.2 LOUT Typemap

    @@ -1889,7 +1889,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.2.3 FFITYPE Typemap

    +

    16.4.2.3 FFITYPE Typemap

    @@ -1939,7 +1939,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.2.4 LISPTYPE Typemap

    +

    16.4.2.4 LISPTYPE Typemap

    @@ -1959,7 +1959,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.2.5 LISPCLASS Typemap

    +

    16.4.2.5 LISPCLASS Typemap

    @@ -1983,7 +1983,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.4.3 Modifying SWIG behavior using typemaps

    +

    16.4.3 Modifying SWIG behavior using typemaps

    @@ -2017,10 +2017,10 @@ return-val wrapper-name(parm0, parm1, ..., parmN) -

    17.5 Identifier Converter functions

    +

    16.5 Identifier Converter functions

    -

    17.5.1 Creating symbols in the lisp environment

    +

    16.5.1 Creating symbols in the lisp environment

    @@ -2041,11 +2041,11 @@ return-val wrapper-name(parm0, parm1, ..., parmN) of arguments.

    -

    17.5.2 Existing identifier-converter functions

    +

    16.5.2 Existing identifier-converter functions

    Two basic identifier routines have been defined. -

    17.5.2.1 identifier-convert-null

    +

    16.5.2.1 identifier-convert-null

    @@ -2054,7 +2054,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) strings, from which a symbol will be created.

    -

    17.5.2.2 identifier-convert-lispify

    +

    16.5.2.2 identifier-convert-lispify

    @@ -2063,7 +2063,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) same symbol transformations.

    -

    17.5.2.3 Default identifier to symbol conversions

    +

    16.5.2.3 Default identifier to symbol conversions

    @@ -2072,7 +2072,7 @@ return-val wrapper-name(parm0, parm1, ..., parmN) default naming conventions.

    -

    17.5.3 Defining your own identifier-converter

    +

    16.5.3 Defining your own identifier-converter

    @@ -2128,7 +2128,7 @@ indicating the number of arguments passed to the routine indicated by this identifier.

    -

    17.5.4 Instructing SWIG to use a particular identifier-converter

    +

    16.5.4 Instructing SWIG to use a particular identifier-converter

    diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html index 81c8a232b..97cb75409 100644 --- a/Doc/Manual/CSharp.html +++ b/Doc/Manual/CSharp.html @@ -5,18 +5,12 @@ -

    18 SWIG and C#

    +

    17 SWIG and C#

    • Introduction
    • Differences to the Java module -
    • C# Arrays -
    • C# Exceptions
      • C# exception example using "check" typemap @@ -45,7 +39,7 @@ -

        18.1 Introduction

        +

        17.1 Introduction

        @@ -65,7 +59,7 @@ The Microsoft Developer Network (MSDN) h Monodoc, available from the Mono project, has a very useful section titled Interop with native libraries.

        -

        18.2 Differences to the Java module

        +

        17.2 Differences to the Java module

        @@ -207,12 +201,7 @@ $jnicall -> $imcall

      • -Unlike the "javain" typemap, the "csin" typemap does not support the 'pgcpp' attribute as the C# module does not have a premature garbage collection prevention parameter. -The "csin" typemap supports additional optional attributes called 'cshin' and 'terminator'. -The 'cshin' attribute should contain the parameter type and name whenever a constructor helper function is generated due to the 'pre' or 'post' attributes. -The 'terminator' attribute normally just contains a closing brace for when the 'pre' attribute contains an opening brace, such as when a C# using or fixed block is started. -Note that 'pre', 'post', 'terminator' and 'cshin' attributes are not used for marshalling the property set. -Please see the Date marshalling example and Date marshalling of properties example for further understanding of these "csin" applicable attributes. +Unlike the "javain" typemap, the "csin" typemap does not support the 'pgcpp' attribute as the C# module does not have a premature garbage collection prevention parameter. The "csin" typemap supports an additional optional attribute called 'cshin'. It should contain the parameter type and name whenever a constructor helper function is generated due to the 'pre' or 'post' attributes. Note that 'pre', 'post' and 'cshin' attributes are not used for marshalling the property set. Please see the Date marshalling example and Date marshalling of properties example for further understanding.

        • @@ -408,275 +397,7 @@ Windows users can also get the examples working using a Cygwin or MinGW environment for automatic configuration of the example makefiles. Any one of the three C# compilers (Portable.NET, Mono or Microsoft) can be detected from within a Cygwin or Mingw environment if installed in your path. -

        18.3 C# Arrays

        - - -

        -There are various ways to pass arrays from C# to C/C++. -The default wrapping treats arrays as pointers and as such simple type wrapper classes are generated, -eg SWIGTYPE_p_int when wrapping the C type int [] or int *. -This gives a rather restricted use of the underlying unmanaged code and the most practical way to use arrays is to enhance or customise -with one of the following three approaches; namely the SWIG C arrays library, P/Invoke default array marshalling or -pinned arrays. -

        - -

        18.3.1 The SWIG C arrays library

        - - -

        -The C arrays library keeps all the array memory in the unmanaged layer. -The library is available to all language modules and is documented in the carrays.i library section. -Please refer to this section for details, but for convenience, the C# usage for the two examples outlined there is shown below. -

        - -

        -For the %array_functions example, the equivalent usage would be: -

        - -
        -
        -SWIGTYPE_p_double a = example.new_doubleArray(10);  // Create an array
-for (int i=0; i<10; i++)
-  example.doubleArray_setitem(a,i,2*i);             // Set a value
-example.print_array(a);                             // Pass to C
-example.delete_doubleArray(a);                      // Destroy array
-
        -
        - -

        -and for the %array_class example, the equivalent usage would be: -

        - -
        -
        -doubleArray c = new doubleArray(10);    // Create double[10]
-for (int i=0; i<10; i++)
-  c.setitem(i, 2*i);                    // Assign values
-example.print_array(c.cast());          // Pass to C
-
        -
        - - -

        18.3.2 Managed arrays using P/Invoke default array marshalling

        - - -

        -In the P/Invoke default marshalling scheme, one needs to designate whether the invoked function will treat a managed -array parameter as input, output, or both. When the function is invoked, the CLR allocates a separate chunk of memory as big as the given managed array, -which is automatically released at the end of the function call. If the array parameter is marked as being input, the content of the managed array is copied -into this buffer when the call is made. Correspondingly, if the array parameter is marked as being output, the contents of the reserved buffer are copied -back into the managed array after the call returns. A pointer to to this buffer -is passed to the native function. -

        - -

        -The reason for allocating a separate buffer is to leave the CLR free to relocate the managed array object -during garbage collection. If the overhead caused by the copying is causing a significant performance penalty, consider pinning the managed array and -passing a direct reference as described in the next section. -

        - -

        -For more information on the subject, see the -Default Marshaling for Arrays article -on MSDN. -

        - - -

        -The P/Invoke default marshalling is supported by the arrays_csharp.i library via the INPUT, OUTPUT and INOUT typemaps. -Let's look at some example usage. Consider the following C function: -

        -
        -
        -void myArrayCopy(int *sourceArray, int *targetArray, int nitems);
-
        -
        - -

        -We can now instruct SWIG to use the default marshalling typemaps by -

        - -
        -
        -%include "arrays_csharp.i"
-
-%apply int INPUT[]  {int *sourceArray}
-%apply int OUTPUT[] {int *targetArray}
-
        -
        - -

        -As a result, we get the following method in the module class: -

        - -
        -
        -public static void myArrayCopy(int[] sourceArray, int[] targetArray, int nitems) {
-    examplePINVOKE.myArrayCopy(sourceArray, targetArray, nitems);
-}
-
        -
        - -

        -If we look beneath the surface at the corresponding intermediary class code, we see -that SWIG has generated code that uses attributes -(from the System.Runtime.InteropServices namespace) to tell the CLR to use default -marshalling for the arrays: -

        - -
        -
        -[DllImport("example", EntryPoint="CSharp_myArrayCopy")]
-public static extern void myArrayCopy([In, MarshalAs(UnmanagedType.LPArray)]int[] jarg1, 
-                                      [Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2, int jarg3);
-
        -
        - -

        -As an example of passing an inout array (i.e. the target function will both read from and -write to the array), consider this C function that swaps a given number of elements -in the given arrays: -

        - -
        -
        -void myArraySwap(int *array1, int *array2, int nitems);
-
        -
        - -

        -Now, we can instruct SWIG to wrap this by -

        - -
        -
        -%include "arrays_csharp.i"
-
-%apply int INOUT[] {int *array1}
-%apply int INOUT[] {int *array2}
-
        -
        - -

        -This results in the module class method -

        - -
        -
        -  public static void myArraySwap(int[] array1, int[] array2, int nitems) {
-    examplePINVOKE.myArraySwap(array1, array2, nitems);
-  }
-
        -
        - -

        -and intermediate class method -

        - -
        -
        -  [DllImport("example", EntryPoint="CSharp_myArraySwap")]
-  public static extern void myArraySwap([In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg1, 
-                                        [In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2, int jarg3);
-
        -
        - - -

        18.3.3 Managed arrays using pinning

        - - -

        -It is also possible to pin a given array in memory (i.e. fix its location in memory), obtain a -direct pointer to it, and then pass this pointer to the wrapped C/C++ function. This approach -involves no copying, but it makes the work of the garbage collector harder as -the managed array object can not be relocated before the fix on the array is released. You should avoid -fixing arrays in memory in cases where the control may re-enter the managed side via a callback and/or -another thread may produce enough garbage to trigger garbage collection. -

        - -

        -For more information, see the fixed statement in the C# language reference. -

        - - -

        -Now let's look at an example using pinning, thus avoiding the CLR making copies -of the arrays passed as parameters. The arrays_csharp.i library file again provides the required support via the FIXED typemaps. -Let's use the same function from the previous section: -

        - -
        -
        -void myArrayCopy(int *sourceArray, int *targetArray, int nitems);
-
        -
        - -

        -We now need to declare the module class method unsafe, as we are using pointers: -

        - -
        -
        -%csmethodmodifiers myArrayCopy "public unsafe";
-
        -
        - -

        -Apply the appropriate typemaps to the array parameters: -

        - -
        -
        -%include "arrays_csharp.i"
-
-%apply int FIXED[] {int *sourceArray}
-%apply int FIXED[] {int *targetArray}
-
        -
        - -

        -Notice that there is no need for separate in, out or inout typemaps as is the -case when using P/Invoke default marshalling. -

        - -

        -As a result, we get the following method in the module class: -

        - -
        -
        -  public unsafe static void myArrayCopy(int[] sourceArray, int[] targetArray, int nitems) {
-    fixed ( int *swig_ptrTo_sourceArray = sourceArray ) {
-    fixed ( int *swig_ptrTo_targetArray = targetArray ) {
-    {
-      examplePINVOKE.myArrayCopy((IntPtr)swig_ptrTo_sourceArray, (IntPtr)swig_ptrTo_targetArray, nitems);
-    }
-    }
-    }
-  }
-
        -
        - -

        -On the method signature level the only difference to the version using P/Invoke default -marshalling is the "unsafe" quantifier, which is required because we are handling pointers. -

        - -

        -Also the intermediate class method looks a little different from the default marshalling -example - the method is expecting an IntPtr as the parameter type. -

        - -
        -
        -[DllImport("example", EntryPoint="CSharp_myArrayCopy")]
-public static extern void myArrayCopy(IntPtr jarg1, IntPtr jarg2, int jarg3);
-
        -
        - - - -

        18.4 C# Exceptions

        +

        17.3 C# Exceptions

        @@ -773,7 +494,7 @@ set so should only be used when a C# exception is not created.

        -

        18.4.1 C# exception example using "check" typemap

        +

        17.3.1 C# exception example using "check" typemap

        @@ -955,7 +676,7 @@ method and C# code does not handle pending exceptions via the canthrow attribute Actually it will issue this warning for any function beginning with SWIG_CSharpSetPendingException.

        -

        18.4.2 C# exception example using %exception

        +

        17.3.2 C# exception example using %exception

        @@ -1020,7 +741,7 @@ The managed code generated does check for the pending exception as mentioned ear

    -

    18.4.3 C# exception example using exception specifications

    +

    17.3.3 C# exception example using exception specifications

    @@ -1077,7 +798,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_evensonly(int jarg1) { Multiple catch handlers are generated should there be more than one exception specifications declared.

    -

    18.4.4 Custom C# ApplicationException example

    +

    17.3.4 Custom C# ApplicationException example

    @@ -1211,7 +932,7 @@ try { -

    18.5 C# Directors

    +

    17.4 C# Directors

    @@ -1224,7 +945,7 @@ The following sections provide information on the C# director implementation and However, the Java directors section should also be read in order to gain more insight into directors.

    -

    18.5.1 Directors example

    +

    17.4.1 Directors example

    @@ -1345,7 +1066,7 @@ CSharpDerived - UIntMethod(123) -

    18.5.2 Directors implementation

    +

    17.4.2 Directors implementation

    @@ -1531,7 +1252,7 @@ void SwigDirector_Base::BaseBoolMethod(Base const &b, bool flag) { -

    18.5.3 Director caveats

    +

    17.4.3 Director caveats

    @@ -1579,7 +1300,7 @@ However, a call from C# to CSharpDefaults.DefaultMethod() will of cours should pass the call on to CSharpDefaults.DefaultMethod(int)using the C++ default value, as shown above.

    -

    18.6 C# Typemap examples

    +

    17.5 C# Typemap examples

    This section includes a few examples of typemaps. For more examples, you @@ -1587,7 +1308,7 @@ might look at the files "csharp.swg" and "typemaps.i" in the SWIG library. -

    18.6.1 Memory management when returning references to member variables

    +

    17.5.1 Memory management when returning references to member variables

    @@ -1711,7 +1432,7 @@ public class Bike : IDisposable { Note the addReference call.

    -

    18.6.2 Memory management for objects passed to the C++ layer

    +

    17.5.2 Memory management for objects passed to the C++ layer

    @@ -1830,7 +1551,7 @@ The 'cscode' typemap simply adds in the specified code into the C# proxy class. -

    18.6.3 Date marshalling using the csin typemap and associated attributes

    +

    17.5.3 Date marshalling using the csin typemap and associated attributes

    @@ -1846,7 +1567,6 @@ Let's assume the code being wrapped is as follows: 

     class CDate {
 public:
-  CDate();
   CDate(int year, int month, int day);
   int getYear();
   int getMonth();
@@ -1929,8 +1649,8 @@ The typemaps to achieve this are shown below.
 
     %typemap(cstype) const CDate& "System.DateTime"
 %typemap(csin, 
-         pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);"
-        ) const CDate &
+         pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);")
+         const CDate &
          "$csclassname.getCPtr(temp$csinput)"
 
 %typemap(cstype) CDate& "out System.DateTime"
@@ -1938,8 +1658,7 @@ The typemaps to achieve this are shown below.
          pre="    CDate temp$csinput = new CDate();", 
          post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
               " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
-         cshin="out $csinput"
-        ) CDate &
+         cshin="out $csinput") CDate &
          "$csclassname.getCPtr(temp$csinput)"
 
 
    
@@ -2044,8 +1763,7 @@ will be possible with the following CDate * typemaps
          pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);",
          post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
               " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
-         cshin="ref $csinput"
-        ) CDate *
+         cshin="ref $csinput") CDate *
          "$csclassname.getCPtr(temp$csinput)"
    @@ -2070,51 +1788,7 @@ public class example { -

    -The following typemap is the same as the previous but demonstrates how a using block can be used for the temporary variable. -The only change to the previous typemap is the introduction of the 'terminator' attribute to terminate the using block. -The subtractYears method is nearly identical to the above addYears method. -

    - -
    -
    -%typemap(csin,
-         pre="    using (CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day)) {",
-         post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
-              " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
-         terminator="    } // terminate temp$csinput using block",
-         cshin="ref $csinput"
-        ) CDate *
-         "$csclassname.getCPtr(temp$csinput)"
-
-void subtractYears(CDate *pDate, int years) {
-  *pDate = CDate(pDate->getYear() - years, pDate->getMonth(), pDate->getDay());
-}
-
    -
    - -

    -The resulting generated code shows the termination of the using block: -

    - -
    -
    -public class example {
-  public static void subtractYears(ref System.DateTime pDate, int years) {
-    using (CDate temppDate = new CDate(pDate.Year, pDate.Month, pDate.Day)) {
-    try {
-      examplePINVOKE.subtractYears(CDate.getCPtr(temppDate), years);
-    } finally {
-      pDate = new System.DateTime(temppDate.getYear(), temppDate.getMonth(), temppDate.getDay(), 0, 0, 0);
-    }
-    } // terminate temppDate using block
-  }
-  ...
-}
-
    -
    - -

    18.6.4 A date example demonstrating marshalling of C# properties

    +

    17.5.4 A date example demonstrating marshalling of C# properties

    @@ -2153,8 +1827,7 @@ The typemap type required is thus CDate *. Given that the previous sect pre=" CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);", post=" $csinput = new System.DateTime(temp$csinput.getYear()," " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", - cshin="ref $csinput" - ) CDate * + cshin="ref $csinput") CDate * "$csclassname.getCPtr(temp$csinput)" %typemap(csvarin, excode=SWIGEXCODE2) CDate * %{ @@ -2215,7 +1888,7 @@ Some points to note: -

    18.6.5 Turning wrapped classes into partial classes

    +

    17.5.5 Turning wrapped classes into partial classes

    @@ -2315,7 +1988,7 @@ demonstrating that the class contains methods calling both unmanaged code - The following example is an alternative approach to adding managed code to the generated proxy class.

    -

    18.6.6 Extending proxy classes with additional C# code

    +

    17.5.6 Extending proxy classes with additional C# code

    diff --git a/Doc/Manual/Chicken.html b/Doc/Manual/Chicken.html index 98372a0f7..bd1b3d94b 100644 --- a/Doc/Manual/Chicken.html +++ b/Doc/Manual/Chicken.html @@ -8,7 +8,7 @@ -

    19 SWIG and Chicken

    +

    18 SWIG and Chicken

      @@ -72,7 +72,7 @@

      -

      19.1 Preliminaries

      +

      18.1 Preliminaries

      @@ -90,7 +90,7 @@ CHICKEN.

      -

      19.1.1 Running SWIG in C mode

      +

      18.1.1 Running SWIG in C mode

      @@ -123,7 +123,7 @@ object files and linked into your project.

      -

      19.1.2 Running SWIG in C++ mode

      +

      18.1.2 Running SWIG in C++ mode

      @@ -152,10 +152,10 @@ object files and linked into your project.

      -

      19.2 Code Generation

      +

      18.2 Code Generation

      -

      19.2.1 Naming Conventions

      +

      18.2.1 Naming Conventions

      @@ -171,7 +171,7 @@ %rename SWIG directive in the SWIG interface file.

      -

      19.2.2 Modules

      +

      18.2.2 Modules

      @@ -193,7 +193,7 @@ (uses modulename)) CHICKEN Scheme form.

      -

      19.2.3 Constants and Variables

      +

      18.2.3 Constants and Variables

      @@ -230,7 +230,7 @@ for info on how to apply the %feature.

      -

      19.2.4 Functions

      +

      18.2.4 Functions

      @@ -249,7 +249,7 @@ parameters). The return values can then be accessed with (call-with-values).

      -

      19.2.5 Exceptions

      +

      18.2.5 Exceptions

      The SWIG chicken module has support for exceptions thrown from @@ -291,7 +291,7 @@

    -

    19.3 TinyCLOS

    +

    18.3 TinyCLOS

    @@ -334,7 +334,7 @@

    -

    19.4 Linkage

    +

    18.4 Linkage

    @@ -355,7 +355,7 @@

    -

    19.4.1 Static binary or shared library linked at compile time

    +

    18.4.1 Static binary or shared library linked at compile time

    We can easily use csc to build a static binary.

    @@ -396,7 +396,7 @@ in which case the test script does not need to be linked with example.so. The t be run with csi.

    -

    19.4.2 Building chicken extension libraries

    +

    18.4.2 Building chicken extension libraries

    Building a shared library like in the above section only works if the library @@ -454,7 +454,7 @@ distributed and used by anyone, even if SWIG is not installed.

    See the Examples/chicken/egg directory in the SWIG source for an example that builds two eggs, one using the first method and one using the second method.

    -

    19.4.3 Linking multiple SWIG modules with TinyCLOS

    +

    18.4.3 Linking multiple SWIG modules with TinyCLOS

    Linking together multiple modules that share type information using the %import @@ -478,7 +478,7 @@ with (declare (uses ...)). To create an extension library or an egg, just create a module_load.scm file that (declare (uses ...)) all the modules.

    -

    19.5 Typemaps

    +

    18.5 Typemaps

    @@ -487,7 +487,7 @@ all the modules.

    Lib/chicken/chicken.swg.

    -

    19.6 Pointers

    +

    18.6 Pointers

    @@ -520,7 +520,7 @@ all the modules.

    type. flags is either zero or SWIG_POINTER_DISOWN (see below).

    -

    19.6.1 Garbage collection

    +

    18.6.1 Garbage collection

    If the owner flag passed to SWIG_NewPointerObj is 1, NewPointerObj will add a @@ -551,7 +551,7 @@ all the modules.

    must be called manually.

    -

    19.7 Unsupported features and known problems

    +

    18.7 Unsupported features and known problems

    -

    19.7.1 TinyCLOS problems with Chicken version <= 1.92

    +

    18.7.1 TinyCLOS problems with Chicken version <= 1.92

    In Chicken versions equal to or below 1.92, TinyCLOS has a limitation such that generic methods do not properly work on methods diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index c135b7c6f..c3197b9dc 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -162,7 +162,7 @@

  • Character strings and structures
  • Array members
  • Structure data members -
  • C constructors and destructors +
  • C constructors and destructors
  • Adding member functions to C structures
  • Nested structures
  • Other things to note about structure wrapping @@ -272,7 +272,7 @@
  • C Arrays and Pointers @@ -390,7 +390,6 @@
  • More about %apply and %clear
  • Reducing wrapper code size
  • Passing data between typemaps -
  • C++ "this" pointer
  • Where to go for more information? @@ -498,33 +497,7 @@ -

    16 Using SWIG with ccache - ccache-swig(1) manpage

    - - -
    - -
    - - -

    17 SWIG and Allegro Common Lisp

    +

    16 SWIG and Allegro Common Lisp

    @@ -608,19 +581,13 @@
    -

    18 SWIG and C#

    +

    17 SWIG and C#

    -

    19 SWIG and Chicken

    +

    18 SWIG and Chicken

    @@ -685,7 +652,7 @@
    -

    20 SWIG and Guile

    +

    19 SWIG and Guile

    @@ -720,7 +687,7 @@
    -

    21 SWIG and Java

    +

    20 SWIG and Java

    @@ -862,7 +829,7 @@
    -

    22 SWIG and Common Lisp

    +

    21 SWIG and Common Lisp

    @@ -885,7 +852,7 @@
    -

    23 SWIG and Lua

    +

    22 SWIG and Lua

    @@ -914,35 +881,20 @@
  • C++ templates
  • C++ Smart Pointers
  • C++ Exceptions +
  • Writing your own custom wrappers +
  • Adding additional Lua code -
  • Typemaps +
  • Details on the Lua binding -
  • Writing typemaps - -
  • Customization of your Bindings - -
  • Details on the Lua binding - -

    24 SWIG and Modula-3

    +

    23 SWIG and Modula-3

    @@ -983,7 +935,7 @@
    -

    25 SWIG and MzScheme

    +

    24 SWIG and MzScheme

    @@ -993,7 +945,7 @@
    -

    26 SWIG and Ocaml

    +

    25 SWIG and Ocaml

    @@ -1044,7 +996,7 @@
    -

    27 SWIG and Octave

    +

    26 SWIG and Octave

    @@ -1079,7 +1031,7 @@
    -

    28 SWIG and Perl5

    +

    27 SWIG and Perl5

    @@ -1146,7 +1098,7 @@
    -

    29 SWIG and PHP

    +

    28 SWIG and PHP

    @@ -1154,6 +1106,7 @@
  • Generating PHP Extensions
  • Basic PHP interface @@ -1176,7 +1129,7 @@ -

    30 SWIG and Pike

    +

    29 SWIG and Pike

    @@ -1200,7 +1153,7 @@
    -

    31 SWIG and Python

    +

    30 SWIG and Python

    @@ -1241,7 +1194,7 @@
  • Memory management
  • Python 2.2 and classic classes -
  • Cross language polymorphism +
  • Cross language polymorphism
  • Python Packages -
  • Python 3 Support - -

    32 SWIG and Ruby

    +

    31 SWIG and Ruby

    @@ -1440,7 +1387,7 @@
    -

    33 SWIG and Tcl

    +

    32 SWIG and Tcl

    @@ -1505,7 +1452,7 @@
    -

    34 SWIG and R

    +

    33 SWIG and R

    @@ -1521,7 +1468,7 @@
    -

    35 Extending SWIG to support new languages

    +

    34 Extending SWIG to support new languages

    diff --git a/Doc/Manual/Customization.html b/Doc/Manual/Customization.html index ec73e5460..e9d70e39a 100644 --- a/Doc/Manual/Customization.html +++ b/Doc/Manual/Customization.html @@ -1019,20 +1019,6 @@ but this will:
    -

    -SWIG provides macros for disabling and clearing features. Many of these can be found in the swig.swg library file. -The typical pattern is to define three macros; one to define the feature itself, one to disable the feature and one to clear the feature. -The three macros below show this for the "except" feature: -

    - -
    -
    -#define %exception      %feature("except")
-#define %noexception    %feature("except","0")
-#define %clearexception %feature("except","")
-
    -
    -

    11.3.4 Features and default arguments

    diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index 73f1a6673..588912b68 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -6,7 +6,7 @@ -

    35 Extending SWIG to support new languages

    +

    34 Extending SWIG to support new languages

      @@ -73,7 +73,7 @@ -

      35.1 Introduction

      +

      34.1 Introduction

      @@ -89,7 +89,7 @@ Also, this chapter is not meant to be a hand-holding tutorial. As a starting po you should probably look at one of SWIG's existing modules.

      -

      35.2 Prerequisites

      +

      34.2 Prerequisites

      @@ -119,7 +119,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of wrapper code are driven by C++ datatypes.

      -

      35.3 The Big Picture

      +

      34.3 The Big Picture

      @@ -156,7 +156,7 @@ role in making the system work. For example, both typemaps and declaration anno based on pattern matching and interact heavily with the underlying type system.

      -

      35.4 Execution Model

      +

      34.4 Execution Model

      @@ -201,7 +201,7 @@ latter stage of compilation. The next few sections briefly describe some of these stages.

      -

      35.4.1 Preprocessing

      +

      34.4.1 Preprocessing

      @@ -232,11 +232,10 @@ of swig.swg looks like this: ... /* Code insertion directives such as %wrapper %{ ... %} */ -#define %begin %insert("begin") -#define %runtime %insert("runtime") -#define %header %insert("header") -#define %wrapper %insert("wrapper") #define %init %insert("init") +#define %wrapper %insert("wrapper") +#define %header %insert("header") +#define %runtime %insert("runtime") /* Access control directives */ @@ -282,7 +281,7 @@ been expanded as well as everything else that goes into the low-level construction of the wrapper code.

      -

      35.4.2 Parsing

      +

      34.4.2 Parsing

      @@ -383,7 +382,7 @@ returning a foo and taking types a and b as arguments).

      -

      35.4.3 Parse Trees

      +

      34.4.3 Parse Trees

      @@ -449,8 +448,7 @@ of the output.

      The contents of each parse tree node consist of a collection of attribute/value pairs. Internally, the nodes are simply represented by hash tables. A display of -the entire parse-tree structure can be obtained using swig -debug-top <n>, where n is -the stage being processed. +the entire parse-tree structure can be obtained using swig -dump_tree. There are a number of other parse tree display options, for example, swig -debug-module <n> will avoid displaying system parse information and only display the parse tree pertaining to the user's module at stage n of processing. @@ -638,7 +636,7 @@ $ swig -c++ -python -debug-module 4 example.i

    -

    35.4.4 Attribute namespaces

    +

    34.4.4 Attribute namespaces

    @@ -657,7 +655,7 @@ that matches the name of the target language. For example, python:foo perl:foo.

    -

    35.4.5 Symbol Tables

    +

    34.4.5 Symbol Tables

    @@ -748,7 +746,7 @@ example.i:5. Previous declaration is foo_i(int ) -

    35.4.6 The %feature directive

    +

    34.4.6 The %feature directive

    @@ -804,7 +802,7 @@ For example, the exception code above is simply stored without any modifications.

    -

    35.4.7 Code Generation

    +

    34.4.7 Code Generation

    @@ -926,7 +924,7 @@ public : The role of these functions is described shortly.

    -

    35.4.8 SWIG and XML

    +

    34.4.8 SWIG and XML

    @@ -939,7 +937,7 @@ internal data structures, it may be useful to keep XML in the back of your mind as a model.

    -

    35.5 Primitive Data Structures

    +

    34.5 Primitive Data Structures

    @@ -985,7 +983,7 @@ typedef Hash Typetab; -

    35.5.1 Strings

    +

    34.5.1 Strings

    @@ -1126,7 +1124,7 @@ Returns the number of replacements made (if any). -

    35.5.2 Hashes

    +

    34.5.2 Hashes

    @@ -1203,7 +1201,7 @@ Returns the list of hash table keys. -

    35.5.3 Lists

    +

    34.5.3 Lists

    @@ -1292,7 +1290,7 @@ If t is not a standard object, it is assumed to be a char * and is used to create a String object. -

    35.5.4 Common operations

    +

    34.5.4 Common operations

    The following operations are applicable to all datatypes. @@ -1347,7 +1345,7 @@ objects and report errors. Gets the line number associated with x. -

    35.5.5 Iterating over Lists and Hashes

    +

    34.5.5 Iterating over Lists and Hashes

    To iterate over the elements of a list or a hash table, the following functions are used: @@ -1392,7 +1390,7 @@ for (j = First(j); j.item; j= Next(j)) { -

    35.5.6 I/O

    +

    34.5.6 I/O

    Special I/O functions are used for all internal I/O. These operations @@ -1528,7 +1526,7 @@ Similarly, the preprocessor and parser all operate on string-files. -

    35.6 Navigating and manipulating parse trees

    +

    34.6 Navigating and manipulating parse trees

    Parse trees are built as collections of hash tables. Each node is a hash table in which @@ -1662,7 +1660,7 @@ Deletes a node from the parse tree. Deletion reconnects siblings and properly u the parent so that sibling nodes are unaffected. -

    35.7 Working with attributes

    +

    34.7 Working with attributes

    @@ -1779,7 +1777,7 @@ the attribute is optional. Swig_restore() must always be called after function. -

    35.8 Type system

    +

    34.8 Type system

    @@ -1788,7 +1786,7 @@ pointers, references, and pointers to members. A detailed discussion of type theory is impossible here. However, let's cover the highlights.

    -

    35.8.1 String encoding of types

    +

    34.8.1 String encoding of types

    @@ -1889,7 +1887,7 @@ make the final type, the two parts are just joined together using string concatenation.

    -

    35.8.2 Type construction

    +

    34.8.2 Type construction

    @@ -2058,7 +2056,7 @@ Returns the prefix of a type. For example, if ty is ty is unmodified. -

    35.8.3 Type tests

    +

    34.8.3 Type tests

    @@ -2145,7 +2143,7 @@ Checks if ty is a varargs type. Checks if ty is a templatized type. -

    35.8.4 Typedef and inheritance

    +

    34.8.4 Typedef and inheritance

    @@ -2247,7 +2245,7 @@ Fully reduces ty according to typedef rules. Resulting datatype will consist only of primitive typenames. -

    35.8.5 Lvalues

    +

    34.8.5 Lvalues

    @@ -2284,7 +2282,7 @@ Literal y; // type = 'Literal', ltype='p.char' -

    35.8.6 Output functions

    +

    34.8.6 Output functions

    @@ -2346,7 +2344,7 @@ SWIG, but is most commonly associated with type-descriptor objects that appear in wrappers (e.g., SWIGTYPE_p_double). -

    35.9 Parameters

    +

    34.9 Parameters

    @@ -2445,7 +2443,7 @@ included. Used to emit prototypes. Returns the number of required (non-optional) arguments in p. -

    35.10 Writing a Language Module

    +

    34.10 Writing a Language Module

    @@ -2460,7 +2458,7 @@ describes the creation of a minimal Python module. You should be able to extra this to other languages.

    -

    35.10.1 Execution model

    +

    34.10.1 Execution model

    @@ -2470,7 +2468,7 @@ the parsing of command line options, all aspects of code generation are controll different methods of the Language that must be defined by your module.

    -

    35.10.2 Starting out

    +

    34.10.2 Starting out

    @@ -2578,7 +2576,7 @@ that activates your module. For example, swig -python foo.i. The messages from your new module should appear.

    -

    35.10.3 Command line options

    +

    34.10.3 Command line options

    @@ -2637,7 +2635,7 @@ to mark the option as valid. If you forget to do this, SWIG will terminate wit unrecognized command line option error.

    -

    35.10.4 Configuration and preprocessing

    +

    34.10.4 Configuration and preprocessing

    @@ -2686,7 +2684,7 @@ an implementation file python.cxx and a configuration file python.swg.

    -

    35.10.5 Entry point to code generation

    +

    34.10.5 Entry point to code generation

    @@ -2744,7 +2742,7 @@ int Python::top(Node *n) { -

    35.10.6 Module I/O and wrapper skeleton

    +

    34.10.6 Module I/O and wrapper skeleton

    @@ -2886,7 +2884,7 @@ functionWrapper : void Shape_y_set(Shape *self,double y) -

    35.10.7 Low-level code generators

    +

    34.10.7 Low-level code generators

    @@ -3040,7 +3038,7 @@ but without the typemaps, there is still work to do.

    -

    35.10.8 Configuration files

    +

    34.10.8 Configuration files

    @@ -3115,7 +3113,7 @@ entirely upcased.

    At the end of the new section is the place to put the aforementioned -nickname kludges (should they be needed). See Perl5 for +nickname kludges (should they be needed). See Perl5 and Php4 for examples of what to do. [If this is still unclear after you've read the code, ping me and I'll expand on this further. --ttn]

    @@ -3190,7 +3188,7 @@ politely displays the ignoring language message. -

    35.10.9 Runtime support

    +

    34.10.9 Runtime support

    @@ -3199,7 +3197,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g. the SWIG files that implement those functions.

    -

    35.10.10 Standard library files

    +

    34.10.10 Standard library files

    @@ -3218,7 +3216,7 @@ The following are the minimum that are usually supported: Please copy these and modify for any new language.

    -

    35.10.11 Examples and test cases

    +

    34.10.11 Examples and test cases

    @@ -3247,7 +3245,7 @@ during this process, see the section on configuration files.

    -

    35.10.12 Documentation

    +

    34.10.12 Documentation

    @@ -3279,7 +3277,7 @@ Some topics that you'll want to be sure to address include: if available. -

    35.10.13 Prerequisites for adding a new language module to the SWIG distribution

    +

    34.10.13 Prerequisites for adding a new language module to the SWIG distribution

    @@ -3336,7 +3334,7 @@ should be added should there be an area not already covered by the existing tests.

    -

    35.10.14 Coding style guidelines

    +

    34.10.14 Coding style guidelines

    @@ -3360,13 +3358,13 @@ The generated C/C++ code should also follow this style as close as possible. How should be avoided as unlike the SWIG developers, users will never have consistent tab settings.

    -

    35.11 Typemaps

    +

    34.11 Typemaps

    -

    35.11.1 Proxy classes

    +

    34.11.1 Proxy classes

    -

    35.12 Guide to parse tree nodes

    +

    34.12 Guide to parse tree nodes

    diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index cf7e8da2c..20ab716e4 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -8,7 +8,7 @@ -

    20 SWIG and Guile

    +

    19 SWIG and Guile

      @@ -47,7 +47,7 @@

      This section details guile-specific support in SWIG. -

      20.1 Meaning of "Module"

      +

      19.1 Meaning of "Module"

      @@ -55,7 +55,7 @@ There are three different concepts of "module" involved, defined separately for SWIG, Guile, and Libtool. To avoid horrible confusion, we explicitly prefix the context, e.g., "guile-module". -

      20.2 Using the SCM or GH Guile API

      +

      19.2 Using the SCM or GH Guile API

      The guile module can currently export wrapper files that use the guile GH interface or the @@ -103,7 +103,7 @@ for the specific API. Currently only the guile language module has created a ma but there is no reason other languages (like mzscheme or chicken) couldn't also use this. If that happens, there is A LOT less code duplication in the standard typemaps.

      -

      20.3 Linkage

      +

      19.3 Linkage

      @@ -111,7 +111,7 @@ Guile support is complicated by a lack of user community cohesiveness, which manifests in multiple shared-library usage conventions. A set of policies implementing a usage convention is called a linkage. -

      20.3.1 Simple Linkage

      +

      19.3.1 Simple Linkage

      @@ -206,7 +206,7 @@ placed between the define-module form and the SWIG_init via a preprocessor define to avoid symbol clashes. For this case, however, passive linkage is available. -

      20.3.2 Passive Linkage

      +

      19.3.2 Passive Linkage

      Passive linkage is just like simple linkage, but it generates an @@ -216,7 +216,7 @@ package name (see below).

      You should use passive linkage rather than simple linkage when you are using multiple modules. -

      20.3.3 Native Guile Module Linkage

      +

      19.3.3 Native Guile Module Linkage

      SWIG can also generate wrapper code that does all the Guile module @@ -257,7 +257,7 @@ Newer Guile versions have a shorthand procedure for this:

    -

    20.3.4 Old Auto-Loading Guile Module Linkage

    +

    19.3.4 Old Auto-Loading Guile Module Linkage

    Guile used to support an autoloading facility for object-code @@ -283,7 +283,7 @@ option, SWIG generates an exported module initialization function with an appropriate name. -

    20.3.5 Hobbit4D Linkage

    +

    19.3.5 Hobbit4D Linkage

    @@ -308,7 +308,7 @@ my/lib/libfoo.so.X.Y.Z and friends. This scheme is still very experimental; the (hobbit4d link) conventions are not well understood.

    -

    20.4 Underscore Folding

    +

    19.4 Underscore Folding

    @@ -320,7 +320,7 @@ complained so far. %rename to specify the Guile name of the wrapped functions and variables (see CHANGES). -

    20.5 Typemaps

    +

    19.5 Typemaps

    @@ -412,7 +412,7 @@ constant will appear as a scheme variable. See Features and the %feature directive for info on how to apply the %feature.

    -

    20.6 Representation of pointers as smobs

    +

    19.6 Representation of pointers as smobs

    @@ -433,7 +433,7 @@ representing the expected pointer type. See also If the Scheme object passed was not a SWIG smob representing a compatible pointer, a wrong-type-arg exception is raised. -

    20.6.1 GH Smobs

    +

    19.6.1 GH Smobs

    @@ -462,7 +462,7 @@ that created them, so the first module we check will most likely be correct. Once we have a swig_type_info structure, we loop through the linked list of casts, using pointer comparisons.

    -

    20.6.2 SCM Smobs

    +

    19.6.2 SCM Smobs

    The SCM interface (using the "-scm" argument to swig) uses swigrun.swg. @@ -477,7 +477,7 @@ in the smob tag. If a generated GOOPS module has been loaded, smobs will be wra GOOPS class.

    -

    20.6.3 Garbage Collection

    +

    19.6.3 Garbage Collection

    Garbage collection is a feature of the new SCM interface, and it is automatically included @@ -491,7 +491,7 @@ is exactly like described in Object ownership and %newobject in the SWIG manual. All typemaps use an $owner var, and the guile module replaces $owner with 0 or 1 depending on feature:new.

    -

    20.7 Exception Handling

    +

    19.7 Exception Handling

    @@ -517,7 +517,7 @@ mapping: The default when not specified here is to use "swig-error". See Lib/exception.i for details. -

    20.8 Procedure documentation

    +

    19.8 Procedure documentation

    If invoked with the command-line option -procdoc @@ -553,7 +553,7 @@ like this: typemap argument doc. See Lib/guile/typemaps.i for details. -

    20.9 Procedures with setters

    +

    19.9 Procedures with setters

    For global variables, SWIG creates a single wrapper procedure @@ -581,7 +581,7 @@ struct members, the procedures (struct-member-get pointer) and (struct-member-set pointer value) are not generated. -

    20.10 GOOPS Proxy Classes

    +

    19.10 GOOPS Proxy Classes

    SWIG can also generate classes and generic functions for use with @@ -730,7 +730,7 @@ Notice that <Foo> is used before it is defined. The fix is to just put th %import "foo.h" before the %inline block.

    -

    20.10.1 Naming Issues

    +

    19.10.1 Naming Issues

    As you can see in the example above, there are potential naming conflicts. The default exported @@ -769,7 +769,7 @@ guile-modules. For example,

    TODO: Renaming class name prefixes?

    -

    20.10.2 Linking

    +

    19.10.2 Linking

    The guile-modules generated above all need to be linked together. GOOPS support requires diff --git a/Doc/Manual/Introduction.html b/Doc/Manual/Introduction.html index 099454cf0..491204d1d 100644 --- a/Doc/Manual/Introduction.html +++ b/Doc/Manual/Introduction.html @@ -414,8 +414,7 @@ SWIG_LINK_LIBRARIES(example ${PYTHON_LIBRARIES})

    The above example will generate native build files such as makefiles, nmake files and Visual Studio projects -which will invoke SWIG and compile the generated C++ files into _example.so (UNIX) or _example.pyd (Windows). -For other target languages on Windows a dll, instead of a .pyd file, is usually generated. +which will invoke SWIG and compile the generated C++ files into _example.so (UNIX) or _example.dll (Windows).

    2.7 Hands off code generation

    diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index c5ff1f906..164fc21e7 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -5,7 +5,7 @@ -

    21 SWIG and Java

    +

    20 SWIG and Java

      @@ -154,7 +154,7 @@ It covers most SWIG features, but certain low-level details are covered in less

      -

      21.1 Overview

      +

      20.1 Overview

      @@ -189,7 +189,7 @@ Various customisation tips and techniques using SWIG directives are covered. The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.

      -

      21.2 Preliminaries

      +

      20.2 Preliminaries

      @@ -205,7 +205,7 @@ Run make -k check from the SWIG root directory after installing SWIG on The Java module requires your system to support shared libraries and dynamic loading. This is the commonly used method to load JNI code so your system will more than likely support this.

      -

      21.2.1 Running SWIG

      +

      20.2.1 Running SWIG

      @@ -258,7 +258,7 @@ The following sections have further practical examples and details on how you mi compiling and using the generated files.

      -

      21.2.2 Additional Commandline Options

      +

      20.2.2 Additional Commandline Options

      @@ -295,7 +295,7 @@ swig -java -help Their use will become clearer by the time you have finished reading this section on SWIG and Java.

      -

      21.2.3 Getting the right header files

      +

      20.2.3 Getting the right header files

      @@ -310,7 +310,7 @@ They are usually in directories like this:

      The exact location may vary on your machine, but the above locations are typical.

      -

      21.2.4 Compiling a dynamic module

      +

      20.2.4 Compiling a dynamic module

      @@ -346,16 +346,16 @@ The name of the shared library output file is important. If the name of your SWIG module is "example", the name of the corresponding shared library file should be "libexample.so" (or equivalent depending on your machine, see Dynamic linking problems for more information). The name of the module is specified using the %module directive or -module command line option.

      -

      21.2.5 Using your module

      +

      20.2.5 Using your module

      To load your shared native library module in Java, simply use Java's System.loadLibrary method in a Java class:

      -// runme.java
+// main.java
 
-public class runme {
+public class main {
   static {
     System.loadLibrary("example");
   }
@@ -372,7 +372,7 @@ Compile all the Java files and run:
 
 
       $ javac *.java
-$ java runme
+$ java main
 24
 $
 
      
@@ -381,7 +381,7 @@ $
 If it doesn't work have a look at the following section which discusses problems loading the shared library.
 
      
 
-
      21.2.6 Dynamic linking problems
      
+
      20.2.6 Dynamic linking problems
      
 
 
 
      
@@ -394,12 +394,12 @@ You may get an exception similar to this:
 
      
 
 
      -$ java runme
+$ java main
 Exception in thread "main" java.lang.UnsatisfiedLinkError: no example in java.library.path
         at java.lang.ClassLoader.loadLibrary(ClassLoader.java:1312)
         at java.lang.Runtime.loadLibrary0(Runtime.java:749)
         at java.lang.System.loadLibrary(System.java:820)
-        at runme.<clinit>(runme.java:5)
+        at main.<clinit>(main.java:5)
 
      
 
 
      
@@ -426,7 +426,7 @@ The following exception is indicative of this:
 
      
 
 
      -$ java runme
+$ java main
 Exception in thread "main" java.lang.UnsatisfiedLinkError: libexample.so: undefined
 symbol: fact
         at java.lang.ClassLoader$NativeLibrary.load(Native Method)
@@ -434,7 +434,7 @@ symbol: fact
         at java.lang.ClassLoader.loadLibrary(ClassLoader.java, Compiled Code)
         at java.lang.Runtime.loadLibrary0(Runtime.java, Compiled Code)
         at java.lang.System.loadLibrary(System.java, Compiled Code)
-        at runme.<clinit>(runme.java:5)
+        at main.<clinit>(main.java:5)
 $
 
      
 
@@ -455,7 +455,7 @@ The following section also contains some C++ specific linking problems and solut
 
      
 
 
-
      21.2.7 Compilation problems and compiling with C++
      
+
      20.2.7 Compilation problems and compiling with C++
      
 
 
 
      
@@ -508,7 +508,7 @@ Finally make sure the version of JDK header files matches the version of Java th
 
      
 
 
-
      21.2.8 Building on Windows
      
+
      20.2.8 Building on Windows
      
 
 
 
      
@@ -517,7 +517,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine.
 This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers.  
 In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.
      
 
-
      21.2.8.1 Running SWIG from Visual Studio
      
+
      20.2.8.1 Running SWIG from Visual Studio
      
 
 
 
      
@@ -556,7 +556,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa
 If the library fails to load have a look at Dynamic linking problems.
 
      
 
-
      21.2.8.2 Using NMAKE
      
+
      20.2.8.2 Using NMAKE
      
 
 
 
      
@@ -615,7 +615,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -
 
      
 
 
-
      21.3 A tour of basic C/C++ wrapping
      
+
      20.3 A tour of basic C/C++ wrapping
      
 
 
 
      
@@ -625,7 +625,7 @@ variables are wrapped with JavaBean type getters and setters and so forth.
 This section briefly covers the essential aspects of this wrapping.
 
      
 
-
      21.3.1 Modules, packages and generated Java classes
      
+
      20.3.1 Modules, packages and generated Java classes
      
 
 
 
      
@@ -659,7 +659,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i
 
 SWIG won't create the directory, so make sure it exists beforehand.
 
-
      21.3.2 Functions
      
+
      20.3.2 Functions
      
 
 
 
      
@@ -693,7 +693,7 @@ System.out.println(example.fact(4));
      -

      21.3.3 Global variables

      +

      20.3.3 Global variables

      @@ -780,7 +780,7 @@ extern char *path; // Read-only (due to %immutable)

    -

    21.3.4 Constants

    +

    20.3.4 Constants

    @@ -920,7 +920,7 @@ Or if you decide this practice isn't so bad and your own class implements ex

    -

    21.3.5 Enumerations

    +

    20.3.5 Enumerations

    @@ -934,7 +934,7 @@ The final two approaches use simple integers for each enum item. Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.

    -

    21.3.5.1 Anonymous enums

    +

    20.3.5.1 Anonymous enums

    @@ -997,7 +997,7 @@ As in the case of constants, you can access them through either the module class

    -

    21.3.5.2 Typesafe enums

    +

    20.3.5.2 Typesafe enums

    @@ -1090,7 +1090,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit The following section details proper Java enum generation.

    -

    21.3.5.3 Proper Java enums

    +

    20.3.5.3 Proper Java enums

    @@ -1143,7 +1143,7 @@ The additional support methods need not be generated if none of the enum items h Simpler Java enums for enums without initializers section.

    -

    21.3.5.4 Type unsafe enums

    +

    20.3.5.4 Type unsafe enums

    @@ -1191,7 +1191,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.

    -

    21.3.5.5 Simple enums

    +

    20.3.5.5 Simple enums

    @@ -1210,7 +1210,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach. The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.

    -

    21.3.6 Pointers

    +

    20.3.6 Pointers

    @@ -1298,7 +1298,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return a NULL pointer if the conversion can't be performed.

    -

    21.3.7 Structures

    +

    20.3.7 Structures

    @@ -1466,7 +1466,7 @@ x.setA(3); // Modify x.a - this is the same as b.f.a -

    21.3.8 C++ classes

    +

    20.3.8 C++ classes

    @@ -1529,7 +1529,7 @@ int bar = Spam.getBar(); -

    21.3.9 C++ inheritance

    +

    20.3.9 C++ inheritance

    @@ -1590,7 +1590,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance A warning is given when multiple inheritance is detected and only the first base class is used.

    -

    21.3.10 Pointers, references, arrays and pass by value

    +

    20.3.10 Pointers, references, arrays and pass by value

    @@ -1645,7 +1645,7 @@ to hold the result and a pointer is returned (Java will release this memory when the returned object's finalizer is run by the garbage collector).

    -

    21.3.10.1 Null pointers

    +

    20.3.10.1 Null pointers

    @@ -1669,7 +1669,7 @@ For spam1 and spam4 above the Java null gets translat The converse also occurs, that is, NULL pointers are translated into null Java objects when returned from a C/C++ function.

    -

    21.3.11 C++ overloaded functions

    +

    20.3.11 C++ overloaded functions

    @@ -1784,7 +1784,7 @@ void spam(unsigned short); // Ignored -

    21.3.12 C++ default arguments

    +

    20.3.12 C++ default arguments

    @@ -1827,7 +1827,7 @@ Further details on default arguments and how to restore this approach are given

    -

    21.3.13 C++ namespaces

    +

    20.3.13 C++ namespaces

    @@ -1887,7 +1887,7 @@ symbols separate, consider wrapping them as separate SWIG modules. Each SWIG module can be placed into a separate package.

    -

    21.3.14 C++ templates

    +

    20.3.14 C++ templates

    @@ -1936,7 +1936,7 @@ Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter.

    -

    21.3.15 C++ Smart Pointers

    +

    20.3.15 C++ Smart Pointers

    @@ -2020,7 +2020,7 @@ Foo f = p.__deref__(); // Returns underlying Foo * -

    21.4 Further details on the generated Java classes

    +

    20.4 Further details on the generated Java classes

    @@ -2035,7 +2035,7 @@ Finally enum classes are covered. First, the crucial intermediary JNI class is considered.

    -

    21.4.1 The intermediary JNI class

    +

    20.4.1 The intermediary JNI class

    @@ -2155,7 +2155,7 @@ If name is the same as modulename then the module class name g from modulename to modulenameModule.

    -

    21.4.1.1 The intermediary JNI class pragmas

    +

    20.4.1.1 The intermediary JNI class pragmas

    @@ -2234,7 +2234,7 @@ For example, let's change the intermediary JNI class access to public. All the methods in the intermediary JNI class will then be callable outside of the package as the method modifiers are public by default.

    -

    21.4.2 The Java module class

    +

    20.4.2 The Java module class

    @@ -2265,7 +2265,7 @@ example.egg(new Foo()); The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a Foo can be passed to the egg function, whereas any long can be passed to the egg function in the intermediary JNI class.

    -

    21.4.2.1 The Java module class pragmas

    +

    20.4.2.1 The Java module class pragmas

    @@ -2316,7 +2316,7 @@ See The intermediary JNI class pragmas section fo

    -

    21.4.3 Java proxy classes

    +

    20.4.3 Java proxy classes

    @@ -2392,7 +2392,7 @@ int y = f.spam(5, new Foo()); -

    21.4.3.1 Memory management

    +

    20.4.3.1 Memory management

    @@ -2554,7 +2554,7 @@ and

    -

    21.4.3.2 Inheritance

    +

    20.4.3.2 Inheritance

    @@ -2670,7 +2670,7 @@ However, true cross language polymorphism can be achieved using the 21.4.3.3 Proxy classes and garbage collection +

    20.4.3.3 Proxy classes and garbage collection

    @@ -2753,7 +2753,7 @@ The section on Java typemaps details how to specify See the How to Handle Java Finalization's Memory-Retention Issues article for alternative approaches to managing memory by avoiding finalizers altogether.

    -

    21.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    +

    20.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    @@ -2857,11 +2857,7 @@ and therefore there is no possibility of premature garbage collection. In practi

    The premature garbage collection prevention parameter for proxy classes is generated by default whenever proxy classes are passed by value, reference or with a pointer. -The implementation for this extra parameter generation requires the "jtype" typemap to contain long and the "jstype" typemap to contain the name of a proxy class. -

    - -

    -The additional parameter does impose a slight performance overhead and the parameter generation can be suppressed globally with the -nopgcpp commandline option. +The additional parameters do impose a slight performance overhead and the parameter generation can be suppressed globally with the -nopgcpp commandline option. More selective suppression is possible with the 'nopgcpp' attribute in the "jtype" Java typemap. The attribute is a flag and so should be set to "1" to enable the suppression, or it can be omitted or set to "0" to disable. For example: @@ -2875,7 +2871,7 @@ For example: Compatibility note: The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.

    -

    21.4.3.5 Single threaded applications and thread safety

    +

    20.4.3.5 Single threaded applications and thread safety

    @@ -2963,7 +2959,7 @@ for (int i=0; i<100000; i++) { -

    21.4.4 Type wrapper classes

    +

    20.4.4 Type wrapper classes

    @@ -3050,7 +3046,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... } -

    21.4.5 Enum classes

    +

    20.4.5 Enum classes

    @@ -3059,7 +3055,7 @@ The Enumerations section discussed these but omitted The following sub-sections detail the various types of enum classes that can be generated.

    -

    21.4.5.1 Typesafe enum classes

    +

    20.4.5.1 Typesafe enum classes

    @@ -3143,7 +3139,7 @@ The swigValue method is used for marshalling in the other direction. The toString method is overridden so that the enum name is available.

    -

    21.4.5.2 Proper Java enum classes

    +

    20.4.5.2 Proper Java enum classes

    @@ -3221,7 +3217,7 @@ These needn't be generated if the enum being wrapped does not have any initializ Simpler Java enums for enums without initializers section describes how typemaps can be used to achieve this.

    -

    21.4.5.3 Type unsafe enum classes

    +

    20.4.5.3 Type unsafe enum classes

    @@ -3252,7 +3248,7 @@ public final class Beverage { -

    21.5 Cross language polymorphism using directors

    +

    20.5 Cross language polymorphism using directors

    @@ -3274,7 +3270,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.

    -

    21.5.1 Enabling directors

    +

    20.5.1 Enabling directors

    @@ -3345,7 +3341,7 @@ public: -

    21.5.2 Director classes

    +

    20.5.2 Director classes

    @@ -3372,7 +3368,7 @@ If the correct implementation is in Java, the Java API is used to call the metho

    -

    21.5.3 Overhead and code bloat

    +

    20.5.3 Overhead and code bloat

    @@ -3390,7 +3386,7 @@ This situation can be optimized by selectively enabling director methods (using

    -

    21.5.4 Simple directors example

    +

    20.5.4 Simple directors example

    @@ -3455,7 +3451,7 @@ DirectorDerived::upcall_method() invoked. -

    21.5.5 Director threading issues

    +

    20.5.5 Director threading issues

    @@ -3475,7 +3471,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern -

    21.6 Accessing protected members

    +

    20.6 Accessing protected members

    @@ -3571,7 +3567,7 @@ class MyProtectedBase extends ProtectedBase -

    21.7 Common customization features

    +

    20.7 Common customization features

    @@ -3583,7 +3579,7 @@ be awkward. This section describes some common SWIG features that are used to improve the interface to existing C/C++ code.

    -

    21.7.1 C/C++ helper functions

    +

    20.7.1 C/C++ helper functions

    @@ -3649,7 +3645,7 @@ hard to implement. It is possible to improve on this using Java code, typemaps, customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.

    -

    21.7.2 Class extension with %extend

    +

    20.7.2 Class extension with %extend

    @@ -3712,7 +3708,7 @@ Vector(2,3,4) in any way---the extensions only show up in the Java interface.

    -

    21.7.3 Exception handling with %exception and %javaexception

    +

    20.7.3 Exception handling with %exception and %javaexception

    @@ -3760,7 +3756,7 @@ will produce a familiar looking Java exception: Exception in thread "main" java.lang.OutOfMemoryError: Not enough memory at exampleJNI.malloc(Native Method) at example.malloc(example.java:16) - at runme.main(runme.java:112) + at main.main(main.java:112) @@ -3820,9 +3816,7 @@ public: In the example above, java.lang.Exception is a checked exception class and so ought to be declared in the throws clause of getitem. Classes can be specified for adding to the throws clause using %javaexception(classes) instead of %exception, where classes is a string containing one or more comma separated Java classes. -The %clearjavaexception feature is the equivalent to %clearexception and clears previously declared exception handlers. -The %nojavaexception feature is the equivalent to %noexception and disables the exception handler. -See Clearing features for the difference on disabling and clearing features. +The %nojavaexception feature is the equivalent to %noexception and clears previously declared exception handlers.

    @@ -3871,7 +3865,7 @@ to raise exceptions. See the SWIG Library ch The typemap example Handling C++ exception specifications as Java exceptions provides further exception handling capabilities.

    -

    21.7.4 Method access with %javamethodmodifiers

    +

    20.7.4 Method access with %javamethodmodifiers

    @@ -3897,7 +3891,7 @@ protected static void protect_me() {

    -

    21.8 Tips and techniques

    +

    20.8 Tips and techniques

    @@ -3907,7 +3901,7 @@ strings and arrays. This chapter discusses the common techniques for solving these problems.

    -

    21.8.1 Input and output parameters using primitive pointers and references

    +

    20.8.1 Input and output parameters using primitive pointers and references

    @@ -4081,7 +4075,7 @@ void foo(Bar *OUTPUT); will not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

    -

    21.8.2 Simple pointers

    +

    20.8.2 Simple pointers

    @@ -4147,7 +4141,7 @@ System.out.println("3 + 4 = " + result); See the SWIG Library chapter for further details.

    -

    21.8.3 Wrapping C arrays with Java arrays

    +

    20.8.3 Wrapping C arrays with Java arrays

    @@ -4214,7 +4208,7 @@ Please be aware that the typemaps in this library are not efficient as all the e There is an alternative approach using the SWIG array library and this is covered in the next section.

    -

    21.8.4 Unbounded C Arrays

    +

    20.8.4 Unbounded C Arrays

    @@ -4359,7 +4353,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

    -

    21.8.5 Overriding new and delete to allocate from Java heap

    +

    20.8.5 Overriding new and delete to allocate from Java heap

    @@ -4476,7 +4470,7 @@ model and use these functions in place of malloc and free in your own code.

    -

    21.9 Java typemaps

    +

    20.9 Java typemaps

    @@ -4497,7 +4491,7 @@ Before proceeding, it should be stressed that typemaps are not a required part of using SWIG---the default wrapping behavior is enough in most cases. Typemaps are only used if you want to change some aspect of the generated code. -

    21.9.1 Default primitive type mappings

    +

    20.9.1 Default primitive type mappings

    @@ -4649,7 +4643,7 @@ However, the mappings allow the full range of values for each C type from Java.

    -

    21.9.2 Default typemaps for non-primitive types

    +

    20.9.2 Default typemaps for non-primitive types

    @@ -4664,7 +4658,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit The Java type is either the proxy class or type wrapper class.

    -

    21.9.3 Sixty four bit JVMs

    +

    20.9.3 Sixty four bit JVMs

    @@ -4677,7 +4671,7 @@ Unfortunately it won't of course hold true for JNI code.

    -

    21.9.4 What is a typemap?

    +

    20.9.4 What is a typemap?

    @@ -4800,7 +4794,7 @@ int c = example.count('e',"Hello World"); -

    21.9.5 Typemaps for mapping C/C++ types to Java types

    +

    20.9.5 Typemaps for mapping C/C++ types to Java types

    @@ -5060,7 +5054,7 @@ These are listed below: -

    21.9.6 Java typemap attributes

    +

    20.9.6 Java typemap attributes

    @@ -5106,7 +5100,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes. Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a this call. In Java the this call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a Date marshalling example showing 'pre', 'post' and 'pgcppname' attributes in action.

    -

    21.9.7 Java special variables

    +

    20.9.7 Java special variables

    @@ -5249,7 +5243,7 @@ This special variable expands to the intermediary class name. Usually this is th unless the jniclassname attribute is specified in the %module directive.

    -

    21.9.8 Typemaps for both C and C++ compilation

    +

    20.9.8 Typemaps for both C and C++ compilation

    @@ -5286,7 +5280,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps

    -

    21.9.9 Java code typemaps

    +

    20.9.9 Java code typemaps

    @@ -5482,7 +5476,7 @@ For the typemap to be used in all type wrapper classes, all the different types Again this is the same that is in "java.swg", barring the method modifier for getCPtr.

    -

    21.9.10 Director specific typemaps

    +

    20.9.10 Director specific typemaps

    @@ -5707,7 +5701,7 @@ The basic strategy here is to provide a default package typemap for the majority -

    21.10 Typemap Examples

    +

    20.10 Typemap Examples

    @@ -5717,7 +5711,7 @@ the SWIG library.

    -

    21.10.1 Simpler Java enums for enums without initializers

    +

    20.10.1 Simpler Java enums for enums without initializers

    @@ -5796,7 +5790,7 @@ This would be done by using the original versions of these typemaps in "enums.sw

    -

    21.10.2 Handling C++ exception specifications as Java exceptions

    +

    20.10.2 Handling C++ exception specifications as Java exceptions

    @@ -5921,7 +5915,7 @@ We could alternatively have used %rename to rename what() into

    -

    21.10.3 NaN Exception - exception handling for a particular type

    +

    20.10.3 NaN Exception - exception handling for a particular type

    @@ -6076,7 +6070,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.

    -

    21.10.4 Converting Java String arrays to char **

    +

    20.10.4 Converting Java String arrays to char **

    @@ -6170,9 +6164,9 @@ When this module is compiled, our wrapped C functions can be used by the followi 

    -// File runme.java
+// File main.java
 
-public class runme {
+public class main {
 
   static {
     try {
@@ -6198,7 +6192,7 @@ When compiled and run we get:
 
    
 
 
    -$ java runme
+$ java main
 argv[0] = Cat
 argv[1] = Dog
 argv[2] = Cow
@@ -6220,7 +6214,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify
 what Java types to use.
 
    
 
-
    21.10.5 Expanding a Java object to multiple arguments
    
+
    20.10.5 Expanding a Java object to multiple arguments
    
 
 
 
    
@@ -6302,7 +6296,7 @@ example.foo(new String[]{"red", "green", "blue", "white"});
 
    
 
 
-
    21.10.6 Using typemaps to return arguments
    
+
    20.10.6 Using typemaps to return arguments
    
 
 
 
    
@@ -6389,9 +6383,9 @@ The following Java program demonstrates this:
 
    
 
 
    -// File: runme.java
+// File: main.java
 
-public class runme {
+public class main {
 
   static {
     try {
@@ -6416,11 +6410,11 @@ When compiled and run we get:
 
    
 
 
    -$ java runme
+$ java main
 1 12.0  340.0
 
    
 
-
    21.10.7 Adding Java downcasts to polymorphic return types
    
+
    20.10.7 Adding Java downcasts to polymorphic return types
    
 
 
 
    
@@ -6476,7 +6470,7 @@ We get:
 
     Ambulance started
 java.lang.ClassCastException
-        at runme.main(runme.java:16)
+        at main.main(main.java:16)
 
    
 
 
    
@@ -6626,7 +6620,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a
 Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.
 
    
 
-
    21.10.8 Adding an equals method to the Java classes
    
+
    20.10.8 Adding an equals method to the Java classes
    
 
 
 
    
@@ -6670,7 +6664,7 @@ System.out.println("foo1? " + foo1.equals(foo2));
 
    
 
 
-
    21.10.9 Void pointers and a common Java base class
    
+
    20.10.9 Void pointers and a common Java base class
    
 
 
 
    
@@ -6729,7 +6723,7 @@ This example contains some useful functionality which you may want in your code.
     
  •  It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer.
 
 
-
    21.10.10 Struct pointer to pointer
    
+
    20.10.10 Struct pointer to pointer
    
 
 
 
    
@@ -6909,7 +6903,7 @@ The C functional interface has been completely morphed into an object-oriented i
 the Butler class would behave much like any pure Java class and feel more natural to Java users.
 
    
 
-
    21.10.11 Memory management when returning references to member variables
    
+
    20.10.11 Memory management when returning references to member variables
    
 
 
 
    
@@ -7032,7 +7026,7 @@ public class Bike {
 Note the addReference call.
 
    
 
-
    21.10.12 Memory management for objects passed to the C++ layer
    
+
    20.10.12 Memory management for objects passed to the C++ layer
    
 
 
 
    
@@ -7148,7 +7142,7 @@ The 'javacode' typemap simply adds in the specified code into the Java proxy cla
    • -

    21.10.13 Date marshalling using the javain typemap and associated attributes

    +

    20.10.13 Date marshalling using the javain typemap and associated attributes

    @@ -7325,7 +7319,7 @@ A few things to note: -

    21.11 Living with Java Directors

    +

    20.11 Living with Java Directors

    @@ -7506,10 +7500,10 @@ public abstract class UserVisibleFoo extends Foo {

    • -

    21.12 Odds and ends

    +

    20.12 Odds and ends

    -

    21.12.1 JavaDoc comments

    +

    20.12.1 JavaDoc comments

    @@ -7565,7 +7559,7 @@ public class Barmy { -

    21.12.2 Functional interface without proxy classes

    +

    20.12.2 Functional interface without proxy classes

    @@ -7626,7 +7620,7 @@ All destructors have to be called manually for example the delete_Foo(foo) -

    21.12.3 Using your own JNI functions

    +

    20.12.3 Using your own JNI functions

    @@ -7676,7 +7670,7 @@ This directive is only really useful if you want to mix your own hand crafted JN

    -

    21.12.4 Performance concerns and hints

    +

    20.12.4 Performance concerns and hints

    @@ -7697,7 +7691,7 @@ However, you will have to be careful about memory management and make sure that This method normally calls the C++ destructor or free() for C code.

    -

    21.12.5 Debugging

    +

    20.12.5 Debugging

    @@ -7719,7 +7713,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh

    -

    21.13 Examples

    +

    20.13 Examples

    diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html index 7293f31fe..586e1ecab 100644 --- a/Doc/Manual/Library.html +++ b/Doc/Manual/Library.html @@ -14,7 +14,7 @@

  • C Arrays and Pointers @@ -316,7 +316,7 @@ In this example, the function int_to_uint() would be used to cast type Note: When working with simple pointers, typemaps can often be used to provide more seamless operation.

    -

    8.2.2 carrays.i

    +

    8.2.2 carrays.i

    @@ -419,9 +419,7 @@ delete_doubleArray(a) # Destroy array -

    %array_class(type,name) -

    diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html index 53cddab83..ca2d0414e 100644 --- a/Doc/Manual/Lisp.html +++ b/Doc/Manual/Lisp.html @@ -6,7 +6,7 @@ -

    22 SWIG and Common Lisp

    +

    21 SWIG and Common Lisp

      @@ -41,7 +41,7 @@ Lisp, Common Foreign Function Interface(CFFI), CLisp and UFFI foreign function interfaces.

      -

      22.1 Allegro Common Lisp

      +

      21.1 Allegro Common Lisp

      @@ -50,7 +50,7 @@ here

      -

      22.2 Common Foreign Function Interface(CFFI)

      +

      21.2 Common Foreign Function Interface(CFFI)

      @@ -77,7 +77,7 @@ swig -cffi -module module-name file-name files and the various things which you can do with them.

      -

      22.2.1 Additional Commandline Options

      +

      21.2.1 Additional Commandline Options

      @@ -118,7 +118,7 @@ swig -cffi -help -

      22.2.2 Generating CFFI bindings

      +

      21.2.2 Generating CFFI bindings

      As we mentioned earlier the ideal way to use SWIG is to use interface @@ -392,7 +392,7 @@ The feature intern_function ensures that all C names are
    -

    22.2.3 Generating CFFI bindings for C++ code

    +

    21.2.3 Generating CFFI bindings for C++ code

    This feature to SWIG (for CFFI) is very new and still far from @@ -568,7 +568,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI module feel free to contact us on the SWIG mailing list, and also please add a "[CFFI]" tag in the subject line. -

    22.2.4 Inserting user code into generated files

    +

    21.2.4 Inserting user code into generated files

    @@ -583,7 +583,7 @@ using the SWIG %insert(section) %{ ...code... %} directive: 

     %module example
 
-%{
+%insert("runtime") %{
 #include "header.h"
 %}
 
@@ -604,11 +604,11 @@ generated lisp interface file:
 
 
    
 Note that the block %{ ... %} is effectively a shortcut for
-%insert("header") %{ ... %}.
+%insert("runtime") %{ ... %}.
 
    
 
 
-
    22.3 CLISP
    
+
    21.3 CLISP
    
 
 
 
    
@@ -638,7 +638,7 @@ swig -clisp -module module-name   file-name
     interface file for the CLISP module. The CLISP module tries to
     produce code which is both human readable and easily modifyable.
 
    
-
    22.3.1 Additional Commandline Options 
    
+
    21.3.1 Additional Commandline Options 
    
 
 
 
    
@@ -671,7 +671,7 @@ and global variables will be created otherwise only definitions for
    
 
 
 
-
    22.3.2 Details on CLISP bindings
    
+
    21.3.2 Details on CLISP bindings
    
 
 
 
    
@@ -795,7 +795,7 @@ struct bar {
    -

    22.4 UFFI

    +

    21.4 UFFI

    diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index e66c1c7f3..4ebf02349 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -6,7 +6,7 @@ -

    23 SWIG and Lua

    +

    22 SWIG and Lua

    -
  • Typemaps +
  • Details on the Lua binding -
  • Writing typemaps - -
  • Customization of your Bindings - -
  • Details on the Lua binding - @@ -67,13 +52,13 @@

    Lua is an extension programming language designed to support general procedural programming with data description facilities. It also offers good support for object-oriented programming, functional programming, and data-driven programming. Lua is intended to be used as a powerful, light-weight configuration language for any program that needs one. Lua is implemented as a library, written in clean C (that is, in the common subset of ANSI C and C++). Its also a really tiny language, less than 6000 lines of code, which compiles to <100 kilobytes of binary code. It can be found at http://www.lua.org

    -

    23.1 Preliminaries

    +

    22.1 Preliminaries

    The current SWIG implementation is designed to work with Lua 5.0.x and Lua 5.1.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. ((Currently SWIG generated code has only been tested on Windows with MingW, though given the nature of Lua, is should not have problems on other OS's)). It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms).

    -

    23.2 Running SWIG

    +

    22.2 Running SWIG

    @@ -105,7 +90,7 @@ This creates a C/C++ source file example_wrap.c or example_wrap.cxx

    The name of the wrapper file is derived from the name of the input file. For example, if the input file is example.i, the name of the wrapper file is example_wrap.c. To change this, you can use the -o option. The wrappered module will export one function "int luaopen_example(lua_State* L)" which must be called to register the module with the Lua interpreter. The name "luaopen_example" depends upon the name of the module.

    -

    23.2.1 Compiling and Linking and Interpreter

    +

    22.2.1 Compiling and Linking and Interpreter

    @@ -152,7 +137,7 @@ $ gcc -c example.c -o example.o $ gcc -I/usr/include/lua -L/usr/lib/lua min.o example_wrap.o example.o -o my_lua -

    23.2.2 Compiling a dynamic module

    +

    22.2.2 Compiling a dynamic module

    @@ -220,7 +205,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib -

    23.2.3 Using your module

    +

    22.2.3 Using your module

    @@ -238,19 +223,19 @@ $ ./my_lua > -

    23.3 A tour of basic C/C++ wrapping

    +

    22.3 A tour of basic C/C++ wrapping

    By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.

    -

    23.3.1 Modules

    +

    22.3.1 Modules

    The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.

    -

    23.3.2 Functions

    +

    22.3.2 Functions

    @@ -288,7 +273,7 @@ It is also possible to rename the module with an assignment. 24 -

    23.3.3 Global variables

    +

    22.3.3 Global variables

    @@ -362,7 +347,7 @@ nil 3.142 -

    23.3.4 Constants and enums

    +

    22.3.4 Constants and enums

    @@ -385,7 +370,7 @@ example.SUNDAY=0

    Constants are not guaranteed to remain constant in Lua. The name of the constant could be accidentally reassigned to refer to some other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

    -

    23.3.5 Pointers

    +

    22.3.5 Pointers

    @@ -423,7 +408,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor nil -

    23.3.6 Structures

    +

    22.3.6 Structures

    @@ -509,7 +494,7 @@ Because the pointer points inside the structure, you can modify the contents and > x.a = 3 -- Modifies the same structure -

    23.3.7 C++ classes

    +

    22.3.7 C++ classes

    @@ -570,7 +555,7 @@ It is not (currently) possible to access static members of an instance: -- does NOT work -

    23.3.8 C++ inheritance

    +

    22.3.8 C++ inheritance

    @@ -595,7 +580,7 @@ then the function spam() accepts a Foo pointer or a pointer to any clas

    It is safe to use multiple inheritance with SWIG.

    -

    23.3.9 Pointers, references, values, and arrays

    +

    22.3.9 Pointers, references, values, and arrays

    @@ -626,7 +611,7 @@ Foo spam7();

    then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.

    -

    23.3.10 C++ overloaded functions

    +

    22.3.10 C++ overloaded functions

    @@ -712,7 +697,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin

    Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.

    -

    23.3.11 C++ operators

    +

    22.3.11 C++ operators

    @@ -824,7 +809,7 @@ It is also possible to overload the operator[], but currently this cann }; -

    23.3.12 Class extension with %extend

    +

    22.3.12 Class extension with %extend

    @@ -879,7 +864,7 @@ true

    Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).

    -

    23.3.13 C++ templates

    +

    22.3.13 C++ templates

    @@ -914,7 +899,7 @@ In Lua:

    Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.

    -

    23.3.14 C++ Smart Pointers

    +

    22.3.14 C++ Smart Pointers

    @@ -966,7 +951,7 @@ If you ever need to access the underlying pointer returned by operator->( > f = p:__deref__() -- Returns underlying Foo * -

    23.3.15 C++ Exceptions

    +

    22.3.15 C++ Exceptions

    @@ -1018,9 +1003,8 @@ stack traceback:

    -SWIG is able to throw numeric types, enums, chars, char*'s and std::string's without problem. It has also written typemaps for std::exception and its derived classes, which convert the exception into and error string.

    -

    -However its not so simple for to throw other types of objects. +SWIG is able to throw numeric types, enums, chars, char*'s and std::string's without problem. +However its not so simple for to throw objects. Thrown objects are not valid outside the 'catch' block. Therefore they cannot be returned to the interpreter. The obvious ways to overcome this would be to either return a copy of the object, or so convert the object to a string and @@ -1054,6 +1038,10 @@ To get a more useful behaviour out of SWIG you must either: provide a way to con throw objects which can be copied.

    +SWIG has typemaps for std::exception and its children already written, so a function which throws any of these will +automatically have its exception converted into an error string. +

    +

    If you have your own class which you want output as a string you will need to add a typemap something like this: 

    @@ -1110,271 +1098,7 @@ add exception specification to functions or globally (respectively).
 
    
 
 
-
    23.4 Typemaps
    
-
-
-
    This section explains what typemaps are and the usage of them. The default wrappering behaviour of SWIG is enough in most cases. However sometimes SWIG may need a little additional assistance to know which typemap to apply to provide the best wrappering. This section will be explaining how to use typemaps to best effect
    
-
-
    23.4.1 What is a typemap?
    
-
-
-
    A typemap is nothing more than a code generation rule that is attached to a specific C datatype. For example, to convert integers from Lua to C, you might define a typemap like this:
    
-
-
    %module example
-
-%typemap(in) int {
-	$1 = (int) lua_tonumber(L,$input);
-	printf("Received an integer : %d\n",$1);
-}
-%inline %{
-extern int fact(int n);
-%}
-
    
-
-
    Note: you shouldn't use this typemap, as SWIG already has a typemap for this task. This is purely for example.
    
-
-
    Typemaps are always associated with some specific aspect of code generation. In this case, the "in" method refers to the conversion of input arguments to C/C++. The datatype int is the datatype to which the typemap will be applied. The supplied C code is used to convert values. In this code a number of special variable prefaced by a $ are used. The $1 variable is placeholder for a local variable of type int. The $input is the index on the Lua stack for the value to be used.
    
-
-
    When this example is compiled into a Lua module, it operates as follows:
    
-
-
    > require "example"
-> print(example.fact(6))
-Received an integer : 6
-720
-
    
-
-
    23.4.2 Using typemaps
    
-
-
-
    There are many ready written typemaps built into SWIG for all common types (int, float, short, long, char*, enum and more), which SWIG uses automatically, with no effort required on your part.
    
-
-
    However for more complex functions which use input/output parameters or arrays, you will need to make use of <typemaps.i>, which contains typemaps for these situations. For example, consider these functions:
    
-
-
    void add(int x, int y, int *result) {
-   *result = x + y;
-}
-
-int sub(int *x1, int *y1) {
-   return *x1-*y1;
-}
-
-void swap(int *sx, int *sy) {
-   int t=*sx;
-   *sx=*sy;
-   *sy=t;
-}
-
    
-
-
    It is clear to the programmer, that 'result' is an output parameter, 'x1' and 'y1' are input parameters and 'sx' and 'sy' are input/output parameters. However is not apparent to SWIG, so SWIG must to informed about which kind they are, so it can wrapper accordingly.
    
-
-
    One means would be to rename the argument name to help SWIG, eg void add(int x, int y, int *OUTPUT), however it is easier to use the %apply to achieve the same result, as shown below.
    
-
-
    %include <typemaps.i>
-%apply int* OUTPUT {int *result}; // int *result is output
-%apply int* INPUT {int *x1, int *y1}; // int *x1 and int *y1 are input
-%apply int* INOUT {int *sx, int *sy}; // int *sx and int *sy are input and output
-
-void add(int x, int y, int *result);
-int sub(int *x1, int *y1);
-void swap(int *sx, int *sy);
-
    
-
-
    When wrapped, it gives the following results:
    
-
-
    > require "example"
-> print(example.add(1,2))
-3
-> print(demo.sub(1,2))
--1
-> a,b=1,2
-> c,d=demo.swap(a,b)
-> print(a,b,c,d)
-1       2       2       1
-
    
-
-
    Notice, that 'result' is not required in the arguments to call the function, as it an output parameter only.  For 'sx' and 'sy' they must be passed in (as they are input), but the original value is not modified (Lua does not have a pass by reference feature). The modified results are then returned as two return values. All INPUT/OUTPUT/INOUT arguments will behave in a similar manner.
    
-
-
    Note: C++ references must be handled exactly the same way. However SWIG will automatically wrap a const int&  as an input parameter (since that it obviously input).
    
-
-
    23.4.3 Typemaps and arrays
    
-
-
-
    Arrays present a challenge for SWIG, because like pointers SWIG does not know whether these are input or output values, nor
-does SWIG have any indication of how large an array should be. However with the proper guidance SWIG can easily wrapper
-arrays for convenient usage.
    
-
-
    Given the functions:
    
-
    extern void sort_int(int* arr, int len);
-extern void sort_double(double* arr, int len);
-
    
-
-
    There are basically two ways that SWIG can deal with this. The first way, uses the <carrays.i> library
-to create an array in C/C++ then this can be filled within Lua and passed into the function. It works, but its a bit tedious.
-More details can be found in the carrays.i documention.
    
-
-
    The second and more intuitive way, would be to pass a Lua table directly into the function, and have SWIG automatically convert between Lua-table and C-array. Within the <typemaps.i> file there are typemaps ready written to perform this task. To use them is again a matter of using %appy in the correct manner.
    
-
-
    The wrapper file below, shows both the use of carrays as well as the use of the typemap to wrap arrays. 
    
-
-
    // using the C-array
-%include <carrays.i>
-// this declares a batch of function for manipulating C integer arrays
-%array_functions(int,int)
-
-extern void sort_int(int* arr, int len); // the function to wrap
-
-// using typemaps
-%include <typemaps.i>
-%apply (double *INOUT,int) {(double* arr,int len)};
-
-extern void sort_double(double* arr, int len); // the function to wrap
-
    
-
-
    Once wrappered, the functions can both be called, though with different ease of use:
    
-
-
    require "example"
-ARRAY_SIZE=10
-
--- passing a C array to the sort_int()
-arr=example.new_int(ARRAY_SIZE) -- create the array
-for i=0,ARRAY_SIZE-1 do -- index 0..9 (just like C)
-    example.int_setitem(arr,i,math.random(1000))
-end
-example.sort_int(arr,ARRAY_SIZE)  -- call the function
-example.delete_int(arr) -- must delete the allocated memory
-
--- use a typemap to call with a Lua-table
--- one item of note: the typemap creates a copy, rather than edit-in-place
-t={} -- a Lua table
-for i=1,ARRAY_SIZE do -- index 1..10 (Lua style)
-    t[i]=math.random(1000)/10
-end
-t=example.sort_double(t) -- replace t with the result
-
    
-
-
    Obviously the first version could be made less tedious by writing a Lua function to perform the conversion from a table 
-to a C-array. The %luacode directive is good for this. See SWIG\Examples\lua\arrays for an example of this.
    
-
-
    Warning: in C indexes start at ZERO, in Lua indexes start at ONE. SWIG expects C-arrays to be filled for 0..N-1
-and Lua tables to be 1..N, (the indexing follows the norm for the language). In the typemap when it converts the table to an array it quietly changes the indexing accordingly. Take note of this behaviour if you have a C function which returns indexes.
    
-
-
    Note: SWIG also can support arrays of pointers in a similar manner.
    
-
-
    23.4.4 Typemaps and pointer-pointer functions
    
-
-
-
    Several C++ libraries use a pointer-pointer functions to create its objects. These functions require a pointer to a pointer which is then filled with the pointer to the new object. Microsoft's COM and DirectX as well as many other libraries have this kind of function. An example is given below:
    
-
-
    struct iMath;    // some structure
-int Create_Math(iMath** pptr); // its creator (assume it mallocs)
-
    
-
-
    Which would be used with the following C code:
    
-
-
    iMath* ptr;
-int ok;
-ok=Create_Math(&ptr);
-// do things with ptr
-//...
-free(ptr); // dispose of iMath
-
    
-
-
    SWIG has a ready written typemap to deal with such a kind of function in <typemaps.i>. It provides the correct wrappering as well as setting the flag to inform Lua that the object in question should be garbage collected. Therefore the code is simply:
    
-
-
    %include <typemaps.i>
-%apply SWIGTYPE** OUTPUT{iMath **pptr }; // tell SWIG its an output
-
-struct iMath;    // some structure
-int Create_Math(iMath** pptr); // its creator (assume it mallocs)
-
    
-
-
    The usage is as follows:
    
-
-
    ok,ptr=Create_Math() -- ptr is a iMath* which is returned with the int (ok)
-ptr=nil -- the iMath* will be GC'ed as normal
-
    
-
-
    23.5 Writing typemaps
    
-
-
-
    This section describes how you can modify SWIG's default wrapping behavior for various C/C++ datatypes using the %typemap directive. This is an advanced topic that assumes familiarity with the Lua C API as well as the material in the "Typemaps" chapter.
    
-
-
    Before proceeding, it should be stressed that writing typemaps is rarely needed unless you want to change some aspect of the wrappering, or to achieve an effect which in not available with the default bindings.
    
-
-
    Before proceeding, you should read the previous section on using typemaps, as well as read the ready written typemaps found in luatypemaps.swg and typemaps.i. These are both well documented and fairly easy to read. You should not attempt to write your own typemaps until you have read and can understand both of these files (they may well also give you a idea to base your worn on).
    
-
-
    23.5.1 Typemaps you can write
    
-
-
-
    There are many different types of typemap that can be written, the full list can be found in the "Typemaps" chapter. However the following are the most commonly used ones.
    
-
-
      
-
    • in this is for input arguments to functions
      • 
-
    • out this is for return types from functions
      • 
-
    • argout this is for a function argument which is actually returning something
      • 
-
    • typecheck this is used to determine which overloaded function should be called 
-(the syntax for the typecheck is different from the typemap, see typemaps for details).
      • 
-
    
-
-
    23.5.2 SWIG's Lua-C API
    
-
-
-
    This section explains the SWIG specific Lua-C API. It does not cover the main Lua-C api, as this is well documented and not worth covering.
    
-
-
    int SWIG_ConvertPtr(lua_State* L,int index,void** ptr,swig_type_info *type,int flags);
    
-
-
    
-This is the standard function used for converting a Lua userdata to a void*. It takes the value at the given index in the Lua state and converts it to a userdata. It will then provide the neccesary type checks, confirming that the pointer is compatible with the type given in 'type'. Then finally setting '*ptr' to the pointer.
-If flags is set to SWIG_POINTER_DISOWN, this is will clear any ownership flag set on the object.
    
-The returns a value which can be checked with the macro SWIG_IsOK()
-
    
-
-
    void SWIG_NewPointerObj(lua_State* L,void* ptr,swig_type_info *type,int own);
    
-
-
    
-This is the opposite of SWIG_ConvertPtr, as it pushes a new userdata which wrappers the pointer 'ptr' of type 'type'.
-The parameter 'own' specifies if the object is owned be Lua and if it is 1 then Lua will GC the object when the userdata is disposed of.
-
    
-
-
    void* SWIG_MustGetPtr(lua_State* L,int index,swig_type_info *type,int flags,int argnum,const char* func_name);
    
-
-
    
-This function is a version of SWIG_ConvertPtr(), except that it will either work, or it will trigger a lua_error() with a text error message. This function is rarely used, and may be deprecated in the future.
-
    
-
-
    SWIG_fail
    
-
-
    
-This macro, when called within the context of a SWIG wrappered function, will jump to the error handler code. This will call any cleanup code (freeing any temp variables) and then triggers a lua_error.
    
-A common use for this code is:
    -if (!SWIG_IsOK(SWIG_ConvertPtr( .....)){
- lua_pushstring(L,"something bad happened");
- SWIG_fail;
-}
    
-
-
    SWIG_fail_arg(char* func_name,int argnum,char* type)
    
-
-
    
-This macro, when called within the context of a SWIG wrappered function, will display the error message and jump to the error handler code. The error message is of the form 
-
    -"Error in func_name (arg argnum), expected 'type' got 'whatever the type was'"
-
    
-
-
    SWIG_fail_ptr(const char* fn_name,int argnum,swig_type_info* type);
    
-
-
    
-Similar to SWIG_fail_arg, except that it will display the swig_type_info information instead.
    
-
-
    23.6 Customization of your Bindings
    
-
-
-
    
-This section covers adding of some small extra bits to your module to add the last finishing touches.
-
    
-
-
-
-
    23.6.1 Writing your own custom wrappers
    
+
    22.3.16 Writing your own custom wrappers
    
 
 
 
    
@@ -1393,7 +1117,7 @@ int native_function(lua_State*L) // my native code
 The %native directive in the above example, tells SWIG that there is a function int native_function(lua_State*L); which is to be added into the module under the name 'my_func'. SWIG will not add any wrappering for this function, beyond adding it into the function table. How you write your code is entirely up to you.
 
    
 
-
    23.6.2 Adding additional Lua code
    
+
    22.3.17 Adding additional Lua code
    
 
 
 
    
@@ -1431,7 +1155,7 @@ Good uses for this feature is adding of new code, or writing helper functions to
 See Examples/lua/arrays for an example of this code.
 
    
 
-
    23.7 Details on the Lua binding
    
+
    22.4 Details on the Lua binding
    
 
 
 
    
@@ -1442,7 +1166,7 @@ See Examples/lua/arrays for an example of this code.
  
 
    
 
-
    23.7.1 Binding global data into the module.
    
+
    22.4.1 Binding global data into the module.
    
 
 
 
    
@@ -1502,7 +1226,7 @@ end
 
    
 That way when you call 'a=example.Foo', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code 'example.Foo=10', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.
 
    
-
    23.7.2 Userdata and Metatables
    
+
    22.4.2 Userdata and Metatables
    
 
 
 
    
@@ -1582,7 +1306,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrappered classes/s
 
    
 Note: Operator overloads are basically done in the same way, by adding functions such as '__add' & '__call' to the classes metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.
 
    
-
    23.7.3 Memory management
    
+
    22.4.3 Memory management
    
 
 
 
    
diff --git a/Doc/Manual/Makefile b/Doc/Manual/Makefile
index 4c907791b..1923c2c48 100644
--- a/Doc/Manual/Makefile
+++ b/Doc/Manual/Makefile
@@ -18,19 +18,15 @@ HTMLDOC_OPTIONS = "--book --toclevels 4 --no-numbered --toctitle \"Table of Cont
 
 all: maketoc check generate
 
-maketoc: CCache.html
+maketoc:
 	python maketoc.py
 
-CCache.html: ../../CCache/ccache.yo
-	yodl2html -o CCache.html ../../CCache/ccache.yo
-
 # Use htmltidy to warn about some HTML errors. Note that it is not used to clean/tidy the HTML,
 # it is just used as a primitive HTML checker.
-# CCache.html is generated by yodl2html and has a few insignificant problems, so we don't put it through tidy
 check:
 	  tidy -errors --gnu-emacs yes -quiet index.html
 	  tidy -errors --gnu-emacs yes -quiet Sections.html
-	  all=`sed '/^#/d' chapters | grep -v CCache.html`; for a in $$all; do tidy -errors --gnu-emacs yes -quiet $$a; done;
+	  all=`sed '/^#/d' chapters`; for a in $$all; do tidy -errors --gnu-emacs yes -quiet $$a; done;
 
 generate: swightml.book swigpdf.book
 	htmldoc --batch swightml.book || true
@@ -49,14 +45,11 @@ swightml.book:
 	echo "Sections.html" >> swightml.book
 	cat chapters >> swightml.book
 
-clean: clean-baks
+clean:
 	rm -f swightml.book
 	rm -f swigpdf.book
-	rm -f CCache.html
 	rm -f SWIGDocumentation.html
 	rm -f SWIGDocumentation.pdf
-
-clean-baks:
 	rm -f *.bak
 
 test:
diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html
index c4e485202..ff70fc143 100644
--- a/Doc/Manual/Modula3.html
+++ b/Doc/Manual/Modula3.html
@@ -5,7 +5,7 @@
 
 
 
-
    24 SWIG and Modula-3
    
+
    23 SWIG and Modula-3
    
 
 
    
 
      
@@ -57,7 +57,7 @@ especially
 typemaps.
 
      
 
-
      24.1 Overview
      
+
      23.1 Overview
      
 
 
 
      
@@ -90,7 +90,7 @@ So the introduction got a bit longer than it should ...  ;-)
 
      
 
 
-
      24.1.1 Why not scripting ?
      
+
      23.1.1 Why not scripting ?
      
 
 
 
      
@@ -126,7 +126,7 @@ are not advantages of the language itself
 but can be provided by function libraries.
 
      
 
-
      24.1.2 Why Modula-3 ?
      
+
      23.1.2 Why Modula-3 ?
      
 
 
 
      
@@ -166,7 +166,7 @@ it's statically typed, too.
 
      
 
 
-
      24.1.3 Why C / C++ ?
      
+
      23.1.3 Why C / C++ ?
      
 
 
 
      
@@ -179,7 +179,7 @@ Even more fortunately even non-C libraries may provide C header files.
 This is where SWIG becomes helpful.
 
      
 
-
      24.1.4 Why SWIG ?
      
+
      23.1.4 Why SWIG ?
      
 
 
 
      
@@ -252,10 +252,10 @@ integrate Modula-3 code into a C / C++ project.
 
      
 
 
-
      24.2 Conception
      
+
      23.2 Conception
      
 
 
-
      24.2.1 Interfaces to C libraries
      
+
      23.2.1 Interfaces to C libraries
      
 
 
 
      
@@ -404,7 +404,7 @@ and the principal type must be renamed (%typemap).
 
      
 
 
-
      24.2.2 Interfaces to C++ libraries
      
+
      23.2.2 Interfaces to C++ libraries
      
 
 
 
      
@@ -505,10 +505,10 @@ There is no C++ library I wrote a SWIG interface for,
 so I'm not sure if this is possible or sensible, yet.
 
      
 
-
      24.3 Preliminaries
      
+
      23.3 Preliminaries
      
 
 
-
      24.3.1 Compilers
      
+
      23.3.1 Compilers
      
 
 
 
      
@@ -522,7 +522,7 @@ For testing examples I use Critical Mass cm3.
 
      
 
 
-
      24.3.2 Additional Commandline Options
      
+
      23.3.2 Additional Commandline Options
      
 
 
 
      
@@ -599,10 +599,10 @@ Instead generate templates for some basic typemaps.
 
 
 
-
      24.4 Modula-3 typemaps
      
+
      23.4 Modula-3 typemaps
      
 
 
-
      24.4.1 Inputs and outputs
      
+
      23.4.1 Inputs and outputs
      
 
 
 
      
@@ -818,7 +818,7 @@ consist of the following parts:
 
 
 
-
      24.4.2 Subranges, Enumerations, Sets
      
+
      23.4.2 Subranges, Enumerations, Sets
      
 
 
 
      
@@ -860,8 +860,8 @@ that split the task up into converting
 the C bit patterns (integer or bit set)
 into Modula-3 bit patterns (integer or bit set)
 and change the type as requested.
-See the corresponding example in the 
-Examples/modula3/enum/example.i file.
+See the corresponding
+example.
 This is quite messy and not satisfying.
 So the best what you can currently do is
 to rewrite constant definitions manually.
@@ -870,20 +870,20 @@ that I'd like to automate.
 
      
 
 
-
      24.4.3 Objects
      
+
      23.4.3 Objects
      
 
 
 
      
 Declarations of C++ classes are mapped to OBJECT types
 while it is tried to retain the access hierarchy
 "public - protected - private" using partial revelation.
-Though the example in 
-Examples/modula3/class/example.i
+Though the
+implementation
 is not really useful, yet.
 
      
 
 
-
      24.4.4 Imports
      
+
      23.4.4 Imports
      
 
 
 
      
@@ -918,7 +918,7 @@ IMPORT M3toC;
    -

    24.4.5 Exceptions

    +

    23.4.5 Exceptions

    @@ -942,7 +942,7 @@ you should declare %typemap("m3wrapinconv:throws") blah * %{OSError.E%}.

    -

    24.4.6 Example

    +

    23.4.6 Example

    @@ -989,10 +989,10 @@ where almost everything is generated by a typemap: -

    24.5 More hints to the generator

    +

    23.5 More hints to the generator

    -

    24.5.1 Features

    +

    23.5.1 Features

    @@ -1029,7 +1029,7 @@ where almost everything is generated by a typemap:
    -

    24.5.2 Pragmas

    +

    23.5.2 Pragmas

    @@ -1052,7 +1052,7 @@ where almost everything is generated by a typemap:
    -

    24.6 Remarks

    +

    23.6 Remarks

      diff --git a/Doc/Manual/Modules.html b/Doc/Manual/Modules.html index 5ac66dc2e..8971324fb 100644 --- a/Doc/Manual/Modules.html +++ b/Doc/Manual/Modules.html @@ -50,90 +50,41 @@ scripting language runtime as you would do for the single module case.

      A bit more complex is the case in which modules need to share information. -For example, when one module extends the class of another by deriving from +For example, when one module extends the class of the another by deriving from it: 

      -// File: base.h
+%module base
+
+%inline %{
 class base {
 public:
-  int foo();
+       int foo(void);
 };
-
      -  - -
      -// File: base_module.i
-%module base_module
-
-%{
-#include "base.h"
 %}
-%include "base.h"
        - 
      -// File: derived_module.i
-%module derived_module
+%module derived
 
-%import "base_module.i"
+%import "base.i"
 
 %inline %{
 class derived : public base {
 public:
-  int bar();
+       int bar(void);
 };
 %}
      -

      To create the wrapper properly, module derived_module needs to know about the -base class and that its interface is covered in another module. The -line %import "base_module.i" lets SWIG know exactly that. Oftentimes -the .h file is passed to %import instead of the .i, -which unfortunately doesn't work for all language modules. For example, Python requires the -name of module that the base class exists in so that the proxy classes can fully inherit the -base class's methods. Typically you will get a warning when the module name is missing, eg: -

      - -
      -derived_module.i:8: Warning(401): Base class 'base' ignored - unknown module name for base. Either import 
-the appropriate module interface file or specify the name of the module in the %import directive.
-
      - -

      -It is sometimes desirable to import the header file rather than the interface file and overcome -the above warning. -For example in the case of the imported interface being quite large, it may be desirable to -simplify matters and just import a small header file of dependent types. -This can be done by specifying the optional module attribute in the %import directive. -The derived_module.i file shown above could be replaced with the following: - -

      -// File: derived_module.i
-%module derived_module
-
-%import(module="base_module") "base.h"
-
-%inline %{
-class derived : public base {
-public:
-  int bar();
-};
-
      - -

      -Note that "base_module" is the module name and is the same as that specified in %module -in base_module.i as well as the %import in derived_module.i. -

      - -

      -Another issue -to beware of is that multiple dependent wrappers should not be linked/loaded +

      To create the wrapper properly, module derived needs to know the +base class and that it's interface is covered in another module. The +line %import "base.i" lets SWIG know exactly that. The common mistake here is +to %import the .h file instead of the .i, which sadly won't do the trick. Another issue +to take care of is that multiple dependent wrappers should not be linked/loaded in parallel from multiple threads as SWIG provides no locking - for more on that -issue, read on. -

      +issue, read on.

      15.2 The SWIG runtime code

      diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html index 9413bb010..699168322 100644 --- a/Doc/Manual/Mzscheme.html +++ b/Doc/Manual/Mzscheme.html @@ -8,7 +8,7 @@ -

      25 SWIG and MzScheme

      +

      24 SWIG and MzScheme

        @@ -22,7 +22,7 @@

        This section contains information on SWIG's support of MzScheme. -

        25.1 Creating native MzScheme structures

        +

        24.1 Creating native MzScheme structures

        diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html index 6dbf24c11..79ede443f 100644 --- a/Doc/Manual/Ocaml.html +++ b/Doc/Manual/Ocaml.html @@ -6,7 +6,7 @@ -

        26 SWIG and Ocaml

        +

        25 SWIG and Ocaml

          @@ -80,7 +80,7 @@ If you're not familiar with the Objective Caml language, you can visit The Ocaml Website.

          -

          26.1 Preliminaries

          +

          25.1 Preliminaries

          @@ -99,7 +99,7 @@ file Examples/Makefile illustrate how to compile and link SWIG modules that will be loaded dynamically. This has only been tested on Linux so far.

          -

          26.1.1 Running SWIG

          +

          25.1.1 Running SWIG

          @@ -122,7 +122,7 @@ you will compile the file example_wrap.c with ocamlc or the resulting .ml and .mli files as well, and do the final link with -custom (not needed for native link).

          -

          26.1.2 Compiling the code

          +

          25.1.2 Compiling the code

          @@ -158,7 +158,7 @@ the user more freedom with respect to custom typing.

        -

        26.1.3 The camlp4 module

        +

        25.1.3 The camlp4 module

        @@ -234,7 +234,7 @@ let b = C_string (getenv "PATH") -

        26.1.4 Using your module

        +

        25.1.4 Using your module

        @@ -248,7 +248,7 @@ When linking any ocaml bytecode with your module, use the -custom option is not needed when you build native code.

        -

        26.1.5 Compilation problems and compiling with C++

        +

        25.1.5 Compilation problems and compiling with C++

        @@ -259,7 +259,7 @@ liberal with pointer types may not compile under the C++ compiler. Most code meant to be compiled as C++ will not have problems.

        -

        26.2 The low-level Ocaml/C interface

        +

        25.2 The low-level Ocaml/C interface

        @@ -360,7 +360,7 @@ is that you must append them to the return list with swig_result = caml_list_a signature for a function that uses value in this way.

        -

        26.2.1 The generated module

        +

        25.2.1 The generated module

        @@ -394,7 +394,7 @@ it describes the output SWIG will generate for class definitions. -

        26.2.2 Enums

        +

        25.2.2 Enums

        @@ -457,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a

      -

      26.2.2.1 Enum typing in Ocaml

      +

      25.2.2.1 Enum typing in Ocaml

      @@ -470,10 +470,10 @@ functions imported from different modules. You must convert values to master values using the swig_val function before sharing them with another module.

      -

      26.2.3 Arrays

      +

      25.2.3 Arrays

      -

      26.2.3.1 Simple types of bounded arrays

      +

      25.2.3.1 Simple types of bounded arrays

      @@ -494,7 +494,7 @@ arrays of simple types with known bounds in your code, but this only works for arrays whose bounds are completely specified.

      -

      26.2.3.2 Complex and unbounded arrays

      +

      25.2.3.2 Complex and unbounded arrays

      @@ -507,7 +507,7 @@ SWIG can't predict which of these methods will be used in the array, so you have to specify it for yourself in the form of a typemap.

      -

      26.2.3.3 Using an object

      +

      25.2.3.3 Using an object

      @@ -521,7 +521,7 @@ Consider writing an object when the ending condition of your array is complex, such as using a required sentinel, etc.

      -

      26.2.3.4 Example typemap for a function taking float * and int

      +

      25.2.3.4 Example typemap for a function taking float * and int

      @@ -572,7 +572,7 @@ void printfloats( float *tab, int len ); -

      26.2.4 C++ Classes

      +

      25.2.4 C++ Classes

      @@ -615,7 +615,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the returned value for the same object.

      -

      26.2.4.1 STL vector and string Example

      +

      25.2.4.1 STL vector and string Example

      @@ -695,7 +695,7 @@ baz # -

      26.2.4.2 C++ Class Example

      +

      25.2.4.2 C++ Class Example

      @@ -725,7 +725,7 @@ public: }; -

      26.2.4.3 Compiling the example

      +

      25.2.4.3 Compiling the example

      @@ -743,7 +743,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
      -

      26.2.4.4 Sample Session

      +

      25.2.4.4 Sample Session

      @@ -770,10 +770,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.  
 
      
 
-
      26.2.5 Director Classes
      
+
      25.2.5 Director Classes
      
 
 
-
      26.2.5.1 Director Introduction
      
+
      25.2.5.1 Director Introduction
      
 
 
 
      
@@ -800,7 +800,7 @@ class foo {
 };
      -

      26.2.5.2 Overriding Methods in Ocaml

      +

      25.2.5.2 Overriding Methods in Ocaml

      @@ -828,7 +828,7 @@ In this example, I'll examine the objective caml code involved in providing an overloaded class. This example is contained in Examples/ocaml/shapes.

      -

      26.2.5.3 Director Usage Example

      +

      25.2.5.3 Director Usage Example

      @@ -887,7 +887,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the program in C++.

      -

      26.2.5.4 Creating director objects

      +

      25.2.5.4 Creating director objects

      @@ -928,7 +928,7 @@ object from causing a core dump, as long as the object is destroyed properly.

      -

      26.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      +

      25.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      @@ -939,7 +939,7 @@ well as a function return value in the same way you provide function arguments, and to receive arguments the same way you normally receive function returns.

      -

      26.2.5.6 directorin typemap

      +

      25.2.5.6 directorin typemap

      @@ -950,7 +950,7 @@ code receives when you are called. In general, a simple directorin typ can use the same body as a simple out typemap.

      -

      26.2.5.7 directorout typemap

      +

      25.2.5.7 directorout typemap

      @@ -961,7 +961,7 @@ for the same type, except when there are special requirements for object ownership, etc.

      -

      26.2.5.8 directorargout typemap

      +

      25.2.5.8 directorargout typemap

      @@ -978,7 +978,7 @@ In the event that you don't specify all of the necessary values, integral values will read zero, and struct or object returns have undefined results.

      -

      26.2.6 Exceptions

      +

      25.2.6 Exceptions

      diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index 7409d78f1..97e1be17c 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -8,7 +8,7 @@ -

      27 SWIG and Octave

      +

      26 SWIG and Octave

        @@ -54,14 +54,14 @@ More information can be found at www.octave.org< Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).

        -

        27.1 Preliminaries

        +

        26.1 Preliminaries

        The current SWIG implemention is based on Octave 2.9.12. Support for other versions (in particular the recent 3.0) has not been tested, nor has support for any OS other than Linux.

        -

        27.2 Running SWIG

        +

        26.2 Running SWIG

        @@ -89,7 +89,7 @@ This creates a C/C++ source file example_wrap.cxx. The generated C++ so The swig command line has a number of options you can use, like to redirect it's output. Use swig --help to learn about these.

        -

        27.2.1 Compiling a dynamic module

        +

        26.2.1 Compiling a dynamic module

        @@ -116,7 +116,7 @@ $ mkoctfile example_wrap.cxx example.c 

        octave:1> example
        -

        27.2.2 Using your module

        +

        26.2.2 Using your module

        @@ -134,10 +134,10 @@ octave:4> example.cvar.Foo=4; octave:5> example.cvar.Foo ans = 4

      -

      27.3 A tour of basic C/C++ wrapping

      +

      26.3 A tour of basic C/C++ wrapping

      -

      27.3.1 Modules

      +

      26.3.1 Modules

      @@ -179,7 +179,7 @@ One can also rename it by simple assignment, e.g., octave:1> some_vars = cvar; -

      27.3.2 Functions

      +

      26.3.2 Functions

      @@ -196,7 +196,7 @@ int fact(int n); 

      octave:1> example.fact(4)
 24
      -

      27.3.3 Global variables

      +

      26.3.3 Global variables

      @@ -249,7 +249,7 @@ octave:2> example.PI=3.142; octave:3> example.PI ans = 3.1420 -

      27.3.4 Constants and enums

      +

      26.3.4 Constants and enums

      @@ -271,7 +271,7 @@ example.SCONST="Hello World" example.SUNDAY=0 .... -

      27.3.5 Pointers

      +

      26.3.5 Pointers

      @@ -318,7 +318,7 @@ octave:2> f=example.fopen("not there","r"); error: value on right hand side of assignment is undefined error: evaluating assignment expression near line 2, column 2 -

      27.3.6 Structures and C++ classes

      +

      26.3.6 Structures and C++ classes

      @@ -453,7 +453,7 @@ ans = 1 Depending on the ownership setting of a swig_ref, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.

      -

      27.3.7 C++ inheritance

      +

      26.3.7 C++ inheritance

      @@ -462,7 +462,7 @@ This information contains the full class hierarchy. When an indexing operation ( the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the swig_ref.

      -

      27.3.8 C++ overloaded functions

      +

      26.3.8 C++ overloaded functions

      @@ -472,7 +472,7 @@ The dispatch function selects which overload to call (if any) based on the passe typecheck typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.

      -

      27.3.9 C++ operators

      +

      26.3.9 C++ operators

      @@ -572,7 +572,7 @@ On the C++ side, the default mappings are as follows: %rename(__brace) *::operator[]; -

      27.3.10 Class extension with %extend

      +

      26.3.10 Class extension with %extend

      @@ -602,7 +602,7 @@ octave:3> printf("%s\n",a); octave:4> a.__str() 4 -

      27.3.11 C++ templates

      +

      26.3.11 C++ templates

      @@ -679,14 +679,14 @@ ans = -

      27.3.12 C++ Smart Pointers

      +

      26.3.12 C++ Smart Pointers

      C++ smart pointers are fully supported as in other modules.

      -

      27.3.13 Directors (calling Octave from C++ code)

      +

      26.3.13 Directors (calling Octave from C++ code)

      @@ -766,14 +766,14 @@ c-side routine called octave-side routine called -

      27.3.14 Threads

      +

      26.3.14 Threads

      The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.

      -

      27.3.15 Memory management

      +

      26.3.15 Memory management

      @@ -807,14 +807,14 @@ The %newobject directive may be used to control this behavior for pointers retur In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/subclass()'ing).

      -

      27.3.16 STL support

      +

      26.3.16 STL support

      This is some skeleton support for various STL containers.

      -

      27.3.17 Matrix typemaps

      +

      26.3.17 Matrix typemaps

      diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html index 1dc8e7d2f..b7cdaf0e5 100644 --- a/Doc/Manual/Perl5.html +++ b/Doc/Manual/Perl5.html @@ -6,7 +6,7 @@ -

      28 SWIG and Perl5

      +

      27 SWIG and Perl5

        @@ -87,7 +87,7 @@ later. Earlier versions are problematic and SWIG generated extensions may not compile or run correctly.

        -

        28.1 Overview

        +

        27.1 Overview

        @@ -108,7 +108,7 @@ described. Advanced customization features, typemaps, and other options are found near the end of the chapter.

        -

        28.2 Preliminaries

        +

        27.2 Preliminaries

        @@ -133,7 +133,7 @@ To build the module, you will need to compile the file example_wrap.c and link it with the rest of your program.

        -

        28.2.1 Getting the right header files

        +

        27.2.1 Getting the right header files

        @@ -165,7 +165,7 @@ loaded, an easy way to find out is to run Perl itself.

      -

      28.2.2 Compiling a dynamic module

      +

      27.2.2 Compiling a dynamic module

      @@ -198,7 +198,7 @@ the target should be named `example.so', `example.sl', or the appropriate dynamic module name on your system.

      -

      28.2.3 Building a dynamic module with MakeMaker

      +

      27.2.3 Building a dynamic module with MakeMaker

      @@ -232,7 +232,7 @@ the preferred approach to compilation. More information about MakeMaker can be found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen, and Randal Schwartz.

      -

      28.2.4 Building a static version of Perl

      +

      27.2.4 Building a static version of Perl

      @@ -301,7 +301,7 @@ added to it. Depending on your machine, you may need to link with additional libraries such as -lsocket, -lnsl, -ldl, etc.

      -

      28.2.5 Using the module

      +

      27.2.5 Using the module

      @@ -456,7 +456,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      28.2.6 Compilation problems and compiling with C++

      +

      27.2.6 Compilation problems and compiling with C++

      @@ -599,7 +599,7 @@ have to find the macro that conflicts and add an #undef into the .i file. Pleas any conflicting macros you find to swig-user mailing list.

      -

      28.2.7 Compiling for 64-bit platforms

      +

      27.2.7 Compiling for 64-bit platforms

      @@ -626,7 +626,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

      -

      28.3 Building Perl Extensions under Windows

      +

      27.3 Building Perl Extensions under Windows

      @@ -637,7 +637,7 @@ section assumes you are using SWIG with Microsoft Visual C++ although the procedure may be similar with other compilers.

      -

      28.3.1 Running SWIG from Developer Studio

      +

      27.3.1 Running SWIG from Developer Studio

      @@ -700,7 +700,7 @@ print "$a\n"; -

      28.3.2 Using other compilers

      +

      27.3.2 Using other compilers

      @@ -708,7 +708,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows. For general hints and suggestions refer to the Windows chapter.

      -

      28.4 The low-level interface

      +

      27.4 The low-level interface

      @@ -718,7 +718,7 @@ can be used to control your application. However, it is also used to construct more user-friendly proxy classes as described in the next section.

      -

      28.4.1 Functions

      +

      27.4.1 Functions

      @@ -741,7 +741,7 @@ use example; $a = &example::fact(2); -

      28.4.2 Global variables

      +

      27.4.2 Global variables

      @@ -811,7 +811,7 @@ extern char *path; // Declared later in the input -

      28.4.3 Constants

      +

      27.4.3 Constants

      @@ -838,7 +838,7 @@ $example::FOO = 2; # Error -

      28.4.4 Pointers

      +

      27.4.4 Pointers

      @@ -947,7 +947,7 @@ as XS and xsubpp. Given the advancement of the SWIG typesystem and the SWIG and XS, this is no longer supported.

      -

      28.4.5 Structures

      +

      27.4.5 Structures

      @@ -1081,7 +1081,7 @@ void Bar_f_set(Bar *b, Foo *val) { -

      28.4.6 C++ classes

      +

      27.4.6 C++ classes

      @@ -1146,7 +1146,7 @@ provides direct access to C++ objects. A higher level interface using Perl prox can be built using these low-level accessors. This is described shortly.

      -

      28.4.7 C++ classes and type-checking

      +

      27.4.7 C++ classes and type-checking

      @@ -1182,7 +1182,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece multiple inheritance is used).

      -

      28.4.8 C++ overloaded functions

      +

      27.4.8 C++ overloaded functions

      @@ -1226,7 +1226,7 @@ example::Spam_foo_d($s,3.14); Please refer to the "SWIG Basics" chapter for more information.

      -

      28.4.9 Operators

      +

      27.4.9 Operators

      @@ -1253,7 +1253,7 @@ The following C++ operators are currently supported by the Perl module:

    • operator or
      • -

      28.4.10 Modules and packages

      +

      27.4.10 Modules and packages

      @@ -1348,7 +1348,7 @@ print Foo::fact(4),"\n"; # Call a function in package FooBar --> -

      28.5 Input and output parameters

      +

      27.5 Input and output parameters

      @@ -1567,7 +1567,7 @@ print "$c\n"; Note: The REFERENCE feature is only currently supported for numeric types (integers and floating point).

      -

      28.6 Exception handling

      +

      27.6 Exception handling

      @@ -1732,7 +1732,7 @@ This is still supported, but it is deprecated. The newer %exception di functionality, but it has additional capabilities that make it more powerful.

      -

      28.7 Remapping datatypes with typemaps

      +

      27.7 Remapping datatypes with typemaps

      @@ -1749,7 +1749,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Perl interface.

      -

      28.7.1 A simple typemap example

      +

      27.7.1 A simple typemap example

      @@ -1853,7 +1853,7 @@ example::count("e","Hello World"); -

      28.7.2 Perl5 typemaps

      +

      27.7.2 Perl5 typemaps

      @@ -1958,7 +1958,7 @@ Return of C++ member data (all languages). Check value of input parameter. -

      28.7.3 Typemap variables

      +

      27.7.3 Typemap variables

      @@ -2029,7 +2029,7 @@ properly assigned. The Perl name of the wrapper function being created. -

      28.7.4 Useful functions

      +

      27.7.4 Useful functions

      @@ -2098,7 +2098,7 @@ int sv_isa(SV *, char *0; -

      28.8 Typemap Examples

      +

      27.8 Typemap Examples

      @@ -2107,7 +2107,7 @@ might look at the files "perl5.swg" and "typemaps.i" in the SWIG library.

      -

      28.8.1 Converting a Perl5 array to a char **

      +

      27.8.1 Converting a Perl5 array to a char **

      @@ -2199,7 +2199,7 @@ print @$b,"\n"; # Print it out -

      28.8.2 Return values

      +

      27.8.2 Return values

      @@ -2228,7 +2228,7 @@ can be done using the EXTEND() macro as in : } -

      28.8.3 Returning values from arguments

      +

      27.8.3 Returning values from arguments

      @@ -2282,7 +2282,7 @@ print "multout(7,13) = @r\n"; ($x,$y) = multout(7,13); -

      28.8.4 Accessing array structure members

      +

      27.8.4 Accessing array structure members

      @@ -2345,7 +2345,7 @@ the "in" typemap in the previous section would be used to convert an to copy the converted array into a C data structure.

      -

      28.8.5 Turning Perl references into C pointers

      +

      27.8.5 Turning Perl references into C pointers

      @@ -2410,7 +2410,7 @@ print "$c\n"; -

      28.8.6 Pointer handling

      +

      27.8.6 Pointer handling

      @@ -2489,7 +2489,7 @@ For example: -

      28.9 Proxy classes

      +

      27.9 Proxy classes

      @@ -2505,7 +2505,7 @@ to the underlying code. This section describes the implementation details of the proxy interface.

      -

      28.9.1 Preliminaries

      +

      27.9.1 Preliminaries

      @@ -2527,7 +2527,7 @@ SWIG creates a collection of high-level Perl wrappers. In your scripts, you wil high level wrappers. The wrappers, in turn, interact with the low-level procedural module.

      -

      28.9.2 Structure and class wrappers

      +

      27.9.2 Structure and class wrappers

      @@ -2653,7 +2653,7 @@ $v->DESTROY(); -

      28.9.3 Object Ownership

      +

      27.9.3 Object Ownership

      @@ -2740,7 +2740,7 @@ counting, garbage collection, or advanced features one might find in sophisticated languages.

      -

      28.9.4 Nested Objects

      +

      27.9.4 Nested Objects

      @@ -2793,7 +2793,7 @@ $p->{f}->{x} = 0.0; %${$p->{v}} = ( x=>0, y=>0, z=>0); -

      28.9.5 Proxy Functions

      +

      27.9.5 Proxy Functions

      @@ -2827,7 +2827,7 @@ This function replaces the original function, but operates in an identical manner.

      -

      28.9.6 Inheritance

      +

      27.9.6 Inheritance

      @@ -2903,7 +2903,7 @@ particular, inheritance of data members is extremely tricky (and I'm not even sure if it really works).

      -

      28.9.7 Modifying the proxy methods

      +

      27.9.7 Modifying the proxy methods

      @@ -2931,7 +2931,7 @@ public: }; -

      28.10 Adding additional Perl code

      +

      27.10 Adding additional Perl code

      diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index d56edcb5f..6b654fde5 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -7,13 +7,14 @@ -

      29 SWIG and PHP

      +

      28 SWIG and PHP

      • Generating PHP Extensions
      • Basic PHP interface @@ -42,24 +43,21 @@ Caution: This chapter (and module!) is still under construction

        -

        -SWIG supports generating wrappers for PHP5. Support for PHP4 has been removed -as of SWIG 1.3.37. The PHP developers are no longer making new PHP4 releases, -and won't even be patching critical security issues after 2008-08-08, so it -doesn't make much sense for SWIG to continue to support PHP4 at this point. -If you need to continue to use PHP4, stick with SWIG 1.3.36. -

        -

        In this chapter, we discuss SWIG's support of PHP. The PHP module -was extensively rewritten in release 1.3.26, and support for generating -OO wrappers for PHP5 was added in 1.3.30. The PHP module works fairly -well, but currently does not implement all the +was extensively rewritten in release 1.3.26, and although it is +significantly more functional, it still does not implement all the features available in some of the other languages.

        -In order to use this module, you will need to have a copy of the PHP5 +The examples and test cases have been developed with PHP4. Release +1.3.30 added support for generating PHP5 class wrappers for C++ +libraries. +

        + +

        +In order to use this module, you will need to have a copy of the PHP4 or PHP5 include files to compile the SWIG generated files. If you installed PHP from a binary package, you may need to install a "php-dev" or "php-devel" package for these to be installed. You can find out where these files are @@ -69,7 +67,7 @@ your extension into php directly, you will need the complete PHP source tree available.

        -

        29.1 Generating PHP Extensions

        +

        28.1 Generating PHP Extensions

        @@ -90,7 +88,7 @@ you wish to statically link the extension into the php interpreter. The third file, example.php can be included by PHP scripts. It attempts to dynamically load the extension and contains extra php code specified -in the interface file. If wrapping C++ code with PHP classes, it will +in the interface file. If wrapping C++ code for PHP5, it will also contain PHP5 class wrappers.

        @@ -102,8 +100,7 @@ more detail in section 27.2.6.

        The usual (and recommended) way is to build the extension as a separate -dynamically loaded module (which is supported by all modern operating -systems). You can then specify that this be loaded +dynamically loaded module. You can then specify that this be loaded automatically in php.ini or load it explicitly for any script which needs it.

        @@ -113,16 +110,17 @@ It is also possible to rebuild PHP from source so that your module is statically linked into the php executable/library. This is a lot more work, and also requires a full rebuild of PHP to update your module, and it doesn't play nicely with package system. We don't recommend -this approach, or provide explicit support for it. +this approach, but if you really want to do this, the -phpfull +command line argument to swig may be of use - see below for details.

        -

        29.1.1 Building a loadable extension

        +

        28.1.1 Building a loadable extension

        To build your module as a dynamically loadable extension, use compilation commands like these (if you aren't using GCC, the commands will be different, -and there may be some variation between platforms - these commands should at +and there may be so variation between platforms - these commands should at least work for Linux though):

        @@ -131,7 +129,135 @@ least work for Linux though): gcc -shared example_wrap.o -o example.so
      -

      29.1.2 Using PHP Extensions

      +

      +There is a deprecated -make command line argument to swig which will +generate an additional file makefile which can usually build the +extension (at least on some UNIX platforms), but the Makefile generated isn't +very flexible, and the commands required are trivial so it is simpler to just +add them to your Makefile or other build system directly. We recommend that +you don't use -make and it's likely to be removed at some point. +

      + +

      28.1.2 Building extensions into PHP

      + + +

      +Note that we don't recommend this approach - it's cleaner and simpler to +use dynamically loadable modules, which are supported by all modern OSes. +Support for this may be discontinued entirely in the future. +

      + +

      +It is possible to rebuild PHP itself with your module statically linked +in. To do this, you can use the -phpfull command line option to +swig. Using this option will generate three additional files. The first +extra file, config.m4 contains the m4 and shell code needed to +enable the extension as part of the PHP build process. The second +extra file, Makefile.in contains the information needed to +build the final Makefile after substitutions. The third and final +extra file, CREDITS should contain the credits for the +extension. +

      + +

      +To build with phpize, after you have run swig you will need to run the +'phpize' command (installed as part of php) in the same +directory. This re-creates the php build environment in that +directory. It also creates a configure file which includes the shell +code from the config.m4 that was generated by SWIG, this configure +script will accept a command line argument to enable the extension to +be run (by default the command line argument is --enable-modulename, +however you can edit the config.m4 file before running phpize to +accept --with-modulename. You can also add extra tests in config.m4 to +check that a correct library version is installed or correct header +files are included, etc, but you must edit this file before running +phpize.) You can also get SWIG to generate simple extra tests for +libraries and header files for you. +

      + +
      +	swig -php -phpfull
+
      + +

      +If you depend on source files not generated by SWIG, before generating +the configure file, you may need to edit the Makefile.in +file. This contains the names of the source files to compile (just the +wrapper file by default) and any additional libraries needed to be +linked in. If there are extra C files to compile, you will need to add +them to the Makefile.in, or add the names of libraries if they are +needed. In simple cases SWIG is pretty good at generating a complete +Makefile.in and config.m4 which need no further editing. +

      + +

      +You then run the configure script with the command line argument needed +to enable the extension. Then run make, which builds the extension. +The extension object file will be left in the modules sub directory, you can +move it to wherever it is convenient to call from your php script. +

      + +

      +When using -phpfull, swig also accepts the following +additional optional arguments: +

      +
        +
      • -withincs "<incs>" Adds include files to the config.m4 file. +
      • -withlibs "<libs>" Links with the specified libraries. +
      • -withc "<files>" Compiles and links the additional specified C files. +
      • -withcxx "<files>" Compiles and links the additional specified C++ files. +
      + +

      +After running swig with the -phpfull switch, you will be left with a shockingly +similar set of files to the previous build process. However you will then need +to move these files to a subdirectory within the php source tree, this subdirectory you will need to create under the ext directory, with the name of the extension (e.g. mkdir php-4.0.6/ext/modulename). +

      + +

      +After moving the files into this directory, you will need to run the 'buildall' +script in the php source directory. This rebuilds the configure script +and includes the extra command line arguments from the module you have added. +

      + +

      +Before running the generated configure file, you may need to edit the +Makefile.in. This contains the names of the source files to compile ( +just the wrapper file by default) and any additional libraries needed to +link in. If there are extra C files to compile you will need to add them +to the Makefile, or add the names of libraries if they are needed. +In most cases Makefile.in will be complete, especially if you +make use of -withlibs and -withincs +

      + +
      +	swig -php -phpfull -withlibs "xapian omquery" --withincs "om.h"
+
      + +

      +Will include in the config.m4 and Makefile.in search for +libxapian.a or libxapian.so and search for +libomquery.a or libomquery.so as well as a +search for om.h. +

      + +

      +You then need to run the configure command and pass the necessary command +line arguments to enable your module (by default this is --enable-modulename, +but this can be changed by editing the config.m4 file in the modules directory +before running the buildall script. In addition, extra tests can be added to +the config.m4 file to ensure the correct libraries and header files are +installed.) +

      + +

      +Once configure has completed, you can run make to build php. If this all +compiles correctly, you should end up with a php executable/library +which contains your new module. You can test it with a php script which +does not have the 'dl' command as used above. +

      + +

      28.1.3 Using PHP Extensions

      @@ -162,7 +288,7 @@ attempts to do the dl() call for you: include("example.php"); -

      29.2 Basic PHP interface

      +

      28.2 Basic PHP interface

      @@ -172,7 +298,7 @@ possible for names of symbols in one extension module to clash with other symbols unless care is taken to %rename them.

      -

      29.2.1 Constants

      +

      28.2.1 Constants

      @@ -297,7 +423,7 @@ both point to the same value, without the case test taking place. ( Apologies, this paragraph needs rewriting to make some sense. )

      -

      29.2.2 Global Variables

      +

      28.2.2 Global Variables

      @@ -346,7 +472,7 @@ undefined. At this time SWIG does not support custom accessor methods.

      -

      29.2.3 Functions

      +

      28.2.3 Functions

      @@ -399,7 +525,7 @@ print $s; # The value of $s was not changed. --> -

      29.2.4 Overloading

      +

      28.2.4 Overloading

      @@ -413,7 +539,7 @@ Overloaded Functions and Methods. -

      29.2.5 Pointers and References

      +

      28.2.5 Pointers and References

      @@ -587,13 +713,24 @@ PHP in a number of ways: by using unset on an existing variable, or assigning NULL to a variable.

      -

      29.2.6 Structures and C++ classes

      +

      28.2.6 Structures and C++ classes

      -SWIG defaults to wrapping C++ structs and classes with PHP classes -unless "-noproxy" is specified. For PHP5, a PHP wrapper +SWIG defaults to wrapping C++ structs and classes with PHP classes. This +requires SWIG to generate different code for PHP4 and PHP5, so you must +specify which you want using -php4 or -php5 (currently +-php generates PHP4 class wrappers for compatibility with +SWIG 1.3.29 and earlier, but this may change in the future). +

      + +

      +PHP4 classes are implemented entirely using the Zend C API so +no additional php code is generated. For PHP5, a PHP wrapper class is generated which calls a set of flat functions wrapping the C++ class. +In many cases the PHP4 and PHP5 wrappers will behave the same way, +but the PHP5 ones make use of better PHP5's better OO functionality +where appropriate.

      @@ -617,7 +754,7 @@ struct Complex {

      -Would be used in the following way from PHP5: +Would be used in the following way from either PHP4 or PHP5: 

      @@ -646,7 +783,7 @@ Would be used in the following way from PHP5:
 Member variables and methods are accessed using the -> operator.
 
      
 
-
      29.2.6.1 Using -noproxy
      
+
      28.2.6.1 Using -noproxy
      
 
 
 
      
@@ -672,7 +809,7 @@ Complex_im_set($obj,$d);
 Complex_im_get($obj);
      -

      29.2.6.2 Constructors and Destructors

      +

      28.2.6.2 Constructors and Destructors

      @@ -713,13 +850,13 @@ the programmer can either reassign the variable or call unset($v)

      -

      29.2.6.3 Static Member Variables

      +

      28.2.6.3 Static Member Variables

      -Static member variables in C++ are not wrapped as such in PHP -as it does not appear to be possible to intercept accesses to such variables. -Therefore, static member variables are +Static member variables are not supported in PHP4, and it does not +appear to be possible to intercept accesses to static member variables +in PHP5. Therefore, static member variables are wrapped using a class function with the same name, which returns the current value of the class variable. For example

      @@ -756,7 +893,7 @@ Ko::threats(10); echo "There has now been " . Ko::threats() . " threats\n"; -

      29.2.6.4 Static Member Functions

      +

      28.2.6.4 Static Member Functions

      @@ -778,12 +915,12 @@ Ko::threats(); -

      29.2.7 PHP Pragmas, Startup and Shutdown code

      +

      28.2.7 PHP Pragmas, Startup and Shutdown code

      Note: Currently pragmas for PHP need to be specified using -%pragma(php) but also apply for PHP5! This is just a historical +%pragma(php4) but also apply for PHP5! This is just a historical oddity because SWIG's PHP support predates PHP5.

      @@ -795,7 +932,7 @@ object. 
       %module example
-%pragma(php) code="
+%pragma(php4) code="
 # This code is inserted into example.php
 echo \"example.php execution\\n\";
 "
@@ -817,7 +954,7 @@ the example.php file.
 
 
       %module example
-%pragma(php) code="
+%pragma(php4) code="
 include \"include.php\";
 "
 %pragma(php) include="include.php"   // equivalent.
@@ -831,7 +968,7 @@ phpinfo() function.
 
 
       %module example;
-%pragma(php) phpinfo="
+%pragma(php4) phpinfo="
   zend_printf("An example of PHP support through SWIG\n");
   php_info_print_table_start();
   php_info_print_table_header(2, \"Directive\", \"Value\");
diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html
index a47d07865..3e39d4062 100644
--- a/Doc/Manual/Pike.html
+++ b/Doc/Manual/Pike.html
@@ -6,7 +6,7 @@
 
 
 
-
      30 SWIG and Pike
      
+
      29 SWIG and Pike
      
 
 
      
 
        
@@ -46,10 +46,10 @@ least, make sure you read the "SWIG Basics"
 chapter.
        
 
        
 
-
        30.1 Preliminaries
        
+
        29.1 Preliminaries
        
 
 
-
        30.1.1 Running SWIG
        
+
        29.1.1 Running SWIG
        
 
 
 
        
@@ -94,7 +94,7 @@ can use the -o option:
 
        
   
        $ swig -pike -o pseudonym.c example.i
        
 
        
-
        30.1.2 Getting the right header files
        
+
        29.1.2 Getting the right header files
        
 
 
 
        
@@ -114,7 +114,7 @@ You're looking for files with the names global.h, program.h
 and so on.
 
        
 
-
        30.1.3 Using your module
        
+
        29.1.3 Using your module
        
 
 
 
        
@@ -129,10 +129,10 @@ Pike v7.4 release 10 running Hilfe v3.5 (Incremental Pike Frontend)
 (1) Result: 24
 
      
 
-
      30.2 Basic C/C++ Mapping
      
+
      29.2 Basic C/C++ Mapping
      
 
 
-
      30.2.1 Modules
      
+
      29.2.1 Modules
      
 
 
 
      
@@ -143,7 +143,7 @@ concerned), SWIG's %module directive doesn't really have any
 significance.
 
      
 
-
      30.2.2 Functions
      
+
      29.2.2 Functions
      
 
 
 
      
@@ -168,7 +168,7 @@ exactly as you'd expect it to:
 (1) Result: 24
 
      
 
-
      30.2.3 Global variables
      
+
      29.2.3 Global variables
      
 
 
 
      
@@ -197,7 +197,7 @@ will result in two functions, Foo_get() and Foo_set():
 (3) Result: 3.141590
      -

      30.2.4 Constants and enumerated types

      +

      29.2.4 Constants and enumerated types

      @@ -205,7 +205,7 @@ Enumerated types in C/C++ declarations are wrapped as Pike constants, not as Pike enums.

      -

      30.2.5 Constructors and Destructors

      +

      29.2.5 Constructors and Destructors

      @@ -213,7 +213,7 @@ Constructors are wrapped as create() methods, and destructors are wrapped as destroy() methods, for Pike classes.

      -

      30.2.6 Static Members

      +

      29.2.6 Static Members

      diff --git a/Doc/Manual/Preprocessor.html b/Doc/Manual/Preprocessor.html index 5afa59243..a454c8124 100644 --- a/Doc/Manual/Preprocessor.html +++ b/Doc/Manual/Preprocessor.html @@ -81,7 +81,7 @@ Such information generally includes type declarations (e.g., typedef) a C++ classes that might be used as base-classes for class declarations in the interface. The use of %import is also important when SWIG is used to generate extensions as a collection of related modules. This is an advanced topic and is described -in later in the Working with Modules chapter. +in a later chapter.

      @@ -107,10 +107,7 @@ SWIGWIN Defined when running SWIG under Windows SWIG_VERSION Hexadecimal number containing SWIG version, such as 0x010311 (corresponding to SWIG-1.3.11). -SWIGALLEGROCL Defined when using Allegro CL -SWIGCFFI Defined when using CFFI SWIGCHICKEN Defined when using CHICKEN -SWIGCLISP Defined when using CLISP SWIGCSHARP Defined when using C# SWIGGUILE Defined when using Guile SWIGJAVA Defined when using Java @@ -118,15 +115,17 @@ SWIGLUA Defined when using Lua SWIGMODULA3 Defined when using Modula-3 SWIGMZSCHEME Defined when using Mzscheme SWIGOCAML Defined when using Ocaml -SWIGOCTAVE Defined when using Octave SWIGPERL Defined when using Perl +SWIGPERL5 Defined when using Perl5 SWIGPHP Defined when using PHP +SWIGPHP4 Defined when using PHP4 +SWIGPHP5 Defined when using PHP5 SWIGPIKE Defined when using Pike SWIGPYTHON Defined when using Python -SWIGR Defined when using R SWIGRUBY Defined when using Ruby SWIGSEXP Defined when using S-expressions SWIGTCL Defined when using Tcl +SWIGTCL8 Defined when using Tcl8.0 SWIGXML Defined when using XML diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html index f4867b69d..62b72fabf 100644 --- a/Doc/Manual/Python.html +++ b/Doc/Manual/Python.html @@ -6,7 +6,7 @@ -

      31 SWIG and Python

      +

      30 SWIG and Python

      -
    • Cross language polymorphism +
    • Cross language polymorphism
    • Python Packages -
    • Python 3 Support -
      • @@ -119,9 +113,9 @@

      This chapter describes SWIG's support of Python. SWIG is compatible -with most recent Python versions including Python 3.0 and Python 2.6, -as well as older versions dating back to Python 2.0. For the best results, -consider using Python 2.3 or newer. +with most recent Python versions including Python 2.2 as well as older +versions dating back to Python 1.5.2. For the best results, consider using Python +2.0 or newer.

      @@ -131,7 +125,7 @@ very least, make sure you read the "SWIG Basics" chapter.

      -

      31.1 Overview

      +

      30.1 Overview

      @@ -158,10 +152,10 @@ described followed by a discussion of low-level implementation details.

      -

      31.2 Preliminaries

      +

      30.2 Preliminaries

      -

      31.2.1 Running SWIG

      +

      30.2.1 Running SWIG

      @@ -259,7 +253,7 @@ The following sections have further practical examples and details on how you might go about compiling and using the generated files.

      -

      31.2.2 Using distutils

      +

      30.2.2 Using distutils

      @@ -351,7 +345,7 @@ This same approach works on all platforms if the appropriate compiler is install can even build extensions to the standard Windows Python using MingGW)

      -

      31.2.3 Hand compiling a dynamic module

      +

      30.2.3 Hand compiling a dynamic module

      @@ -399,7 +393,7 @@ module actually consists of two files; socket.py and

      -

      31.2.4 Static linking

      +

      30.2.4 Static linking

      @@ -478,7 +472,7 @@ If using static linking, you might want to rely on a different approach (perhaps using distutils).

      -

      31.2.5 Using your module

      +

      30.2.5 Using your module

      @@ -635,7 +629,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      31.2.6 Compilation of C++ extensions

      +

      30.2.6 Compilation of C++ extensions

      @@ -734,7 +728,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

      -

      31.2.7 Compiling for 64-bit platforms

      +

      30.2.7 Compiling for 64-bit platforms

      @@ -771,7 +765,7 @@ and -m64 allow you to choose the desired binary format for your python extension.

      -

      31.2.8 Building Python Extensions under Windows

      +

      30.2.8 Building Python Extensions under Windows

      @@ -880,7 +874,7 @@ SWIG Wiki.

      -

      31.3 A tour of basic C/C++ wrapping

      +

      30.3 A tour of basic C/C++ wrapping

      @@ -889,7 +883,7 @@ to your C/C++ code. Functions are wrapped as functions, classes are wrapped as This section briefly covers the essential aspects of this wrapping.

      -

      31.3.1 Modules

      +

      30.3.1 Modules

      @@ -902,7 +896,7 @@ module name, make sure you don't use the same name as a built-in Python command or standard module name.

      -

      31.3.2 Functions

      +

      30.3.2 Functions

      @@ -926,7 +920,7 @@ like you think it does: >>> -

      31.3.3 Global variables

      +

      30.3.3 Global variables

      @@ -1064,7 +1058,7 @@ that starts with a leading underscore. SWIG does not create cvar if there are no global variables in a module.

      -

      31.3.4 Constants and enums

      +

      30.3.4 Constants and enums

      @@ -1104,7 +1098,7 @@ other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

      -

      31.3.5 Pointers

      +

      30.3.5 Pointers

      @@ -1245,7 +1239,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      31.3.6 Structures

      +

      30.3.6 Structures

      @@ -1434,7 +1428,7 @@ everything works just like you would expect. For example: -

      31.3.7 C++ classes

      +

      30.3.7 C++ classes

      @@ -1523,7 +1517,7 @@ they are accessed through cvar like this: -

      31.3.8 C++ inheritance

      +

      30.3.8 C++ inheritance

      @@ -1578,7 +1572,7 @@ then the function spam() accepts Foo * or a pointer to any cla It is safe to use multiple inheritance with SWIG.

      -

      31.3.9 Pointers, references, values, and arrays

      +

      30.3.9 Pointers, references, values, and arrays

      @@ -1639,7 +1633,7 @@ treated as a returning value, and it will follow the same allocation/deallocation process.

      -

      31.3.10 C++ overloaded functions

      +

      30.3.10 C++ overloaded functions

      @@ -1762,7 +1756,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      31.3.11 C++ operators

      +

      30.3.11 C++ operators

      @@ -1851,7 +1845,7 @@ Also, be aware that certain operators don't map cleanly to Python. For instance overloaded assignment operators don't map to Python semantics and will be ignored.

      -

      31.3.12 C++ namespaces

      +

      30.3.12 C++ namespaces

      @@ -1918,7 +1912,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      31.3.13 C++ templates

      +

      30.3.13 C++ templates

      @@ -1972,7 +1966,7 @@ Some more complicated examples will appear later.

      -

      31.3.14 C++ Smart Pointers

      +

      30.3.14 C++ Smart Pointers

      @@ -2057,7 +2051,7 @@ simply use the __deref__() method. For example: -

      31.3.15 C++ Reference Counted Objects (ref/unref)

      +

      30.3.15 C++ Reference Counted Objects (ref/unref)

      @@ -2219,7 +2213,7 @@ python releases the proxy instance.

      -

      31.4 Further details on the Python class interface

      +

      30.4 Further details on the Python class interface

      @@ -2232,7 +2226,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      31.4.1 Proxy classes

      +

      30.4.1 Proxy classes

      @@ -2321,7 +2315,7 @@ you can attach new Python methods to the class and you can even inherit from it by Python built-in types until Python 2.2).

      -

      31.4.2 Memory management

      +

      30.4.2 Memory management

      @@ -2513,7 +2507,7 @@ It is also possible to deal with situations like this using typemaps--an advanced topic discussed later.

      -

      31.4.3 Python 2.2 and classic classes

      +

      30.4.3 Python 2.2 and classic classes

      @@ -2550,7 +2544,7 @@ class itself. In Python-2.1 and earlier, they have to be accessed as a global function or through an instance (see the earlier section).

      -

      31.5 Cross language polymorphism

      +

      30.5 Cross language polymorphism

      @@ -2584,7 +2578,7 @@ proxy classes, director classes, and C wrapper functions takes care of all the cross-language method routing transparently.

      -

      31.5.1 Enabling directors

      +

      30.5.1 Enabling directors

      @@ -2677,7 +2671,7 @@ class MyFoo(mymodule.Foo): -

      31.5.2 Director classes

      +

      30.5.2 Director classes

      @@ -2759,7 +2753,7 @@ so there is no need for the extra overhead involved with routing the calls through Python.

      -

      31.5.3 Ownership and object destruction

      +

      30.5.3 Ownership and object destruction

      @@ -2826,7 +2820,7 @@ deleting all the Foo pointers it contains at some point. Note that no hard references to the Foo objects remain in Python.

      -

      31.5.4 Exception unrolling

      +

      30.5.4 Exception unrolling

      @@ -2885,7 +2879,7 @@ Swig::DirectorMethodException is thrown, Python will register the exception as soon as the C wrapper function returns.

      -

      31.5.5 Overhead and code bloat

      +

      30.5.5 Overhead and code bloat

      @@ -2919,7 +2913,7 @@ directive) for only those methods that are likely to be extended in Python.

      -

      31.5.6 Typemaps

      +

      30.5.6 Typemaps

      @@ -2933,7 +2927,7 @@ need to be supported.

      -

      31.5.7 Miscellaneous

      +

      30.5.7 Miscellaneous

      @@ -2980,7 +2974,7 @@ methods that return const references.

      -

      31.6 Common customization features

      +

      30.6 Common customization features

      @@ -2993,7 +2987,7 @@ This section describes some common SWIG features that are used to improve your the interface to an extension module.

      -

      31.6.1 C/C++ helper functions

      +

      30.6.1 C/C++ helper functions

      @@ -3074,7 +3068,7 @@ hard to implement. It is possible to clean this up using Python code, typemaps, customization features as covered in later sections.

      -

      31.6.2 Adding additional Python code

      +

      30.6.2 Adding additional Python code

      @@ -3223,7 +3217,7 @@ public: -

      31.6.3 Class extension with %extend

      +

      30.6.3 Class extension with %extend

      @@ -3312,7 +3306,7 @@ Vector(12,14,16) in any way---the extensions only show up in the Python interface.

      -

      31.6.4 Exception handling with %exception

      +

      30.6.4 Exception handling with %exception

      @@ -3438,7 +3432,7 @@ The language-independent exception.i library file can also be used to raise exceptions. See the SWIG Library chapter.

      -

      31.7 Tips and techniques

      +

      30.7 Tips and techniques

      @@ -3448,7 +3442,7 @@ strings, binary data, and arrays. This chapter discusses the common techniques solving these problems.

      -

      31.7.1 Input and output parameters

      +

      30.7.1 Input and output parameters

      @@ -3661,7 +3655,7 @@ void foo(Bar *OUTPUT); may not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

      -

      31.7.2 Simple pointers

      +

      30.7.2 Simple pointers

      @@ -3730,7 +3724,7 @@ If you replace %pointer_functions() by %pointer_class(type,name)SWIG Library chapter for further details.

      -

      31.7.3 Unbounded C Arrays

      +

      30.7.3 Unbounded C Arrays

      @@ -3792,7 +3786,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

      -

      31.7.4 String handling

      +

      30.7.4 String handling

      @@ -3861,16 +3855,16 @@ If you need to return binary data, you might use the also be used to extra binary data from arbitrary pointers.

      -

      31.7.5 Arrays

      +

      30.7.5 Arrays

      -

      31.7.6 String arrays

      +

      30.7.6 String arrays

      -

      31.7.7 STL wrappers

      +

      30.7.7 STL wrappers

      -

      31.8 Typemaps

      +

      30.8 Typemaps

      @@ -3887,7 +3881,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Python interface or if you want to elevate your guru status.

      -

      31.8.1 What is a typemap?

      +

      30.8.1 What is a typemap?

      @@ -4003,7 +3997,7 @@ parameter is omitted): -

      31.8.2 Python typemaps

      +

      30.8.2 Python typemaps

      @@ -4044,7 +4038,7 @@ a look at the SWIG library version 1.3.20 or so.

      -

      31.8.3 Typemap variables

      +

      30.8.3 Typemap variables

      @@ -4115,7 +4109,7 @@ properly assigned. The Python name of the wrapper function being created. -

      31.8.4 Useful Python Functions

      +

      30.8.4 Useful Python Functions

      @@ -4243,7 +4237,7 @@ write me -

      31.9 Typemap Examples

      +

      30.9 Typemap Examples

      @@ -4252,7 +4246,7 @@ might look at the files "python.swg" and "typemaps.i" in the SWIG library.

      -

      31.9.1 Converting Python list to a char **

      +

      30.9.1 Converting Python list to a char **

      @@ -4332,7 +4326,7 @@ memory allocation is used to allocate memory for the array, the the C function.

      -

      31.9.2 Expanding a Python object into multiple arguments

      +

      30.9.2 Expanding a Python object into multiple arguments

      @@ -4411,7 +4405,7 @@ to supply the argument count. This is automatically set by the typemap code. F -

      31.9.3 Using typemaps to return arguments

      +

      30.9.3 Using typemaps to return arguments

      @@ -4500,7 +4494,7 @@ function can now be used as follows: >>> -

      31.9.4 Mapping Python tuples into small arrays

      +

      30.9.4 Mapping Python tuples into small arrays

      @@ -4549,7 +4543,7 @@ array, such an approach would not be recommended for huge arrays, but for small structures, this approach works fine.

      -

      31.9.5 Mapping sequences to C arrays

      +

      30.9.5 Mapping sequences to C arrays

      @@ -4638,7 +4632,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) { -

      31.9.6 Pointer handling

      +

      30.9.6 Pointer handling

      @@ -4735,7 +4729,7 @@ class object (if applicable). -

      31.10 Docstring Features

      +

      30.10 Docstring Features

      @@ -4763,7 +4757,7 @@ of your users much simpler.

      -

      31.10.1 Module docstring

      +

      30.10.1 Module docstring

      @@ -4797,7 +4791,7 @@ layout of controls on a panel, etc. to be loaded from an XML file." -

      31.10.2 %feature("autodoc")

      +

      30.10.2 %feature("autodoc")

      @@ -4824,7 +4818,7 @@ names, default values if any, and return type if any. There are also three options for autodoc controlled by the value given to the feature, described below. -

      31.10.2.1 %feature("autodoc", "0")

      +

      30.10.2.1 %feature("autodoc", "0")

      @@ -4853,7 +4847,7 @@ def function_name(*args, **kwargs): -

      31.10.2.2 %feature("autodoc", "1")

      +

      30.10.2.2 %feature("autodoc", "1")

      @@ -4878,7 +4872,7 @@ def function_name(*args, **kwargs): -

      31.10.2.3 %feature("autodoc", "docstring")

      +

      30.10.2.3 %feature("autodoc", "docstring")

      @@ -4897,7 +4891,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT); -

      31.10.3 %feature("docstring")

      +

      30.10.3 %feature("docstring")

      @@ -4929,13 +4923,13 @@ with more than one line. -

      31.11 Python Packages

      +

      30.11 Python Packages

      Using the package option of the %module directive allows you to specify what Python package that the module will be -living in when installed. +living in when installed.

      @@ -4956,256 +4950,6 @@ and also in base class declarations, etc. if the package name is different than its own.

      -

      31.12 Python 3 Support

      - - -

      -SWIG is able to support Python 3.0. The wrapper code generated by -SWIG can be compiled with both Python 2.x or 3.0. Further more, by -passing the -py3 command line option to SWIG, wrapper code -with some Python 3 specific features can be generated (see below -subsections for details of these features). The -py3 option also -disables some incompatible features for Python 3, such as --classic. - -

      -There is a list of known-to-be-broken features in Python 3: -

      -
        -
      • No more support for FILE* typemaps, because PyFile_AsFile has been dropped - in Python 3.
        • -
      • The -apply command line option is removed and generating - code using apply() is no longer supported.
        • -
      - -

      -The following are Python 3.0 new features that are currently supported by -SWIG. -

      - -

      31.12.1 Function annotation

      - - -

      -The -py3 option will enable function annotation support. When used -SWIG is able to generate proxy method definitions like this: -

      - -
      -  def foo(self, bar : "int" = 0) -> "void" : ...
-
      - -

      -Also, even if without passing SWIG the -py3 option, the parameter list -still could be generated: -

      - -
      -  def foo(self, bar = 0): ...
-
      - -

      -But for overloaded function or method, the parameter list would fallback to -*args or self, *args, and **kwargs may be append -depend on whether you enabled the keyword argument. This fallback is due to -all overloaded functions share the same function in SWIG generated proxy class. -

      - -

      -For detailed usage of function annotation, see PEP 3107. -

      - -

      31.12.2 Buffer interface

      - - -

      -Buffer protocols were revised in Python 3. SWIG also gains a series of -new typemaps to support buffer interfaces. These typemap macros are -defined in pybuffer.i, which must be included in order to use them. -By using these typemaps, your wrapped function will be able to -accept any Python object that exposes a suitable buffer interface. -

      - -

      -For example, the get_path() function puts the path string -into the memory pointed to by its argument: -

      - -
      -void get_path(char *s);
-
      - -

      -Then you can write a typemap like this: (the following example is -applied to both Python 3.0 and 2.6, since the bytearray type -is backported to 2.6. -

      - - -
      -%include <pybuffer.i>
-%pybuffer_mutable_string(char *str);
-void get_path(char *s);
-
      - -

      -And then on the Python side the wrapped get_path could be used in this -way: -

      - -
      ->>> p = bytearray(10)
->>> get_path(p)
->>> print(p)
-bytearray(b'/Foo/Bar/\x00')
-
      - -

      -The macros defined in pybuffer.i are similar to those in -cstring.i: -

      - -

      -%pybuffer_mutable_binary(parm, size_parm) -

      - -
      - -

      -The macro can be used to generate a typemap which maps a buffer of an -object to a pointer provided by parm and a size argument -provided by size_parm. For example: -

      - -
      -%pybuffer_mutable_binary(char *str, size_t size);
-...
-int snprintf(char *str, size_t size, const char *format, ...);
-
      - -

      -In Python: -

      - -
      ->>> buf = bytearray(6)
->>> snprintf(buf, "Hello world!")
->>> print(buf)
-bytearray(b'Hello\x00')
->>> 
-
      - -
      - -

      -%pybuffer_mutable_string(parm) -

      - -
      - -

      -This typemap macro requires the buffer to be a zero terminated string, -and maps the pointer of the buffer to parm. For example: -

      - -
      -%pybuffer_mutable_string(char *str);
-...
-size_t make_upper(char *str);
-
      - -

      -In Python: -

      - -
      ->>> buf = bytearray(b'foo\x00')
->>> make_upper(buf)
->>> print(buf)
-bytearray(b'FOO\x00')
->>>
-
      - -

      -Both %pybuffer_mutable_binary and %pybuffer_mutable_string -require the provided buffer to be mutable, eg. they can accept a -bytearray type but can't accept an immutable byte -type. -

      - -
      - -

      -%pybuffer_binary(parm, size_parm) -

      - -
      - -

      -This macro maps an object's buffer to a pointer parm and a -size size_parm. It is similar to -%pybuffer_mutable_binary, except the -%pybuffer_binary an accept both mutable and immutable -buffers. As a result, the wrapped function should not modify the buffer. -

      - -
      - -

      -%pybuffer_string(parm) -

      - -
      - -

      -This macro maps an object's buffer as a string pointer parm. -It is similar to %pybuffer_mutable_string but the buffer -could be both mutable and immutable. And your function should not -modify the buffer. -

      - -
      - - -

      31.12.3 Abstract base classes

      - - -

      -By including pyabc.i and using the -py3 command -line option when calling SWIG, the proxy classes of the STL containers -will automatically gain an appropriate abstract base class. For -example, the following SWIG interface: -

      - -
      -%include <pyabc.i>
-%include <std_map.i>
-%include <std_list.i>
-
-namespace std {
-  %template(Mapii) map<int, int>;
-  %template(IntList) list<int>;
-}
-
      - -

      -will generate a Python proxy class Mapii inheriting from -collections.MutableMap and a proxy class IntList -inheriting from collections.MutableSequence. -

      - -

      -pyabc.i also provides a macro %pythonabc that could be -used to define an abstract base class for your own C++ class: -

      - -
      -%pythonabc(MySet, collections.MutableSet);
-
      - -

      -For details of abstract base class, please see PEP 3119. -

      diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html index 0ed43fc52..3b37d53a0 100644 --- a/Doc/Manual/R.html +++ b/Doc/Manual/R.html @@ -6,7 +6,7 @@ -

      34 SWIG and R

      +

      33 SWIG and R

        @@ -33,7 +33,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux with gcc. The R bindings also work on Microsoft Windows using Visual C++.

        -

        34.1 Bugs

        +

        33.1 Bugs

        @@ -45,7 +45,7 @@ Currently the following features are not implemented or broken:

      • C Array wrappings
      -

      34.2 Using R and SWIG

      +

      33.2 Using R and SWIG

      @@ -99,7 +99,7 @@ Without it, inheritance of wrapped objects may fail. These two files can be loaded in any order

      -

      34.3 Precompiling large R files

      +

      33.3 Precompiling large R files

      In cases where the R file is large, one make save a lot of loading @@ -117,7 +117,7 @@ will save a large amount of loading time. -

      34.4 General policy

      +

      33.4 General policy

      @@ -126,7 +126,7 @@ wrapping over the underlying functions and rely on the R type system to provide R syntax.

      -

      34.5 Language conventions

      +

      33.5 Language conventions

      @@ -135,7 +135,7 @@ and [ are overloaded to allow for R syntax (one based indices and slices)

      -

      34.6 C++ classes

      +

      33.6 C++ classes

      @@ -147,7 +147,7 @@ keep track of the pointer object which removes the necessity for a lot of the proxy class baggage you see in other languages.

      -

      34.7 Enumerations

      +

      33.7 Enumerations

      diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html index 2070db0c0..9cd83d494 100644 --- a/Doc/Manual/Ruby.html +++ b/Doc/Manual/Ruby.html @@ -26,7 +26,7 @@ -

      32 SWIG and Ruby

      +

      31 SWIG and Ruby

        @@ -167,7 +167,7 @@ -

        32.1 Preliminaries

        +

        31.1 Preliminaries

        SWIG 1.3 is known to work with Ruby versions 1.6 and later. @@ -190,7 +190,7 @@ of Ruby.

        -

        32.1.1 Running SWIG

        +

        31.1.1 Running SWIG

        To build a Ruby module, run SWIG using the -ruby @@ -244,7 +244,7 @@ to compile this file and link it with the rest of your program.

        -

        32.1.2 Getting the right header files

        +

        31.1.2 Getting the right header files

        In order to compile the wrapper code, the compiler needs the ruby.h @@ -288,7 +288,7 @@ installed, you can run Ruby to find out. For example:

        -

        32.1.3 Compiling a dynamic module

        +

        31.1.3 Compiling a dynamic module

        Ruby extension modules are typically compiled into shared @@ -443,7 +443,7 @@ manual pages for your compiler and linker to determine the correct set of options. You might also check the SWIG Wiki for additional information.

        -

        32.1.4 Using your module

        +

        31.1.4 Using your module

        Ruby module names must be capitalized, @@ -498,7 +498,7 @@ begins with:

        -

        32.1.5 Static linking

        +

        31.1.5 Static linking

        An alternative approach to dynamic linking is to rebuild the @@ -519,7 +519,7 @@ finally rebuilding Ruby.

        -

        32.1.6 Compilation of C++ extensions

        +

        31.1.6 Compilation of C++ extensions

        On most machines, C++ extension modules should be linked @@ -571,7 +571,7 @@ extension, e.g.

        -

        32.2 Building Ruby Extensions under Windows 95/NT

        +

        31.2 Building Ruby Extensions under Windows 95/NT

        Building a SWIG extension to Ruby under Windows 95/NT is @@ -610,7 +610,7 @@ files.

        -

        32.2.1 Running SWIG from Developer Studio

        +

        31.2.1 Running SWIG from Developer Studio

        If you are developing your application within Microsoft @@ -752,7 +752,7 @@ directory, then run the Ruby script from the DOS/Command prompt:

        -

        32.3 The Ruby-to-C/C++ Mapping

        +

        31.3 The Ruby-to-C/C++ Mapping

        This section describes the basics of how SWIG maps C or C++ @@ -762,7 +762,7 @@ declarations in your SWIG interface files to Ruby constructs.

        -

        32.3.1 Modules

        +

        31.3.1 Modules

        The SWIG %module directive specifies @@ -931,7 +931,7 @@ Ruby's built-in names.

        -

        32.3.2 Functions

        +

        31.3.2 Functions

        Global functions are wrapped as Ruby module methods. For @@ -994,7 +994,7 @@ module that can be used like so:

        -

        32.3.3 Variable Linking

        +

        31.3.3 Variable Linking

        C/C++ global variables are wrapped as a pair of singleton @@ -1094,7 +1094,7 @@ effect until it is explicitly disabled using %mutable. -

        32.3.4 Constants

        +

        31.3.4 Constants

        C/C++ constants are wrapped as module constants initialized @@ -1138,7 +1138,7 @@ constant values, e.g.

        -

        32.3.5 Pointers

        +

        31.3.5 Pointers

        "Opaque" pointers to arbitrary C/C++ types (i.e. types that @@ -1190,7 +1190,7 @@ the Ruby nil object.

        -

        32.3.6 Structures

        +

        31.3.6 Structures

        C/C++ structs are wrapped as Ruby classes, with accessor @@ -1365,7 +1365,7 @@ pointers. For example,

        -

        32.3.7 C++ classes

        +

        31.3.7 C++ classes

        Like structs, C++ classes are wrapped by creating a new Ruby @@ -1451,7 +1451,7 @@ class. -

        32.3.8 C++ Inheritance

        +

        31.3.8 C++ Inheritance

        The SWIG type-checker is fully aware of C++ inheritance. @@ -1682,7 +1682,7 @@ Typing").

        -

        32.3.9 C++ Overloaded Functions

        +

        31.3.9 C++ Overloaded Functions

        C++ overloaded functions, methods, and constructors are @@ -1878,7 +1878,7 @@ and C++" chapter for more information about overloading.

        -

        32.3.10 C++ Operators

        +

        31.3.10 C++ Operators

        For the most part, overloaded operators are handled @@ -1959,7 +1959,7 @@ on operator overloading.

        -

        32.3.11 C++ namespaces

        +

        31.3.11 C++ namespaces

        SWIG is aware of C++ namespaces, but namespace names do not @@ -2035,7 +2035,7 @@ identical symbol names, well, then you get what you deserve.

        -

        32.3.12 C++ templates

        +

        31.3.12 C++ templates

        C++ templates don't present a huge problem for SWIG. However, @@ -2079,7 +2079,7 @@ directive. For example:

        -

        32.3.13 C++ Standard Template Library (STL)

        +

        31.3.13 C++ Standard Template Library (STL)

        On a related note, the standard SWIG library contains a @@ -2332,7 +2332,7 @@ chapter.

        -

        32.3.14 C++ STL Functors

        +

        31.3.14 C++ STL Functors

        Some containers in the STL allow you to modify their default @@ -2532,7 +2532,7 @@ b
        -

        32.3.15 C++ STL Iterators

        +

        31.3.15 C++ STL Iterators

        The STL is well known for the use of iterators.  There @@ -2743,7 +2743,7 @@ i
        -

        32.3.16 C++ Smart Pointers

        +

        31.3.16 C++ Smart Pointers

        In certain C++ programs, it is common to use classes that @@ -2868,7 +2868,7 @@ method. For example:

        -

        32.3.17 Cross-Language Polymorphism

        +

        31.3.17 Cross-Language Polymorphism

        SWIG's Ruby module supports cross-language polymorphism @@ -2881,7 +2881,7 @@ using this feature with Ruby.

        -

        32.3.17.1 Exception Unrolling

        +

        31.3.17.1 Exception Unrolling

        Whenever a C++ director class routes one of its virtual @@ -2919,7 +2919,7 @@ caught here and a C++ exception is raised in its place.

        -

        32.4 Naming

        +

        31.4 Naming

        Ruby has several common naming conventions. Constants are @@ -3015,7 +3015,7 @@ planned to become the default option in future releases.

        -

        32.4.1 Defining Aliases

        +

        31.4.1 Defining Aliases

        It's a fairly common practice in the Ruby built-ins and @@ -3107,7 +3107,7 @@ Features") for more details).

        -

        32.4.2 Predicate Methods

        +

        31.4.2 Predicate Methods

        Ruby methods that return a boolean value and end in a @@ -3196,7 +3196,7 @@ Features") for more details).

        -

        32.4.3 Bang Methods

        +

        31.4.3 Bang Methods

        Ruby methods that modify an object in-place and end in an @@ -3260,7 +3260,7 @@ Features") for more details).

        -

        32.4.4 Getters and Setters

        +

        31.4.4 Getters and Setters

        Often times a C++ library will expose properties through @@ -3330,7 +3330,7 @@ methods to be exposed in Ruby as value and value=. -

        32.5 Input and output parameters

        +

        31.5 Input and output parameters

        A common problem in some C programs is handling parameters @@ -3581,10 +3581,10 @@ of %apply

        -

        32.6 Exception handling

        +

        31.6 Exception handling

        -

        32.6.1 Using the %exception directive

        +

        31.6.1 Using the %exception directive

        The SWIG %exception directive can be @@ -3679,7 +3679,7 @@ Features for more examples.

        -

        32.6.2 Handling Ruby Blocks

        +

        31.6.2 Handling Ruby Blocks

        One of the highlights of Ruby and most of its standard library @@ -3860,7 +3860,7 @@ RUBY_YIELD_SELF );

        For more information on typemaps, see Typemaps.

        -

        32.6.3 Raising exceptions

        +

        31.6.3 Raising exceptions

        There are three ways to raise exceptions from C++ code to @@ -4621,7 +4621,7 @@ the built-in Ruby exception types.

        -

        32.6.4 Exception classes

        +

        31.6.4 Exception classes

        Starting with SWIG 1.3.28, the Ruby module supports the %exceptionclass @@ -4679,7 +4679,7 @@ providing for a more natural integration between C++ code and Ruby code.

        -

        32.7 Typemaps

        +

        31.7 Typemaps

        This section describes how you can modify SWIG's default @@ -4702,7 +4702,7 @@ of the primitive C-Ruby interface.

        -

        32.7.1 What is a typemap?

        +

        31.7.1 What is a typemap?

        A typemap is nothing more than a code generation rule that is @@ -4964,7 +4964,7 @@ to be used as follows (notice how the length parameter is omitted):

        -

        32.7.2 Typemap scope

        +

        31.7.2 Typemap scope

        Once defined, a typemap remains in effect for all of the @@ -5012,7 +5012,7 @@ where the class itself is defined. For example:

        -

        32.7.3 Copying a typemap

        +

        31.7.3 Copying a typemap

        A typemap is copied by using assignment. For example:

        @@ -5114,7 +5114,7 @@ rules as for -

        32.7.4 Deleting a typemap

        +

        31.7.4 Deleting a typemap

        A typemap can be deleted by simply defining no code. For @@ -5166,7 +5166,7 @@ typemaps immediately after the clear operation.

        -

        32.7.5 Placement of typemaps

        +

        31.7.5 Placement of typemaps

        Typemap declarations can be declared in the global scope, @@ -5250,7 +5250,7 @@ string -

        32.7.6 Ruby typemaps

        +

        31.7.6 Ruby typemaps

        The following list details all of the typemap methods that @@ -5260,7 +5260,7 @@ can be used by the Ruby module:

        -

        32.7.6.1  "in" typemap

        +

        31.7.6.1  "in" typemap

        Converts Ruby objects to input @@ -5503,7 +5503,7 @@ arguments to be specified. For example:

        -

        32.7.6.2 "typecheck" typemap

        +

        31.7.6.2 "typecheck" typemap

        The "typecheck" typemap is used to support overloaded @@ -5544,7 +5544,7 @@ on "Typemaps and Overloading."

        -

        32.7.6.3  "out" typemap

        +

        31.7.6.3  "out" typemap

        Converts return value of a C function @@ -5776,7 +5776,7 @@ version of the C datatype matched by the typemap. -

        32.7.6.4 "arginit" typemap

        +

        31.7.6.4 "arginit" typemap

        The "arginit" typemap is used to set the initial value of a @@ -5801,7 +5801,7 @@ applications. For example:

        -

        32.7.6.5 "default" typemap

        +

        31.7.6.5 "default" typemap

        The "default" typemap is used to turn an argument into a @@ -5843,7 +5843,7 @@ default argument wrapping.

        -

        32.7.6.6 "check" typemap

        +

        31.7.6.6 "check" typemap

        The "check" typemap is used to supply value checking code @@ -5867,7 +5867,7 @@ arguments have been converted. For example:

        -

        32.7.6.7 "argout" typemap

        +

        31.7.6.7 "argout" typemap

        The "argout" typemap is used to return values from arguments. @@ -6025,7 +6025,7 @@ some function like SWIG_Ruby_AppendOutput.

        -

        32.7.6.8 "freearg" typemap

        +

        31.7.6.8 "freearg" typemap

        The "freearg" typemap is used to cleanup argument data. It is @@ -6061,7 +6061,7 @@ abort prematurely.

        -

        32.7.6.9 "newfree" typemap

        +

        31.7.6.9 "newfree" typemap

        The "newfree" typemap is used in conjunction with the %newobject @@ -6092,7 +6092,7 @@ ownership and %newobject for further details.

        -

        32.7.6.10 "memberin" typemap

        +

        31.7.6.10 "memberin" typemap

        The "memberin" typemap is used to copy data from an @@ -6125,7 +6125,7 @@ other objects.

        -

        32.7.6.11 "varin" typemap

        +

        31.7.6.11 "varin" typemap

        The "varin" typemap is used to convert objects in the target @@ -6136,7 +6136,7 @@ This is implementation specific.

        -

        32.7.6.12 "varout" typemap

        +

        31.7.6.12 "varout" typemap

        The "varout" typemap is used to convert a C/C++ object to an @@ -6147,7 +6147,7 @@ This is implementation specific.

        -

        32.7.6.13 "throws" typemap

        +

        31.7.6.13 "throws" typemap

        The "throws" typemap is only used when SWIG parses a C++ @@ -6206,7 +6206,7 @@ handling with %exception section.

        -

        32.7.6.14 directorin typemap

        +

        31.7.6.14 directorin typemap

        Converts C++ objects in director @@ -6460,7 +6460,7 @@ referring to the class itself. -

        32.7.6.15 directorout typemap

        +

        31.7.6.15 directorout typemap

        Converts Ruby objects in director @@ -6720,7 +6720,7 @@ exception.
        -

        32.7.6.16 directorargout typemap

        +

        31.7.6.16 directorargout typemap

        Output argument processing in director @@ -6960,7 +6960,7 @@ referring to the instance of the class itself -

        32.7.6.17 ret typemap

        +

        31.7.6.17 ret typemap

        Cleanup of function return values @@ -6970,7 +6970,7 @@ referring to the instance of the class itself -

        32.7.6.18 globalin typemap

        +

        31.7.6.18 globalin typemap

        Setting of C global variables @@ -6980,7 +6980,7 @@ referring to the instance of the class itself -

        32.7.7 Typemap variables

        +

        31.7.7 Typemap variables

        @@ -7090,7 +7090,7 @@ being created.

      -

      32.7.8 Useful Functions

      +

      31.7.8 Useful Functions

      When you write a typemap, you usually have to work directly @@ -7114,7 +7114,7 @@ across multiple languages.

      -

      32.7.8.1 C Datatypes to Ruby Objects

      +

      31.7.8.1 C Datatypes to Ruby Objects

      @@ -7170,7 +7170,7 @@ SWIG_From_float(float) -

      32.7.8.2 Ruby Objects to C Datatypes

      +

      31.7.8.2 Ruby Objects to C Datatypes

      Here, while the Ruby versions return the value directly, the SWIG @@ -7259,7 +7259,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      32.7.8.3 Macros for VALUE

      +

      31.7.8.3 Macros for VALUE

      RSTRING_LEN(str)

      @@ -7322,7 +7322,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      32.7.8.4 Exceptions

      +

      31.7.8.4 Exceptions

      void rb_raise(VALUE exception, const char *fmt, @@ -7489,7 +7489,7 @@ arguments are interpreted as with printf().

      -

      32.7.8.5 Iterators

      +

      31.7.8.5 Iterators

      void rb_iter_break()

      @@ -7591,7 +7591,7 @@ VALUE), VALUE value)

      -

      32.7.9 Typemap Examples

      +

      31.7.9 Typemap Examples

      This section includes a few examples of typemaps. For more @@ -7602,7 +7602,7 @@ directory.

      -

      32.7.10 Converting a Ruby array to a char **

      +

      31.7.10 Converting a Ruby array to a char **

      A common problem in many C programs is the processing of @@ -7657,7 +7657,7 @@ after the execution of the C function.

      -

      32.7.11 Collecting arguments in a hash

      +

      31.7.11 Collecting arguments in a hash

      Ruby's solution to the "keyword arguments" capability of some @@ -7936,7 +7936,7 @@ directory of the SWIG distribution.

      -

      32.7.12 Pointer handling

      +

      31.7.12 Pointer handling

      Occasionally, it might be necessary to convert pointer values @@ -8035,7 +8035,7 @@ For example:

      -

      32.7.12.1 Ruby Datatype Wrapping

      +

      31.7.12.1 Ruby Datatype Wrapping

      VALUE Data_Wrap_Struct(VALUE class, void @@ -8086,7 +8086,7 @@ and assigns that pointer to ptr.

      -

      32.7.13 Example: STL Vector to Ruby Array

      +

      31.7.13 Example: STL Vector to Ruby Array

      Another use for macros and type maps is to create a Ruby array @@ -8195,7 +8195,7 @@ the C++ Standard Template Library.
      -

      32.8 Docstring Features

      +

      31.8 Docstring Features

      @@ -8256,7 +8256,7 @@ generate ri documentation from a c wrap file, you could do:

      -

      32.8.1 Module docstring

      +

      31.8.1 Module docstring

      @@ -8307,7 +8307,7 @@ macro. For example: -

      32.8.2 %feature("autodoc")

      +

      31.8.2 %feature("autodoc")

      Since SWIG does know everything about the function it wraps, @@ -8336,7 +8336,7 @@ feature, described below. -

      32.8.2.1 %feature("autodoc", "0")

      +

      31.8.2.1 %feature("autodoc", "0")

      @@ -8384,7 +8384,7 @@ Then Ruby code like this will be generated: -

      32.8.2.2 %feature("autodoc", "1")

      +

      31.8.2.2 %feature("autodoc", "1")

      @@ -8416,7 +8416,7 @@ this: -

      32.8.2.3 %feature("autodoc", "2")

      +

      31.8.2.3 %feature("autodoc", "2")

      @@ -8432,7 +8432,7 @@ this: -

      32.8.2.4 %feature("autodoc", "3")

      +

      31.8.2.4 %feature("autodoc", "3")

      @@ -8460,7 +8460,7 @@ this: -

      32.8.2.5 %feature("autodoc", "docstring")

      +

      31.8.2.5 %feature("autodoc", "docstring")

      @@ -8488,7 +8488,7 @@ generated string. For example: -

      32.8.3 %feature("docstring")

      +

      31.8.3 %feature("docstring")

      @@ -8503,10 +8503,10 @@ docstring and they are output together.

      -

      32.9 Advanced Topics

      +

      31.9 Advanced Topics

      -

      32.9.1 Operator overloading

      +

      31.9.1 Operator overloading

      SWIG allows operator overloading with, by using the %extend @@ -9523,7 +9523,7 @@ parses the expression a != b as !(a == b). -

      32.9.2 Creating Multi-Module Packages

      +

      31.9.2 Creating Multi-Module Packages

      The chapter on Working @@ -9704,7 +9704,7 @@ initialized:

      -

      32.9.3 Specifying Mixin Modules

      +

      31.9.3 Specifying Mixin Modules

      The Ruby language doesn't support multiple inheritance, but @@ -9802,7 +9802,7 @@ Features") for more details).

      -

      32.10 Memory Management

      +

      31.10 Memory Management

      One of the most common issues in generating SWIG bindings for @@ -9849,7 +9849,7 @@ understanding of how the underlying library manages memory.

      -

      32.10.1 Mark and Sweep Garbage Collector

      +

      31.10.1 Mark and Sweep Garbage Collector

      Ruby uses a mark and sweep garbage collector. When the garbage @@ -9897,7 +9897,7 @@ this memory.

      -

      32.10.2 Object Ownership

      +

      31.10.2 Object Ownership

      As described above, memory management depends on clearly @@ -10124,7 +10124,7 @@ classes is:

      -

      32.10.3 Object Tracking

      +

      31.10.3 Object Tracking

      The remaining parts of this section will use the class library @@ -10338,7 +10338,7 @@ methods.

      -

      32.10.4 Mark Functions

      +

      31.10.4 Mark Functions

      With a bit more testing, we see that our class library still @@ -10456,7 +10456,7 @@ test suite.

      -

      32.10.5 Free Functions

      +

      31.10.5 Free Functions

      By default, SWIG creates a "free" function that is called when @@ -10567,7 +10567,7 @@ existing Ruby object to the destroyed C++ object and raise an exception.

      -
      %module example

      %{
      #include "example.h"
      %}

      /* Specify that ownership is transferred to the zoo
      	when calling add_animal */
      %apply SWIGTYPE *DISOWN { Animal* animal };

      /* Track objects */
      %trackobjects;

      /* Specify the mark function */
      %freefunc Zoo "free_Zoo";

      %include "example.h"

      %header %{
       static void free_Zoo(void* ptr) {
       Zoo* zoo = (Zoo*) ptr;

       /* Loop over each animal */
       int count = zoo->get_num_animals();

       for(int i = 0; i < count; ++i) {
       /* Get an animal */
       Animal* animal = zoo->get_animal(i);

       /* Unlink the Ruby object from the C++ object */
       SWIG_RubyUnlinkObjects(animal);

       /* Now remove the tracking for this animal */
       SWIG_RubyRemoveTracking(animal);
       }

       /* Now call SWIG_RubyRemoveTracking for the zoo */
       SWIG_RubyRemoveTracking(ptr);
       
       /* Now free the zoo which will free the animals it contains */
       delete zoo;
       }
      %}
      +
      %module example

      %{
      #include "example.h"
      %}

      /* Specify that ownership is transferred to the zoo
      	when calling add_animal */
      %apply SWIGTYPE *DISOWN { Animal* animal };

      /* Track objects */
      %trackobjects;

      /* Specify the mark function */
      %freefunc Zoo "free_Zoo";

      %include "example.h"

      %header %{
       static void free_Zoo(void* ptr) {
       Zoo* zoo = (Zoo*) ptr;

       /* Loop over each animal */
       int count = zoo->get_num_animals();

       for(int i = 0; i < count; ++i) {
       /* Get an animal */
       Animal* animal = zoo->get_animal(i);

       /* Unlink the Ruby object from the C++ object */
       SWIG_RubyUnlinkObjects(animal);

       /* Now remove the tracking for this animal */
       SWIG_RubyRemoveTracking(animal);
       }

       /* Now call SWIG_RemoveMapping for the zoo */
       SWIG_RemoveMapping(ptr);
       
       /* Now free the zoo which will free the animals it contains */
       delete zoo;
       }
      %}
      @@ -10611,7 +10611,7 @@ been freed, and thus raises a runtime exception.

      -

      32.10.6 Embedded Ruby and the C++ Stack

      +

      31.10.6 Embedded Ruby and the C++ Stack

      As has been said, the Ruby GC runs and marks objects before diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html index d52f0441c..c22d81c07 100644 --- a/Doc/Manual/SWIG.html +++ b/Doc/Manual/SWIG.html @@ -53,7 +53,7 @@

    • Character strings and structures
    • Array members
    • Structure data members -
    • C constructors and destructors +
    • C constructors and destructors
    • Adding member functions to C structures
    • Nested structures
    • Other things to note about structure wrapping @@ -120,7 +120,8 @@ can be obtained by typing swig -help or swig -mzscheme Generate Mzscheme wrappers -ocaml Generate Ocaml wrappers -perl Generate Perl wrappers --php Generate PHP wrappers +-php4 Generate PHP4 wrappers +-php5 Generate PHP5 wrappers -pike Generate Pike wrappers -python Generate Python wrappers -r Generate R (aka GNU S) wrappers @@ -139,7 +140,6 @@ can be obtained by typing swig -help or swig -lfile Include a SWIG library file. -module name Set the name of the SWIG module -o outfile Name of output file --outcurrentdir Set default output dir to current dir instead of input file's path -outdir dir Set language specific files output directory -swiglib Show location of SWIG library -version Show SWIG version number @@ -224,7 +224,7 @@ The C/C++ output file created by SWIG often contains everything that is needed to construct a extension module for the target scripting language. SWIG is not a stub compiler nor is it usually necessary to edit the output file (and if you look at the output, -you probably won't want to). To build the final extension module, the +you probably won't want to). To build the final extension module, the SWIG output file is compiled and linked with the rest of your C/C++ program to create a shared library.

      @@ -232,7 +232,7 @@ program to create a shared library.

      Many target languages will also generate proxy class files in the target language. The default output directory for these language -specific files is the same directory as the generated C/C++ file. This +specific files is the same directory as the generated C/C++ file. This can can be modified using the -outdir option. For example:

      @@ -247,17 +247,6 @@ cppfiles/example_wrap.cpp pyfiles/example.py
      • -

      -If the -outcurrentdir option is used (without -o) -then SWIG behaves like a typical C/C++ -compiler and the default output directory is then the current directory. Without -this option the default output directory is the path to the input file. -If -o and --outcurrentdir are used together, -outcurrentdir is effectively ignored -as the output directory for the language files is the same directory as the -generated C/C++ file if not overidden with -outdir. -

      -

      5.1.3 Comments

      @@ -2230,13 +2219,13 @@ void Foo_w_set(FOO *f, WORD value) {

      -Compatibility Note: SWIG-1.3.11 and earlier releases transformed all non-primitive member datatypes -to pointers. Starting in SWIG-1.3.12, this transformation only occurs if a datatype is known to be a structure, -class, or union. This is unlikely to break existing code. However, if you need to tell SWIG that an undeclared +Compatibility Note: SWIG-1.3.11 and earlier releases transformed all non-primitive member datatypes +to pointers. Starting in SWIG-1.3.12, this transformation only occurs if a datatype is known to be a structure, +class, or union. This is unlikely to break existing code. However, if you need to tell SWIG that an undeclared datatype is really a struct, simply use a forward struct declaration such as "struct Foo;".

      -

      5.5.5 C constructors and destructors

      +

      5.5.5 C constructors and destructors

      @@ -2293,7 +2282,7 @@ struct Bar { // Default constructor generated. Since ignoring the implicit or default destructors most of the times produce memory leaks, SWIG will always try to generate them. If needed, however, you can selectively disable the generation of the -default/implicit destructor by using %nodefaultdtor +default/implicit destructor by using %nodefaultdtor

      @@ -2737,16 +2726,11 @@ the module upon loading.

      Code is inserted into the appropriate code section by using one -of the code insertion directives listed below. The order of the sections in -the wrapper file is as shown: +of the following code insertion directives: 

      -%begin %{
-   ... code in begin section ...
-%}
-
 %runtime %{
    ... code in runtime section ...
 %}
@@ -2767,12 +2751,10 @@ the wrapper file is as shown:
 
 
      
 The bare %{ ... %} directive is a shortcut that is the same as
-%header %{ ... %}. 
+%header %{ ... %}.
 
      
 
 
      
-The %begin section is effectively empty as it just contains the SWIG banner by default. 
-This section is provided as a way for users to insert code at the top of the wrapper file before any other code is generated.
 Everything in a code insertion block is copied verbatim into the output file and is 
 not parsed by SWIG.   Most SWIG input files have at least one such block to include header
 files and support C code.  Additional code blocks may be placed anywhere in a
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 789efc129..5406f44ea 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
      SWIG-1.3 Development Documentation
      
 
-Last update : SWIG-1.3.40 (in progress)
+Last update : SWIG-1.3.37 (in progress)
 
 
      Sections
      
 
@@ -35,7 +35,6 @@ to help!).
 
    • Variable length arguments
      • 
 
    • Warning messages
      • 
 
    • Working with Modules
      • 
-
    • Using SWIG with ccache
      • 
 
 
 
      Language Module Documentation
      
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index b36395cab..e837a5b17 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -6,7 +6,7 @@
 
 
 
-
      33 SWIG and Tcl
      
+
      32 SWIG and Tcl
      
 
 
      
 
        
@@ -82,7 +82,7 @@ Tcl 8.0 or a later release.   Earlier releases of SWIG supported Tcl 7.x, but
 this is no longer supported.
 
        
 
-
        33.1 Preliminaries
        
+
        32.1 Preliminaries
        
 
 
 
        
@@ -108,7 +108,7 @@ build a Tcl extension module.  To finish building the module, you
 need to compile this file and link it with the rest of your program.
 
        
 
-
        33.1.1 Getting the right header files
        
+
        32.1.1 Getting the right header files
        
 
 
 
        
@@ -126,7 +126,7 @@ this is the case, you should probably make a symbolic link so that tcl.h
 
-
        33.1.2 Compiling a dynamic module
        
+
        32.1.2 Compiling a dynamic module
        
 
 
 
        
@@ -161,7 +161,7 @@ The name of the module is specified using the %module directive or the
  -module command line option.
 
        
 
-
        33.1.3 Static linking
        
+
        32.1.3 Static linking
        
 
 
 
        
@@ -227,7 +227,7 @@ minimal in most situations (and quite frankly not worth the extra
 hassle in the opinion of this author). 
 
        
 
-
        33.1.4 Using your module
        
+
        32.1.4 Using your module
        
 
 
 
        
@@ -355,7 +355,7 @@ to the default system configuration (this requires root access and you will need
 the man pages). 
 
        
 
-
        33.1.5 Compilation of C++ extensions
        
+
        32.1.5 Compilation of C++ extensions
        
 
 
 
        
@@ -438,7 +438,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 
        
 
-
        33.1.6 Compiling for 64-bit platforms
        
+
        32.1.6 Compiling for 64-bit platforms
        
 
 
 
        
@@ -465,7 +465,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 
        
 
-
        33.1.7 Setting a package prefix
        
+
        32.1.7 Setting a package prefix
        
 
 
 
        
@@ -484,7 +484,7 @@ option will append the prefix to the name when creating a command and
 call it "Foo_bar".
 
        
 
-
        33.1.8 Using namespaces
        
+
        32.1.8 Using namespaces
        
 
 
 
        
@@ -506,7 +506,7 @@ When the -namespace option is used, objects in the module
 are always accessed with the namespace name such as Foo::bar.
 
        
 
-
        33.2 Building Tcl/Tk Extensions under Windows 95/NT
        
+
        32.2 Building Tcl/Tk Extensions under Windows 95/NT
        
 
 
 
        
@@ -517,7 +517,7 @@ covers the process of using SWIG with Microsoft Visual C++.
 although the procedure may be similar with other compilers.
 
        
 
-
        33.2.1 Running SWIG from Developer Studio
        
+
        32.2.1 Running SWIG from Developer Studio
        
 
 
 
        
@@ -575,7 +575,7 @@ MSDOS > tclsh80
 %
      -

      33.2.2 Using NMAKE

      +

      32.2.2 Using NMAKE

      @@ -638,7 +638,7 @@ to get you started. With a little practice, you'll be making lots of Tcl extensions.

      -

      33.3 A tour of basic C/C++ wrapping

      +

      32.3 A tour of basic C/C++ wrapping

      @@ -649,7 +649,7 @@ classes. This section briefly covers the essential aspects of this wrapping.

      -

      33.3.1 Modules

      +

      32.3.1 Modules

      @@ -683,7 +683,7 @@ To fix this, supply an extra argument to load like this:

      -

      33.3.2 Functions

      +

      32.3.2 Functions

      @@ -708,7 +708,7 @@ like you think it does: %

      -

      33.3.3 Global variables

      +

      32.3.3 Global variables

      @@ -788,7 +788,7 @@ extern char *path; // Read-only (due to %immutable) -

      33.3.4 Constants and enums

      +

      32.3.4 Constants and enums

      @@ -872,7 +872,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l conversion. This allows the global statement to be omitted.

      -

      33.3.5 Pointers

      +

      32.3.5 Pointers

      @@ -968,7 +968,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      33.3.6 Structures

      +

      32.3.6 Structures

      @@ -1250,7 +1250,7 @@ Note: Tcl only destroys the underlying object if it has ownership. See the memory management section that appears shortly.

      -

      33.3.7 C++ classes

      +

      32.3.7 C++ classes

      @@ -1317,7 +1317,7 @@ In Tcl, the static member is accessed as follows: -

      33.3.8 C++ inheritance

      +

      32.3.8 C++ inheritance

      @@ -1366,7 +1366,7 @@ For instance: It is safe to use multiple inheritance with SWIG.

      -

      33.3.9 Pointers, references, values, and arrays

      +

      32.3.9 Pointers, references, values, and arrays

      @@ -1420,7 +1420,7 @@ to hold the result and a pointer is returned (Tcl will release this memory when the return value is garbage collected).

      -

      33.3.10 C++ overloaded functions

      +

      32.3.10 C++ overloaded functions

      @@ -1543,7 +1543,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      33.3.11 C++ operators

      +

      32.3.11 C++ operators

      @@ -1645,7 +1645,7 @@ There are ways to make this operator appear as part of the class using the % Keep reading.

      -

      33.3.12 C++ namespaces

      +

      32.3.12 C++ namespaces

      @@ -1709,7 +1709,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      33.3.13 C++ templates

      +

      32.3.13 C++ templates

      @@ -1761,7 +1761,7 @@ More details can be found in the SWIG and C++ -

      33.3.14 C++ Smart Pointers

      +

      32.3.14 C++ Smart Pointers

      @@ -1845,7 +1845,7 @@ simply use the __deref__() method. For example: -

      33.4 Further details on the Tcl class interface

      +

      32.4 Further details on the Tcl class interface

      @@ -1858,7 +1858,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      33.4.1 Proxy classes

      +

      32.4.1 Proxy classes

      @@ -1923,7 +1923,7 @@ function. This allows objects to be encapsulated objects that look a lot like as shown in the last section.

      -

      33.4.2 Memory management

      +

      32.4.2 Memory management

      @@ -2111,7 +2111,7 @@ typemaps--an advanced topic discussed later.

      -

      33.5 Input and output parameters

      +

      32.5 Input and output parameters

      @@ -2299,7 +2299,7 @@ set c [lindex $dim 1] -

      33.6 Exception handling

      +

      32.6 Exception handling

      @@ -2433,7 +2433,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex See the chapter on "Customization Features" for more examples.

      -

      33.7 Typemaps

      +

      32.7 Typemaps

      @@ -2450,7 +2450,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Tcl interface.

      -

      33.7.1 What is a typemap?

      +

      32.7.1 What is a typemap?

      @@ -2567,7 +2567,7 @@ parameter is omitted): -

      33.7.2 Tcl typemaps

      +

      32.7.2 Tcl typemaps

      @@ -2705,7 +2705,7 @@ Initialize an argument to a value before any conversions occur. Examples of these methods will appear shortly.

      -

      33.7.3 Typemap variables

      +

      32.7.3 Typemap variables

      @@ -2776,7 +2776,7 @@ properly assigned. The Tcl name of the wrapper function being created. -

      33.7.4 Converting a Tcl list to a char **

      +

      32.7.4 Converting a Tcl list to a char **

      @@ -2838,7 +2838,7 @@ argv[2] = Larry 3 -

      33.7.5 Returning values in arguments

      +

      32.7.5 Returning values in arguments

      @@ -2880,7 +2880,7 @@ result, a Tcl function using these typemaps will work like this : % -

      33.7.6 Useful functions

      +

      32.7.6 Useful functions

      @@ -2957,7 +2957,7 @@ int Tcl_IsShared(Tcl_Obj *obj); -

      33.7.7 Standard typemaps

      +

      32.7.7 Standard typemaps

      @@ -3041,7 +3041,7 @@ work) -

      33.7.8 Pointer handling

      +

      32.7.8 Pointer handling

      @@ -3117,7 +3117,7 @@ For example: -

      33.8 Turning a SWIG module into a Tcl Package.

      +

      32.8 Turning a SWIG module into a Tcl Package.

      @@ -3189,7 +3189,7 @@ As a final note, most SWIG examples do not yet use the to use the load command instead.

      -

      33.9 Building new kinds of Tcl interfaces (in Tcl)

      +

      32.9 Building new kinds of Tcl interfaces (in Tcl)

      @@ -3288,7 +3288,7 @@ danger of blowing something up (although it is easily accomplished with an out of bounds array access).

      -

      33.9.1 Proxy classes

      +

      32.9.1 Proxy classes

      diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html index 777184069..8f3035dc8 100644 --- a/Doc/Manual/Typemaps.html +++ b/Doc/Manual/Typemaps.html @@ -75,7 +75,6 @@

    • More about %apply and %clear
    • Reducing wrapper code size
    • Passing data between typemaps -
    • C++ "this" pointer
    • Where to go for more information? @@ -3900,66 +3899,7 @@ sure that the typemaps sharing information have exactly the same types and names

      -

      10.15 C++ "this" pointer

      - - -

      -All the rules discussed for Typemaps apply to C++ as well as C. -However in addition C++ passes an extra parameter into every -non-static class method -- the this pointer. Occasionally it can be -useful to apply a typemap to this pointer (for example to check -and make sure this is non-null before deferencing). -Actually, C also has an the equivalent of the this pointer which is used -when accessing variables in a C struct. -

      -

      -In order to customise the this pointer handling, target a variable named self in your typemaps. -self is the name SWIG uses to refer to the extra parameter in wrapped functions. -

      -

      -For example, if wrapping for Java generation: -

      - -
      -
      -%typemap(check) SWIGTYPE *self %{
-if (!$1) {
-  SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "swigCPtr null");
-  return $null;
-}
-%}
-
      -
      - -

      -In the above case, the $1 variable is expanded into the argument -name that SWIG is using as the this pointer. - -SWIG will then insert the check code before the actual C++ class method -is called, and will raise an exception rather than crash -the Java virtual machine. - -The generated code will look something like: -

      - -
      -
      -  if (!arg1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException,
-      "invalid native object; delete() likely already called");
-    return ;
-  }
-  (arg1)->wrappedFunction(...);
-
      -
      - -

      -Note that if you have a parameter named self then it -will also match the typemap. One work around is to create an interface file that wraps -the method, but give the argument a name other than self. -

      - -

      10.16 Where to go for more information?

      +

      10.15 Where to go for more information?

      diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html index 95af1ec6b..0b3cb37e9 100644 --- a/Doc/Manual/Warnings.html +++ b/Doc/Manual/Warnings.html @@ -558,7 +558,7 @@ example.i(4): Syntax error in input.

        -
      • 870. Warning for classname: Base baseclass ignored. Multiple inheritance is not supported in PHP. +
      • 870. Warning for classname: Base baseclass ignored. Multiple inheritance is not supported in Php4. (Php).
      • 871. Unrecognized pragma pragma. (Php).
      diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html index bc8c8fa51..8a718ffad 100644 --- a/Doc/Manual/Windows.html +++ b/Doc/Manual/Windows.html @@ -281,7 +281,7 @@ Execute the steps in the order shown and don't use spaces in path names. In fact
    • - Copy the following to the MSYS install folder (C:\msys\1.0 is default): + Copy the followig to the MSYS install folder (C:\msys\1.0 is default):
      • msys-automake-1.8.2.tar.bz2
      • msys-autoconf-2.59.tar.bz2
        • diff --git a/Doc/Manual/chapters b/Doc/Manual/chapters index bf180f1b4..840709d89 100644 --- a/Doc/Manual/chapters +++ b/Doc/Manual/chapters @@ -13,8 +13,8 @@ Contract.html Varargs.html Warnings.html Modules.html -CCache.html Allegrocl.html +C.html CSharp.html Chicken.html Guile.html diff --git a/Doc/Manual/swig16.png b/Doc/Manual/swig16.png old mode 100644 new mode 100755 diff --git a/Doc/README b/Doc/README index f7a493933..110428199 100644 --- a/Doc/README +++ b/Doc/README @@ -2,5 +2,4 @@ Doc/Manual - Latest version of the SWIG user manual Doc/Devel - Developer documentation concerning SWIG internals. (not necessarily up to date) -Open the index.html file in each of these directories with a web browser. - + \ No newline at end of file diff --git a/Examples/GIFPlot/Java/full/README b/Examples/GIFPlot/Java/full/README index 93463ea30..f536864de 100644 --- a/Examples/GIFPlot/Java/full/README +++ b/Examples/GIFPlot/Java/full/README @@ -1,8 +1,8 @@ This example runs the entire gifplot.h header file through SWIG without -any changes. The program 'runme.java' does something a little more -interesting. After doing a make, run it using 'java runme'. You'll have to go +any changes. The program 'main.java' does something a little more +interesting. After doing a make, run it using 'java main'. You'll have to go look at the header file to get a complete listing of the functions. -Note the differences in the runme.java files between this example and the +Note the differences in the main.java files between this example and the 'full' example. This example does not use shadow classes. diff --git a/Examples/GIFPlot/Java/full/runme.java b/Examples/GIFPlot/Java/full/main.java similarity index 99% rename from Examples/GIFPlot/Java/full/runme.java rename to Examples/GIFPlot/Java/full/main.java index c47c1e672..8fb65c86d 100644 --- a/Examples/GIFPlot/Java/full/runme.java +++ b/Examples/GIFPlot/Java/full/main.java @@ -1,7 +1,7 @@ // Plot a 3D function import java.lang.Math; -public class runme { +public class main { static { try { diff --git a/Examples/GIFPlot/Java/shadow/Makefile b/Examples/GIFPlot/Java/shadow/Makefile index 8062c2700..e513b9b5a 100644 --- a/Examples/GIFPlot/Java/shadow/Makefile +++ b/Examples/GIFPlot/Java/shadow/Makefile @@ -1,9 +1,8 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -outcurrentdir +SWIGOPT = -I../../Interface SRCS = TARGET = gifplot -INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -11,7 +10,7 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java clean:: diff --git a/Examples/GIFPlot/Java/shadow/README b/Examples/GIFPlot/Java/shadow/README index b06c5a8f1..4adbde306 100644 --- a/Examples/GIFPlot/Java/shadow/README +++ b/Examples/GIFPlot/Java/shadow/README @@ -1,5 +1,5 @@ This example uses the file in ../../Interface/gifplot.i to build -an interface with shadow classes. After doing a make, run the program runme, ie: 'java runme'. +an interface with shadow classes. After doing a make, run the program main, ie: 'java main'. -Note the differences in the runme.java files between this example and the +Note the differences in the main.java files between this example and the 'full' example. This example uses the shadow classes. diff --git a/Examples/GIFPlot/Java/shadow/runme.java b/Examples/GIFPlot/Java/shadow/main.java similarity index 99% rename from Examples/GIFPlot/Java/shadow/runme.java rename to Examples/GIFPlot/Java/shadow/main.java index 91db03898..fbcf6e792 100644 --- a/Examples/GIFPlot/Java/shadow/runme.java +++ b/Examples/GIFPlot/Java/shadow/main.java @@ -2,7 +2,7 @@ import java.lang.Math; -public class runme { +public class main { static { try { diff --git a/Examples/GIFPlot/Java/simple/README b/Examples/GIFPlot/Java/simple/README index 13ff49611..1fb8453f0 100644 --- a/Examples/GIFPlot/Java/simple/README +++ b/Examples/GIFPlot/Java/simple/README @@ -1,5 +1,5 @@ This is a very minimalistic example in which just a few functions and constants from library are wrapped and used to draw some simple -shapes. After doing a make, run the java program, ie 'java runme'. +shapes. After doing a make, run the java program, ie 'java main'. diff --git a/Examples/GIFPlot/Java/simple/runme.java b/Examples/GIFPlot/Java/simple/main.java similarity index 98% rename from Examples/GIFPlot/Java/simple/runme.java rename to Examples/GIFPlot/Java/simple/main.java index 2d8d2bb48..b165a4baa 100644 --- a/Examples/GIFPlot/Java/simple/runme.java +++ b/Examples/GIFPlot/Java/simple/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/GIFPlot/Lib/color.c b/Examples/GIFPlot/Lib/color.c index 7d79baca9..a4eaf285e 100644 --- a/Examples/GIFPlot/Lib/color.c +++ b/Examples/GIFPlot/Lib/color.c @@ -132,10 +132,7 @@ int ColorMap_write(ColorMap *cm, char *filename) { f = fopen(filename,"w"); - if (fwrite(cm->cmap,768,1,f) != 1) { - fclose(f); - return -1; - } + fwrite(cm->cmap,768,1,f); fclose(f); return 0; } diff --git a/Examples/GIFPlot/Lib/gif.c b/Examples/GIFPlot/Lib/gif.c index 7953e5ce9..a0cfca1d5 100644 --- a/Examples/GIFPlot/Lib/gif.c +++ b/Examples/GIFPlot/Lib/gif.c @@ -268,7 +268,7 @@ static int maxmaxcode = 1 << GP_BITS; /* NEVER generate this */ static count_int *htab; static unsigned short *codetab; -static int GIFOutBufSize; +static GIFOutBufSize; /* static count_int htab [HSIZE]; static unsigned short codetab [HSIZE]; */ @@ -656,11 +656,7 @@ int FrameBuffer_writeGIF(FrameBuffer *f, ColorMap *c, char *filename) { fclose(file); return -1; } - if (fwrite(buffer,nbytes,1,file) != 1) { - free(buffer); - fclose(file); - return -1; - } + fwrite(buffer,nbytes,1,file); fclose(file); free(buffer); return 0; diff --git a/Examples/GIFPlot/Perl5/shadow/Makefile b/Examples/GIFPlot/Perl5/shadow/Makefile index c39eac52c..c5cb7aec4 100644 --- a/Examples/GIFPlot/Perl5/shadow/Makefile +++ b/Examples/GIFPlot/Perl5/shadow/Makefile @@ -1,9 +1,8 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -outcurrentdir +SWIGOPT = -I../../Interface SRCS = TARGET = gifplot -INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot -lm INCLUDES = -I../../Include @@ -11,12 +10,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5 + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static + TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static clean:: $(MAKE) -f $(TOP)/Makefile perl5_clean diff --git a/Examples/GIFPlot/Php/check.list b/Examples/GIFPlot/Php4/check.list similarity index 100% rename from Examples/GIFPlot/Php/check.list rename to Examples/GIFPlot/Php4/check.list diff --git a/Examples/GIFPlot/Php/full/Makefile b/Examples/GIFPlot/Php4/full/Makefile similarity index 81% rename from Examples/GIFPlot/Php/full/Makefile rename to Examples/GIFPlot/Php4/full/Makefile index e33e7a730..3aa632b99 100644 --- a/Examples/GIFPlot/Php/full/Makefile +++ b/Examples/GIFPlot/Php4/full/Makefile @@ -10,10 +10,10 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4 clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f *.gif rm -f php_gifplot.h diff --git a/Examples/GIFPlot/Php/full/README b/Examples/GIFPlot/Php4/full/README similarity index 100% rename from Examples/GIFPlot/Php/full/README rename to Examples/GIFPlot/Php4/full/README diff --git a/Examples/GIFPlot/Php/full/cmap b/Examples/GIFPlot/Php4/full/cmap similarity index 100% rename from Examples/GIFPlot/Php/full/cmap rename to Examples/GIFPlot/Php4/full/cmap diff --git a/Examples/GIFPlot/Php/full/gifplot.i b/Examples/GIFPlot/Php4/full/gifplot.i similarity index 100% rename from Examples/GIFPlot/Php/full/gifplot.i rename to Examples/GIFPlot/Php4/full/gifplot.i diff --git a/Examples/GIFPlot/Php/full/runme.php b/Examples/GIFPlot/Php4/full/runme.php4 similarity index 100% rename from Examples/GIFPlot/Php/full/runme.php rename to Examples/GIFPlot/Php4/full/runme.php4 diff --git a/Examples/GIFPlot/Php/shadow/Makefile b/Examples/GIFPlot/Php4/shadow/Makefile similarity index 80% rename from Examples/GIFPlot/Php/shadow/Makefile rename to Examples/GIFPlot/Php4/shadow/Makefile index df8ee30c0..5627e53a0 100644 --- a/Examples/GIFPlot/Php/shadow/Makefile +++ b/Examples/GIFPlot/Php4/shadow/Makefile @@ -10,10 +10,10 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4 clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f *.gif check: all diff --git a/Examples/GIFPlot/Php/shadow/README b/Examples/GIFPlot/Php4/shadow/README similarity index 100% rename from Examples/GIFPlot/Php/shadow/README rename to Examples/GIFPlot/Php4/shadow/README diff --git a/Examples/GIFPlot/Php/shadow/cmap b/Examples/GIFPlot/Php4/shadow/cmap similarity index 100% rename from Examples/GIFPlot/Php/shadow/cmap rename to Examples/GIFPlot/Php4/shadow/cmap diff --git a/Examples/GIFPlot/Php/shadow/runme.php b/Examples/GIFPlot/Php4/shadow/runme.php4 similarity index 100% rename from Examples/GIFPlot/Php/shadow/runme.php rename to Examples/GIFPlot/Php4/shadow/runme.php4 diff --git a/Examples/GIFPlot/Php/simple/Makefile b/Examples/GIFPlot/Php4/simple/Makefile similarity index 80% rename from Examples/GIFPlot/Php/simple/Makefile rename to Examples/GIFPlot/Php4/simple/Makefile index e60b641fa..6903bec0b 100644 --- a/Examples/GIFPlot/Php/simple/Makefile +++ b/Examples/GIFPlot/Php4/simple/Makefile @@ -10,10 +10,10 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php4 clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f *.gif rm -f php_simple.h diff --git a/Examples/GIFPlot/Php/simple/README b/Examples/GIFPlot/Php4/simple/README similarity index 100% rename from Examples/GIFPlot/Php/simple/README rename to Examples/GIFPlot/Php4/simple/README diff --git a/Examples/GIFPlot/Php/simple/runme.php b/Examples/GIFPlot/Php4/simple/runme.php4 similarity index 100% rename from Examples/GIFPlot/Php/simple/runme.php rename to Examples/GIFPlot/Php4/simple/runme.php4 diff --git a/Examples/GIFPlot/Php/simple/simple.i b/Examples/GIFPlot/Php4/simple/simple.i similarity index 100% rename from Examples/GIFPlot/Php/simple/simple.i rename to Examples/GIFPlot/Php4/simple/simple.i diff --git a/Examples/GIFPlot/Python/full/Makefile b/Examples/GIFPlot/Python/full/Makefile index 83a7c864b..ae927b72b 100644 --- a/Examples/GIFPlot/Python/full/Makefile +++ b/Examples/GIFPlot/Python/full/Makefile @@ -1,5 +1,5 @@ TOP = ../../.. -SWIG = $(TOP)/../preinst-swig +SWIG = $(TOP)/../swig SWIGOPT = -I../../Include SRCS = TARGET = gifplot @@ -23,4 +23,3 @@ clean:: rm -f *.gif check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/shadow/Makefile b/Examples/GIFPlot/Python/shadow/Makefile index 3ae9a9897..1f5014895 100644 --- a/Examples/GIFPlot/Python/shadow/Makefile +++ b/Examples/GIFPlot/Python/shadow/Makefile @@ -1,9 +1,8 @@ TOP = ../../.. -SWIG = $(TOP)/../preinst-swig -SWIGOPT = -outcurrentdir +SWIG = $(TOP)/../swig +SWIGOPT = -I../../Interface SRCS = TARGET = gifplot -INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -11,12 +10,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static + TARGET='mypython' INTERFACE='$(INTERFACE)' python_static clean:: $(MAKE) -f $(TOP)/Makefile python_clean @@ -24,4 +23,3 @@ clean:: rm -f *.gif check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Python/simple/Makefile b/Examples/GIFPlot/Python/simple/Makefile index 9fc9a6c72..5eb0344e8 100644 --- a/Examples/GIFPlot/Python/simple/Makefile +++ b/Examples/GIFPlot/Python/simple/Makefile @@ -1,5 +1,5 @@ TOP = ../../.. -SWIG = $(TOP)/../preinst-swig +SWIG = $(TOP)/../swig SWIGOPT = SRCS = TARGET = simple @@ -23,4 +23,3 @@ clean:: rm -f *.gif check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/GIFPlot/Ruby/shadow/Makefile b/Examples/GIFPlot/Ruby/shadow/Makefile index 8cbea2a57..ea382ea88 100644 --- a/Examples/GIFPlot/Ruby/shadow/Makefile +++ b/Examples/GIFPlot/Ruby/shadow/Makefile @@ -1,9 +1,8 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -outcurrentdir +SWIGOPT = -I../../Interface SRCS = TARGET = gifplot -INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -11,12 +10,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static + TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static clean:: $(MAKE) -f $(TOP)/Makefile ruby_clean diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 63ca787d6..c47bb6a7b 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -12,11 +12,11 @@ # certain packages have been installed. Set the prefixes # accordingly. # -# 2. To use this makefile, set required varibles, eg SRCS, INTERFACE, -# INTERFACEDIR, INCLUDES, LIBS, TARGET, and do a +# 2. To use this makefile, simply set SRCS, INTERFACE, INCLUDES, LIBS, +# TARGET, and do a # $(MAKE) -f Makefile.template.in SRCS='$(SRCS)' \ # INCLUDES='$(INCLUDES) LIBS='$(LIBS)' INTERFACE='$(INTERFACE)' \ -# INTERFACEDIR='$(INTERFACEDIR)' TARGET='$(TARGET)' method +# TARGET='$(TARGET)' method # # 'method' describes what is being built. #--------------------------------------------------------------- @@ -31,8 +31,6 @@ SRCS = INCLUDES = LIBS = INTERFACE = -INTERFACEDIR = -INTERFACEPATH = $(INTERFACEDIR)$(INTERFACE) SWIGOPT = SWIG = swig @@ -98,8 +96,6 @@ TK_OPTS = -ltk -ltcl @LIBS@ # Extra Tcl specific dynamic linking options TCL_DLNK = @TCLDYNAMICLINKING@ TCL_SO = @TCL_SO@ -TCLLDSHARED = @TCLLDSHARED@ -TCLCXXSHARED = @TCLCXXSHARED@ # ----------------------------------------------------------- # Build a new version of the tclsh shell @@ -107,12 +103,12 @@ TCLCXXSHARED = @TCLCXXSHARED@ tclsh: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACEPATH) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE) $(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) tclsh_cpp: $(SRCS) - $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACEPATH) + $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) @@ -121,13 +117,13 @@ tclsh_cpp: $(SRCS) # ----------------------------------------------------------- wish: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACEPATH) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE) $(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) wish_cpp: $(SRCS) - $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACEPATH) + $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) @@ -136,18 +132,18 @@ wish_cpp: $(SRCS) # ----------------------------------------------------------- tcl: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) - $(TCLLDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------- # Build a Tcl7.5 dynamic loadable module for C++ # ----------------------------------------------------------- tcl_cpp: $(SRCS) - $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH) + $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) - $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------------- # Cleaning the Tcl examples @@ -177,7 +173,7 @@ PERL5_CCFLAGS = @PERL5CCFLAGS@ # ---------------------------------------------------------------- perl5: $(SRCS) - $(SWIG) -perl5 $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -perl5 $(SWIGOPT) $(INTERFACE) $(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -186,7 +182,7 @@ perl5: $(SRCS) # ---------------------------------------------------------------- perl5_cpp: $(SRCS) - $(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -204,11 +200,11 @@ perl5_xs: $(SRCS) PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS) perl5_static: $(SRCS) - $(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) -Dbool=char $(SRCS) $(ISRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) perl5_static_cpp: $(SRCS) - $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) # ----------------------------------------------------------------- @@ -225,39 +221,19 @@ perl5_clean: ################################################################## # Make sure these locate your Python installation -ifeq (,$(PY3)) - PYTHON_INCLUDE= $(DEFS) @PYINCLUDE@ - PYTHON_LIB = @PYLIB@ - PYTHON = @PYTHON@ -else - PYTHON_INCLUDE= $(DEFS) @PY3INCLUDE@ - PYTHON_LIB = @PY3LIB@ - PYTHON = @PYTHON3@ -endif +PYTHON_INCLUDE= $(DEFS) @PYINCLUDE@ +PYTHON_LIB = @PYLIB@ -# Extra Python specific linking options -ifeq (,$(PY3)) - PYTHON_DLNK = @PYTHONDYNAMICLINKING@ - PYTHON_LINK = @PYLINK@ -else - PYTHON_DLNK = @PYTHON3DYNAMICLINKING@ - PYTHON_LINK = @PY3LINK@ -endif +# Extra Python specific dynamic linking options +PYTHON_DLNK = @PYTHONDYNAMICLINKING@ PYTHON_SO = @PYTHON_SO@ -# SWIG option for Python -ifeq (,$(PY3)) - SWIGPYTHON = $(SWIG) -python -else - SWIGPYTHON = $(SWIG) -python -py3 -endif - # ---------------------------------------------------------------- # Build a C dynamically loadable module # ---------------------------------------------------------------- python: $(SRCS) - $(SWIGPYTHON) $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -python $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) @@ -266,7 +242,7 @@ python: $(SRCS) # ----------------------------------------------------------------- python_cpp: $(SRCS) - $(SWIGPYTHON) -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -python $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) @@ -279,37 +255,18 @@ python_cpp: $(SRCS) #TKINTER = -L/usr/X11R6.3/lib -L/usr/local/compat/lib -ltk4.0 -ltcl7.4 -lX11 TKINTER = -PYTHON_LIBOPTS = $(PYTHON_LINK) @LIBS@ $(TKINTER) $(SYSLIBS) +PYTHON_LIBOPTS = @PYLINK@ @LIBS@ $(TKINTER) $(SYSLIBS) python_static: $(SRCS) - $(SWIGPYTHON) -lembed.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -python -lembed.i $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) python_static_cpp: $(SRCS) - $(SWIGPYTHON) -c++ -lembed.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -python -lembed.i $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) -# ----------------------------------------------------------------- -# Running a Python example -# ----------------------------------------------------------------- - -ifeq (,$(PY3)) - PYSCRIPT = runme.py -else - PYSCRIPT = runme3.py -endif - -PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'` - -python_run: $(PYSCRIPT) - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT) >/dev/null - -runme3.py: runme.py - cp $< $@ - $(PY2TO3) -w $@ >/dev/null 2>&1 - # ----------------------------------------------------------------- # Cleaning the python examples # ----------------------------------------------------------------- @@ -318,8 +275,6 @@ python_clean: rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@ - if [ -f runme.py ]; then (rm -f runme3.py runme3.py.bak;) fi; - ################################################################## ##### OCTAVE ###### @@ -338,7 +293,7 @@ OCTAVE_SO = @OCTAVE_SO@ # ---------------------------------------------------------------- octave: $(SRCS) - $(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -octave $(SWIGOPT) $(INTERFACE) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDES) $(OCTAVE_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) @@ -348,7 +303,7 @@ octave: $(SRCS) # ----------------------------------------------------------------- octave_cpp: $(SRCS) - $(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACE) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CXXSHARED) -g $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) @@ -375,12 +330,12 @@ GUILE_LIBPREFIX = lib # Build a dynamically loaded module with passive linkage and the scm interface #------------------------------------------------------------------ guile: $(SRCS) - $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_cpp: $(SRCS) - $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -391,12 +346,12 @@ guile_externalhdr: # Build a dynamically loaded module with passive linkage and the gh interface #------------------------------------------------------------------ guile_gh: $(SRCS) - $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_gh_cpp: $(SRCS) - $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -405,12 +360,12 @@ guile_gh_cpp: $(SRCS) # ----------------------------------------------------------------- guile_passive: $(SRCS) - $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_passive_cpp: $(SRCS) - $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -421,24 +376,24 @@ guile_passive_cpp: $(SRCS) GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS) guile_static: $(SRCS) - $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_static_cpp: $(SRCS) - $(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple: $(SRCS) - $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple_cpp: $(SRCS) - $(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile @@ -473,7 +428,7 @@ JAVACFLAGS = @JAVACFLAGS@ # ---------------------------------------------------------------- java: $(SRCS) - $(SWIG) -java $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -java $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVALDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) @@ -482,7 +437,7 @@ java: $(SRCS) # ---------------------------------------------------------------- java_cpp: $(SRCS) - $(SWIG) -java -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) @@ -491,7 +446,7 @@ java_cpp: $(SRCS) # ----------------------------------------------------------------- java_clean: - rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v runme.java` + rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v main.java` rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@JAVASO@ @@ -506,12 +461,12 @@ MODULA3_INCLUDE= @MODULA3INC@ # ---------------------------------------------------------------- modula3: $(SRCS) - $(SWIG) -modula3 $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -modula3 $(SWIGOPT) $(INTERFACE) # $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) \ # $(OBJS) $(IOBJS) $(LIBS) modula3_cpp: $(SRCS) - $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACE) # ----------------------------------------------------------------- # Cleaning the modula3 examples @@ -526,7 +481,7 @@ modula3_clean: ##### MZSCHEME ###### ################################################################## -MZC = @MZC@ +MZC = test -n "@MZC@" && @MZC@ MZDYNOBJ = @MZDYNOBJ@ MZSCHEME_SO = @MZSCHEME_SO@ @@ -535,13 +490,13 @@ MZSCHEME_SO = @MZSCHEME_SO@ # ---------------------------------------------------------------- mzscheme: $(SRCS) - $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACEPATH) - $(COMPILETOOL) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS) - $(COMPILETOOL) $(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) + $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACE) + $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS) + $(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) mzscheme_cpp: $(SRCS) - $(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACEPATH) - $(COMPILETOOL) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) + $(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACE) + $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS) # ----------------------------------------------------------------- @@ -563,7 +518,6 @@ OCAMLFIND=@OCAMLFIND@ OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE) NOLINK ?= false OCAMLPP= -pp "camlp4o ./swigp4.cmo" -OCAMLP4WHERE=`$(COMPILETOOL) camlp4 -where` OCAMLCORE=\ rm -rf swig.mli swig.ml swigp4.ml && \ $(SWIG) -ocaml -co swig.mli 2>/dev/null && \ @@ -571,12 +525,12 @@ OCAMLCORE=\ $(SWIG) -ocaml -co swigp4.ml 2>/dev/null && \ $(OCC) -c swig.mli && \ $(OCC) -c swig.ml && \ - $(OCC) -I $(OCAMLP4WHERE) -pp "camlp4o pa_extend.cmo q_MLast.cmo" \ + $(OCC) -I `camlp4 -where` -pp "camlp4o pa_extend.cmo q_MLast.cmo" \ -c swigp4.ml ocaml_static: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.ml) @@ -590,7 +544,7 @@ ocaml_static: $(SRCS) ocaml_dynamic: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(CXXSHARED) $(CFLAGS) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(LIBS) @@ -609,7 +563,7 @@ ocaml_dynamic: $(SRCS) ocaml_static_toplevel: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.ml) @@ -617,14 +571,14 @@ ocaml_static_toplevel: $(SRCS) $(OCC) $(OCAMLPP) -c $(PROGFILE) $(NOLINK) || $(OCAMLMKTOP) \ swig.cmo \ - -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo \ + -I `camlp4 -where` camlp4o.cma swigp4.cmo \ -g -ccopt -g -cclib -g -custom -o $(TARGET)_top \ $(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" ocaml_static_cpp: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) @@ -641,7 +595,7 @@ ocaml_static_cpp: $(SRCS) ocaml_static_cpp_toplevel: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) @@ -651,7 +605,7 @@ ocaml_static_cpp_toplevel: $(SRCS) $(OCC) $(OCAMLPP) -c $(PROGFILE) $(NOLINK) || $(OCAMLMKTOP) \ swig.cmo \ - -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo \ + -I `camlp4 -where` camlp4o.cma swigp4.cmo \ -g -ccopt -g -cclib -g -custom -o $(TARGET)_top \ $(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \ @@ -659,7 +613,7 @@ ocaml_static_cpp_toplevel: $(SRCS) ocaml_dynamic_cpp: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) -ccopt -fPIC @@ -700,7 +654,7 @@ RUBY_DLNK = @RUBYDYNAMICLINKING@ # ---------------------------------------------------------------- ruby: $(SRCS) - $(SWIG) -ruby $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ruby $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(RUBY_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -709,7 +663,7 @@ ruby: $(SRCS) # ----------------------------------------------------------------- ruby_cpp: $(SRCS) - $(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(RUBY_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -723,12 +677,12 @@ ruby_cpp: $(SRCS) RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS) ruby_static: $(SRCS) - $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) $(RUBY_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) ruby_cpp_static: $(SRCS) - $(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) @@ -747,41 +701,41 @@ ruby_clean: ################################################################## # ------------------------------------------------------------------- -# Build a PHP dynamically loadable module (C) +# Build a PHP4 dynamically loadable module (C) # ------------------------------------------------------------------- -PHP_INCLUDE = @PHPINC@ -PHP_SO = @PHP_SO@ +PHP4_INCLUDE = @PHP4INC@ +PHP4_SO = @PHP4_SO@ -php: $(SRCS) - $(SWIG) -php $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP_INCLUDE) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO) +php4: $(SRCS) + $(SWIG) -php5 $(SWIGOPT) $(INTERFACE) + $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) # -------------------------------------------------------------------- -# Build a PHP dynamically loadable module (C++) +# Build a PHP4 dynamically loadable module (C++) # -------------------------------------------------------------------- -php_cpp: $(SRCS) - $(SWIG) -php -cppext cxx -c++ $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP_INCLUDE) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO) +php4_cpp: $(SRCS) + $(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACE) + $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) # ----------------------------------------------------------------- -# Running a PHP example +# Running a PHP4 example # ----------------------------------------------------------------- -PHP=@PHP@ -PHPSCRIPT ?= runme.php +PHP4=@PHP4@ +SCRIPT ?= runme.php4 -php_run: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHPSCRIPT) +php4_run: + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(SCRIPT) # ----------------------------------------------------------------- -# Cleaning the PHP examples +# Cleaning the PHP4 examples # ----------------------------------------------------------------- -php_clean: +php4_clean: rm -f *_wrap* *~ .~* example.php php_example.h rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ @@ -801,7 +755,7 @@ PIKE_DLNK = @PIKEDYNAMICLINKING@ # ---------------------------------------------------------------- pike: $(SRCS) - $(SWIG) -pike $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -pike $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PIKE_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -810,7 +764,7 @@ pike: $(SRCS) # ----------------------------------------------------------------- pike_cpp: $(SRCS) - $(SWIG) -c++ -pike $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -pike $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PIKE_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -824,12 +778,12 @@ pike_cpp: $(SRCS) PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS) pike_static: $(SRCS) - $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) pike_cpp_static: $(SRCS) - $(SWIG) -c++ -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -pike -lembed.i $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) @@ -871,7 +825,7 @@ CHICKEN_COMPILED_MAIN_OBJECT = $(CHICKEN_COMPILED_MAIN:.c=.@OBJEXT@) # This is the old way to build chicken, but it does not work correctly with exceptions chicken_direct: $(SRCS) - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -dynamic -feature chicken-compile-shared \ -output-file $(CHICKEN_COMPILED_SCHEME) @@ -881,7 +835,7 @@ chicken_direct: $(SRCS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(LIBPREFIX)$(TARGET)$(SO) chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS) - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -dynamic -feature chicken-compile-shared \ -output-file $(CHICKEN_COMPILED_SCHEME) @@ -896,7 +850,7 @@ chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS) # The following two targets are also used by the test suite chicken_static: $(SRCS) $(CHICKSRCS) - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -output-file $(CHICKEN_COMPILED_SCHEME) $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ @@ -908,7 +862,7 @@ chicken_static: $(SRCS) $(CHICKSRCS) $(OBJS) $(IOBJS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(TARGET) chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -output-file $(CHICKEN_COMPILED_SCHEME) $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ @@ -924,11 +878,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) # ---------------------------------------------------------------- chicken: - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) chicken_cpp: - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) chicken_externalhdr: @@ -956,7 +910,7 @@ CSHARPSO = @CSHARPSO@ # ---------------------------------------------------------------- csharp: $(SRCS) - $(SWIG) -csharp $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -csharp $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) @@ -965,7 +919,7 @@ csharp: $(SRCS) # ---------------------------------------------------------------- csharp_cpp: $(SRCS) - $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) @@ -1005,7 +959,7 @@ LUA_INTERP = ../lua.c # ---------------------------------------------------------------- lua: $(SRCS) - $(SWIG) -lua $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -lua $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LUA_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) @@ -1014,7 +968,7 @@ lua: $(SRCS) # ----------------------------------------------------------------- lua_cpp: $(SRCS) - $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(LUA_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) @@ -1023,12 +977,12 @@ lua_cpp: $(SRCS) # ----------------------------------------------------------------- lua_static: $(SRCS) - $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACE) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) lua_static_cpp: $(SRCS) - $(SWIG) -c++ -lua -module example $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -lua -module example $(SWIGOPT) $(INTERFACE) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) @@ -1046,12 +1000,12 @@ lua_clean: ################################################################## allegrocl: $(SRCS) - $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) allegrocl_cpp: $(SRCS) - $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1065,10 +1019,10 @@ allegrocl_clean: ################################################################## clisp: $(SRCS) - $(SWIG) -clisp $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -clisp $(SWIGOPT) $(INTERFACE) clisp_cpp: $(SRCS) - $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACE) clisp_clean: rm -f *_wrap* *~ .~* @@ -1080,12 +1034,12 @@ clisp_clean: ################################################################## cffi: $(SRCS) - $(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -cffi $(SWIGOPT) $(INTERFACE) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) cffi_cpp: $(SRCS) - $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1099,12 +1053,12 @@ cffi_clean: ################################################################## uffi: $(SRCS) - $(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -uffi $(SWIGOPT) $(INTERFACE) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) uffi_cpp: $(SRCS) - $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACE) # $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) # $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1122,11 +1076,11 @@ RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #Need to use _wrap.cpp for R build system a RRSRC = $(INTERFACE:.i=.R) r: $(SRCS) - $(SWIG) -r $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -r $(SWIGOPT) $(INTERFACE) +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) r_cpp: $(CXXSRCS) - $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH) + $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE) +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) r_clean: @@ -1149,12 +1103,12 @@ CXX_LDSHARED = @CXX_LDSHARED@ C_SO = @C_SO@ c: $(SRCS) - $(SWIG) -c $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c $(SWIGOPT) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_cpp: $(SRCS) - $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) diff --git a/Examples/csharp/arrays/Makefile b/Examples/csharp/arrays/Makefile deleted file mode 100644 index b3446d895..000000000 --- a/Examples/csharp/arrays/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -SRCS = example.c -TARGET = example -INTERFACE = example.i -SWIGOPT = -CSHARPSRCS = *.cs -CSHARPFLAGS= -nologo -unsafe -out:runme.exe - -all:: csharp - -csharp:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp - $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile - -clean:: - $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/arrays/example.c b/Examples/csharp/arrays/example.c deleted file mode 100644 index 2498e1f4e..000000000 --- a/Examples/csharp/arrays/example.c +++ /dev/null @@ -1,22 +0,0 @@ -/* File : example.c */ - -#include "example.h" - -/* copy the contents of the first array to the second */ -void myArrayCopy( int* sourceArray, int* targetArray, int nitems ) { - int i; - for ( i = 0; i < nitems; i++ ) { - targetArray[ i ] = sourceArray[ i ]; - } -} - -/* swap the contents of the two arrays */ -void myArraySwap( int* array1, int* array2, int nitems ) { - int i, temp; - for ( i = 0; i < nitems; i++ ) { - temp = array1[ i ]; - array1[ i ] = array2[ i ]; - array2[ i ] = temp; - } -} - diff --git a/Examples/csharp/arrays/example.h b/Examples/csharp/arrays/example.h deleted file mode 100644 index 113b92c1b..000000000 --- a/Examples/csharp/arrays/example.h +++ /dev/null @@ -1,4 +0,0 @@ - -void myArrayCopy( int *sourceArray, int* targetArray, int nitems ); -void myArraySwap( int* array1, int* array2, int nitems ); - diff --git a/Examples/csharp/arrays/example.i b/Examples/csharp/arrays/example.i deleted file mode 100644 index 488565a74..000000000 --- a/Examples/csharp/arrays/example.i +++ /dev/null @@ -1,45 +0,0 @@ -/* File : example.i */ -%module example - -%{ -#include "example.h" -%} -%include "arrays_csharp.i" - -%apply int INPUT[] { int* sourceArray } -%apply int OUTPUT[] { int* targetArray } - -%apply int INOUT[] { int* array1 } -%apply int INOUT[] { int* array2 } - -%include "example.h" - -%clear int* sourceArray; -%clear int* targetArray; - -%clear int* array1; -%clear int* array2; - - -// Below replicates the above array handling but this time using the pinned (fixed) array typemaps -%csmethodmodifiers "public unsafe"; - -%apply int FIXED[] { int* sourceArray } -%apply int FIXED[] { int* targetArray } - -%inline %{ -void myArrayCopyUsingFixedArrays( int *sourceArray, int* targetArray, int nitems ) { - myArrayCopy(sourceArray, targetArray, nitems); -} -%} - -%apply int FIXED[] { int* array1 } -%apply int FIXED[] { int* array2 } - -%inline %{ -void myArraySwapUsingFixedArrays( int* array1, int* array2, int nitems ) { - myArraySwap(array1, array2, nitems); -} -%} - - diff --git a/Examples/csharp/arrays/runme.cs b/Examples/csharp/arrays/runme.cs deleted file mode 100644 index c2b8a6bdd..000000000 --- a/Examples/csharp/arrays/runme.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; - -public class runme -{ - static void Main() - { - int[] source = { 1, 2, 3 }; - int[] target = new int[ source.Length ]; - - example.myArrayCopy( source, target, target.Length ); - - Console.WriteLine( "Contents of copy target array using default marshaling" ); - PrintArray( target ); - - target = new int[ source.Length ]; - - example.myArrayCopyUsingFixedArrays( source, target, target.Length ); - Console.WriteLine( "Contents of copy target array using fixed arrays" ); - PrintArray( target ); - - target = new int[] { 4, 5, 6 }; - example.myArraySwap( source, target, target.Length ); - Console.WriteLine( "Contents of arrays after swapping using default marshaling" ); - PrintArray( source ); - PrintArray( target ); - - source = new int[] { 1, 2, 3 }; - target = new int[] { 4, 5, 6 }; - - example.myArraySwapUsingFixedArrays( source, target, target.Length ); - Console.WriteLine( "Contents of arrays after swapping using fixed arrays" ); - PrintArray( source ); - PrintArray( target ); - } - - static void PrintArray( int[] a ) - { - foreach ( int i in a ) - Console.Write( "{0} ", i ); - Console.WriteLine(); - } -} - diff --git a/Examples/csharp/check.list b/Examples/csharp/check.list index 5454d8531..c4d92402b 100644 --- a/Examples/csharp/check.list +++ b/Examples/csharp/check.list @@ -1,5 +1,4 @@ # see top-level Makefile.in -arrays callback class enum diff --git a/Examples/guile/matrix/matrix.scm b/Examples/guile/matrix/matrix.scm old mode 100644 new mode 100755 diff --git a/Examples/java/callback/runme.java b/Examples/java/callback/main.java similarity index 98% rename from Examples/java/callback/runme.java rename to Examples/java/callback/main.java index 4090f0ac3..4800f8cc9 100644 --- a/Examples/java/callback/runme.java +++ b/Examples/java/callback/main.java @@ -1,4 +1,4 @@ -public class runme +public class main { static { try { diff --git a/Examples/java/class/index.html b/Examples/java/class/index.html index cf9130c62..e9db7e94a 100644 --- a/Examples/java/class/index.html +++ b/Examples/java/class/index.html @@ -88,7 +88,7 @@ Note: when creating a C++ extension, you must run SWIG with the -c++ op

        A sample Java program

        -Click here to see a Java program that calls the C++ functions from Java. +Click here to see a Java program that calls the C++ functions from Java.

        Key points

        diff --git a/Examples/java/class/runme.java b/Examples/java/class/main.java similarity index 99% rename from Examples/java/class/runme.java rename to Examples/java/class/main.java index e1ea0d71c..8ef35db6d 100644 --- a/Examples/java/class/runme.java +++ b/Examples/java/class/main.java @@ -1,7 +1,7 @@ // This example illustrates how C++ classes can be used from Java using SWIG. // The Java class gets mapped onto the C++ class and behaves as if it is a Java class. -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/java/constants/index.html b/Examples/java/constants/index.html index 9f1e95a03..8367d0571 100644 --- a/Examples/java/constants/index.html +++ b/Examples/java/constants/index.html @@ -20,7 +20,7 @@ to see a SWIG interface with some constant declarations in it. Click here for the section on constants in the SWIG and Java documentation.

        -Click here to see a Java program that prints out the values +Click here to see a Java program that prints out the values of the constants contained in the above file.

        Key points

          diff --git a/Examples/java/constants/runme.java b/Examples/java/constants/main.java similarity index 98% rename from Examples/java/constants/runme.java rename to Examples/java/constants/main.java index 2c67d86aa..7130c3d70 100644 --- a/Examples/java/constants/runme.java +++ b/Examples/java/constants/main.java @@ -1,6 +1,6 @@ import java.lang.reflect.*; -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/java/enum/index.html b/Examples/java/enum/index.html index 20daf2691..52c06c5d1 100644 --- a/Examples/java/enum/index.html +++ b/Examples/java/enum/index.html @@ -21,7 +21,7 @@ See the documentation for the other approaches for wrapping enums.
          diff --git a/Examples/java/enum/runme.java b/Examples/java/enum/main.java similarity index 98% rename from Examples/java/enum/runme.java rename to Examples/java/enum/main.java index 56e49af91..8646e0087 100644 --- a/Examples/java/enum/runme.java +++ b/Examples/java/enum/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/java/extend/runme.java b/Examples/java/extend/main.java similarity index 99% rename from Examples/java/extend/runme.java rename to Examples/java/extend/main.java index 629bb14a6..ee3a94ed0 100644 --- a/Examples/java/extend/runme.java +++ b/Examples/java/extend/main.java @@ -17,7 +17,7 @@ class CEO extends Manager { } -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/java/funcptr/index.html b/Examples/java/funcptr/index.html index 56d3baa18..0ad2be1cf 100644 --- a/Examples/java/funcptr/index.html +++ b/Examples/java/funcptr/index.html @@ -66,7 +66,7 @@ Here are some files that illustrate this with a simple example:
        • example.c
        • example.h
        • example.i (SWIG interface) -
        • runme.java (Sample program) +
        • main.java (Sample program)

        Notes

        diff --git a/Examples/java/funcptr/runme.java b/Examples/java/funcptr/main.java similarity index 98% rename from Examples/java/funcptr/runme.java rename to Examples/java/funcptr/main.java index cd34c1b65..cf81f92b4 100644 --- a/Examples/java/funcptr/runme.java +++ b/Examples/java/funcptr/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/java/index.html b/Examples/java/index.html index 007e14dbc..d98f9a393 100644 --- a/Examples/java/index.html +++ b/Examples/java/index.html @@ -30,7 +30,7 @@ certain C declarations are turned into constants.

        Running the examples

        Please see the Windows page in the main manual for information on using the examples on Windows.

        -On Unix most of the examples work by making the Makefile before executing the program runme.java. The Makefile will output the swig generated JNI c code as well as the Java wrapper classes. Additionally the JNI c/c++ code is compiled into the shared object (dynamic link library) which is needed for dynamic linking to the native code. The Makefiles also compile the Java files using javac. +On Unix most of the examples work by making the Makefile before executing the program main.java. The Makefile will output the swig generated JNI c code as well as the Java wrapper classes. Additionally the JNI c/c++ code is compiled into the shared object (dynamic link library) which is needed for dynamic linking to the native code. The Makefiles also compile the Java files using javac.

        Ensure that the dynamic link library file is in the appropriate path before executing the Java program. For example in Unix, libexample.so must be in the LD_LIBRARY_PATH.

        @@ -39,7 +39,7 @@ A Unix example: 

         $ make
 $ export LD_LIBRARY_PATH=. #ksh 
-$ java runme
+$ java main

        diff --git a/Examples/java/multimap/runme.java b/Examples/java/multimap/main.java similarity index 97% rename from Examples/java/multimap/runme.java rename to Examples/java/multimap/main.java index 738330e77..331ac6b89 100644 --- a/Examples/java/multimap/runme.java +++ b/Examples/java/multimap/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/java/native/index.html b/Examples/java/native/index.html index 1ca51c1e9..7ecf129ce 100644 --- a/Examples/java/native/index.html +++ b/Examples/java/native/index.html @@ -18,7 +18,7 @@ This example compares wrapping a c global function using the manual way and the

        • example.i. Interface file comparing code wrapped by SWIG and wrapped manually. -
        • runme.java. Sample Java program showing calls to both manually wrapped and SWIG wrapped c functions. +
        • main.java. Sample Java program showing calls to both manually wrapped and SWIG wrapped c functions.

        Notes

        diff --git a/Examples/java/native/runme.java b/Examples/java/native/main.java similarity index 96% rename from Examples/java/native/runme.java rename to Examples/java/native/main.java index e9a18b21a..f4760bb3d 100644 --- a/Examples/java/native/runme.java +++ b/Examples/java/native/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/java/pointer/index.html b/Examples/java/pointer/index.html index e20fe3328..c30d549e6 100644 --- a/Examples/java/pointer/index.html +++ b/Examples/java/pointer/index.html @@ -144,7 +144,7 @@ extraction.

        Notes

        diff --git a/Examples/java/pointer/runme.java b/Examples/java/pointer/main.java similarity index 98% rename from Examples/java/pointer/runme.java rename to Examples/java/pointer/main.java index f32f980f9..e96e02eaa 100644 --- a/Examples/java/pointer/runme.java +++ b/Examples/java/pointer/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/java/reference/index.html b/Examples/java/reference/index.html index 33c80c50f..64b129cbb 100644 --- a/Examples/java/reference/index.html +++ b/Examples/java/reference/index.html @@ -121,7 +121,7 @@ Click here to see a SWIG interface file with these addit

        Sample Java program

        -Click here to see a Java program that manipulates some C++ references. +Click here to see a Java program that manipulates some C++ references.

        Notes:

        diff --git a/Examples/java/reference/runme.java b/Examples/java/reference/main.java similarity index 99% rename from Examples/java/reference/runme.java rename to Examples/java/reference/main.java index 6a2d9bf70..4fd354761 100644 --- a/Examples/java/reference/runme.java +++ b/Examples/java/reference/main.java @@ -1,6 +1,6 @@ // This example illustrates the manipulation of C++ references in Java. -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/java/simple/index.html b/Examples/java/simple/index.html index 9729e6dd8..a363327fe 100644 --- a/Examples/java/simple/index.html +++ b/Examples/java/simple/index.html @@ -65,15 +65,15 @@ to create the extension libexample.so (unix).

        Using the extension

        -Click here to see a program that calls our C functions from Java. +Click here to see a program that calls our C functions from Java.

        -Compile the java files example.java and runme.java -to create the class files example.class and runme.class before running runme in the JVM. Ensure that the libexample.so file is in your LD_LIBRARY_PATH before running. For example: +Compile the java files example.java and main.java +to create the class files example.class and main.class before running main in the JVM. Ensure that the libexample.so file is in your LD_LIBRARY_PATH before running. For example: 

         export LD_LIBRARY_PATH=. #ksh 
 javac *.java
-java runme
+java main
        diff --git a/Examples/java/simple/runme.java b/Examples/java/simple/main.java similarity index 97% rename from Examples/java/simple/runme.java rename to Examples/java/simple/main.java index 92880e8f9..6d224a4dc 100644 --- a/Examples/java/simple/runme.java +++ b/Examples/java/simple/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/java/template/index.html b/Examples/java/template/index.html index f4408e568..1aebd4c2a 100644 --- a/Examples/java/template/index.html +++ b/Examples/java/template/index.html @@ -85,7 +85,7 @@ Note that SWIG parses the templated function max and templated class A sample Java program -Click here to see a Java program that calls the C++ functions from Java. +Click here to see a Java program that calls the C++ functions from Java.

        Notes

        Use templated classes just like you would any other SWIG generated Java class. Use the classnames specified by the %template directive. diff --git a/Examples/java/template/runme.java b/Examples/java/template/main.java similarity index 98% rename from Examples/java/template/runme.java rename to Examples/java/template/main.java index 5d1097bba..9129fcf2a 100644 --- a/Examples/java/template/runme.java +++ b/Examples/java/template/main.java @@ -1,6 +1,6 @@ // This example illustrates how C++ templates can be used from Java. -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/java/typemap/index.html b/Examples/java/typemap/index.html index 5dd591941..486aa8e79 100644 --- a/Examples/java/typemap/index.html +++ b/Examples/java/typemap/index.html @@ -16,7 +16,7 @@ This example shows how typemaps can be used to modify the default behaviour of t

        Notes

        diff --git a/Examples/java/typemap/runme.java b/Examples/java/typemap/main.java similarity index 96% rename from Examples/java/typemap/runme.java rename to Examples/java/typemap/main.java index fcbcc3067..bd9a4e1b6 100644 --- a/Examples/java/typemap/runme.java +++ b/Examples/java/typemap/main.java @@ -1,5 +1,5 @@ -public class runme { +public class main { static { try { diff --git a/Examples/java/variables/index.html b/Examples/java/variables/index.html index 07b19d4e7..05aaa2d6e 100644 --- a/Examples/java/variables/index.html +++ b/Examples/java/variables/index.html @@ -38,7 +38,7 @@ example.set_foo(12.3); -Click here to see the example program that updates and prints +Click here to see the example program that updates and prints out the values of the variables using this technique.

        Key points

        diff --git a/Examples/java/variables/runme.java b/Examples/java/variables/main.java similarity index 99% rename from Examples/java/variables/runme.java rename to Examples/java/variables/main.java index 361a30fa6..92745db99 100644 --- a/Examples/java/variables/runme.java +++ b/Examples/java/variables/main.java @@ -2,7 +2,7 @@ import java.lang.reflect.*; -public class runme { +public class main { static { try { System.loadLibrary("example"); diff --git a/Examples/lua/embed3/embed3.cpp b/Examples/lua/embed3/embed3.cpp index e5e0e0a7d..c2424f9af 100644 --- a/Examples/lua/embed3/embed3.cpp +++ b/Examples/lua/embed3/embed3.cpp @@ -26,12 +26,7 @@ extern "C" { #include #include } - -/* The SWIG external runtime is generated by using. -swig -lua -externalruntime swigluarun.h -It contains useful function used by SWIG in its wrappering -SWIG_TypeQuery() SWIG_NewPointerObj() -*/ + #include "swigluarun.h" // the SWIG external runtime /* the SWIG wrappered library */ diff --git a/Examples/perl5/class/example.dsp b/Examples/perl5/class/example.dsp index b5ccd1928..bbdedc094 100644 --- a/Examples/perl5/class/example.dsp +++ b/Examples/perl5/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/bar.dsp b/Examples/perl5/import/bar.dsp index 64786b8f6..682c21757 100644 --- a/Examples/perl5/import/bar.dsp +++ b/Examples/perl5/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/base.dsp b/Examples/perl5/import/base.dsp index 920891cbf..7a0ea8027 100644 --- a/Examples/perl5/import/base.dsp +++ b/Examples/perl5/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/foo.dsp b/Examples/perl5/import/foo.dsp index d519a5316..755560165 100644 --- a/Examples/perl5/import/foo.dsp +++ b/Examples/perl5/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/import/spam.dsp b/Examples/perl5/import/spam.dsp index e5c8046eb..ed41de36b 100644 --- a/Examples/perl5/import/spam.dsp +++ b/Examples/perl5/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig -c++ -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/multimap/example.dsp b/Examples/perl5/multimap/example.dsp index be8a0070e..2d295763b 100644 --- a/Examples/perl5/multimap/example.dsp +++ b/Examples/perl5/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig -perl5 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig -perl5 $(InputPath) # End Custom Build diff --git a/Examples/perl5/simple/example.dsp b/Examples/perl5/simple/example.dsp index be8a0070e..2d295763b 100644 --- a/Examples/perl5/simple/example.dsp +++ b/Examples/perl5/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig -perl5 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig -perl5 $(InputPath) # End Custom Build diff --git a/Examples/php/variables/Makefile b/Examples/php/variables/Makefile deleted file mode 100644 index 0862ce5ec..000000000 --- a/Examples/php/variables/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -SRCS = example.c -TARGET = example -INTERFACE = example.i -LIBS = -SWIGOPT = - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static - -clean:: - $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/check.list b/Examples/php4/check.list similarity index 100% rename from Examples/php/check.list rename to Examples/php4/check.list diff --git a/Examples/php/class/Makefile b/Examples/php4/class/Makefile similarity index 71% rename from Examples/php/class/Makefile rename to Examples/php4/class/Makefile index 252a72660..39c4d2f23 100644 --- a/Examples/php/class/Makefile +++ b/Examples/php4/class/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/class/example.cxx b/Examples/php4/class/example.cxx similarity index 100% rename from Examples/php/class/example.cxx rename to Examples/php4/class/example.cxx diff --git a/Examples/php/class/example.h b/Examples/php4/class/example.h similarity index 100% rename from Examples/php/class/example.h rename to Examples/php4/class/example.h diff --git a/Examples/php/class/example.i b/Examples/php4/class/example.i similarity index 100% rename from Examples/php/class/example.i rename to Examples/php4/class/example.i diff --git a/Examples/php/class/runme.php b/Examples/php4/class/runme.php4 similarity index 100% rename from Examples/php/class/runme.php rename to Examples/php4/class/runme.php4 diff --git a/Examples/php/pragmas/Makefile b/Examples/php4/constants/Makefile similarity index 70% rename from Examples/php/pragmas/Makefile rename to Examples/php4/constants/Makefile index 23e2675d7..aed110eb2 100644 --- a/Examples/php/pragmas/Makefile +++ b/Examples/php4/constants/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/constants/example.i b/Examples/php4/constants/example.i similarity index 100% rename from Examples/php/constants/example.i rename to Examples/php4/constants/example.i diff --git a/Examples/php/constants/runme.php b/Examples/php4/constants/runme.php4 similarity index 100% rename from Examples/php/constants/runme.php rename to Examples/php4/constants/runme.php4 diff --git a/Examples/php/funcptr/Makefile b/Examples/php4/cpointer/Makefile similarity index 71% rename from Examples/php/funcptr/Makefile rename to Examples/php4/cpointer/Makefile index 0862ce5ec..caeec2d73 100644 --- a/Examples/php/funcptr/Makefile +++ b/Examples/php4/cpointer/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/cpointer/example.c b/Examples/php4/cpointer/example.c similarity index 100% rename from Examples/php/cpointer/example.c rename to Examples/php4/cpointer/example.c diff --git a/Examples/php/cpointer/example.i b/Examples/php4/cpointer/example.i similarity index 100% rename from Examples/php/cpointer/example.i rename to Examples/php4/cpointer/example.i diff --git a/Examples/php/cpointer/runme.php b/Examples/php4/cpointer/runme.php4 similarity index 100% rename from Examples/php/cpointer/runme.php rename to Examples/php4/cpointer/runme.php4 diff --git a/Examples/php/proxy/Makefile b/Examples/php4/disown/Makefile similarity index 70% rename from Examples/php/proxy/Makefile rename to Examples/php4/disown/Makefile index 1bc0beaab..ef3acc773 100644 --- a/Examples/php/proxy/Makefile +++ b/Examples/php4/disown/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/disown/example.cxx b/Examples/php4/disown/example.cxx similarity index 100% rename from Examples/php/disown/example.cxx rename to Examples/php4/disown/example.cxx diff --git a/Examples/php/disown/example.h b/Examples/php4/disown/example.h similarity index 100% rename from Examples/php/disown/example.h rename to Examples/php4/disown/example.h diff --git a/Examples/php/disown/example.i b/Examples/php4/disown/example.i similarity index 100% rename from Examples/php/disown/example.i rename to Examples/php4/disown/example.i diff --git a/Examples/php/disown/runme.php b/Examples/php4/disown/runme.php4 similarity index 100% rename from Examples/php/disown/runme.php rename to Examples/php4/disown/runme.php4 diff --git a/Examples/php/enum/Makefile b/Examples/php4/enum/Makefile similarity index 71% rename from Examples/php/enum/Makefile rename to Examples/php4/enum/Makefile index 252a72660..39c4d2f23 100644 --- a/Examples/php/enum/Makefile +++ b/Examples/php4/enum/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/enum/example.cxx b/Examples/php4/enum/example.cxx similarity index 100% rename from Examples/php/enum/example.cxx rename to Examples/php4/enum/example.cxx diff --git a/Examples/php/enum/example.h b/Examples/php4/enum/example.h similarity index 100% rename from Examples/php/enum/example.h rename to Examples/php4/enum/example.h diff --git a/Examples/php/enum/example.i b/Examples/php4/enum/example.i similarity index 100% rename from Examples/php/enum/example.i rename to Examples/php4/enum/example.i diff --git a/Examples/php/enum/runme.php b/Examples/php4/enum/runme.php4 similarity index 100% rename from Examples/php/enum/runme.php rename to Examples/php4/enum/runme.php4 diff --git a/Examples/php/simple/Makefile b/Examples/php4/funcptr/Makefile similarity index 71% rename from Examples/php/simple/Makefile rename to Examples/php4/funcptr/Makefile index 0862ce5ec..caeec2d73 100644 --- a/Examples/php/simple/Makefile +++ b/Examples/php4/funcptr/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/funcptr/example.c b/Examples/php4/funcptr/example.c similarity index 100% rename from Examples/php/funcptr/example.c rename to Examples/php4/funcptr/example.c diff --git a/Examples/php/funcptr/example.h b/Examples/php4/funcptr/example.h similarity index 100% rename from Examples/php/funcptr/example.h rename to Examples/php4/funcptr/example.h diff --git a/Examples/php/funcptr/example.i b/Examples/php4/funcptr/example.i similarity index 100% rename from Examples/php/funcptr/example.i rename to Examples/php4/funcptr/example.i diff --git a/Examples/php/funcptr/runme.php b/Examples/php4/funcptr/runme.php4 similarity index 100% rename from Examples/php/funcptr/runme.php rename to Examples/php4/funcptr/runme.php4 diff --git a/Examples/php/sync/Makefile b/Examples/php4/overloading/Makefile similarity index 70% rename from Examples/php/sync/Makefile rename to Examples/php4/overloading/Makefile index 1bc0beaab..ef3acc773 100644 --- a/Examples/php/sync/Makefile +++ b/Examples/php4/overloading/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/overloading/example.cxx b/Examples/php4/overloading/example.cxx similarity index 78% rename from Examples/php/overloading/example.cxx rename to Examples/php4/overloading/example.cxx index 2f684f05c..fc7aff195 100644 --- a/Examples/php/overloading/example.cxx +++ b/Examples/php4/overloading/example.cxx @@ -34,22 +34,22 @@ double Square::perimeter(void) { return 4*width; } -const char *overloaded(int i) { +char *overloaded(int i) { return "Overloaded with int"; } -const char *overloaded(double d) { +char *overloaded(double d) { return "Overloaded with double"; } -const char *overloaded(const char * str) { +char *overloaded(const char * str) { return "Overloaded with char *"; } -const char *overloaded( const Circle& ) { +char *overloaded( const Circle& ) { return "Overloaded with Circle"; } -const char *overloaded( const Shape& ) { +char *overloaded( const Shape& ) { return "Overloaded with Shape"; } diff --git a/Examples/php/overloading/example.h b/Examples/php4/overloading/example.h similarity index 77% rename from Examples/php/overloading/example.h rename to Examples/php4/overloading/example.h index 01d71dd70..39ccc1cb1 100644 --- a/Examples/php/overloading/example.h +++ b/Examples/php4/overloading/example.h @@ -38,9 +38,9 @@ public: virtual double perimeter(void); }; -const char *overloaded( int i ); -const char *overloaded( double d ); -const char *overloaded( const char * str ); -const char *overloaded( const Circle& ); -const char *overloaded( const Shape& ); +char *overloaded( int i ); +char *overloaded( double d ); +char *overloaded( const char * str ); +char *overloaded( const Circle& ); +char *overloaded( const Shape& ); diff --git a/Examples/php/overloading/example.i b/Examples/php4/overloading/example.i similarity index 100% rename from Examples/php/overloading/example.i rename to Examples/php4/overloading/example.i diff --git a/Examples/php/overloading/runme.php b/Examples/php4/overloading/runme.php4 similarity index 100% rename from Examples/php/overloading/runme.php rename to Examples/php4/overloading/runme.php4 diff --git a/Examples/php/pointer/Makefile b/Examples/php4/pointer/Makefile similarity index 71% rename from Examples/php/pointer/Makefile rename to Examples/php4/pointer/Makefile index 0862ce5ec..caeec2d73 100644 --- a/Examples/php/pointer/Makefile +++ b/Examples/php4/pointer/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/pointer/example.c b/Examples/php4/pointer/example.c similarity index 100% rename from Examples/php/pointer/example.c rename to Examples/php4/pointer/example.c diff --git a/Examples/php/pointer/example.i b/Examples/php4/pointer/example.i similarity index 100% rename from Examples/php/pointer/example.i rename to Examples/php4/pointer/example.i diff --git a/Examples/php/pointer/runme.php b/Examples/php4/pointer/runme.php4 similarity index 100% rename from Examples/php/pointer/runme.php rename to Examples/php4/pointer/runme.php4 diff --git a/Examples/php/constants/Makefile b/Examples/php4/pragmas/Makefile similarity index 70% rename from Examples/php/constants/Makefile rename to Examples/php4/pragmas/Makefile index 23e2675d7..aed110eb2 100644 --- a/Examples/php/constants/Makefile +++ b/Examples/php4/pragmas/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/pragmas/example.i b/Examples/php4/pragmas/example.i similarity index 70% rename from Examples/php/pragmas/example.i rename to Examples/php4/pragmas/example.i index c7e8bf303..289d4ec99 100644 --- a/Examples/php/pragmas/example.i +++ b/Examples/php4/pragmas/example.i @@ -21,11 +21,11 @@ zend_printf("This was %%rshutdown\n"); } -%pragma(php) include="include.php"; +%pragma(php4) include="include.php"; -%pragma(php) code=" +%pragma(php4) code=" # This code is inserted into example.php -echo \"this was php code\\n\"; +echo \"this was php4 code\\n\"; " -%pragma(php) phpinfo="php_info_print_table_start();" +%pragma(php4) phpinfo="php_info_print_table_start();" diff --git a/Examples/php/pragmas/include.php b/Examples/php4/pragmas/include.php similarity index 100% rename from Examples/php/pragmas/include.php rename to Examples/php4/pragmas/include.php diff --git a/Examples/php/pragmas/runme.php b/Examples/php4/pragmas/runme.php4 similarity index 100% rename from Examples/php/pragmas/runme.php rename to Examples/php4/pragmas/runme.php4 diff --git a/Examples/php/disown/Makefile b/Examples/php4/proxy/Makefile similarity index 70% rename from Examples/php/disown/Makefile rename to Examples/php4/proxy/Makefile index 1bc0beaab..ef3acc773 100644 --- a/Examples/php/disown/Makefile +++ b/Examples/php4/proxy/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/proxy/example.cxx b/Examples/php4/proxy/example.cxx similarity index 100% rename from Examples/php/proxy/example.cxx rename to Examples/php4/proxy/example.cxx diff --git a/Examples/php/proxy/example.h b/Examples/php4/proxy/example.h similarity index 100% rename from Examples/php/proxy/example.h rename to Examples/php4/proxy/example.h diff --git a/Examples/php/proxy/example.i b/Examples/php4/proxy/example.i similarity index 100% rename from Examples/php/proxy/example.i rename to Examples/php4/proxy/example.i diff --git a/Examples/php/proxy/runme.php b/Examples/php4/proxy/runme.php4 similarity index 100% rename from Examples/php/proxy/runme.php rename to Examples/php4/proxy/runme.php4 diff --git a/Examples/php4/reference/BUILD-proxy.sh b/Examples/php4/reference/BUILD-proxy.sh new file mode 100755 index 000000000..b1c8c71a4 --- /dev/null +++ b/Examples/php4/reference/BUILD-proxy.sh @@ -0,0 +1,5 @@ +#! /bin/sh -e + +${SWIG:=swig} -php4 -make -c++ -withcxx example.cxx example.i +make +php -d extension_dir=. runme-proxy.php4 diff --git a/Examples/php/reference/Makefile b/Examples/php4/reference/Makefile similarity index 71% rename from Examples/php/reference/Makefile rename to Examples/php4/reference/Makefile index 252a72660..39c4d2f23 100644 --- a/Examples/php/reference/Makefile +++ b/Examples/php4/reference/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/reference/example.cxx b/Examples/php4/reference/example.cxx similarity index 100% rename from Examples/php/reference/example.cxx rename to Examples/php4/reference/example.cxx diff --git a/Examples/php/reference/example.h b/Examples/php4/reference/example.h similarity index 100% rename from Examples/php/reference/example.h rename to Examples/php4/reference/example.h diff --git a/Examples/php/reference/example.i b/Examples/php4/reference/example.i similarity index 100% rename from Examples/php/reference/example.i rename to Examples/php4/reference/example.i diff --git a/Examples/php/reference/runme-proxy.php4 b/Examples/php4/reference/runme-proxy.php4 similarity index 100% rename from Examples/php/reference/runme-proxy.php4 rename to Examples/php4/reference/runme-proxy.php4 diff --git a/Examples/php/reference/runme.php b/Examples/php4/reference/runme.php4 similarity index 100% rename from Examples/php/reference/runme.php rename to Examples/php4/reference/runme.php4 diff --git a/Examples/php/cpointer/Makefile b/Examples/php4/simple/Makefile similarity index 71% rename from Examples/php/cpointer/Makefile rename to Examples/php4/simple/Makefile index 0862ce5ec..caeec2d73 100644 --- a/Examples/php/cpointer/Makefile +++ b/Examples/php4/simple/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/simple/example.c b/Examples/php4/simple/example.c similarity index 100% rename from Examples/php/simple/example.c rename to Examples/php4/simple/example.c diff --git a/Examples/php/simple/example.i b/Examples/php4/simple/example.i similarity index 100% rename from Examples/php/simple/example.i rename to Examples/php4/simple/example.i diff --git a/Examples/php/simple/runme.php b/Examples/php4/simple/runme.php4 similarity index 100% rename from Examples/php/simple/runme.php rename to Examples/php4/simple/runme.php4 diff --git a/Examples/php/overloading/Makefile b/Examples/php4/sync/Makefile similarity index 70% rename from Examples/php/overloading/Makefile rename to Examples/php4/sync/Makefile index 1bc0beaab..ef3acc773 100644 --- a/Examples/php/overloading/Makefile +++ b/Examples/php4/sync/Makefile @@ -9,16 +9,16 @@ SWIGOPT = all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php_cpp + php4_cpp static:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_cpp_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_cpp_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/sync/example.cxx b/Examples/php4/sync/example.cxx similarity index 91% rename from Examples/php/sync/example.cxx rename to Examples/php4/sync/example.cxx index 31ed2021b..47378924b 100644 --- a/Examples/php/sync/example.cxx +++ b/Examples/php4/sync/example.cxx @@ -2,7 +2,7 @@ #include int x = 42; -char *s = (char *)"Test"; +char *s = "Test"; void Sync::printer(void) { diff --git a/Examples/php/sync/example.h b/Examples/php4/sync/example.h similarity index 100% rename from Examples/php/sync/example.h rename to Examples/php4/sync/example.h diff --git a/Examples/php/sync/example.i b/Examples/php4/sync/example.i similarity index 100% rename from Examples/php/sync/example.i rename to Examples/php4/sync/example.i diff --git a/Examples/php/sync/runme.php b/Examples/php4/sync/runme.php4 similarity index 100% rename from Examples/php/sync/runme.php rename to Examples/php4/sync/runme.php4 diff --git a/Examples/php/value/Makefile b/Examples/php4/value/Makefile similarity index 71% rename from Examples/php/value/Makefile rename to Examples/php4/value/Makefile index 9e69d00a4..cc383ea3f 100644 --- a/Examples/php/value/Makefile +++ b/Examples/php4/value/Makefile @@ -9,16 +9,16 @@ SWIGOPT = -noproxy all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - php + php4 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ - php_static + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static clean:: - $(MAKE) -f $(TOP)/Makefile php_clean + $(MAKE) -f $(TOP)/Makefile php4_clean rm -f $(TARGET).php check: all - $(MAKE) -f $(TOP)/Makefile php_run + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/value/example.c b/Examples/php4/value/example.c similarity index 100% rename from Examples/php/value/example.c rename to Examples/php4/value/example.c diff --git a/Examples/php/value/example.h b/Examples/php4/value/example.h similarity index 100% rename from Examples/php/value/example.h rename to Examples/php4/value/example.h diff --git a/Examples/php/value/example.i b/Examples/php4/value/example.i similarity index 100% rename from Examples/php/value/example.i rename to Examples/php4/value/example.i diff --git a/Examples/php/value/runme.php b/Examples/php4/value/runme.php4 similarity index 100% rename from Examples/php/value/runme.php rename to Examples/php4/value/runme.php4 diff --git a/Examples/php4/variables/Makefile b/Examples/php4/variables/Makefile new file mode 100644 index 000000000..caeec2d73 --- /dev/null +++ b/Examples/php4/variables/Makefile @@ -0,0 +1,24 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SRCS = example.c +TARGET = example +INTERFACE = example.i +LIBS = +SWIGOPT = + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ + php4 + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \ + php4_static + +clean:: + $(MAKE) -f $(TOP)/Makefile php4_clean + rm -f $(TARGET).php + +check: all + $(MAKE) -f $(TOP)/Makefile php4_run diff --git a/Examples/php/variables/example.c b/Examples/php4/variables/example.c similarity index 100% rename from Examples/php/variables/example.c rename to Examples/php4/variables/example.c diff --git a/Examples/php/variables/example.h b/Examples/php4/variables/example.h similarity index 100% rename from Examples/php/variables/example.h rename to Examples/php4/variables/example.h diff --git a/Examples/php/variables/example.i b/Examples/php4/variables/example.i similarity index 100% rename from Examples/php/variables/example.i rename to Examples/php4/variables/example.i diff --git a/Examples/php/variables/runme.php b/Examples/php4/variables/runme.php4 similarity index 100% rename from Examples/php/variables/runme.php rename to Examples/php4/variables/runme.php4 diff --git a/Examples/php/variables/runme.php4.old b/Examples/php4/variables/runme.php4.old similarity index 100% rename from Examples/php/variables/runme.php4.old rename to Examples/php4/variables/runme.php4.old diff --git a/Examples/pike/class/Makefile b/Examples/pike/class/Makefile old mode 100644 new mode 100755 diff --git a/Examples/pike/class/example.cxx b/Examples/pike/class/example.cxx old mode 100644 new mode 100755 diff --git a/Examples/pike/class/example.h b/Examples/pike/class/example.h old mode 100644 new mode 100755 diff --git a/Examples/pike/class/example.i b/Examples/pike/class/example.i old mode 100644 new mode 100755 diff --git a/Examples/pike/constants/Makefile b/Examples/pike/constants/Makefile old mode 100644 new mode 100755 diff --git a/Examples/pike/constants/example.i b/Examples/pike/constants/example.i old mode 100644 new mode 100755 diff --git a/Examples/pike/overload/example.cxx b/Examples/pike/overload/example.cxx old mode 100644 new mode 100755 diff --git a/Examples/pike/overload/example.h b/Examples/pike/overload/example.h old mode 100644 new mode 100755 diff --git a/Examples/pike/template/Makefile b/Examples/pike/template/Makefile old mode 100644 new mode 100755 diff --git a/Examples/pike/template/example.h b/Examples/pike/template/example.h old mode 100644 new mode 100755 diff --git a/Examples/pike/template/example.i b/Examples/pike/template/example.i old mode 100644 new mode 100755 diff --git a/Examples/python/callback/Makefile b/Examples/python/callback/Makefile index a29276e58..ad36d7d7e 100644 --- a/Examples/python/callback/Makefile +++ b/Examples/python/callback/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/class/Makefile b/Examples/python/class/Makefile index 74625b992..f331b8203 100644 --- a/Examples/python/class/Makefile +++ b/Examples/python/class/Makefile @@ -18,4 +18,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/class/example.dsp b/Examples/python/class/example.dsp index fd7bf8c06..dccba46b0 100644 --- a/Examples/python/class/example.dsp +++ b/Examples/python/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/class/example.i b/Examples/python/class/example.i index 75700b305..0bf3285ca 100644 --- a/Examples/python/class/example.i +++ b/Examples/python/class/example.i @@ -5,6 +5,10 @@ #include "example.h" %} +%typemap(in) double { + /* hello */ +} + /* Let's just grab the original header file here */ %include "example.h" diff --git a/Examples/python/constants/Makefile b/Examples/python/constants/Makefile index 1420b4e0b..01d0f943a 100644 --- a/Examples/python/constants/Makefile +++ b/Examples/python/constants/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/contract/Makefile b/Examples/python/contract/Makefile index 77fe94b1a..c7b476995 100644 --- a/Examples/python/contract/Makefile +++ b/Examples/python/contract/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/contract/example.dsp b/Examples/python/contract/example.dsp index 32845e0e8..7a32f4dc1 100644 --- a/Examples/python/contract/example.dsp +++ b/Examples/python/contract/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig -python $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig -python $(InputPath) # End Custom Build diff --git a/Examples/python/docstrings/Makefile b/Examples/python/docstrings/Makefile index f25450cac..74ab112a1 100644 --- a/Examples/python/docstrings/Makefile +++ b/Examples/python/docstrings/Makefile @@ -21,4 +21,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/enum/Makefile b/Examples/python/enum/Makefile index 74625b992..f331b8203 100644 --- a/Examples/python/enum/Makefile +++ b/Examples/python/enum/Makefile @@ -18,4 +18,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/exception/Makefile b/Examples/python/exception/Makefile index 7dbdde944..17c4f30b7 100644 --- a/Examples/python/exception/Makefile +++ b/Examples/python/exception/Makefile @@ -18,4 +18,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/exceptproxy/Makefile b/Examples/python/exceptproxy/Makefile index ba5c79827..a4f334311 100644 --- a/Examples/python/exceptproxy/Makefile +++ b/Examples/python/exceptproxy/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/extend/Makefile b/Examples/python/extend/Makefile index a29276e58..ad36d7d7e 100644 --- a/Examples/python/extend/Makefile +++ b/Examples/python/extend/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/funcptr/Makefile b/Examples/python/funcptr/Makefile index 0f4a1e077..4a1e1bb71 100644 --- a/Examples/python/funcptr/Makefile +++ b/Examples/python/funcptr/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/funcptr2/Makefile b/Examples/python/funcptr2/Makefile index 0f4a1e077..4a1e1bb71 100644 --- a/Examples/python/funcptr2/Makefile +++ b/Examples/python/funcptr2/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/functor/Makefile b/Examples/python/functor/Makefile index fe389757a..c45536529 100644 --- a/Examples/python/functor/Makefile +++ b/Examples/python/functor/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/import/Makefile b/Examples/python/import/Makefile index 74d4f88cf..e00e81864 100644 --- a/Examples/python/import/Makefile +++ b/Examples/python/import/Makefile @@ -19,4 +19,3 @@ clean:: @rm -f foo.py bar.py spam.py base.py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/import/bar.dsp b/Examples/python/import/bar.dsp index 17b05cc39..edb45811b 100644 --- a/Examples/python/import/bar.dsp +++ b/Examples/python/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import/base.dsp b/Examples/python/import/base.dsp index 2bc9736d1..0ddb65157 100644 --- a/Examples/python/import/base.dsp +++ b/Examples/python/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import/foo.dsp b/Examples/python/import/foo.dsp index 9a92c4b85..86e11699f 100644 --- a/Examples/python/import/foo.dsp +++ b/Examples/python/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import/spam.dsp b/Examples/python/import/spam.dsp index 0a6595bfe..7245f7a7c 100644 --- a/Examples/python/import/spam.dsp +++ b/Examples/python/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig -c++ -python $(InputPath) # End Custom Build diff --git a/Examples/python/import_template/Makefile b/Examples/python/import_template/Makefile index ee47e994d..fa49f3145 100644 --- a/Examples/python/import_template/Makefile +++ b/Examples/python/import_template/Makefile @@ -19,4 +19,3 @@ clean:: @rm -f foo.py bar.py spam.py base.py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/libffi/Makefile b/Examples/python/libffi/Makefile index fafb7de09..8c7edfa65 100644 --- a/Examples/python/libffi/Makefile +++ b/Examples/python/libffi/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/multimap/Makefile b/Examples/python/multimap/Makefile index 0f4a1e077..4a1e1bb71 100644 --- a/Examples/python/multimap/Makefile +++ b/Examples/python/multimap/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/multimap/example.dsp b/Examples/python/multimap/example.dsp index 32845e0e8..7a32f4dc1 100644 --- a/Examples/python/multimap/example.dsp +++ b/Examples/python/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig -python $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig -python $(InputPath) # End Custom Build diff --git a/Examples/python/multimap/example.i b/Examples/python/multimap/example.i index f1c4d9990..163d7cc8e 100644 --- a/Examples/python/multimap/example.i +++ b/Examples/python/multimap/example.i @@ -27,24 +27,11 @@ extern int gcd(int x, int y); $2 = (char **) malloc(($1+1)*sizeof(char *)); for (i = 0; i < $1; i++) { PyObject *s = PyList_GetItem($input,i); -%#if PY_VERSION_HEX >= 0x03000000 - if (!PyUnicode_Check(s)) -%#else - if (!PyString_Check(s)) -%#endif - { + if (!PyString_Check(s)) { free($2); SWIG_exception(SWIG_ValueError, "List items must be strings"); } -%#if PY_VERSION_HEX >= 0x03000000 - { - int l; - $2[i] = PyUnicode_AsStringAndSize(s, &l); - } -%#else $2[i] = PyString_AsString(s); -%#endif - } $2[i] = 0; } @@ -52,21 +39,12 @@ extern int gcd(int x, int y); extern int gcdmain(int argc, char *argv[]); %typemap(in) (char *bytes, int len) { - -%#if PY_VERSION_HEX >= 0x03000000 - if (!PyUnicode_Check($input)) { - PyErr_SetString(PyExc_ValueError,"Expected a string"); - return NULL; - } - $1 = PyUnicode_AsStringAndSize($input, &$2); -%#else if (!PyString_Check($input)) { PyErr_SetString(PyExc_ValueError,"Expected a string"); return NULL; } $1 = PyString_AsString($input); $2 = PyString_Size($input); -%#endif } extern int count(char *bytes, int len, char c); @@ -78,15 +56,9 @@ extern int count(char *bytes, int len, char c); so that we don't violate it's mutability */ %typemap(in) (char *str, int len) { -%#if PY_VERSION_HEX >= 0x03000000 - $2 = PyUnicode_GetSize($input); - $1 = (char *) malloc($2+1); - memmove($1,PyUnicode_AsString($input),$2); -%#else $2 = PyString_Size($input); $1 = (char *) malloc($2+1); memmove($1,PyString_AsString($input),$2); -%#endif } /* Return the mutated string as a new object. The t_output_helper @@ -95,11 +67,7 @@ extern int count(char *bytes, int len, char c); %typemap(argout) (char *str, int len) { PyObject *o; -%#if PY_VERSION_HEX >= 0x03000000 - o = PyUnicode_FromStringAndSize($1,$2); -%#else o = PyString_FromStringAndSize($1,$2); -%#endif $result = t_output_helper($result,o); free($1); } diff --git a/Examples/python/operator/Makefile b/Examples/python/operator/Makefile index fe389757a..c45536529 100644 --- a/Examples/python/operator/Makefile +++ b/Examples/python/operator/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/pointer/Makefile b/Examples/python/pointer/Makefile index 0f4a1e077..4a1e1bb71 100644 --- a/Examples/python/pointer/Makefile +++ b/Examples/python/pointer/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/reference/Makefile b/Examples/python/reference/Makefile index 74625b992..f331b8203 100644 --- a/Examples/python/reference/Makefile +++ b/Examples/python/reference/Makefile @@ -18,4 +18,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/simple/Makefile b/Examples/python/simple/Makefile index 0f4a1e077..4a1e1bb71 100644 --- a/Examples/python/simple/Makefile +++ b/Examples/python/simple/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/simple/example.dsp b/Examples/python/simple/example.dsp index 32845e0e8..7a32f4dc1 100644 --- a/Examples/python/simple/example.dsp +++ b/Examples/python/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig -python $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig -python $(InputPath) # End Custom Build diff --git a/Examples/python/smartptr/Makefile b/Examples/python/smartptr/Makefile index f73802a6b..58d139643 100644 --- a/Examples/python/smartptr/Makefile +++ b/Examples/python/smartptr/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/std_map/Makefile b/Examples/python/std_map/Makefile index 5d13da764..2d4c1b4a3 100644 --- a/Examples/python/std_map/Makefile +++ b/Examples/python/std_map/Makefile @@ -22,4 +22,3 @@ run: python runme.py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/std_map/example.i b/Examples/python/std_map/example.i index 6a7af7108..36354a882 100644 --- a/Examples/python/std_map/example.i +++ b/Examples/python/std_map/example.i @@ -23,5 +23,5 @@ namespace std { %template(halfi) half_map; -%template() std::pair; -%template(pymap) std::map; +%template() std::pair; +%template(pymap) std::map; diff --git a/Examples/python/std_vector/Makefile b/Examples/python/std_vector/Makefile index ba5c79827..a4f334311 100644 --- a/Examples/python/std_vector/Makefile +++ b/Examples/python/std_vector/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/swigrun/Makefile b/Examples/python/swigrun/Makefile index 2142be5bb..53bf701c9 100644 --- a/Examples/python/swigrun/Makefile +++ b/Examples/python/swigrun/Makefile @@ -22,4 +22,3 @@ clean:: check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/template/Makefile b/Examples/python/template/Makefile index ba5c79827..a4f334311 100644 --- a/Examples/python/template/Makefile +++ b/Examples/python/template/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/varargs/Makefile b/Examples/python/varargs/Makefile index 1420b4e0b..01d0f943a 100644 --- a/Examples/python/varargs/Makefile +++ b/Examples/python/varargs/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/variables/Makefile b/Examples/python/variables/Makefile index 0f4a1e077..4a1e1bb71 100644 --- a/Examples/python/variables/Makefile +++ b/Examples/python/variables/Makefile @@ -17,4 +17,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/weave/Makefile b/Examples/python/weave/Makefile index 88f95c095..822779bd1 100644 --- a/Examples/python/weave/Makefile +++ b/Examples/python/weave/Makefile @@ -19,4 +19,3 @@ clean:: rm -f $(TARGET).py check: all - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/r/class/example.dsp b/Examples/r/class/example.dsp index b831989cc..682b156fb 100644 --- a/Examples/r/class/example.dsp +++ b/Examples/r/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -c++ -r -o example_wrap.cpp $(InputPath) + ..\..\..\swig -c++ -r -o example_wrap.cpp $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -c++ -r -o example_wrap.cpp $(InputPath) + ..\..\..\swig -c++ -r -o example_wrap.cpp $(InputPath) # End Custom Build diff --git a/Examples/r/simple/example.dsp b/Examples/r/simple/example.dsp index 356815d19..aaa5ef8e0 100644 --- a/Examples/r/simple/example.dsp +++ b/Examples/r/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -r $(InputPath) + ..\..\..\swig -r $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -r $(InputPath) + ..\..\..\swig -r $(InputPath) # End Custom Build diff --git a/Examples/ruby/class/example.dsp b/Examples/ruby/class/example.dsp index 2adab787a..9a26322ec 100644 --- a/Examples/ruby/class/example.dsp +++ b/Examples/ruby/class/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/free_function/example.dsp b/Examples/ruby/free_function/example.dsp index 2adab787a..9a26322ec 100644 --- a/Examples/ruby/free_function/example.dsp +++ b/Examples/ruby/free_function/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/free_function/example.i b/Examples/ruby/free_function/example.i index a446b3f99..5ab29bd58 100644 --- a/Examples/ruby/free_function/example.i +++ b/Examples/ruby/free_function/example.i @@ -20,7 +20,7 @@ static void free_Zoo(void* ptr) { Zoo* zoo = (Zoo*) ptr; - /* Loop over each object and call SWIG_RubyRemoveTracking */ + /* Loop over each object and call SWIG_RemoveMapping */ int count = zoo->get_num_animals(); for(int i = 0; i < count; ++i) { @@ -32,7 +32,7 @@ SWIG_RubyRemoveTracking(animal); } - /* Now call SWIG_RubyRemoveTracking for the zoo */ + /* Now call SWIG_RemoveMapping for the zoo */ SWIG_RubyRemoveTracking(ptr); /* Now free the zoo which will free the animals it contains */ diff --git a/Examples/ruby/hashargs/Makefile b/Examples/ruby/hashargs/Makefile old mode 100644 new mode 100755 diff --git a/Examples/ruby/hashargs/example.i b/Examples/ruby/hashargs/example.i old mode 100644 new mode 100755 diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp index 29d9abf2f..dd09ca021 100644 --- a/Examples/ruby/import/bar.dsp +++ b/Examples/ruby/import/bar.dsp @@ -120,7 +120,7 @@ InputName=bar echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=bar echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp index 174afef3e..2bd4fa243 100644 --- a/Examples/ruby/import/base.dsp +++ b/Examples/ruby/import/base.dsp @@ -120,7 +120,7 @@ InputName=base echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=base echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp index 7f4754915..2a764bbd7 100644 --- a/Examples/ruby/import/foo.dsp +++ b/Examples/ruby/import/foo.dsp @@ -120,7 +120,7 @@ InputName=foo echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=foo echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp index 72729f290..d2d7158bb 100644 --- a/Examples/ruby/import/spam.dsp +++ b/Examples/ruby/import/spam.dsp @@ -120,7 +120,7 @@ InputName=spam echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -135,7 +135,7 @@ InputName=spam echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/mark_function/example.dsp b/Examples/ruby/mark_function/example.dsp index 2adab787a..9a26322ec 100644 --- a/Examples/ruby/mark_function/example.dsp +++ b/Examples/ruby/mark_function/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig -c++ -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/multimap/example.dsp b/Examples/ruby/multimap/example.dsp index 4888299f5..ccb99d44d 100644 --- a/Examples/ruby/multimap/example.dsp +++ b/Examples/ruby/multimap/example.dsp @@ -124,7 +124,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig -ruby $(InputPath) # End Custom Build @@ -139,7 +139,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/simple/example.dsp b/Examples/ruby/simple/example.dsp index 4888299f5..ccb99d44d 100644 --- a/Examples/ruby/simple/example.dsp +++ b/Examples/ruby/simple/example.dsp @@ -124,7 +124,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig -ruby $(InputPath) # End Custom Build @@ -139,7 +139,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig -ruby $(InputPath) # End Custom Build diff --git a/Examples/ruby/std_vector/runme.rb b/Examples/ruby/std_vector/runme.rb index 851190536..1529d38c6 100644 --- a/Examples/ruby/std_vector/runme.rb +++ b/Examples/ruby/std_vector/runme.rb @@ -9,7 +9,7 @@ puts Example::average([1,2,3,4]) # ... or a wrapped std::vector v = Example::IntVector.new(4) -0.upto(v.size-1) { |i| v[i] = i+1 } +0.upto(v.length-1) { |i| v[i] = i+1 } puts Example::average(v) @@ -17,7 +17,7 @@ puts Example::average(v) # Call it with a Ruby array... w = Example::half([1.0, 1.5, 2.0, 2.5, 3.0]) -0.upto(w.size-1) { |i| print w[i],"; " } +0.upto(w.length-1) { |i| print w[i],"; " } puts # ... or a wrapped std::vector @@ -25,12 +25,12 @@ puts v = Example::DoubleVector.new [1,2,3,4].each { |i| v.push(i) } w = Example::half(v) -0.upto(w.size-1) { |i| print w[i],"; " } +0.upto(w.length-1) { |i| print w[i],"; " } puts # now halve a wrapped std::vector in place Example::halve_in_place(v) -0.upto(v.size-1) { |i| print v[i],"; " } +0.upto(v.length-1) { |i| print v[i],"; " } puts diff --git a/Examples/tcl/class/example.dsp b/Examples/tcl/class/example.dsp index 0ff54829f..bf6149407 100644 --- a/Examples/tcl/class/example.dsp +++ b/Examples/tcl/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/contract/example.dsp b/Examples/tcl/contract/example.dsp index c1568f2c5..296cb313b 100644 --- a/Examples/tcl/contract/example.dsp +++ b/Examples/tcl/contract/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig -tcl8 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/bar.dsp b/Examples/tcl/import/bar.dsp index d22b6a6fa..35b4e608b 100644 --- a/Examples/tcl/import/bar.dsp +++ b/Examples/tcl/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/base.dsp b/Examples/tcl/import/base.dsp index b27bbfdb6..74870ccb0 100644 --- a/Examples/tcl/import/base.dsp +++ b/Examples/tcl/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/foo.dsp b/Examples/tcl/import/foo.dsp index 4d3765bd7..ac7f09f06 100644 --- a/Examples/tcl/import/foo.dsp +++ b/Examples/tcl/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/import/spam.dsp b/Examples/tcl/import/spam.dsp index 5674c4373..db9ade0a3 100644 --- a/Examples/tcl/import/spam.dsp +++ b/Examples/tcl/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/multimap/example.dsp b/Examples/tcl/multimap/example.dsp index c1568f2c5..296cb313b 100644 --- a/Examples/tcl/multimap/example.dsp +++ b/Examples/tcl/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig -tcl8 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/tcl/simple/example.dsp b/Examples/tcl/simple/example.dsp index c1568f2c5..296cb313b 100644 --- a/Examples/tcl/simple/example.dsp +++ b/Examples/tcl/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig -tcl8 $(InputPath) # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig -tcl8 $(InputPath) # End Custom Build diff --git a/Examples/test-suite/abstract_virtual.i b/Examples/test-suite/abstract_virtual.i index 2e4d105b1..e2d8054bb 100644 --- a/Examples/test-suite/abstract_virtual.i +++ b/Examples/test-suite/abstract_virtual.i @@ -2,10 +2,10 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, Java, PHP multiple inheritance */ + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) D; /* C#, Java, Php4 multiple inheritance */ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */ + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) E; /* C#, Java, Php4 multiple inheritance */ %inline %{ #if defined(_MSC_VER) diff --git a/Examples/test-suite/allegrocl/Makefile.in b/Examples/test-suite/allegrocl/Makefile.in index df7193389..394d2d524 100644 --- a/Examples/test-suite/allegrocl/Makefile.in +++ b/Examples/test-suite/allegrocl/Makefile.in @@ -9,75 +9,116 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ - -# these cpp tests generate warnings/errors when compiling -# the wrapper .cxx file. -CPP_TEST_BROKEN_CXX = -# the error is wrap:action code generated by swig. \ -# error: can't convert [std::string] 'b' to 'bool' \ -# might just need a bool overload op for std::string. \ - global_vars \ -# same as w/ global_vars but with more errors in cxx file \ - naturalvar \ - # these cpp tests aren't working. Fix 'em # need to further separate these into tests requiring # std libraries, or the $ldestructor problem. CPP_TEST_BROKEN_ACL = \ + array_member \ + char_strings \ + class_ignore \ + constant_pointers \ contract \ - allprotected \ -# 'throws' typemap entries. \ cplusplus_throw \ -# 'throws' typemap entries. \ + cpp_basic \ + cpp_enum \ + cpp_typedef \ + default_constructor \ default_args \ -# missing typemaps. suspect module support needed \ dynamic_cast \ + enum_thorough \ extend_variable \ -# cdata.i support needed \ + global_vars \ + import_nomodule \ + kind \ + li_carrays \ li_cdata \ -# warning generated. otherwise all good. \ + li_windows \ + namespace_class \ + namespace_spaces \ + naturalvar \ operator_overload \ -# std_common.i support \ + overload_simple \ + register_par \ sizet \ -# std_vector.i support. \ + smart_pointer_extend \ + smart_pointer_namespace \ + template \ + template_classes \ template_default \ -# *** line 31. can't copy typemap?? \ + template_default_inherit \ + template_enum \ + template_explicit \ + template_extend_overload \ + template_ns \ + template_ns4 \ + template_ns_enum \ + template_rename \ + template_retvalue \ + template_static \ + template_tbase_template \ + template_typedef \ + template_typedef_cplx \ + template_typedef_cplx2 \ + template_typedef_cplx3 \ + template_typedef_cplx4 \ + template_typedef_cplx5 \ + template_typedef_ns \ + template_typedef_rec \ + threads \ + typedef_array_member \ + typedef_sizet \ typemap_namespace \ + union_scope \ + using_pointers \ + valuewrapper_opaque \ + varargs \ + virtual_poly \ + voidtest \ + wrapmacro # these aren't working due to longlong support. (low hanging fruit) CPP_TEST_BROKEN_LONGLONG = \ arrays_dimensionless \ arrays_global \ arrays_global_twodim \ + li_stdint \ li_typemaps \ - li_windows \ long_long_apply \ + mixed_types \ primitive_ref \ reference_global_vars \ template_default_arg # These are currently unsupported. CPP_TEST_CASES_ACL_UNSUPPORTED = \ -# contract support \ aggregate \ -# directors support \ - apply_signed_char \ -# contract support \ contract \ + director_abstract \ + director_basic \ + director_constructor \ + director_detect \ + director_default \ + director_enum \ director_exception \ + director_frob \ + director_finalizer \ + director_nested \ director_protected \ + director_redefined \ + director_unroll \ + director_using \ + director_wombat \ exception_order \ -# 'throws' typemap support \ extern_throws \ - throw_exception \ - using_pointers \ + throw_exception C_TEST_CASES_ACL_BROKEN = \ -# 'cdate.i' module support \ + arrays \ + enums \ + extern_declaration \ + immutable \ + integers \ li_cdata \ -# adding an existing type defnition... \ - typedef_struct \ -# swigrun.swg support. \ typemap_subst C_TEST_BROKEN_LONGLONG = \ @@ -87,9 +128,11 @@ C_TEST_BROKEN_LONGLONG = \ # std lib support hasn't been done yet. SKIP_CPP_STD_CASES = Yes -include $(srcdir)/../common.mk +C_TEST_CASES = -# SWIGOPT += -debug-module 4 +CPP_TEST_CASES = + +include $(srcdir)/../common.mk # Rules for the different types of tests %.cpptest: @@ -114,8 +157,9 @@ run_testcase = \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(ALLEGROCLBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \ fi; +# Clean: (does nothing, we dont generate extra allegrocl code) %.clean: - @rm -f $*.cl + clean: $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile allegrocl_clean diff --git a/Examples/test-suite/allowexcept.i b/Examples/test-suite/allowexcept.i index 37b01cd75..14b19b33d 100644 --- a/Examples/test-suite/allowexcept.i +++ b/Examples/test-suite/allowexcept.i @@ -26,26 +26,14 @@ UVW Bar::static_member_variable; struct XYZ { }; -// The operator& trick doesn't work for SWIG/PHP because the generated code -// takes the address of the variable in the code in the "vinit" section. -#ifdef SWIGPHP %{ struct XYZ { void foo() {} private: XYZ& operator=(const XYZ& other); // prevent assignment used in normally generated set method + XYZ* operator&(); // prevent dereferencing used in normally generated get method }; %} -#else -%{ -struct XYZ { - void foo() {} -private: - XYZ& operator=(const XYZ& other); // prevent assignment used in normally generated set method - XYZ* operator&(); // prevent dereferencing used in normally generated get method -}; -%} -#endif #if defined(SWIGUTL) %exception { /* diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 5734805b6..a7941551c 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -34,8 +34,6 @@ C_CPP_TEST_BROKEN = \ li_windows \ long_long_apply -INTERFACEDIR = ../../ - # Rules for the different types of tests %.cpptest: $(setup) diff --git a/Examples/test-suite/char_strings.i b/Examples/test-suite/char_strings.i index 12e4b5aa2..b06eba773 100644 --- a/Examples/test-suite/char_strings.i +++ b/Examples/test-suite/char_strings.i @@ -9,12 +9,6 @@ below. %warnfilter(SWIGWARN_TYPEMAP_VARIN_UNDEF) global_char_array1; // Unable to set variable of type char[] %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK_MSG) global_const_char; // Setting a const char * variable may leak memory. -#ifdef SWIG_ALLEGRO_CL -%{ -#include -%} -#endif - %{ #define OTHERLAND_MSG "Little message from the safe world." #define CPLUSPLUS_MSG "A message from the deep dark world of C++, where anything is possible." diff --git a/Examples/test-suite/chicken/Makefile.in b/Examples/test-suite/chicken/Makefile.in index 764518880..ef6d7056c 100644 --- a/Examples/test-suite/chicken/Makefile.in +++ b/Examples/test-suite/chicken/Makefile.in @@ -19,7 +19,7 @@ SKIP_CPP_STD_CASES = Yes CPP_TEST_CASES += li_std_string -EXTRA_TEST_CASES += chicken_ext_test.externaltest +EXTRA_TEST_CASES += ext_test.externaltest include $(srcdir)/../common.mk diff --git a/Examples/test-suite/chicken_ext_test.i b/Examples/test-suite/chicken/ext_test.i similarity index 94% rename from Examples/test-suite/chicken_ext_test.i rename to Examples/test-suite/chicken/ext_test.i index b4f726cc7..e8f5930df 100644 --- a/Examples/test-suite/chicken_ext_test.i +++ b/Examples/test-suite/chicken/ext_test.i @@ -1,4 +1,4 @@ -%module chicken_ext_test +%module ext_test /* just use the imports_a.h header... for this test we only need a class */ %{ diff --git a/Examples/test-suite/chicken/chicken_ext_test_runme.ss b/Examples/test-suite/chicken/ext_test_runme.ss similarity index 57% rename from Examples/test-suite/chicken/chicken_ext_test_runme.ss rename to Examples/test-suite/chicken/ext_test_runme.ss index 65fa4e085..ea3eaa487 100644 --- a/Examples/test-suite/chicken/chicken_ext_test_runme.ss +++ b/Examples/test-suite/chicken/ext_test_runme.ss @@ -1,4 +1,4 @@ -(load "chicken_ext_test.so") +(load "ext_test.so") (define a (test-create)) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 85858c2fd..d2e4f96a7 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -59,12 +59,11 @@ CXXSRCS = CSRCS = TARGETPREFIX = TARGETSUFFIX = -SWIGOPT = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) -INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) -DSWIG_NOEXTRA_QUALIFICATION +INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) LIBS = -L. LIBPREFIX = lib ACTION = check -INTERFACEDIR = ../ # # Please keep test cases in alphabetical order. @@ -78,9 +77,8 @@ CPP_TEST_BROKEN += \ cpp_broken \ exception_partial_info \ extend_variable \ - li_std_vector_ptr \ namespace_union \ - nested_struct \ + nested_comment \ overload_complicated \ template_default_pointer \ template_expr @@ -167,7 +165,6 @@ CPP_TEST_CASES += \ director_overload \ director_primitives \ director_protected \ - director_protected_overloaded \ director_redefined \ director_thread \ director_unroll \ @@ -195,7 +192,6 @@ CPP_TEST_CASES += \ fragments \ friends \ fvirtual \ - global_namespace \ global_ns_arg \ global_vars \ grouping \ @@ -207,7 +203,6 @@ CPP_TEST_CASES += \ inherit_target_language \ inherit_void_arg \ inline_initializer \ - insert_directive \ keyword_rename \ kind \ langobj \ @@ -239,12 +234,10 @@ CPP_TEST_CASES += \ namespace_typemap \ namespace_virtual_method \ naturalvar \ - nested_comment \ newobject1 \ null_pointer \ operator_overload \ operator_overload_break \ - operbool \ ordering \ overload_copy \ overload_extend \ @@ -267,7 +260,6 @@ CPP_TEST_CASES += \ rename3 \ rename4 \ rename_scope \ - rename_strip_encoder \ restrict_cplusplus \ return_const_value \ return_value_scope \ @@ -412,7 +404,6 @@ CPP_STD_TEST_CASES += \ template_typedef_fnc \ template_type_namespace \ template_opaque -# li_std_list ifndef SKIP_CPP_STD_CASES @@ -449,13 +440,11 @@ C_TEST_CASES += \ overload_extendc \ preproc \ ret_by_value \ - simple_array \ sizeof_pointer \ sneaky1 \ struct_rename \ typedef_struct \ typemap_subst \ - union_parameter \ unions @@ -501,14 +490,14 @@ swig_and_compile_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_c = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT) swig_and_compile_multi_cpp = \ @@ -516,7 +505,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ done @@ -528,7 +517,7 @@ swig_and_compile_external = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_runtime = \ diff --git a/Examples/test-suite/contract.i b/Examples/test-suite/contract.i index b979ef19e..6ee0a353c 100644 --- a/Examples/test-suite/contract.i +++ b/Examples/test-suite/contract.i @@ -3,7 +3,7 @@ %warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, PHP multiple inheritance */ + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, Php4 multiple inheritance */ #ifdef SWIGCSHARP %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override @@ -201,33 +201,3 @@ struct E { }; %} - -// Namespace - -%{ -namespace myNames { - -class myClass -{ - public: - myClass(int i) {} -}; - -} -%} - -namespace myNames { - -%contract myClass::myClass( int i ) { -require: - i > 0; -} - -class myClass -{ - public: - myClass(int i) {} -}; - -} - diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in index 5fb547f3f..5fd576ed8 100644 --- a/Examples/test-suite/csharp/Makefile.in +++ b/Examples/test-suite/csharp/Makefile.in @@ -21,17 +21,12 @@ CPP_TEST_CASES = \ enum_thorough_typesafe \ exception_partial_info -CUSTOM_TEST_CASES = \ - csharp_lib_arrays \ - intermediary_classname +CUSTOM_TEST_CASES = intermediary_classname include $(srcdir)/../common.mk # Overridden variables here SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL) -INTERFACEDIR = ../../ - -CSHARPFLAGSSPECIAL = # Rules for the different types of tests %.cpptest: @@ -52,8 +47,6 @@ CSHARPFLAGSSPECIAL = # Rules for custom tests intermediary_classname.customtest: $(MAKE) intermediary_classname.cpptest SWIGOPTSPECIAL="-dllimport intermediary_classname" -csharp_lib_arrays.customtest: - $(MAKE) csharp_lib_arrays.cpptest CSHARPFLAGSSPECIAL="-unsafe" # Makes a directory for the testcase if it does not exist setup = \ @@ -72,14 +65,14 @@ setup = \ run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \ - CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \ + CSHARPFLAGS='-nologo -out:$*_runme.exe' \ CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` \ $*$(CSHARPPATHSEPARATOR)*.cs' csharp_compile && \ env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; ) \ else ( \ cd $* && \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \ - CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \ + CSHARPFLAGS='-nologo -t:module -out:$*.netmodule' \ CSHARPSRCS='*.cs' csharp_compile; ); \ fi; diff --git a/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs b/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs deleted file mode 100644 index 9f3ea6b88..000000000 --- a/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using csharp_lib_arraysNamespace; - -public class runme -{ - static void Main() - { - { - int[] source = { 1, 2, 3, 4, 5 }; - int[] target = new int[ source.Length ]; - - csharp_lib_arrays.myArrayCopy( source, target, target.Length ); - CompareArrays(source, target); - } - - { - int[] source = { 1, 2, 3, 4, 5 }; - int[] target = new int[ source.Length ]; - - csharp_lib_arrays.myArrayCopyUsingFixedArrays( source, target, target.Length ); - CompareArrays(source, target); - } - - { - int[] source = { 1, 2, 3, 4, 5 }; - int[] target = new int[] { 6, 7, 8, 9, 10 }; - - csharp_lib_arrays.myArraySwap( source, target, target.Length ); - - for (int i=0; i myEnumerator = dv.GetEnumerator(); - while ( myEnumerator.MoveNext() ) { - if (myEnumerator.Current != 77.7) - throw new Exception("Repeat (2) test failed"); - } - } -#endif } { @@ -533,13 +516,6 @@ public class li_std_vector_runme { li_std_vector.halve_in_place(dvec); } - // Dispose() - { - using (StructVector vs = new StructVector() { new Struct(0.0), new Struct(11.1) } ) - using (DoubleVector vd = new DoubleVector() { 0.0, 11.1 } ) { - } - } - // More wrapped methods { RealVector v0 = li_std_vector.vecreal(new RealVector()); diff --git a/Examples/test-suite/csharp_lib_arrays.i b/Examples/test-suite/csharp_lib_arrays.i deleted file mode 100644 index d07d43737..000000000 --- a/Examples/test-suite/csharp_lib_arrays.i +++ /dev/null @@ -1,61 +0,0 @@ -%module csharp_lib_arrays - -%include "arrays_csharp.i" - -%apply int INPUT[] { int* sourceArray } -%apply int OUTPUT[] { int* targetArray } - -%apply int INOUT[] { int* array1 } -%apply int INOUT[] { int* array2 } - -%inline %{ -/* copy the contents of the first array to the second */ -void myArrayCopy( int* sourceArray, int* targetArray, int nitems ) { - int i; - for ( i = 0; i < nitems; i++ ) { - targetArray[ i ] = sourceArray[ i ]; - } -} - -/* swap the contents of the two arrays */ -void myArraySwap( int* array1, int* array2, int nitems ) { - int i, temp; - for ( i = 0; i < nitems; i++ ) { - temp = array1[ i ]; - array1[ i ] = array2[ i ]; - array2[ i ] = temp; - } -} -%} - - -%clear int* sourceArray; -%clear int* targetArray; - -%clear int* array1; -%clear int* array2; - - -// Below replicates the above array handling but this time using the pinned (fixed) array typemaps -%csmethodmodifiers myArrayCopyUsingFixedArrays "public unsafe"; -%csmethodmodifiers myArraySwapUsingFixedArrays "public unsafe"; - -%apply int FIXED[] { int* sourceArray } -%apply int FIXED[] { int* targetArray } - -%inline %{ -void myArrayCopyUsingFixedArrays( int *sourceArray, int* targetArray, int nitems ) { - myArrayCopy(sourceArray, targetArray, nitems); -} -%} - -%apply int FIXED[] { int* array1 } -%apply int FIXED[] { int* array2 } - -%inline %{ -void myArraySwapUsingFixedArrays( int* array1, int* array2, int nitems ) { - myArraySwap(array1, array2, nitems); -} -%} - - diff --git a/Examples/test-suite/csharp_prepost.i b/Examples/test-suite/csharp_prepost.i index 0c35c1833..9c2cedc83 100644 --- a/Examples/test-suite/csharp_prepost.i +++ b/Examples/test-suite/csharp_prepost.i @@ -1,6 +1,6 @@ %module csharp_prepost -// Test the pre, post, terminate and cshin attributes for csin typemaps +// Test the pre, post and cshin attributes for csin typemaps %include "std_vector.i" @@ -88,102 +88,3 @@ public: }; %} - - -// test Date marshalling with pre post and terminate typemap attributes (Documented in CSharp.html) -%typemap(cstype) const CDate& "System.DateTime" -%typemap(csin, - pre=" CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);" - ) const CDate & - "$csclassname.getCPtr(temp$csinput)" - -%typemap(cstype) CDate& "out System.DateTime" -%typemap(csin, - pre=" CDate temp$csinput = new CDate();", - post=" $csinput = new System.DateTime(temp$csinput.getYear()," - " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", - cshin="out $csinput" - ) CDate & - "$csclassname.getCPtr(temp$csinput)" - - -%inline %{ -class CDate { -public: - CDate(); - CDate(int year, int month, int day); - int getYear(); - int getMonth(); - int getDay(); -private: - int m_year; - int m_month; - int m_day; -}; -struct Action { - int doSomething(const CDate &dateIn, CDate &dateOut); - Action(const CDate &dateIn, CDate& dateOut); -}; -%} - -%{ -Action::Action(const CDate &dateIn, CDate& dateOut) {dateOut = dateIn;} -int Action::doSomething(const CDate &dateIn, CDate &dateOut) { dateOut = dateIn; return 0; } -CDate::CDate() : m_year(0), m_month(0), m_day(0) {} -CDate::CDate(int year, int month, int day) : m_year(year), m_month(month), m_day(day) {} -int CDate::getYear() { return m_year; } -int CDate::getMonth() { return m_month; } -int CDate::getDay() { return m_day; } -%} - -%typemap(cstype, out="System.DateTime") CDate * "ref System.DateTime" - -%typemap(csin, - pre=" CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);", - post=" $csinput = new System.DateTime(temp$csinput.getYear()," - " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", - cshin="ref $csinput" - ) CDate * - "$csclassname.getCPtr(temp$csinput)" - -%inline %{ -void addYears(CDate *pDate, int years) { - *pDate = CDate(pDate->getYear() + years, pDate->getMonth(), pDate->getDay()); -} -%} - -%typemap(csin, - pre=" using (CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day)) {", - post=" $csinput = new System.DateTime(temp$csinput.getYear()," - " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", - terminator=" } // terminate temp$csinput using block", - cshin="ref $csinput" - ) CDate * - "$csclassname.getCPtr(temp$csinput)" - -%inline %{ -void subtractYears(CDate *pDate, int years) { - *pDate = CDate(pDate->getYear() - years, pDate->getMonth(), pDate->getDay()); -} -%} - -%typemap(csvarin, excode=SWIGEXCODE2) CDate * %{ - /* csvarin typemap code */ - set { - CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day); - $imcall;$excode - } %} - -%typemap(csvarout, excode=SWIGEXCODE2) CDate * %{ - /* csvarout typemap code */ - get { - IntPtr cPtr = $imcall; - CDate tempDate = (cPtr == IntPtr.Zero) ? null : new CDate(cPtr, $owner);$excode - return new System.DateTime(tempDate.getYear(), tempDate.getMonth(), tempDate.getDay(), - 0, 0, 0); - } %} - -%inline %{ -CDate ImportantDate = CDate(1999, 12, 31); -%} - diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i index ff22c7834..71600e55a 100644 --- a/Examples/test-suite/default_constructor.i +++ b/Examples/test-suite/default_constructor.i @@ -5,11 +5,11 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) EB; /* C#, Java, PHP multiple inheritance */ + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) EB; /* C#, Java, Php4 multiple inheritance */ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, Java, PHP multiple inheritance */ + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) AD; /* C#, Java, Php4 multiple inheritance */ %warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */ diff --git a/Examples/test-suite/director_basic.i b/Examples/test-suite/director_basic.i index 12cb0db65..986a1706f 100644 --- a/Examples/test-suite/director_basic.i +++ b/Examples/test-suite/director_basic.i @@ -112,14 +112,12 @@ public: return vmethod(b); } + static MyClass *get_self(MyClass *c) { return c; } - - static Bar * call_pmethod(MyClass *myclass, Bar *b) { - return myclass->pmethod(b); - } + }; template diff --git a/Examples/test-suite/director_classic.i b/Examples/test-suite/director_classic.i old mode 100644 new mode 100755 diff --git a/Examples/test-suite/director_ignore.i b/Examples/test-suite/director_ignore.i old mode 100644 new mode 100755 diff --git a/Examples/test-suite/director_protected_overloaded.i b/Examples/test-suite/director_protected_overloaded.i deleted file mode 100644 index a9f786fc7..000000000 --- a/Examples/test-suite/director_protected_overloaded.i +++ /dev/null @@ -1,21 +0,0 @@ -%module(directors="1",dirprot="1") director_protected_overloaded - -%director IDataObserver; -%director DerivedDataObserver; - -// protected overloaded methods -%inline %{ - class IDataObserver - { - public: - virtual ~IDataObserver(){} - - protected: - virtual void notoverloaded() = 0; - virtual void isoverloaded() = 0; - virtual void isoverloaded(int i) = 0; - virtual void isoverloaded(int i, double d) = 0; - }; - class DerivedDataObserver : public IDataObserver { - }; -%} diff --git a/Examples/test-suite/director_thread.i b/Examples/test-suite/director_thread.i index 2732eb907..4f4e55cfe 100644 --- a/Examples/test-suite/director_thread.i +++ b/Examples/test-suite/director_thread.i @@ -13,7 +13,6 @@ #include #else #include -#include #include #endif @@ -28,8 +27,6 @@ extern "C" { void* working(void* t); pthread_t thread; #endif - static int thread_terminate = 0; - } %} @@ -54,15 +51,6 @@ extern "C" { virtual ~Foo() { } - void stop() { - thread_terminate = 1; - %#ifdef _WIN32 - /*TODO(bhy) what to do for win32? */ - %#else - pthread_join(thread, NULL); - %#endif - } - void run() { %#ifdef _WIN32 _beginthreadex(NULL,0,working,this,0,&thread_id); @@ -87,15 +75,10 @@ extern "C" { #endif { Foo* f = static_cast(t); - while ( ! thread_terminate ) { + while (1) { MilliSecondSleep(50); f->do_foo(); } -#ifdef _WIN32 - /* TODO(bhy) what's the corresponding of pthread_exit in win32? */ -#else - pthread_exit(0); -#endif return 0; } } diff --git a/Examples/test-suite/evil_diamond.i b/Examples/test-suite/evil_diamond.i index 7b2e9152f..33353e32e 100644 --- a/Examples/test-suite/evil_diamond.i +++ b/Examples/test-suite/evil_diamond.i @@ -6,7 +6,7 @@ %warnfilter(SWIGWARN_RUBY_WRONG_NAME, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance %inline %{ diff --git a/Examples/test-suite/evil_diamond_ns.i b/Examples/test-suite/evil_diamond_ns.i index 515044007..78a764ccc 100644 --- a/Examples/test-suite/evil_diamond_ns.i +++ b/Examples/test-suite/evil_diamond_ns.i @@ -6,7 +6,7 @@ %warnfilter(SWIGWARN_RUBY_WRONG_NAME, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) Blah::spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Blah::spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance %inline %{ namespace Blah { diff --git a/Examples/test-suite/evil_diamond_prop.i b/Examples/test-suite/evil_diamond_prop.i index 804ea66b4..e9fc24f4d 100644 --- a/Examples/test-suite/evil_diamond_prop.i +++ b/Examples/test-suite/evil_diamond_prop.i @@ -6,7 +6,7 @@ %warnfilter(SWIGWARN_RUBY_WRONG_NAME, SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance %inline %{ diff --git a/Examples/test-suite/features.i b/Examples/test-suite/features.i index 2ccbe725a..2db51ae6b 100644 --- a/Examples/test-suite/features.i +++ b/Examples/test-suite/features.i @@ -162,20 +162,3 @@ namespace Space { } %} -// Test 8 conversion operators -%rename(opbool) operator bool; -%rename(opuint) operator unsigned int; - -%exception ConversionOperators::ConversionOperators() "$action /* ConversionOperators::ConversionOperators() */"; -%exception ConversionOperators::~ConversionOperators() "$action /* ConversionOperators::~ConversionOperators() */"; -%exception ConversionOperators::operator bool "$action /* ConversionOperators::operator bool */"; -%exception ConversionOperators::operator unsigned int "$action /* ConversionOperators::unsigned int*/"; - -%inline %{ - class ConversionOperators { - public: - operator bool() { return false; } - operator unsigned int() { return 0; } - }; -%} - diff --git a/Examples/test-suite/global_namespace.i b/Examples/test-suite/global_namespace.i deleted file mode 100644 index 02139f6c4..000000000 --- a/Examples/test-suite/global_namespace.i +++ /dev/null @@ -1,60 +0,0 @@ -%module global_namespace - -// classes -%inline %{ -class Klass1 {}; -class Klass2 {}; -class Klass3 {}; -class Klass4 {}; -class Klass5 {}; -class Klass6 {}; -class Klass7 {}; - -struct KlassMethods { - static void methodA(::Klass1 v, const ::Klass2 cv, const ::Klass3 *cp, ::Klass4 *p, const ::Klass5 &cr, ::Klass6 &r, Klass7*& pr) {} - static void methodB( Klass1 v, const Klass2 cv, const Klass3 *cp, Klass4 *p, const Klass5 &cr, Klass6 &r, Klass7*& pr) {} -}; -%} - -%inline %{ -namespace Space { -class XYZ1 {}; -class XYZ2 {}; -class XYZ3 {}; -class XYZ4 {}; -class XYZ5 {}; -class XYZ6 {}; -class XYZ7 {}; -} - -struct XYZMethods { - static void methodA(::Space::XYZ1 v, const ::Space::XYZ2 cv, const ::Space::XYZ3 *cp, ::Space::XYZ4 *p, const ::Space::XYZ5 &cr, ::Space::XYZ6 &r, Space::XYZ7*& pr) {} - static void methodB( Space::XYZ1 v, const Space::XYZ2 cv, const Space::XYZ3 *cp, Space::XYZ4 *p, const Space::XYZ5 &cr, Space::XYZ6 &r, Space::XYZ7*& pr) {} -}; -%} - -//enums -%inline %{ -enum AnEnum1 { anenum1 }; -enum AnEnum2 { anenum2 }; -enum AnEnum3 { anenum3 }; - -struct AnEnumMethods { - static void methodA(::AnEnum1 v, const ::AnEnum2 cv, const ::AnEnum3 &cr) {} - static void methodB( AnEnum1 v, const AnEnum2 cv, const AnEnum3 &cr) {} -}; -%} - -%inline %{ -namespace Space { -enum TheEnum1 { theenum1 }; -enum TheEnum2 { theenum2 }; -enum TheEnum3 { theenum3 }; - -struct TheEnumMethods { - static void methodA(::Space::TheEnum1 v, const ::Space::TheEnum2 cv, const ::Space::TheEnum3 &cr) {} - static void methodB( Space::TheEnum1 v, const Space::TheEnum2 cv, const Space::TheEnum3 &cr) {} -}; -} -%} - diff --git a/Examples/test-suite/guile/Makefile.in b/Examples/test-suite/guile/Makefile.in index 25d40674d..97f30e3b2 100644 --- a/Examples/test-suite/guile/Makefile.in +++ b/Examples/test-suite/guile/Makefile.in @@ -36,7 +36,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $$SWIGOPT" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ SWIGOPT=" -noruntime "; \ done diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilescm/Makefile.in index eb53f020e..04de236db 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilescm/Makefile.in @@ -2,7 +2,7 @@ # Makefile for guile test-suite (with SCM API) ####################################################################### -EXTRA_TEST_CASES += guilescm_ext_test.externaltest +EXTRA_TEST_CASES += ext_test.externaltest include ../guile/Makefile @@ -31,7 +31,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $$SWIGOPT" NOLINK=true \ - TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ + TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ $(LANGUAGE)$(VARIANT)_cpp; \ done diff --git a/Examples/test-suite/guilescm_ext_test.i b/Examples/test-suite/guilescm/ext_test.i similarity index 93% rename from Examples/test-suite/guilescm_ext_test.i rename to Examples/test-suite/guilescm/ext_test.i index fd5655d4f..8b117bb5a 100644 --- a/Examples/test-suite/guilescm_ext_test.i +++ b/Examples/test-suite/guilescm/ext_test.i @@ -1,4 +1,4 @@ -%module guilescm_ext_test +%module ext_test /* just use the imports_a.h header... for this test we only need a class */ %{ diff --git a/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm b/Examples/test-suite/guilescm/ext_test_runme.scm similarity index 82% rename from Examples/test-suite/guilescm/guilescm_ext_test_runme.scm rename to Examples/test-suite/guilescm/ext_test_runme.scm index ff3df064b..67add849e 100644 --- a/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm +++ b/Examples/test-suite/guilescm/ext_test_runme.scm @@ -1,4 +1,4 @@ -(dynamic-call "scm_init_guilescm_ext_test_module" (dynamic-link "./libguilescm_ext_test.so")) +(dynamic-call "scm_init_ext_test_module" (dynamic-link "./libext_test.so")) ; This is a test for SF Bug 1573892 ; If IsPointer is called before TypeQuery, the test-is-pointer will fail diff --git a/Examples/test-suite/ignore_template_constructor.i b/Examples/test-suite/ignore_template_constructor.i index ffd541986..5225d5183 100644 --- a/Examples/test-suite/ignore_template_constructor.i +++ b/Examples/test-suite/ignore_template_constructor.i @@ -37,9 +37,3 @@ public: #endif %template(VectFlow) std::vector; - -%inline %{ -std::vector inandout(std::vector v) { - return v; -} -%} diff --git a/Examples/test-suite/import_nomodule.i b/Examples/test-suite/import_nomodule.i index a1ba9ad7a..5d5115360 100644 --- a/Examples/test-suite/import_nomodule.i +++ b/Examples/test-suite/import_nomodule.i @@ -3,9 +3,6 @@ #include "import_nomodule.h" %} -// For Python -%warnfilter(SWIGWARN_TYPE_UNDEFINED_CLASS) Bar; // Base class 'Foo' ignored - unknown module name for base. Either import the appropriate module interface file or specify the name of the module in the %import directive. - %import "import_nomodule.h" #if !defined(SWIGJAVA) && !defined(SWIGRUBY) && !defined(SWIGCSHARP) diff --git a/Examples/test-suite/imports_b.i b/Examples/test-suite/imports_b.i index 81e84cddd..afc573a39 100644 --- a/Examples/test-suite/imports_b.i +++ b/Examples/test-suite/imports_b.i @@ -34,14 +34,9 @@ */ #if 0 - %import "imports_a.i" +%import "imports_a.i" #else -# if 0 - // Test Warning 401 (Python only) - %import "imports_a.h" -# else - %import(module="imports_a") "imports_a.h" -# endif +%import(module="imports_a") "imports_a.h" #endif %include "imports_b.h" diff --git a/Examples/test-suite/insert_directive.i b/Examples/test-suite/insert_directive.i deleted file mode 100644 index 8ad966a99..000000000 --- a/Examples/test-suite/insert_directive.i +++ /dev/null @@ -1,38 +0,0 @@ -%module insert_directive - -// check %insert and the order of each insert section is correct - -%begin %{ -// %inserted code %begin -int inserted_begin(int i) { return i; } -%} - -%runtime %{ -// %inserted code %runtime -int inserted_runtime(int i) { return inserted_begin(i); } -%} - -%{ -// %inserted code %header -int inserted_header1(int i) { return inserted_runtime(i); } -%} - -%header %{ -// %inserted code %header -int inserted_header2(int i) { return inserted_header1(i); } -%} - -%{ -// %inserted code %header -int inserted_header3(int i) { return inserted_header2(i); } -%} - -%wrapper %{ -// %inserted code %wrapper -int inserted_wrapper(int i) { return inserted_header3(i); } -%} - -%init %{ -// %inserted code %init -int inserted_init_value = inserted_wrapper(0); -%} diff --git a/Examples/test-suite/intermediary_classname.i b/Examples/test-suite/intermediary_classname.i index 94858a5fb..0f90f9cdd 100644 --- a/Examples/test-suite/intermediary_classname.i +++ b/Examples/test-suite/intermediary_classname.i @@ -18,7 +18,6 @@ "new $javaclassname($jniinput, false)/*javadirectorin*/" %typemap(out, throws="IllegalAccessException/*out Base&*/") Base& { // XYZ& typemap out - $result = 0; // remove unused variable warning } %inline %{ diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 03c10d498..ace8dee86 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -32,13 +32,11 @@ CPP_TEST_CASES = \ java_throws \ java_typemaps_proxy \ java_typemaps_typewrapper -# li_boost_intrusive_ptr include $(srcdir)/../common.mk # Overridden variables here SWIGOPT += -package $* -INTERFACEDIR = ../../ # Rules for the different types of tests %.cpptest: @@ -74,7 +72,7 @@ run_testcase = \ (cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java) && \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(COMPILETOOL) $(JAVAC) -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ - env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*_runme;) \ + env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*\_runme;) \ fi; # Clean: remove testcase directories diff --git a/Examples/test-suite/java/allprotected_runme.java b/Examples/test-suite/java/allprotected_runme.java old mode 100644 new mode 100755 diff --git a/Examples/test-suite/java/director_basic_runme.java b/Examples/test-suite/java/director_basic_runme.java index 16a46aa35..eafe20bec 100644 --- a/Examples/test-suite/java/director_basic_runme.java +++ b/Examples/test-suite/java/director_basic_runme.java @@ -14,43 +14,28 @@ public class director_basic_runme { public static void main(String argv[]) { - director_basic_MyFoo a = new director_basic_MyFoo(); + director_basic_MyFoo a = new director_basic_MyFoo(); - if (!a.ping().equals("director_basic_MyFoo::ping()")) { - throw new RuntimeException ( "a.ping()" ); - } + if (!a.ping().equals("director_basic_MyFoo::ping()")) { + throw new RuntimeException ( "a.ping()" ); + } - if (!a.pong().equals("Foo::pong();director_basic_MyFoo::ping()")) { - throw new RuntimeException ( "a.pong()" ); - } + if (!a.pong().equals("Foo::pong();director_basic_MyFoo::ping()")) { + throw new RuntimeException ( "a.pong()" ); + } - Foo b = new Foo(); + Foo b = new Foo(); - if (!b.ping().equals("Foo::ping()")) { - throw new RuntimeException ( "b.ping()" ); - } + if (!b.ping().equals("Foo::ping()")) { + throw new RuntimeException ( "b.ping()" ); + } - if (!b.pong().equals("Foo::pong();Foo::ping()")) { - throw new RuntimeException ( "b.pong()" ); - } + if (!b.pong().equals("Foo::pong();Foo::ping()")) { + throw new RuntimeException ( "b.pong()" ); + } - A1 a1 = new A1(1, false); - a1.delete(); - - { - MyOverriddenClass my = new MyOverriddenClass(); - - my.expectNull = true; - if (MyClass.call_pmethod(my, null) != null) - throw new RuntimeException("null pointer marshalling problem"); - - Bar myBar = new Bar(); - my.expectNull = false; - Bar myNewBar = MyClass.call_pmethod(my, myBar); - if (myNewBar == null) - throw new RuntimeException("non-null pointer marshalling problem"); - myNewBar.setX(10); - } + A1 a1 = new A1(1, false); + a1.delete(); } } @@ -60,13 +45,3 @@ class director_basic_MyFoo extends Foo { } } -class MyOverriddenClass extends MyClass { - public boolean expectNull = false; - public boolean nonNullReceived = false; - public Bar pmethod(Bar b) { - if ( expectNull && (b != null) ) - throw new RuntimeException("null not received as expected"); - return b; - } -} - diff --git a/Examples/test-suite/java/director_classic_runme.java b/Examples/test-suite/java/director_classic_runme.java old mode 100644 new mode 100755 diff --git a/Examples/test-suite/java/director_ignore_runme.java b/Examples/test-suite/java/director_ignore_runme.java old mode 100644 new mode 100755 diff --git a/Examples/test-suite/java/global_namespace_runme.java b/Examples/test-suite/java/global_namespace_runme.java deleted file mode 100644 index faab7d4ba..000000000 --- a/Examples/test-suite/java/global_namespace_runme.java +++ /dev/null @@ -1,25 +0,0 @@ -import global_namespace.*; - -public class global_namespace_runme { - - static { - try { - System.loadLibrary("global_namespace"); - } catch (UnsatisfiedLinkError e) { - System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); - System.exit(1); - } - } - - public static void main(String argv[]) { - - KlassMethods.methodA(new Klass1(), new Klass2(), new Klass3(), new Klass4(), new Klass5(), new Klass6(), new Klass7()); - KlassMethods.methodB(new Klass1(), new Klass2(), new Klass3(), new Klass4(), new Klass5(), new Klass6(), new Klass7()); - - XYZMethods.methodA(new XYZ1(), new XYZ2(), new XYZ3(), new XYZ4(), new XYZ5(), new XYZ6(), new XYZ7()); - XYZMethods.methodB(new XYZ1(), new XYZ2(), new XYZ3(), new XYZ4(), new XYZ5(), new XYZ6(), new XYZ7()); - - TheEnumMethods.methodA(TheEnum1.theenum1, TheEnum2.theenum2, TheEnum3.theenum3); - TheEnumMethods.methodA(TheEnum1.theenum1, TheEnum2.theenum2, TheEnum3.theenum3); - } -} diff --git a/Examples/test-suite/java/java_throws_runme.java b/Examples/test-suite/java/java_throws_runme.java index 6a73ea563..3538aa6d4 100644 --- a/Examples/test-suite/java/java_throws_runme.java +++ b/Examples/test-suite/java/java_throws_runme.java @@ -94,20 +94,5 @@ public class java_throws_runme { if (!pass) throw new RuntimeException("Test 7 failed"); - - // Test %nojavaexception - NoExceptTest net = new NoExceptTest(); - - pass = false; - try { - net.exceptionPlease(); - pass = true; - } - catch (MyException e) {} - - if (!pass) - throw new RuntimeException("Test 8 failed"); - - net.noExceptionPlease(); } } diff --git a/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java b/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java deleted file mode 100644 index f40c28e9e..000000000 --- a/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java +++ /dev/null @@ -1,701 +0,0 @@ -import li_boost_intrusive_ptr.*; - -public class li_boost_intrusive_ptr_runme { - static { - try { - System.loadLibrary("li_boost_intrusive_ptr"); - } catch (UnsatisfiedLinkError e) { - System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); - System.exit(1); - } - } - - // Debugging flag - public final static boolean debug = false; - - public static void main(String argv[]) - { - if (debug) - System.out.println("Started"); - - li_boost_intrusive_ptr.setDebug_shared(debug); - - // Change loop count to run for a long time to monitor memory - final int loopCount = 5000; //5000; - for (int i=0; iFindClass("java_throws/MyException"); - if (excep) - jenv->ThrowNew(excep, "exception message"); - return $null; -} -%} - -%nojavaexception *::noExceptionPlease(); -%nojavaexception NoExceptTest::NoExceptTest(); - -// Need to handle the checked exception in NoExceptTest.delete() -%typemap(javafinalize) SWIGTYPE %{ - protected void finalize() { - try { - delete(); - } catch (MyException e) { - throw new RuntimeException(e); - } - } -%} - -%inline %{ -struct NoExceptTest { - unsigned int noExceptionPlease() { return 123; } - unsigned int exceptionPlease() { return 456; } - ~NoExceptTest() {} -}; -%} - -// Turn global exceptions off (for the implicit destructors/constructors) -%nojavaexception; - diff --git a/Examples/test-suite/li_attribute.i b/Examples/test-suite/li_attribute.i index 4f9497afb..5b4379ebf 100644 --- a/Examples/test-suite/li_attribute.i +++ b/Examples/test-suite/li_attribute.i @@ -93,11 +93,9 @@ struct MyFoo; // %attribute2 does not work with templates %template(Param_i) Param; -// class/struct attribute with get/set methods using return/pass by reference %attribute2(MyClass, MyFoo, Foo, GetFoo, SetFoo); %inline %{ struct MyFoo { - MyFoo() : x(-1) {} int x; }; class MyClass { @@ -108,32 +106,3 @@ struct MyFoo; // %attribute2 does not work with templates }; %} - -// class/struct attribute with get/set methods using return/pass by value -%attributeval(MyClassVal, MyFoo, ReadWriteFoo, GetFoo, SetFoo); -%attributeval(MyClassVal, MyFoo, ReadOnlyFoo, GetFoo); -%inline %{ - class MyClassVal { - MyFoo foo; - public: - MyFoo GetFoo() { return foo; } - void SetFoo(MyFoo other) { foo = other; } - }; -%} - - -// string attribute with get/set methods using return/pass by value -%include -%attributestring(MyStringyClass, std::string, ReadWriteString, GetString, SetString); -%attributestring(MyStringyClass, std::string, ReadOnlyString, GetString); -%inline %{ - class MyStringyClass { - std::string str; - public: - MyStringyClass(const std::string &val) : str(val) {} - std::string GetString() { return str; } - void SetString(std::string other) { str = other; } - }; -%} - - diff --git a/Examples/test-suite/li_boost_intrusive_ptr.i b/Examples/test-suite/li_boost_intrusive_ptr.i deleted file mode 100644 index 7c37e6843..000000000 --- a/Examples/test-suite/li_boost_intrusive_ptr.i +++ /dev/null @@ -1,494 +0,0 @@ -// This tests intrusive_ptr is working okay. It also checks that there are no memory leaks in the -// class that intrusive_ptr is pointing via a counting mechanism in the constructors and destructor of Klass. -// In order to test that there are no leaks of the intrusive_ptr class itself (as it is created on the heap) -// the runtime tests can be run for a long time to monitor memory leaks using memory monitor tools -// like 'top'. There is a wrapper for intrusive_ptr in intrusive_ptr_wrapper.h which enables one to -// count the instances of intrusive_ptr. Uncomment the INTRUSIVE_PTR_WRAPPER macro to turn this on. -// -// Also note the debug_shared flag which can be set from the target language. - -%module li_boost_intrusive_ptr - -%warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK); - -%inline %{ -#include "boost/shared_ptr.hpp" -#include "boost/intrusive_ptr.hpp" -#include - -// Uncomment macro below to turn on intrusive_ptr memory leak checking as described above -//#define INTRUSIVE_PTR_WRAPPER - -#ifdef INTRUSIVE_PTR_WRAPPER -# include "intrusive_ptr_wrapper.h" -# include "shared_ptr_wrapper.h" -#endif -%} - -%{ -#ifndef INTRUSIVE_PTR_WRAPPER -# define SwigBoost boost -#endif -%} - -%include "std_string.i" -#ifndef INTRUSIVE_PTR_WRAPPER -# define SWIG_INTRUSIVE_PTR_NAMESPACE SwigBoost -# define SWIG_SHARED_PTR_NAMESPACE SwigBoost -#endif - -#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) -#define INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED -#endif - -#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) - -%include -SWIG_INTRUSIVE_PTR(Klass, Space::Klass) -SWIG_INTRUSIVE_PTR_NO_WRAP(KlassWithoutRefCount, Space::KlassWithoutRefCount) -SWIG_INTRUSIVE_PTR_DERIVED(KlassDerived, Space::KlassWithoutRefCount, Space::KlassDerived) -SWIG_INTRUSIVE_PTR_DERIVED(KlassDerivedDerived, Space::KlassDerived, Space::KlassDerivedDerived) - -//For the use_count shared_ptr functions -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & ($*1_ltype tempnull) %{ - $1 = $input ? *($&1_ltype)&$input : &tempnull; -%} -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass.getCPtr($javainput)" - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & ($*1_ltype tempnull) %{ - $1 = $input ? *($&1_ltype)&$input : &tempnull; -%} -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived.getCPtr($javainput)" - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & ($*1_ltype tempnull) %{ - $1 = $input ? *($&1_ltype)&$input : &tempnull; -%} -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived.getCPtr($javainput)" - -#endif - -// TODO: -// const intrusive_ptr -// std::vector -// Add in generic %extend for the Upcast function for derived classes -// Remove proxy upcast method - implement %feature("shadow") ??? which replaces the proxy method - -%exception { - if (debug_shared) { - cout << "++++++" << endl << flush; - cout << "calling $name" << endl << flush; - } - $action - if (debug_shared) { - cout << "------" << endl << flush; - } -} - -%ignore IgnoredRefCountingBase; -%ignore *::operator=; -%ignore intrusive_ptr_add_ref; -%ignore intrusive_ptr_release; -%newobject pointerownertest(); -%newobject smartpointerpointerownertest(); - -%inline %{ -#include -using namespace std; - -static bool debug_shared = false; - -namespace Space { - -struct Klass { - Klass() : value("EMPTY"), count(0) { if (debug_shared) cout << "Klass() [" << value << "]" << endl << flush; increment(); } - - Klass(const std::string &val) : value(val), count(0) { if (debug_shared) cout << "Klass(string) [" << value << "]" << endl << flush; increment(); } - - virtual ~Klass() { if (debug_shared) cout << "~Klass() [" << value << "]" << endl << flush; decrement(); } - virtual std::string getValue() const { return value; } - void append(const std::string &s) { value += s; } - Klass(const Klass &other) : value(other.value), count(0) { if (debug_shared) cout << "Klass(const Klass&) [" << value << "]" << endl << flush; increment(); } - - Klass &operator=(const Klass &other) { value = other.value; return *this; } - - void addref(void) const { ++count; } - void release(void) const { if (--count == 0) delete this; } - int use_count(void) const { return count; } - static long getTotal_count() { return total_count; } - -private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx Klass::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx Klass::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; - std::string value; - int array[1024]; - mutable boost::detail::atomic_count count; -}; - -struct KlassWithoutRefCount { - KlassWithoutRefCount() : value("EMPTY") { if (debug_shared) cout << "KlassWithoutRefCount() [" << value << "]" << endl << flush; increment(); } - - KlassWithoutRefCount(const std::string &val) : value(val) { if (debug_shared) cout << "KlassWithoutRefCount(string) [" << value << "]" << endl << flush; increment(); } - - virtual ~KlassWithoutRefCount() { if (debug_shared) cout << "~KlassWithoutRefCount() [" << value << "]" << endl << flush; decrement(); } - virtual std::string getValue() const { return value; } - void append(const std::string &s) { value += s; } - KlassWithoutRefCount(const KlassWithoutRefCount &other) : value(other.value) { if (debug_shared) cout << "KlassWithoutRefCount(const KlassWithoutRefCount&) [" << value << "]" << endl << flush; increment(); } - std::string getSpecialValueFromUnwrappableClass() { return "this class cannot be wrapped by intrusive_ptrs but we can still use it"; } - KlassWithoutRefCount &operator=(const KlassWithoutRefCount &other) { value = other.value; return *this; } - static long getTotal_count() { return total_count; } - -private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassWithoutRefCount::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassWithoutRefCount::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; - std::string value; - int array[1024]; -}; - -struct IgnoredRefCountingBase { - IgnoredRefCountingBase() : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase()" << endl << flush; increment(); } - - IgnoredRefCountingBase(const IgnoredRefCountingBase &other) : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase(const IgnoredRefCountingBase&)" << endl << flush; increment(); } - - IgnoredRefCountingBase &operator=(const IgnoredRefCountingBase& other) { - return *this; - } - - virtual ~IgnoredRefCountingBase() { if (debug_shared) cout << "~IgnoredRefCountingBase()" << endl << flush; decrement(); } - - void addref(void) const { ++count; } - void release(void) const { if (--count == 0) delete this; } - int use_count(void) const { return count; } - static long getTotal_count() { return total_count; } - - private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx IgnoredRefCountingBase::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx IgnoredRefCountingBase::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; - double d; - double e; - mutable boost::detail::atomic_count count; -}; - -long getTotal_IgnoredRefCountingBase_count() { - return IgnoredRefCountingBase::getTotal_count(); -} - -// For most compilers, this use of multiple inheritance results in different derived and base class -// pointer values ... for some more challenging tests :) -struct KlassDerived : IgnoredRefCountingBase, KlassWithoutRefCount { - KlassDerived() : KlassWithoutRefCount() { if (debug_shared) cout << "KlassDerived()" << endl << flush; increment(); } - KlassDerived(const std::string &val) : KlassWithoutRefCount(val) { if (debug_shared) cout << "KlassDerived(string) [" << val << "]" << endl << flush; increment(); } - KlassDerived(const KlassDerived &other) : KlassWithoutRefCount(other) { if (debug_shared) cout << "KlassDerived(const KlassDerived&))" << endl << flush; increment(); } - virtual ~KlassDerived() { if (debug_shared) cout << "~KlassDerived()" << endl << flush; decrement(); } - virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-Derived"; } - int use_count(void) const { return IgnoredRefCountingBase::use_count(); } - static long getTotal_count() { return total_count; } - - private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerived::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerived::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; -}; -struct KlassDerivedDerived : KlassDerived { - KlassDerivedDerived() : KlassDerived() { if (debug_shared) cout << "KlassDerivedDerived()" << endl << flush; increment(); } - KlassDerivedDerived(const std::string &val) : KlassDerived(val) { if (debug_shared) cout << "KlassDerivedDerived(string) [" << val << "]" << endl << flush; increment(); } - KlassDerivedDerived(const KlassDerived &other) : KlassDerived(other) { if (debug_shared) cout << "KlassDerivedDerived(const KlassDerivedDerived&))" << endl << flush; increment(); } - virtual ~KlassDerivedDerived() { if (debug_shared) cout << "~KlassDerivedDerived()" << endl << flush; decrement(); } - virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-DerivedDerived"; } - static long getTotal_count() { return total_count; } - - private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerivedDerived::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerivedDerived::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; -}; -KlassDerived* derivedpointertest(KlassDerived* kd) { - if (kd) - kd->append(" derivedpointertest"); - return kd; -} -KlassDerived derivedvaluetest(KlassDerived kd) { - kd.append(" derivedvaluetest"); - return kd; -} -KlassDerived& derivedreftest(KlassDerived& kd) { - kd.append(" derivedreftest"); - return kd; -} -SwigBoost::intrusive_ptr derivedsmartptrtest(SwigBoost::intrusive_ptr kd) { - if (kd) - kd->append(" derivedsmartptrtest"); - return kd; -} -SwigBoost::intrusive_ptr* derivedsmartptrpointertest(SwigBoost::intrusive_ptr* kd) { - if (kd && *kd) - (*kd)->append(" derivedsmartptrpointertest"); - return kd; -} -SwigBoost::intrusive_ptr* derivedsmartptrreftest(SwigBoost::intrusive_ptr* kd) { - if (kd && *kd) - (*kd)->append(" derivedsmartptrreftest"); - return kd; -} -SwigBoost::intrusive_ptr*& derivedsmartptrpointerreftest(SwigBoost::intrusive_ptr*& kd) { - if (kd && *kd) - (*kd)->append(" derivedsmartptrpointerreftest"); - return kd; -} - -SwigBoost::intrusive_ptr factorycreate() { - return SwigBoost::intrusive_ptr(new Klass("factorycreate")); -} -// smart pointer -SwigBoost::intrusive_ptr smartpointertest(SwigBoost::intrusive_ptr k) { - if (k) - k->append(" smartpointertest"); - return SwigBoost::intrusive_ptr(k); -} -SwigBoost::intrusive_ptr* smartpointerpointertest(SwigBoost::intrusive_ptr* k) { - if (k && *k) - (*k)->append(" smartpointerpointertest"); - return k; -} -SwigBoost::intrusive_ptr& smartpointerreftest(SwigBoost::intrusive_ptr& k) { - if (k) - k->append(" smartpointerreftest"); - return k; -} -SwigBoost::intrusive_ptr*& smartpointerpointerreftest(SwigBoost::intrusive_ptr*& k) { - if (k && *k) - (*k)->append(" smartpointerpointerreftest"); - return k; -} -// const -SwigBoost::intrusive_ptr constsmartpointertest(SwigBoost::intrusive_ptr k) { - return SwigBoost::intrusive_ptr(k); -} -SwigBoost::intrusive_ptr* constsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { - return k; -} -SwigBoost::intrusive_ptr& constsmartpointerreftest(SwigBoost::intrusive_ptr& k) { - return k; -} -// plain pointer -Klass valuetest(Klass k) { - k.append(" valuetest"); - return k; -} -Klass *pointertest(Klass *k) { - if (k) - k->append(" pointertest"); - return k; -} -Klass& reftest(Klass& k) { - k.append(" reftest"); - return k; -} -Klass*& pointerreftest(Klass*& k) { - k->append(" pointerreftest"); - return k; -} -// null -std::string nullsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { - if (k && *k) - return "not null"; - else if (!k) - return "null smartpointer pointer"; - else if (!*k) - return "null pointer"; - else - return "also not null"; -} -// $owner -Klass *pointerownertest() { - return new Klass("pointerownertest"); -} -SwigBoost::intrusive_ptr* smartpointerpointerownertest() { - return new SwigBoost::intrusive_ptr(new Klass("smartpointerpointerownertest")); -} - -const SwigBoost::intrusive_ptr& ref_1() { - static SwigBoost::intrusive_ptr sptr; - return sptr; -} - -// overloading tests -std::string overload_rawbyval(int i) { return "int"; } -std::string overload_rawbyval(Klass k) { return "rawbyval"; } - -std::string overload_rawbyref(int i) { return "int"; } -std::string overload_rawbyref(Klass &k) { return "rawbyref"; } - -std::string overload_rawbyptr(int i) { return "int"; } -std::string overload_rawbyptr(Klass *k) { return "rawbyptr"; } - -std::string overload_rawbyptrref(int i) { return "int"; } -std::string overload_rawbyptrref(Klass *&k) { return "rawbyptrref"; } - - - -std::string overload_smartbyval(int i) { return "int"; } -std::string overload_smartbyval(SwigBoost::intrusive_ptr k) { return "smartbyval"; } - -std::string overload_smartbyref(int i) { return "int"; } -std::string overload_smartbyref(SwigBoost::intrusive_ptr &k) { return "smartbyref"; } - -std::string overload_smartbyptr(int i) { return "int"; } -std::string overload_smartbyptr(SwigBoost::intrusive_ptr *k) { return "smartbyptr"; } - -std::string overload_smartbyptrref(int i) { return "int"; } -std::string overload_smartbyptrref(SwigBoost::intrusive_ptr *&k) { return "smartbyptrref"; } - -} // namespace Space - -%} -%{ - boost::detail::atomic_count Space::Klass::total_count(0); - boost::detail::atomic_count Space::KlassWithoutRefCount::total_count(0); - boost::detail::atomic_count Space::IgnoredRefCountingBase::total_count(0); - boost::detail::atomic_count Space::KlassDerived::total_count(0); - boost::detail::atomic_count Space::KlassDerivedDerived::total_count(0); -%} - -// Member variables - -%inline %{ -struct MemberVariables { - MemberVariables() : SmartMemberPointer(new SwigBoost::intrusive_ptr()), SmartMemberReference(*(new SwigBoost::intrusive_ptr())), MemberPointer(0), MemberReference(MemberValue) {} - virtual ~MemberVariables() { - delete SmartMemberPointer; - delete &SmartMemberReference; - } - SwigBoost::intrusive_ptr SmartMemberValue; - SwigBoost::intrusive_ptr * SmartMemberPointer; - SwigBoost::intrusive_ptr & SmartMemberReference; - Space::Klass MemberValue; - Space::Klass * MemberPointer; - Space::Klass & MemberReference; -}; - -// Global variables -SwigBoost::intrusive_ptr GlobalSmartValue; -Space::Klass GlobalValue; -Space::Klass * GlobalPointer = 0; -Space::Klass & GlobalReference = GlobalValue; - -%} - -#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) - -// Note: %template after the intrusive_ptr typemaps -SWIG_INTRUSIVE_PTR(BaseIntDouble, Base) -// Note: cannot use Base in the macro below because of the comma in the type, -// so we use a typedef instead. Alternatively use %arg(Base). %arg is defined in swigmacros.swg. -SWIG_INTRUSIVE_PTR_DERIVED(PairIntDouble, BaseIntDouble_t, Pair) - -#endif - -// Templates -%inline %{ -template struct Base { - Space::Klass klassBase; - T1 baseVal1; - T2 baseVal2; - Base(T1 t1, T2 t2) : baseVal1(t1*2), baseVal2(t2*2) {} - virtual std::string getValue() const { return "Base<>"; }; - mutable int count; - void addref(void) const { count++; } - void release(void) const { if (--count == 0) delete this; } - int use_count(void) const { return count; } -}; -typedef Base BaseIntDouble_t; -%} - -%template(BaseIntDouble) Base; - -%inline %{ -template struct Pair : Base { - Space::Klass klassPair; - T1 val1; - T2 val2; - Pair(T1 t1, T2 t2) : Base(t1, t2), val1(t1), val2(t2) {} - virtual std::string getValue() const { return "Pair<>"; }; -}; - -Pair pair_id2(Pair p) { return p; } -SwigBoost::intrusive_ptr< Pair > pair_id1(SwigBoost::intrusive_ptr< Pair > p) { return p; } - -template void intrusive_ptr_add_ref(const T* r) { r->addref(); } - -template void intrusive_ptr_release(const T* r) { r->release(); } - -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -%} - -%template(PairIntDouble) Pair; - -// For counting the instances of intrusive_ptr (all of which are created on the heap) -// intrusive_ptr_wrapper_count() gives overall count -%inline %{ -namespace SwigBoost { - const int NOT_COUNTING = -123456; - int intrusive_ptr_wrapper_count() { - #ifdef INTRUSIVE_PTR_WRAPPER - return SwigBoost::IntrusivePtrWrapper::getTotalCount(); - #else - return NOT_COUNTING; - #endif - } - #ifdef INTRUSIVE_PTR_WRAPPER - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "Klass: " + (*t)->getValue(); - else - return "Klass: NULL"; - } - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "Klass: " + (*t)->getValue(); - else - return "Klass: NULL"; - } - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "KlassDerived: " + (*t)->getValue(); - else - return "KlassDerived: NULL"; - } - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "KlassDerived: " + (*t)->getValue(); - else - return "KlassDerived: NULL"; - } - #endif -} -%} - diff --git a/Examples/test-suite/li_boost_shared_ptr.i b/Examples/test-suite/li_boost_shared_ptr.i index f992a3c08..a6225410b 100644 --- a/Examples/test-suite/li_boost_shared_ptr.i +++ b/Examples/test-suite/li_boost_shared_ptr.i @@ -43,14 +43,6 @@ %include SWIG_SHARED_PTR(Klass, Space::Klass) SWIG_SHARED_PTR_DERIVED(KlassDerived, Space::Klass, Space::KlassDerived) -SWIG_SHARED_PTR_DERIVED(Klass2ndDerived, Space::Klass, Space::Klass2ndDerived) -SWIG_SHARED_PTR_DERIVED(Klass3rdDerived, Space::Klass2ndDerived, Space::Klass3rdDerived) - -// TEMP for python -%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass3rdDerived > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass >) { - *newmemory = SWIG_CAST_NEW_MEMORY; - return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass3rdDerived > *)$from); -} #endif @@ -109,13 +101,7 @@ private: }; SwigExamples::CriticalSection Space::Klass::critical_section; -struct IgnoredMultipleInheritBase { - IgnoredMultipleInheritBase() : d(0.0), e(0.0) {} - virtual ~IgnoredMultipleInheritBase() {} - double d; - double e; - virtual void AVirtualMethod() {} -}; +struct IgnoredMultipleInheritBase { virtual ~IgnoredMultipleInheritBase() {} double d; double e;}; // For most compilers, this use of multiple inheritance results in different derived and base class // pointer values ... for some more challenging tests :) @@ -156,21 +142,7 @@ SwigBoost::shared_ptr*& derivedsmartptrpointerreftest(SwigBoost::s return kd; } -// 3 classes in inheritance chain test -struct Klass2ndDerived : Klass { - Klass2ndDerived() : Klass() {} - Klass2ndDerived(const std::string &val) : Klass(val) {} -}; -struct Klass3rdDerived : IgnoredMultipleInheritBase, Klass2ndDerived { - Klass3rdDerived() : Klass2ndDerived() {} - Klass3rdDerived(const std::string &val) : Klass2ndDerived(val) {} - virtual ~Klass3rdDerived() {} - virtual std::string getValue() const { return Klass2ndDerived::getValue() + "-3rdDerived"; } -}; -std::string test3rdupcast( SwigBoost::shared_ptr< Klass > k) { - return k->getValue(); -} @@ -245,14 +217,8 @@ SwigBoost::shared_ptr* smartpointerpointerownertest() { return new SwigBoost::shared_ptr(new Klass("smartpointerpointerownertest")); } -// Provide overloads for Klass and derived classes as some language modules, eg Python, create an extra reference in +// Provide overloads for Klass and KlassDerived as some language modules, eg Python, create an extra reference in // the marshalling if an upcast to a base class is required. -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} long use_count(const SwigBoost::shared_ptr& sptr) { return sptr.use_count(); } diff --git a/Examples/test-suite/li_cstring.i b/Examples/test-suite/li_cstring.i index 28e8049e8..fd92ac7d3 100644 --- a/Examples/test-suite/li_cstring.i +++ b/Examples/test-suite/li_cstring.i @@ -4,7 +4,7 @@ #ifndef SWIG_CSTRING_UNIMPL -%cstring_input_binary(char *str_in, int n); +%cstring_input_binary(char *in, int n); %cstring_bounded_output(char *out1, 512); %cstring_chunk_output(char *out2, 64); %cstring_bounded_mutable(char *out3, 512); @@ -22,13 +22,13 @@ %inline %{ -int count(char *str_in, int n, char c) { +int count(char *in, int n, char c) { int r = 0; while (n > 0) { - if (*str_in == c) { + if (*in == c) { r++; } - str_in++; + in++; --n; } return r; diff --git a/Examples/test-suite/li_cwstring.i b/Examples/test-suite/li_cwstring.i index 769dcce12..dc9a1c4b9 100644 --- a/Examples/test-suite/li_cwstring.i +++ b/Examples/test-suite/li_cwstring.i @@ -4,7 +4,7 @@ #ifndef SWIG_CWSTRING_UNIMPL -%cwstring_input_binary(wchar_t *str_in, int n); +%cwstring_input_binary(wchar_t *in, int n); %cwstring_bounded_output(wchar_t *out1, 512); %cwstring_chunk_output(wchar_t *out2, 64); %cwstring_bounded_mutable(wchar_t *out3, 512); @@ -22,13 +22,13 @@ %inline %{ -int count(wchar_t *str_in, int n, wchar_t c) { +int count(wchar_t *in, int n, wchar_t c) { int r = 0; while (n > 0) { - if (*str_in == c) { + if (*in == c) { r++; } - str_in++; + in++; --n; } return r; diff --git a/Examples/test-suite/li_std_map.i b/Examples/test-suite/li_std_map.i index 27c1b1a70..edcb05641 100644 --- a/Examples/test-suite/li_std_map.i +++ b/Examples/test-suite/li_std_map.i @@ -10,7 +10,7 @@ * * For example: * swig::LANGUAGE_OBJ is GC_VALUE in Ruby - * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python + * swig::LANGUAGE_OBJ is PyObject_ptr in python * * */ @@ -47,15 +47,8 @@ namespace std %template(pairiiAc) pair >; -#ifdef SWIGRUBY %template() pair< swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ >; %template(LanguageMap) map< swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ >; -#endif - -#ifdef SWIGPYTHON - %template() pair; - %template(pymap) map; -#endif } diff --git a/Examples/test-suite/li_std_set.i b/Examples/test-suite/li_std_set.i index 8c335b24c..c2cdc2ebe 100644 --- a/Examples/test-suite/li_std_set.i +++ b/Examples/test-suite/li_std_set.i @@ -10,7 +10,7 @@ * * For example: * swig::LANGUAGE_OBJ is GC_VALUE in Ruby - * swig::LANGUAGE_OBJ is SwigPtr_PyObject in python + * swig::LANGUAGE_OBJ is PyObject_ptr in python * * */ @@ -31,10 +31,4 @@ -#if defined(SWIGRUBY) %template(LanguageSet) std::set; -#endif - -#if defined(SWIGPYTHON) -%template(pyset) std::set; -#endif diff --git a/Examples/test-suite/li_std_vector.i b/Examples/test-suite/li_std_vector.i index c6e2ea9ad..587ea2217 100644 --- a/Examples/test-suite/li_std_vector.i +++ b/Examples/test-suite/li_std_vector.i @@ -85,10 +85,8 @@ SWIG_STD_VECTOR_SPECIALIZE(SWIGTYPE_p_int, const int *) %template(StructureConstPtrVector) std::vector; #endif -#if !defined(SWIGR) %template(IntPtrVector) std::vector; %template(IntConstPtrVector) std::vector; -#endif %template(StructVector) std::vector; %template(StructPtrVector) std::vector; %template(StructConstPtrVector) std::vector; diff --git a/Examples/test-suite/li_std_vector_ptr.i b/Examples/test-suite/li_std_vector_ptr.i deleted file mode 100644 index 688cbdd54..000000000 --- a/Examples/test-suite/li_std_vector_ptr.i +++ /dev/null @@ -1,29 +0,0 @@ -%module li_std_vector_ptr - -%include "std_vector.i" - -%template(IntPtrVector) std::vector; - -%inline %{ -#include -using namespace std; -int* makeIntPtr(int v) { - return new int(v); -} -double* makeDoublePtr(double v) { - return new double(v); -} - -#if 1 -int** makeIntPtrPtr(int* v) { - return new int*(v); -} -#endif - -void displayVector(std::vector vpi) { - cout << "displayVector..." << endl; - for (int i=0; i; + %inline { /* silently rename the parameter names in csharp/java */ #ifdef SWIGR double foo(double inparam, double out) { return 1.0; } #else - double foo(double abstract, double out) { return 1.0; } + double foo(double in, double out) { return 1.0; } #endif double bar(double native, bool boolean) { return 1.0; } } diff --git a/Examples/test-suite/namespace_typemap.i b/Examples/test-suite/namespace_typemap.i index 984b93a6f..e4e0af905 100644 --- a/Examples/test-suite/namespace_typemap.i +++ b/Examples/test-suite/namespace_typemap.i @@ -75,7 +75,7 @@ namespace test { class string_class; #ifdef SWIGPYTHON %typemap(in) string_class * { - $1 = new string_class(SWIG_Python_str_AsChar($input)); + $1 = new string_class(PyString_AsString($input)); } %typemap(freearg) string_class * { delete $1; diff --git a/Examples/test-suite/nested_comment.i b/Examples/test-suite/nested_comment.i index ea365a6fe..16f1b7af2 100644 --- a/Examples/test-suite/nested_comment.i +++ b/Examples/test-suite/nested_comment.i @@ -18,17 +18,24 @@ in rlgc models */ char *name; } n ; } s2; + %} -// comment in nested struct +// bug #491476 %inline %{ -struct a -{ - struct { - /*struct*/ - struct { - int b; - } c; - } d; -}; +struct { +struct { +int a; +} a, b; +} a; + %} + +// bug #909387 +%inline %{ +struct foo { + struct happy; // no warning + struct sad { int x; }; // warning + happy *good(); // produces good code + sad *bad(); // produces bad code +}; diff --git a/Examples/test-suite/nested_structs.i b/Examples/test-suite/nested_structs.i deleted file mode 100644 index 4b13ff69d..000000000 --- a/Examples/test-suite/nested_structs.i +++ /dev/null @@ -1,22 +0,0 @@ -%module nested_structs - -// bug #491476 -%inline %{ -struct { -struct { -int a; -} a, b; -} a; - -%} - -// bug #909387 -%inline %{ -struct foo { - struct happy; // no warning - struct sad { int x; }; // warning - happy *good(); // produces good code - sad *bad(); // produces bad code -}; -%} - diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in index 0e6235f94..6f0b65489 100644 --- a/Examples/test-suite/ocaml/Makefile.in +++ b/Examples/test-suite/ocaml/Makefile.in @@ -16,7 +16,7 @@ run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -a \ -f $(top_srcdir)/Examples/test-suite/$*.list ] ; then ( \ $(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ - $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& $(RUNTOOL) ./runme) ; \ + $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& ./runme) ; \ elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme $(srcdir)/$(*).cmo $(srcdir)/$(*)_runme.cmo $(srcdir)/$(*)_wrap.o && \ diff --git a/Examples/test-suite/octave/Makefile.in b/Examples/test-suite/octave/Makefile.in index b12cf500a..534da55c4 100644 --- a/Examples/test-suite/octave/Makefile.in +++ b/Examples/test-suite/octave/Makefile.in @@ -10,9 +10,7 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ CPP_TEST_CASES += \ - li_std_pair_extra \ - li_std_string_extra \ - octave_cell_deref + cell_deref CPP_TEST_BROKEN += \ implicittest \ diff --git a/Examples/test-suite/octave_cell_deref.i b/Examples/test-suite/octave/cell_deref.i similarity index 86% rename from Examples/test-suite/octave_cell_deref.i rename to Examples/test-suite/octave/cell_deref.i index 2e92ec4de..fddcd80ec 100644 --- a/Examples/test-suite/octave_cell_deref.i +++ b/Examples/test-suite/octave/cell_deref.i @@ -1,4 +1,4 @@ -%module octave_cell_deref +%module cell_deref %inline { bool func(const char* s) { diff --git a/Examples/test-suite/octave/octave_cell_deref_runme.m b/Examples/test-suite/octave/cell_deref_runme.m similarity index 85% rename from Examples/test-suite/octave/octave_cell_deref_runme.m rename to Examples/test-suite/octave/cell_deref_runme.m index 5a98c0a3b..1c370fe85 100644 --- a/Examples/test-suite/octave/octave_cell_deref_runme.m +++ b/Examples/test-suite/octave/cell_deref_runme.m @@ -1,4 +1,4 @@ -octave_cell_deref; +cell_deref; assert(func("hello")); assert(func({"hello"})); diff --git a/Examples/test-suite/implicittest.i b/Examples/test-suite/octave/implicittest.i similarity index 100% rename from Examples/test-suite/implicittest.i rename to Examples/test-suite/octave/implicittest.i diff --git a/Examples/test-suite/octave/li_attribute_runme.m b/Examples/test-suite/octave/li_attribute_runme.m index 548e733ed..c66e27c5b 100644 --- a/Examples/test-suite/octave/li_attribute_runme.m +++ b/Examples/test-suite/octave/li_attribute_runme.m @@ -10,6 +10,7 @@ if (aa.a != 3) error("aa.a = %i",aa.a) endif + if (aa.b != 2) error(aa.b) endif @@ -18,6 +19,8 @@ if (aa.b != 5) error endif + + if (aa.d != aa.b) error endif @@ -36,13 +39,14 @@ if (pi.value != 3) error endif + b = li_attribute.B(aa); if (b.a.c != 3) error endif + -# class/struct attribute with get/set methods using return/pass by reference myFoo = li_attribute.MyFoo(); myFoo.x = 8; myClass = li_attribute.MyClass(); @@ -51,35 +55,3 @@ if (myClass.Foo.x != 8) error endif -# class/struct attribute with get/set methods using return/pass by value -myClassVal = li_attribute.MyClassVal(); -if (myClassVal.ReadWriteFoo.x != -1) - error -endif -if (myClassVal.ReadOnlyFoo.x != -1) - error -endif -myClassVal.ReadWriteFoo = myFoo; -if (myClassVal.ReadWriteFoo.x != 8) - error -endif -if (myClassVal.ReadOnlyFoo.x != 8) - error -endif - -# string attribute with get/set methods using return/pass by value -myStringyClass = li_attribute.MyStringyClass("initial string"); -if (myStringyClass.ReadWriteString != "initial string") - error -endif -if (myStringyClass.ReadOnlyString != "initial string") - error -endif -myStringyClass.ReadWriteString = "changed string"; -if (myStringyClass.ReadWriteString != "changed string") - error -endif -if (myStringyClass.ReadOnlyString != "changed string") - error -endif - diff --git a/Examples/test-suite/li_std_pair_extra.i b/Examples/test-suite/octave/li_std_pair.i similarity index 99% rename from Examples/test-suite/li_std_pair_extra.i rename to Examples/test-suite/octave/li_std_pair.i index 4e3b3a571..886bf1a4b 100644 --- a/Examples/test-suite/li_std_pair_extra.i +++ b/Examples/test-suite/octave/li_std_pair.i @@ -1,4 +1,4 @@ -%module li_std_pair_extra +%module li_std_pair // // activate the automatic comparison methods generation (==,!=,...) diff --git a/Examples/test-suite/octave/li_std_pair_extra_runme.m b/Examples/test-suite/octave/li_std_pair_extra_runme.m deleted file mode 100644 index 0f9e9a23d..000000000 --- a/Examples/test-suite/octave/li_std_pair_extra_runme.m +++ /dev/null @@ -1,69 +0,0 @@ -li_std_pair_extra - -p = {1,2}; -p1 = li_std_pair_extra.p_inout(p); -assert(all(cell2mat(p1)==[2,1])); -p2 = li_std_pair_extra.p_inoutd(p1); -assert(all(cell2mat(p2)==[1,2])); - -d1 = li_std_pair_extra.d_inout(2); -assert(d1==4); - -[i,d2] = li_std_pair_extra.d_inout2(2); -assert(all([i,d2]==[1,4])); - -[i,p] = li_std_pair_extra.p_inout2(p); -assert(i==1&&all([cell2mat(p)]==[2,1])); -[p3,p4] = li_std_pair_extra.p_inout3(p1,p1); -assert(all(cell2mat(p3)==[2,1])); -assert(all(cell2mat(p4)==[2,1])); - -psi = li_std_pair_extra.SIPair("hello",1); -assert(psi=={"hello",1}); -pci = li_std_pair_extra.CIPair(complex(1,2),1); -assert(pci.first==complex(1,2)&&pci.second==1); - - -psi = li_std_pair_extra.SIPair("hi",1); -assert(psi.first=="hi"&&psi.second==1); - -psii = li_std_pair_extra.SIIPair(psi,1); -assert(psii.first.first=="hi"); -assert(psii.first.second==1); -assert(psii.second==1); - -a = li_std_pair_extra.A(); -b = li_std_pair_extra.B(); - -pab = li_std_pair_extra.ABPair(a,b); - -pab.first = a; -pab.first.val = 2; - -assert(pab.first.val == 2); - -pci = li_std_pair_extra.CIntPair(1,0); -assert(pci.first==1&&pci.second==0); - -a = li_std_pair_extra.A(5); -p1 = li_std_pair_extra.pairP1(1,a); -p2 = li_std_pair_extra.pairP2(a,1); -p3 = li_std_pair_extra.pairP3(a,a); - -assert(a.val == li_std_pair_extra.p_identa(p1){2}.val); - -p = li_std_pair_extra.IntPair(1,10); -assert(p.first==1&&p.second==10); -p.first = 1; -assert(p.first==1); - -p = li_std_pair_extra.paircA1(1,a); -assert(p.first==1); -assert(swig_this(p.second)==swig_this(a)); - -p = li_std_pair_extra.paircA2(1,a); -assert(p.first==1); -assert(swig_this(p.second)==swig_this(a)); -#pp = li_std_pair_extra.pairiiA(1,p); # conversion pb re const of pairA1/A2 -pp = li_std_pair_extra.pairiiA(1,{1,A()}); - diff --git a/Examples/test-suite/octave/li_std_pair_runme.m b/Examples/test-suite/octave/li_std_pair_runme.m new file mode 100644 index 000000000..83e9fe5b5 --- /dev/null +++ b/Examples/test-suite/octave/li_std_pair_runme.m @@ -0,0 +1,69 @@ +li_std_pair + +p = {1,2}; +p1 = li_std_pair.p_inout(p); +assert(all(cell2mat(p1)==[2,1])); +p2 = li_std_pair.p_inoutd(p1); +assert(all(cell2mat(p2)==[1,2])); + +d1 = li_std_pair.d_inout(2); +assert(d1==4); + +[i,d2] = li_std_pair.d_inout2(2); +assert(all([i,d2]==[1,4])); + +[i,p] = li_std_pair.p_inout2(p); +assert(i==1&&all([cell2mat(p)]==[2,1])); +[p3,p4] = li_std_pair.p_inout3(p1,p1); +assert(all(cell2mat(p3)==[2,1])); +assert(all(cell2mat(p4)==[2,1])); + +psi = li_std_pair.SIPair("hello",1); +assert(psi=={"hello",1}); +pci = li_std_pair.CIPair(complex(1,2),1); +assert(pci.first==complex(1,2)&&pci.second==1); + + +psi = li_std_pair.SIPair("hi",1); +assert(psi.first=="hi"&&psi.second==1); + +psii = li_std_pair.SIIPair(psi,1); +assert(psii.first.first=="hi"); +assert(psii.first.second==1); +assert(psii.second==1); + +a = li_std_pair.A(); +b = li_std_pair.B(); + +pab = li_std_pair.ABPair(a,b); + +pab.first = a; +pab.first.val = 2; + +assert(pab.first.val == 2); + +pci = li_std_pair.CIntPair(1,0); +assert(pci.first==1&&pci.second==0); + +a = li_std_pair.A(5); +p1 = li_std_pair.pairP1(1,a); +p2 = li_std_pair.pairP2(a,1); +p3 = li_std_pair.pairP3(a,a); + +assert(a.val == li_std_pair.p_identa(p1){2}.val); + +p = li_std_pair.IntPair(1,10); +assert(p.first==1&&p.second==10); +p.first = 1; +assert(p.first==1); + +p = li_std_pair.paircA1(1,a); +assert(p.first==1); +assert(swig_this(p.second)==swig_this(a)); + +p = li_std_pair.paircA2(1,a); +assert(p.first==1); +assert(swig_this(p.second)==swig_this(a)); +#pp = li_std_pair.pairiiA(1,p); # conversion pb re const of pairA1/A2 +pp = li_std_pair.pairiiA(1,{1,A()}); + diff --git a/Examples/test-suite/li_std_string_extra.i b/Examples/test-suite/octave/li_std_string.i similarity index 93% rename from Examples/test-suite/li_std_string_extra.i rename to Examples/test-suite/octave/li_std_string.i index aa758532a..822d713c4 100644 --- a/Examples/test-suite/li_std_string_extra.i +++ b/Examples/test-suite/octave/li_std_string.i @@ -1,4 +1,4 @@ -%module li_std_string_extra +%module li_std_string %naturalvar A; @@ -51,5 +51,5 @@ std::basic_string,std::allocator > test_value_ %} -%include "li_std_string.i" +%include ../li_std_string.i diff --git a/Examples/test-suite/octave/li_std_string_extra_runme.m b/Examples/test-suite/octave/li_std_string_extra_runme.m deleted file mode 100644 index 8d506af8a..000000000 --- a/Examples/test-suite/octave/li_std_string_extra_runme.m +++ /dev/null @@ -1,162 +0,0 @@ -li_std_string_extra - -x="hello"; - - - -if (li_std_string_extra.test_ccvalue(x) != x) - error("bad string mapping") -endif - -if (li_std_string_extra.test_cvalue(x) != x) - error("bad string mapping") -endif - -if (li_std_string_extra.test_value(x) != x) - error("bad string mapping: %s, %s", x, li_std_string_extra.test_value(x)) -endif - -if (li_std_string_extra.test_const_reference(x) != x) - error("bad string mapping") -endif - - -s = li_std_string_extra.string("he"); -#s += "ll" -#s.append("ll") -s = s + "llo"; - -if (s != x) - error("bad string mapping: %s, %s", s, x); -endif - -#if (s(1:4) != x(1:4)) -# error("bad string mapping") -#endif - -if (li_std_string_extra.test_value(s) != x) - error("bad string mapping") -endif - -if (li_std_string_extra.test_const_reference(s) != x) - error("bad string mapping") -endif - -a = li_std_string_extra.A(s); - -if (li_std_string_extra.test_value(a) != x) - error("bad string mapping") -endif - -if (li_std_string_extra.test_const_reference(a) != x) - error("bad string mapping") -endif - -b = li_std_string_extra.string(" world"); - -s = a + b; -if (a + b != "hello world") - error("bad string mapping: %s", a + b) -endif - -if (a + " world" != "hello world") - error("bad string mapping") -endif - -#if ("hello" + b != "hello world") -# error("bad string mapping") -#endif - -c = (li_std_string_extra.string("hello") + b); -if (c.find_last_of("l") != 9) - error("bad string mapping") -endif - -s = "hello world"; - -b = li_std_string_extra.B("hi"); - -b.name = li_std_string_extra.string("hello"); -if (b.name != "hello") - error("bad string mapping") -endif - - -b.a = li_std_string_extra.A("hello"); -if (b.a != "hello") - error("bad string mapping") -endif - - -if (li_std_string_extra.test_value_basic1(x) != x) - error("bad string mapping") -endif - -if (li_std_string_extra.test_value_basic2(x) != x) - error("bad string mapping") -endif - - -if (li_std_string_extra.test_value_basic3(x) != x) - error("bad string mapping") -endif - -# Global variables -s = "initial string"; -if (li_std_string_extra.cvar.GlobalString2 != "global string 2") - error("GlobalString2 test 1") -endif -li_std_string_extra.cvar.GlobalString2 = s; -if (li_std_string_extra.cvar.GlobalString2 != s) - error("GlobalString2 test 2") -endif -if (li_std_string_extra.cvar.ConstGlobalString != "const global string") - error("ConstGlobalString test") -endif - -# Member variables -myStructure = li_std_string_extra.Structure(); -if (myStructure.MemberString2 != "member string 2") - error("MemberString2 test 1") -endif -myStructure.MemberString2 = s; -if (myStructure.MemberString2 != s) - error("MemberString2 test 2") -endif -if (myStructure.ConstMemberString != "const member string") - error("ConstMemberString test") -endif - -if (li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2") - error("StaticMemberString2 test 1") -endif -li_std_string_extra.cvar.Structure_StaticMemberString2 = s; -if (li_std_string_extra.cvar.Structure_StaticMemberString2 != s) - error("StaticMemberString2 test 2") -endif -if (li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string") - error("ConstStaticMemberString test") -endif - - -if (li_std_string_extra.test_reference_input("hello") != "hello") - error -endif -s = li_std_string_extra.test_reference_inout("hello"); -if (s != "hellohello") - error -endif - - -if (li_std_string_extra.stdstring_empty() != "") - error -endif - - -if (li_std_string_extra.c_empty() != "") - error -endif - -#if (li_std_string_extra.c_null() != None) -# error -#endif diff --git a/Examples/test-suite/octave/li_std_string_runme.m b/Examples/test-suite/octave/li_std_string_runme.m new file mode 100644 index 000000000..fa0e260e0 --- /dev/null +++ b/Examples/test-suite/octave/li_std_string_runme.m @@ -0,0 +1,162 @@ +li_std_string + +x="hello"; + + + +if (li_std_string.test_ccvalue(x) != x) + error("bad string mapping") +endif + +if (li_std_string.test_cvalue(x) != x) + error("bad string mapping") +endif + +if (li_std_string.test_value(x) != x) + error("bad string mapping: %s, %s", x, li_std_string.test_value(x)) +endif + +if (li_std_string.test_const_reference(x) != x) + error("bad string mapping") +endif + + +s = li_std_string.string("he"); +#s += "ll" +#s.append('o') +s = s + "llo"; + +if (s != x) + error("bad string mapping: %s, %s", s, x); +endif + +if (s[1:4] != x[1:4]) + error("bad string mapping") +endif + +if (li_std_string.test_value(s) != x) + error("bad string mapping") +endif + +if (li_std_string.test_const_reference(s) != x) + error("bad string mapping") +endif + +a = li_std_string.A(s); + +if (li_std_string.test_value(a) != x) + error("bad string mapping") +endif + +if (li_std_string.test_const_reference(a) != x) + error("bad string mapping") +endif + +b = li_std_string.string(" world"); + +s = a + b; +if (a + b != "hello world") + error("bad string mapping: %s", a + b) +endif + +if (a + " world" != "hello world") + error("bad string mapping") +endif + +if ("hello" + b != "hello world") + error("bad string mapping") +endif + +c = ("hello" + b) +if (c.find_last_of("l") != 9) + error("bad string mapping") +endif + +s = "hello world"; + +b = li_std_string.B("hi"); + +b.name = li_std_string.string("hello"); +if (b.name != "hello") + error("bad string mapping") +endif + + +b.a = li_std_string.A("hello"); +if (b.a != "hello") + error("bad string mapping") +endif + + +if (li_std_string.test_value_basic1(x) != x) + error("bad string mapping") +endif + +if (li_std_string.test_value_basic2(x) != x) + error("bad string mapping") +endif + + +if (li_std_string.test_value_basic3(x) != x) + error("bad string mapping") +endif + +# Global variables +s = "initial string"; +if (li_std_string.cvar.GlobalString2 != "global string 2") + error("GlobalString2 test 1") +endif +li_std_string.cvar.GlobalString2 = s; +if (li_std_string.cvar.GlobalString2 != s) + error("GlobalString2 test 2") +endif +if (li_std_string.cvar.ConstGlobalString != "const global string") + error("ConstGlobalString test") +endif + +# Member variables +myStructure = li_std_string.Structure(); +if (myStructure.MemberString2 != "member string 2") + error("MemberString2 test 1") +endif +myStructure.MemberString2 = s; +if (myStructure.MemberString2 != s) + error("MemberString2 test 2") +endif +if (myStructure.ConstMemberString != "const member string") + error("ConstMemberString test") +endif + +if (li_std_string.cvar.Structure_StaticMemberString2 != "static member string 2") + error("StaticMemberString2 test 1") +endif +li_std_string.cvar.Structure_StaticMemberString2 = s; +if (li_std_string.cvar.Structure_StaticMemberString2 != s) + error("StaticMemberString2 test 2") +endif +if (li_std_string.cvar.Structure_ConstStaticMemberString != "const static member string") + error("ConstStaticMemberString test") +endif + + +if (li_std_string.test_reference_input("hello") != "hello") + error +endif +s = li_std_string.test_reference_inout("hello"); +if (s != "hellohello") + error +endif + + +if (li_std_string.stdstring_empty() != "") + error +endif + + +if (li_std_string.c_empty() != "") + error +endif + +if (li_std_string.c_null() != None) + error +endif diff --git a/Examples/test-suite/operator_overload.i b/Examples/test-suite/operator_overload.i index c9b0a6e34..78330c88d 100644 --- a/Examples/test-suite/operator_overload.i +++ b/Examples/test-suite/operator_overload.i @@ -76,12 +76,6 @@ see bottom for a set of possible tests %rename(OrOperator) operator ||; #endif -#ifdef SWIG_ALLEGRO_CL -%{ -#include -%} -#endif - %rename(IntCast) operator int(); %rename(DoubleCast) operator double(); diff --git a/Examples/test-suite/operbool.i b/Examples/test-suite/operbool.i deleted file mode 100644 index 793c0174e..000000000 --- a/Examples/test-suite/operbool.i +++ /dev/null @@ -1,12 +0,0 @@ -%module operbool - -%rename(operbool) operator bool(); - -%inline %{ - class Test { - public: - operator bool() { - return false; - } - }; -%} diff --git a/Examples/test-suite/packageoption.h b/Examples/test-suite/packageoption.h index 82f29d1c7..a7ef499aa 100644 --- a/Examples/test-suite/packageoption.h +++ b/Examples/test-suite/packageoption.h @@ -1,6 +1,5 @@ -struct Base { - virtual int vmethod() { return 1; } - int basemethod() { return 1; } - virtual ~Base() {} +class A +{ + public: + int testInt() { return 2;} }; - diff --git a/Examples/test-suite/packageoption.list b/Examples/test-suite/packageoption.list index da125c2a3..4bdabeccf 100644 --- a/Examples/test-suite/packageoption.list +++ b/Examples/test-suite/packageoption.list @@ -1,3 +1,2 @@ packageoption_a packageoption_b -packageoption_c diff --git a/Examples/test-suite/packageoption_a.i b/Examples/test-suite/packageoption_a.i index b28278282..e95091b0d 100644 --- a/Examples/test-suite/packageoption_a.i +++ b/Examples/test-suite/packageoption_a.i @@ -1,4 +1,4 @@ -%module(package="CommonPackage") "packageoption_a"; +%module(package="C") "packageoption_a"; %inline %{ class A @@ -6,11 +6,5 @@ class A public: int testInt() { return 2;} }; + %} - -%{ -#include "packageoption.h" -%} - -%include "packageoption.h" - diff --git a/Examples/test-suite/packageoption_b.i b/Examples/test-suite/packageoption_b.i index 40a44be14..466853cc0 100644 --- a/Examples/test-suite/packageoption_b.i +++ b/Examples/test-suite/packageoption_b.i @@ -1,4 +1,4 @@ -%module(package="CommonPackage") "packageoption_b"; +%module(package="C") "packageoption_b"; %inline %{ class B diff --git a/Examples/test-suite/packageoption_c.i b/Examples/test-suite/packageoption_c.i deleted file mode 100644 index f43e47002..000000000 --- a/Examples/test-suite/packageoption_c.i +++ /dev/null @@ -1,13 +0,0 @@ -%module(package="PackageC") "packageoption_c"; - -%import "packageoption_a.i" - -%inline %{ -#include "packageoption.h" - -struct Derived : Base { - virtual int vmethod() { return 2; } - virtual ~Derived() {} -}; - -%} diff --git a/Examples/test-suite/perl5/char_strings_runme.pl b/Examples/test-suite/perl5/char_strings_runme.pl index c4573737e..51c227bb9 100644 --- a/Examples/test-suite/perl5/char_strings_runme.pl +++ b/Examples/test-suite/perl5/char_strings_runme.pl @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More tests => 5; +use Test::More tests => 4; BEGIN { use_ok('char_strings') } require_ok('char_strings'); @@ -10,6 +10,3 @@ is(char_strings::CharPingPong($val1), "100", 'cstr1'); my $val2 = "greetings"; is(char_strings::CharPingPong($val2), "greetings", 'cstr2'); -# SF#2564192 -"this is a test" =~ /(\w+)$/; -is(char_strings::CharPingPong($1), "test", "handles Magical"); diff --git a/Examples/test-suite/li_std_list.i b/Examples/test-suite/perl5/li_std_list.i similarity index 100% rename from Examples/test-suite/li_std_list.i rename to Examples/test-suite/perl5/li_std_list.i diff --git a/Examples/test-suite/perl5/li_typemaps_runme.pl b/Examples/test-suite/perl5/li_typemaps_runme.pl index c182cdbb1..c149284ae 100644 --- a/Examples/test-suite/perl5/li_typemaps_runme.pl +++ b/Examples/test-suite/perl5/li_typemaps_runme.pl @@ -37,29 +37,24 @@ batch('ulong', 0, 1, 12, 0xffffffff); batch('uchar', 0, 1, 12, 0xff); batch('schar', -0x80, 0, 1, 12, 0x7f); -{ - use Math::BigInt qw(); - # the pack dance is to get plain old NVs out of the - # Math::BigInt objects. - my $inf = unpack 'd', pack 'd', Math::BigInt->binf(); - my $nan = unpack 'd', pack 'd', Math::BigInt->bnan(); - batch('float', - -(2 - 2 ** -23) * 2 ** 127, - -1, -2 ** -149, 0, 2 ** -149, 1, - (2 - 2 ** -23) * 2 ** 127, - $nan); - { local $TODO = "float typemaps don't pass infinity"; - # it seems as though SWIG is unwilling to pass infinity around - # because that value always fails bounds checking. I think that - # is a bug. - batch('float', $inf); - } - batch('double', - -(2 - 2 ** -53) ** 1023, - -1, -2 ** -1074, 0, 2 ** 1074, - (2 - 2 ** -53) ** 1023, - $nan, $inf); +# IEEE 754 machine, please! +batch('float', + -(2 - 2 ** -23) * 2 ** 127, + -1, -2 ** -149, 0, 2 ** -149, 1, + (2 - 2 ** -23) * 2 ** 127, + 'nan'); +{ local $TODO = "shouldn't some Inf <=> float work?"; + # I'm going to guess that it could work reasonably as + # NV Inf => float Inf + # float Inf => NV NaN + # but this needs some thought. + batch('float', 'inf'); } +batch('double', + -(2 - 2 ** -53) ** 1023, + -1, -2 ** -1074, 0, 2 ** 1074, + (2 - 2 ** -53) ** 1023, + 'nan', 'inf'); batch('longlong', -1, 0, 1, 12); batch('ulonglong', 0, 1, 12); SKIP: { diff --git a/Examples/test-suite/perl5/packageoption_runme.pl b/Examples/test-suite/perl5/packageoption_runme.pl index d94a7a1fd..debea78e1 100644 --- a/Examples/test-suite/perl5/packageoption_runme.pl +++ b/Examples/test-suite/perl5/packageoption_runme.pl @@ -14,11 +14,11 @@ sub ok_not ($;$) { ok($test, $name); } -my $a = CommonPackage::A->new(); +my $a = C::A->new(); -isa_ok($a, 'CommonPackage::A'); +isa_ok($a, 'C::A'); -my $b = CommonPackage::B->new(); +my $b = C::B->new(); -isa_ok($b, 'CommonPackage::B'); +isa_ok($b, 'C::B'); diff --git a/Examples/test-suite/php/Makefile.in b/Examples/test-suite/php4/Makefile.in similarity index 69% rename from Examples/test-suite/php/Makefile.in rename to Examples/test-suite/php4/Makefile.in index b8aeaaa11..2e14ef9a2 100644 --- a/Examples/test-suite/php/Makefile.in +++ b/Examples/test-suite/php4/Makefile.in @@ -1,16 +1,13 @@ ####################################################################### -# Makefile for php test-suite +# Makefile for php4 test-suite ####################################################################### -LANGUAGE = php -SCRIPTSUFFIX = _runme.php +LANGUAGE = php4 +SCRIPTSUFFIX = _runme.php4 srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -#CPP_TEST_CASES += \ -# php_namewarn_rename \ - include $(srcdir)/../common.mk # Overridden variables here @@ -25,19 +22,19 @@ makectests: @bash -ec 'for test in $(C_TEST_CASES) ; do $($(MAKE)) clean && $(MAKE) $${test}.cpptest; done' runcpptests: - @bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done' + @bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done' runctests: - @bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done' + @bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done' runtests: runcpptests runctests -# write out tests without a _runme.php +# write out tests without a _runme.php4 missingcpptests: - @bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done' + @bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done' missingctests: - @bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done' + @bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done' missingtests: missingcpptests missingctests @@ -58,10 +55,10 @@ missingtests: missingcpptests missingctests +$(run_testcase) # Runs the testcase. A testcase is only run if -# a file is found which has _runme.php appended after the testcase name. +# a file is found which has _runme.php4 appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ - $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run;) \ + $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \ fi; # Clean: remove the generated .php file @@ -69,4 +66,4 @@ run_testcase = \ @rm -f $*.php; clean: - $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php_clean + $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php4_clean diff --git a/Examples/test-suite/php/abstract_inherit_ok_runme.php b/Examples/test-suite/php4/abstract_inherit_ok_runme.php4 similarity index 88% rename from Examples/test-suite/php/abstract_inherit_ok_runme.php rename to Examples/test-suite/php4/abstract_inherit_ok_runme.php4 index c2d86499b..1182e4cec 100644 --- a/Examples/test-suite/php/abstract_inherit_ok_runme.php +++ b/Examples/test-suite/php4/abstract_inherit_ok_runme.php4 @@ -1,6 +1,6 @@ diff --git a/Examples/test-suite/php/arrays_global_twodim_runme.php b/Examples/test-suite/php4/arrays_global_twodim_runme.php4 similarity index 97% rename from Examples/test-suite/php/arrays_global_twodim_runme.php rename to Examples/test-suite/php4/arrays_global_twodim_runme.php4 index d9b62de0d..352ad2568 100644 --- a/Examples/test-suite/php/arrays_global_twodim_runme.php +++ b/Examples/test-suite/php4/arrays_global_twodim_runme.php4 @@ -1,7 +1,7 @@ /dev/null 2>&1 - - # Runs the testcase. A testcase is only run if -# a file is found which has _runme.py (or _runme3.py for Python 3) appended after the testcase name. - -run_python = env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) - -py2_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY2SCRIPTSUFFIX) -py3_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY3SCRIPTSUFFIX) - -ifeq (,$(PY3)) +# a file is found which has _runme.py appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ - $(run_python);)\ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \ fi; -else -run_testcase = \ - if [ -f $(py2_runme) ]; then ( \ - $(MAKE) -f $(srcdir)/Makefile $(py3_runme) && \ - $(run_python);) \ - elif [ -f $(py3_runme) ]; then ( \ - $(run_python);) \ - fi; -endif # Clean: remove the generated .py file %.clean: @rm -f hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py @rm -f $*.py; - @#We only remove the _runme3.py if it is generated by 2to3 from a _runme.py. - @if [ -f $(py2_runme) ]; then (rm -f $(py3_runme) $(py3_runme).bak;) fi; clean: $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile python_clean @@ -153,15 +101,14 @@ cvsignore: @echo clientdata_prop_b.py @echo imports_a.py @echo imports_b.py - @echo mod_a.py mod_b.py + @echo mod_a.py mod_b.py @echo hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py @echo template_typedef_import.py -hugemod_runme = hugemod$(SCRIPTPREFIX) hugemod: - perl hugemod.pl $(hugemod_runme) + perl hugemod.pl $(MAKE) hugemod_a.cpptest $(MAKE) hugemod_b.cpptest - sh -c "time $(PYTHON) $(hugemod_runme)" - sh -c "time $(PYTHON) $(hugemod_runme)" + time $(PYTHON) hugemod_runme.py + time $(PYTHON) hugemod_runme.py diff --git a/Examples/test-suite/python/README b/Examples/test-suite/python/README index 71db759b5..b86ec5289 100644 --- a/Examples/test-suite/python/README +++ b/Examples/test-suite/python/README @@ -1,8 +1,4 @@ See ../README for common README file. -Any testcases which have _runme.py (or _runme3.py for Python 3) appended after the testcase name will be detected and run. +Any testcases which have _runme.py appended after the testcase name will be detected and run. -If you intend to write a testcase for both Python 2.x and 3.x, do *not* directly put the _runme3.py in this directory. Just write Python 2.x's _runme.py testcase and it will be automatically converted to Python 3 code during test. - -You can run make with PY3=y to run test case with Python 3.x, eg. - $ make voidtest.cpptest PY3=y diff --git a/Examples/test-suite/argcargvtest.i b/Examples/test-suite/python/argcargvtest.i similarity index 100% rename from Examples/test-suite/argcargvtest.i rename to Examples/test-suite/python/argcargvtest.i diff --git a/Examples/test-suite/python_autodoc.i b/Examples/test-suite/python/autodoc.i similarity index 97% rename from Examples/test-suite/python_autodoc.i rename to Examples/test-suite/python/autodoc.i index c363e4384..c22cc02f0 100644 --- a/Examples/test-suite/python_autodoc.i +++ b/Examples/test-suite/python/autodoc.i @@ -1,4 +1,4 @@ -%module(docstring="hello") python_autodoc +%module(docstring="hello") autodoc %feature("autodoc"); diff --git a/Examples/test-suite/callback.i b/Examples/test-suite/python/callback.i similarity index 100% rename from Examples/test-suite/callback.i rename to Examples/test-suite/python/callback.i diff --git a/Examples/test-suite/complextest.i b/Examples/test-suite/python/complextest.i similarity index 100% rename from Examples/test-suite/complextest.i rename to Examples/test-suite/python/complextest.i diff --git a/Examples/test-suite/python/contract_runme.py b/Examples/test-suite/python/contract_runme.py index 905bf1196..9ded5bb5b 100644 --- a/Examples/test-suite/python/contract_runme.py +++ b/Examples/test-suite/python/contract_runme.py @@ -133,11 +133,3 @@ try: except: pass -#Namespace -my = contract.myClass(1) -try: - my = contract.myClass(0) - print "Failed! constructor preassertion" -except: - pass - diff --git a/Examples/test-suite/python/cpp_namespace_runme.py b/Examples/test-suite/python/cpp_namespace_runme.py index a454774f5..3108b4f47 100644 --- a/Examples/test-suite/python/cpp_namespace_runme.py +++ b/Examples/test-suite/python/cpp_namespace_runme.py @@ -3,20 +3,20 @@ import cpp_namespace n = cpp_namespace.fact(4) if n != 24: - raise RuntimeError("Bad return value!") + raise "Bad return value!" if cpp_namespace.cvar.Foo != 42: - raise RuntimeError("Bad variable value!") + raise "Bad variable value!" t = cpp_namespace.Test() if t.method() != "Test::method": - raise RuntimeError("Bad method return value!") + raise "Bad method return value!" if cpp_namespace.do_method(t) != "Test::method": - raise RuntimeError("Bad return value!") + raise "Bad return value!" if cpp_namespace.do_method2(t) != "Test::method": - raise RuntimeError("Bad return value!") + raise "Bad return value!" cpp_namespace.weird("hello", 4) @@ -28,18 +28,18 @@ t4 = cpp_namespace.Test4() t5 = cpp_namespace.Test5() if cpp_namespace.foo3(42) != 42: - raise RuntimeError("Bad return value!") + raise "Bad return value!" if cpp_namespace.do_method3(t2,40) != "Test2::method": - raise RuntimeError("Bad return value!") + raise "Bad return value!" if cpp_namespace.do_method3(t3,40) != "Test3::method": - raise RuntimeError("Bad return value!") + raise "Bad return value!" if cpp_namespace.do_method3(t4,40) != "Test4::method": - raise RuntimeError("Bad return value!") + raise "Bad return value!" if cpp_namespace.do_method3(t5,40) != "Test5::method": - raise RuntimeError("Bad return value!") + raise "Bad return value!" diff --git a/Examples/test-suite/python/cpp_static_runme.py b/Examples/test-suite/python/cpp_static_runme.py deleted file mode 100644 index ef8623359..000000000 --- a/Examples/test-suite/python/cpp_static_runme.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/evn python -from cpp_static import * -StaticFunctionTest.static_func() -StaticFunctionTest.static_func_2(1) -StaticFunctionTest.static_func_3(1,2) -StaticMemberTest.static_int = 10 -assert StaticMemberTest.static_int == 10 diff --git a/Examples/test-suite/python/director_classic_runme.py b/Examples/test-suite/python/director_classic_runme.py index 7e18a9a61..878905679 100644 --- a/Examples/test-suite/python/director_classic_runme.py +++ b/Examples/test-suite/python/director_classic_runme.py @@ -1,56 +1,56 @@ from director_classic import * class TargetLangPerson(Person): - def __init__(self): - Person.__init__(self) - def id(self): - identifier = "TargetLangPerson" - return identifier + def __init__(self): + Person.__init__(self) + def id(self): + identifier = "TargetLangPerson" + return identifier class TargetLangChild(Child): - def __init__(self): - Child.__init__(self) - def id(self): - identifier = "TargetLangChild" - return identifier + def __init__(self): + Child.__init__(self) + def id(self): + identifier = "TargetLangChild" + return identifier class TargetLangGrandChild(GrandChild): - def __init__(self): - GrandChild.__init__(self) - def id(self): - identifier = "TargetLangGrandChild" - return identifier + def __init__(self): + GrandChild.__init__(self) + def id(self): + identifier = "TargetLangGrandChild" + return identifier # Semis - don't override id() in target language class TargetLangSemiPerson(Person): - def __init__(self): - Person.__init__(self) + def __init__(self): + Person.__init__(self) # No id() override class TargetLangSemiChild(Child): - def __init__(self): - Child.__init__(self) + def __init__(self): + Child.__init__(self) # No id() override class TargetLangSemiGrandChild(GrandChild): - def __init__(self): - GrandChild.__init__(self) + def __init__(self): + GrandChild.__init__(self) # No id() override # Orphans - don't override id() in C++ class TargetLangOrphanPerson(OrphanPerson): - def __init__(self): - OrphanPerson.__init__(self) - def id(self): - identifier = "TargetLangOrphanPerson" - return identifier + def __init__(self): + OrphanPerson.__init__(self) + def id(self): + identifier = "TargetLangOrphanPerson" + return identifier class TargetLangOrphanChild(OrphanChild): - def __init__(self): - Child.__init__(self) - def id(self): - identifier = "TargetLangOrphanChild" - return identifier + def __init__(self): + Child.__init__(self) + def id(self): + identifier = "TargetLangOrphanChild" + return identifier def check(person, expected): @@ -61,7 +61,7 @@ def check(person, expected): if (debug): print(ret) if (ret != expected): - raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected) + raise ("Failed. Received: " + ret + " Expected: " + expected) # Polymorphic call from C++ caller = Caller() @@ -70,7 +70,7 @@ def check(person, expected): if (debug): print(ret) if (ret != expected): - raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected) + raise ("Failed. Received: " + ret + " Expected: " + expected) # Polymorphic call of object created in target language and passed to C++ and back again baseclass = caller.baseClass() @@ -78,7 +78,7 @@ def check(person, expected): if (debug): print(ret) if (ret != expected): - raise RuntimeError("Failed. Received: " + str(ret)+ " Expected: " + expected) + raise ("Failed. Received: " + ret + " Expected: " + expected) caller.resetCallback() if (debug): diff --git a/Examples/test-suite/python/director_exception_runme.py b/Examples/test-suite/python/director_exception_runme.py index ef7a044f1..7c9e69250 100644 --- a/Examples/test-suite/python/director_exception_runme.py +++ b/Examples/test-suite/python/director_exception_runme.py @@ -1,8 +1,5 @@ from director_exception import * - -class MyException(Exception): - def __init__(self, a, b): - self.msg = a + b +from exceptions import * class MyFoo(Foo): def ping(self): @@ -10,62 +7,39 @@ class MyFoo(Foo): class MyFoo2(Foo): def ping(self): - return True + return true pass # error: should return a string -class MyFoo3(Foo): - def ping(self): - raise MyException("foo", "bar") - -# Check that the NotImplementedError raised by MyFoo.ping() is returned by -# MyFoo.pong(). ok = 0 + a = MyFoo() b = launder(a) + try: b.pong() except NotImplementedError, e: - if str(e) == "MyFoo::ping() EXCEPTION": - ok = 1 - else: - print "Unexpected error message: %s" % str(e) + ok = 1 except: pass + if not ok: raise RuntimeError - -# Check that the director returns the appropriate TypeError if the return type -# is wrong. ok = 0 + a = MyFoo2() b = launder(a) + try: b.pong() -except TypeError, e: - if str(e) == "Swig director type mismatch in output value of type 'std::string'": - ok = 1 - else: - print "Unexpected error message: %s" % str(e) +except: + ok = 1 + + if not ok: raise RuntimeError -# Check that the director can return an exception which requires two arguments -# to the constructor, without mangling it. -ok = 0 -a = MyFoo3() -b = launder(a) -try: - b.pong() -except MyException, e: - if e.msg == 'foobar': - ok = 1 - else: - print "Unexpected error message: %s" % str(e) -if not ok: - raise RuntimeError - try: raise Exception2() except Exception2: diff --git a/Examples/test-suite/director_profile.i b/Examples/test-suite/python/director_profile.i similarity index 100% rename from Examples/test-suite/director_profile.i rename to Examples/test-suite/python/director_profile.i diff --git a/Examples/test-suite/director_stl.i b/Examples/test-suite/python/director_stl.i similarity index 100% rename from Examples/test-suite/director_stl.i rename to Examples/test-suite/python/director_stl.i diff --git a/Examples/test-suite/python/director_thread_runme.py b/Examples/test-suite/python/director_thread_runme.py index 15a12ab80..e66817e17 100644 --- a/Examples/test-suite/python/director_thread_runme.py +++ b/Examples/test-suite/python/director_thread_runme.py @@ -14,5 +14,3 @@ d.run() if d.val >= 0: print d.val raise RuntimeError - -d.stop() diff --git a/Examples/test-suite/python/file_test_runme.py b/Examples/test-suite/python/file_test_runme.py index de4e2669e..64154c619 100644 --- a/Examples/test-suite/python/file_test_runme.py +++ b/Examples/test-suite/python/file_test_runme.py @@ -1,8 +1,7 @@ import sys import file_test -if sys.version_info < (3,0): - file_test.nfile(sys.stdout) +file_test.nfile(sys.stdout) cstdout = file_test.GetStdOut() diff --git a/Examples/test-suite/python/hugemod.pl b/Examples/test-suite/python/hugemod.pl index 5420926e4..15c4ce41b 100644 --- a/Examples/test-suite/python/hugemod.pl +++ b/Examples/test-suite/python/hugemod.pl @@ -2,12 +2,8 @@ use strict; -my $modsize = 399; #adjust it so you can have a smaller or bigger hugemod - -my $runme = shift @ARGV; - open HEADER, ">hugemod.h" or die "error"; -open TEST, ">$runme" or die "error"; +open TEST, ">hugemod_runme.py" or die "error"; open I1, ">hugemod_a.i" or die "error"; open I2, ">hugemod_b.i" or die "error"; @@ -25,7 +21,7 @@ print I2 "\%inline \%{\n"; my $i; -for ($i = 0; $i < $modsize; $i++) { +for ($i = 0; $i < 6000; $i++) { my $t = $i * 4; print HEADER "class type$i { public: int a; };\n"; print I2 "class dtype$i : public type$i { public: int b; };\n"; diff --git a/Examples/test-suite/iadd.i b/Examples/test-suite/python/iadd.h similarity index 79% rename from Examples/test-suite/iadd.i rename to Examples/test-suite/python/iadd.h index 514bd3e4f..367eda26f 100644 --- a/Examples/test-suite/iadd.i +++ b/Examples/test-suite/python/iadd.h @@ -1,12 +1,3 @@ -%module iadd - -%include attribute.i -class Foo; -%attribute_ref(test::Foo, test::A& , AsA); -%attribute_ref(test::Foo, long, AsLong); - - -%inline %{ struct B { int x; B(const int x) : x(x) {} @@ -54,5 +45,3 @@ private: long *_n; }; } - -%} diff --git a/Examples/test-suite/python/iadd.i b/Examples/test-suite/python/iadd.i new file mode 100644 index 000000000..76604c027 --- /dev/null +++ b/Examples/test-suite/python/iadd.i @@ -0,0 +1,12 @@ +%module iadd + +%include attribute.i +%{ +#include "iadd.h" +%} +class Foo; +%attribute_ref(test::Foo, test::A& , AsA); +%attribute_ref(test::Foo, long, AsLong); + + +%include "iadd.h" diff --git a/Examples/test-suite/python/implicittest.i b/Examples/test-suite/python/implicittest.i new file mode 100644 index 000000000..91205aafa --- /dev/null +++ b/Examples/test-suite/python/implicittest.i @@ -0,0 +1,68 @@ +%module(naturalvar="1") implicittest + +%implicitconv; + +%inline +{ + struct B { }; +} + +%inline +{ + struct A + { + int ii; + A(int i) { ii = 1; } + A(double d) { ii = 2; } + A(const B& b) { ii = 3; } + explicit A(char *s) { ii = 4; } + + int get() const { return ii; } + + }; + + int get(const A& a) { return a.ii; } + + template + struct A_T + { + int ii; + A_T(int i) { ii = 1; } + A_T(double d) { ii = 2; } + A_T(const B& b) { ii = 3; } + explicit A_T(char *s) { ii = 4; } + + int get() const { return ii; } + + }; +} + +%inline +{ + struct Foo + { + int ii; + Foo(){ ii = 0;} + Foo(int){ ii = 1;} + Foo(double){ ii = 2;} + explicit Foo(char *s){ii = 3;} + Foo(const Foo& f){ ii = f.ii;} + + }; + + struct Bar + { + int ii; + Foo f; + Bar() {ii = -1;} + Bar(const Foo& ff){ ii = ff.ii;} + }; + + + int get_b(const Bar&b) { return b.ii; } + + Foo foo; + +} + +%template(A_int) A_T; diff --git a/Examples/test-suite/inout.i b/Examples/test-suite/python/inout.i similarity index 100% rename from Examples/test-suite/inout.i rename to Examples/test-suite/python/inout.i diff --git a/Examples/test-suite/inplaceadd.i b/Examples/test-suite/python/inplaceadd.i similarity index 100% rename from Examples/test-suite/inplaceadd.i rename to Examples/test-suite/python/inplaceadd.i diff --git a/Examples/test-suite/input.i b/Examples/test-suite/python/input.i similarity index 100% rename from Examples/test-suite/input.i rename to Examples/test-suite/python/input.i diff --git a/Examples/test-suite/python_kwargs.i b/Examples/test-suite/python/kwargs.i similarity index 98% rename from Examples/test-suite/python_kwargs.i rename to Examples/test-suite/python/kwargs.i index 28089bbf1..83713d8c2 100644 --- a/Examples/test-suite/python_kwargs.i +++ b/Examples/test-suite/python/kwargs.i @@ -1,4 +1,4 @@ -%module python_kwargs +%module kwargs %nocopyctor; %kwargs; diff --git a/Examples/test-suite/python/python_kwargs_runme.py b/Examples/test-suite/python/kwargs_runme.py similarity index 97% rename from Examples/test-suite/python/python_kwargs_runme.py rename to Examples/test-suite/python/kwargs_runme.py index fb6e191dd..91812929d 100644 --- a/Examples/test-suite/python/python_kwargs_runme.py +++ b/Examples/test-suite/python/kwargs_runme.py @@ -1,4 +1,4 @@ -from python_kwargs import * +from kwargs import * class MyFoo(Foo): def __init__(self, a , b = 0): diff --git a/Examples/test-suite/python/li_attribute_runme.py b/Examples/test-suite/python/li_attribute_runme.py index db40b9b2a..5eeec299b 100644 --- a/Examples/test-suite/python/li_attribute_runme.py +++ b/Examples/test-suite/python/li_attribute_runme.py @@ -1,5 +1,3 @@ -# Ported to C# li_attribute_runme.cs - import li_attribute aa = li_attribute.A(1,2,3) @@ -11,6 +9,7 @@ if aa.a != 3: print aa.a raise RuntimeError + if aa.b != 2: print aa.b raise RuntimeError @@ -18,6 +17,8 @@ aa.b = 5 if aa.b != 5: raise RuntimeError + + if aa.d != aa.b: raise RuntimeError @@ -35,40 +36,17 @@ pi.value=3 if pi.value != 3: raise RuntimeError + b = li_attribute.B(aa) if b.a.c != 3: raise RuntimeError -# class/struct attribute with get/set methods using return/pass by reference -myFoo = li_attribute.MyFoo() + +myFoo = li_attribute.MyFoo myFoo.x = 8 -myClass = li_attribute.MyClass() +myClass = li_attribute.MyClass myClass.Foo = myFoo if myClass.Foo.x != 8: raise RuntimeError -# class/struct attribute with get/set methods using return/pass by value -myClassVal = li_attribute.MyClassVal() -if myClassVal.ReadWriteFoo.x != -1: - raise RuntimeError -if myClassVal.ReadOnlyFoo.x != -1: - raise RuntimeError -myClassVal.ReadWriteFoo = myFoo -if myClassVal.ReadWriteFoo.x != 8: - raise RuntimeError -if myClassVal.ReadOnlyFoo.x != 8: - raise RuntimeError - -# string attribute with get/set methods using return/pass by value -myStringyClass = li_attribute.MyStringyClass("initial string") -if myStringyClass.ReadWriteString != "initial string": - raise RuntimeError -if myStringyClass.ReadOnlyString != "initial string": - raise RuntimeError -myStringyClass.ReadWriteString = "changed string" -if myStringyClass.ReadWriteString != "changed string": - raise RuntimeError -if myStringyClass.ReadOnlyString != "changed string": - raise RuntimeError - diff --git a/Examples/test-suite/python/li_boost_shared_ptr_runme.py b/Examples/test-suite/python/li_boost_shared_ptr_runme.py index f967def14..5f6cbd211 100644 --- a/Examples/test-suite/python/li_boost_shared_ptr_runme.py +++ b/Examples/test-suite/python/li_boost_shared_ptr_runme.py @@ -304,15 +304,6 @@ class li_boost_shared_ptr_runme: self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr") self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref") - # 3rd derived class - k = li_boost_shared_ptr.Klass3rdDerived("me oh my") - val = k.getValue() - self.verifyValue("me oh my-3rdDerived", val) - self.verifyCount(1, k) - val = li_boost_shared_ptr.test3rdupcast(k) - self.verifyValue("me oh my-3rdDerived", val) - self.verifyCount(1, k) - # //////////////////////////////// Member variables //////////////////////////////////////// # smart pointer by value m = li_boost_shared_ptr.MemberVariables() diff --git a/Examples/test-suite/li_std_carray.i b/Examples/test-suite/python/li_std_carray.i similarity index 100% rename from Examples/test-suite/li_std_carray.i rename to Examples/test-suite/python/li_std_carray.i diff --git a/Examples/test-suite/python/li_std_map.i b/Examples/test-suite/python/li_std_map.i new file mode 100644 index 000000000..a8ba4f2e2 --- /dev/null +++ b/Examples/test-suite/python/li_std_map.i @@ -0,0 +1,58 @@ +%module("templatereduce") li_std_map + +%include std_pair.i +%include std_map.i +%include std_multimap.i + +%inline %{ +struct A{ + int val; + + A(int v = 0): val(v) + { + } + +}; +%} + +namespace std +{ + %template(pairii) pair; + %template(pairAA) pair; + %template(pairA) pair; + %template(mapA) map; + %template(mmapA) multimap; + + %template(paircA1) pair; + %template(paircA2) pair; + %template(pairiiA) pair >; + %template(pairiiAc) pair >; + + + %template() pair; + %template(pymap) map; + +} + + + +%inline +{ +std::pair +p_identa(std::pair p) { + return p; +} + +std::map m_identa(const std::map& v) +{ + return v; +} + +} + + + +namespace std +{ +%template(mapii) map; +} diff --git a/Examples/test-suite/python/li_std_pair.i b/Examples/test-suite/python/li_std_pair.i new file mode 100644 index 000000000..886bf1a4b --- /dev/null +++ b/Examples/test-suite/python/li_std_pair.i @@ -0,0 +1,210 @@ +%module li_std_pair + +// +// activate the automatic comparison methods generation (==,!=,...) +// + +%{ +#include // for std::swap +%} + + +%include std_pair.i +%include std_string.i +%include std_complex.i + +%inline +%{ + struct A + { + int val; + + A(int v = 0): val(v) + { + } + + }; + struct B + { + }; +%} + +%std_comp_methods(std::pair); + +namespace std { + %template(CIntPair) pair; + %template() pair; + %template(ShortPair) pair; + + %template(IntPair) pair; + %extend pair + { + %template(pair) pair; + } + + + + %template(SIPair) pair; + %template(CIPair) pair, int>; + %template(SIIPair) pair, int>; + %template(AIntPair) pair; + + %template(CCIntPair) pair >; + + %template(ABPair) pair; + %template(IntAPair) pair; + + %template(pairP1) pair; + %template(pairP2) pair; + %template(pairP3) pair; + %template(pairP4) pair; + %template(pairP5) pair; + %template(pairP6) pair; + +} +%std_comp_methods(std::pair, int>); + +%apply std::pair *INOUT {std::pair *INOUT2}; + +%inline %{ + +/* Test the "out" typemap for pair */ +std::pair makeIntPair(int a, int b) { + return std::make_pair(a, b); +} + +/** + * There is no "out" typemap for a pointer to a pair, so + * this should return a wrapped instance of a std::pair + * instead of the native "array" type for the target language. + */ +std::pair * makeIntPairPtr(int a, int b) { + static std::pair p = std::make_pair(a, b); + return &p; +} + +/** + * There is no "out" typemap for a non-const reference to a pair, so + * this should return a wrapped instance of a std::pair instead of + * the native "array" type for the target language. + */ +std::pair& makeIntPairRef(int a, int b) { + static std::pair p = std::make_pair(a, b); + return p; +} + +/** + * There is no "out" typemap for a const reference to a pair, so + * this should return a wrapped instance of a std::pair + * instead of the native "array" type for the target language. + */ +const std::pair & makeIntPairConstRef(int a, int b) { + static std::pair p = std::make_pair(a, b); + return p; +} + +/* Test the "in" typemap for pair */ +int product1(std::pair p) { + return p.first*p.second; +} + +/* Test the "in" typemap for const pair& */ +int product2(const std::pair& p) { + return p.first*p.second; +} + +std::pair + p_ident(std::pair p, const std::pair& q) { + return p; +} + + +std::pair +p_identa(const std::pair& p) { + return p; +} + +void +d_inout(double *INOUT) { + *INOUT += *INOUT; +} + +void +d_inout(int *INOUT) { + *INOUT += *INOUT; +} + +int +d_inout2(double *INOUT) { + *INOUT += *INOUT; + return 1; +} + +void +p_inout(std::pair *INOUT) { + std::swap(INOUT->first, INOUT->second); +} + +int +p_inout2(std::pair *INOUT) { + std::swap(INOUT->first, INOUT->second); + return 1; +} + +void + p_inout3(std::pair *INOUT, std::pair *INOUT2) { + std::swap(*INOUT, *INOUT2); +} + +void +p_inoutd(std::pair *INOUT) { + std::swap(INOUT->first, INOUT->second); +} + +std::string + s_ident(const std::string& s) { + return s; +} + +#if 0 +std::pair + p_ident(std::pair p, const std::pair& q) { + return p; +} + +/* Test the "in" typemap for const pair* */ +std::pair + p_ident(std::pair p, const std::pair& q) { + return q; +} + +/* Test the "in" typemap for const pair* */ +std::pair + p_ident(std::pair p, const std::pair& q) { + return p; +} + + +std::pair + p_ident(std::pair p, const std::pair& q) { + return p; +} + +std::pair + p_ident(std::pair p, const std::pair& q) { + return p; +} + + + +#endif +%} + + +namespace std +{ + %template(paircA1) pair; + %template(paircA2) pair; + %template(pairiiA) pair >; +} + diff --git a/Examples/test-suite/python/li_std_pair_extra_runme.py b/Examples/test-suite/python/li_std_pair_extra_runme.py deleted file mode 100644 index dc6e31b76..000000000 --- a/Examples/test-suite/python/li_std_pair_extra_runme.py +++ /dev/null @@ -1,59 +0,0 @@ -import li_std_pair_extra - -p = (1,2) -p1 = li_std_pair_extra.p_inout(p) -p2 = li_std_pair_extra.p_inoutd(p1) - -d1 = li_std_pair_extra.d_inout(2) - -i,d2 = li_std_pair_extra.d_inout2(2) - -i,p = li_std_pair_extra.p_inout2(p) -p3,p4 = li_std_pair_extra.p_inout3(p1,p1) - -psi = li_std_pair_extra.SIPair("hello",1) -pci = li_std_pair_extra.CIPair(1,1) - - -#psi.first = "hi" - - -psi = li_std_pair_extra.SIPair("hi",1) -if psi != ("hi",1): - raise RuntimeError - -psii = li_std_pair_extra.SIIPair(psi,1) - -a = li_std_pair_extra.A() -b = li_std_pair_extra.B() - -pab = li_std_pair_extra.ABPair(a,b); - -pab.first = a -pab.first.val = 2 - -if pab.first.val != 2: - raise RuntimeError - - -pci = li_std_pair_extra.CIntPair(1,0) - -a = li_std_pair_extra.A(5) -p1 = li_std_pair_extra.pairP1(1,a.this) -p2 = li_std_pair_extra.pairP2(a,1) -p3 = li_std_pair_extra.pairP3(a,a) - - -if a.val != li_std_pair_extra.p_identa(p1.this)[1].val: - raise RuntimeError - -p = li_std_pair_extra.IntPair(1,10) -p.first = 1 - -p = li_std_pair_extra.paircA1(1,a) -p.first -p.second - -p = li_std_pair_extra.paircA2(1,a) -pp = li_std_pair_extra.pairiiA(1,p) - diff --git a/Examples/test-suite/python/li_std_pair_runme.py b/Examples/test-suite/python/li_std_pair_runme.py new file mode 100644 index 000000000..b301f0d24 --- /dev/null +++ b/Examples/test-suite/python/li_std_pair_runme.py @@ -0,0 +1,59 @@ +import li_std_pair + +p = (1,2) +p1 = li_std_pair.p_inout(p) +p2 = li_std_pair.p_inoutd(p1) + +d1 = li_std_pair.d_inout(2) + +i,d2 = li_std_pair.d_inout2(2) + +i,p = li_std_pair.p_inout2(p) +p3,p4 = li_std_pair.p_inout3(p1,p1) + +psi = li_std_pair.SIPair("hello",1) +pci = li_std_pair.CIPair(1,1) + + +#psi.first = "hi" + + +psi = li_std_pair.SIPair("hi",1) +if psi != ("hi",1): + raise RuntimeError + +psii = li_std_pair.SIIPair(psi,1) + +a = li_std_pair.A() +b = li_std_pair.B() + +pab = li_std_pair.ABPair(a,b); + +pab.first = a +pab.first.val = 2 + +if pab.first.val != 2: + raise RuntimeError + + +pci = li_std_pair.CIntPair(1,0) + +a = li_std_pair.A(5) +p1 = li_std_pair.pairP1(1,a.this) +p2 = li_std_pair.pairP2(a,1) +p3 = li_std_pair.pairP3(a,a) + + +if a.val != li_std_pair.p_identa(p1.this)[1].val: + raise RuntimeError + +p = li_std_pair.IntPair(1,10) +p.first = 1 + +p = li_std_pair.paircA1(1,a) +p.first +p.second + +p = li_std_pair.paircA2(1,a) +pp = li_std_pair.pairiiA(1,p) + diff --git a/Examples/test-suite/python/li_std_set.i b/Examples/test-suite/python/li_std_set.i new file mode 100644 index 000000000..f0fddb058 --- /dev/null +++ b/Examples/test-suite/python/li_std_set.i @@ -0,0 +1,17 @@ +%module li_std_set + +%include +%include +%include +%include + +%template(set_string) std::set; +%template(set_int) std::multiset; + + +%template(v_int) std::vector; + + + + +%template(pyset) std::set; diff --git a/Examples/test-suite/python/li_std_stream.i b/Examples/test-suite/python/li_std_stream.i new file mode 100644 index 000000000..0a999ddbf --- /dev/null +++ b/Examples/test-suite/python/li_std_stream.i @@ -0,0 +1,59 @@ +%module li_std_stream + +%inline %{ + struct A; +%} + +%include +%include + + + +%callback(1) A::bar; + +%inline %{ + + struct B { + virtual ~B() + { + } + + }; + + struct A : B + { + void __add__(int a) + { + } + + void __add__(double a) + { + } + + static int bar(int a){ + return a; + } + + static int foo(int a, int (*pf)(int a)) + { + return pf(a); + } + + + std::ostream& __rlshift__(std::ostream& out) + { + out << "A class"; + return out; + } + }; +%} + +%extend std::basic_ostream{ + std::basic_ostream& + operator<<(const A& a) + { + *self << "A class"; + return *self; + } +} + diff --git a/Examples/test-suite/python/li_std_string.i b/Examples/test-suite/python/li_std_string.i new file mode 100644 index 000000000..822d713c4 --- /dev/null +++ b/Examples/test-suite/python/li_std_string.i @@ -0,0 +1,55 @@ +%module li_std_string + +%naturalvar A; + + +%include +%include + + +%inline %{ + +struct A : std::string +{ + A(const std::string& s) : std::string(s) + { + } +}; + +struct B +{ + B(const std::string& s) : cname(0), name(s), a(s) + { + } + + char *cname; + std::string name; + A a; + +}; + + +const char* test_ccvalue(const char* x) { + return x; +} + +char* test_cvalue(char* x) { + return x; +} + +std::basic_string test_value_basic1(std::basic_string x) { + return x; +} + +std::basic_string > test_value_basic2(std::basic_string > x) { + return x; +} + +std::basic_string,std::allocator > test_value_basic3(std::basic_string,std::allocator > x) { + return x; +} + +%} + +%include ../li_std_string.i + diff --git a/Examples/test-suite/python/li_std_string_extra_runme.py b/Examples/test-suite/python/li_std_string_runme.py similarity index 54% rename from Examples/test-suite/python/li_std_string_extra_runme.py rename to Examples/test-suite/python/li_std_string_runme.py index cef5921b0..c0dae1e25 100644 --- a/Examples/test-suite/python/li_std_string_extra_runme.py +++ b/Examples/test-suite/python/li_std_string_runme.py @@ -1,24 +1,24 @@ -import li_std_string_extra +import li_std_string x="hello" -if li_std_string_extra.test_ccvalue(x) != x: +if li_std_string.test_ccvalue(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_cvalue(x) != x: +if li_std_string.test_cvalue(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_value(x) != x: - print x, li_std_string_extra.test_value(x) +if li_std_string.test_value(x) != x: + print x, li_std_string.test_value(x) raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_const_reference(x) != x: +if li_std_string.test_const_reference(x) != x: raise RuntimeError, "bad string mapping" -s = li_std_string_extra.string("he") +s = li_std_string.string("he") #s += "ll" #s.append('o') s = s + "llo" @@ -30,21 +30,21 @@ if s != x: if s[1:4] != x[1:4]: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_value(s) != x: +if li_std_string.test_value(s) != x: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_const_reference(s) != x: +if li_std_string.test_const_reference(s) != x: raise RuntimeError, "bad string mapping" -a = li_std_string_extra.A(s) +a = li_std_string.A(s) -if li_std_string_extra.test_value(a) != x: +if li_std_string.test_value(a) != x: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_const_reference(a) != x: +if li_std_string.test_const_reference(a) != x: raise RuntimeError, "bad string mapping" -b = li_std_string_extra.string(" world") +b = li_std_string.string(" world") s = a + b if a + b != "hello world": @@ -63,40 +63,40 @@ if c.find_last_of("l") != 9: s = "hello world" -b = li_std_string_extra.B("hi") +b = li_std_string.B("hi") -b.name = li_std_string_extra.string("hello") +b.name = li_std_string.string("hello") if b.name != "hello": raise RuntimeError, "bad string mapping" -b.a = li_std_string_extra.A("hello") +b.a = li_std_string.A("hello") if b.a != "hello": raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_value_basic1(x) != x: +if li_std_string.test_value_basic1(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_value_basic2(x) != x: +if li_std_string.test_value_basic2(x) != x: raise RuntimeError, "bad string mapping" -if li_std_string_extra.test_value_basic3(x) != x: +if li_std_string.test_value_basic3(x) != x: raise RuntimeError, "bad string mapping" # Global variables s = "initial string" -if li_std_string_extra.cvar.GlobalString2 != "global string 2": +if li_std_string.cvar.GlobalString2 != "global string 2": raise RuntimeError, "GlobalString2 test 1" -li_std_string_extra.cvar.GlobalString2 = s -if li_std_string_extra.cvar.GlobalString2 != s: +li_std_string.cvar.GlobalString2 = s +if li_std_string.cvar.GlobalString2 != s: raise RuntimeError, "GlobalString2 test 2" -if li_std_string_extra.cvar.ConstGlobalString != "const global string": +if li_std_string.cvar.ConstGlobalString != "const global string": raise RuntimeError, "ConstGlobalString test" # Member variables -myStructure = li_std_string_extra.Structure() +myStructure = li_std_string.Structure() if myStructure.MemberString2 != "member string 2": raise RuntimeError, "MemberString2 test 1" myStructure.MemberString2 = s @@ -105,28 +105,28 @@ if myStructure.MemberString2 != s: if myStructure.ConstMemberString != "const member string": raise RuntimeError, "ConstMemberString test" -if li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2": +if li_std_string.cvar.Structure_StaticMemberString2 != "static member string 2": raise RuntimeError, "StaticMemberString2 test 1" -li_std_string_extra.cvar.Structure_StaticMemberString2 = s -if li_std_string_extra.cvar.Structure_StaticMemberString2 != s: +li_std_string.cvar.Structure_StaticMemberString2 = s +if li_std_string.cvar.Structure_StaticMemberString2 != s: raise RuntimeError, "StaticMemberString2 test 2" -if li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string": +if li_std_string.cvar.Structure_ConstStaticMemberString != "const static member string": raise RuntimeError, "ConstStaticMemberString test" -if li_std_string_extra.test_reference_input("hello") != "hello": +if li_std_string.test_reference_input("hello") != "hello": raise RuntimeError -s = li_std_string_extra.test_reference_inout("hello") +s = li_std_string.test_reference_inout("hello") if s != "hellohello": raise RuntimeError -if li_std_string_extra.stdstring_empty() != "": +if li_std_string.stdstring_empty() != "": raise RuntimeError -if li_std_string_extra.c_empty() != "": +if li_std_string.c_empty() != "": raise RuntimeError -if li_std_string_extra.c_null() != None: +if li_std_string.c_null() != None: raise RuntimeError diff --git a/Examples/test-suite/li_std_vector_extra.i b/Examples/test-suite/python/li_std_vector.i similarity index 85% rename from Examples/test-suite/li_std_vector_extra.i rename to Examples/test-suite/python/li_std_vector.i index 9c2497f7c..06dafce59 100644 --- a/Examples/test-suite/li_std_vector_extra.i +++ b/Examples/test-suite/python/li_std_vector.i @@ -1,4 +1,4 @@ -%module li_std_vector_extra +%module li_std_vector %warnfilter(509) overloaded1; %warnfilter(509) overloaded2; @@ -123,17 +123,11 @@ std::vector vecStr(std::vector v) { %pointer_class(int,PtrInt) %array_functions(int,ArrInt) -%inline %{ - int *makeIntPtr(int v) { return new int(v); } - double *makeDoublePtr(double v) { return new double(v); } - int extractInt(int *p) { return *p; } -%} -%template(pyvector) std::vector; +%template(pyvector) std::vector; namespace std { - %template(ConstShortVector) vector; -// %template(ConstIntVector) vector; // interferes with vector... see new testcase li_std_vector_ptr + %template(ConstIntVector) vector; } %inline %{ diff --git a/Examples/test-suite/python/li_std_vector_ptr_runme.py b/Examples/test-suite/python/li_std_vector_ptr_runme.py deleted file mode 100644 index c5f72fde4..000000000 --- a/Examples/test-suite/python/li_std_vector_ptr_runme.py +++ /dev/null @@ -1,8 +0,0 @@ -from li_std_vector_ptr import * - -ip1 = makeIntPtr(11) -ip2 = makeIntPtr(22) - -vi = IntPtrVector((ip1, ip2)) -displayVector(vi) - diff --git a/Examples/test-suite/python/li_std_vector_extra_runme.py b/Examples/test-suite/python/li_std_vector_runme.py similarity index 84% rename from Examples/test-suite/python/li_std_vector_extra_runme.py rename to Examples/test-suite/python/li_std_vector_runme.py index 776eacfb3..a0d96d4aa 100644 --- a/Examples/test-suite/python/li_std_vector_extra_runme.py +++ b/Examples/test-suite/python/li_std_vector_runme.py @@ -1,4 +1,4 @@ -from li_std_vector_extra import * +from li_std_vector import * iv = IntVector(4) for i in range(0,4): @@ -133,24 +133,3 @@ if overloaded3(None) != "vector *": if overloaded3(100) != "int": raise RuntimeError - -# vector pointer checks -ip = makeIntPtr(11) -dp = makeDoublePtr(33.3) -error = 0 -try: - vi = IntPtrVector((ip, dp)) # check vector does not accept double * element - error = 1 -except: - pass - -if error: - raise RuntimeError - -vi = IntPtrVector((ip, makeIntPtr(22))) -if extractInt(vi[0]) != 11: - raise RuntimeError - -if extractInt(vi[1]) != 22: - raise RuntimeError - diff --git a/Examples/test-suite/li_std_vectora.i b/Examples/test-suite/python/li_std_vectora.i similarity index 100% rename from Examples/test-suite/li_std_vectora.i rename to Examples/test-suite/python/li_std_vectora.i diff --git a/Examples/test-suite/li_std_wstream.i b/Examples/test-suite/python/li_std_wstream.i similarity index 100% rename from Examples/test-suite/li_std_wstream.i rename to Examples/test-suite/python/li_std_wstream.i diff --git a/Examples/test-suite/python/li_std_wstring.i b/Examples/test-suite/python/li_std_wstring.i new file mode 100644 index 000000000..c809e11ec --- /dev/null +++ b/Examples/test-suite/python/li_std_wstring.i @@ -0,0 +1,89 @@ +%module li_std_wstring +%include +%include + + +%inline %{ + +struct A : std::wstring +{ + A(const std::wstring& s) : std::wstring(s) + { + } +}; + +struct B +{ + B(const std::wstring& s) : cname(0), name(s), a(s) + { + } + + char *cname; + std::wstring name; + A a; + +}; + + +wchar_t test_wcvalue(wchar_t x) { + return x; +} + +const wchar_t* test_ccvalue(const wchar_t* x) { + return x; +} + +wchar_t* test_cvalue(wchar_t* x) { + return x; +} + + +std::wstring test_value(std::wstring x) { + return x; +} + +const std::wstring& test_const_reference(const std::wstring &x) { + return x; +} + +void test_pointer(std::wstring *x) { +} + +std::wstring *test_pointer_out() { + static std::wstring x = L"x"; + return &x; +} + +void test_const_pointer(const std::wstring *x) { +} + +const std::wstring *test_const_pointer_out() { + static std::wstring x = L"x"; + return &x; +} + +void test_reference(std::wstring &x) { +} + +std::wstring& test_reference_out() { + static std::wstring x = L"x"; + return x; +} + +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + +void test_throw() throw(std::wstring){ + static std::wstring x = L"x"; + + throw x; +} + +#if defined(_MSC_VER) + #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + +%} + + diff --git a/Examples/test-suite/python_nondynamic.i b/Examples/test-suite/python/nondynamic.i similarity index 96% rename from Examples/test-suite/python_nondynamic.i rename to Examples/test-suite/python/nondynamic.i index 26c69644d..2acc9bf8b 100644 --- a/Examples/test-suite/python_nondynamic.i +++ b/Examples/test-suite/python/nondynamic.i @@ -1,4 +1,4 @@ -%module python_nondynamic +%module nondynamic /* Use the %pythonnondynamic directuve to make the wrapped class a diff --git a/Examples/test-suite/python/python_nondynamic_runme.py b/Examples/test-suite/python/nondynamic_runme.py similarity index 67% rename from Examples/test-suite/python/python_nondynamic_runme.py rename to Examples/test-suite/python/nondynamic_runme.py index 27755db9c..18230616d 100644 --- a/Examples/test-suite/python/python_nondynamic_runme.py +++ b/Examples/test-suite/python/nondynamic_runme.py @@ -1,6 +1,6 @@ -import python_nondynamic +import nondynamic -aa = python_nondynamic.A() +aa = nondynamic.A() aa.a = 1 aa.b = 2 @@ -14,10 +14,10 @@ if not err: raise RuntimeError, "A is not static" -class B(python_nondynamic.A): +class B(nondynamic.A): c = 4 def __init__(self): - python_nondynamic.A.__init__(self) + nondynamic.A.__init__(self) pass pass @@ -35,5 +35,5 @@ if not err: raise RuntimeError, "B is not static" -cc = python_nondynamic.C() +cc = nondynamic.C() cc.d = 3 diff --git a/Examples/test-suite/python/operbool_runme.py b/Examples/test-suite/python/operbool_runme.py deleted file mode 100644 index 4218b5dd4..000000000 --- a/Examples/test-suite/python/operbool_runme.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python -import operbool -assert not operbool.Test() - diff --git a/Examples/test-suite/python_overload_simple_cast.i b/Examples/test-suite/python/overload_simple_cast.i similarity index 58% rename from Examples/test-suite/python_overload_simple_cast.i rename to Examples/test-suite/python/overload_simple_cast.i index e7f58d788..d274722c0 100644 --- a/Examples/test-suite/python_overload_simple_cast.i +++ b/Examples/test-suite/python/overload_simple_cast.i @@ -1,4 +1,4 @@ // Simple tests of overloaded functions -%module("castmode") python_overload_simple_cast +%module("castmode") overload_simple_cast %include overload_simple.i diff --git a/Examples/test-suite/python/python_overload_simple_cast_runme.py b/Examples/test-suite/python/overload_simple_cast_runme.py similarity index 98% rename from Examples/test-suite/python/python_overload_simple_cast_runme.py rename to Examples/test-suite/python/overload_simple_cast_runme.py index 1b3a5482c..87e6e5d43 100644 --- a/Examples/test-suite/python/python_overload_simple_cast_runme.py +++ b/Examples/test-suite/python/overload_simple_cast_runme.py @@ -1,4 +1,4 @@ -from python_overload_simple_cast import * +from overload_simple_cast import * class Ai: def __init__(self,x): diff --git a/Examples/test-suite/python/python_abstractbase_runme3.py b/Examples/test-suite/python/python_abstractbase_runme3.py deleted file mode 100644 index e34777558..000000000 --- a/Examples/test-suite/python/python_abstractbase_runme3.py +++ /dev/null @@ -1,8 +0,0 @@ -from python_abstractbase import * -from collections import * -assert issubclass(Mapii, MutableMapping) -assert issubclass(Multimapii, MutableMapping) -assert issubclass(IntSet, MutableSet) -assert issubclass(IntMultiset, MutableSet) -assert issubclass(IntVector, MutableSequence) -assert issubclass(IntList, MutableSequence) diff --git a/Examples/test-suite/python/python_append_runme.py b/Examples/test-suite/python/python_append_runme.py deleted file mode 100644 index c8e6b2640..000000000 --- a/Examples/test-suite/python/python_append_runme.py +++ /dev/null @@ -1,4 +0,0 @@ -from python_append import * -t=Test() -t.func() -t.static_func() diff --git a/Examples/test-suite/python/python_pybuf_runme3.py b/Examples/test-suite/python/python_pybuf_runme3.py deleted file mode 100644 index 152aecdc0..000000000 --- a/Examples/test-suite/python/python_pybuf_runme3.py +++ /dev/null @@ -1,42 +0,0 @@ -#run: -# python python_pybuf_runme3.py benchmark -#for the benchmark, other wise the test case will be run -import python_pybuf -import sys -if len(sys.argv)>=2 and sys.argv[1]=="benchmark": - #run the benchmark - import time - k=1000000 #number of times to excute the functions - - t=time.time() - a = bytearray(b'hello world') - for i in range(k): - pybuf.title1(a) - print("Time used by bytearray:",time.time()-t) - - t=time.time() - b = 'hello world' - for i in range(k): - pybuf.title2(b) - print("Time used by string:",time.time()-t) -else: - #run the test case - buf1 = bytearray(10) - buf2 = bytearray(50) - - pybuf.func1(buf1) - assert buf1 == b'a'*10 - - pybuf.func2(buf2) - assert buf2.startswith(b"Hello world!\x00") - - count = pybuf.func3(buf2) - assert count==10 #number of alpha and number in 'Hello world!' - - length = pybuf.func4(buf2) - assert length==12 - - buf3 = bytearray(b"hello") - pybuf.title1(buf3) - assert buf3==b'Hello' - diff --git a/Examples/test-suite/python/rename_strip_encoder_runme.py b/Examples/test-suite/python/rename_strip_encoder_runme.py deleted file mode 100644 index 64be611d6..000000000 --- a/Examples/test-suite/python/rename_strip_encoder_runme.py +++ /dev/null @@ -1,6 +0,0 @@ -from rename_strip_encoder import * - -s = SomeWidget() -a = AnotherWidget() -a.DoSomething() - diff --git a/Examples/test-suite/simutry.i b/Examples/test-suite/python/simutry.i similarity index 100% rename from Examples/test-suite/simutry.i rename to Examples/test-suite/python/simutry.i diff --git a/Examples/test-suite/python/std_containers.i b/Examples/test-suite/python/std_containers.i new file mode 100644 index 000000000..a1d39e7ab --- /dev/null +++ b/Examples/test-suite/python/std_containers.i @@ -0,0 +1,199 @@ +%module std_containers + +%{ +#include +%} +%include std_vector.i +%include std_string.i +%include std_deque.i +%include std_list.i +%include std_set.i +%include std_multiset.i +%include std_pair.i +%include std_map.i +%include std_multimap.i +%include std_complex.i + +%template() std::vector; +%template() std::pair; +%template() std::pair; + +%template() std::vector< std::vector > ; +%template(ccube) std::vector< std::vector< std::vector > >; + +%inline +{ + typedef + std::vector > > + ccube; + + ccube cident(const ccube& c) + { + return c; + } + + struct C + { + }; +} + + +%template(map_si) std::map; +%template(pair_iC) std::pair; +%template(map_iC) std::map; +%template(mmap_si) std::multimap; +%template(set_i) std::set; +%template(multiset_i) std::multiset; +%template(list_i) std::list; +%template(deque_i) std::deque; + +%template(vector_b) std::vector; +%template(vector_i) std::vector; +%template(vector_c) std::vector >; +%template(vector_ui) std::vector; + +%template(bmatrix) std::vector >; +%template(imatrix) std::vector >; +%template(cmatrix) std::vector > >; + +%apply std::vector *INOUT {std::vector *INOUT2}; + +%inline +{ + typedef std::vector > imatrix; + imatrix midenti(const imatrix& v) + { + return v; + } + + typedef std::vector > bmatrix; + bmatrix midentb(const bmatrix& v) + { + return v; + } + + std::map mapidentc(const std::map& v) + { + return v; + } + + std::map mapidenti(const std::map& v) + { + return v; + } + + std::map mapident(const std::map& v) + { + return v; + } + + std::multimap mapident(const std::multimap& v) + { + return v; + } + + std::vector vident(const std::vector& v) + { + return v; + } + + std::set sident(const std::set& v) + { + return v; + } + + std::vector videntu(const std::vector& v) + { + return v; + } + + + int get_elem(const std::vector& v, int index) + { + return v[index]; + } + + std::pair pident(const std::pair& p) + { + return p; + } + + void + v_inout(std::vector *INOUT) { + *INOUT = *INOUT; + } + + void + v_inout2(std::vector *INOUT, std::vector *INOUT2) { + std::swap(*INOUT, *INOUT2); + } + +} + + +%{ + + template struct Param + { + }; +%} + + +template struct Param +{ +}; + + +%template(Param_c) Param >; +%inline +{ + int hello(Param > c) + { + return 0; + } +} + +%inline +{ + struct A + { + A(int aa = 0) : a(aa) + { + } + int a; + }; +} + +%template() std::pair; +%template(pair_iA) std::pair; +%template(vector_piA) std::vector >; + + +%inline { + std::pair ident(std::pair a, const std::pair& b) + { + return std::pair(); + } + + + std::vector > pia_vident(std::vector > a ) + { + return a; + } + + struct Foo + { + Foo(int i) { + } + }; + +} + + +%std_nodefconst_type(Foo); + +%template(vector_Foo) std::vector; +%template(deque_Foo) std::deque; +%template(list_Foo) std::list; + + diff --git a/Examples/test-suite/swigobject.i b/Examples/test-suite/python/swigobject.i similarity index 81% rename from Examples/test-suite/swigobject.i rename to Examples/test-suite/python/swigobject.i index 2ec064509..2e77969b9 100644 --- a/Examples/test-suite/swigobject.i +++ b/Examples/test-suite/python/swigobject.i @@ -10,7 +10,7 @@ const char* pointer_str(A *a){ static char result[1024]; - sprintf(result,"%p", a); + sprintf(result,"0x%lx", (unsigned long)(void *)a); return result; } diff --git a/Examples/test-suite/python/swigobject_runme.py b/Examples/test-suite/python/swigobject_runme.py index a906108e3..7f629e1d5 100644 --- a/Examples/test-suite/python/swigobject_runme.py +++ b/Examples/test-suite/python/swigobject_runme.py @@ -12,17 +12,11 @@ if a1.this != a2.this: lthis = long(a.this) -# match pointer value, but deal with leading zeros on 8/16 bit systems and different C++ compilers interpretation of %p -xstr1 = "%016X" % (lthis,) -xstr1 = str.lstrip(xstr1, '0') +xstr1 = "0x%x" % (lthis,) xstr2 = pointer_str(a) -xstr2 = str.replace(xstr2, "0x", "") -xstr2 = str.replace(xstr2, "0X", "") -xstr2 = str.lstrip(xstr2, '0') -xstr2 = str.upper(xstr2) if xstr1 != xstr2: - print xstr1, xstr2 + print xstr1, xstr2 raise RuntimeError s = str(a.this) diff --git a/Examples/test-suite/python/tag_no_clash_with_variable_runme.i b/Examples/test-suite/python/tag_no_clash_with_variable_runme.i new file mode 100644 index 000000000..0f8fdafed --- /dev/null +++ b/Examples/test-suite/python/tag_no_clash_with_variable_runme.i @@ -0,0 +1,3 @@ +import enum_tag_no_clash_with_variable + +error_action = error_action diff --git a/Examples/test-suite/template_matrix.i b/Examples/test-suite/python/template_matrix.i similarity index 100% rename from Examples/test-suite/template_matrix.i rename to Examples/test-suite/python/template_matrix.i diff --git a/Examples/test-suite/python/template_typedef_cplx2_runme.py b/Examples/test-suite/python/template_typedef_cplx2_runme.py index 04c599329..030fe02d8 100644 --- a/Examples/test-suite/python/template_typedef_cplx2_runme.py +++ b/Examples/test-suite/python/template_typedef_cplx2_runme.py @@ -1,3 +1,4 @@ +import string from template_typedef_cplx2 import * # @@ -12,7 +13,7 @@ except: raise RuntimeError s = '%s' % d -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print d, "is not an ArithUnaryFunction" raise RuntimeError @@ -24,7 +25,7 @@ except: raise RuntimeError s = '%s' % e -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print e, "is not an ArithUnaryFunction" raise RuntimeError @@ -41,7 +42,7 @@ except: raise RuntimeError s = '%s' % c -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print c, "is not an ArithUnaryFunction" raise RuntimeError @@ -53,7 +54,7 @@ except: raise RuntimeError s = '%s' % f -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print f, "is not an ArithUnaryFunction" raise RuntimeError @@ -69,7 +70,7 @@ except: raise RuntimeError s = '%s' % g -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print g, "is not an ArithUnaryFunction" raise RuntimeError @@ -82,7 +83,7 @@ except: raise RuntimeError s = '%s' % h -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print h, "is not an ArithUnaryFunction" raise RuntimeError diff --git a/Examples/test-suite/python/template_typedef_cplx_runme.py b/Examples/test-suite/python/template_typedef_cplx_runme.py index 2cd9c8348..99ffcb9aa 100644 --- a/Examples/test-suite/python/template_typedef_cplx_runme.py +++ b/Examples/test-suite/python/template_typedef_cplx_runme.py @@ -1,3 +1,4 @@ +import string from template_typedef_cplx import * # @@ -12,7 +13,7 @@ except: raise RuntimeError s = '%s' % d -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print d, "is not an ArithUnaryFunction" raise RuntimeError @@ -24,7 +25,7 @@ except: raise RuntimeError s = '%s' % e -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print e, "is not an ArithUnaryFunction" raise RuntimeError @@ -41,7 +42,7 @@ except: raise RuntimeError s = '%s' % c -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print c, "is not an ArithUnaryFunction" raise RuntimeError @@ -53,7 +54,7 @@ except: raise RuntimeError s = '%s' % f -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print f, "is not an ArithUnaryFunction" raise RuntimeError @@ -69,7 +70,7 @@ except: raise RuntimeError s = '%s' % g -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print g, "is not an ArithUnaryFunction" raise RuntimeError @@ -82,6 +83,6 @@ except: raise RuntimeError s = '%s' % h -if str.find(s, 'ArithUnaryFunction') == -1: +if string.find(s, 'ArithUnaryFunction') == -1: print h, "is not an ArithUnaryFunction" raise RuntimeError diff --git a/Examples/test-suite/python/vector.i b/Examples/test-suite/python/vector.i new file mode 100644 index 000000000..04c961cda --- /dev/null +++ b/Examples/test-suite/python/vector.i @@ -0,0 +1,51 @@ +%module vector +%{ +#include +%} + +%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) + public: + typedef size_t size_type; + typedef CTYPE value_type; + size_type size() const; + vector(); + %extend { + static std::vector *Repeat(const value_type& value, int count) /*throw (std::out_of_range)*/ { +// if (count < 0) +// throw std::out_of_range("count"); + return new std::vector(count, value); + } + } +%enddef + +namespace std { + // primary (unspecialized) class template for std::vector + // does not require operator== to be defined + template class vector { + SWIG_STD_VECTOR_MINIMUM(T, T) + }; +} + +%define SWIG_STD_VECTOR_SPECIALIZE(CSTYPE, CTYPE...) +namespace std { + template<> class vector { + SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE) + }; +} +%enddef + +SWIG_STD_VECTOR_SPECIALIZE(float, float) + +%inline %{ +typedef float Real; +%} + +#if 1 +//fails +namespace std { + %template(RealVector) vector; +} +#else +//works +%template(RealVector) std::vector; +#endif diff --git a/Examples/test-suite/python_abstractbase.i b/Examples/test-suite/python_abstractbase.i deleted file mode 100644 index f72688237..000000000 --- a/Examples/test-suite/python_abstractbase.i +++ /dev/null @@ -1,18 +0,0 @@ -%module python_abstractbase -%include -%include -%include -%include -%include -%include -%include - -namespace std -{ - %template(Mapii) map; - %template(Multimapii) multimap; - %template(IntSet) set; - %template(IntMultiset) multiset; - %template(IntVector) vector; - %template(IntList) list; -} diff --git a/Examples/test-suite/python_append.i b/Examples/test-suite/python_append.i deleted file mode 100644 index 2dc9cb970..000000000 --- a/Examples/test-suite/python_append.i +++ /dev/null @@ -1,32 +0,0 @@ -/* -Testcase to test %pythonprepend and %pythonappend -*/ - -%module python_append - -%pythonappend Test::func %{ - pass -%} - -%pythonprepend Test::func %{ - pass -%} - -%pythonappend Test::static_func %{ -pass -%} - -%pythonprepend Test::static_func { - pass -} - -%inline %{ - -class Test { -public: - static void static_func() {}; - void func() {}; -}; - -%} - diff --git a/Examples/test-suite/python_pybuf.i b/Examples/test-suite/python_pybuf.i deleted file mode 100644 index 8e1302582..000000000 --- a/Examples/test-suite/python_pybuf.i +++ /dev/null @@ -1,64 +0,0 @@ -%module python_pybuf -%include -%include -/*functions for the test case*/ -%pybuffer_mutable_binary(char *buf1, int len); -%pybuffer_mutable_string(char *buf2); -%pybuffer_binary(const char *buf3, int len); -%pybuffer_string(const char *buf4); - -%inline %{ - void func1(char *buf1, int len) - { - int i; - for (i=0; i %include diff --git a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb b/Examples/test-suite/ruby/li_std_speed_runme.rb similarity index 97% rename from Examples/test-suite/ruby/ruby_li_std_speed_runme.rb rename to Examples/test-suite/ruby/li_std_speed_runme.rb index 825f3c593..a67e618a3 100755 --- a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb +++ b/Examples/test-suite/ruby/li_std_speed_runme.rb @@ -10,8 +10,8 @@ require 'benchmark' require 'mathn' -require 'ruby_li_std_speed' -include Ruby_li_std_speed +require 'li_std_speed' +include Li_std_speed def benchmark(f, phigh, sequences) diff --git a/Examples/test-suite/li_std_stack.i b/Examples/test-suite/ruby/li_std_stack.i similarity index 100% rename from Examples/test-suite/li_std_stack.i rename to Examples/test-suite/ruby/li_std_stack.i diff --git a/Examples/test-suite/ruby_naming.i b/Examples/test-suite/ruby/naming.i similarity index 98% rename from Examples/test-suite/ruby_naming.i rename to Examples/test-suite/ruby/naming.i index d8ef50ad3..75500ae34 100644 --- a/Examples/test-suite/ruby_naming.i +++ b/Examples/test-suite/ruby/naming.i @@ -1,4 +1,4 @@ -%module ruby_naming +%module naming %predicate predicateMethod(); %bang bangMethod(); diff --git a/Examples/test-suite/ruby/ruby_naming_runme.rb b/Examples/test-suite/ruby/naming_runme.rb similarity index 68% rename from Examples/test-suite/ruby/ruby_naming_runme.rb rename to Examples/test-suite/ruby/naming_runme.rb index 8ea5f13d3..dab3a50b6 100644 --- a/Examples/test-suite/ruby/ruby_naming_runme.rb +++ b/Examples/test-suite/ruby/naming_runme.rb @@ -9,86 +9,86 @@ require 'swig_assert' -require 'ruby_naming' +require 'naming' # Check class names -if not Ruby_naming - raise RuntimeError, 'Invalid module name for Ruby_naming' +if not Naming + raise RuntimeError, 'Invalid module name for Naming' end -if not Ruby_naming::MyClass +if not Naming::MyClass raise RuntimeError, 'Invalid class name for MyClass' end # Check constant names / values -if Ruby_naming::CONSTANT1 != 1 +if Naming::CONSTANT1 != 1 raise RuntimeError, "Incorrect value for CONSTANT1" end -if Ruby_naming::CONSTANT2 != 2 +if Naming::CONSTANT2 != 2 raise RuntimeError, "Incorrect value for CONSTANT2" end # Check constant names / values -if Ruby_naming::CONSTANT3 != 3 +if Naming::CONSTANT3 != 3 raise RuntimeError, "Incorrect value for CONSTANT3" end -if not Ruby_naming::methods.include?("constant4") +if not Naming::methods.include?("constant4") raise RuntimeError, "Incorrect mapping for constant4" end -if not Ruby_naming::methods.include?("constant5") +if not Naming::methods.include?("constant5") raise RuntimeError, "Incorrect mapping for constant5" end -if not Ruby_naming::methods.include?("constant6") +if not Naming::methods.include?("constant6") raise RuntimeError, "Incorrect mapping for constant6" end -if not Ruby_naming::TestConstants.instance_methods.include?("constant7") +if not Naming::TestConstants.instance_methods.include?("constant7") raise RuntimeError, "Incorrect mapping for constant7" end -if not Ruby_naming::TestConstants.methods.include?("constant8") +if not Naming::TestConstants.methods.include?("constant8") raise RuntimeError, "Incorrect mapping for constant8" end # There is no constant9 because it is illegal C++ -#if not Ruby_naming::TestConstants.instance_methods.include?("constant9") +#if not Naming::TestConstants.instance_methods.include?("constant9") # raise RuntimeError, "Incorrect mapping for constant9" #end -if Ruby_naming::TestConstants::CONSTANT10 != 10 +if Naming::TestConstants::CONSTANT10 != 10 raise RuntimeError, "Incorrect value for CONSTANT10" end -if not Ruby_naming::methods.include?("constant11") +if not Naming::methods.include?("constant11") raise RuntimeError, "Incorrect mapping for constant11" end # Check enums -if Ruby_naming::constants.include?("Color") +if Naming::constants.include?("Color") raise RuntimeError, "Color enum should not be exposed to Ruby" end -if Ruby_naming::Red != 0 +if Naming::Red != 0 raise RuntimeError, "Incorrect value for enum RED" end -if Ruby_naming::Green != 1 +if Naming::Green != 1 raise RuntimeError, "Incorrect value for enum GREEN" end -if Ruby_naming::Blue != 2 +if Naming::Blue != 2 raise RuntimeError, "Incorrect value for enum BLUE" end # Check method names -my_class = Ruby_naming::MyClass.new() +my_class = Naming::MyClass.new() if my_class.method_one != 1 raise RuntimeError, "Incorrect value for method_one" diff --git a/Examples/test-suite/stl_new.i b/Examples/test-suite/ruby/stl_new.i similarity index 100% rename from Examples/test-suite/stl_new.i rename to Examples/test-suite/ruby/stl_new.i diff --git a/Examples/test-suite/ruby_track_objects.i b/Examples/test-suite/ruby/track_objects.i similarity index 98% rename from Examples/test-suite/ruby_track_objects.i rename to Examples/test-suite/ruby/track_objects.i index f4bbb37e7..0a50e1fad 100644 --- a/Examples/test-suite/ruby_track_objects.i +++ b/Examples/test-suite/ruby/track_objects.i @@ -1,4 +1,4 @@ -%module ruby_track_objects +%module track_objects %include typemaps.i diff --git a/Examples/test-suite/ruby_track_objects_directors.i b/Examples/test-suite/ruby/track_objects_directors.i similarity index 88% rename from Examples/test-suite/ruby_track_objects_directors.i rename to Examples/test-suite/ruby/track_objects_directors.i index 131209828..adac8ae4d 100644 --- a/Examples/test-suite/ruby_track_objects_directors.i +++ b/Examples/test-suite/ruby/track_objects_directors.i @@ -1,4 +1,4 @@ -%module(directors="1") ruby_track_objects_directors +%module(directors="1") track_objects_directors %{ #include diff --git a/Examples/test-suite/ruby/ruby_track_objects_directors_runme.rb b/Examples/test-suite/ruby/track_objects_directors_runme.rb similarity index 74% rename from Examples/test-suite/ruby/ruby_track_objects_directors_runme.rb rename to Examples/test-suite/ruby/track_objects_directors_runme.rb index fb55323a8..247d3e98b 100644 --- a/Examples/test-suite/ruby/ruby_track_objects_directors_runme.rb +++ b/Examples/test-suite/ruby/track_objects_directors_runme.rb @@ -9,9 +9,9 @@ require 'swig_assert' -require 'ruby_track_objects_directors' +require 'track_objects_directors' -class MyFoo < Ruby_track_objects_directors::Foo +class MyFoo < Track_objects_directors::Foo def ping "MyFoo::ping()" end @@ -22,12 +22,12 @@ a = MyFoo.new raise RuntimeError if a.ping != "MyFoo::ping()" raise RuntimeError if a.pong != "Foo::pong();MyFoo::ping()" -b = Ruby_track_objects_directors::Foo.new +b = Track_objects_directors::Foo.new raise RuntimeError if b.ping != "Foo::ping()" raise RuntimeError if b.pong != "Foo::pong();Foo::ping()" -container = Ruby_track_objects_directors::Container.new +container = Track_objects_directors::Container.new foo = MyFoo.new container.set_foo(foo) diff --git a/Examples/test-suite/ruby/ruby_track_objects_runme.rb b/Examples/test-suite/ruby/track_objects_runme.rb similarity index 78% rename from Examples/test-suite/ruby/ruby_track_objects_runme.rb rename to Examples/test-suite/ruby/track_objects_runme.rb index 7bc67a478..27d8f6da7 100644 --- a/Examples/test-suite/ruby/ruby_track_objects_runme.rb +++ b/Examples/test-suite/ruby/track_objects_runme.rb @@ -9,7 +9,7 @@ require 'swig_assert' -require 'ruby_track_objects' +require 'track_objects' def test_same_ruby_object(foo1, foo2) if not foo1.equal?(foo2) @@ -23,12 +23,12 @@ def test_same_cpp_object(foo1, foo2) end end -bar = Ruby_track_objects::Bar.new -foo1 = Ruby_track_objects::Foo.new() +bar = Track_objects::Bar.new +foo1 = Track_objects::Foo.new() bar.set_unowned_foo(foo1) # test_simple_identity -foo2 = Ruby_track_objects::Foo.new() +foo2 = Track_objects::Foo.new() foo3 = foo2 test_same_ruby_object(foo2, foo3) @@ -48,8 +48,8 @@ test_same_ruby_object(foo5, foo6) test_same_cpp_object(foo5, foo6) # test_new_foo_identity -foo7 = Ruby_track_objects::Bar.get_new_foo() -foo8 = Ruby_track_objects::Bar.get_new_foo() +foo7 = Track_objects::Bar.get_new_foo() +foo8 = Track_objects::Bar.get_new_foo() if foo7.equal?(foo8) raise "Ruby objects should be different." @@ -60,7 +60,7 @@ if foo7.cpp_equal(foo8) end # test_set_owned_identity -foo9 = Ruby_track_objects::Foo.new +foo9 = Track_objects::Foo.new bar.set_owned_foo(foo9) foo10 = bar.get_owned_foo() @@ -69,7 +69,7 @@ test_same_cpp_object(foo9, foo10) # test_set_owned_identity2 begin - foo11 = Ruby_track_objects::Foo.new + foo11 = Track_objects::Foo.new bar.set_owned_foo(foo11) foo11 = nil end @@ -90,20 +90,20 @@ test_same_ruby_object(foo13, foo14) test_same_cpp_object(foo13, foo14) # Now create the factory -factory = Ruby_track_objects::Factory.new +factory = Track_objects::Factory.new # Create itemA which is really an itemB itemA = factory.createItem # Check class -if itemA.class != Ruby_track_objects::ItemA +if itemA.class != Track_objects::ItemA raise RuntimeError, 'Item should have an ItemA class' end # Now downcast -itemB = Ruby_track_objects.downcast(itemA) +itemB = Track_objects.downcast(itemA) -if itemB.class != Ruby_track_objects::ItemB +if itemB.class != Track_objects::ItemB raise RuntimeError, 'Item should have an ItemB class' end diff --git a/Examples/test-suite/swig_examples_lock.h b/Examples/test-suite/swig_examples_lock.h index feef26d0f..7710f9361 100644 --- a/Examples/test-suite/swig_examples_lock.h +++ b/Examples/test-suite/swig_examples_lock.h @@ -1,10 +1,10 @@ +namespace SwigExamples { + # if defined(_WIN32) || defined(__WIN32__) #include -namespace SwigExamples { - class CriticalSection { public: CriticalSection() { @@ -27,18 +27,9 @@ private: CriticalSection &critical_section; }; -} - #else #include -#ifndef PTHREAD_MUTEX_RECURSIVE_NP - // For Cygwin and possibly other OSs: _NP is "non-portable" - #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE -#endif - -namespace SwigExamples { - class CriticalSection { public: CriticalSection() { @@ -64,7 +55,7 @@ private: CriticalSection &critical_section; }; -} - #endif +} + diff --git a/Examples/test-suite/tcl/Makefile.in b/Examples/test-suite/tcl/Makefile.in index 7c4b7ed61..e26d77582 100644 --- a/Examples/test-suite/tcl/Makefile.in +++ b/Examples/test-suite/tcl/Makefile.in @@ -11,12 +11,15 @@ top_builddir = @top_builddir@ CPP_TEST_CASES += \ primitive_types \ + li_cdata \ li_cstring \ li_cwstring C_TEST_CASES += \ + li_cdata \ li_cstring \ - li_cwstring + li_cwstring \ + union include $(srcdir)/../common.mk diff --git a/Examples/test-suite/union_parameter.i b/Examples/test-suite/tcl/union.i similarity index 97% rename from Examples/test-suite/union_parameter.i rename to Examples/test-suite/tcl/union.i index bb010d3fa..d8ac62bfb 100644 --- a/Examples/test-suite/union_parameter.i +++ b/Examples/test-suite/tcl/union.i @@ -1,4 +1,4 @@ -%module union_parameter +%module unions %inline %{ diff --git a/Examples/test-suite/tcl/union_parameter_runme.tcl b/Examples/test-suite/tcl/union_runme.tcl old mode 100644 new mode 100755 similarity index 92% rename from Examples/test-suite/tcl/union_parameter_runme.tcl rename to Examples/test-suite/tcl/union_runme.tcl index fb3e092b8..2c47ecef3 --- a/Examples/test-suite/tcl/union_parameter_runme.tcl +++ b/Examples/test-suite/tcl/union_runme.tcl @@ -1,4 +1,4 @@ -if [ catch { load ./union_parameter[info sharedlibextension] union_parameter} err_msg ] { +if [ catch { load ./union[info sharedlibextension] unions} err_msg ] { puts stderr "Could not load shared object:\n$err_msg" } diff --git a/Examples/test-suite/template_inherit_abstract.i b/Examples/test-suite/template_inherit_abstract.i index 2f83433a5..f676b3b3e 100644 --- a/Examples/test-suite/template_inherit_abstract.i +++ b/Examples/test-suite/template_inherit_abstract.i @@ -4,7 +4,7 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) oss::Module; /* C#, Java, PHP multiple inheritance */ + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) oss::Module; /* C#, Java, Php4 multiple inheritance */ %inline %{ @@ -56,7 +56,7 @@ namespace oss %inline %{ namespace oss { -#if defined(SWIG) && defined(SWIGCSHARP) +#ifdef SWIGCSHARP %ignore HModule::get(); // Work around for lack of multiple inheritance support - base ModuleBase is ignored. #endif struct test : HModule diff --git a/Examples/test-suite/template_typedef_funcptr.i b/Examples/test-suite/template_typedef_funcptr.i index cec43e7c8..0175c7516 100644 --- a/Examples/test-suite/template_typedef_funcptr.i +++ b/Examples/test-suite/template_typedef_funcptr.i @@ -2,10 +2,6 @@ //Bug #1832613 -#if !defined(SWIGR) -// R Swig fails on this test. Because it tries to return a nil SEXP in -// an error - %include %inline %{ @@ -50,4 +46,3 @@ typedef MCContractPtr* ContractPtrPtr; // Plain pointers were also causing problems... %template(MCContractFactory2) ContractFactory; -#endif diff --git a/Examples/test-suite/typemap_namespace.i b/Examples/test-suite/typemap_namespace.i index b3fa1a733..5375c43b6 100644 --- a/Examples/test-suite/typemap_namespace.i +++ b/Examples/test-suite/typemap_namespace.i @@ -27,7 +27,7 @@ namespace Foo { %typemap(javaout) Str1 * = char *; #endif %typemap(in) Str1 * = char *; -#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP) || defined(SWIGMZSCHEME) || defined(SWIGOCAML)) +#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP)) %typemap(freearg) Str1 * = char *; #endif %typemap(typecheck) Str1 * = char *; diff --git a/Examples/test-suite/types_directive.i b/Examples/test-suite/types_directive.i index 26cb6aeeb..44312263d 100644 --- a/Examples/test-suite/types_directive.i +++ b/Examples/test-suite/types_directive.i @@ -1,13 +1,5 @@ %module types_directive -#if defined(SWIGR) -// Avoid conflict with Date class in R -#define Date DateSwig -%inline %{ -#define Date DateSwig -%} -#endif - %ignore Time2::operator Date *; %inline %{ diff --git a/Examples/test-suite/using_composition.i b/Examples/test-suite/using_composition.i index bd0f712b5..7bb6add2a 100644 --- a/Examples/test-suite/using_composition.i +++ b/Examples/test-suite/using_composition.i @@ -2,13 +2,13 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; // C#, Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; // C#, Java, Php4 multiple inheritance %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar2; // C#, Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar2; // C#, Java, Php4 multiple inheritance %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar3; // C#, Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar3; // C#, Java, Php4 multiple inheritance #ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah; #endif diff --git a/Examples/test-suite/using_extend.i b/Examples/test-suite/using_extend.i index e14cc28e8..414ceedb4 100644 --- a/Examples/test-suite/using_extend.i +++ b/Examples/test-suite/using_extend.i @@ -2,7 +2,7 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; // C#, Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; // C#, Java, Php4 multiple inheritance #ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah; #endif diff --git a/Examples/test-suite/using_namespace.i b/Examples/test-suite/using_namespace.i index 799c7cfb5..1989b6a0d 100644 --- a/Examples/test-suite/using_namespace.i +++ b/Examples/test-suite/using_namespace.i @@ -5,7 +5,7 @@ %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, - SWIGWARN_PHP_MULTIPLE_INHERITANCE) Hi; // C#, Java, PHP multiple inheritance + SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Hi; // C#, Java, Php4 multiple inheritance %inline %{ namespace hello diff --git a/Lib/allegrocl/allegrocl.swg b/Lib/allegrocl/allegrocl.swg index 4479f6ac2..0ae8ed76c 100644 --- a/Lib/allegrocl/allegrocl.swg +++ b/Lib/allegrocl/allegrocl.swg @@ -26,76 +26,37 @@ %typemap(lout) SWIGTYPE "(cl::let* ((address $body)\n (new-inst (cl::make-instance '$lclass :foreign-address address)))\n (cl::unless (cl::zerop address)\n (excl:schedule-finalization new-inst #'$ldestructor))\n (cl::setq ACL_ffresult new-inst))"; -%typemap(lisptype) bool, const bool "cl:boolean"; -%typemap(lisptype) char, const char "cl:character"; -%typemap(lisptype) unsigned char, const unsigned char "cl:integer"; -%typemap(lisptype) signed char, const signed char "cl:integer"; +%typemap(lisptype) bool "cl:boolean"; +%typemap(lisptype) char "cl:character"; +%typemap(lisptype) unsigned char "cl:integer"; +%typemap(lisptype) signed char "cl:integer"; -%typemap(ffitype) bool, const bool ":int"; -%typemap(ffitype) char, const char, - signed char, const signed char ":char"; -%typemap(ffitype) unsigned char, const unsigned char ":unsigned-char"; -%typemap(ffitype) short, const short, - signed short, const signed short ":short"; -%typemap(ffitype) unsigned short, const unsigned short ":unsigned-short"; -%typemap(ffitype) int, const int, signed int, const signed int ":int"; -%typemap(ffitype) unsigned int, const unsigned int ":unsigned-int"; -%typemap(ffitype) long, const long, signed long, const signed long ":long"; -%typemap(ffitype) unsigned long, const unsigned long ":unsigned-long"; -%typemap(ffitype) float, const float ":float"; -%typemap(ffitype) double, const double ":double"; -%typemap(ffitype) char *, const char *, signed char *, - const signed char *, signed char &, - const signed char & "(* :char)"; -%typemap(ffitype) unsigned char *, const unsigned char *, - unsigned char &, const unsigned char & "(* :unsigned-char)"; -%typemap(ffitype) short *, const short *, short &, - const short & "(* :short)"; -%typemap(ffitype) unsigned short *, const unsigned short *, - unsigned short &, const unsigned short & "(* :unsigned-short)"; -%typemap(ffitype) int *, const int *, int &, const int & "(* :int)"; -%typemap(ffitype) unsigned int *, const unsigned int *, - unsigned int &, const unsigned int & "(* :unsigned-int)"; +%typemap(ffitype) bool ":int"; +%typemap(ffitype) char ":char"; +%typemap(ffitype) unsigned char ":unsigned-char"; +%typemap(ffitype) signed char ":char"; +%typemap(ffitype) short, signed short ":short"; +%typemap(ffitype) unsigned short ":unsigned-short"; +%typemap(ffitype) int, signed int ":int"; +%typemap(ffitype) unsigned int ":unsigned-int"; +%typemap(ffitype) long, signed long ":long"; +%typemap(ffitype) unsigned long ":unsigned-long"; +%typemap(ffitype) float ":float"; +%typemap(ffitype) double ":double"; +%typemap(ffitype) char * "(* :char)"; %typemap(ffitype) void * "(* :void)"; %typemap(ffitype) void ":void"; %typemap(ffitype) enum SWIGTYPE ":int"; %typemap(ffitype) SWIGTYPE & "(* :void)"; -/* const typemaps -idea: marshall all primitive c types to their respective lisp types -to maintain const corretness. For pointers/references, all bets -are off if you try to modify them. - -idea: add a constant-p slot to the base foreign-pointer class. For -constant pointer/references check this value when setting (around method?) -and error if a setf operation is performed on the address of this object. - -*/ - -/* -%exception %{ - try { - $action - } catch (...) { - return $null; - } -%} - -*/ - -// %typemap(throws) SWIGTYPE { -// (void)$1; -// SWIG_fail; -// } - -%typemap(ctype) bool, const bool "int"; +%typemap(ctype) bool "int"; %typemap(ctype) char, unsigned char, signed char, short, signed short, unsigned short, int, signed int, unsigned int, long, signed long, unsigned long, float, double, long double, char *, void *, void, - enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[], - SWIGTYPE[ANY], SWIGTYPE &, const SWIGTYPE "$1_ltype"; + enum SWIGTYPE, SWIGTYPE *, + SWIGTYPE[ANY], SWIGTYPE & "$1_ltype"; %typemap(ctype) SWIGTYPE "$&1_type"; %typemap(in) bool "$1 = (bool)$input;"; @@ -104,7 +65,7 @@ and error if a setf operation is performed on the address of this object. int, signed int, unsigned int, long, signed long, unsigned long, float, double, long double, char *, void *, void, - enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[], + enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[ANY], SWIGTYPE & "$1 = $input;"; %typemap(in) SWIGTYPE "$1 = *$input;"; @@ -161,8 +122,7 @@ SWIG_TYPECHECK_STRING_ARRAY 1140 long, signed long, unsigned long, enum SWIGTYPE { $1 = 1; }; %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, - SWIGTYPE[], SWIGTYPE[ANY], - SWIGTYPE { $1 = 1; }; + SWIGTYPE[ANY], SWIGTYPE { $1 = 1; }; /* This maps C/C++ types to Lisp classes for overload dispatch */ @@ -187,7 +147,7 @@ SWIG_TYPECHECK_STRING_ARRAY 1140 enum SWIGTYPE, SWIGTYPE *, SWIGTYPE[ANY], SWIGTYPE & "$result = $1;"; #ifdef __cplusplus -%typemap(out) SWIGTYPE "$result = new $1_ltype($1);"; +%typemap(out) SWIGTYPE "$result = new $1_type($1);"; #else %typemap(out) SWIGTYPE { $result = ($&1_ltype) malloc(sizeof($1_type)); @@ -283,15 +243,12 @@ $body)" %rename(__funcall__) *::operator(); %rename(__aref__) *::operator[]; - -%rename(__bool__) *::operator bool(); -%rename(__bool__) *::operator bool() const; #endif %insert("lisphead") %{ ;; $Id$ -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (compile load eval) ;; avoid compiling ef-templates at runtime (excl:find-external-format :fat) @@ -339,30 +296,15 @@ $body)" sym)))) (cl::defun full-name (id type arity class) - ; We need some kind of a hack here to handle template classes - ; and other synonym types right. We need the original name. - (let*( (sym (read-symbol-from-string - (if (eq *swig-identifier-converter* 'identifier-convert-lispify) - (string-lispify id) - id))) - (sym-class (find-class sym nil)) - (id (cond ( (not sym-class) - id ) - ( (and sym-class - (not (eq (class-name sym-class) - sym))) - (class-name sym-class) ) - ( t - id ))) ) - (cl::case type - (:getter (cl::format nil "~@[~A_~]~A" class id)) - (:constructor (cl::format nil "new_~A~@[~A~]" id arity)) - (:destructor (cl::format nil "delete_~A" id)) - (:type (cl::format nil "ff_~A" id)) - (:slot id) - (:ff-operator (cl::format nil "ffi_~A" id)) - (otherwise (cl::format nil "~@[~A_~]~A~@[~A~]" - class id arity))))) + (cl::case type + (:getter (cl::format nil "~@[~A_~]~A" class id)) + (:constructor (cl::format nil "new_~A~@[~A~]" id arity)) + (:destructor (cl::format nil "delete_~A" id)) + (:type (cl::format nil "ff_~A" id)) + (:slot id) + (:ff-operator (cl::format nil "ffi_~A" id)) + (otherwise (cl::format nil "~@[~A_~]~A~@[~A~]" + class id arity)))) (cl::defun identifier-convert-null (id &key type class arity) (cl::if (cl::eq type :setter) @@ -370,27 +312,6 @@ $body)" id :type :getter :class class :arity arity)) (read-symbol-from-string (full-name id type arity class)))) -(cl::defun string-lispify (str) - (cl::let ( (cname (excl::replace-regexp str "_" "-")) - (lastcase :other) - newcase char res ) - (cl::dotimes (n (cl::length cname)) - (cl::setf char (cl::schar cname n)) - (excl::if* (cl::alpha-char-p char) - then - (cl::setf newcase (cl::if (cl::upper-case-p char) :upper :lower)) - (cl::when (cl::and (cl::eq lastcase :lower) - (cl::eq newcase :upper)) - ;; case change... add a dash - (cl::push #\- res) - (cl::setf newcase :other)) - (cl::push (cl::char-downcase char) res) - (cl::setf lastcase newcase) - else - (cl::push char res) - (cl::setf lastcase :other))) - (cl::coerce (cl::nreverse res) 'string))) - (cl::defun identifier-convert-lispify (cname &key type class arity) (cl::assert (cl::stringp cname)) (cl::when (cl::eq type :setter) @@ -400,7 +321,31 @@ $body)" (cl::setq cname (full-name cname type arity class)) (cl::if (cl::eq type :constant) (cl::setf cname (cl::format nil "*~A*" cname))) - (read-symbol-from-string (string-lispify cname))) + (cl::setf cname (excl::replace-regexp cname "_" "-")) + (cl::let ((lastcase :other) + newcase char res) + (cl::dotimes (n (cl::length cname)) + (cl::setf char (cl::schar cname n)) + (excl::if* (cl::alpha-char-p char) + then + (cl::setf newcase (cl::if (cl::upper-case-p char) :upper :lower)) + + (cl::when (cl::or (cl::and (cl::eq lastcase :upper) + (cl::eq newcase :lower)) + (cl::and (cl::eq lastcase :lower) + (cl::eq newcase :upper))) + ;; case change... add a dash + (cl::push #\- res) + (cl::setf newcase :other)) + + (cl::push (cl::char-downcase char) res) + + (cl::setf lastcase newcase) + + else + (cl::push char res) + (cl::setf lastcase :other))) + (read-symbol-from-string (cl::coerce (cl::nreverse res) 'string)))) (cl::defun id-convert-and-export (name &rest kwargs) (cl::multiple-value-bind (symbol package) @@ -418,7 +363,7 @@ $body)" (defswig2 swig-defconstant (string value) (cl::let ((symbol (id-convert-and-export string :type :constant))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (cl::defconstant ,symbol ,value)))) (cl::defun maybe-reorder-args (funcname arglist) @@ -464,7 +409,7 @@ $body)" ) (cl::when (swig-anyvarargs-p ffargs) (cl::setq ffargs '())) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (excl::compiler-let ((*record-xref-info* nil)) (ff:def-foreign-call (,mangle ,mangled-name) ,ffargs ,@kwargs)) (cl::macrolet ((swig-ff-call (&rest args) @@ -490,7 +435,7 @@ $body)" ffargs (cl::loop for (nil name nil . ffi) in ffargs collect `(,name ,@ffi))))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (excl::compiler-let ((*record-xref-info* nil)) (ff:def-foreign-call (,mangle ,mangled-name) ,ffargs ,@kwargs)) (cl::macrolet ((swig-ff-call (&rest args) @@ -502,7 +447,7 @@ $body)" (defswig1 swig-dispatcher ((name &key (type :operator) class arities)) (cl::let ((symbol (id-convert-and-export name :type type :class class))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (cl::defun ,symbol (&rest args) (cl::case (cl::length args) ,@(cl::loop for arity in arities @@ -515,14 +460,14 @@ $body)" (defswig2 swig-def-foreign-stub (name) (cl::let ((lsymbol (id-convert-and-export name :type :class)) (symbol (id-convert-and-export name :type :type))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (ff:def-foreign-type ,symbol (:class )) (cl::defclass ,lsymbol (ff:foreign-pointer) ())))) (defswig2 swig-def-foreign-class (name supers &rest rest) (cl::let ((lsymbol (id-convert-and-export name :type :class)) (symbol (id-convert-and-export name :type :type))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (ff:def-foreign-type ,symbol ,@rest) (cl::defclass ,lsymbol ,supers ((foreign-type :initform ',symbol :initarg :foreign-type @@ -530,11 +475,11 @@ $body)" (defswig2 swig-def-foreign-type (name &rest rest) (cl::let ((symbol (id-convert-and-export name :type :type))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (ff:def-foreign-type ,symbol ,@rest)))) (defswig2 swig-def-synonym-type (synonym of ff-synonym) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (cl::setf (cl::find-class ',synonym) (cl::find-class ',of)) (ff:def-foreign-type ,ff-synonym (:struct )))) @@ -554,24 +499,24 @@ $body)" (parent-strings (cl::mapcar #'package-name-for-namespace parent-namespaces)) (string (package-name-for-namespace namespace))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (cl::defpackage ,string (:use :swig :ff #+ignore '(:common-lisp :ff :excl) ,@parent-strings ,*swig-module-name*) (:import-from :cl :* :nil :t))))) (cl::defmacro swig-in-package (namespace) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (cl::in-package ,(package-name-for-namespace namespace)))) (defswig2 swig-defvar (name mangled-name &key type (ftype :unsigned-natural)) (cl::let ((symbol (id-convert-and-export name :type type))) - `(cl::eval-when (:compile-toplevel :load-toplevel :execute) + `(cl::eval-when (compile load eval) (ff:def-foreign-variable (,symbol ,mangled-name) :type ,ftype)))) ) ;; eval-when -(cl::eval-when (:compile-toplevel :execute) +(cl::eval-when (compile eval) (cl::flet ((starts-with-p (str prefix) (cl::and (cl::>= (cl::length str) (cl::length prefix)) (cl::string= str prefix :end1 (cl::length prefix))))) @@ -582,7 +527,7 @@ $body)" %} -typedef void *__SWIGACL_FwdReference; + %{ @@ -594,8 +539,6 @@ typedef void *__SWIGACL_FwdReference; #define EXPORT EXTERN SWIGEXPORT -typedef void *__SWIGACL_FwdReference; - #include #include %} diff --git a/Lib/allegrocl/inout_typemaps.i b/Lib/allegrocl/inout_typemaps.i old mode 100644 new mode 100755 diff --git a/Lib/allegrocl/longlongs.i b/Lib/allegrocl/longlongs.i old mode 100644 new mode 100755 diff --git a/Lib/allegrocl/std_list.i b/Lib/allegrocl/std_list.i old mode 100644 new mode 100755 diff --git a/Lib/allegrocl/std_string.i b/Lib/allegrocl/std_string.i old mode 100644 new mode 100755 diff --git a/Lib/allkw.swg b/Lib/allkw.swg index 2a2fe18d8..dec6c7c03 100644 --- a/Lib/allkw.swg +++ b/Lib/allkw.swg @@ -19,7 +19,7 @@ %include %include %include -%include +%include %include %include %include diff --git a/Lib/cdata.i b/Lib/cdata.i index 67601f737..a9e74ed8a 100644 --- a/Lib/cdata.i +++ b/Lib/cdata.i @@ -29,11 +29,6 @@ typedef struct SWIGCDATA { $result = C_string(&string_space, $1.len, $1.data); } %typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); -#elif SWIGPHP -%typemap(out) SWIGCDATA { - ZVAL_STRINGL($result, $1.data, $1.len, 1); -} -%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); #else %echo "cdata.i module not supported." #endif @@ -81,3 +76,7 @@ SWIGCDATA cdata_##NAME(TYPE *ptr, int nelements); /* Memory move function */ void memmove(void *data, const void *indata, int inlen); + + + + diff --git a/Lib/chicken/chicken.swg b/Lib/chicken/chicken.swg index a8d1b5a57..d8b71874e 100644 --- a/Lib/chicken/chicken.swg +++ b/Lib/chicken/chicken.swg @@ -10,7 +10,6 @@ /* chicken.h has to appear first. */ %insert(runtime) %{ -#include #include %} diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg index 8703ea65a..bd7242407 100644 --- a/Lib/chicken/chickenrun.swg +++ b/Lib/chicken/chickenrun.swg @@ -7,7 +7,6 @@ * ----------------------------------------------------------------------------- */ #include -#include #include #include #include diff --git a/Lib/csharp/arrays_csharp.i b/Lib/csharp/arrays_csharp.i deleted file mode 100644 index ea22da584..000000000 --- a/Lib/csharp/arrays_csharp.i +++ /dev/null @@ -1,140 +0,0 @@ -/* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * arrays_csharp.i - * - * This file contains a two approaches to marshaling arrays. The first uses - * default p/invoke marshaling and the second uses pinning of the arrays. - * - * Default marshaling approach - * ---------------------------- - * Array typemaps using default p/invoke marshaling. The data is copied to a separately - * allocated buffer when passing over the managed-native boundary. - * - * There are separate typemaps for in, out and inout arrays to enable avoiding - * unnecessary copying. - * - * Example usage: - * - * %include "arrays_csharp.i" - * %apply int INPUT[] { int* sourceArray } - * %apply int OUTPUT[] { int* targetArray } - * void myArrayCopy( int* sourceArray, int* targetArray, int nitems ); - * - * %apply int INOUT[] { int* array1, int *array2 } - * void myArraySwap( int* array1, int* array2, int nitems ); - * - * If handling large arrays you should consider using the pinning array typemaps - * described next. - * - * Pinning approach - * ---------------- - * Array typemaps using pinning. These typemaps pin the managed array given - * as parameter and pass a pointer to it to the c/c++ side. This is very - * efficient as no copying is done (unlike in the default array marshaling), - * but it makes garbage collection more difficult. When considering using - * these typemaps, think carefully whether you have callbacks that may cause - * the control to re-enter the managed side from within the call (and produce - * garbage for the gc) or whether other threads may produce enough garbage to - * trigger gc while the call is being executed. In those cases it may be - * wiser to use the default marshaling typemaps. - * - * Please note that when using fixed arrays, you have to mark your corresponding - * module class method unsafe using - * %csmethodmodifiers "public unsafe" - * (the visibility of the method is up to you). - * - * Example usage: - * - * %include "arrays_csharp.i" - * %apply int FIXED[] { int* sourceArray, int *targetArray } - * %csmethodmodifiers myArrayCopy "public unsafe"; - * void myArrayCopy( int *sourceArray, int* targetArray, int nitems ); - * - * ----------------------------------------------------------------------------- */ - -%define CSHARP_ARRAYS( CTYPE, CSTYPE ) - -// input only arrays - -%typemap(ctype) CTYPE INPUT[] "CTYPE*" -%typemap(cstype) CTYPE INPUT[] "CSTYPE[]" -%typemap(imtype, inattributes="[In, MarshalAs(UnmanagedType.LPArray)]") CTYPE INPUT[] "CSTYPE[]" -%typemap(csin) CTYPE INPUT[] "$csinput" - -%typemap(in) CTYPE INPUT[] "$1 = $input;" -%typemap(freearg) CTYPE INPUT[] "" -%typemap(argout) CTYPE INPUT[] "" - -// output only arrays - -%typemap(ctype) CTYPE OUTPUT[] "CTYPE*" -%typemap(cstype) CTYPE OUTPUT[] "CSTYPE[]" -%typemap(imtype, inattributes="[Out, MarshalAs(UnmanagedType.LPArray)]") CTYPE OUTPUT[] "CSTYPE[]" -%typemap(csin) CTYPE OUTPUT[] "$csinput" - -%typemap(in) CTYPE OUTPUT[] "$1 = $input;" -%typemap(freearg) CTYPE OUTPUT[] "" -%typemap(argout) CTYPE OUTPUT[] "" - -// inout arrays - -%typemap(ctype) CTYPE INOUT[] "CTYPE*" -%typemap(cstype) CTYPE INOUT[] "CSTYPE[]" -%typemap(imtype, inattributes="[In, Out, MarshalAs(UnmanagedType.LPArray)]") CTYPE INOUT[] "CSTYPE[]" -%typemap(csin) CTYPE INOUT[] "$csinput" - -%typemap(in) CTYPE INOUT[] "$1 = $input;" -%typemap(freearg) CTYPE INOUT[] "" -%typemap(argout) CTYPE INOUT[] "" - -%enddef // CSHARP_ARRAYS - -CSHARP_ARRAYS(signed char, sbyte) -CSHARP_ARRAYS(unsigned char, byte) -CSHARP_ARRAYS(short, short) -CSHARP_ARRAYS(unsigned short, ushort) -CSHARP_ARRAYS(int, int) -CSHARP_ARRAYS(unsigned int, uint) -// FIXME - on Unix 64 bit, long is 8 bytes but is 4 bytes on Windows 64 bit. -// How can this be handled sensibly? -// See e.g. http://www.xml.com/ldd/chapter/book/ch10.html -CSHARP_ARRAYS(long, int) -CSHARP_ARRAYS(unsigned long, uint) -CSHARP_ARRAYS(long long, long) -CSHARP_ARRAYS(unsigned long long, ulong) -CSHARP_ARRAYS(float, float) -CSHARP_ARRAYS(double, double) - - -%define CSHARP_ARRAYS_FIXED( CTYPE, CSTYPE ) - -%typemap(ctype) CTYPE FIXED[] "CTYPE*" -%typemap(imtype) CTYPE FIXED[] "IntPtr" -%typemap(cstype) CTYPE FIXED[] "CSTYPE[]" -%typemap(csin, - pre= " fixed ( CSTYPE* swig_ptrTo_$csinput = $csinput ) {", - terminator=" }") - CTYPE FIXED[] "(IntPtr)swig_ptrTo_$csinput" - -%typemap(in) CTYPE FIXED[] "$1 = $input;" -%typemap(freearg) CTYPE FIXED[] "" -%typemap(argout) CTYPE FIXED[] "" - - -%enddef // CSHARP_ARRAYS_FIXED - -CSHARP_ARRAYS_FIXED(signed char, sbyte) -CSHARP_ARRAYS_FIXED(unsigned char, byte) -CSHARP_ARRAYS_FIXED(short, short) -CSHARP_ARRAYS_FIXED(unsigned short, ushort) -CSHARP_ARRAYS_FIXED(int, int) -CSHARP_ARRAYS_FIXED(unsigned int, uint) -CSHARP_ARRAYS_FIXED(long, int) -CSHARP_ARRAYS_FIXED(unsigned long, uint) -CSHARP_ARRAYS_FIXED(long long, long) -CSHARP_ARRAYS_FIXED(unsigned long long, ulong) -CSHARP_ARRAYS_FIXED(float, float) -CSHARP_ARRAYS_FIXED(double, double) - diff --git a/Lib/csharp/boost_shared_ptr.i b/Lib/csharp/boost_shared_ptr.i index 2cb687356..47fbaba1d 100644 --- a/Lib/csharp/boost_shared_ptr.i +++ b/Lib/csharp/boost_shared_ptr.i @@ -33,7 +33,7 @@ // plain reference %typemap(in, canthrow=1) CONST TYPE & %{ $1 = ($1_ltype)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0); - if (!$1) { + if(!$1) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0); return $null; } %} @@ -199,26 +199,22 @@ %typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE { lock(this) { - if (swigCPtr.Handle != IntPtr.Zero) { - if (swigCMemOwnBase) { - swigCMemOwnBase = false; - $imcall; - } - swigCPtr = new HandleRef(null, IntPtr.Zero); + if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwnBase) { + swigCMemOwnBase = false; + $imcall; } + swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); } } %typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE { lock(this) { - if (swigCPtr.Handle != IntPtr.Zero) { - if (swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $imcall; - } - swigCPtr = new HandleRef(null, IntPtr.Zero); + if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $imcall; } + swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); base.Dispose(); } diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg index 94f76a3ad..35e5c26d7 100644 --- a/Lib/csharp/csharp.swg +++ b/Lib/csharp/csharp.swg @@ -396,7 +396,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { SWIG_UnpackData($input, (void *)&$1, sizeof($1)); %} %typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input; - if (!$1) { + if(!$1) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0); return $null; } %} @@ -428,8 +428,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { %typemap(directorin) SWIGTYPE & %{ $input = ($1_ltype) &$1; %} -%typemap(csdirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*) "($iminput == IntPtr.Zero) ? null : new $csclassname($iminput, false)" -%typemap(csdirectorin) SWIGTYPE & "new $csclassname($iminput, false)" +%typemap(csdirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "new $csclassname($iminput, false)" %typemap(csdirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "$csclassname.getCPtr($cscall).Handle" /* Default array handling */ @@ -885,26 +884,22 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { %typemap(csdestruct, methodname="Dispose", methodmodifiers="public") SWIGTYPE { lock(this) { - if (swigCPtr.Handle != IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - $imcall; - } - swigCPtr = new HandleRef(null, IntPtr.Zero); + if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { + swigCMemOwn = false; + $imcall; } + swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); } } %typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") SWIGTYPE { lock(this) { - if (swigCPtr.Handle != IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - $imcall; - } - swigCPtr = new HandleRef(null, IntPtr.Zero); + if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { + swigCMemOwn = false; + $imcall; } + swigCPtr = new HandleRef(null, IntPtr.Zero); GC.SuppressFinalize(this); base.Dispose(); } diff --git a/Lib/csharp/std_vector.i b/Lib/csharp/std_vector.i old mode 100644 new mode 100755 index f4ad88bae..a04831f75 --- a/Lib/csharp/std_vector.i +++ b/Lib/csharp/std_vector.i @@ -6,22 +6,15 @@ * * SWIG typemaps for std::vector * C# implementation - * The C# wrapper is made to look and feel like a C# System.Collections.Generic.List<> collection. - * For .NET 1 compatibility, define SWIG_DOTNET_1 when compiling the C# code; then the C# wrapper is - * made to look and feel like a typesafe C# System.Collections.ArrayList. All the methods in IList - * are defined, but we don't derive from IList as this is a typesafe collection and the C++ operator== - * must always be defined for the collection type (which it isn't). + * The C# wrapper is made to look and feel like a typesafe C# System.Collections.ArrayList + * All the methods in IList are defined, but we don't derive from IList as this is a typesafe collection. + * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents! * * Very often the C# generated code will not compile as the C++ template type is not the same as the C# * proxy type, so use the SWIG_STD_VECTOR_SPECIALIZE or SWIG_STD_VECTOR_SPECIALIZE_MINIMUM macro, eg * * SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(Klass, SomeNamespace::Klass) * %template(VectKlass) std::vector; - * - * Note that IEnumerable<> is implemented in the proxy class which is useful for using LINQ with - * C++ std::vector wrappers. - * - * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents! * ----------------------------------------------------------------------------- */ // Warning: Use the typemaps here in the expectation that the macros they are in will change name. @@ -31,8 +24,8 @@ // MACRO for use within the std::vector class body // CSTYPE and CTYPE respectively correspond to the types in the cstype and ctype typemaps -%define SWIG_STD_VECTOR_MINIMUM_INTERNAL(CONST_REFERENCE_TYPE, CSTYPE, CTYPE...) -%typemap(csinterfaces) std::vector "IDisposable, System.Collections.IEnumerable\n#if !SWIG_DOTNET_1\n , System.Collections.Generic.IEnumerable\n#endif\n"; +%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) +%typemap(csinterfaces) std::vector "IDisposable, System.Collections.IEnumerable"; %typemap(cscode) std::vector %{ public $csclassname(System.Collections.ICollection c) : this() { if (c == null) @@ -86,30 +79,15 @@ } } -#if SWIG_DOTNET_1 - public void CopyTo(System.Array array) -#else - public void CopyTo(CSTYPE[] array) -#endif - { + public void CopyTo(System.Array array) { CopyTo(0, array, 0, this.Count); } -#if SWIG_DOTNET_1 - public void CopyTo(System.Array array, int arrayIndex) -#else - public void CopyTo(CSTYPE[] array, int arrayIndex) -#endif - { + public void CopyTo(System.Array array, int arrayIndex) { CopyTo(0, array, arrayIndex, this.Count); } -#if SWIG_DOTNET_1 - public void CopyTo(int index, System.Array array, int arrayIndex, int count) -#else - public void CopyTo(int index, CSTYPE[] array, int arrayIndex, int count) -#endif - { + public void CopyTo(int index, System.Array array, int arrayIndex, int count) { if (array == null) throw new ArgumentNullException("array"); if (index < 0) @@ -119,19 +97,14 @@ if (count < 0) throw new ArgumentOutOfRangeException("count", "Value is less than zero"); if (array.Rank > 1) - throw new ArgumentException("Multi dimensional array.", "array"); + throw new ArgumentException("Multi dimensional array."); if (index+count > this.Count || arrayIndex+count > array.Length) throw new ArgumentException("Number of elements to copy is too large."); for (int i=0; i System.Collections.Generic.IEnumerable.GetEnumerator() { - return new $csclassnameEnumerator(this); - } -#endif - + // Type-safe version of IEnumerable.GetEnumerator System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { return new $csclassnameEnumerator(this); } @@ -145,11 +118,7 @@ /// whenever the collection is modified. This has been done for changes in the size of the /// collection but not when one of the elements of the collection is modified as it is a bit /// tricky to detect unmanaged code that modifies the collection under our feet. - public sealed class $csclassnameEnumerator : System.Collections.IEnumerator -#if !SWIG_DOTNET_1 - , System.Collections.Generic.IEnumerator -#endif - { + public sealed class $csclassnameEnumerator : System.Collections.IEnumerator { private $csclassname collectionRef; private int currentIndex; private object currentObject; @@ -201,20 +170,13 @@ throw new InvalidOperationException("Collection modified."); } } - -#if !SWIG_DOTNET_1 - public void Dispose() { - currentIndex = -1; - currentObject = null; - } -#endif } %} public: typedef size_t size_type; typedef CTYPE value_type; - typedef CONST_REFERENCE_TYPE const_reference; + typedef const value_type& const_reference; %rename(Clear) clear; void clear(); %rename(Add) push_back; @@ -324,14 +286,8 @@ } %enddef -%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) -SWIG_STD_VECTOR_MINIMUM_INTERNAL(const value_type&, CSTYPE, CTYPE) -%enddef - - // Extra methods added to the collection class if operator== is defined for the class being wrapped // CSTYPE and CTYPE respectively correspond to the types in the cstype and ctype typemaps -// The class will then implement IList<>, which adds extra functionality %define SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CSTYPE, CTYPE...) %extend { bool Contains(const value_type& value) { @@ -351,13 +307,10 @@ SWIG_STD_VECTOR_MINIMUM_INTERNAL(const value_type&, CSTYPE, CTYPE) index = (int)(self->rend() - 1 - rit); return index; } - bool Remove(const value_type& value) { + void Remove(const value_type& value) { std::vector::iterator it = std::find(self->begin(), self->end(), value); - if (it != self->end()) { + if (it != self->end()) self->erase(it); - return true; - } - return false; } } %enddef @@ -381,6 +334,7 @@ namespace std { } %enddef + %{ #include #include @@ -407,15 +361,11 @@ namespace std { template class vector { SWIG_STD_VECTOR_MINIMUM(T, const T*) }; - // bool is a bit different in the C++ standard - template<> class vector { - SWIG_STD_VECTOR_MINIMUM_INTERNAL(bool, bool, bool) - SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(bool, bool) - }; } // template specializations for std::vector // these provide extra collections methods as operator== is defined +SWIG_STD_VECTOR_SPECIALIZE(bool, bool) SWIG_STD_VECTOR_SPECIALIZE(char, char) SWIG_STD_VECTOR_SPECIALIZE(sbyte, signed char) SWIG_STD_VECTOR_SPECIALIZE(byte, unsigned char) @@ -431,3 +381,4 @@ SWIG_STD_VECTOR_SPECIALIZE(float, float) SWIG_STD_VECTOR_SPECIALIZE(double, double) SWIG_STD_VECTOR_SPECIALIZE(string, std::string) // also requires a %include + diff --git a/Lib/csharp/std_wstring.i b/Lib/csharp/std_wstring.i old mode 100644 new mode 100755 diff --git a/Lib/csharp/wchar.i b/Lib/csharp/wchar.i old mode 100644 new mode 100755 diff --git a/Lib/intrusive_ptr.i b/Lib/intrusive_ptr.i deleted file mode 100644 index 7a686cfc5..000000000 --- a/Lib/intrusive_ptr.i +++ /dev/null @@ -1,96 +0,0 @@ -// Allow for different namespaces for shared_ptr / intrusive_ptr - they could be boost or std or std::tr1 -// For example for std::tr1, use: -// #define SWIG_SHARED_PTR_NAMESPACE std -// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1 -// #define SWIG_INTRUSIVE_PTR_NAMESPACE boost -// #define SWIG_INTRUSIVE_PTR_SUBNAMESPACE - -#if !defined(SWIG_INTRUSIVE_PTR_NAMESPACE) -# define SWIG_INTRUSIVE_PTR_NAMESPACE boost -#endif - -#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) -# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE::SWIG_INTRUSIVE_PTR_SUBNAMESPACE -#else -# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE -#endif - -namespace SWIG_INTRUSIVE_PTR_NAMESPACE { -#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) - namespace SWIG_INTRUSIVE_PTR_SUBNAMESPACE { -#endif - template class intrusive_ptr { - }; -#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) - } -#endif -} - -%fragment("SWIG_intrusive_deleter", "header") { -template struct SWIG_intrusive_deleter -{ - void operator()(T * p) - { - if(p) intrusive_ptr_release(p); - } -}; -} - -%fragment("SWIG_null_deleter", "header") { -struct SWIG_null_deleter { - void operator() (void const *) const { - } -}; -%#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter() -%#define SWIG_NO_NULL_DELETER_1 -} - -// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types -// For plain classes, do not use for derived classes -%define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...) -SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, , TYPE) -SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) -%enddef - -// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types -// For derived classes -%define SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...) -SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, , TYPE) -SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) -%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >) %{ - *newmemory = SWIG_CAST_NEW_MEMORY; - return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *)$from); - %} -%extend TYPE { - static SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { - return swigSharedPtrUpcast; - } -} -%enddef - -// Extra user macro for including classes in intrusive_ptr typemaps for both const and non-const pointer types -// This caters for classes which cannot be wrapped by intrusive_ptrs but are still part of the class hierarchy -// For plain classes, do not use for derived classes -%define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...) -SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, , TYPE) -SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, const, TYPE) -%enddef - -// Extra user macro for including classes in intrusive_ptr typemaps for both const and non-const pointer types -// This caters for classes which cannot be wrapped by intrusive_ptrs but are still part of the class hierarchy -// For derived classes -%define SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE...) -SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, , TYPE) -SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, const, TYPE) -%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >) %{ - *newmemory = SWIG_CAST_NEW_MEMORY; - return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *)$from); -%} -%extend TYPE { - static SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { - return swigSharedPtrUpcast; - } -} -%enddef - - diff --git a/Lib/java/boost_intrusive_ptr.i b/Lib/java/boost_intrusive_ptr.i deleted file mode 100644 index 48f6c317b..000000000 --- a/Lib/java/boost_intrusive_ptr.i +++ /dev/null @@ -1,460 +0,0 @@ -%include - -%define SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) - -%naturalvar TYPE; -%naturalvar SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; - -// destructor mods -%feature("unref") TYPE "(void)arg1; delete smartarg1;" - - -%typemap(in) CONST TYPE ($&1_type argp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain value - argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; - if (!argp) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); - return $null; - } - $1 = *argp; -%} -%typemap(out, fragment="SWIG_intrusive_deleter") CONST TYPE %{ - //plain value(out) - $1_ltype* resultp = new $1_ltype(($1_ltype &)$1); - intrusive_ptr_add_ref(resultp); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(resultp, SWIG_intrusive_deleter< CONST TYPE >()); -%} - -%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain pointer - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; - $1 = (TYPE *)(smartarg ? smartarg->get() : 0); -%} -%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE * %{ - //plain pointer(out) - #if ($owner) - if ($1) { - intrusive_ptr_add_ref($1); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - #else - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; - #endif -%} - -%typemap(in) CONST TYPE & (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain reference - $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - if(!$1) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); - return $null; - } -%} -%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE & %{ - //plain reference(out) - #if ($owner) - if ($1) { - intrusive_ptr_add_ref($1); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - #else - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; - #endif -%} - -%typemap(in) CONST TYPE *& ($*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain pointer by reference - temp = ((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - $1 = &temp; -%} -%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE *& %{ - // plain pointer by reference(out) - #if ($owner) - if (*$1) { - intrusive_ptr_add_ref(*$1); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1, SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - #else - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_0); - #endif -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > ($&1_type argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by value - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - if (smartarg) { - $1 = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - } -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{ - if ($1) { - intrusive_ptr_add_ref(result.get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(result.get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } -%} - -%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ - // shared_ptr by value - smartarg = *($&1_ltype*)&$input; - if (smartarg) $1 = *smartarg; -%} -%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ - *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by reference - if ( $input ) { - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - $1 = &temp; - } else { - $1 = &tempnull; - } -%} -%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ - delete &($1); - if ($self) { - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * temp = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); - $1 = *temp; - } -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ - if (*$1) { - intrusive_ptr_add_ref($1->get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by pointer - if ( $input ) { - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - $1 = &temp; - } else { - $1 = &tempnull; - } -%} -%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ - delete $1; - if ($self) $1 = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ - if ($1 && *$1) { - intrusive_ptr_add_ref($1->get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - if ($owner) delete $1; -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& (SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > temp, $*1_ltype tempp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by pointer reference - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - if ($input) { - temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - } - tempp = &temp; - $1 = &tempp; -%} -%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ - if ($self) $1 = *$input; -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ - if (*$1 && **$1) { - intrusive_ptr_add_ref((*$1)->get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >((*$1)->get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } -%} - -// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug -%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} -%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} - - -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "PROXYCLASS" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "PROXYCLASS.getCPtr($javainput)" - -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } -%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } - - -%typemap(javaout) CONST TYPE { - return new PROXYCLASS($jnicall, true); - } -%typemap(javaout) CONST TYPE & { - return new PROXYCLASS($jnicall, true); - } -%typemap(javaout) CONST TYPE * { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } -%typemap(javaout) CONST TYPE *& { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } - -// Base proxy classes -%typemap(javabody) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnBase; - - protected $javaclassname(long cPtr, boolean cMemoryOwn) { - swigCMemOwnBase = cMemoryOwn; - swigCPtr = cPtr; - } - - protected static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -// Derived proxy classes -%typemap(javabody_derived) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnDerived; - - protected $javaclassname(long cPtr, boolean cMemoryOwn) { - super($imclassname.$javaclassname_SWIGSharedPtrUpcast(cPtr), true); - swigCMemOwnDerived = cMemoryOwn; - swigCPtr = cPtr; - } - - protected static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { - if(swigCPtr != 0 && swigCMemOwnBase) { - swigCMemOwnBase = false; - $jnicall; - } - swigCPtr = 0; - } - -%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { - if(swigCPtr != 0 && swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $jnicall; - } - swigCPtr = 0; - super.delete(); - } - -// CONST version needed ???? also for C# -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" - - -%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; -%template() SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; -%enddef - - -///////////////////////////////////////////////////////////////////// - - -%include - -%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, CONST, TYPE...) - -%naturalvar TYPE; -%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; - -// destructor mods -%feature("unref") TYPE "(void)arg1; delete smartarg1;" - - -// plain value -%typemap(in) CONST TYPE ($&1_type argp = 0) %{ - argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; - if (!argp) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); - return $null; - } - $1 = *argp; %} -%typemap(out) CONST TYPE -%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %} - -// plain pointer -%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; - $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %} -%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{ - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0; -%} - -// plain reference -%typemap(in) CONST TYPE & %{ - $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - if (!$1) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); - return $null; - } %} -%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & -%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %} - -// plain pointer by reference -%typemap(in) CONST TYPE *& ($*1_ltype temp = 0) -%{ temp = ((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - $1 = &temp; %} -%typemap(out, fragment="SWIG_null_deleter") CONST TYPE *& -%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %} - -%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ - // shared_ptr by value - smartarg = *($&1_ltype*)&$input; - if (smartarg) $1 = *smartarg; -%} -%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ - *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; -%} - -// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug -%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} -%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} - - -%typemap (jni) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong" -%typemap (jtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long" -%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS" -%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS.getCPtr($javainput)" -%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } - -%typemap(javaout) CONST TYPE { - return new PROXYCLASS($jnicall, true); - } -%typemap(javaout) CONST TYPE & { - return new PROXYCLASS($jnicall, true); - } -%typemap(javaout) CONST TYPE * { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } -%typemap(javaout) CONST TYPE *& { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); - } - -// Base proxy classes -%typemap(javabody) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnBase; - - protected $javaclassname(long cPtr, boolean cMemoryOwn) { - swigCMemOwnBase = cMemoryOwn; - swigCPtr = cPtr; - } - - protected static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -// Derived proxy classes -%typemap(javabody_derived) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnDerived; - - protected $javaclassname(long cPtr, boolean cMemoryOwn) { - super($imclassname.$javaclassname_SWIGSharedPtrUpcast(cPtr), true); - swigCMemOwnDerived = cMemoryOwn; - swigCPtr = cPtr; - } - - protected static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { - if (swigCPtr != 0) { - if (swigCMemOwnBase) { - swigCMemOwnBase = false; - $jnicall; - } - swigCPtr = 0; - } - } - -%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { - if (swigCPtr != 0) { - if (swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $jnicall; - } - swigCPtr = 0; - } - super.delete(); - } - -// CONST version needed ???? also for C# -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" - - -%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; -%enddef - diff --git a/Lib/java/boost_shared_ptr.i b/Lib/java/boost_shared_ptr.i index 75762f84f..1f555bf85 100644 --- a/Lib/java/boost_shared_ptr.i +++ b/Lib/java/boost_shared_ptr.i @@ -33,7 +33,7 @@ // plain reference %typemap(in) CONST TYPE & %{ $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - if (!$1) { + if(!$1) { SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); return $null; } %} @@ -166,23 +166,19 @@ %} %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { - if (swigCPtr != 0) { - if (swigCMemOwnBase) { - swigCMemOwnBase = false; - $jnicall; - } - swigCPtr = 0; + if(swigCPtr != 0 && swigCMemOwnBase) { + swigCMemOwnBase = false; + $jnicall; } + swigCPtr = 0; } %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { - if (swigCPtr != 0) { - if (swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $jnicall; - } - swigCPtr = 0; + if(swigCPtr != 0 && swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $jnicall; } + swigCPtr = 0; super.delete(); } diff --git a/Lib/java/java.swg b/Lib/java/java.swg index bd2357a86..b7c5607c3 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -364,7 +364,7 @@ } %typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } -%typemap(out, noblock=1) char * { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } +%typemap(out, noblock=1) char * { if($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } %typemap(javadirectorin) char * "$jniinput" %typemap(javadirectorout) char * "$javacall" @@ -378,7 +378,7 @@ $1 = &temp; } %typemap(freearg, noblock=1) char *& { if ($1 && *$1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)*$1); } -%typemap(out, noblock=1) char *& { if (*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); } +%typemap(out, noblock=1) char *& { if(*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); } %typemap(out) void "" %typemap(javadirectorin) void "$jniinput" @@ -597,7 +597,7 @@ /* Generic pointers and references */ %typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %} %typemap(in) SWIGTYPE & %{ $1 = *($&1_ltype)&$input; - if (!$1) { + if(!$1) { SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); return $null; } %} @@ -620,8 +620,7 @@ %typemap(directorin,descriptor="L$packagepath/$javaclassname;") SWIGTYPE & %{ *($&1_ltype)&$input = ($1_ltype) &$1; %} -%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*) "($jniinput == 0) ? null : new $javaclassname($jniinput, false)" -%typemap(javadirectorin) SWIGTYPE & "new $javaclassname($jniinput, false)" +%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "new $javaclassname($jniinput, false)" %typemap(javadirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE & "$javaclassname.getCPtr($javacall)" /* Default array handling */ @@ -656,7 +655,7 @@ %typemap(argout) char[ANY], char[] "" %typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } -%typemap(out, noblock=1) char[ANY], char[] { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } +%typemap(out, noblock=1) char[ANY], char[] { if($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } %typemap(javadirectorin) char[ANY], char[] "$jniinput" %typemap(javadirectorout) char[ANY], char[] "$javacall" @@ -1148,23 +1147,19 @@ SWIG_PROXY_CONSTRUCTOR(true, false, TYPENAME) SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE) %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE { - if (swigCPtr != 0) { - if (swigCMemOwn) { - swigCMemOwn = false; - $jnicall; - } - swigCPtr = 0; + if(swigCPtr != 0 && swigCMemOwn) { + swigCMemOwn = false; + $jnicall; } + swigCPtr = 0; } %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE { - if (swigCPtr != 0) { - if (swigCMemOwn) { - swigCMemOwn = false; - $jnicall; - } - swigCPtr = 0; + if(swigCPtr != 0 && swigCMemOwn) { + swigCMemOwn = false; + $jnicall; } + swigCPtr = 0; super.delete(); } @@ -1195,8 +1190,7 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE) #define %javaenum(wrapapproach) %feature("java:enum","wrapapproach") #define %javamethodmodifiers %feature("java:methodmodifiers") #define %javaexception(exceptionclasses) %feature("except",throws=exceptionclasses) -#define %nojavaexception %feature("except","0",throws="") -#define %clearjavaexception %feature("except","",throws="") +#define %nojavaexception %feature("except","",throws="") %pragma(java) jniclassclassmodifiers="class" %pragma(java) moduleclassmodifiers="public class" diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index fc4c4e267..4aa0c84b5 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -34,7 +34,7 @@ %insert(runtime) %{ /* Fix for jlong on some versions of gcc on Windows */ -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) +#if defined(__GNUC__) && !defined(__INTELC__) typedef long long __int64; #endif diff --git a/Lib/java/std_vector.i b/Lib/java/std_vector.i index 29439606b..92fa25ac2 100644 --- a/Lib/java/std_vector.i +++ b/Lib/java/std_vector.i @@ -46,40 +46,6 @@ namespace std { } } }; - - // bool specialization - template<> class vector { - public: - typedef size_t size_type; - typedef bool value_type; - typedef bool const_reference; - vector(); - vector(size_type n); - size_type size() const; - size_type capacity() const; - void reserve(size_type n); - %rename(isEmpty) empty; - bool empty() const; - void clear(); - %rename(add) push_back; - void push_back(const value_type& x); - %extend { - const_reference get(int i) throw (std::out_of_range) { - int size = int(self->size()); - if (i>=0 && isize()); - if (i>=0 && i=0),"number must not be negative") -$1 = ($type)lua_tonumber(L, $input);%} %typemap(out) int,short,long, unsigned int,unsigned short,unsigned long, @@ -45,20 +41,15 @@ $1 = ($type)lua_tonumber(L, $input);%} %typemap(in,checkfn="lua_isnumber") const int&($basetype temp) %{ temp=($basetype)lua_tonumber(L,$input); $1=&temp;%} -%typemap(in,checkfn="lua_isnumber") const unsigned int&($basetype temp) -%{SWIG_contract_assert((lua_tonumber(L,$input)>=0),"number must not be negative") -temp=($basetype)lua_tonumber(L,$input); $1=&temp;%} - -%typemap(out) const int&, const unsigned int& +%typemap(out) const int& %{ lua_pushnumber(L, (lua_Number) *$1); SWIG_arg++;%} // for the other numbers we can just use an apply statement to cover them -%apply const int & {const short&,const long&,const signed char&, +%apply const int & {const short&,const long&, + const unsigned int&,const unsigned short&,const unsigned long&, + const signed char&,const unsigned char&, const float&,const double&}; -%apply const unsigned int & {const unsigned short&,const unsigned long&, - const unsigned char&}; - /* enums have to be handled slightly differently VC++ .net will not allow a cast from lua_Number(double) to enum directly. */ diff --git a/Lib/ocaml/std_deque.i b/Lib/ocaml/std_deque.i index baadb4e53..44815ebda 100644 --- a/Lib/ocaml/std_deque.i +++ b/Lib/ocaml/std_deque.i @@ -28,4 +28,4 @@ } }; -%include +%include <_std_deque.i> diff --git a/Lib/octave/carrays.i b/Lib/octave/carrays.i index 014de37ff..454762aa1 100644 --- a/Lib/octave/carrays.i +++ b/Lib/octave/carrays.i @@ -1,5 +1,5 @@ %define %array_class(TYPE,NAME) - %array_class_wrap(TYPE,NAME,__paren__,__paren_asgn__) + %array_class_wrap(TYPE,NAME,__paren,__paren_asgn) %enddef %include diff --git a/Lib/octave/octcontainer.swg b/Lib/octave/octcontainer.swg index afc3ed147..bb1122a7b 100644 --- a/Lib/octave/octcontainer.swg +++ b/Lib/octave/octcontainer.swg @@ -204,7 +204,7 @@ namespace swig operator T () const { - // swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, _index); + // swig::PyObject_var item = OctSequence_GetItem(_seq, _index); octave_value item; // * todo try { return swig::as(item, true); @@ -410,7 +410,7 @@ namespace swig { int s = size(); for (int i = 0; i < s; ++i) { - // swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, i); + // swig::PyObject_var item = OctSequence_GetItem(_seq, i); octave_value item; // * todo if (!swig::check(item)) { if (set_err) { @@ -453,7 +453,7 @@ namespace swig $result = Cell(tmpc); } - %fragment("SwigPyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="OctSequence_Cont") {} + %fragment("PyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="OctSequence_Cont") {} %typemap(out,fragment="OctPairBoolOutputIterator") std::pair, std::pair { @@ -513,11 +513,11 @@ namespace swig return x; } - value_type __paren__(difference_type i) throw (std::out_of_range) { + value_type __paren(difference_type i) throw (std::out_of_range) { return *(swig::cgetpos(self, i)); } - void __paren_asgn__(difference_type i, value_type x) throw (std::out_of_range) { + void __paren_asgn(difference_type i, value_type x) throw (std::out_of_range) { *(swig::getpos(self,i)) = x; } diff --git a/Lib/octave/octopers.swg b/Lib/octave/octopers.swg index c38e64d8c..a9ccf44b8 100644 --- a/Lib/octave/octopers.swg +++ b/Lib/octave/octopers.swg @@ -6,68 +6,68 @@ // operators supported in Octave, and the methods they are routed to -// __brace__ a{args} -// __brace_asgn__ a{args} = rhs -// __paren__ a(args) -// __paren_asgn__ a(args) = rhs -// __str__ generates string rep +// __brace a{args} +// __brace_asgn a{args} = rhs +// __paren a(args) +// __paren_asgn a(args) = rhs +// __str generates string rep -// __not__ !a -// __uplus__ +a -// __uminus__ -a -// __transpose__ a.' -// __hermitian__ a' -// __incr__ a++ -// __decr__ a-- -// __add__ a + b -// __sub__ a - b -// __mul__ a * b -// __div__ a / b -// __pow__ a ^ b -// __ldiv__ a \ b -// __lshift__ a << b -// __rshift__ a >> b -// __lt__ a < b -// __le__ a <= b -// __eq__ a == b -// __ge__ a >= b -// __gt__ a > b -// __ne__ a != b -// __el_mul__ a .* b -// __el_div__ a ./ b -// __el_pow__ a .^ b -// __el_ldiv__ a .\ b -// __el_and__ a & b -// __el_or__ a | b +// __not !a +// __uplus +a +// __uminus -a +// __transpose a.' +// __hermitian a' +// __incr a++ +// __decr a-- +// __add a + b +// __sub a - b +// __mul a * b +// __div a / b +// __pow a ^ b +// __ldiv a \ b +// __lshift a << b +// __rshift a >> b +// __lt a < b +// __le a <= b +// __eq a == b +// __ge a >= b +// __gt a > b +// __ne a != b +// __el_mul a .* b +// __el_div a ./ b +// __el_pow a .^ b +// __el_ldiv a .\ b +// __el_and a & b +// __el_or a | b // operators supported in C++, and the methods that route to them -%rename(__add__) *::operator+; -%rename(__add__) *::operator+(); -%rename(__add__) *::operator+() const; -%rename(__sub__) *::operator-; -%rename(__uminus__) *::operator-(); -%rename(__uminus__) *::operator-() const; -%rename(__mul__) *::operator*; -%rename(__div__) *::operator/; -%rename(__mod__) *::operator%; -%rename(__lshift__) *::operator<<; -%rename(__rshift__) *::operator>>; -%rename(__el_and__) *::operator&&; -%rename(__el_or__) *::operator||; -%rename(__xor__) *::operator^; -%rename(__invert__) *::operator~; -%rename(__lt__) *::operator<; -%rename(__le__) *::operator<=; -%rename(__gt__) *::operator>; -%rename(__ge__) *::operator>=; -%rename(__eq__) *::operator==; -%rename(__ne__) *::operator!=; -%rename(__not__) *::operator!; -%rename(__incr__) *::operator++; -%rename(__decr__) *::operator--; -%rename(__paren__) *::operator(); -%rename(__brace__) *::operator[]; +%rename(__add) *::operator+; +%rename(__add) *::operator+(); +%rename(__add) *::operator+() const; +%rename(__sub) *::operator-; +%rename(__uminus) *::operator-(); +%rename(__uminus) *::operator-() const; +%rename(__mul) *::operator*; +%rename(__div) *::operator/; +%rename(__mod) *::operator%; +%rename(__lshift) *::operator<<; +%rename(__rshift) *::operator>>; +%rename(__el_and) *::operator&&; +%rename(__el_or) *::operator||; +%rename(__xor) *::operator^; +%rename(__invert) *::operator~; +%rename(__lt) *::operator<; +%rename(__le) *::operator<=; +%rename(__gt) *::operator>; +%rename(__ge) *::operator>=; +%rename(__eq) *::operator==; +%rename(__ne) *::operator!=; +%rename(__not) *::operator!; +%rename(__incr) *::operator++; +%rename(__decr) *::operator--; +%rename(__paren) *::operator(); +%rename(__brace) *::operator[]; // Ignored inplace operators %ignoreoperator(PLUSEQ) operator+=; diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index c48310e27..07aa47cb5 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -589,7 +589,7 @@ namespace Swig { // index operator else { if (ops[skip] == '(' || ops[skip] == '{') { - const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__"; + const char *op_name = ops[skip] == '(' ? "__paren" : "__brace"; octave_value_list args; args.append(*idx_it++); ++skip; @@ -628,7 +628,7 @@ namespace Swig { } else if (ops[skip] == '(' || ops[skip] == '{') { - const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__"; + const char *op_name = ops[skip] == '(' ? "__paren_asgn" : "__brace_asgn"; member_value_pair *m = find_member(op_name, false); if (m) { octave_value_list args; @@ -666,27 +666,40 @@ namespace Swig { virtual bool is_string() const { octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); - return !!nc_this->find_member("__str__", false); + return !!nc_this->find_member("__str", false); } virtual std::string string_value(bool force = false) const { octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); - member_value_pair *m = nc_this->find_member("__str__", false); + member_value_pair *m = nc_this->find_member("__str", false); if (!m) { - error("__str__ method not defined"); + error("__str method not defined"); return std::string(); } octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1); if (outarg.length() < 1 || !outarg(0).is_string()) { - error("__str__ method did not return a string"); + error("__str method did not return a string"); return std::string(); } return outarg(0).string_value(); } + /* virtual Octave_map map_value() const { - return Octave_map(); + octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); + member_value_pair *m = nc_this->find_member("__str", false); + if (!m) { + error("__map method not defined"); + return std::string(); + } + octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1); + if (outarg.length() < 1 || !outarg(0).is_map()) { + error("__map method did not return a string"); + return std::string(); + } + return outarg(0).map_value(); } + */ virtual string_vector map_keys() const { member_map tmp; @@ -700,35 +713,6 @@ namespace Swig { return keys; } - virtual bool save_ascii (std::ostream& os) { - return true; - } - - virtual bool load_ascii (std::istream& is) { - return true; - } - - virtual bool save_binary (std::ostream& os, bool& save_as_floats) { - return true; - } - - virtual bool load_binary (std::istream& is, bool swap, - oct_mach_info::float_format fmt) { - return true; - } - -#if defined (HAVE_HDF5) - virtual bool - save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { - return true; - } - - virtual bool - load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { - return true; - } -#endif - virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const { return string_value(); } @@ -753,7 +737,7 @@ namespace Swig { assert(ost); octave_value ret; - if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret)) + if (ost->dispatch_unary_op(std::string("__") + op_name, ret)) return ret; std::string symbol = "op_" + ost->swig_type_name() + "_" + op_name; octave_value_list args; @@ -770,7 +754,7 @@ namespace Swig { octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs); octave_value ret; - if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret)) + if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name, rhs, ret)) return ret; std::string symbol; @@ -892,35 +876,9 @@ namespace Swig { virtual std::string string_value(bool force = false) const { return ptr->string_value(force); } - virtual Octave_map map_value() const - { return ptr->map_value(); } - virtual string_vector map_keys() const { return ptr->map_keys(); } - virtual bool save_ascii (std::ostream& os) - { return ptr->save_ascii(os); } - - virtual bool load_ascii (std::istream& is) - { return ptr->load_ascii(is); } - - virtual bool save_binary (std::ostream& os, bool& save_as_floats) - { return ptr->save_binary(os, save_as_floats); } - - virtual bool load_binary (std::istream& is, bool swap, - oct_mach_info::float_format fmt) - { return ptr->load_binary(is, swap, fmt); } - -#if defined (HAVE_HDF5) - virtual bool - save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) - { return ptr->save_hdf5(loc_id, name, save_as_floats); } - - virtual bool - load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) - { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); } -#endif - virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const { return ptr->convert_to_str(pad, force, type); } @@ -969,37 +927,6 @@ namespace Swig { void print(std::ostream &os, bool pr_as_read_syntax = false) const { os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size() << std::endl; } - - - virtual bool save_ascii (std::ostream& os) { - return true; - } - - virtual bool load_ascii (std::istream& is) { - return true; - } - - virtual bool save_binary (std::ostream& os, bool& save_as_floats) { - return true; - } - - virtual bool load_binary (std::istream& is, bool swap, - oct_mach_info::float_format fmt) { - return true; - } - -#if defined (HAVE_HDF5) - virtual bool - save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { - return true; - } - - virtual bool - load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { - return true; - } -#endif - private: DECLARE_OCTAVE_ALLOCATOR; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index 82a17285a..dd68ca4c1 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -3,7 +3,6 @@ #include #include #include -#include %} %insert(runtime) "swigrun.swg"; diff --git a/Lib/octave/octstdcommon.swg b/Lib/octave/octstdcommon.swg index 96923f40a..e69c7e629 100644 --- a/Lib/octave/octstdcommon.swg +++ b/Lib/octave/octstdcommon.swg @@ -42,7 +42,7 @@ namespace swig { struct traits_asptr { static int asptr(const octave_value& obj, Type **val) { Type *p; - int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); + int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0; if (SWIG_IsOK(res)) { if (val) *val = p; } diff --git a/Lib/octave/std_basic_string.i b/Lib/octave/std_basic_string.i index 9fc0b0730..f2dac405a 100644 --- a/Lib/octave/std_basic_string.i +++ b/Lib/octave/std_basic_string.i @@ -1,6 +1,5 @@ #if !defined(SWIG_STD_STRING) #define SWIG_STD_BASIC_STRING -#define SWIG_STD_MODERN_STL %include @@ -10,22 +9,39 @@ %fragment(SWIG_AsPtr_frag(std::basic_string),"header", fragment="SWIG_AsCharPtrAndSize") { SWIGINTERN int -SWIG_AsPtr(std::basic_string)(octave_value obj, std::string **val) +SWIG_AsPtr(std::basic_string)(PyObject* obj, std::string **val) { - if (obj.is_string()) { - if (val) - *val = new std::string(obj.string_value()); - return SWIG_NEWOBJ; + static swig_type_info* string_info = + SWIG_TypeQuery("std::basic_string *"); + std::string *vptr; + if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) { + if (val) *val = vptr; + return SWIG_OLDOBJ; + } else { + PyErr_Clear(); + char* buf = 0 ; size_t size = 0; int alloc = 0; + if (SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) { + if (buf) { + if (val) *val = new std::string(buf, size - 1); + if (alloc == SWIG_NEWOBJ) %delete_array(buf); + return SWIG_NEWOBJ; + } + } else { + PyErr_Clear(); + } + if (val) { + SWIG_PYTHON_THREAD_BEGIN_BLOCK; + PyErr_SetString(PyExc_TypeError,"a string is expected"); + SWIG_PYTHON_THREAD_END_BLOCK; + } + return 0; } - if (val) - error("a string is expected"); - return 0; -} +} } %fragment(SWIG_From_frag(std::basic_string),"header", fragment="SWIG_FromCharPtrAndSize") { -SWIGINTERNINLINE octave_value +SWIGINTERNINLINE PyObject* SWIG_From(std::basic_string)(const std::string& s) { return SWIG_FromCharPtrAndSize(s.data(), s.size()); diff --git a/Lib/octave/std_carray.i b/Lib/octave/std_carray.i index 9e2338a61..1477479da 100644 --- a/Lib/octave/std_carray.i +++ b/Lib/octave/std_carray.i @@ -17,7 +17,7 @@ namespace swig { %extend std::carray { %fragment(SWIG_Traits_frag(std::carray<_Type, _Size >), "header", - fragment="SwigPyIterator_T", + fragment="PySwigIterator_T", fragment=SWIG_Traits_frag(_Type), fragment="StdCarrayTraits") { namespace swig { @@ -36,7 +36,7 @@ namespace swig { %typemap(out,noblock=1) iterator, const_iterator { $result = SWIG_NewPointerObj(swig::make_output_iterator((const $type &)$1), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); + swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN); } inline size_t __len__() const { return self->size(); } @@ -46,7 +46,7 @@ namespace swig { inline void __setitem__(size_t i, const _Type& v) { (*self)[i] = v; } - swig::SwigPyIterator* __iter__(PyObject **PYTHON_SELF) { + swig::PySwigIterator* __iter__(PyObject **PYTHON_SELF) { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } } diff --git a/Lib/octave/std_map.i b/Lib/octave/std_map.i index 20003df58..a54e5f753 100644 --- a/Lib/octave/std_map.i +++ b/Lib/octave/std_map.i @@ -22,7 +22,7 @@ /* int res = SWIG_ERROR; if (PyDict_Check(obj)) { - SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); + PyObject_var items = PyObject_CallMethod(obj,(char *)"items",NULL); res = traits_asptr_stdseq, std::pair >::asptr(items, val); } else { map_type *p; @@ -58,8 +58,8 @@ } PyObject *obj = PyDict_New(); for (const_iterator i= map.begin(); i!= map.end(); ++i) { - swig::SwigVar_PyObject key = swig::from(i->first); - swig::SwigVar_PyObject val = swig::from(i->second); + swig::PyObject_var key = swig::from(i->first); + swig::PyObject_var val = swig::from(i->second); PyDict_SetItem(obj, key, val); } return obj; @@ -92,10 +92,10 @@ }; template - struct OctMapIterator_T : SwigPyIteratorClosed_T + struct OctMapIterator_T : PySwigIteratorClosed_T { OctMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, octave_value seq) - : SwigPyIteratorClosed_T(curr, first, last, seq) + : PySwigIteratorClosed_T(curr, first, last, seq) { } }; @@ -112,7 +112,7 @@ }; template - inline SwigPyIterator* + inline PySwigIterator* make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, octave_value seq = octave_value()) { return new OctMapKeyIterator_T(current, begin, end, seq); @@ -130,7 +130,7 @@ template - inline SwigPyIterator* + inline PySwigIterator* make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, octave_value seq = 0) { return new OctMapValueIterator_T(current, begin, end, seq); diff --git a/Lib/perl5/noembed.h b/Lib/perl5/noembed.h index 55c3752aa..a29de61f5 100644 --- a/Lib/perl5/noembed.h +++ b/Lib/perl5/noembed.h @@ -91,9 +91,3 @@ #ifdef open #undef open #endif -#ifdef readdir - #undef readdir -#endif -#ifdef bind - #undef bind -#endif diff --git a/Lib/perl5/perlrun.swg b/Lib/perl5/perlrun.swg index 6fb2968f0..54d098d9b 100644 --- a/Lib/perl5/perlrun.swg +++ b/Lib/perl5/perlrun.swg @@ -205,32 +205,13 @@ SWIG_Perl_TypeProxyName(const swig_type_info *type) { } } -/* Identical to SWIG_TypeCheck, except for strcmp comparison */ SWIGRUNTIME swig_cast_info * SWIG_TypeProxyCheck(const char *c, swig_type_info *ty) { - if (ty) { - swig_cast_info *iter = ty->cast; - while (iter) { - if ( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) || - (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0)) ) { - if (iter == ty->cast) - return iter; - /* Move iter to the top of the linked list */ - iter->prev->next = iter->next; - if (iter->next) - iter->next->prev = iter->prev; - iter->next = ty->cast; - iter->prev = 0; - if (ty->cast) ty->cast->prev = iter; - ty->cast = iter; - return iter; - } - iter = iter->next; - } - } - return 0; + SWIG_TypeCheck_Template(( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) + || (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0))), ty); } + /* Function for getting a pointer value */ SWIGRUNTIME int diff --git a/Lib/perl5/perlstrings.swg b/Lib/perl5/perlstrings.swg index 242a9c967..2083f0bba 100644 --- a/Lib/perl5/perlstrings.swg +++ b/Lib/perl5/perlstrings.swg @@ -6,11 +6,6 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc) { - if (SvMAGICAL(obj)) { - SV *tmp = sv_newmortal(); - SvSetSV(tmp, obj); - obj = tmp; - } if (SvPOK(obj)) { STRLEN len = 0; char *cstr = SvPV(obj, len); diff --git a/Lib/perl5/perltypemaps.swg b/Lib/perl5/perltypemaps.swg index a59f84689..c17e410b9 100644 --- a/Lib/perl5/perltypemaps.swg +++ b/Lib/perl5/perltypemaps.swg @@ -43,7 +43,6 @@ /* Perl types */ #define SWIG_Object SV * -#define VOID_Object sv_newmortal() /* Perl $shadow flag */ #define %newpointer_flags $shadow diff --git a/Lib/perl5/std_vector.i b/Lib/perl5/std_vector.i index 7c4f72919..b1f722d4b 100644 --- a/Lib/perl5/std_vector.i +++ b/Lib/perl5/std_vector.i @@ -105,9 +105,9 @@ namespace std { } } %typemap(out) vector { - size_t len = $1.size(); + int len = $1.size(); SV **svs = new SV*[len]; - for (size_t i=0; i // PHP initialization routine. +%include // Php4 initialization routine. %include // Global variables. %include @@ -73,13 +73,6 @@ $1 = ($1_ltype) Z_STRVAL_PP($input); } -%typemap(in) (char *STRING, int LENGTH) -{ - convert_to_string_ex($input); - $1 = ($1_ltype) Z_STRVAL_PP($input); - $2 = ($2_ltype) Z_STRLEN_PP($input); -} - /* Object passed by value. Convert to a pointer */ %typemap(in) SWIGTYPE ($&1_ltype tmp) { @@ -110,7 +103,6 @@ SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor"); } } - %typemap(argout) SWIGTYPE *, SWIGTYPE [], SWIGTYPE&; @@ -205,15 +197,15 @@ %typemap(out) SWIGTYPE *, SWIGTYPE [], SWIGTYPE & -%{ - SWIG_SetPointerZval(return_value, (void *)$1, $1_descriptor, $owner); -%} +{ + SWIG_SetPointerZval(return_value, (void *)$1, $1_descriptor, $owner); +} %typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC { - swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1); - SWIG_SetPointerZval(return_value, (void *)$1, ty, $owner); + swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **) &$1); + SWIG_SetPointerZval(return_value, (void *)$1, ty, $owner); } %typemap(out) SWIGTYPE @@ -225,7 +217,7 @@ #else { $&1_ltype resultobj = ($&1_ltype) emalloc(sizeof($1_type)); - memcpy(resultobj, &$1, sizeof($1_type)); + memmove(resultobj, &$1, sizeof($1_type)); SWIG_SetPointerZval(return_value, (void *)resultobj, $&1_descriptor, 1); } #endif @@ -234,9 +226,7 @@ %typemap(out) char [ANY] { - int len = 0; - while (len < $1_dim0 && $1[len]) ++len; - RETVAL_STRINGL($1, len, 1); + RETVAL_STRINGL($1,$1_dim0,1); } // This typecheck does hard checking for proper argument type. If you want @@ -267,24 +257,19 @@ %php_typecheck(double,SWIG_TYPECHECK_BOOL,IS_DOUBLE) %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE -{ - void *tmp; - _v = (SWIG_ConvertPtr(*$input, (void **)&tmp, $&1_descriptor, 0) >= 0); -} + " /* typecheck SWIGTYPE */ " %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE [], SWIGTYPE & { void *tmp; - _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, $1_descriptor, 0) >= 0); + _v = (SWIG_ConvertPtr( *$input, (void**)&tmp, $1_descriptor, 0) >= 0); } %typecheck(SWIG_TYPECHECK_VOIDPTR) void * -{ - void *tmp; - _v = (SWIG_ConvertPtr(*$input, (void**)&tmp, 0, 0) >= 0); -} + " /* typecheck void * */ " + /* Exception handling */ @@ -310,4 +295,4 @@ /* php keywords */ -%include +%include diff --git a/Lib/php/phpinit.swg b/Lib/php4/php4init.swg similarity index 100% rename from Lib/php/phpinit.swg rename to Lib/php4/php4init.swg diff --git a/Lib/php/phpkw.swg b/Lib/php4/php4kw.swg similarity index 99% rename from Lib/php/phpkw.swg rename to Lib/php4/php4kw.swg index 3d1a62511..a6b519445 100644 --- a/Lib/php/phpkw.swg +++ b/Lib/php4/php4kw.swg @@ -2,7 +2,7 @@ * See the LICENSE file for information on copyright, usage and redistribution * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * phpkw.swg + * php4kw.swg * * The 'keywords' in PHP are global, ie, the following names are fine * when used as class methods. @@ -67,7 +67,7 @@ PHPKW(include_once); PHPKW(isset); PHPKW(list); PHPKW(new); -// PHPKW(old_function); /* No longer reserved in PHP5 */ +PHPKW(old_function); /* No longer reserved in PHP5 */ PHPKW(or); PHPKW(print); PHPKW(require); diff --git a/Lib/php/phprun.swg b/Lib/php4/php4run.swg similarity index 96% rename from Lib/php/phprun.swg rename to Lib/php4/php4run.swg index 5196b95b4..d38452764 100644 --- a/Lib/php/phprun.swg +++ b/Lib/php4/php4run.swg @@ -2,9 +2,9 @@ * See the LICENSE file for information on copyright, usage and redistribution * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * phprun.swg + * php4run.swg * - * PHP runtime library + * PHP4 runtime library * ----------------------------------------------------------------------------- */ #ifdef __cplusplus @@ -70,8 +70,8 @@ static int default_error_code = E_ERROR; if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else /* Standard SWIG API */ -#define SWIG_GetModule(clientdata) SWIG_Php_GetModule() -#define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer) +#define SWIG_GetModule(clientdata) SWIG_Php4_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Php4_SetModule(pointer) /* used to wrap returned objects in so we know whether they are newobject and need freeing, or not */ @@ -199,7 +199,7 @@ SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC } static char const_name[] = "swig_runtime_data_type_pointer"; -static swig_module_info *SWIG_Php_GetModule() { +static swig_module_info *SWIG_Php4_GetModule() { zval *pointer; swig_module_info *ret = 0; @@ -216,7 +216,7 @@ static swig_module_info *SWIG_Php_GetModule() { return ret; } -static void SWIG_Php_SetModule(swig_module_info *pointer) { +static void SWIG_Php4_SetModule(swig_module_info *pointer) { TSRMLS_FETCH(); REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, 0); } diff --git a/Lib/php/phppointers.i b/Lib/php4/phppointers.i similarity index 100% rename from Lib/php/phppointers.i rename to Lib/php4/phppointers.i diff --git a/Lib/php/std_common.i b/Lib/php4/std_common.i similarity index 100% rename from Lib/php/std_common.i rename to Lib/php4/std_common.i diff --git a/Lib/php/std_deque.i b/Lib/php4/std_deque.i similarity index 100% rename from Lib/php/std_deque.i rename to Lib/php4/std_deque.i diff --git a/Lib/php/std_map.i b/Lib/php4/std_map.i similarity index 97% rename from Lib/php/std_map.i rename to Lib/php4/std_map.i index c6721806b..c35f21dc7 100644 --- a/Lib/php/std_map.i +++ b/Lib/php4/std_map.i @@ -30,7 +30,6 @@ namespace std { map(const map &); unsigned int size() const; - %rename(is_empty) empty; bool empty() const; void clear(); %extend { @@ -70,7 +69,6 @@ namespace std { map(const map &); unsigned int size() const; - %rename(is_empty) empty; bool empty() const; void clear(); %extend { @@ -107,7 +105,6 @@ namespace std { map(const map &); unsigned int size() const; - %rename(is_empty) empty; bool empty() const; void clear(); %extend { @@ -145,7 +142,6 @@ namespace std { map(const map &); unsigned int size() const; - %rename(is_empty) empty; bool empty() const; void clear(); %extend { diff --git a/Lib/php/std_pair.i b/Lib/php4/std_pair.i similarity index 100% rename from Lib/php/std_pair.i rename to Lib/php4/std_pair.i diff --git a/Lib/php/std_string.i b/Lib/php4/std_string.i similarity index 100% rename from Lib/php/std_string.i rename to Lib/php4/std_string.i diff --git a/Lib/php/std_vector.i b/Lib/php4/std_vector.i similarity index 98% rename from Lib/php/std_vector.i rename to Lib/php4/std_vector.i index b54181618..fe084aca4 100644 --- a/Lib/php/std_vector.i +++ b/Lib/php4/std_vector.i @@ -48,7 +48,6 @@ namespace std { public: vector(unsigned int size = 0); unsigned int size() const; - %rename(is_empty) empty; bool empty() const; void clear(); %rename(push) push_back; @@ -87,7 +86,6 @@ namespace std { public: vector(unsigned int size = 0); unsigned int size() const; - %rename(is_empty) empty; bool empty() const; void clear(); %rename(push) push_back; diff --git a/Lib/php/stl.i b/Lib/php4/stl.i similarity index 100% rename from Lib/php/stl.i rename to Lib/php4/stl.i diff --git a/Lib/php/typemaps.i b/Lib/php4/typemaps.i similarity index 62% rename from Lib/php/typemaps.i rename to Lib/php4/typemaps.i index 7af301d0d..c388fdf96 100644 --- a/Lib/php/typemaps.i +++ b/Lib/php4/typemaps.i @@ -4,7 +4,7 @@ * * typemaps.i. * - * SWIG Typemap library for PHP. + * SWIG Typemap library for PHP4. * * This library provides standard typemaps for modifying SWIG's behavior. * With enough entries in this file, I hope that very few people actually @@ -96,96 +96,16 @@ int_typemap(unsigned short); int_typemap(unsigned long); int_typemap(unsigned char); -int_typemap(long long); -%typemap(argout,fragment="t_output_helper") long long *OUTPUT -{ - zval *o; - MAKE_STD_ZVAL(o); - if ((long long)LONG_MIN <= temp$argnum && temp$argnum <= (long long)LONG_MAX) { - ZVAL_LONG(o, temp$argnum); - } else { - char temp[256]; - sprintf(temp, "%lld", temp$argnum); - ZVAL_STRING(o, temp, 1); - } - t_output_helper( &$result, o ); -} -%typemap(in) TYPE *REFERENCE (long long lvalue) -%{ - // FIXME won't work for values which don't fit in a long... - convert_to_long_ex($input); - lvalue = (long long) (*$input)->value.lval; - $1 = &lvalue; -%} -%typemap(argout) long long *REFERENCE -%{ - if ((long long)LONG_MIN <= lvalue$argnum && lvalue$argnum <= (long long)LONG_MAX) { - (*$arg)->value.lval = (long)(lvalue$argnum); - (*$arg)->type = IS_LONG; - } else { - char temp[256]; - sprintf(temp, "%lld", lvalue$argnum); - ZVAL_STRING((*$arg), temp, 1); - } -%} -int_typemap(unsigned long long); -%typemap(argout,fragment="t_output_helper") unsigned long long *OUTPUT -{ - zval *o; - MAKE_STD_ZVAL(o); - if (temp$argnum <= (unsigned long long)LONG_MAX) { - ZVAL_LONG(o, temp$argnum); - } else { - char temp[256]; - sprintf(temp, "%llu", temp$argnum); - ZVAL_STRING(o, temp, 1); - } - t_output_helper( &$result, o ); -} -%typemap(in) TYPE *REFERENCE (unsigned long long lvalue) -%{ - // FIXME won't work for values which don't fit in a long... - convert_to_long_ex($input); - lvalue = (unsigned long long) (*$input)->value.lval; - $1 = &lvalue; -%} -%typemap(argout) unsigned long long *REFERENCE -%{ - if (lvalue$argnum <= (unsigned long long)LONG_MAX) { - (*$arg)->value.lval = (long)(lvalue$argnum); - (*$arg)->type = IS_LONG; - } else { - char temp[256]; - sprintf(temp, "%llu", lvalue$argnum); - ZVAL_STRING((*$arg), temp, 1); - } -%} - %typemap(in) float *INOUT = float *INPUT; %typemap(in) double *INOUT = double *INPUT; %typemap(in) int *INOUT = int *INPUT; %typemap(in) short *INOUT = short *INPUT; %typemap(in) long *INOUT = long *INPUT; -%typemap(in) long long *INOUT = long long *INPUT; %typemap(in) unsigned *INOUT = unsigned *INPUT; %typemap(in) unsigned short *INOUT = unsigned short *INPUT; %typemap(in) unsigned long *INOUT = unsigned long *INPUT; %typemap(in) unsigned char *INOUT = unsigned char *INPUT; -%typemap(in) unsigned long long *INOUT = unsigned long long *INPUT; - -%typemap(in) float &INOUT = float *INPUT; -%typemap(in) double &INOUT = double *INPUT; - -%typemap(in) int &INOUT = int *INPUT; -%typemap(in) short &INOUT = short *INPUT; -%typemap(in) long &INOUT = long *INPUT; -%typemap(in) long long &INOUT = long long *INPUT; -%typemap(in) unsigned &INOUT = unsigned *INPUT; -%typemap(in) unsigned short &INOUT = unsigned short *INPUT; -%typemap(in) unsigned long &INOUT = unsigned long *INPUT; -%typemap(in) unsigned char &INOUT = unsigned char *INPUT; -%typemap(in) unsigned long long &INOUT = unsigned long long *INPUT; %typemap(argout) float *INOUT = float *OUTPUT; %typemap(argout) double *INOUT= double *OUTPUT; @@ -193,23 +113,9 @@ int_typemap(unsigned long long); %typemap(argout) int *INOUT = int *OUTPUT; %typemap(argout) short *INOUT = short *OUTPUT; %typemap(argout) long *INOUT= long *OUTPUT; -%typemap(argout) long long *INOUT= long long *OUTPUT; %typemap(argout) unsigned short *INOUT= unsigned short *OUTPUT; %typemap(argout) unsigned long *INOUT = unsigned long *OUTPUT; %typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT; -%typemap(argout) unsigned long long *INOUT = unsigned long long *OUTPUT; - -%typemap(argout) float &INOUT = float *OUTPUT; -%typemap(argout) double &INOUT= double *OUTPUT; - -%typemap(argout) int &INOUT = int *OUTPUT; -%typemap(argout) short &INOUT = short *OUTPUT; -%typemap(argout) long &INOUT= long *OUTPUT; -%typemap(argout) long long &INOUT= long long *OUTPUT; -%typemap(argout) unsigned short &INOUT= unsigned short *OUTPUT; -%typemap(argout) unsigned long &INOUT = unsigned long *OUTPUT; -%typemap(argout) unsigned char &INOUT = unsigned char *OUTPUT; -%typemap(argout) unsigned long long &INOUT = unsigned long long *OUTPUT; %typemap(in) char INPUT[ANY] ( char temp[$1_dim0] ) %{ diff --git a/Lib/php/utils.i b/Lib/php4/utils.i similarity index 86% rename from Lib/php/utils.i rename to Lib/php4/utils.i index facf54196..f7241187c 100644 --- a/Lib/php/utils.i +++ b/Lib/php4/utils.i @@ -24,23 +24,19 @@ %enddef %define CONVERT_STRING_IN(lvar,t,invar) - if ((*invar)->type==IS_NULL) { - lvar = (t) 0; - } else { - convert_to_string_ex(invar); - lvar = (t) Z_STRVAL_PP(invar); - } + convert_to_string_ex(invar); + lvar = (t) Z_STRVAL_PP(invar); %enddef %define %pass_by_val( TYPE, CONVERT_IN ) -%typemap(in) TYPE, const TYPE & +%typemap(in) TYPE %{ CONVERT_IN($1,$1_ltype,$input); %} %enddef %fragment("t_output_helper","header") %{ -static void +void t_output_helper( zval **target, zval *o) { if ( (*target)->type == IS_ARRAY ) { /* it's already an array, just append */ diff --git a/Lib/python/boost_shared_ptr.i b/Lib/python/boost_shared_ptr.i index b4c0b5b83..2e34290ac 100644 --- a/Lib/python/boost_shared_ptr.i +++ b/Lib/python/boost_shared_ptr.i @@ -1,11 +1,5 @@ %include -// Set SHARED_PTR_DISOWN to $disown if required, for example -// #define SHARED_PTR_DISOWN $disown -#if !defined(SHARED_PTR_DISOWN) -#define SHARED_PTR_DISOWN 0 -#endif - %define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %naturalvar TYPE; @@ -57,10 +51,10 @@ } // plain pointer -// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance +// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance %typemap(in) CONST TYPE * (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) { int newmem = 0; - res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); if (!SWIG_IsOK(res)) { %argument_fail(res, "$type", $symname, $argnum); } @@ -145,10 +139,10 @@ } // plain pointer by reference -// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance +// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance %typemap(in) CONST TYPE *& (void *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { int newmem = 0; - res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); if (!SWIG_IsOK(res)) { %argument_fail(res, "$type", $symname, $argnum); } diff --git a/Lib/python/director.swg b/Lib/python/director.swg index 836d107ce..176ee3336 100644 --- a/Lib/python/director.swg +++ b/Lib/python/director.swg @@ -107,7 +107,7 @@ namespace Swig { /* memory handler */ struct GCItem { - virtual ~GCItem() {} + virtual ~GCItem() = 0; virtual int get_own() const { @@ -115,6 +115,10 @@ namespace Swig { } }; + GCItem::~GCItem() + { + } + struct GCItem_var { GCItem_var(GCItem *item = 0) : _item(item) @@ -208,7 +212,10 @@ namespace Swig { swig_msg += msg; } if (!PyErr_Occurred()) { + swig_msg.insert(0, ": "); PyErr_SetString(error, getMessage()); + } else { + SWIG_Python_AddErrorMsg(getMessage()); } SWIG_PYTHON_THREAD_END_BLOCK; } diff --git a/Lib/python/file.i b/Lib/python/file.i index 294ab9178..c0e7d5ea9 100644 --- a/Lib/python/file.i +++ b/Lib/python/file.i @@ -20,13 +20,11 @@ SWIG_AsValFilePtr(PyObject *obj, FILE **val) { if ((SWIG_ConvertPtr(obj, &vptr, desc, 0)) == SWIG_OK) { if (val) *val = (FILE *)vptr; return SWIG_OK; - } -%#if PY_VERSION_HEX < 0x03000000 + } if (PyFile_Check(obj)) { if (val) *val = PyFile_AsFile(obj); return SWIG_OK; } -%#endif return SWIG_TypeError; } } diff --git a/Lib/python/pyabc.i b/Lib/python/pyabc.i deleted file mode 100644 index 3da06b5a9..000000000 --- a/Lib/python/pyabc.i +++ /dev/null @@ -1,10 +0,0 @@ -%define %pythonabc(Type, Abc) - %feature("python:abc", #Abc) Type; -%enddef -%pythoncode {import collections}; -%pythonabc(std::vector, collections.MutableSequence); -%pythonabc(std::list, collections.MutableSequence); -%pythonabc(std::map, collections.MutableMapping); -%pythonabc(std::multimap, collections.MutableMapping); -%pythonabc(std::set, collections.MutableSet); -%pythonabc(std::multiset, collections.MutableSet); diff --git a/Lib/python/pyapi.swg b/Lib/python/pyapi.swg index d980f9263..1d5148dbf 100644 --- a/Lib/python/pyapi.swg +++ b/Lib/python/pyapi.swg @@ -27,20 +27,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - -/* ----------------------------------------------------------------------------- - * Wrapper of PyInstanceMethod_New() used in Python 3 - * It is exported to the generated module, used for -fastproxy - * ----------------------------------------------------------------------------- */ -SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func) -{ -#if PY_VERSION_HEX >= 0x03000000 - return PyInstanceMethod_New(func); -#else - return NULL; -#endif -} - #ifdef __cplusplus #if 0 { /* cc-mode */ diff --git a/Lib/python/pybuffer.i b/Lib/python/pybuffer.i deleted file mode 100644 index 121cd709f..000000000 --- a/Lib/python/pybuffer.i +++ /dev/null @@ -1,107 +0,0 @@ -/* Implementing buffer protocol typemaps */ - -/* %pybuffer_mutable_binary(TYPEMAP, SIZE) - * - * Macro for functions accept mutable buffer pointer with a size. - * This can be used for both input and output. For example: - * - * %pybuffer_mutable_binary(char *buff, int size); - * void foo(char *buff, int size) { - * for(int i=0; i; + std::vector; or as a member variable: struct A { - SwigPtr_PyObject obj; + PyObject_ptr obj; A(PyObject *o) : _obj(o) { } }; or as a input/output value - SwigPtr_PyObject func(SwigPtr_PyObject obj) { - SwigPtr_PyObject out = PyString_FromFormat("hello %s", PyObject_AsString(obj)); + PyObject_ptr func(PyObject_ptr obj) { + PyObject_ptr out = PyString_FromFormat("hello %s", PyObject_AsString(obj)); Py_DECREF(out); return out; } just remember to pair the object creation with the proper DECREF, - the same as with plain PyObject *ptr, since SwigPtr_PyObject always add + the same as with plain PyObject *ptr, since PyObject_ptr always add one reference at construction. - SwigPtr_PyObject is 'visible' at the wrapped side, so you can do: + PyObject_ptr is 'visible' at the wrapped side, so you can do: - %template(pyvector) std::vector; + %template(pyvector) std::vector; and all the proper typemaps will be used. */ namespace swig { - %ignore SwigPtr_PyObject; - struct SwigPtr_PyObject {}; - %apply PyObject * {SwigPtr_PyObject}; - %apply PyObject * const& {SwigPtr_PyObject const&}; + %ignore PyObject_ptr; + struct PyObject_ptr {}; + %apply PyObject * {PyObject_ptr}; + %apply PyObject * const& {PyObject_ptr const&}; /* For output */ - %typemap(out,noblock=1) SwigPtr_PyObject { + %typemap(out,noblock=1) PyObject_ptr { $result = (PyObject *)$1; Py_INCREF($result); } - %typemap(out,noblock=1) SwigPtr_PyObject const & { + %typemap(out,noblock=1) PyObject_ptr const & { $result = (PyObject *)*$1; Py_INCREF($result); } @@ -58,28 +58,28 @@ namespace swig { %{ namespace swig { - class SwigPtr_PyObject { + class PyObject_ptr { protected: PyObject *_obj; public: - SwigPtr_PyObject() :_obj(0) + PyObject_ptr() :_obj(0) { } - SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj) + PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj) { Py_XINCREF(_obj); } - SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj) + PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj) { if (initial_ref) { Py_XINCREF(_obj); } } - SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) + PyObject_ptr & operator=(const PyObject_ptr& item) { Py_XINCREF(item._obj); Py_XDECREF(_obj); @@ -87,7 +87,7 @@ namespace swig { return *this; } - ~SwigPtr_PyObject() + ~PyObject_ptr() { Py_XDECREF(_obj); } @@ -106,33 +106,33 @@ namespace swig { %} /* - SwigVar_PyObject is used to manage 'in the scope' PyObject * variables, + PyObject_var is used to manage 'in the scope' PyObject * variables, as in int func () { - SwigVar_PyObject obj = PyString_FromString("hello"); + PyObject_var obj = PyString_FromString("hello"); } ie, 'obj' is created and destructed in the same scope from a python object that carries at least one reference value. - SwigVar_PyObject just take care of applying the proper Py_DECREF. + PyObject_var just take care of applying the proper Py_DECREF. Hence, this class is purely internal and not visible at the wrapped side. */ namespace swig { - %ignore SwigVar_PyObject; - struct SwigVar_PyObject {}; - %apply PyObject * {SwigVar_PyObject}; - %apply PyObject * const& {SwigVar_PyObject const&}; + %ignore PyObject_var; + struct PyObject_var {}; + %apply PyObject * {PyObject_var}; + %apply PyObject * const& {PyObject_var const&}; } %{ namespace swig { - struct SwigVar_PyObject : SwigPtr_PyObject { - SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { } + struct PyObject_var : PyObject_ptr { + PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { } - SwigVar_PyObject & operator = (PyObject* obj) + PyObject_var & operator = (PyObject* obj) { Py_XDECREF(_obj); _obj = obj; diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index 6fd1d56f9..ed0eb7f0b 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -36,15 +36,15 @@ %include -%fragment(SWIG_Traits_frag(swig::SwigPtr_PyObject),"header",fragment="StdTraits") { +%fragment(SWIG_Traits_frag(swig::PyObject_ptr),"header",fragment="StdTraits") { namespace swig { - template <> struct traits { + template <> struct traits { typedef value_category category; - static const char* type_name() { return "SwigPtr_PyObject"; } + static const char* type_name() { return "PyObject_ptr"; } }; - template <> struct traits_from { - typedef SwigPtr_PyObject value_type; + template <> struct traits_from { + typedef PyObject_ptr value_type; static PyObject *from(const value_type& val) { PyObject *obj = static_cast(val); Py_XINCREF(obj); @@ -53,14 +53,14 @@ namespace swig { }; template <> - struct traits_check { - static bool check(SwigPtr_PyObject) { + struct traits_check { + static bool check(PyObject_ptr) { return true; } }; - template <> struct traits_asval { - typedef SwigPtr_PyObject value_type; + template <> struct traits_asval { + typedef PyObject_ptr value_type; static int asval(PyObject *obj, value_type *val) { if (val) *val = obj; return SWIG_OK; @@ -69,15 +69,15 @@ namespace swig { } } -%fragment(SWIG_Traits_frag(swig::SwigVar_PyObject),"header",fragment="StdTraits") { +%fragment(SWIG_Traits_frag(swig::PyObject_var),"header",fragment="StdTraits") { namespace swig { - template <> struct traits { + template <> struct traits { typedef value_category category; - static const char* type_name() { return "SwigVar_PyObject"; } + static const char* type_name() { return "PyObject_var"; } }; - template <> struct traits_from { - typedef SwigVar_PyObject value_type; + template <> struct traits_from { + typedef PyObject_var value_type; static PyObject *from(const value_type& val) { PyObject *obj = static_cast(val); Py_XINCREF(obj); @@ -86,14 +86,14 @@ namespace swig { }; template <> - struct traits_check { - static bool check(SwigVar_PyObject) { + struct traits_check { + static bool check(PyObject_var) { return true; } }; - template <> struct traits_asval { - typedef SwigVar_PyObject value_type; + template <> struct traits_asval { + typedef PyObject_var value_type; static int asval(PyObject *obj, value_type *val) { if (val) *val = obj; return SWIG_OK; @@ -102,7 +102,7 @@ namespace swig { } } -%fragment("SwigPySequence_Base","header") +%fragment("PySequence_Base","header") { %#include @@ -115,38 +115,27 @@ namespace std { { bool res; SWIG_PYTHON_THREAD_BEGIN_BLOCK; - res = PyObject_RichCompareBool(v, w, Py_LT) ? true : false; - /* This may fall into a case of inconsistent - eg. ObjA > ObjX > ObjB - but ObjA < ObjB - */ - if( PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_TypeError) ) - { - /* Objects can't be compared, this mostly occured in Python 3.0 */ - /* Compare their ptr directly for a workaround */ - res = (v < w); - PyErr_Clear(); - } + res = PyObject_Compare(v, w) < 0; SWIG_PYTHON_THREAD_END_BLOCK; return res; } }; template <> - struct less : public binary_function + struct less : public binary_function { bool - operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const + operator()(const swig::PyObject_ptr& v, const swig::PyObject_ptr& w) const { return std::less()(v, w); } }; template <> - struct less : public binary_function + struct less : public binary_function { bool - operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const + operator()(const swig::PyObject_var& v, const swig::PyObject_var& w) const { return std::less()(v, w); } @@ -288,24 +277,24 @@ namespace swig { } } -%fragment("SwigPySequence_Cont","header", +%fragment("PySequence_Cont","header", fragment="StdTraits", - fragment="SwigPySequence_Base", - fragment="SwigPyIterator_T") + fragment="PySequence_Base", + fragment="PySwigIterator_T") { namespace swig { template - struct SwigPySequence_Ref + struct PySequence_Ref { - SwigPySequence_Ref(PyObject* seq, int index) + PySequence_Ref(PyObject* seq, int index) : _seq(seq), _index(index) { } operator T () const { - swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index); + swig::PyObject_var item = PySequence_GetItem(_seq, _index); try { return swig::as(item, true); } catch (std::exception& e) { @@ -320,7 +309,7 @@ namespace swig } } - SwigPySequence_Ref& operator=(const T& v) + PySequence_Ref& operator=(const T& v) { PySequence_SetItem(_seq, _index, swig::from(v)); return *this; @@ -332,18 +321,18 @@ namespace swig }; template - struct SwigPySequence_ArrowProxy + struct PySequence_ArrowProxy { - SwigPySequence_ArrowProxy(const T& x): m_value(x) {} + PySequence_ArrowProxy(const T& x): m_value(x) {} const T* operator->() const { return &m_value; } operator const T*() const { return &m_value; } T m_value; }; template - struct SwigPySequence_InputIterator + struct PySequence_InputIterator { - typedef SwigPySequence_InputIterator self; + typedef PySequence_InputIterator self; typedef std::random_access_iterator_tag iterator_category; typedef Reference reference; @@ -351,11 +340,11 @@ namespace swig typedef T* pointer; typedef int difference_type; - SwigPySequence_InputIterator() + PySequence_InputIterator() { } - SwigPySequence_InputIterator(PyObject* seq, int index) + PySequence_InputIterator(PyObject* seq, int index) : _seq(seq), _index(index) { } @@ -365,9 +354,9 @@ namespace swig return reference(_seq, _index); } - SwigPySequence_ArrowProxy + PySequence_ArrowProxy operator->() const { - return SwigPySequence_ArrowProxy(operator*()); + return PySequence_ArrowProxy(operator*()); } bool operator==(const self& ri) const @@ -436,19 +425,19 @@ namespace swig }; template - struct SwigPySequence_Cont + struct PySequence_Cont { - typedef SwigPySequence_Ref reference; - typedef const SwigPySequence_Ref const_reference; + typedef PySequence_Ref reference; + typedef const PySequence_Ref const_reference; typedef T value_type; typedef T* pointer; typedef int difference_type; typedef int size_type; typedef const pointer const_pointer; - typedef SwigPySequence_InputIterator iterator; - typedef SwigPySequence_InputIterator const_iterator; + typedef PySequence_InputIterator iterator; + typedef PySequence_InputIterator const_iterator; - SwigPySequence_Cont(PyObject* seq) : _seq(0) + PySequence_Cont(PyObject* seq) : _seq(0) { if (!PySequence_Check(seq)) { throw std::invalid_argument("a sequence is expected"); @@ -457,7 +446,7 @@ namespace swig Py_INCREF(_seq); } - ~SwigPySequence_Cont() + ~PySequence_Cont() { Py_XDECREF(_seq); } @@ -506,7 +495,7 @@ namespace swig { int s = size(); for (int i = 0; i < s; ++i) { - swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i); + swig::PyObject_var item = PySequence_GetItem(_seq, i); if (!swig::check(item)) { if (set_err) { char msg[1024]; @@ -533,40 +522,40 @@ namespace swig class const_iterator; class const_reverse_iterator; - %typemap(out,noblock=1,fragment="SwigPySequence_Cont") + %typemap(out,noblock=1,fragment="PySequence_Cont") iterator, reverse_iterator, const_iterator, const_reverse_iterator { $result = SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &)), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); + swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN); } - %typemap(out,noblock=1,fragment="SwigPySequence_Cont") + %typemap(out,noblock=1,fragment="PySequence_Cont") std::pair, std::pair { $result = PyTuple_New(2); PyTuple_SetItem($result,0,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN)); + swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN)); PyTuple_SetItem($result,1,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).second), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN)); + swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN)); } - %fragment("SwigPyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="SwigPySequence_Cont") {} + %fragment("PyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="PySequence_Cont") {} - %typemap(out,noblock=1,fragment="SwigPyPairBoolOutputIterator") + %typemap(out,noblock=1,fragment="PyPairBoolOutputIterator") std::pair, std::pair { $result = PyTuple_New(2); PyTuple_SetItem($result,0,SWIG_NewPointerObj(swig::make_output_iterator(%static_cast($1,const $type &).first), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN)); + swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN)); PyTuple_SetItem($result,1,SWIG_From(bool)(%static_cast($1,const $type &).second)); } - %typemap(in,noblock=1,fragment="SwigPySequence_Cont") - iterator(swig::SwigPyIterator *iter = 0, int res), - reverse_iterator(swig::SwigPyIterator *iter = 0, int res), - const_iterator(swig::SwigPyIterator *iter = 0, int res), - const_reverse_iterator(swig::SwigPyIterator *iter = 0, int res) { - res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0); + %typemap(in,noblock=1,fragment="PySequence_Cont") + iterator(swig::PySwigIterator *iter = 0, int res), + reverse_iterator(swig::PySwigIterator *iter = 0, int res), + const_iterator(swig::PySwigIterator *iter = 0, int res), + const_reverse_iterator(swig::PySwigIterator *iter = 0, int res) { + res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0); if (!SWIG_IsOK(res) || !iter) { %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); } else { - swig::SwigPyIterator_T<$type > *iter_t = dynamic_cast *>(iter); + swig::PySwigIterator_T<$type > *iter_t = dynamic_cast *>(iter); if (iter_t) { $1 = iter_t->get_current(); } else { @@ -575,18 +564,18 @@ namespace swig } } - %typecheck(%checkcode(ITERATOR),noblock=1,fragment="SwigPySequence_Cont") + %typecheck(%checkcode(ITERATOR),noblock=1,fragment="PySequence_Cont") iterator, reverse_iterator, const_iterator, const_reverse_iterator { - swig::SwigPyIterator *iter = 0; - int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0); - $1 = (SWIG_IsOK(res) && iter && (dynamic_cast *>(iter) != 0)); + swig::PySwigIterator *iter = 0; + int res = SWIG_ConvertPtr($input, %as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0); + $1 = (SWIG_IsOK(res) && iter && (dynamic_cast *>(iter) != 0)); } - %fragment("SwigPySequence_Cont"); + %fragment("PySequence_Cont"); %newobject iterator(PyObject **PYTHON_SELF); %extend { - swig::SwigPyIterator* iterator(PyObject **PYTHON_SELF) { + swig::PySwigIterator* iterator(PyObject **PYTHON_SELF) { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } @@ -608,11 +597,6 @@ namespace swig return !(self->empty()); } - /* Alias for Python 3 compatibility */ - bool __bool__() const { - return !(self->empty()); - } - size_type __len__() const { return self->size(); } @@ -623,7 +607,7 @@ namespace swig %swig_sequence_iterator(%arg(Sequence)) %swig_container_methods(%arg(Sequence)) - %fragment("SwigPySequence_Base"); + %fragment("PySequence_Base"); %extend { value_type pop() throw (std::out_of_range) { @@ -634,14 +618,6 @@ namespace swig return x; } - /* typemap for slice object support */ - %typemap(in) PySliceObject* { - $1 = (PySliceObject *) $input; - } - %typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) PySliceObject* { - $1 = PySlice_Check($input); - } - Sequence* __getslice__(difference_type i, difference_type j) throw (std::out_of_range) { return swig::getslice(self, i, j); } @@ -658,43 +634,6 @@ namespace swig void __delitem__(difference_type i) throw (std::out_of_range) { self->erase(swig::getpos(self,i)); } - - - /* Overloaded methods for Python 3 compatibility - * (Also useful in Python 2.x) - */ - Sequence* __getitem__(PySliceObject *slice) throw (std::out_of_range) { - Py_ssize_t i, j, step; - if( !PySlice_Check(slice) ) { - SWIG_Error(SWIG_TypeError, "Slice object expected."); - return NULL; - } - PySlice_GetIndices(slice, self->size(), &i, &j, &step); - return swig::getslice(self, i, j); - } - - void __setitem__(PySliceObject *slice, const Sequence& v) - throw (std::out_of_range, std::invalid_argument) { - Py_ssize_t i, j, step; - if( !PySlice_Check(slice) ) { - SWIG_Error(SWIG_TypeError, "Slice object expected."); - return; - } - PySlice_GetIndices(slice, self->size(), &i, &j, &step); - swig::setslice(self, i, j, v); - } - - void __delitem__(PySliceObject *slice) - throw (std::out_of_range) { - Py_ssize_t i, j, step; - if( !PySlice_Check(slice) ) { - SWIG_Error(SWIG_TypeError, "Slice object expected."); - return; - } - PySlice_GetIndices(slice, self->size(), &i, &j, &step); - swig::delslice(self, i,j); - } - } %enddef @@ -740,16 +679,16 @@ namespace swig %fragment("StdSequenceTraits","header", fragment="StdTraits", - fragment="SwigPySequence_Cont") + fragment="PySequence_Cont") { namespace swig { - template + template inline void - assign(const SwigPySeq& swigpyseq, Seq* seq) { - // seq->assign(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented - typedef typename SwigPySeq::value_type value_type; - typename SwigPySeq::const_iterator it = swigpyseq.begin(); - for (;it != swigpyseq.end(); ++it) { + assign(const PySeq& pyseq, Seq* seq) { + // seq->assign(pyseq.begin(), pyseq.end()); // not used as not always implemented + typedef typename PySeq::value_type value_type; + typename PySeq::const_iterator it = pyseq.begin(); + for (;it != pyseq.end(); ++it) { seq->insert(seq->end(),(value_type)(*it)); } } @@ -769,14 +708,14 @@ namespace swig { } } else if (PySequence_Check(obj)) { try { - SwigPySequence_Cont swigpyseq(obj); + PySequence_Cont pyseq(obj); if (seq) { sequence *pseq = new sequence(); - assign(swigpyseq, pseq); + assign(pyseq, pseq); *seq = pseq; return SWIG_NEWOBJ; } else { - return swigpyseq.check() ? SWIG_OK : SWIG_ERROR; + return pyseq.check() ? SWIG_OK : SWIG_ERROR; } } catch (std::exception& e) { if (seq) { diff --git a/Lib/python/pyerrors.swg b/Lib/python/pyerrors.swg index fe7313554..e287e2fc8 100644 --- a/Lib/python/pyerrors.swg +++ b/Lib/python/pyerrors.swg @@ -55,16 +55,15 @@ SWIG_Python_AddErrorMsg(const char* mesg) if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback); if (value) { - char *tmp; PyObject *old_str = PyObject_Str(value); PyErr_Clear(); Py_XINCREF(type); - - PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg); - SWIG_Python_str_DelForPy3(tmp); + PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); Py_DECREF(old_str); Py_DECREF(value); } else { PyErr_SetString(PyExc_RuntimeError, mesg); } } + + diff --git a/Lib/python/pyhead.swg b/Lib/python/pyhead.swg index 732d4689e..7839511bc 100644 --- a/Lib/python/pyhead.swg +++ b/Lib/python/pyhead.swg @@ -1,64 +1,3 @@ -/* Compatibility marcos for Python 3 */ -#if PY_VERSION_HEX >= 0x03000000 - -#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type) -#define PyInt_Check(x) PyLong_Check(x) -#define PyInt_AsLong(x) PyLong_AsLong(x) -#define PyInt_FromLong(x) PyLong_FromLong(x) -#define PyString_Format(fmt, args) PyUnicode_Format(fmt, args) - -#endif - -#ifndef Py_TYPE -# define Py_TYPE(op) ((op)->ob_type) -#endif - -/* SWIG APIs for compatibility of both Python 2 & 3 */ - -#if PY_VERSION_HEX >= 0x03000000 -# define SWIG_Python_str_FromFormat PyUnicode_FromFormat -#else -# define SWIG_Python_str_FromFormat PyString_FromFormat -#endif - - -/* Warning: This function will allocate a new string in Python 3, - * so please call SWIG_Python_str_DelForPy3(x) to free the space. - */ -SWIGINTERN char* -SWIG_Python_str_AsChar(PyObject *str) -{ -#if PY_VERSION_HEX >= 0x03000000 - char *cstr; - char *newstr; - int len; - str = PyUnicode_AsUTF8String(str); - PyBytes_AsStringAndSize(str, &cstr, &len); - newstr = (char *) malloc(len+1); - memcpy(newstr, cstr, len+1); - Py_XDECREF(str); - return newstr; -#else - return PyString_AsString(str); -#endif -} - -#if PY_VERSION_HEX >= 0x03000000 -# define SWIG_Python_str_DelForPy3(x) free( (void*) (x) ) -#else -# define SWIG_Python_str_DelForPy3(x) -#endif - - -SWIGINTERN PyObject* -SWIG_Python_str_FromChar(const char *c) -{ -#if PY_VERSION_HEX >= 0x03000000 - return PyUnicode_FromString(c); -#else - return PyString_FromString(c); -#endif -} /* Add PyOS_snprintf for old Pythons */ #if PY_VERSION_HEX < 0x02020000 @@ -105,7 +44,6 @@ PyString_FromFormat(const char *fmt, ...) { # define PyObject_GenericGetAttr 0 # endif #endif - /* Py_NotImplemented is defined in 2.1 and up. */ #if PY_VERSION_HEX < 0x02010000 # ifndef Py_NotImplemented @@ -113,6 +51,7 @@ PyString_FromFormat(const char *fmt, ...) { # endif #endif + /* A crude PyString_AsStringAndSize implementation for old Pythons */ #if PY_VERSION_HEX < 0x02010000 # ifndef PyString_AsStringAndSize @@ -127,6 +66,7 @@ PyString_FromFormat(const char *fmt, ...) { # endif #endif + /* PyBool_FromLong for old Pythons */ #if PY_VERSION_HEX < 0x02030000 static diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg index 286e7fb68..e6109b7bd 100644 --- a/Lib/python/pyinit.swg +++ b/Lib/python/pyinit.swg @@ -33,58 +33,26 @@ typedef struct swig_varlinkobject { SWIGINTERN PyObject * swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) { -#if PY_VERSION_HEX >= 0x03000000 - return PyUnicode_InternFromString(""); -#else return PyString_FromString(""); -#endif } SWIGINTERN PyObject * swig_varlink_str(swig_varlinkobject *v) { -#if PY_VERSION_HEX >= 0x03000000 - PyObject *str = PyUnicode_InternFromString("("); - PyObject *tail; - PyObject *joined; - swig_globalvar *var; - for (var = v->vars; var; var=var->next) { - tail = PyUnicode_FromString(var->name); - joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); - str = joined; - if (var->next) { - tail = PyUnicode_InternFromString(", "); - joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); - str = joined; - } - } - tail = PyUnicode_InternFromString(")"); - joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); - str = joined; -#else PyObject *str = PyString_FromString("("); - swig_globalvar *var; + swig_globalvar *var; for (var = v->vars; var; var=var->next) { PyString_ConcatAndDel(&str,PyString_FromString(var->name)); if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", ")); } PyString_ConcatAndDel(&str,PyString_FromString(")")); -#endif return str; } SWIGINTERN int swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { - char *tmp; PyObject *str = swig_varlink_str(v); fprintf(fp,"Swig global variables "); - fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str)); - SWIG_Python_str_DelForPy3(tmp); + fprintf(fp,"%s\n", PyString_AsString(str)); Py_DECREF(str); return 0; } @@ -142,13 +110,8 @@ swig_varlink_type(void) { if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ -#if PY_VERSION_HEX >= 0x03000000 - PyVarObject_HEAD_INIT(&PyType_Type, 0) -#else PyObject_HEAD_INIT(NULL) 0, /* Number of items in variable part (ob_size) */ -#endif (char *)"swigvarlink", /* Type name (tp_name) */ sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */ 0, /* Itemsize (tp_itemsize) */ @@ -184,10 +147,7 @@ swig_varlink_type(void) { #endif }; varlink_type = tmp; - /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */ -#if PY_VERSION_HEX < 0x03000000 varlink_type.ob_type = &PyType_Type; -#endif type_init = 1; } return &varlink_type; @@ -312,37 +272,13 @@ SWIG_Python_FixMethods(PyMethodDef *methods, #ifdef __cplusplus extern "C" #endif - -SWIGEXPORT -#if PY_VERSION_HEX >= 0x03000000 - PyObject* -#else - void -#endif -SWIG_init(void) { - PyObject *m, *d; -#if PY_VERSION_HEX >= 0x03000000 - static struct PyModuleDef SWIG_module = { - PyModuleDef_HEAD_INIT, - (char *) SWIG_name, - NULL, - -1, - SwigMethods, - NULL, - NULL, - NULL, - NULL - }; -#endif - +SWIGEXPORT void SWIG_init(void) { + PyObject *m, *d; + /* Fix SwigMethods to carry the callback ptrs when needed */ SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial); - -#if PY_VERSION_HEX >= 0x03000000 - m = PyModule_Create(&SWIG_module); -#else + m = Py_InitModule((char *) SWIG_name, SwigMethods); -#endif d = PyModule_GetDict(m); SWIG_InitializeModule(0); diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg index 9cd795d7c..38f1791a9 100644 --- a/Lib/python/pyiterators.swg +++ b/Lib/python/pyiterators.swg @@ -6,56 +6,56 @@ * * Implement a python 'output' iterator for Python 2.2 or higher. * - * Users can derive form the SwigPyIterator to implement their + * Users can derive form the PySwigIterator to implement their * own iterators. As an example (real one since we use it for STL/STD - * containers), the template SwigPyIterator_T does the + * containers), the template PySwigIterator_T does the * implementation for genereic C++ iterators. * ----------------------------------------------------------------------------- */ %include -%fragment("SwigPyIterator","header") { +%fragment("PySwigIterator","header") { namespace swig { struct stop_iteration { }; - struct SwigPyIterator { + struct PySwigIterator { private: - SwigPtr_PyObject _seq; + PyObject_ptr _seq; protected: - SwigPyIterator(PyObject *seq) : _seq(seq) + PySwigIterator(PyObject *seq) : _seq(seq) { } public: - virtual ~SwigPyIterator() {} + virtual ~PySwigIterator() {} // Access iterator method, required by Python virtual PyObject *value() const = 0; // Forward iterator method, required by Python - virtual SwigPyIterator *incr(size_t n = 1) = 0; + virtual PySwigIterator *incr(size_t n = 1) = 0; // Backward iterator method, very common in C++, but not required in Python - virtual SwigPyIterator *decr(size_t /*n*/ = 1) + virtual PySwigIterator *decr(size_t /*n*/ = 1) { throw stop_iteration(); } // Random access iterator methods, but not required in Python - virtual ptrdiff_t distance(const SwigPyIterator &/*x*/) const + virtual ptrdiff_t distance(const PySwigIterator &/*x*/) const { throw std::invalid_argument("operation not supported"); } - virtual bool equal (const SwigPyIterator &/*x*/) const + virtual bool equal (const PySwigIterator &/*x*/) const { throw std::invalid_argument("operation not supported"); } // C++ common/needed methods - virtual SwigPyIterator *copy() const = 0; + virtual PySwigIterator *copy() const = 0; PyObject *next() { @@ -66,12 +66,6 @@ namespace swig { return obj; } - /* Make an alias for Python 3.x */ - PyObject *__next__() - { - return next(); - } - PyObject *previous() { SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads @@ -81,42 +75,42 @@ namespace swig { return obj; } - SwigPyIterator *advance(ptrdiff_t n) + PySwigIterator *advance(ptrdiff_t n) { return (n > 0) ? incr(n) : decr(-n); } - bool operator == (const SwigPyIterator& x) const + bool operator == (const PySwigIterator& x) const { return equal(x); } - bool operator != (const SwigPyIterator& x) const + bool operator != (const PySwigIterator& x) const { return ! operator==(x); } - SwigPyIterator& operator += (ptrdiff_t n) + PySwigIterator& operator += (ptrdiff_t n) { return *advance(n); } - SwigPyIterator& operator -= (ptrdiff_t n) + PySwigIterator& operator -= (ptrdiff_t n) { return *advance(-n); } - SwigPyIterator* operator + (ptrdiff_t n) const + PySwigIterator* operator + (ptrdiff_t n) const { return copy()->advance(n); } - SwigPyIterator* operator - (ptrdiff_t n) const + PySwigIterator* operator - (ptrdiff_t n) const { return copy()->advance(-n); } - ptrdiff_t operator - (const SwigPyIterator& x) const + ptrdiff_t operator - (const PySwigIterator& x) const { return x.distance(*this); } @@ -125,7 +119,7 @@ namespace swig { static int init = 0; static swig_type_info* desc = 0; if (!init) { - desc = SWIG_TypeQuery("swig::SwigPyIterator *"); + desc = SWIG_TypeQuery("swig::PySwigIterator *"); init = 1; } return desc; @@ -134,18 +128,18 @@ namespace swig { } } -%fragment("SwigPyIterator_T","header",fragment="SwigPyIterator",fragment="StdTraits",fragment="StdIteratorTraits") { +%fragment("PySwigIterator_T","header",fragment="PySwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") { namespace swig { template - class SwigPyIterator_T : public SwigPyIterator + class PySwigIterator_T : public PySwigIterator { public: typedef OutIterator out_iterator; typedef typename std::iterator_traits::value_type value_type; - typedef SwigPyIterator_T self_type; + typedef PySwigIterator_T self_type; - SwigPyIterator_T(out_iterator curr, PyObject *seq) - : SwigPyIterator(seq), current(curr) + PySwigIterator_T(out_iterator curr, PyObject *seq) + : PySwigIterator(seq), current(curr) { } @@ -155,7 +149,7 @@ namespace swig { } - bool equal (const SwigPyIterator &iter) const + bool equal (const PySwigIterator &iter) const { const self_type *iters = dynamic_cast(&iter); if (iters) { @@ -165,7 +159,7 @@ namespace swig { } } - ptrdiff_t distance(const SwigPyIterator &iter) const + ptrdiff_t distance(const PySwigIterator &iter) const { const self_type *iters = dynamic_cast(&iter); if (iters) { @@ -193,17 +187,17 @@ namespace swig { template::value_type, typename FromOper = from_oper > - class SwigPyIteratorOpen_T : public SwigPyIterator_T + class PySwigIteratorOpen_T : public PySwigIterator_T { public: FromOper from; typedef OutIterator out_iterator; typedef ValueType value_type; - typedef SwigPyIterator_T base; - typedef SwigPyIteratorOpen_T self_type; + typedef PySwigIterator_T base; + typedef PySwigIteratorOpen_T self_type; - SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq) - : SwigPyIterator_T(curr, seq) + PySwigIteratorOpen_T(out_iterator curr, PyObject *seq) + : PySwigIterator_T(curr, seq) { } @@ -211,12 +205,12 @@ namespace swig { return from(static_cast(*(base::current))); } - SwigPyIterator *copy() const + PySwigIterator *copy() const { return new self_type(*this); } - SwigPyIterator *incr(size_t n = 1) + PySwigIterator *incr(size_t n = 1) { while (n--) { ++base::current; @@ -224,7 +218,7 @@ namespace swig { return this; } - SwigPyIterator *decr(size_t n = 1) + PySwigIterator *decr(size_t n = 1) { while (n--) { --base::current; @@ -236,17 +230,17 @@ namespace swig { template::value_type, typename FromOper = from_oper > - class SwigPyIteratorClosed_T : public SwigPyIterator_T + class PySwigIteratorClosed_T : public PySwigIterator_T { public: FromOper from; typedef OutIterator out_iterator; typedef ValueType value_type; - typedef SwigPyIterator_T base; - typedef SwigPyIteratorClosed_T self_type; + typedef PySwigIterator_T base; + typedef PySwigIteratorClosed_T self_type; - SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) - : SwigPyIterator_T(curr, seq), begin(first), end(last) + PySwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) + : PySwigIterator_T(curr, seq), begin(first), end(last) { } @@ -258,12 +252,12 @@ namespace swig { } } - SwigPyIterator *copy() const + PySwigIterator *copy() const { return new self_type(*this); } - SwigPyIterator *incr(size_t n = 1) + PySwigIterator *incr(size_t n = 1) { while (n--) { if (base::current == end) { @@ -275,7 +269,7 @@ namespace swig { return this; } - SwigPyIterator *decr(size_t n = 1) + PySwigIterator *decr(size_t n = 1) { while (n--) { if (base::current == begin) { @@ -293,23 +287,23 @@ namespace swig { }; template - inline SwigPyIterator* + inline PySwigIterator* make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0) { - return new SwigPyIteratorClosed_T(current, begin, end, seq); + return new PySwigIteratorClosed_T(current, begin, end, seq); } template - inline SwigPyIterator* + inline PySwigIterator* make_output_iterator(const OutIter& current, PyObject *seq = 0) { - return new SwigPyIteratorOpen_T(current, seq); + return new PySwigIteratorOpen_T(current, seq); } } } -%fragment("SwigPyIterator"); +%fragment("PySwigIterator"); namespace swig { /* @@ -327,67 +321,65 @@ namespace swig /* Mark methods that return new objects */ - %newobject SwigPyIterator::copy; - %newobject SwigPyIterator::operator + (ptrdiff_t n) const; - %newobject SwigPyIterator::operator - (ptrdiff_t n) const; + %newobject PySwigIterator::copy; + %newobject PySwigIterator::operator + (ptrdiff_t n) const; + %newobject PySwigIterator::operator - (ptrdiff_t n) const; - %nodirector SwigPyIterator; - %extend SwigPyIterator { + %nodirector PySwigIterator; + %extend PySwigIterator { %pythoncode {def __iter__(self): return self} } - %catches(swig::stop_iteration) SwigPyIterator::value() const; - %catches(swig::stop_iteration) SwigPyIterator::incr(size_t n = 1); - %catches(swig::stop_iteration) SwigPyIterator::decr(size_t n = 1); - %catches(std::invalid_argument) SwigPyIterator::distance(const SwigPyIterator &x) const; - %catches(std::invalid_argument) SwigPyIterator::equal (const SwigPyIterator &x) const; - %catches(swig::stop_iteration) SwigPyIterator::__next__(); - %catches(swig::stop_iteration) SwigPyIterator::next(); - %catches(swig::stop_iteration) SwigPyIterator::previous(); - %catches(swig::stop_iteration) SwigPyIterator::advance(ptrdiff_t n); - %catches(swig::stop_iteration) SwigPyIterator::operator += (ptrdiff_t n); - %catches(swig::stop_iteration) SwigPyIterator::operator -= (ptrdiff_t n); - %catches(swig::stop_iteration) SwigPyIterator::operator + (ptrdiff_t n) const; - %catches(swig::stop_iteration) SwigPyIterator::operator - (ptrdiff_t n) const; + %catches(swig::stop_iteration) PySwigIterator::value() const; + %catches(swig::stop_iteration) PySwigIterator::incr(size_t n = 1); + %catches(swig::stop_iteration) PySwigIterator::decr(size_t n = 1); + %catches(std::invalid_argument) PySwigIterator::distance(const PySwigIterator &x) const; + %catches(std::invalid_argument) PySwigIterator::equal (const PySwigIterator &x) const; + %catches(swig::stop_iteration) PySwigIterator::next(); + %catches(swig::stop_iteration) PySwigIterator::previous(); + %catches(swig::stop_iteration) PySwigIterator::advance(ptrdiff_t n); + %catches(swig::stop_iteration) PySwigIterator::operator += (ptrdiff_t n); + %catches(swig::stop_iteration) PySwigIterator::operator -= (ptrdiff_t n); + %catches(swig::stop_iteration) PySwigIterator::operator + (ptrdiff_t n) const; + %catches(swig::stop_iteration) PySwigIterator::operator - (ptrdiff_t n) const; - struct SwigPyIterator + struct PySwigIterator { protected: - SwigPyIterator(PyObject *seq); + PySwigIterator(PyObject *seq); public: - virtual ~SwigPyIterator(); + virtual ~PySwigIterator(); // Access iterator method, required by Python virtual PyObject *value() const = 0; // Forward iterator method, required by Python - virtual SwigPyIterator *incr(size_t n = 1) = 0; + virtual PySwigIterator *incr(size_t n = 1) = 0; // Backward iterator method, very common in C++, but not required in Python - virtual SwigPyIterator *decr(size_t n = 1); + virtual PySwigIterator *decr(size_t n = 1); // Random access iterator methods, but not required in Python - virtual ptrdiff_t distance(const SwigPyIterator &x) const; + virtual ptrdiff_t distance(const PySwigIterator &x) const; - virtual bool equal (const SwigPyIterator &x) const; + virtual bool equal (const PySwigIterator &x) const; // C++ common/needed methods - virtual SwigPyIterator *copy() const = 0; + virtual PySwigIterator *copy() const = 0; PyObject *next(); - PyObject *__next__(); PyObject *previous(); - SwigPyIterator *advance(ptrdiff_t n); + PySwigIterator *advance(ptrdiff_t n); - bool operator == (const SwigPyIterator& x) const; - bool operator != (const SwigPyIterator& x) const; - SwigPyIterator& operator += (ptrdiff_t n); - SwigPyIterator& operator -= (ptrdiff_t n); - SwigPyIterator* operator + (ptrdiff_t n) const; - SwigPyIterator* operator - (ptrdiff_t n) const; - ptrdiff_t operator - (const SwigPyIterator& x) const; + bool operator == (const PySwigIterator& x) const; + bool operator != (const PySwigIterator& x) const; + PySwigIterator& operator += (ptrdiff_t n); + PySwigIterator& operator -= (ptrdiff_t n); + PySwigIterator* operator + (ptrdiff_t n) const; + PySwigIterator* operator - (ptrdiff_t n) const; + ptrdiff_t operator - (const PySwigIterator& x) const; }; } diff --git a/Lib/python/pyname_compat.i b/Lib/python/pyname_compat.i deleted file mode 100644 index cdda38f80..000000000 --- a/Lib/python/pyname_compat.i +++ /dev/null @@ -1,88 +0,0 @@ -/* -* From SWIG 1.3.37 we deprecated all SWIG symbols that start with Py, -* since they are inappropriate and discouraged in Python documentation -* (from http://www.python.org/doc/2.5.2/api/includes.html): -* -* "All user visible names defined by Python.h (except those defined by the included -* standard headers) have one of the prefixes "Py" or "_Py". Names beginning with -* "_Py" are for internal use by the Python implementation and should not be used -* by extension writers. Structure member names do not have a reserved prefix. -* -* Important: user code should never define names that begin with "Py" or "_Py". -* This confuses the reader, and jeopardizes the portability of the user code to -* future Python versions, which may define additional names beginning with one -* of these prefixes." -* -* This file defined macros to provide backward compatibility for these deprecated -* symbols. In the case you have these symbols in your interface file, you can simply -* include this file at begining of it. -* -* However, this file may be removed in future release of SWIG, so using this file to -* keep these inappropriate names in your SWIG interface file is also not recommanded. -* Instead, we provide a simple tool for converting your interface files to -* the new naming convention. You can download the tool here: -* https://swig.svn.sourceforge.net/svnroot/swig/trunk/Tools/pyname_patch.py -*/ - -%fragment("PySequence_Base", "header", fragment="SwigPySequence_Base") {} -%fragment("PySequence_Cont", "header", fragment="SwigPySequence_Cont") {} -%fragment("PySwigIterator_T", "header", fragment="SwigPyIterator_T") {} -%fragment("PyPairBoolOutputIterator", "header", fragment="SwigPyPairBoolOutputIterator") {} -%fragment("PySwigIterator", "header", fragment="SwigPyIterator") {} -%fragment("PySwigIterator_T", "header", fragment="SwigPyIterator_T") {} - -%inline %{ -#define PyMapIterator_T SwigPyMapIterator_T -#define PyMapKeyIterator_T SwigPyMapKeyIterator_T -#define PyMapValueIterator_T SwigPyMapValueITerator_T -#define PyObject_ptr SwigPtr_PyObject -#define PyObject_var SwigVar_PyObject -#define PyOper SwigPyOper -#define PySeq SwigPySeq -#define PySequence_ArrowProxy SwigPySequence_ArrowProxy -#define PySequence_Cont SwigPySequence_Cont -#define PySequence_InputIterator SwigPySequence_InputIterator -#define PySequence_Ref SwigPySequence_Ref -#define PySwigClientData SwigPyClientData -#define PySwigClientData_Del SwigPyClientData_Del -#define PySwigClientData_New SwigPyClientData_New -#define PySwigIterator SwigPyIterator -#define PySwigIteratorClosed_T SwigPyIteratorClosed_T -#define PySwigIteratorOpen_T SwigPyIteratorOpen_T -#define PySwigIterator_T SwigPyIterator_T -#define PySwigObject SwigPyObject -#define PySwigObject_Check SwigPyObject_Check -#define PySwigObject_GetDesc SwigPyObject_GetDesc -#define PySwigObject_New SwigPyObject_New -#define PySwigObject_acquire SwigPyObject_acquire -#define PySwigObject_append SwigPyObject_append -#define PySwigObject_as_number SwigPyObject_as_number -#define PySwigObject_compare SwigPyObject_compare -#define PySwigObject_dealloc SwigPyObject_dealloc -#define PySwigObject_disown SwigPyObject_disown -#define PySwigObject_format SwigPyObject_format -#define PySwigObject_getattr SwigPyObject_getattr -#define PySwigObject_hex SwigPyObject_hex -#define PySwigObject_long SwigPyObject_long -#define PySwigObject_next SwigPyObject_next -#define PySwigObject_oct SwigPyObject_oct -#define PySwigObject_own SwigPyObject_own -#define PySwigObject_print SwigPyObject_print -#define PySwigObject_repr SwigPyObject_repr -#define PySwigObject_richcompare SwigPyObject_richcompare -#define PySwigObject_str SwigPyObject_str -#define PySwigObject_type SwigPyObject_type -#define PySwigPacked SwigPyPacked -#define PySwigPacked_Check SwigPyPacked_Check -#define PySwigPacked_New SwigPyPacked_New -#define PySwigPacked_UnpackData SwigPyPacked_UnpackData -#define PySwigPacked_compare SwigPyPacked_compare -#define PySwigPacked_dealloc SwigPyPacked_dealloc -#define PySwigPacked_print SwigPyPacked_print -#define PySwigPacked_repr SwigPyPacked_repr -#define PySwigPacked_str SwigPyPacked_str -#define PySwigPacked_type SwigPyPacked_type -#define pyseq swigpyseq -#define pyswigobject_type swigpyobject_type -#define pyswigpacked_type swigpypacked_type -%} diff --git a/Lib/python/pyopers.swg b/Lib/python/pyopers.swg index 30775b84e..76f1e6789 100644 --- a/Lib/python/pyopers.swg +++ b/Lib/python/pyopers.swg @@ -33,12 +33,6 @@ /* Special cases */ %rename(__invert__) *::operator~; %rename(__call__) *::operator(); - -%feature("shadow") *::operator bool %{ -def __nonzero__(self): - return $action(self) -__bool__ = __nonzero__ -%}; %rename(__nonzero__) *::operator bool; /* Ignored operators */ @@ -90,7 +84,7 @@ __bool__ = __nonzero__ */ -#define %pyinplaceoper(SwigPyOper, Oper) %delobject Oper; %newobject Oper; %rename(SwigPyOper) Oper +#define %pyinplaceoper(PyOper, Oper) %delobject Oper; %newobject Oper; %rename(PyOper) Oper %pyinplaceoper(__iadd__ , *::operator +=); %pyinplaceoper(__isub__ , *::operator -=); diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index 5a1b1230e..844a66bec 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -42,7 +42,7 @@ #define SWIG_GetModule(clientdata) SWIG_Python_GetModule() #define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer) -#define SWIG_NewClientData(obj) SwigPyClientData_New(obj) +#define SWIG_NewClientData(obj) PySwigClientData_New(obj) #define SWIG_SetErrorObj SWIG_Python_SetErrorObj #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg @@ -238,7 +238,7 @@ SWIG_Py_Void(void) return none; } -/* SwigPyClientData */ +/* PySwigClientData */ typedef struct { PyObject *klass; @@ -247,30 +247,30 @@ typedef struct { PyObject *destroy; int delargs; int implicitconv; -} SwigPyClientData; +} PySwigClientData; SWIGRUNTIMEINLINE int SWIG_Python_CheckImplicit(swig_type_info *ty) { - SwigPyClientData *data = (SwigPyClientData *)ty->clientdata; + PySwigClientData *data = (PySwigClientData *)ty->clientdata; return data ? data->implicitconv : 0; } SWIGRUNTIMEINLINE PyObject * SWIG_Python_ExceptionType(swig_type_info *desc) { - SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0; + PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0; PyObject *klass = data ? data->klass : 0; return (klass ? klass : PyExc_RuntimeError); } -SWIGRUNTIME SwigPyClientData * -SwigPyClientData_New(PyObject* obj) +SWIGRUNTIME PySwigClientData * +PySwigClientData_New(PyObject* obj) { if (!obj) { return 0; } else { - SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData)); + PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData)); /* the klass element */ data->klass = obj; Py_INCREF(data->klass); @@ -318,14 +318,14 @@ SwigPyClientData_New(PyObject* obj) } SWIGRUNTIME void -SwigPyClientData_Del(SwigPyClientData* data) +PySwigClientData_Del(PySwigClientData* data) { Py_XDECREF(data->newraw); Py_XDECREF(data->newargs); Py_XDECREF(data->destroy); } -/* =============== SwigPyObject =====================*/ +/* =============== PySwigObject =====================*/ typedef struct { PyObject_HEAD @@ -333,28 +333,24 @@ typedef struct { swig_type_info *ty; int own; PyObject *next; -} SwigPyObject; +} PySwigObject; SWIGRUNTIME PyObject * -SwigPyObject_long(SwigPyObject *v) +PySwigObject_long(PySwigObject *v) { return PyLong_FromVoidPtr(v->ptr); } SWIGRUNTIME PyObject * -SwigPyObject_format(const char* fmt, SwigPyObject *v) +PySwigObject_format(const char* fmt, PySwigObject *v) { PyObject *res = NULL; PyObject *args = PyTuple_New(1); if (args) { - if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) { - PyObject *ofmt = SWIG_Python_str_FromChar(fmt); + if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) { + PyObject *ofmt = PyString_FromString(fmt); if (ofmt) { -#if PY_VERSION_HEX >= 0x03000000 - res = PyUnicode_Format(ofmt,args); -#else res = PyString_Format(ofmt,args); -#endif Py_DECREF(ofmt); } Py_DECREF(args); @@ -364,59 +360,49 @@ SwigPyObject_format(const char* fmt, SwigPyObject *v) } SWIGRUNTIME PyObject * -SwigPyObject_oct(SwigPyObject *v) +PySwigObject_oct(PySwigObject *v) { - return SwigPyObject_format("%o",v); + return PySwigObject_format("%o",v); } SWIGRUNTIME PyObject * -SwigPyObject_hex(SwigPyObject *v) +PySwigObject_hex(PySwigObject *v) { - return SwigPyObject_format("%x",v); + return PySwigObject_format("%x",v); } SWIGRUNTIME PyObject * #ifdef METH_NOARGS -SwigPyObject_repr(SwigPyObject *v) +PySwigObject_repr(PySwigObject *v) #else -SwigPyObject_repr(SwigPyObject *v, PyObject *args) +PySwigObject_repr(PySwigObject *v, PyObject *args) #endif { const char *name = SWIG_TypePrettyName(v->ty); - PyObject *hex = SwigPyObject_hex(v); - PyObject *repr = SWIG_Python_str_FromFormat("", name, hex); + PyObject *hex = PySwigObject_hex(v); + PyObject *repr = PyString_FromFormat("", name, PyString_AsString(hex)); Py_DECREF(hex); if (v->next) { #ifdef METH_NOARGS - PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next); + PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next); #else - PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args); + PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args); #endif -#if PY_VERSION_HEX >= 0x03000000 - PyObject *joined = PyUnicode_Concat(repr, nrep); - Py_DecRef(repr); - Py_DecRef(nrep); - repr = joined; -#else PyString_ConcatAndDel(&repr,nrep); -#endif } return repr; } SWIGRUNTIME int -SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) +PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { - char *str; #ifdef METH_NOARGS - PyObject *repr = SwigPyObject_repr(v); + PyObject *repr = PySwigObject_repr(v); #else - PyObject *repr = SwigPyObject_repr(v, NULL); + PyObject *repr = PySwigObject_repr(v, NULL); #endif if (repr) { - str = SWIG_Python_str_AsChar(repr); - fputs(str, fp); - SWIG_Python_str_DelForPy3(str); + fputs(PyString_AsString(repr), fp); Py_DECREF(repr); return 0; } else { @@ -425,71 +411,53 @@ SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) } SWIGRUNTIME PyObject * -SwigPyObject_str(SwigPyObject *v) +PySwigObject_str(PySwigObject *v) { char result[SWIG_BUFFER_SIZE]; return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ? - SWIG_Python_str_FromChar(result) : 0; + PyString_FromString(result) : 0; } SWIGRUNTIME int -SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w) +PySwigObject_compare(PySwigObject *v, PySwigObject *w) { void *i = v->ptr; void *j = w->ptr; return (i < j) ? -1 : ((i > j) ? 1 : 0); } -/* Added for Python 3.x, whould it also useful for Python 2.x? */ -SWIGRUNTIME PyObject* -SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op) -{ - PyObject* res; - if( op != Py_EQ && op != Py_NE ) { - Py_INCREF(Py_NotImplemented); - return Py_NotImplemented; - } - if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ) - res = Py_True; - else - res = Py_False; - Py_INCREF(res); - return res; -} - - SWIGRUNTIME PyTypeObject* _PySwigObject_type(void); SWIGRUNTIME PyTypeObject* -SwigPyObject_type(void) { +PySwigObject_type(void) { static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type(); return type; } SWIGRUNTIMEINLINE int -SwigPyObject_Check(PyObject *op) { - return (Py_TYPE(op) == SwigPyObject_type()) - || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0); +PySwigObject_Check(PyObject *op) { + return ((op)->ob_type == PySwigObject_type()) + || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0); } SWIGRUNTIME PyObject * -SwigPyObject_New(void *ptr, swig_type_info *ty, int own); +PySwigObject_New(void *ptr, swig_type_info *ty, int own); SWIGRUNTIME void -SwigPyObject_dealloc(PyObject *v) +PySwigObject_dealloc(PyObject *v) { - SwigPyObject *sobj = (SwigPyObject *) v; + PySwigObject *sobj = (PySwigObject *) v; PyObject *next = sobj->next; if (sobj->own == SWIG_POINTER_OWN) { swig_type_info *ty = sobj->ty; - SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; + PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; PyObject *destroy = data ? data->destroy : 0; if (destroy) { /* destroy is always a VARARGS method */ PyObject *res; if (data->delargs) { /* we need to create a temporal object to carry the destroy operation */ - PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); + PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0); res = SWIG_Python_CallFunctor(destroy, tmp); Py_DECREF(tmp); } else { @@ -511,15 +479,15 @@ SwigPyObject_dealloc(PyObject *v) } SWIGRUNTIME PyObject* -SwigPyObject_append(PyObject* v, PyObject* next) +PySwigObject_append(PyObject* v, PyObject* next) { - SwigPyObject *sobj = (SwigPyObject *) v; + PySwigObject *sobj = (PySwigObject *) v; #ifndef METH_O PyObject *tmp = 0; if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL; next = tmp; #endif - if (!SwigPyObject_Check(next)) { + if (!PySwigObject_Check(next)) { return NULL; } sobj->next = next; @@ -529,12 +497,12 @@ SwigPyObject_append(PyObject* v, PyObject* next) SWIGRUNTIME PyObject* #ifdef METH_NOARGS -SwigPyObject_next(PyObject* v) +PySwigObject_next(PyObject* v) #else -SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) #endif { - SwigPyObject *sobj = (SwigPyObject *) v; + PySwigObject *sobj = (PySwigObject *) v; if (sobj->next) { Py_INCREF(sobj->next); return sobj->next; @@ -545,30 +513,30 @@ SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) SWIGINTERN PyObject* #ifdef METH_NOARGS -SwigPyObject_disown(PyObject *v) +PySwigObject_disown(PyObject *v) #else -SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) #endif { - SwigPyObject *sobj = (SwigPyObject *)v; + PySwigObject *sobj = (PySwigObject *)v; sobj->own = 0; return SWIG_Py_Void(); } SWIGINTERN PyObject* #ifdef METH_NOARGS -SwigPyObject_acquire(PyObject *v) +PySwigObject_acquire(PyObject *v) #else -SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) #endif { - SwigPyObject *sobj = (SwigPyObject *)v; + PySwigObject *sobj = (PySwigObject *)v; sobj->own = SWIG_POINTER_OWN; return SWIG_Py_Void(); } SWIGINTERN PyObject* -SwigPyObject_own(PyObject *v, PyObject *args) +PySwigObject_own(PyObject *v, PyObject *args) { PyObject *val = 0; #if (PY_VERSION_HEX < 0x02020000) @@ -581,20 +549,20 @@ SwigPyObject_own(PyObject *v, PyObject *args) } else { - SwigPyObject *sobj = (SwigPyObject *)v; + PySwigObject *sobj = (PySwigObject *)v; PyObject *obj = PyBool_FromLong(sobj->own); if (val) { #ifdef METH_NOARGS if (PyObject_IsTrue(val)) { - SwigPyObject_acquire(v); + PySwigObject_acquire(v); } else { - SwigPyObject_disown(v); + PySwigObject_disown(v); } #else if (PyObject_IsTrue(val)) { - SwigPyObject_acquire(v,args); + PySwigObject_acquire(v,args); } else { - SwigPyObject_disown(v,args); + PySwigObject_disown(v,args); } #endif } @@ -605,30 +573,30 @@ SwigPyObject_own(PyObject *v, PyObject *args) #ifdef METH_O static PyMethodDef swigobject_methods[] = { - {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, - {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, - {(char *)"own", (PyCFunction)SwigPyObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, - {(char *)"append", (PyCFunction)SwigPyObject_append, METH_O, (char *)"appends another 'this' object"}, - {(char *)"next", (PyCFunction)SwigPyObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, - {(char *)"__repr__",(PyCFunction)SwigPyObject_repr, METH_NOARGS, (char *)"returns object representation"}, + {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, + {(char *)"append", (PyCFunction)PySwigObject_append, METH_O, (char *)"appends another 'this' object"}, + {(char *)"next", (PyCFunction)PySwigObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, + {(char *)"__repr__",(PyCFunction)PySwigObject_repr, METH_NOARGS, (char *)"returns object representation"}, {0, 0, 0, 0} }; #else static PyMethodDef swigobject_methods[] = { - {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_VARARGS, (char *)"releases ownership of the pointer"}, - {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS, (char *)"aquires ownership of the pointer"}, - {(char *)"own", (PyCFunction)SwigPyObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, - {(char *)"append", (PyCFunction)SwigPyObject_append, METH_VARARGS, (char *)"appends another 'this' object"}, - {(char *)"next", (PyCFunction)SwigPyObject_next, METH_VARARGS, (char *)"returns the next 'this' object"}, - {(char *)"__repr__",(PyCFunction)SwigPyObject_repr, METH_VARARGS, (char *)"returns object representation"}, + {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_VARARGS, (char *)"releases ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, + {(char *)"append", (PyCFunction)PySwigObject_append, METH_VARARGS, (char *)"appends another 'this' object"}, + {(char *)"next", (PyCFunction)PySwigObject_next, METH_VARARGS, (char *)"returns the next 'this' object"}, + {(char *)"__repr__",(PyCFunction)PySwigObject_repr, METH_VARARGS, (char *)"returns object representation"}, {0, 0, 0, 0} }; #endif #if PY_VERSION_HEX < 0x02020000 SWIGINTERN PyObject * -SwigPyObject_getattr(SwigPyObject *sobj,char *name) +PySwigObject_getattr(PySwigObject *sobj,char *name) { return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name); } @@ -638,14 +606,11 @@ SWIGRUNTIME PyTypeObject* _PySwigObject_type(void) { static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer"; - static PyNumberMethods SwigPyObject_as_number = { + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ (binaryfunc)0, /*nb_multiply*/ - /* nb_divide removed in Python 3 */ -#if PY_VERSION_HEX < 0x03000000 (binaryfunc)0, /*nb_divide*/ -#endif (binaryfunc)0, /*nb_remainder*/ (binaryfunc)0, /*nb_divmod*/ (ternaryfunc)0,/*nb_power*/ @@ -659,23 +624,13 @@ _PySwigObject_type(void) { 0, /*nb_and*/ 0, /*nb_xor*/ 0, /*nb_or*/ -#if PY_VERSION_HEX < 0x03000000 - 0, /*nb_coerce*/ -#endif - (unaryfunc)SwigPyObject_long, /*nb_int*/ -#if PY_VERSION_HEX < 0x03000000 - (unaryfunc)SwigPyObject_long, /*nb_long*/ -#else - 0, /*nb_reserved*/ -#endif + (coercion)0, /*nb_coerce*/ + (unaryfunc)PySwigObject_long, /*nb_int*/ + (unaryfunc)PySwigObject_long, /*nb_long*/ (unaryfunc)0, /*nb_float*/ -#if PY_VERSION_HEX < 0x03000000 - (unaryfunc)SwigPyObject_oct, /*nb_oct*/ - (unaryfunc)SwigPyObject_hex, /*nb_hex*/ -#endif -#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */ -#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ + (unaryfunc)PySwigObject_oct, /*nb_oct*/ + (unaryfunc)PySwigObject_hex, /*nb_hex*/ +#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */ #elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ @@ -684,41 +639,32 @@ _PySwigObject_type(void) { #endif }; - static PyTypeObject swigpyobject_type; + static PyTypeObject pyswigobject_type; static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyOjbect header changed in Python 3 */ -#if PY_VERSION_HEX >= 0x03000000 - PyVarObject_HEAD_INIT(&PyType_Type, 0) -#else PyObject_HEAD_INIT(NULL) 0, /* ob_size */ -#endif - (char *)"SwigPyObject", /* tp_name */ - sizeof(SwigPyObject), /* tp_basicsize */ + (char *)"PySwigObject", /* tp_name */ + sizeof(PySwigObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor)SwigPyObject_dealloc, /* tp_dealloc */ - (printfunc)SwigPyObject_print, /* tp_print */ + (destructor)PySwigObject_dealloc, /* tp_dealloc */ + (printfunc)PySwigObject_print, /* tp_print */ #if PY_VERSION_HEX < 0x02020000 - (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ + (getattrfunc)PySwigObject_getattr, /* tp_getattr */ #else (getattrfunc)0, /* tp_getattr */ #endif (setattrfunc)0, /* tp_setattr */ -#if PY_VERSION_HEX >= 0x03000000 - 0, /* tp_reserved in 3.0.1 */ -#else - (cmpfunc)SwigPyObject_compare, /* tp_compare */ -#endif - (reprfunc)SwigPyObject_repr, /* tp_repr */ - &SwigPyObject_as_number, /* tp_as_number */ + (cmpfunc)PySwigObject_compare, /* tp_compare */ + (reprfunc)PySwigObject_repr, /* tp_repr */ + &PySwigObject_as_number, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ (hashfunc)0, /* tp_hash */ (ternaryfunc)0, /* tp_call */ - (reprfunc)SwigPyObject_str, /* tp_str */ + (reprfunc)PySwigObject_str, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -726,7 +672,7 @@ _PySwigObject_type(void) { swigobject_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ - (richcmpfunc)SwigPyObject_richcompare, /* tp_richcompare */ + 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ #if PY_VERSION_HEX >= 0x02020000 0, /* tp_iter */ @@ -743,11 +689,11 @@ _PySwigObject_type(void) { 0, /* tp_alloc */ 0, /* tp_new */ 0, /* tp_free */ - 0, /* tp_is_gc */ + 0, /* tp_is_gc */ 0, /* tp_bases */ 0, /* tp_mro */ 0, /* tp_cache */ - 0, /* tp_subclasses */ + 0, /* tp_subclasses */ 0, /* tp_weaklist */ #endif #if PY_VERSION_HEX >= 0x02030000 @@ -757,20 +703,17 @@ _PySwigObject_type(void) { 0,0,0,0 /* tp_alloc -> tp_next */ #endif }; - swigpyobject_type = tmp; - /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */ -#if PY_VERSION_HEX < 0x03000000 - swigpyobject_type.ob_type = &PyType_Type; -#endif + pyswigobject_type = tmp; + pyswigobject_type.ob_type = &PyType_Type; type_init = 1; } - return &swigpyobject_type; + return &pyswigobject_type; } SWIGRUNTIME PyObject * -SwigPyObject_New(void *ptr, swig_type_info *ty, int own) +PySwigObject_New(void *ptr, swig_type_info *ty, int own) { - SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type()); + PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type()); if (sobj) { sobj->ptr = ptr; sobj->ty = ty; @@ -789,10 +732,10 @@ typedef struct { void *pack; swig_type_info *ty; size_t size; -} SwigPyPacked; +} PySwigPacked; SWIGRUNTIME int -SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags)) +PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { char result[SWIG_BUFFER_SIZE]; fputs("pack, v->size, 0, sizeof(result))) { - return SWIG_Python_str_FromFormat("", result, v->ty->name); + return PyString_FromFormat("", result, v->ty->name); } else { - return SWIG_Python_str_FromFormat("", v->ty->name); + return PyString_FromFormat("", v->ty->name); } } SWIGRUNTIME PyObject * -SwigPyPacked_str(SwigPyPacked *v) +PySwigPacked_str(PySwigPacked *v) { char result[SWIG_BUFFER_SIZE]; if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){ - return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name); + return PyString_FromFormat("%s%s", result, v->ty->name); } else { - return SWIG_Python_str_FromChar(v->ty->name); + return PyString_FromString(v->ty->name); } } SWIGRUNTIME int -SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w) +PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w) { size_t i = v->size; size_t j = w->size; @@ -839,22 +782,22 @@ SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w) SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void); SWIGRUNTIME PyTypeObject* -SwigPyPacked_type(void) { +PySwigPacked_type(void) { static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type(); return type; } SWIGRUNTIMEINLINE int -SwigPyPacked_Check(PyObject *op) { +PySwigPacked_Check(PyObject *op) { return ((op)->ob_type == _PySwigPacked_type()) - || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0); + || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0); } SWIGRUNTIME void -SwigPyPacked_dealloc(PyObject *v) +PySwigPacked_dealloc(PyObject *v) { - if (SwigPyPacked_Check(v)) { - SwigPyPacked *sobj = (SwigPyPacked *) v; + if (PySwigPacked_Check(v)) { + PySwigPacked *sobj = (PySwigPacked *) v; free(sobj->pack); } PyObject_DEL(v); @@ -863,37 +806,28 @@ SwigPyPacked_dealloc(PyObject *v) SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void) { static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer"; - static PyTypeObject swigpypacked_type; + static PyTypeObject pyswigpacked_type; static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ -#if PY_VERSION_HEX>=0x03000000 - PyVarObject_HEAD_INIT(&PyType_Type, 0) -#else PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ -#endif - (char *)"SwigPyPacked", /* tp_name */ - sizeof(SwigPyPacked), /* tp_basicsize */ + 0, /* ob_size */ + (char *)"PySwigPacked", /* tp_name */ + sizeof(PySwigPacked), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ - (printfunc)SwigPyPacked_print, /* tp_print */ + (destructor)PySwigPacked_dealloc, /* tp_dealloc */ + (printfunc)PySwigPacked_print, /* tp_print */ (getattrfunc)0, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ -#if PY_VERSION_HEX>=0x03000000 - 0, /* tp_reserved in 3.0.1 */ -#else - (cmpfunc)SwigPyPacked_compare, /* tp_compare */ -#endif - (reprfunc)SwigPyPacked_repr, /* tp_repr */ - 0, /* tp_as_number */ + (cmpfunc)PySwigPacked_compare, /* tp_compare */ + (reprfunc)PySwigPacked_repr, /* tp_repr */ + 0, /* tp_as_number */ 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)0, /* tp_hash */ - (ternaryfunc)0, /* tp_call */ - (reprfunc)SwigPyPacked_str, /* tp_str */ + 0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)PySwigPacked_str, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -932,20 +866,17 @@ _PySwigPacked_type(void) { 0,0,0,0 /* tp_alloc -> tp_next */ #endif }; - swigpypacked_type = tmp; - /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */ -#if PY_VERSION_HEX < 0x03000000 - swigpypacked_type.ob_type = &PyType_Type; -#endif + pyswigpacked_type = tmp; + pyswigpacked_type.ob_type = &PyType_Type; type_init = 1; } - return &swigpypacked_type; + return &pyswigpacked_type; } SWIGRUNTIME PyObject * -SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty) +PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty) { - SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type()); + PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type()); if (sobj) { void *pack = malloc(size); if (pack) { @@ -962,10 +893,10 @@ SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty) } SWIGRUNTIME swig_type_info * -SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size) +PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size) { - if (SwigPyPacked_Check(obj)) { - SwigPyPacked *sobj = (SwigPyPacked *)obj; + if (PySwigPacked_Check(obj)) { + PySwigPacked *sobj = (PySwigPacked *)obj; if (sobj->size != size) return 0; memcpy(ptr, sobj->pack, size); return sobj->ty; @@ -981,7 +912,7 @@ SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size) SWIGRUNTIMEINLINE PyObject * _SWIG_This(void) { - return SWIG_Python_str_FromChar("this"); + return PyString_FromString("this"); } SWIGRUNTIME PyObject * @@ -993,16 +924,11 @@ SWIG_This(void) /* #define SWIG_PYTHON_SLOW_GETSET_THIS */ -/* TODO: I don't know how to implement the fast getset in Python 3 right now */ -#if PY_VERSION_HEX>=0x03000000 -#define SWIG_PYTHON_SLOW_GETSET_THIS -#endif - -SWIGRUNTIME SwigPyObject * +SWIGRUNTIME PySwigObject * SWIG_Python_GetSwigThis(PyObject *pyobj) { - if (SwigPyObject_Check(pyobj)) { - return (SwigPyObject *) pyobj; + if (PySwigObject_Check(pyobj)) { + return (PySwigObject *) pyobj; } else { PyObject *obj = 0; #if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000)) @@ -1038,12 +964,12 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) return 0; } #endif - if (obj && !SwigPyObject_Check(obj)) { + if (obj && !PySwigObject_Check(obj)) { /* a PyObject is called 'this', try to get the 'real this' - SwigPyObject from it */ + PySwigObject from it */ return SWIG_Python_GetSwigThis(obj); } - return (SwigPyObject *)obj; + return (PySwigObject *)obj; } } @@ -1052,7 +978,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) SWIGRUNTIME int SWIG_Python_AcquirePtr(PyObject *obj, int own) { if (own == SWIG_POINTER_OWN) { - SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj); + PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); if (sobj) { int oldown = sobj->own; sobj->own = own; @@ -1071,7 +997,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int if (ptr) *ptr = 0; return SWIG_OK; } else { - SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj); + PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); if (own) *own = 0; while (sobj) { @@ -1085,7 +1011,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } else { swig_cast_info *tc = SWIG_TypeCheck(to->name,ty); if (!tc) { - sobj = (SwigPyObject *)sobj->next; + sobj = (PySwigObject *)sobj->next; } else { if (ptr) { int newmemory = 0; @@ -1114,7 +1040,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } else { int res = SWIG_ERROR; if (flags & SWIG_POINTER_IMPLICIT_CONV) { - SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; + PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; if (data && !data->implicitconv) { PyObject *klass = data->klass; if (klass) { @@ -1127,7 +1053,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int impconv = 0; } if (impconv) { - SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv); + PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv); if (iobj) { void *vptr; res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0); @@ -1189,7 +1115,7 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) { SWIGRUNTIME int SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) { - swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz); + swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz); if (!to) return SWIG_ERROR; if (ty) { if (to != ty) { @@ -1211,7 +1137,7 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t */ SWIGRUNTIME PyObject* -SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) +SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this) { #if (PY_VERSION_HEX >= 0x02020000) PyObject *inst = 0; @@ -1235,16 +1161,10 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) #endif } } else { -#if PY_VERSION_HEX >= 0x03000000 - inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); - PyObject_SetAttr(inst, SWIG_This(), swig_this); - Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; -#else PyObject *dict = PyDict_New(); PyDict_SetItem(dict, SWIG_This(), swig_this); inst = PyInstance_NewRaw(data->newargs, dict); Py_DECREF(dict); -#endif } return inst; #else @@ -1307,9 +1227,9 @@ SWIG_Python_InitShadowInstance(PyObject *args) { if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) { return NULL; } else { - SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]); + PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]); if (sthis) { - SwigPyObject_append((PyObject*) sthis, obj[1]); + PySwigObject_append((PyObject*) sthis, obj[1]); } else { SWIG_Python_SetSwigThis(obj[0], obj[1]); } @@ -1325,8 +1245,8 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) { return SWIG_Py_Void(); } else { int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0; - PyObject *robj = SwigPyObject_New(ptr, type, own); - SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0; + PyObject *robj = PySwigObject_New(ptr, type, own); + PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0; if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) { PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj); if (inst) { @@ -1342,7 +1262,7 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) { SWIGRUNTIMEINLINE PyObject * SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { - return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void(); + return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void(); } /* -----------------------------------------------------------------------------* @@ -1413,8 +1333,8 @@ SWIG_Python_DestroyModule(void *vptr) for (i =0; i < swig_module->size; ++i) { swig_type_info *ty = types[i]; if (ty->owndata) { - SwigPyClientData *data = (SwigPyClientData *) ty->clientdata; - if (data) SwigPyClientData_Del(data); + PySwigClientData *data = (PySwigClientData *) ty->clientdata; + if (data) PySwigClientData_Del(data); } } Py_DECREF(SWIG_This()); @@ -1424,13 +1344,8 @@ SWIGRUNTIME void SWIG_Python_SetModule(swig_module_info *swig_module) { static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */ -#if PY_VERSION_HEX >= 0x03000000 - /* Add a dummy module object into sys.modules */ - PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION); -#else PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table); -#endif PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); if (pointer && module) { PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); @@ -1450,7 +1365,7 @@ SWIGRUNTIME swig_type_info * SWIG_Python_TypeQuery(const char *type) { PyObject *cache = SWIG_Python_TypeCache(); - PyObject *key = SWIG_Python_str_FromChar(type); + PyObject *key = PyString_FromString(type); PyObject *obj = PyDict_GetItem(cache, key); swig_type_info *descriptor; if (obj) { @@ -1477,23 +1392,21 @@ SWIG_Python_TypeQuery(const char *type) SWIGRUNTIME int SWIG_Python_AddErrMesg(const char* mesg, int infront) -{ +{ if (PyErr_Occurred()) { PyObject *type = 0; PyObject *value = 0; PyObject *traceback = 0; PyErr_Fetch(&type, &value, &traceback); if (value) { - char *tmp; PyObject *old_str = PyObject_Str(value); Py_XINCREF(type); PyErr_Clear(); if (infront) { - PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str)); + PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str)); } else { - PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg); + PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); } - SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); } return 1; @@ -1516,9 +1429,9 @@ SWIG_Python_ArgFail(int argnum) } SWIGRUNTIMEINLINE const char * -SwigPyObject_GetDesc(PyObject *self) +PySwigObject_GetDesc(PyObject *self) { - SwigPyObject *v = (SwigPyObject *)self; + PySwigObject *v = (PySwigObject *)self; swig_type_info *ty = v ? v->ty : 0; return ty ? ty->str : (char*)""; } @@ -1528,10 +1441,10 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) { if (type) { #if defined(SWIG_COBJECT_TYPES) - if (obj && SwigPyObject_Check(obj)) { - const char *otype = (const char *) SwigPyObject_GetDesc(obj); + if (obj && PySwigObject_Check(obj)) { + const char *otype = (const char *) PySwigObject_GetDesc(obj); if (otype) { - PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received", + PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received", type, otype); return; } @@ -1541,11 +1454,10 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) const char *otype = (obj ? obj->ob_type->tp_name : 0); if (otype) { PyObject *str = PyObject_Str(obj); - const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0; + const char *cstr = str ? PyString_AsString(str) : 0; if (cstr) { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", type, otype, cstr); - SWIG_Python_str_DelForPy3(cstr); } else { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); @@ -1567,12 +1479,10 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) void *result; if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { PyErr_Clear(); -#if SWIG_POINTER_EXCEPTION - if (flags) { + if (flags & SWIG_POINTER_EXCEPTION) { SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); SWIG_Python_ArgFail(argnum); } -#endif } return result; } diff --git a/Lib/python/pystdcommon.swg b/Lib/python/pystdcommon.swg index 7e9720cc0..48b1fdcd5 100644 --- a/Lib/python/pystdcommon.swg +++ b/Lib/python/pystdcommon.swg @@ -46,7 +46,7 @@ namespace swig { struct traits_asptr { static int asptr(PyObject *obj, Type **val) { Type *p; - int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); + int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0; if (SWIG_IsOK(res)) { if (val) *val = p; } diff --git a/Lib/python/pystrings.swg b/Lib/python/pystrings.swg index 1983037a5..d4d60c42b 100644 --- a/Lib/python/pystrings.swg +++ b/Lib/python/pystrings.swg @@ -5,28 +5,10 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) { -%#if PY_VERSION_HEX>=0x03000000 - if (PyUnicode_Check(obj)) -%#else - if (PyString_Check(obj)) -%#endif - { + if (PyString_Check(obj)) { char *cstr; Py_ssize_t len; -%#if PY_VERSION_HEX>=0x03000000 - if (!alloc && cptr) { - /* We can't allow converting without allocation, since the internal - representation of string in Python 3 is UCS-2/UCS-4 but we require - a UTF-8 representation. - TODO(bhy) More detailed explanation */ - return SWIG_RuntimeError; - } - obj = PyUnicode_AsUTF8String(obj); - PyBytes_AsStringAndSize(obj, &cstr, &len); - if(alloc) *alloc = SWIG_NEWOBJ; -%#else PyString_AsStringAndSize(obj, &cstr, &len); -%#endif - if (cptr) { + if (cptr) { if (alloc) { /* In python the user should not be able to modify the inner @@ -51,16 +33,10 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) *alloc = SWIG_OLDOBJ; } } else { - %#if PY_VERSION_HEX>=0x03000000 - assert(0); /* Should never reach here in Python 3 */ - %#endif - *cptr = SWIG_Python_str_AsChar(obj); + *cptr = PyString_AsString(obj); } } if (psize) *psize = len + 1; -%#if PY_VERSION_HEX>=0x03000000 - Py_XDECREF(obj); -%#endif return SWIG_OK; } else { swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); @@ -88,11 +64,7 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size) return pchar_descriptor ? SWIG_NewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void(); } else { -%#if PY_VERSION_HEX >= 0x03000000 - return PyUnicode_FromStringAndSize(carray, %numeric_cast(size,int)); -%#else return PyString_FromStringAndSize(carray, %numeric_cast(size,int)); -%#endif } } else { return SWIG_Py_Void(); diff --git a/Lib/python/pytypemaps.swg b/Lib/python/pytypemaps.swg index e8df069ef..2d0aa576c 100644 --- a/Lib/python/pytypemaps.swg +++ b/Lib/python/pytypemaps.swg @@ -88,7 +88,7 @@ if ($result) { PyObject *robj = PyObject_CallMethod($result, (char *)"__deref__", NULL); if (robj && !PyErr_Occurred()) { - SwigPyObject_append((PyObject *) SWIG_Python_GetSwigThis($result), + PySwigObject_append((PyObject *) SWIG_Python_GetSwigThis($result), (PyObject *) SWIG_Python_GetSwigThis(robj)); Py_DECREF(robj); } diff --git a/Lib/python/pywstrings.swg b/Lib/python/pywstrings.swg index 7c36f248d..8254bf8f7 100644 --- a/Lib/python/pywstrings.swg +++ b/Lib/python/pywstrings.swg @@ -8,16 +8,14 @@ SWIG_AsWCharPtrAndSize(PyObject *obj, wchar_t **cptr, size_t *psize, int *alloc) { PyObject *tmp = 0; int isunicode = PyUnicode_Check(obj); -%#if PY_VERSION_HEX < 0x03000000 if (!isunicode && PyString_Check(obj)) { if (cptr) { obj = tmp = PyUnicode_FromObject(obj); } isunicode = 1; } -%#endif if (isunicode) { - Py_ssize_t len = PyUnicode_GetSize(obj); + int len = PyUnicode_GetSize(obj); if (cptr) { *cptr = %new_array(len + 1, wchar_t); PyUnicode_AsWideChar((PyUnicodeObject *)obj, *cptr, len); diff --git a/Lib/python/std_carray.i b/Lib/python/std_carray.i index 680d67115..2e40757f2 100644 --- a/Lib/python/std_carray.i +++ b/Lib/python/std_carray.i @@ -17,7 +17,7 @@ namespace swig { %extend std::carray { %fragment(SWIG_Traits_frag(std::carray<_Type, _Size >), "header", - fragment="SwigPyIterator_T", + fragment="PySwigIterator_T", fragment=SWIG_Traits_frag(_Type), fragment="StdCarrayTraits") { namespace swig { @@ -36,7 +36,7 @@ namespace swig { %typemap(out,noblock=1) iterator, const_iterator { $result = SWIG_NewPointerObj(swig::make_output_iterator((const $type &)$1), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); + swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN); } inline size_t __len__() const { return self->size(); } @@ -46,7 +46,7 @@ namespace swig { inline void __setitem__(size_t i, const _Type& v) { (*self)[i] = v; } - swig::SwigPyIterator* __iter__(PyObject **PYTHON_SELF) { + swig::PySwigIterator* __iter__(PyObject **PYTHON_SELF) { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } } diff --git a/Lib/python/std_map.i b/Lib/python/std_map.i index c93ffe61b..12dc23ccf 100644 --- a/Lib/python/std_map.i +++ b/Lib/python/std_map.i @@ -5,12 +5,12 @@ %fragment("StdMapTraits","header",fragment="StdSequenceTraits") { namespace swig { - template + template inline void - assign(const SwigPySeq& swigpyseq, std::map *map) { + assign(const PySeq& pyseq, std::map *map) { typedef typename std::map::value_type value_type; - typename SwigPySeq::const_iterator it = swigpyseq.begin(); - for (;it != swigpyseq.end(); ++it) { + typename PySeq::const_iterator it = pyseq.begin(); + for (;it != pyseq.end(); ++it) { map->insert(value_type(it->first, it->second)); } } @@ -21,11 +21,7 @@ static int asptr(PyObject *obj, map_type **val) { int res = SWIG_ERROR; if (PyDict_Check(obj)) { - SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); -%#if PY_VERSION_HEX >= 0x03000000 - /* In Python 3.x the ".items()" method return a dict_items object */ - items = PySequence_Fast(items, ".items() havn't returned a sequence!"); -%#endif + PyObject_var items = PyObject_CallMethod(obj,(char *)"items",NULL); res = traits_asptr_stdseq, std::pair >::asptr(items, val); } else { map_type *p; @@ -58,8 +54,8 @@ } PyObject *obj = PyDict_New(); for (const_iterator i= map.begin(); i!= map.end(); ++i) { - swig::SwigVar_PyObject key = swig::from(i->first); - swig::SwigVar_PyObject val = swig::from(i->second); + swig::PyObject_var key = swig::from(i->first); + swig::PyObject_var val = swig::from(i->second); PyDict_SetItem(obj, key, val); } return obj; @@ -90,10 +86,10 @@ }; template - struct SwigPyMapIterator_T : SwigPyIteratorClosed_T + struct PyMapIterator_T : PySwigIteratorClosed_T { - SwigPyMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) - : SwigPyIteratorClosed_T(curr, first, last, seq) + PyMapIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) + : PySwigIteratorClosed_T(curr, first, last, seq) { } }; @@ -101,37 +97,37 @@ template > - struct SwigPyMapKeyIterator_T : SwigPyMapIterator_T + struct PyMapKeyIterator_T : PyMapIterator_T { - SwigPyMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) - : SwigPyMapIterator_T(curr, first, last, seq) + PyMapKeyIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) + : PyMapIterator_T(curr, first, last, seq) { } }; template - inline SwigPyIterator* + inline PySwigIterator* make_output_key_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0) { - return new SwigPyMapKeyIterator_T(current, begin, end, seq); + return new PyMapKeyIterator_T(current, begin, end, seq); } template > - struct SwigPyMapValueITerator_T : SwigPyMapIterator_T + struct PyMapValueIterator_T : PyMapIterator_T { - SwigPyMapValueITerator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) - : SwigPyMapIterator_T(curr, first, last, seq) + PyMapValueIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq) + : PyMapIterator_T(curr, first, last, seq) { } }; template - inline SwigPyIterator* + inline PySwigIterator* make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0) { - return new SwigPyMapValueITerator_T(current, begin, end, seq); + return new PyMapValueIterator_T(current, begin, end, seq); } } } @@ -222,12 +218,12 @@ } %newobject key_iterator(PyObject **PYTHON_SELF); - swig::SwigPyIterator* key_iterator(PyObject **PYTHON_SELF) { + swig::PySwigIterator* key_iterator(PyObject **PYTHON_SELF) { return swig::make_output_key_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } %newobject value_iterator(PyObject **PYTHON_SELF); - swig::SwigPyIterator* value_iterator(PyObject **PYTHON_SELF) { + swig::PySwigIterator* value_iterator(PyObject **PYTHON_SELF) { return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } diff --git a/Lib/python/std_multimap.i b/Lib/python/std_multimap.i index 58336bc4b..f923af06b 100644 --- a/Lib/python/std_multimap.i +++ b/Lib/python/std_multimap.i @@ -6,12 +6,12 @@ %fragment("StdMultimapTraits","header",fragment="StdSequenceTraits") { namespace swig { - template + template inline void - assign(const SwigPySeq& swigpyseq, std::multimap *multimap) { + assign(const PySeq& pyseq, std::multimap *multimap) { typedef typename std::multimap::value_type value_type; - typename SwigPySeq::const_iterator it = swigpyseq.begin(); - for (;it != swigpyseq.end(); ++it) { + typename PySeq::const_iterator it = pyseq.begin(); + for (;it != pyseq.end(); ++it) { multimap->insert(value_type(it->first, it->second)); } } @@ -22,7 +22,7 @@ static int asptr(PyObject *obj, std::multimap **val) { int res = SWIG_ERROR; if (PyDict_Check(obj)) { - SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); + PyObject_var items = PyObject_CallMethod(obj,(char *)"items",NULL); return traits_asptr_stdseq, std::pair >::asptr(items, val); } else { multimap_type *p; @@ -55,8 +55,8 @@ } PyObject *obj = PyDict_New(); for (const_iterator i= multimap.begin(); i!= multimap.end(); ++i) { - swig::SwigVar_PyObject key = swig::from(i->first); - swig::SwigVar_PyObject val = swig::from(i->second); + swig::PyObject_var key = swig::from(i->first); + swig::PyObject_var val = swig::from(i->second); PyDict_SetItem(obj, key, val); } return obj; diff --git a/Lib/python/std_multiset.i b/Lib/python/std_multiset.i index ac430334c..35a689026 100644 --- a/Lib/python/std_multiset.i +++ b/Lib/python/std_multiset.i @@ -7,13 +7,13 @@ %fragment("StdMultisetTraits","header",fragment="StdSequenceTraits") %{ namespace swig { - template + template inline void - assign(const SwigPySeq& swigpyseq, std::multiset* seq) { - // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented - typedef typename SwigPySeq::value_type value_type; - typename SwigPySeq::const_iterator it = swigpyseq.begin(); - for (;it != swigpyseq.end(); ++it) { + assign(const PySeq& pyseq, std::multiset* seq) { + // seq->insert(pyseq.begin(), pyseq.end()); // not used as not always implemented + typedef typename PySeq::value_type value_type; + typename PySeq::const_iterator it = pyseq.begin(); + for (;it != pyseq.end(); ++it) { seq->insert(seq->end(),(value_type)(*it)); } } diff --git a/Lib/python/std_pair.i b/Lib/python/std_pair.i index bc8ccaade..673e85eef 100644 --- a/Lib/python/std_pair.i +++ b/Lib/python/std_pair.i @@ -42,8 +42,8 @@ } } else if (PySequence_Check(obj)) { if (PySequence_Size(obj) == 2) { - swig::SwigVar_PyObject first = PySequence_GetItem(obj,0); - swig::SwigVar_PyObject second = PySequence_GetItem(obj,1); + swig::PyObject_var first = PySequence_GetItem(obj,0); + swig::PyObject_var second = PySequence_GetItem(obj,1); res = get_pair(first, second, val); } } else { @@ -92,8 +92,8 @@ } } else if (PySequence_Check(obj)) { if (PySequence_Size(obj) == 2) { - swig::SwigVar_PyObject first = PySequence_GetItem(obj,0); - swig::SwigVar_PyObject second = PySequence_GetItem(obj,1); + swig::PyObject_var first = PySequence_GetItem(obj,0); + swig::PyObject_var second = PySequence_GetItem(obj,1); res = get_pair(first, second, val); } } else { diff --git a/Lib/python/std_set.i b/Lib/python/std_set.i index 59f69cdc9..94ef667e2 100644 --- a/Lib/python/std_set.i +++ b/Lib/python/std_set.i @@ -5,13 +5,13 @@ %fragment("StdSetTraits","header",fragment="StdSequenceTraits") %{ namespace swig { - template + template inline void - assign(const SwigPySeq& swigpyseq, std::set* seq) { - // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented - typedef typename SwigPySeq::value_type value_type; - typename SwigPySeq::const_iterator it = swigpyseq.begin(); - for (;it != swigpyseq.end(); ++it) { + assign(const PySeq& pyseq, std::set* seq) { + // seq->insert(pyseq.begin(), pyseq.end()); // not used as not always implemented + typedef typename PySeq::value_type value_type; + typename PySeq::const_iterator it = pyseq.begin(); + for (;it != pyseq.end(); ++it) { seq->insert(seq->end(),(value_type)(*it)); } } diff --git a/Lib/r/r.swg b/Lib/r/r.swg index 7fd6d761f..0ab7e11a0 100644 --- a/Lib/r/r.swg +++ b/Lib/r/r.swg @@ -55,62 +55,13 @@ SWIG_InitializeModule(0); %typemap(out) void ""; -%typemap(in) int *, int[ANY], - signed int *, signed int[ANY], - unsigned int *, unsigned int[ANY], - short *, short[ANY], - signed short *, signed short[ANY], - unsigned short *, unsigned short[ANY], - long *, long[ANY], - signed long *, signed long[ANY], - unsigned long *, unsigned long[ANY], - long long *, long long[ANY], - signed long long *, signed long long[ANY], - unsigned long long *, unsigned long long[ANY] - -{ -{ int _rswigi; - int _rswiglen = LENGTH($input); - $1 = %static_cast(calloc(sizeof($1_basetype), _rswiglen), $1_ltype); - for (_rswigi=0; _rswigi< _rswiglen; _rswigi++) { - $1[_rswigi] = INTEGER($input)[_rswigi]; - } -} -} - -%typemap(in) float *, float[ANY], - double *, double[ANY] - -{ -{ int _rswigi; - int _rswiglen = LENGTH($input); - $1 = %static_cast(calloc(sizeof($1_basetype), _rswiglen), $1_ltype); - for (_rswigi=0; _rswigi<_rswiglen; _rswigi++) { - $1[_rswigi] = REAL($input)[_rswigi]; - } -} -} - -%typemap(freearg,noblock=1) int *, int[ANY], - signed int *, signed int[ANY], - unsigned int *, unsigned int[ANY], - short *, short[ANY], - signed short *, signed short[ANY], - unsigned short *, unsigned short[ANY], - long *, long[ANY], - signed long *, signed long[ANY], - unsigned long *, unsigned long[ANY], - long long *, long long[ANY], - signed long long *, signed long long[ANY], - unsigned long long *, unsigned long long[ANY], - float *, float[ANY], - double *, double[ANY] -%{ - free($1); +%typemap(in) int *, int[ANY] %{ + $1 = INTEGER($input); %} - - +%typemap(in) double *, double[ANY] %{ + $1 = REAL($input); +%} /* Shoul dwe recycle to make the length correct. And warn if length() > the dimension. @@ -126,9 +77,9 @@ SWIG_InitializeModule(0); %} -%typemap(scheck) int, long %{ +%typemap(scheck) int %{ if(length($input) > 1) { - warning("using only the first element of $input") + Rf_warning("using only the first element of $input") } %} @@ -140,6 +91,8 @@ SWIG_InitializeModule(0); %include %include +%apply int[ANY] { enum SWIGTYPE[ANY] }; + %typemap(in,noblock=1) enum SWIGTYPE[ANY] { $1 = %reinterpret_cast(INTEGER($input), $1_ltype); } @@ -204,12 +157,11 @@ $1 = %static_cast(CHAR(STRING_ELT($input, 0))[0],$1_ltype); } -%typemap(in,noblock=1) int, long -{ +%typemap(in,noblock=1) int { $1 = %static_cast(INTEGER($input)[0], $1_ltype); } -%typemap(out,noblock=1) int, long +%typemap(out,noblock=1) int "$result = Rf_ScalarInteger($1);"; @@ -220,16 +172,18 @@ $1 = %static_cast(CHAR(STRING_ELT($input, 0))[0],$1_ltype); %typemap(out,noblock=1) bool "$result = Rf_ScalarLogical($1);"; -%typemap(in,noblock=1) +%typemap(in,noblock=1) unsigned int, + unsigned long, float, - double + double, + long { $1 = %static_cast(REAL($input)[0], $1_ltype); } -/* Why is this here ? */ -/* %typemap(out,noblock=1) unsigned int * - "$result = ScalarReal(*($1));"; */ + +%typemap(out,noblock=1) unsigned int * + "$result = ScalarReal(*($1));"; %Rruntime %{ setMethod('[', "ExternalReference", diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg index 32946c7b5..b5375c213 100644 --- a/Lib/r/rrun.swg +++ b/Lib/r/rrun.swg @@ -16,6 +16,8 @@ extern "C" { #include #include +#define SWIGR 1 + #if R_VERSION >= R_Version(2,6,0) #define VMAXTYPE void * #else diff --git a/Lib/r/rstdcommon.swg b/Lib/r/rstdcommon.swg index 56cbe2cdd..223203773 100644 --- a/Lib/r/rstdcommon.swg +++ b/Lib/r/rstdcommon.swg @@ -40,7 +40,7 @@ namespace swig { struct traits_asptr { static int asptr(SWIG_Object obj, Type **val) { Type *p; - int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); + int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0; if (SWIG_IsOK(res)) { if (val) *val = p; } diff --git a/Lib/r/rtype.swg b/Lib/r/rtype.swg index d388d1eae..9206b5e3e 100644 --- a/Lib/r/rtype.swg +++ b/Lib/r/rtype.swg @@ -3,23 +3,17 @@ for use in class representations. */ -%typemap("rtype") int, int *, int & "integer"; +%typemap("rtype") int, int *, int & "numeric"; %apply int {size_t} %apply int {std::size_t} %apply int {ptrdiff_t} %apply int {std::ptrdiff_t} -%apply int {signed int} -%apply int {unsigned int} -%apply int {short} -%apply int {unsigned short} - -%typemap("rtype") long, long *, long & "integer"; -%apply long {long long} -%apply long {signed long long} -%apply long {unsigned long long} -%apply long {signed long} -%apply long {unsigned long} +%typemap("rtype") long, long * "numeric"; +%typemap("rtype") unsigned long, + unsigned long * "numeric"; +%typemap("rtype") unsigned int, + unsigned int * "numeric"; %typemap("rtype") double, double*, double & "numeric"; %typemap("rtype") float, float *, float & "numeric"; %typemap("rtype") char *, char ** "character"; @@ -41,14 +35,15 @@ INTSXP. */ -/* Force coercion of integer, since by default R sets all constants to - numeric, which means that you can't directly call a function with an - integer using an R numercal literal */ %typemap(scoercein) int, int *, int & - %{ $input = as.integer($input); %} -%typemap(scoercein) long, long *, long & - %{ $input = as.integer($input); %} + %{ $input = as($input, "integer"); %} +%typemap(scoercein) ptrdiff_t, ptrdiff_t *, ptrdiff_t & + %{ $input = as($input, "integer"); %} +%typemap(scoercein) unsigned long, unsigned long *, unsigned long & + %{ $input = as($input, "integer"); %} +%typemap(scoercein) unsigned int, unsigned int *, unsigned int & + %{ $input = as($input, "integer"); %} %typemap(scoercein) double, double *, double & %{ %} %typemap(scoercein) float, float *, float & @@ -92,16 +87,45 @@ %typemap(scoercein) bool, bool *, bool & "$input = as.logical($input) "; +/* %typemap(scoercein) int, int *, int &, int[ANY], - long, - long *, - long &, - long[ANY] + size_t, + std::size_t, + size_t &, + std::size_t & "$input = as.integer($input) "; + +%typemap(scoercein) unsigned int, + unsigned long, + double, + float, + long, + long long, + unsigned int[], + unsigned long[], + double[], + float[], + long[], + long long[], + unsigned int[ANY], + unsigned long[ANY], + double[ANY], + float[ANY], + long[ANY], + long long[ANY], + unsigned int *, + unsigned long *, + double*, + float*, + long*, + long long * +%{ $input = as.numeric($input) %} +*/ + %typemap(scoercein) char *, string, std::string, string &, std::string & %{ $input = as($input, "character") %} @@ -129,38 +153,31 @@ string &, std::string & %typemap(scoerceout) char, char *, char &, + unsigned int, + unsigned int &, + unsigned long, + unsigned long &, double, double &, float, float &, + long, + long &, + long long, + long long &, int, int &, - long, - long &, bool, bool &, string, std::string, string &, std::string &, - void, - signed int, - signed int &, - unsigned int, - unsigned int &, - short, - short &, - unsigned short, - unsigned short &, - long long, - signed long long, - signed long long &, - unsigned long long, - unsigned long long &, - signed long, - signed long &, - unsigned long, - unsigned long & + size_t, + std::size_t, + size_t &, + std::size_t &, + void %{ %} diff --git a/Lib/ruby/file.i b/Lib/ruby/file.i index d64937ed1..54ed0a609 100644 --- a/Lib/ruby/file.i +++ b/Lib/ruby/file.i @@ -3,14 +3,7 @@ #ifdef __cplusplus extern "C" { #endif - -// Ruby 1.9 changed the file name of this header -#ifdef HAVE_RUBY_IO_H -#include "ruby/io.h" -#else #include "rubyio.h" -#endif - #ifdef __cplusplus } #endif diff --git a/Lib/ruby/rubyhead.swg b/Lib/ruby/rubyhead.swg index d17fdbaae..8e6e2e7d0 100644 --- a/Lib/ruby/rubyhead.swg +++ b/Lib/ruby/rubyhead.swg @@ -7,9 +7,6 @@ #ifdef read # undef read #endif -#ifdef bind -# undef bind -#endif /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */ diff --git a/Lib/ruby/rubywstrings.swg b/Lib/ruby/rubywstrings.swg index 862928c95..0cf9d7ed9 100644 --- a/Lib/ruby/rubywstrings.swg +++ b/Lib/ruby/rubywstrings.swg @@ -29,7 +29,7 @@ SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc) // } // } // if (ok) { -// Py_ssize_t len = PyUnicode_GetSize(obj); +// int len = PyUnicode_GetSize(obj); // rb_notimplement(); // if (cptr) { // *cptr = %new_array(len + 1, wchar_t); diff --git a/Lib/shared_ptr.i b/Lib/shared_ptr.i index 709791502..0ccce64bf 100644 --- a/Lib/shared_ptr.i +++ b/Lib/shared_ptr.i @@ -1,8 +1,4 @@ // shared_ptr namespaces could be boost or std or std::tr1 -// For example for std::tr1, use: -// #define SWIG_SHARED_PTR_NAMESPACE std -// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1 - #if !defined(SWIG_SHARED_PTR_NAMESPACE) # define SWIG_SHARED_PTR_NAMESPACE boost #endif @@ -48,12 +44,12 @@ SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) %define SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...) SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, , TYPE) SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) -%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >) %{ +%types(SWIG_SHARED_PTR_NAMESPACE::shared_ptr< TYPE > = SWIG_SHARED_PTR_NAMESPACE::shared_ptr< BASECLASSTYPE >) %{ *newmemory = SWIG_CAST_NEW_MEMORY; - return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *)$from); -%} + return (void *) new SWIG_SHARED_PTR_NAMESPACE::shared_ptr< BASECLASSTYPE >(*(SWIG_SHARED_PTR_NAMESPACE::shared_ptr< TYPE > *)$from); + %} %extend TYPE { - static SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { + static SWIG_SHARED_PTR_NAMESPACE::shared_ptr< BASECLASSTYPE > SWIGSharedPtrUpcast(SWIG_SHARED_PTR_NAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast) { return swigSharedPtrUpcast; } } diff --git a/Lib/swig.swg b/Lib/swig.swg index 77308e080..6f40a8fe9 100644 --- a/Lib/swig.swg +++ b/Lib/swig.swg @@ -25,11 +25,10 @@ /* Code insertion directives such as %wrapper %{ ... %} */ -#define %begin %insert("begin") -#define %runtime %insert("runtime") -#define %header %insert("header") -#define %wrapper %insert("wrapper") #define %init %insert("init") +#define %wrapper %insert("wrapper") +#define %header %insert("header") +#define %runtime %insert("runtime") /* Class extension */ @@ -424,21 +423,13 @@ namespace std { /* Character array handling */ %typemap(memberin) char [ANY] { - if($input) { - strncpy((char*)$1, (const char *)$input, $1_dim0-1); - $1[$1_dim0-1] = 0; - } else { - $1[0] = 0; - } + if ($input) strncpy((char *)$1, (const char *)$input, $1_dim0); + else $1[0] = 0; } %typemap(globalin) char [ANY] { - if($input) { - strncpy((char*)$1, (const char *)$input, $1_dim0-1); - $1[$1_dim0-1] = 0; - } else { - $1[0] = 0; - } + if ($input) strncpy((char *)$1, (const char *)$input, $1_dim0); + else $1[0] = 0; } %typemap(memberin) char [] { @@ -468,26 +459,26 @@ namespace std { /* memberin/globalin typemap for double arrays. */ %typemap(memberin) SWIGTYPE [ANY][ANY] { - $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input); - $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1); + $basetype (*inp)[$dim1] = ($basetype (*)[$dim1])($input); + $basetype (*dest)[$dim1] = ($basetype (*)[$dim1])($1); size_t ii = 0; - for (; ii < $1_dim0; ++ii) { + for (; ii < $dim0; ++ii) { $basetype *ip = inp[ii]; $basetype *dp = dest[ii]; size_t jj = 0; - for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj]; + for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; } } %typemap(globalin) SWIGTYPE [ANY][ANY] { - $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input); - $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1); + $basetype (*inp)[$dim1] = ($basetype (*)[$dim1])($input); + $basetype (*dest)[$dim1] = ($basetype (*)[$dim1])($1); size_t ii = 0; - for (; ii < $1_dim0; ++ii) { + for (; ii < $dim0; ++ii) { $basetype *ip = inp[ii]; $basetype *dp = dest[ii]; size_t jj = 0; - for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj]; + for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; } } @@ -634,10 +625,6 @@ namespace std { * arg1 = *inarg1; // Assignment from a pointer * arg1 = Vector(1,2,3); // Assignment from a value * - * The class offers a strong guarantee of exception safety. - * With regards to the implementation, the private SwigMovePointer nested class is - * a simple smart pointer with move semantics, much like std::auto_ptr. - * * This wrapping technique was suggested by William Fulton and is henceforth * known as the "Fulton Transform" :-). */ @@ -645,21 +632,18 @@ namespace std { #ifdef __cplusplus %insert("runtime") %{ #ifdef __cplusplus -/* SwigValueWrapper is described in swig.swg */ template class SwigValueWrapper { - struct SwigMovePointer { - T *ptr; - SwigMovePointer(T *p) : ptr(p) { } - ~SwigMovePointer() { delete ptr; } - SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); + T *tt; public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; } - operator T&() const { return *pointer.ptr; } - T *operator&() { return pointer.ptr; } + SwigValueWrapper() : tt(0) { } + SwigValueWrapper(const SwigValueWrapper& rhs) : tt(new T(*rhs.tt)) { } + SwigValueWrapper(const T& t) : tt(new T(t)) { } + ~SwigValueWrapper() { delete tt; } + SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; } + operator T&() const { return *tt; } + T *operator&() { return tt; } +private: + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); };%} /* diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index a8e9ad74c..9ee676a2b 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- * swigrun.swg * - * This file contains generic C API SWIG runtime support for pointer + * This file contains generic CAPI SWIG runtime support for pointer * type checking. * ----------------------------------------------------------------------------- */ @@ -20,11 +20,11 @@ /* You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for - creating a static or dynamic library from the SWIG runtime code. - In 99.9% of the cases, SWIG just needs to declare them as 'static'. + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. - But only do this if strictly necessary, ie, if you have problems - with your compiler or suchlike. + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. */ #ifndef SWIGRUNTIME @@ -51,14 +51,14 @@ /* Flags/methods for returning states. - The SWIG conversion methods, as ConvertPtr, return and integer + The swig conversion methods, as ConvertPtr, return and integer that tells if the conversion was successful or not. And if not, an error code can be returned (see swigerrors.swg for the codes). Use the following macros/flags to set or process the returning states. - In old versions of SWIG, code such as the following was usually written: + In old swig versions, you usually write code as: if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { // success code @@ -66,7 +66,7 @@ //fail code } - Now you can be more explicit: + Now you can be more explicit as: int res = SWIG_ConvertPtr(obj,vptr,ty.flags); if (SWIG_IsOK(res)) { @@ -75,7 +75,7 @@ // fail code } - which is the same really, but now you can also do + that seems to be the same, but now you can also do Type *ptr; int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); @@ -93,7 +93,7 @@ I.e., now SWIG_ConvertPtr can return new objects and you can identify the case and take care of the deallocation. Of course that - also requires SWIG_ConvertPtr to return new result values, such as + requires also to SWIG_ConvertPtr to return new result values, as int SWIG_ConvertPtr(obj, ptr,...) { if () { @@ -111,7 +111,7 @@ Of course, returning the plain '0(success)/-1(fail)' still works, but you can be more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the - SWIG errors code. + swig errors code. Finally, if the SWIG_CASTRANK_MODE is enabled, the result code allows to return the 'cast rank', for example, if you have this @@ -125,8 +125,9 @@ fooi(1) // cast rank '0' just use the SWIG_AddCast()/SWIG_CheckState() -*/ + + */ #define SWIG_OK (0) #define SWIG_ERROR (-1) #define SWIG_IsOK(r) (r >= 0) @@ -151,6 +152,7 @@ #define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) #define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) + /* Cast-Rank Mode */ #if defined(SWIG_CASTRANK_MODE) # ifndef SWIG_TypeRank @@ -173,6 +175,8 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) { #endif + + #include #ifdef __cplusplus @@ -269,58 +273,40 @@ SWIG_TypeCompare(const char *nb, const char *tb) { } +/* think of this as a c++ template<> or a scheme macro */ +#define SWIG_TypeCheck_Template(comparison, ty) \ + if (ty) { \ + swig_cast_info *iter = ty->cast; \ + while (iter) { \ + if (comparison) { \ + if (iter == ty->cast) return iter; \ + /* Move iter to the top of the linked list */ \ + iter->prev->next = iter->next; \ + if (iter->next) \ + iter->next->prev = iter->prev; \ + iter->next = ty->cast; \ + iter->prev = 0; \ + if (ty->cast) ty->cast->prev = iter; \ + ty->cast = iter; \ + return iter; \ + } \ + iter = iter->next; \ + } \ + } \ + return 0 + /* Check the typename */ SWIGRUNTIME swig_cast_info * SWIG_TypeCheck(const char *c, swig_type_info *ty) { - if (ty) { - swig_cast_info *iter = ty->cast; - while (iter) { - if (strcmp(iter->type->name, c) == 0) { - if (iter == ty->cast) - return iter; - /* Move iter to the top of the linked list */ - iter->prev->next = iter->next; - if (iter->next) - iter->next->prev = iter->prev; - iter->next = ty->cast; - iter->prev = 0; - if (ty->cast) ty->cast->prev = iter; - ty->cast = iter; - return iter; - } - iter = iter->next; - } - } - return 0; + SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); } -/* - Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison -*/ +/* Same as previous function, except strcmp is replaced with a pointer comparison */ SWIGRUNTIME swig_cast_info * -SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) { - if (ty) { - swig_cast_info *iter = ty->cast; - while (iter) { - if (iter->type == from) { - if (iter == ty->cast) - return iter; - /* Move iter to the top of the linked list */ - iter->prev->next = iter->next; - if (iter->next) - iter->next->prev = iter->prev; - iter->next = ty->cast; - iter->prev = 0; - if (ty->cast) ty->cast->prev = iter; - ty->cast = iter; - return iter; - } - iter = iter->next; - } - } - return 0; +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { + SWIG_TypeCheck_Template(iter->type == from, into); } /* diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg index 4bc6315b7..f6335be82 100644 --- a/Lib/typemaps/attribute.swg +++ b/Lib/typemaps/attribute.swg @@ -11,7 +11,7 @@ The following macros convert a pair of set/get methods into a "native" attribute. - Use %attribute when you have a pair of get/set methods to a primitive type + Use %attribute when you have a pair of get/set methods like in: %attribute(A, int, a, get_a, set_a); @@ -27,8 +27,8 @@ %attribute(A, int, c, get_c); - Use %attributeref when you have const/non-const reference access methods - for primitive types or class/structs, like in: + Use %attributeref when you have const/non-const reference + access methods, like in: %attributeref(A, int, b); @@ -99,40 +99,6 @@ where %arg() 'normalizes' the type to be understood as a single argument, otherwise the macro will get confused by the comma. - - The %attributeval is the same as %attribute, but should be used when the type - is a class/struct (ie a non-primitive type) and when the get and set methods - return/pass by value. The following is very similar to the above example, but - note that the access is by value rather than reference. - - %attributeval(MyClassVal, MyFoo, ReadWriteFoo, GetFoo, SetFoo); - %attributeval(MyClassVal, MyFoo, ReadOnlyFoo, GetFoo); - %inline %{ - class MyClassVal { - MyFoo foo; - public: - MyFoo GetFoo() { return foo; } - void SetFoo(MyFoo other) { foo = other; } - }; - %} - - The %attributestring is the same as %attributeval, but should be used for string - class types, which are unusual as they are a class on the C++ side, but normally an - immutable/primitive type in the target language. Example usage for std::string: - - %include - %attributestring(MyStringyClass, std::string, ReadWriteString, GetString, SetString); - %attributestring(MyStringyClass, std::string, ReadOnlyString, GetString); - %inline %{ - class MyStringyClass { - std::string str; - public: - MyStringyClass(const std::string &val) : str(val) {} - std::string GetString() { return str; } - void SetString(std::string other) { str = other; } - }; - %} - */ // @@ -237,50 +203,3 @@ #endif %enddef - -%define %attributeval(Class, AttributeType, AttributeName, GetMethod, SetMethod...) - %{ - #define %mangle(Class) ##_## AttributeName ## _get(self_) new AttributeType(self_->GetMethod()) - %} - #if #SetMethod != "" - %{ - #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) self_->SetMethod(*val_) - %} - #if #SetMethod != #AttributeName - %ignore Class::SetMethod; - #endif - #else - %immutable Class::AttributeName; - #endif - %ignore Class::GetMethod(); - %ignore Class::GetMethod() const; - %newobject Class::AttributeName; - %extend Class { - AttributeType AttributeName; - } -%enddef - - -%define %attributestring(Class, AttributeType, AttributeName, GetMethod, SetMethod...) - %{ - #define %mangle(Class) ##_## AttributeName ## _get(self_) *new AttributeType(self_->GetMethod()) - %} - #if #SetMethod != "" - %{ - #define %mangle(Class) ##_## AttributeName ## _set(self_, val_) self_->SetMethod(val_) - %} - #if #SetMethod != #AttributeName - %ignore Class::SetMethod; - #endif - #else - %immutable Class::AttributeName; - #endif - %ignore Class::GetMethod(); - %ignore Class::GetMethod() const; - %newobject Class::AttributeName; - %typemap(newfree) const AttributeType &AttributeName "delete $1;// my newfree override" - %extend Class { - AttributeType AttributeName; - } -%enddef - diff --git a/Lib/typemaps/swigtype.swg b/Lib/typemaps/swigtype.swg index 15f2f9b41..f5c88a717 100644 --- a/Lib/typemaps/swigtype.swg +++ b/Lib/typemaps/swigtype.swg @@ -124,7 +124,7 @@ %typemap(memberin) SWIGTYPE [ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = $input[ii]; + for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii]; } else { %variable_nullref("$type","$name"); } @@ -133,7 +133,7 @@ %typemap(globalin) SWIGTYPE [ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = $input[ii]; + for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii]; } else { %variable_nullref("$type","$name"); } @@ -146,7 +146,7 @@ %variable_fail(res, "$type", "$name"); } else if (inp) { size_t ii = 0; - for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = inp[ii]; + for (; ii < (size_t)$dim0; ++ii) $1[ii] = inp[ii]; } else { %variable_nullref("$type", "$name"); } @@ -158,10 +158,10 @@ %typemap(memberin) SWIGTYPE [ANY][ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$1_dim0; ++ii) { + for (; ii < (size_t)$dim0; ++ii) { if ($input[ii]) { size_t jj = 0; - for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj]; + for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj]; } else { %variable_nullref("$type","$name"); } @@ -174,10 +174,10 @@ %typemap(globalin) SWIGTYPE [ANY][ANY] { if ($input) { size_t ii = 0; - for (; ii < (size_t)$1_dim0; ++ii) { + for (; ii < (size_t)$dim0; ++ii) { if ($input[ii]) { size_t jj = 0; - for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj]; + for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj]; } else { %variable_nullref("$type","$name"); } @@ -188,16 +188,16 @@ } %typemap(varin) SWIGTYPE [ANY][ANY] { - $basetype (*inp)[$1_dim1] = 0; + $basetype (*inp)[$dim1] = 0; int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags); if (!SWIG_IsOK(res)) { %variable_fail(res, "$type", "$name"); } else if (inp) { size_t ii = 0; - for (; ii < (size_t)$1_dim0; ++ii) { + for (; ii < (size_t)$dim0; ++ii) { if (inp[ii]) { size_t jj = 0; - for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = inp[ii][jj]; + for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = inp[ii][jj]; } else { %variable_nullref("$type", "$name"); } diff --git a/Makefile.in b/Makefile.in index b56272b11..dd3867f0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,8 +2,6 @@ # $Id$ ####################################################################### -.PHONY: ccache source swig - prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ @@ -16,39 +14,23 @@ datarootdir = @datarootdir@ SHELL = /bin/sh SWIG_LIB = @swig_lib@ BIN_DIR = @bindir@ -ENABLE_CCACHE = @ENABLE_CCACHE@ TARGET_NOEXE= swig TARGET = $(TARGET_NOEXE)@EXEEXT@ SOURCE = Source -CCACHE = CCache DOCS = Doc/Manual -swig: libfiles source ccache +swig: libfiles source source: @cd $(SOURCE) && $(MAKE) -ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE)) - libfiles: $(srcdir)/Lib/swigwarn.swg # Files required just for the tarball maintainer: libfiles @cd $(SOURCE) && $(MAKE) CParse/parser.h -##################################################################### -# Documentation -##################################################################### - -docs: docs-main docs-ccache - -docs-main: - @echo making docs - @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) all clean-baks - -docs-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) docs) +.PHONY: source libfiles maintainer ##################################################################### # All the languages SWIG speaks (when it wants to) @@ -62,7 +44,7 @@ skip-guilescm = test -n "@SKIP_GUILESCM@" skip-guile = test -n "@SKIP_GUILE@" skip-mzscheme = test -n "@SKIP_MZSCHEME@" skip-ruby = test -n "@SKIP_RUBY@" -skip-php = test -n "@SKIP_PHP@" +skip-php4 = test -n "@SKIP_PHP4@" skip-ocaml = test -n "@SKIP_OCAML@" skip-octave = test -n "@SKIP_OCTAVE@" skip-pike = test -n "@SKIP_PIKE@" @@ -85,7 +67,6 @@ skip-gcj = test -n "@SKIP_GCJ@" ##################################################################### ACTION = check -NOSKIP = chk-set-swiglib = SWIG_LIB=@ROOT_DIR@/Lib chk-set-swig = SWIG=@ROOT_DIR@/$(TARGET) @@ -104,7 +85,7 @@ check-aliveness: @$(skip-ruby) || ./$(TARGET) -ruby -help @$(skip-ocaml) || ./$(TARGET) -ocaml -help @$(skip-octave) || ./$(TARGET) -octave -help - @$(skip-php) || ./$(TARGET) -php -help + @$(skip-php4) || ./$(TARGET) -php4 -help @$(skip-pike) || ./$(TARGET) -pike -help @$(skip-chicken) || ./$(TARGET) -chicken -help @$(skip-csharp) || ./$(TARGET) -csharp -help @@ -113,9 +94,6 @@ check-aliveness: @$(skip-r) || ./$(TARGET) -r -help @$(skip-c) || ./$(TARGET) -c -help -check-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) check) - # Checks examples for compilation (does not run them) check-examples: \ check-tcl-examples \ @@ -127,7 +105,7 @@ check-examples: \ check-ruby-examples \ check-ocaml-examples \ check-octave-examples \ - check-php-examples \ + check-php4-examples \ check-pike-examples \ check-chicken-examples \ check-csharp-examples \ @@ -137,7 +115,7 @@ check-examples: \ check-clisp-examples \ check-uffi-examples \ check-cffi-examples \ - check-r-examples \ + check-r-examples \ check-c-examples tcl_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/tcl/check.list) @@ -149,7 +127,7 @@ mzscheme_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/mzscheme/check.list ruby_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/ruby/check.list) ocaml_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/ocaml/check.list) octave_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/octave/check.list) -php_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/php/check.list) +php4_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/php4/check.list) pike_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/pike/check.list) chicken_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/chicken/check.list) csharp_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/csharp/check.list) @@ -202,13 +180,13 @@ check-gifplot: \ check-ruby-gifplot \ check-ocaml-gifplot \ check-octave-gifplot \ - check-php-gifplot \ + check-php4-gifplot \ check-pike-gifplot \ check-chicken-gifplot \ # check-lua-gifplot \ # check-csharp-gifplot \ -# check-modula3-gifplot \ -# check-c-gifplot +# check-modula3-gifplot \ +# check-c-gifplot check-%-gifplot: gifplot-library @if test -z "$(skip-$*)"; then \ @@ -245,7 +223,7 @@ check-test-suite: \ check-ruby-test-suite \ check-ocaml-test-suite \ check-octave-test-suite \ - check-php-test-suite \ + check-php4-test-suite \ check-pike-test-suite \ check-csharp-test-suite \ check-modula3-test-suite \ @@ -255,7 +233,7 @@ check-test-suite: \ check-uffi-test-suite \ check-cffi-test-suite \ check-chicken-test-suite \ - check-r-test-suite \ + check-r-test-suite \ check-c-test-suite check-%-test-suite: @@ -265,7 +243,7 @@ check-%-test-suite: fi @passed=true; \ dir="Examples/test-suite/$*"; \ - if $(skip-$*) -a "$(NOSKIP)" != "1"; then \ + if $(skip-$*); then \ echo skipping $* test-suite $(ACTION); \ elif [ ! -d $$dir ]; then \ echo warning: cannot $(ACTION) $* test-suite "(no dir $$dir)";\ @@ -278,12 +256,12 @@ check-%-test-suite: # Partial test-suite check - it only invokes SWIG, ie no compilation and no runtime testing partialcheck-test-suite: - @$(MAKE) -k -s check-test-suite ACTION=partialcheck NOSKIP=1 + @$(MAKE) -k -s check-test-suite ACTION=partialcheck partialcheck-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck NOSKIP=1 + @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck -check: check-aliveness check-ccache check-examples check-gifplot check-test-suite +check: check-aliveness check-examples check-gifplot check-test-suite # Run known-to-be-broken as well as not broken testcases in the test-suite all-test-suite: \ @@ -297,7 +275,7 @@ all-test-suite: \ all-ruby-test-suite \ all-ocaml-test-suite \ all-octave-test-suite \ - all-php-test-suite \ + all-php4-test-suite \ all-pike-test-suite \ all-csharp-test-suite \ all-modula3-test-suite \ @@ -307,7 +285,7 @@ all-test-suite: \ all-uffi-test-suite \ all-cffi-test-suite \ all-chicken-test-suite \ - all-r-test-suite \ + all-r-test-suite \ all-c-test-suite all-%-test-suite: @@ -325,7 +303,7 @@ broken-test-suite: \ broken-ruby-test-suite \ broken-ocaml-test-suite \ broken-octave-test-suite \ - broken-php-test-suite \ + broken-php4-test-suite \ broken-pike-test-suite \ broken-csharp-test-suite \ broken-modula3-test-suite \ @@ -335,8 +313,8 @@ broken-test-suite: \ broken-uffi-test-suite \ broken-cffi-test-suite \ broken-chicken-test-suite \ - broken-r-test-suite \ - broken-c-test-suite + broken-r-test-suite \ + broken-c-test-suite broken-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=broken @@ -347,7 +325,7 @@ broken-%-test-suite: clean: clean-objects clean-libfiles clean-examples clean-gifplot clean-test-suite clean-docs -clean-objects: clean-source clean-ccache +clean-objects: clean-source clean-source: @echo cleaning Source @@ -364,28 +342,20 @@ clean-gifplot: @$(MAKE) -k -s check-gifplot ACTION=clean clean-test-suite: - @$(MAKE) -k -s check-test-suite ACTION=clean NOSKIP=1 + @$(MAKE) -k -s check-test-suite ACTION=clean clean-%-examples: @$(MAKE) -k -s check-$*-examples ACTION=clean clean-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=clean NOSKIP=1 + @$(MAKE) -k -s check-$*-test-suite ACTION=clean clean-%-gifplot: @$(MAKE) -k -s check-$*-gifplot ACTION=clean -clean-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s clean) - -clean-docs: clean-docs-main clean-docs-ccache - -clean-docs-main: +clean-docs: @echo cleaning Docs - @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) clean - -clean-docs-ccache: - @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) clean-docs) + @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) -s clean maintainer-clean: clean-libfiles @cd $(SOURCE) && $(MAKE) maintainer-clean @@ -396,7 +366,7 @@ maintainer-clean: clean-libfiles DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool -distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite clean-docs distclean-dead distclean-ccache +distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite clean-docs distclean-dead distclean-objects: distclean-source @@ -407,10 +377,39 @@ distclean-source: distclean-test-suite: @echo distcleaning Examples/test-suite - @$(MAKE) -k -s check-test-suite ACTION=distclean NOSKIP=1 + @$(MAKE) -k -s noskip-test-suite ACTION=distclean -distclean-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s distclean) +noskip-test-suite: \ + noskip-tcl-test-suite \ + noskip-perl5-test-suite \ + noskip-python-test-suite \ + noskip-java-test-suite \ + noskip-guilescm-test-suite \ + noskip-guile-test-suite \ + noskip-mzscheme-test-suite \ + noskip-ruby-test-suite \ + noskip-ocaml-test-suite \ + noskip-octave-test-suite \ + noskip-php4-test-suite \ + noskip-pike-test-suite \ + noskip-csharp-test-suite \ + noskip-lua-test-suite \ + noskip-allegrocl-test-suite \ + noskip-clisp-test-suite \ + noskip-uffi-test-suite \ + noskip-cffi-test-suite \ + noskip-chicken-test-suite \ + noskip-r-test-suite \ + noskip-c-test-suite + +noskip-%-test-suite: + dir="Examples/test-suite/$*"; \ + if [ ! -d $$dir ]; then \ + echo warning: cannot $(ACTION) $* test-suite "(no dir $$dir)";\ + else \ + echo $(ACTION)ing $$dir; \ + (cd $$dir && $(MAKE) -k -s $(ACTION)) \ + fi; distclean-dead: rm -f $(DISTCLEAN-DEAD) @@ -440,7 +439,7 @@ MKINSTDIRS = @abs_srcdir@/Tools/config/install-sh -m 0755 -d # Use standard autoconf approach to transform executable name using --program-prefix and --program-suffix transform = @program_transform_name@ -install: install-main install-lib install-ccache +install: install-main install-lib @echo "Installation complete" install-main: @@ -449,7 +448,7 @@ install-main: @echo "Installing $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@" @$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@ -lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php ocaml octave \ +lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php4 ocaml octave \ pike chicken csharp modula3 allegrocl clisp lua cffi uffi r c lib-modules = std @@ -484,15 +483,12 @@ install-lib: fi) ; \ done -install-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) install) - ##################################################################### # TARGETS: uninstall & friends ##################################################################### -uninstall: uninstall-main uninstall-lib uninstall-ccache +uninstall: uninstall-main uninstall-lib @echo "Uninstall complete" uninstall-main: @@ -503,9 +499,6 @@ uninstall-lib: @echo "Uninstalling the SWIG library" rm -rf $(DESTDIR)$(SWIG_LIB)/ -uninstall-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) uninstall) - ############################################################################ # DIST and other maintenance ############################################################################ diff --git a/README b/README index 3df9e506a..2898130b0 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 1.3.40 (in progress) +Version: 1.3.36 (24 June 2008) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, @@ -91,27 +91,6 @@ A SWIG FAQ and other hints can be found on the SWIG Wiki: What's New? =========== -SWIG-1.3.39 summary: -- Some new small feature enhancements. -- Improved C# std::vector wrappers. -- Bug fixes: mainly Python, but also Perl, MzScheme, CFFI, Allegrocl - and Ruby - -SWIG-1.3.38 summary: -- Output directory regression fix and other minor bug fixes - -SWIG-1.3.37 summary: -- Python 3 support added -- SWIG now ships with a version of ccache that can be used with SWIG. - This enables the files generated by SWIG to be cached so that repeated - use of SWIG on unchanged input files speeds up builds quite considerably. -- PHP 4 support removed and PHP support improved in general -- Improved C# array support -- Numerous Allegro CL improvements -- Bug fixes/enhancements for Python, PHP, Java, C#, Chicken, Allegro CL, - CFFI, Ruby, Tcl, Perl, R, Lua. -- Other minor generic bug fixes and enhancements - SWIG-1.3.36 summary: - Enhancement to directors to wrap all protected members - Optimisation feature for objects returned by value diff --git a/Source/CParse/cparse.h b/Source/CParse/cparse.h index 9be41c60e..06a901c0d 100644 --- a/Source/CParse/cparse.h +++ b/Source/CParse/cparse.h @@ -34,18 +34,16 @@ extern "C" { extern void scanner_ignore_typedef(void); extern void scanner_last_id(int); extern void scanner_clear_rename(void); - extern void scanner_set_location(String *file, int line); - extern void scanner_set_main_input_file(String *file); - extern String *scanner_get_main_input_file(); + extern void scanner_set_location(String_or_char *, int line); extern void Swig_cparse_follow_locators(int); extern void start_inline(char *, int); extern String *scanner_ccode; - extern int yylex(void); + extern int yylex(); /* parser.y */ extern SwigType *Swig_cparse_type(String *); extern Node *Swig_cparse(File *); - extern Hash *Swig_cparse_features(void); + extern Hash *Swig_cparse_features(); extern void SWIG_cparse_set_compact_default_args(int defargs); extern int SWIG_cparse_template_reduce(int treduce); diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index 8734c7d0e..032c71f7e 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -22,10 +22,7 @@ char cvsroot_cscanner_c[] = "$Id$"; static Scanner *scan = 0; /* Global string containing C code. Used by the parser to grab code blocks */ -String *scanner_ccode = 0; - -/* The main file being parsed */ -static String *main_input_file = 0; +DOHString *scanner_ccode = 0; /* Error reporting/location information */ int cparse_line = 1; @@ -264,8 +261,10 @@ int yylook(void) { while (1) { if ((tok = Scanner_token(scan)) == 0) return 0; - if (tok == SWIG_TOKEN_ERROR) - return 0; + if (tok == SWIG_TOKEN_ERROR) { + Swig_error(Scanner_file(scan), Scanner_errline(scan), Scanner_errmsg(scan)); + continue; + } cparse_start_line = Scanner_start_line(scan); cparse_line = Scanner_line(scan); cparse_file = Scanner_file(scan); @@ -442,7 +441,7 @@ int yylook(void) { static int check_typedef = 0; -void scanner_set_location(String *file, int line) { +void scanner_set_location(String_or_char *file, int line) { Scanner_set_location(scan,file,line-1); } @@ -468,14 +467,6 @@ void scanner_next_token(int tok) { next_token = tok; } -void scanner_set_main_input_file(String *file) { - main_input_file = file; -} - -String *scanner_get_main_input_file() { - return main_input_file; -} - /* ---------------------------------------------------------------------------- * int yylex() * @@ -699,22 +690,10 @@ int yylex(void) { termtoken = SWIG_TOKEN_LPAREN; termvalue = "("; break; - } else if (nexttok == SWIG_TOKEN_CODEBLOCK) { - termtoken = SWIG_TOKEN_CODEBLOCK; - termvalue = Char(Scanner_text(scan)); - break; - } else if (nexttok == SWIG_TOKEN_LBRACE) { - termtoken = SWIG_TOKEN_LBRACE; - termvalue = "{"; - break; - } else if (nexttok == SWIG_TOKEN_SEMI) { + } else if (nexttok == SWIG_TOKEN_SEMI) { termtoken = SWIG_TOKEN_SEMI; termvalue = ";"; break; - } else if (nexttok == SWIG_TOKEN_STRING) { - termtoken = SWIG_TOKEN_STRING; - termvalue = Swig_copy_string(Char(Scanner_text(scan))); - break; } else if (nexttok == SWIG_TOKEN_ID) { if (needspace) { Append(s," "); @@ -880,14 +859,8 @@ int yylex(void) { return (INLINE); if (strcmp(yytext, "%typemap") == 0) return (TYPEMAP); - if (strcmp(yytext, "%feature") == 0) { - /* The rename_active indicates we don't need the information of the - * following function's return type. This applied for %rename, so do - * %feature. - */ - rename_active = 1; + if (strcmp(yytext, "%feature") == 0) return (FEATURE); - } if (strcmp(yytext, "%except") == 0) return (EXCEPT); if (strcmp(yytext, "%importfile") == 0) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 0babfbbb8..58e0c0c41 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -66,7 +66,7 @@ static void yyerror (const char *e) { (void)e; } -static Node *new_node(const_String_or_char_ptr tag) { +static Node *new_node(const String_or_char *tag) { Node *n = NewHash(); set_nodeType(n,tag); Setfile(n,cparse_file); @@ -203,7 +203,7 @@ static String *yyrename = 0; static String *resolve_node_scope(String *cname); -Hash *Swig_cparse_features(void) { +Hash *Swig_cparse_features() { static Hash *features_hash = 0; if (!features_hash) features_hash = NewHash(); return features_hash; @@ -1002,68 +1002,6 @@ static void add_nested(Nested *n) { } } -/* Strips C-style and C++-style comments from string in-place. */ -static void strip_comments(char *string) { - int state = 0; /* - * 0 - not in comment - * 1 - in c-style comment - * 2 - in c++-style comment - * 3 - in string - * 4 - after reading / not in comments - * 5 - after reading * in c-style comments - * 6 - after reading \ in strings - */ - char * c = string; - while (*c) { - switch (state) { - case 0: - if (*c == '\"') - state = 3; - else if (*c == '/') - state = 4; - break; - case 1: - if (*c == '*') - state = 5; - *c = ' '; - break; - case 2: - if (*c == '\n') - state = 0; - else - *c = ' '; - break; - case 3: - if (*c == '\"') - state = 0; - else if (*c == '\\') - state = 6; - break; - case 4: - if (*c == '/') { - *(c-1) = ' '; - *c = ' '; - state = 2; - } else if (*c == '*') { - *(c-1) = ' '; - *c = ' '; - state = 1; - } else - state = 0; - break; - case 5: - if (*c == '/') - state = 0; - *c = ' '; - break; - case 6: - state = 3; - break; - } - ++c; - } -} - /* Dump all of the nested class declarations to the inline processor * However. We need to do a few name replacements and other munging * first. This function must be called before closing a class! */ @@ -1115,9 +1053,6 @@ static Node *dump_nested(const char *parent) { ret = retx; */ - /* Strip comments - further code may break in presence of comments. */ - strip_comments(Char(n->code)); - /* Make all SWIG created typedef structs/unions/classes unnamed else redefinition errors occur - nasty hack alert.*/ @@ -1425,7 +1360,7 @@ static void default_arguments(Node *n) { * Used by the parser to mark subtypes with extra information. * ----------------------------------------------------------------------------- */ -static void tag_nodes(Node *n, const_String_or_char_ptr attrname, DOH *value) { +static void tag_nodes(Node *n, const String_or_char *attrname, DOH *value) { while (n) { Setattr(n, attrname, value); tag_nodes(firstChild(n), attrname, value); @@ -1951,19 +1886,14 @@ fragment_directive: FRAGMENT LPAREN fname COMMA kwargs RPAREN HBLOCK { ; /* ------------------------------------------------------------ - %includefile "filename" [option1="xyz", ...] [ declarations ] - %importfile "filename" [option1="xyz", ...] [ declarations ] + %includefile "filename" [ declarations ] + %importfile "filename" [ declarations ] ------------------------------------------------------------ */ include_directive: includetype options string LBRACKET { $1.filename = Copy(cparse_file); $1.line = cparse_line; scanner_set_location(NewString($3),1); - if ($2) { - String *maininput = Getattr($2, "maininput"); - if (maininput) - scanner_set_main_input_file(NewString(maininput)); - } } interface RBRACKET { String *mname = 0; $$ = $6; @@ -2360,25 +2290,21 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr String *val = $7 ? NewString($7) : NewString("1"); new_feature($3, val, 0, $5.id, $5.type, $5.parms, $6.qualifier); $$ = 0; - scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum RPAREN declarator cpp_const SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, 0, $7.id, $7.type, $7.parms, $8.qualifier); $$ = 0; - scanner_clear_rename(); } | FEATURE LPAREN idstring featattr RPAREN declarator cpp_const stringbracesemi { String *val = $8 ? NewString($8) : NewString("1"); new_feature($3, val, $4, $6.id, $6.type, $6.parms, $7.qualifier); $$ = 0; - scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN declarator cpp_const SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, $6, $8.id, $8.type, $8.parms, $9.qualifier); $$ = 0; - scanner_clear_rename(); } /* Global feature */ @@ -2386,25 +2312,21 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr String *val = $5 ? NewString($5) : NewString("1"); new_feature($3, val, 0, 0, 0, 0, 0); $$ = 0; - scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum RPAREN SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, 0, 0, 0, 0, 0); $$ = 0; - scanner_clear_rename(); } | FEATURE LPAREN idstring featattr RPAREN stringbracesemi { String *val = $6 ? NewString($6) : NewString("1"); new_feature($3, val, $4, 0, 0, 0, 0); $$ = 0; - scanner_clear_rename(); } | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN SEMI { String *val = Len($5) ? NewString($5) : 0; new_feature($3, val, $6, 0, 0, 0, 0); $$ = 0; - scanner_clear_rename(); } ; @@ -3230,15 +3152,15 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { List *bases = 0; Node *scope = 0; - $$ = new_node("class"); - Setline($$,cparse_start_line); - Setattr($$,"kind",$2); + $$ = new_node("class"); + Setline($$,cparse_start_line); + Setattr($$,"kind",$2); if ($4) { - Setattr($$,"baselist", Getattr($4,"public")); - Setattr($$,"protectedbaselist", Getattr($4,"protected")); - Setattr($$,"privatebaselist", Getattr($4,"private")); + Setattr($$,"baselist", Getattr($4,"public")); + Setattr($$,"protectedbaselist", Getattr($4,"protected")); + Setattr($$,"privatebaselist", Getattr($4,"private")); } - Setattr($$,"allows_typedef","1"); + Setattr($$,"allows_typedef","1"); /* preserve the current scope */ prev_symtab = Swig_symbol_current(); @@ -3267,10 +3189,10 @@ cpp_class_decl : nscope_inner = 0; } } - Setattr($$,"name",$3); + Setattr($$,"name",$3); Delete(class_rename); - class_rename = make_name($$,$3,0); + class_rename = make_name($$,$3,0); Classprefix = NewString($3); /* Deal with inheritance */ if ($4) { @@ -3334,12 +3256,12 @@ cpp_class_decl : } else { max_class_levels *= 2; } - class_decl = (Node**) realloc(class_decl, sizeof(Node*) * max_class_levels); + class_decl = realloc(class_decl, sizeof(Node*) * max_class_levels); if (!class_decl) { Swig_error(cparse_file, cparse_line, "realloc() failed\n"); } } - class_decl[class_level++] = $$; + class_decl[class_level++] = $$; inclass = 1; } cpp_members RBRACE cpp_opt_declarators { Node *p; @@ -3462,14 +3384,14 @@ cpp_class_decl : | storage_class cpptype LBRACE { String *unnamed; unnamed = make_unnamed(); - $$ = new_node("class"); - Setline($$,cparse_start_line); - Setattr($$,"kind",$2); - Setattr($$,"storage",$1); - Setattr($$,"unnamed",unnamed); - Setattr($$,"allows_typedef","1"); + $$ = new_node("class"); + Setline($$,cparse_start_line); + Setattr($$,"kind",$2); + Setattr($$,"storage",$1); + Setattr($$,"unnamed",unnamed); + Setattr($$,"allows_typedef","1"); Delete(class_rename); - class_rename = make_name($$,0,0); + class_rename = make_name($$,0,0); if (strcmp($2,"class") == 0) { cplus_mode = CPLUS_PRIVATE; } else { @@ -3483,12 +3405,12 @@ cpp_class_decl : } else { max_class_levels *= 2; } - class_decl = (Node**) realloc(class_decl, sizeof(Node*) * max_class_levels); + class_decl = realloc(class_decl, sizeof(Node*) * max_class_levels); if (!class_decl) { Swig_error(cparse_file, cparse_line, "realloc() failed\n"); } } - class_decl[class_level++] = $$; + class_decl[class_level++] = $$; inclass = 1; Classprefix = NewStringEmpty(); Delete(Namespaceprefix); @@ -5492,18 +5414,7 @@ valexpr : exprnum { $$ = $1; } | LPAREN expr RPAREN expr %prec CAST { $$ = $4; if ($4.type != T_STRING) { - switch ($2.type) { - case T_FLOAT: - case T_DOUBLE: - case T_LONGDOUBLE: - case T_FLTCPLX: - case T_DBLCPLX: - $$.val = NewStringf("(%s)%s", $2.val, $4.val); /* SwigType_str and decimal points don't mix! */ - break; - default: - $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $4.val); - break; - } + $$.val = NewStringf("(%s) %s", SwigType_str($2.val,0), $4.val); } } | LPAREN expr pointer RPAREN expr %prec CAST { diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index 14886605f..8142125a7 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -15,7 +15,7 @@ char cvsroot_templ_c[] = "$Id$"; static int template_debug = 0; -const char *baselists[3]; +String *baselists[3]; void SwigType_template_init() { baselists[0] = "baselist"; @@ -167,21 +167,18 @@ static int cparse_template_expand(Node *n, String *tname, String *rname, String add_parms(Getattr(n, "throws"), cpatchlist, typelist); } else if (Equal(nodeType, "destructor")) { String *name = Getattr(n, "name"); - if (name) { - if (strchr(Char(name), '<')) - Append(patchlist, Getattr(n, "name")); - else - Append(name, templateargs); + if (name && strchr(Char(name), '<')) { + Append(patchlist, Getattr(n, "name")); + } else { + Append(name, templateargs); } name = Getattr(n, "sym:name"); - if (name) { - if (strchr(Char(name), '<')) { - String *sn = Copy(tname); - Setattr(n, "sym:name", sn); - Delete(sn); - } else { - Replace(name, tname, rname, DOH_REPLACE_ANY); - } + if (name && strchr(Char(name), '<')) { + String *sn = Copy(tname); + Setattr(n, "sym:name", sn); + Delete(sn); + } else { + Replace(name, tname, rname, DOH_REPLACE_ANY); } /* Setattr(n,"sym:name",name); */ Append(cpatchlist, Getattr(n, "code")); diff --git a/Source/DOH/README b/Source/DOH/README index 9a42e8b8b..1e948105c 100644 --- a/Source/DOH/README +++ b/Source/DOH/README @@ -92,12 +92,12 @@ DohEncoding(name, fn) Register a format encoding for Printf Currently Available datatypes ------------------------------ -NewString(char *initial) Strings -NewHash() Hash -NewList() List -NewVoid(void *ptr, void (*del)(void *)) Void -NewFile(char *filename, char *mode, List *newfiles) File -NewCallable(DOH *(*func)(DOH *, DOH *)) Callable object +NewString(char *initial) Strings +NewHash() Hash +NewList() List +NewVoid(void *ptr, void (*del)(void *)) Void +NewFile(char *file, char *mode) File +NewCallable(DOH *(*func)(DOH *, DOH *)) Callable object Odds and ends: diff --git a/Source/DOH/base.c b/Source/DOH/base.c index 15827f328..dcb0140e0 100644 --- a/Source/DOH/base.c +++ b/Source/DOH/base.c @@ -827,7 +827,7 @@ void DohSetfile(DOH *ho, DOH *file) { /* ----------------------------------------------------------------------------- * DohGetFile() * ----------------------------------------------------------------------------- */ -DOH *DohGetfile(const DOH *ho) { +DOH *DohGetfile(DOH *ho) { DohBase *h = (DohBase *) ho; DohObjInfo *objinfo; if (!h) @@ -854,7 +854,7 @@ void DohSetline(DOH *ho, int l) { /* ----------------------------------------------------------------------------- * DohGetLine() * ----------------------------------------------------------------------------- */ -int DohGetline(const DOH *ho) { +int DohGetline(DOH *ho) { DohBase *h = (DohBase *) ho; DohObjInfo *objinfo; if (!h) diff --git a/Source/DOH/doh.h b/Source/DOH/doh.h index 766e12a34..7ab244fab 100644 --- a/Source/DOH/doh.h +++ b/Source/DOH/doh.h @@ -144,9 +144,6 @@ typedef void DOH; #define DOHString_or_char DOH #define DOHObj_or_char DOH -typedef const DOHString_or_char * const_String_or_char_ptr; -typedef const DOHString_or_char * DOHconst_String_or_char_ptr; - #define DOH_BEGIN -1 #define DOH_END -2 #define DOH_CUR -3 @@ -237,9 +234,9 @@ extern DohIterator DohNext(DohIterator x); /* Positional */ -extern int DohGetline(const DOH *obj); +extern int DohGetline(DOH *obj); extern void DohSetline(DOH *obj, int line); -extern DOH *DohGetfile(const DOH *obj); +extern DOH *DohGetfile(DOH *obj); extern void DohSetfile(DOH *obj, DOH *file); /* String Methods */ @@ -274,7 +271,7 @@ extern int DohGetmark(DOH *obj); * Strings. * ----------------------------------------------------------------------------- */ -extern DOHString *DohNewStringEmpty(void); +extern DOHString *DohNewStringEmpty(); extern DOHString *DohNewString(const DOH *c); extern DOHString *DohNewStringWithSize(const DOH *c, int len); extern DOHString *DohNewStringf(const DOH *fmt, ...); @@ -300,7 +297,7 @@ extern char *DohStrchr(const DOHString_or_char *s1, int ch); * Files * ----------------------------------------------------------------------------- */ -extern DOHFile *DohNewFile(DOH *filename, const char *mode, DOHList *outfiles); +extern DOHFile *DohNewFile(DOH *file, const char *mode); extern DOHFile *DohNewFileFromFile(FILE *f); extern DOHFile *DohNewFileFromFd(int fd); extern void DohFileErrorDisplay(DOHString * filename); @@ -312,14 +309,14 @@ extern int DohCopyto(DOHFile * input, DOHFile * output); * List * ----------------------------------------------------------------------------- */ -extern DOHList *DohNewList(void); +extern DOHList *DohNewList(); extern void DohSortList(DOH *lo, int (*cmp) (const DOH *, const DOH *)); /* ----------------------------------------------------------------------------- * Hash * ----------------------------------------------------------------------------- */ -extern DOHHash *DohNewHash(void); +extern DOHHash *DohNewHash(); /* ----------------------------------------------------------------------------- * Void diff --git a/Source/DOH/file.c b/Source/DOH/file.c index 65c2336a4..8c53978ee 100644 --- a/Source/DOH/file.c +++ b/Source/DOH/file.c @@ -228,16 +228,15 @@ static DohObjInfo DohFileType = { * NewFile() * * Create a new file from a given filename and mode. - * If newfiles is non-zero, the filename is added to the list of new files. * ----------------------------------------------------------------------------- */ -DOH *DohNewFile(DOH *filename, const char *mode, DOHList *newfiles) { +DOH *DohNewFile(DOH *fn, const char *mode) { DohFile *f; FILE *file; - char *filen; + char *filename; - filen = Char(filename); - file = fopen(filen, mode); + filename = Char(fn); + file = fopen(filename, mode); if (!file) return 0; @@ -246,8 +245,6 @@ DOH *DohNewFile(DOH *filename, const char *mode, DOHList *newfiles) { fclose(file); return 0; } - if (newfiles) - Append(newfiles, filename); f->filep = file; f->fd = 0; f->closeondel = 1; diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 045de8b5b..62aef10f2 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -535,7 +535,7 @@ DohObjInfo DohHashType = { * Create a new hash table. * ----------------------------------------------------------------------------- */ -DOH *DohNewHash(void) { +DOH *DohNewHash() { Hash *h; int i; h = (Hash *) DohMalloc(sizeof(Hash)); diff --git a/Source/DOH/list.c b/Source/DOH/list.c index 7a1786299..a45731de1 100644 --- a/Source/DOH/list.c +++ b/Source/DOH/list.c @@ -345,7 +345,7 @@ DohObjInfo DohListType = { #define MAXLISTITEMS 8 -DOH *DohNewList(void) { +DOH *DohNewList() { List *l; int i; l = (List *) DohMalloc(sizeof(List)); diff --git a/Source/DOH/string.c b/Source/DOH/string.c index 141cd58e8..1498d717a 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -1056,7 +1056,7 @@ DOHString *DohNewString(const DOH *so) { * NewStringEmpty() - Create a new string * ----------------------------------------------------------------------------- */ -DOHString *DohNewStringEmpty(void) { +DOHString *DohNewStringEmpty() { int max = INIT_MAXSIZE; String *str = (String *) DohMalloc(sizeof(String)); str->hashkey = 0; diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index ebcd2fe7c..72e394c98 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -49,7 +49,6 @@ #define WARN_DEPRECATED_NOEXTERN 122 #define WARN_DEPRECATED_NODEFAULT 123 #define WARN_DEPRECATED_TYPEMAP_LANG 124 -#define WARN_DEPRECATED_INPUT_FILE 125 /* -- Preprocessor -- */ @@ -248,21 +247,15 @@ /* please leave 850-869 free for Modula 3 */ -/* These are needed for backward compatibility, but you don't need to add - * PHP4 versions of new warnings since existing user interface files can't - * be using them. - */ -#define WARN_PHP_MULTIPLE_INHERITANCE 870 -#define WARN_PHP_UNKNOWN_PRAGMA 871 +#define WARN_PHP4_MULTIPLE_INHERITANCE 870 +#define WARN_PHP4_UNKNOWN_PRAGMA 871 -#define WARN_PHP_MULTIPLE_INHERITANCE 870 -#define WARN_PHP_UNKNOWN_PRAGMA 871 +/* please leave 870-889 free for Php */ -/* please leave 870-889 free for PHP */ +#define WARN_C_TYPEMAP_CTYPE_UNDEF 890 /* please leave 890-909 free for C */ -#define WARN_C_TYPEMAP_CTYPE_UNDEF 890 /* Feel free to claim any number in this space that's not currently being used. Just make sure you add an entry here */ diff --git a/Source/Makefile.am b/Source/Makefile.am index a5f4a0c39..c44f22931 100644 --- a/Source/Makefile.am +++ b/Source/Makefile.am @@ -38,11 +38,11 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/allegrocl.cxx \ Modules/allocate.cxx \ Modules/browser.cxx \ - Modules/c.cxx \ Modules/cffi.cxx \ Modules/chicken.cxx \ Modules/clisp.cxx \ Modules/contract.cxx \ + Modules/c.cxx \ Modules/csharp.cxx \ Modules/directors.cxx \ Modules/emit.cxx \ @@ -58,7 +58,7 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/octave.cxx \ Modules/overload.cxx \ Modules/perl5.cxx \ - Modules/php.cxx \ + Modules/php4.cxx \ Modules/pike.cxx \ Modules/python.cxx \ Modules/r.cxx \ diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 878e30a67..a968e506c 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -21,8 +21,7 @@ char cvsroot_allegrocl_cxx[] = "$Id$"; static File *f_cl = 0; String *f_clhead = NewString(""); String *f_clwrap = NewString("(swig-in-package ())\n\n"); -static File *f_begin; -static File *f_runtime; +static File *f_cxx; static File *f_cxx_header = 0; static File *f_cxx_wrapper = 0; @@ -35,8 +34,6 @@ static bool CWrap = true; // generate wrapper file for C code by default. most c static bool Generate_Wrapper = false; static bool unique_swig_package = false; -static SwigType *fwdref_ffi_type = NewString("__SWIGACL_FwdReference"); - static String *current_namespace = NewString(""); static String *current_package = NewString(""); static Hash *defined_namespace_packages = NewHash(); @@ -171,7 +168,6 @@ static String *namespace_of(String *str) { void add_linked_type(Node *n) { #ifdef ALLEGROCL_CLASS_DEBUG Printf(stderr, "Adding linked node of type: %s(%s) %s(%x)\n\n", nodeType(n), Getattr(n, "storage"), Getattr(n, "name"), n); - // Swig_print_node(n); #endif if (!first_linked_type) { first_linked_type = n; @@ -301,8 +297,7 @@ void add_forward_referenced_type(Node *n, int overwrite = 0) { } } -void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, - String *name = 0, String *ns = current_namespace) { +void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, String *name = 0, String *ns = current_namespace) { String *val; String *ns_list = listify_namespace(ns); @@ -326,34 +321,22 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, /* For typedefs of the form: - typedef struct __xxx { ... } xxx; + typedef __xxx { ... } xxx; - behavior differs between C mode and C++ mode. - - C Mode: add_defined_foreign_type will be called once via classHandler - to define the type for 'struct __xxx' and add the mapping from - 'struct __xxx' -> 'xxx' + to define the type for 'struct __xxx', and once via typedefHandler + to associate xxx with 'struct __xxx'. - It will also be called once via typedefHandler to add the - mapping 'xxx' -> 'xxx' + We create the following type to identifier mappings: - C++ Mode: - add_defined_foreign_type will be called once via classHandler - to define the type for 'xxx'. it also adds the mapping from - 'xxx' -> 'xxx' and also for 'struct xxx' -> 'xxx' + struct __xxx -> (swig-insert-id "xxx") via classHand + xxx -> (swig-insert-id "xxx") via typedefHand - In typedefHandler, we again try to add the mapping from - 'xxx' -> 'xxx', which already exists. This second mapping - is ignored. + and all references to this typedef'd struct will appear in + generated code as 'xxx'. For non-typedef'd structs, the + classHand mapping will be - Both modes: - - All references to this typedef'd struct will appear in - generated lisp code as an objectd of type 'xxx'. For - non-typedef'd structs, the classHand mapping will be - - struct __xxx -> (swig-insert-id "__xxx") + struct __xxx -> (swig-insert-id "__xxx") */ // Swig_print_node(n); String *unnamed = Getattr(n, "unnamed"); @@ -602,11 +585,7 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, Delete(mangled_name_gen); Delete(mangled_lname_gen); } else { - if (!CPlusPlus || Strcmp(Getattr(n,"kind"),"typedef")) { - Swig_warning(WARN_TYPE_REDEFINED, Getfile(n), Getline(n), - "Attempting to store a foreign type that exists: %s (%s)\n", - k, val); - } + Swig_warning(WARN_TYPE_REDEFINED, Getfile(n), Getline(n), "Attempting to store a foreign type that exists: %s (%s)\n", k, val); } Delete(ns_list); @@ -626,7 +605,7 @@ void note_implicit_template_instantiation(SwigType *t) { add_defined_foreign_type(0, 0, t, t, implicit_ns ? implicit_ns : current_namespace); } -String *get_ffi_type(SwigType *ty, const_String_or_char_ptr name) { +String *get_ffi_type(SwigType *ty, const String_or_char *name) { /* lookup defined foreign type. if it exists, it will return a form suitable for placing into lisp code to generate the def-foreign-type name */ @@ -641,8 +620,7 @@ String *get_ffi_type(SwigType *ty, const_String_or_char_ptr name) { #ifdef ALLEGROCL_TYPE_DEBUG Printf(stderr, "found_type '%s'\n", found_type); #endif - return (Strcmp(found_type, "forward-reference") ? Copy(found_type) : - get_ffi_type(fwdref_ffi_type, "")); + return (Strcmp(found_type, "forward-reference") ? Copy(found_type) : NewString(":void")); } else { Hash *typemap = Swig_typemap_search("ffitype", ty, name, 0); @@ -729,39 +707,25 @@ String *internal_compose_foreign_type(SwigType *ty) { if (res) Printf(ffiType, "%s", res); } - +// while(resolved_type) { +// // the resolved_type may expand into something like p.NS1::NS2::SomeType +// // for which get_ffi_type will not find any match (due to the p.). +// // Printf(stderr, "\n in resolved type loop on '%s'\n", resolved_type); +// res = get_ffi_type(resolved_type, ""); +// if (res) { +// Printf(ffiType, "%s", res); +// break; +// } else { +// resolved_type = SwigType_typedef_resolve(resolved_type); +// } +// } if (!res) { - String *is_struct = 0; - String *tok_remove_text = 0; - String *tok_name = Copy(tok); - String *tok_key = SwigType_str(tok,0); - if ((is_struct = Strstr(tok_key, "struct ")) || Strstr(tok_key, "union ")) { - tok_remove_text = NewString(is_struct ? "struct " : "union "); + if (Strstr(tok, "struct ")) { + Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(tok), Getline(tok), "Unable to find definition of '%s', assuming forward reference.\n", tok); + } else { + Printf(stderr, "Unable to compose foreign type of: '%s'\n", tok); } - - /* be more permissive of opaque types. This is the swig way. - compiles will notice if these types are ultimately not - present. */ - - if(tok_remove_text) { - Replaceall(tok_name,tok_remove_text,""); - } - tok_name = strip_namespaces(tok_name); - Delete(tok_remove_text); - // Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(tok), Getline(tok), "Unable to find definition of '%s', assuming forward reference.\n", tok); - -#ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "i-c-f-t: adding forward reference for unknown type '%s'. mapping: %s -> %s\n", tok, tok_key, tok_name); -#endif - Node *nn = NewHash(); - Setattr(nn,"nodeType","classforward"); - Setattr(nn,"kind","class"); - Setattr(nn,"sym:name",tok_name); - Setattr(nn,"name",tok_key); - Setattr(nn,"allegrocl:package",current_namespace); - - add_forward_referenced_type(nn, 0); - Printf(ffiType, "%s", get_ffi_type(tok, ""), tok_name); + Printf(ffiType, "(* :void)"); } } } @@ -769,36 +733,24 @@ String *internal_compose_foreign_type(SwigType *ty) { return ffiType; } -String *compose_foreign_type(SwigType *ty, String * /*id*/ = 0) { - -/* Hash *lookup_res = Swig_typemap_search("ffitype", ty, id, 0); */ +String *compose_foreign_type(SwigType *ty, String *id = 0) { + Hash *lookup_res = Swig_typemap_search("ffitype", ty, id, 0); #ifdef ALLEGROCL_TYPE_DEBUG Printf(stderr, "compose_foreign_type: ENTER (%s)...\n ", ty); - // Printf(stderr, "compose_foreign_type: ENTER (%s)(%s)...\n ", ty, (id ? id : 0)); - /* String *id_ref = SwigType_str(ty, id); + String *id_ref = SwigType_str(ty, id); Printf(stderr, "looking up typemap for %s, found '%s'(%x)\n", id_ref, lookup_res ? Getattr(lookup_res, "code") : 0, lookup_res); - if (lookup_res) Swig_print_node(lookup_res); - */ #endif - /* should we allow named lookups in the typemap here? YES! */ /* unnamed lookups should be found in get_ffi_type, called by internal_compose_foreign_type(), below. */ - - /* I'm reverting to 'no' for the question above. I can no longer - remember why I needed it. If a user needed it, I'll find out - as soon as they upgrade. Sigh. -mutandiz 9/16/2008. */ - -/* if(id && lookup_res) { #ifdef ALLEGROCL_TYPE_DEBUG Printf(stderr, "compose_foreign_type: EXIT-1 (%s)\n ", Getattr(lookup_res, "code")); #endif return NewString(Getattr(lookup_res, "code")); } -*/ SwigType *temp = SwigType_strip_qualifiers(ty); String *res = internal_compose_foreign_type(temp); @@ -876,10 +828,6 @@ String *strip_parens(String *string) { } int ALLEGROCL::validIdentifier(String *s) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "validIdentifier %s\n", s); -#endif - char *c = Char(s); bool got_dot = false; @@ -1006,7 +954,6 @@ String *convert_literal(String *literal, String *type, bool try_to_split) { Delete(num); num = 0; } - Delete(lisp_exp); } else { String *id = NewStringf("#.(swig-insert-id \"%s\" %s :type :constant)", num, ns); @@ -1137,8 +1084,7 @@ void emit_synonym(Node *synonym) { of_ltype = lookup_defined_foreign_ltype(of_name); // Printf(f_clhead,";; from emit-synonym\n"); - if( of_ltype ) - Printf(f_clhead, "(swig-def-synonym-type %s\n %s\n %s)\n", syn_ltype, of_ltype, syn_type); + Printf(f_clhead, "(swig-def-synonym-type %s\n %s\n %s)\n", syn_ltype, of_ltype, syn_type); Delete(synonym_ns); Delete(of_ns_list); @@ -1338,6 +1284,7 @@ void emit_typedef(Node *n) { // leave these in for now. might want to change these to def-foreign-class at some point. // Printf(f_clhead, ";; %s\n", SwigType_typedef_resolve_all(lisp_type)); + // Swig_print_node(n); Printf(f_clhead, "(swig-def-foreign-type \"%s\"\n %s)\n", name, lisp_type); Delete(name); @@ -1521,7 +1468,6 @@ extern "C" Language *swig_allegrocl(void) { void ALLEGROCL::main(int argc, char *argv[]) { int i; - Preprocessor_define("SWIGALLEGROCL 1", 0); SWIG_library_directory("allegrocl"); SWIG_config_file("allegrocl.swg"); @@ -1569,10 +1515,7 @@ void ALLEGROCL::main(int argc, char *argv[]) { "\tcalled to convert identifiers to symbols.\n" "\n" " -[no]cwrap\n" - "\tTurn on or turn off generation of an intermediate C file when\n" "\tcreating a C interface. By default this is only done for C++ code.\n" - " -isolate\n" - "Define all SWIG helper functions in a package unique to this module. Avoids redefinition warnings when loading multiple SWIGged modules\n" - "into the same running Allegro CL image.\n"); + "\tTurn on or turn off generation of an intermediate C file when\n" "\tcreating a C interface. By default this is only done for C++ code.\n"); } @@ -1588,9 +1531,9 @@ int ALLEGROCL::top(Node *n) { swig_package = unique_swig_package ? NewStringf("swig.%s", module_name) : NewString("swig"); - Printf(cl_filename, "%s%s.cl", SWIG_output_directory(), module_name); + Printf(cl_filename, "%s%s.cl", SWIG_output_directory(), Swig_file_basename(Getattr(n,"infile"))); - f_cl = NewFile(cl_filename, "w", SWIG_output_files()); + f_cl = NewFile(cl_filename, "w"); if (!f_cl) { Printf(stderr, "Unable to open %s for writing\n", cl_filename); SWIG_exit(EXIT_FAILURE); @@ -1599,42 +1542,33 @@ int ALLEGROCL::top(Node *n) { Generate_Wrapper = CPlusPlus || CWrap; if (Generate_Wrapper) { - f_begin = NewFile(cxx_filename, "w", SWIG_output_files()); - if (!f_begin) { + f_cxx = NewFile(cxx_filename, "w"); + if (!f_cxx) { Close(f_cl); Delete(f_cl); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); SWIG_exit(EXIT_FAILURE); } } else - f_begin = NewString(""); + f_cxx = NewString(""); - f_runtime = NewString(""); - f_cxx_header = f_runtime; + f_cxx_header = f_cxx; f_cxx_wrapper = NewString(""); Swig_register_filebyname("header", f_cxx_header); Swig_register_filebyname("wrapper", f_cxx_wrapper); - Swig_register_filebyname("begin", f_begin); - Swig_register_filebyname("runtime", f_runtime); + Swig_register_filebyname("runtime", f_cxx); Swig_register_filebyname("lisp", f_clwrap); Swig_register_filebyname("lisphead", f_cl); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGALLEGROCL\n"); - Printf(f_runtime, "\n"); - - Swig_banner_target_lang(f_cl, ";;"); - - Printf(f_cl, "\n" + Printf(f_cl, ";; This is an automatically generated file. Make changes in\n" + ";; the definition file, not here.\n\n" "(defpackage :%s\n" " (:use :common-lisp :ff :excl)\n" " (:export #:*swig-identifier-converter* #:*swig-module-name*\n" " #:*void* #:*swig-export-list*))\n" "(in-package :%s)\n\n" - "(eval-when (:compile-toplevel :load-toplevel :execute)\n" + "(eval-when (compile load eval)\n" " (defparameter *swig-identifier-converter* '%s)\n" " (defparameter *swig-module-name* :%s))\n\n", swig_package, swig_package, identifier_converter, module_name); Printf(f_cl, "(defpackage :%s\n" " (:use :common-lisp :%s :ff :excl))\n\n", module_name, swig_package); @@ -1645,7 +1579,7 @@ int ALLEGROCL::top(Node *n) { Language::top(n); - // SwigType_emit_type_table(f_runtime,f_cxx_wrapper); + // SwigType_emit_type_table(f_cxx,f_cxx_wrapper); // Swig_print_tree(n); #ifdef ALLEGROCL_TYPE_DEBUG @@ -1668,12 +1602,8 @@ int ALLEGROCL::top(Node *n) { Delete(f_clhead); Delete(f_clwrap); - Dump(f_runtime, f_begin); - Printf(f_begin, "%s\n", f_cxx_wrapper); - - Close(f_begin); - Delete(f_runtime); - Delete(f_begin); + Close(f_cxx); + Delete(f_cxx); Delete(f_cxx_wrapper); // Swig_print_tree(n); @@ -1968,7 +1898,7 @@ int any_varargs(ParmList *pl) { return 0; } -String *get_lisp_type(SwigType *ty, const_String_or_char_ptr name) { +String *get_lisp_type(SwigType *ty, const String_or_char *name) { Hash *typemap = Swig_typemap_search("lisptype", ty, name, 0); if (typemap) { String *typespec = Getattr(typemap, "code"); @@ -2154,9 +2084,7 @@ struct IDargs { String *arity; IDargs():name(0), type(0), klass(0), arity(0) { - } - - String *full_quoted_str() { + } String *full_quoted_str() { String *result = no_others_quoted_str(); if (arity) Printf(result, " :arity %s", arity); @@ -2407,24 +2335,41 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { for (p = pl; p; p = nextSibling(p), argnum++, largnum++) { // SwigType *argtype=Getattr(p, "type"); SwigType *argtype = Swig_cparse_type(Getattr(p, "tmap:ctype")); - SwigType *parmtype = Getattr(p,"type"); if (!first) { Printf(fcl, "\n "); } - /* by default, skip varargs */ - if (!SwigType_isvarargs(parmtype)) { + if (SwigType_isvarargs(argtype)) { + Printf(stderr, "Function %s (line %d) contains varargs, which is not directly supported. Use %%varargs instead.\n", Getattr(n, "name"), Getline(n)); + } else { String *argname = NewStringf("PARM%d_%s", largnum, Getattr(p, "name")); + // Swig_print_node(p); // Printf(stderr,"%s\n", Getattr(p,"tmap:lin")); String *ffitype = compose_foreign_type(argtype, Getattr(p,"name")); - String *deref_ffitype = dereference_ffitype(ffitype); - String *lisptype = get_lisp_type(parmtype, Getattr(p, "name")); + String *deref_ffitype; + + deref_ffitype = dereference_ffitype(ffitype); + +/* + String *temp = Copy(argtype); + + if (SwigType_ispointer(temp)) { + SwigType_pop(temp); + deref_ffitype = compose_foreign_type(temp); + } else { + deref_ffitype = Copy(ffitype); + } + + Delete(temp); +*/ + // String *lisptype=get_lisp_type(argtype, argname); + String *lisptype = get_lisp_type(Getattr(p, "type"), Getattr(p, "name")); #ifdef ALLEGROCL_DEBUG - Printf(stderr, "lisptype of '%s' '%s' = '%s'\n", parmtype, - Getattr(p, "name"), lisptype); + Printf(stderr, "lisptype of '%s' '%s' = '%s'\n", + Getattr(p, "type"), Getattr(p, "name"), lisptype); #endif // while we're walking the parameters, generating LIN @@ -2455,9 +2400,7 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { first = 0; } - Delete(argname); Delete(ffitype); - Delete(deref_ffitype); Delete(lisptype); } } @@ -2495,6 +2438,11 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { lclass = lookup_defined_foreign_ltype(cl_t); isPtrReturn = 1; } + // if (SwigType_ispointer(cl_t)) { + // isPtrReturn = 1; + // SwigType_pop(cl_t); + // lclass = lookup_defined_foreign_ltype(cl_t); + // } int ff_foreign_ptr = 0; if (!lclass) { @@ -2567,16 +2515,9 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { } int ALLEGROCL::functionWrapper(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "functionWrapper %s\n", Getattr(n,"name")); - Swig_print_node(n); -#endif - ParmList *parms = CopyParmList(Getattr(n, "parms")); Wrapper *f = NewWrapper(); - SwigType *t = Getattr(n, "type"); - String *name = Getattr(n, "name"); String *raw_return_type = Swig_typemap_lookup("ctype", n, "", 0); SwigType *return_type = Swig_cparse_type(raw_return_type); @@ -2586,13 +2527,11 @@ int ALLEGROCL::functionWrapper(Node *n) { Delete(resolved); if (!is_void_return) { - String *lresult_init = - NewStringf("= (%s)0", - SwigType_str(SwigType_strip_qualifiers(return_type),0)); - Wrapper_add_localv(f, "lresult", - SwigType_lstr(SwigType_ltype(return_type), "lresult"), - lresult_init, NIL); - Delete(lresult_init); + String *lresult_init = NewStringf("= (%s)0", raw_return_type); + Wrapper_add_localv(f, "lresult", + SwigType_lstr(SwigType_ltype(return_type), "lresult"), + lresult_init, NIL); + Delete(lresult_init); } // Emit all of the local variables for holding arguments. emit_parameter_variables(parms, f); @@ -2617,7 +2556,7 @@ int ALLEGROCL::functionWrapper(Node *n) { if (Getattr(n, "overload:ignore")) { // if we're the last overload, make sure to force the emit // of the rest of the overloads before we leave. - Printf(stderr, "ignored overload %s(%x)\n", name, Getattr(n, "sym:nextSibling")); + Printf(stderr, "ignored overload %s(%x)\n", Getattr(n, "name"), Getattr(n, "sym:nextSibling")); if (!Getattr(n, "sym:nextSibling")) { update_package_if_needed(n); emit_buffered_defuns(n); @@ -2632,7 +2571,7 @@ int ALLEGROCL::functionWrapper(Node *n) { int gencomma = 0; #ifdef ALLEGROCL_DEBUG - Printf(stderr, "Walking parameters for %s '%s'\n", Getattr(n, "allegrocl:kind"), name); + Printf(stderr, "Walking parameters for %s '%s'\n", Getattr(n, "allegrocl:kind"), Getattr(n, "name")); #endif // Now walk the function parameter list and generate code to get arguments String *name_and_parms = NewStringf("%s (", mangled); @@ -2686,34 +2625,24 @@ int ALLEGROCL::functionWrapper(Node *n) { String *actioncode = emit_action(n); - String *tm = Swig_typemap_lookup_out("out", n, "result", f, actioncode); - if (!is_void_return && tm) { - if (tm) { - Replaceall(tm, "$result", "lresult"); - Printf(f->code, "%s\n", tm); - Printf(f->code, " return lresult;\n"); - Delete(tm); - } else { - Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, - "Unable to use return type %s in function %s.\n", - SwigType_str(t, 0), name); - } - } - - emit_return_variable(n, t, f); + String *result_convert = Swig_typemap_lookup_out("out", n, "result", f, actioncode); + Replaceall(result_convert, "$result", "lresult"); + Printf(f->code, "%s\n", result_convert); + Printf(f->code, " return lresult;\n"); + Delete(result_convert); + emit_return_variable(n, Getattr(n, "type"), f); if (CPlusPlus) { Printf(f->code, " } catch (...) {\n"); if (!is_void_return) - Printf(f->code, " return (%s)0;\n", - SwigType_str(SwigType_strip_qualifiers(return_type),0)); + Printf(f->code, " return (%s)0;\n", raw_return_type); Printf(f->code, " }\n"); } Printf(f->code, "}\n"); /* print this when in C mode? make this a command-line arg? */ if (Generate_Wrapper) - Wrapper_print(f, f_cxx_wrapper); + Wrapper_print(f, f_cxx); String *f_buffer = NewString(""); @@ -2735,15 +2664,13 @@ int ALLEGROCL::functionWrapper(Node *n) { } int ALLEGROCL::namespaceDeclaration(Node *n) { + // Empty namespaces are not worth DEFPACKAGEing. + // Swig_print_node(n); #ifdef ALLEGROCL_DEBUG Printf(stderr, "namespaceDecl: '%s'(0x%x) (fc=0x%x)\n", Getattr(n, "sym:name"), n, firstChild(n)); #endif - /* don't wrap a namespace with no contents. package bloat. - also, test-suite/namespace_class.i claims an unnamed namespace - is 'private' and should not be wrapped. Complying... - */ - if (Getattr(n,"unnamed") || !firstChild(n)) + if (!firstChild(n)) return SWIG_OK; String *name = Getattr(n, "sym:name"); @@ -2770,7 +2697,7 @@ int ALLEGROCL::namespaceDeclaration(Node *n) { int ALLEGROCL::constructorHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "constructorHandler %s\n", Getattr(n, "name")); + Printf(stderr, "constructor %s\n", Getattr(n, "name")); #endif // Swig_print_node(n); Setattr(n, "allegrocl:kind", "constructor"); @@ -2782,7 +2709,7 @@ int ALLEGROCL::constructorHandler(Node *n) { int ALLEGROCL::destructorHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "destructorHandler %s\n", Getattr(n, "name")); + Printf(stderr, "destructor %s\n", Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "destructor"); @@ -2793,8 +2720,9 @@ int ALLEGROCL::destructorHandler(Node *n) { } int ALLEGROCL::constantWrapper(Node *n) { + #ifdef ALLEGROCL_DEBUG - Printf(stderr, "constantWrapper %s\n", Getattr(n, "name")); + Printf(stderr, "constant %s\n", Getattr(n, "name")); #endif if (Generate_Wrapper) { @@ -2813,10 +2741,10 @@ int ALLEGROCL::constantWrapper(Node *n) { } SwigType_add_qualifier(const_type, "const"); + SwigType_add_qualifier(const_type, "static"); - String *ppcname = NewStringf("ACLppc_%s", Getattr(n, "sym:name")); - // Printf(f_runtime, "static const %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val); - Printf(f_runtime, "static %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val); + String *ppcname = NewStringf("ACLppc_%s", Getattr(n, "name")); + Printf(f_cxx, "static const %s = %s;\n", SwigType_lstr(const_type, ppcname), const_val); Setattr(n, "name", ppcname); SetFlag(n, "feature:immutable"); @@ -2850,10 +2778,6 @@ int ALLEGROCL::constantWrapper(Node *n) { } int ALLEGROCL::globalvariableHandler(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "globalvariableHandler %s\n", Getattr(n, "name")); -#endif - if (Generate_Wrapper) return Language::globalvariableHandler(n); @@ -2873,7 +2797,7 @@ int ALLEGROCL::globalvariableHandler(Node *n) { ctype = SwigType_str(type, 0); // EXPORT ; // = ; - // Printf(f_runtime, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, + // Printf(f_cxx, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, // ctype, mangled_name, (pointer_added ? "&" : ""), name); Printf(f_clwrap, "(swig-defvar \"%s\" \"%s\" :type %s)\n", @@ -2884,7 +2808,7 @@ int ALLEGROCL::globalvariableHandler(Node *n) { int ALLEGROCL::variableWrapper(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "variableWrapper %s\n", Getattr(n, "name")); + Printf(stderr, "variable %s\n", Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "variable"); Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name")); @@ -2909,30 +2833,24 @@ int ALLEGROCL::variableWrapper(Node *n) { } ctype = SwigType_str(type, 0); - // EXPORT ; // = ; - Printf(f_runtime, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, ctype, mangled_name, (pointer_added ? "&" : ""), name); + Printf(f_cxx, "EXPORT %s %s;\n%s %s = %s%s;\n", ctype, mangled_name, ctype, mangled_name, (pointer_added ? "&" : ""), name); Printf(f_cl, "(swig-defvar \"%s\" :type %s)\n", mangled_name, ((SwigType_isconst(type)) ? ":constant" : ":variable")); /* - Printf(f_runtime, "// swigtype: %s\n", SwigType_typedef_resolve_all(Getattr(n,"type"))); - Printf(f_runtime, "// vwrap: %s\n", compose_foreign_type(SwigType_strip_qualifiers(Copy(rtype)))); + Printf(f_cxx, "// swigtype: %s\n", SwigType_typedef_resolve_all(Getattr(n,"type"))); + Printf(f_cxx, "// vwrap: %s\n", compose_foreign_type(SwigType_strip_qualifiers(Copy(rtype)))); */ - Printf(stderr,"***\n"); Delete(mangled_name); -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "DONE variable %s\n", Getattr(n, "name")); -#endif - return SWIG_OK; } int ALLEGROCL::memberfunctionHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "memberfunctionHandler %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); + Printf(stderr, "member function %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "member function"); Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name")); @@ -2943,7 +2861,7 @@ int ALLEGROCL::memberfunctionHandler(Node *n) { int ALLEGROCL::membervariableHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "membervariableHandler %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); + Printf(stderr, "member variable %s::%s\n", Getattr(parent_node_skipping_extends(n), "name"), Getattr(n, "name")); #endif Setattr(n, "allegrocl:kind", "member variable"); Setattr(n, "allegrocl:old-sym:name", Getattr(n, "sym:name")); @@ -2953,8 +2871,10 @@ int ALLEGROCL::membervariableHandler(Node *n) { } int ALLEGROCL::typedefHandler(Node *n) { + #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "In typedefHandler\n"); + Printf(stderr, "In typedefHAND\n"); + // Swig_print_node(n); #endif SwigType *typedef_type = Getattr(n,"type"); @@ -2972,7 +2892,9 @@ int ALLEGROCL::typedefHandler(Node *n) { Printf(stderr, " typedef in class '%s'(%x)\n", Getattr(in_class, "sym:name"), in_class); #endif Setattr(n, "allegrocl:typedef:in-class", in_class); + } + if (in_class) { String *class_name = Getattr(in_class, "name"); name = NewStringf("%s__%s", class_name, sym_name); type_ref = NewStringf("%s::%s", class_name, sym_name); @@ -2986,19 +2908,14 @@ int ALLEGROCL::typedefHandler(Node *n) { String *lookup = lookup_defined_foreign_type(typedef_type); -#ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "** lookup='%s'(%x), typedef_type='%s', strcmp = '%d' strstr = '%d'\n", lookup, lookup, typedef_type, Strcmp(typedef_type,"void"), Strstr(ff_type,"__SWIGACL_FwdReference")); -#endif + // Printf(stderr, "** lookup='%s'(%x), ff_type='%s', strstr = '%d'\n", lookup, lookup, ff_type, !Strstr(ff_type,"void")); - if(lookup || (!lookup && Strcmp(typedef_type,"void")) || - (!lookup && Strstr(ff_type,"__SWIGACL_FwdReference"))) { + if(lookup || (!lookup && !Strstr(ff_type,"void"))) add_defined_foreign_type(n, 0, type_ref, name); - } else { - add_forward_referenced_type(n); - } + else add_forward_referenced_type(n); #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "Out typedefHandler\n"); + Printf(stderr, "Out typedefHAND\n"); #endif Delete(ff_type); @@ -3008,33 +2925,22 @@ int ALLEGROCL::typedefHandler(Node *n) { // forward referenced classes are added specially to defined_foreign_types int ALLEGROCL::classforwardDeclaration(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "classforwardDeclaration %s\n", Getattr(n, "name")); -#endif - add_forward_referenced_type(n); return SWIG_OK; } int ALLEGROCL::classHandler(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "classHandler %s::%s\n", current_namespace, Getattr(n, "sym:name")); + Printf(stderr, "class %s::%s\n", current_namespace, Getattr(n, "sym:name")); #endif - int result; - if (Generate_Wrapper) - result = cppClassHandler(n); + return cppClassHandler(n); else - result = cClassHandler(n); - - return result; + return cClassHandler(n); } int ALLEGROCL::cClassHandler(Node *n) { -#ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "In cClassHandler\n"); -#endif // String *cDeclName = Getattr(n,"classDeclaration:name"); // String *name= Getattr(n, "sym:name"); // String *kind = Getattr(n,"kind"); @@ -3044,21 +2950,22 @@ int ALLEGROCL::cClassHandler(Node *n) { // Printf(stderr, "Adding %s foreign type\n", name); String *ns = listify_namespace(current_namespace); +#ifdef ALLEGROCL_TYPE_DEBUG + Printf(stderr, "In cClassHAND\n"); +#endif + add_defined_foreign_type(n); Delete(ns); #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "Out cClassHandler\n"); + Printf(stderr, "Out cClassHAND\n"); #endif return SWIG_OK; } int ALLEGROCL::cppClassHandler(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "cppClassHandler %s\n", Getattr(n, "name")); -#endif // String *name=Getattr(n, "sym:name"); // String *kind = Getattr(n,"kind"); @@ -3117,9 +3024,6 @@ int ALLEGROCL::cppClassHandler(Node *n) { // so their types can be added to the linked_type_list. SwigType *childType = NewStringf("%s%s", Getattr(c, "decl"), Getattr(c, "type")); -#ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "looking at child '%x' of type '%s'\n", c, childType); -#endif if (!SwigType_isfunction(childType)) Delete(compose_foreign_type(childType)); @@ -3160,9 +3064,6 @@ int ALLEGROCL::emit_one(Node *n) { } int ALLEGROCL::enumDeclaration(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "enumDeclaration %s\n", Getattr(n, "name")); -#endif if (Getattr(n, "sym:name")) { add_defined_foreign_type(n); @@ -3179,34 +3080,21 @@ int ALLEGROCL::enumDeclaration(Node *n) { int ALLEGROCL::enumvalueDeclaration(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "enumvalueDeclaration %s\n", Getattr(n, "name")); -#endif - /* print this when in C mode? make this a command-line arg? */ - if (Generate_Wrapper) { - SwigType *enum_type = Copy(Getattr(n,"type")); - String *mangled_name = - mangle_name(n, "ACL_ENUM", - in_class ? Getattr(in_class,"name") : - current_namespace); - - SwigType_add_qualifier(enum_type,"const"); - String *enum_decl = SwigType_str(enum_type, mangled_name); - Printf(f_cxx_wrapper, "EXPORT %s;\n", enum_decl); - Printf(f_cxx_wrapper, "%s = %s;\n", enum_decl, Getattr(n, "value")); + /* print this when in C mode? make this a command-line arg? */ + + if (Generate_Wrapper) { + String *mangled_name = mangle_name(n, "ACL_ENUM"); + + Printf(f_cxx, "EXPORT const %s %s = %s;\n", Getattr(n, "type"), mangled_name, Getattr(n, "value")); Delete(mangled_name); - Delete(enum_type); - Delete(enum_decl); } + return SWIG_OK; } int ALLEGROCL::templateDeclaration(Node *n) { -#ifdef ALLEGROCL_DEBUG - Printf(stderr, "templateDeclaration %s\n", Getattr(n, "name")); -#endif String *type = Getattr(n, "templatetype"); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 74a960214..9d22a0de4 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -12,22 +12,6 @@ char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $"; #include #include "swigmod.h" -int SwigType_isbuiltin(SwigType *t) { - const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", - "unsigned short", "unsigned int", "unsigned long", "unsigned char", "signed char", - "long long", "unsigned long long", 0 }; - int i = 0; - char *c = Char(t); - if (!t) - return 0; - while (builtins[i]) { - if (strcmp(c, builtins[i]) == 0) - return 1; - i++; - } - return 0; -} - class C:public Language { static const char *usage; @@ -166,8 +150,8 @@ public: String *outfile = Getattr(n, "outfile"); // initialize I/O - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } @@ -186,13 +170,13 @@ public: // create proxy files with appropriate name String *proxy_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); - if ((f_proxy_c = NewFile(proxy_code_filename, "w", SWIG_output_files())) == 0) { + if ((f_proxy_c = NewFile(proxy_code_filename, "w")) == 0) { FileErrorDisplay(proxy_code_filename); SWIG_exit(EXIT_FAILURE); } String *proxy_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module)); - if ((f_proxy_h = NewFile(proxy_header_filename, "w", SWIG_output_files())) == 0) { + if ((f_proxy_h = NewFile(proxy_header_filename, "w")) == 0) { FileErrorDisplay(proxy_header_filename); SWIG_exit(EXIT_FAILURE); } diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 0aa933c56..736564d1a 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -22,8 +22,7 @@ public: String *f_clhead; String *f_clwrap; bool CWrap; // generate wrapper file for C code? - File *f_begin; - File *f_runtime; + File *f_cxx; File *f_cxx_header; File *f_cxx_wrapper; File *f_clos; @@ -68,7 +67,6 @@ private: void CFFI::main(int argc, char *argv[]) { int i; - Preprocessor_define("SWIGCFFI 1", 0); SWIG_library_directory("cffi"); SWIG_config_file("cffi.swg"); generate_typedef_flag = 0; @@ -121,15 +119,16 @@ int CFFI::top(Node *n) { Printf(lisp_filename, "%s%s.lisp", SWIG_output_directory(), module); - File *f_lisp = NewFile(lisp_filename, "w", SWIG_output_files()); + File *f_lisp = NewFile(lisp_filename, "w"); + NewFile(lisp_filename, "w"); if (!f_lisp) { FileErrorDisplay(lisp_filename); SWIG_exit(EXIT_FAILURE); } if (CPlusPlus || CWrap) { - f_begin = NewFile(cxx_filename, "w", SWIG_output_files()); - if (!f_begin) { + f_cxx = NewFile(cxx_filename, "w"); + if (!f_cxx) { Close(f_lisp); Delete(f_lisp); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); @@ -138,7 +137,7 @@ int CFFI::top(Node *n) { String *clos_filename = NewString(""); Printf(clos_filename, "%s%s-clos.lisp", SWIG_output_directory(), module); - f_clos = NewFile(clos_filename, "w", SWIG_output_files()); + f_clos = NewFile(clos_filename, "w"); if (!f_clos) { Close(f_lisp); Delete(f_lisp); @@ -146,32 +145,22 @@ int CFFI::top(Node *n) { SWIG_exit(EXIT_FAILURE); } } else { - f_begin = NewString(""); + f_cxx = NewString(""); f_clos = NewString(""); } - f_runtime = NewString(""); - f_cxx_header = f_runtime; + f_cxx_header = f_cxx; f_cxx_wrapper = NewString(""); Swig_register_filebyname("header", f_cxx_header); Swig_register_filebyname("wrapper", f_cxx_wrapper); - Swig_register_filebyname("begin", f_begin); - Swig_register_filebyname("runtime", f_runtime); + Swig_register_filebyname("runtime", f_cxx); Swig_register_filebyname("lisphead", f_clhead); if (!no_swig_lisp) Swig_register_filebyname("swiglisp", f_cl); else Swig_register_filebyname("swiglisp", f_null); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGCFFI\n"); - Printf(f_runtime, "\n"); - - Swig_banner_target_lang(f_lisp, ";;;"); - Language::top(n); Printf(f_lisp, "%s\n", f_clhead); Printf(f_lisp, "%s\n", f_cl); @@ -182,10 +171,8 @@ int CFFI::top(Node *n) { Delete(f_cl); Delete(f_clhead); Delete(f_clwrap); - Dump(f_runtime, f_begin); - Close(f_begin); - Delete(f_runtime); - Delete(f_begin); + Close(f_cxx); + Delete(f_cxx); Delete(f_cxx_wrapper); Delete(f_null); @@ -245,7 +232,7 @@ void CFFI::emit_defmethod(Node *n) { ParmList *pl = Getattr(n, "parms"); int argnum = 0; - Node *parent = getCurrentClass(); + Node *parent = parentNode(n); bool first = 0; for (Parm *p = pl; p; p = nextSibling(p), argnum++) { @@ -300,7 +287,7 @@ void CFFI::emit_initialize_instance(Node *n) { ParmList *pl = Getattr(n, "parms"); int argnum = 0; - Node *parent = getCurrentClass(); + Node *parent = parentNode(n); for (Parm *p = pl; p; p = nextSibling(p), argnum++) { String *argname = Getattr(p, "name"); @@ -337,18 +324,18 @@ void CFFI::emit_initialize_instance(Node *n) { } void CFFI::emit_setter(Node *n) { - Node *parent = getCurrentClass(); + Node *p = parentNode(n); Printf(f_clos, "(cl:defmethod (cl:setf %s) (arg0 (obj %s))\n (%s (ff-pointer obj) arg0))\n\n", lispify_name(n, Getattr(n, "name"), "'method"), - lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); + lispify_name(p, lispy_name(Char(Getattr(p, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); } void CFFI::emit_getter(Node *n) { - Node *parent = getCurrentClass(); + Node *p = parentNode(n); Printf(f_clos, "(cl:defmethod %s ((obj %s))\n (%s (ff-pointer obj)))\n\n", lispify_name(n, Getattr(n, "name"), "'method"), - lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); + lispify_name(p, lispy_name(Char(Getattr(p, "sym:name"))), "'class"), lispify_name(n, Getattr(n, "sym:name"), "'function")); } int CFFI::memberfunctionHandler(Node *n) { @@ -468,7 +455,7 @@ int CFFI::functionWrapper(Node *n) { Printf(f->code, "}\n"); if (CPlusPlus) - Wrapper_print(f, f_runtime); + Wrapper_print(f, f_cxx); if (CPlusPlus) { emit_defun(n, wname); @@ -643,7 +630,7 @@ int CFFI::enumDeclaration(Node *n) { else { String *type = Getattr(c, "type"); String *converted_value = convert_literal(value, type); - Printf(f_cl, "\n\t(%s #.%s)", slot_name, converted_value); + Printf(f_cl, "\n\t(%s %s)", slot_name, converted_value); Delete(converted_value); } Delete(value); diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index 12ef4b454..2298d2939 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -30,7 +30,6 @@ static char *module = 0; static char *chicken_path = (char *) "chicken"; static int num_methods = 0; -static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -102,12 +101,12 @@ protected: int isPointer(SwigType *t); void dispatchFunction(Node *n); - String *chickenNameMapping(String *, const_String_or_char_ptr ); + String *chickenNameMapping(String *, String_or_char *); String *chickenPrimitiveName(String *); String *runtimeCode(); String *defaultExternalRuntimeFilename(); - String *buildClosFunctionCall(List *types, const_String_or_char_ptr closname, const_String_or_char_ptr funcname); + String *buildClosFunctionCall(List *types, String_or_char *closname, String_or_char *funcname); }; /* ----------------------------------------------------------------------- @@ -189,12 +188,11 @@ int CHICKEN::top(Node *n) { /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -207,7 +205,6 @@ int CHICKEN::top(Node *n) { /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -218,16 +215,14 @@ int CHICKEN::top(Node *n) { clos_methods = NewString(""); scm_const_defs = NewString(""); - Swig_banner(f_begin); + Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); + Swig_banner(f_runtime); - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGCHICKEN\n"); + Printf(f_runtime, "/* Implementation : CHICKEN */\n\n"); if (no_collection) Printf(f_runtime, "#define SWIG_CHICKEN_NO_COLLECTION 1\n"); - Printf(f_runtime, "\n"); - /* Set module name */ module = Swig_copy_string(Char(Getattr(n, "name"))); scmmodule = NewString(module); @@ -256,14 +251,14 @@ int CHICKEN::top(Node *n) { Printf(f_init, "#endif\n"); Printf(chicken_filename, "%s%s.scm", SWIG_output_directory(), module); - if ((f_scm = NewFile(chicken_filename, "w", SWIG_output_files())) == 0) { + if ((f_scm = NewFile(chicken_filename, "w")) == 0) { FileErrorDisplay(chicken_filename); SWIG_exit(EXIT_FAILURE); } - Swig_banner_target_lang(f_scm, ";;"); - Printf(f_scm, "\n"); - + Printv(f_scm, + ";; -*- buffer-read-only: t -*- vi: set ro:\n", + ";; This file was created automatically by SWIG.\n", ";; Don't modify this file, modify the SWIG interface instead.\n", NIL); if (declare_unit) Printv(f_scm, "(declare (unit ", scmmodule, "))\n\n", NIL); Printv(f_scm, "(declare \n", @@ -312,17 +307,15 @@ int CHICKEN::top(Node *n) { /* Close all of the files */ Delete(primitive_names); Delete(scmmodule); - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_sym_size); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -1240,7 +1233,7 @@ int CHICKEN::importDirective(Node *n) { return Language::importDirective(n); } -String *CHICKEN::buildClosFunctionCall(List *types, const_String_or_char_ptr closname, const_String_or_char_ptr funcname) { +String *CHICKEN::buildClosFunctionCall(List *types, String_or_char *closname, String_or_char *funcname) { String *method_signature = NewString(""); String *func_args = NewString(""); String *func_call = NewString(""); @@ -1514,7 +1507,7 @@ int CHICKEN::validIdentifier(String *s) { * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ -String *CHICKEN::chickenNameMapping(String *name, const_String_or_char_ptr class_name) { +String *CHICKEN::chickenNameMapping(String *name, String_or_char *class_name) { String *n = NewString(""); if (Strcmp(class_name, "") == 0) { diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index fa73b3a0b..823f22e2c 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -36,7 +36,6 @@ private: void CLISP::main(int argc, char *argv[]) { int i; - Preprocessor_define("SWIGCLISP 1", 0); SWIG_library_directory("clisp"); SWIG_config_file("clisp.swg"); generate_typedef_flag = 0; @@ -80,22 +79,20 @@ int CLISP::top(Node *n) { Printf(output_filename, "%s%s.lisp", SWIG_output_directory(), module); } - f_cl = NewFile(output_filename, "w+", SWIG_output_files()); + f_cl = NewFile(output_filename, "w+"); if (!f_cl) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); } Swig_register_filebyname("header", f_null); - Swig_register_filebyname("begin", f_null); Swig_register_filebyname("runtime", f_null); Swig_register_filebyname("wrapper", f_null); - String *header = NewString(""); - - Swig_banner_target_lang(header, ";;"); - - Printf(header, "\n(defpackage :%s\n (:use :common-lisp :ffi)", module); + String *header = + NewStringf + (";; This is an automatically generated file. \n;;Make changes as you feel are necessary (but remember if you try to regenerate this file, your changes will be lost). \n\n(defpackage :%s\n (:use :common-lisp :ffi)", + module); Language::top(n); diff --git a/Source/Modules/contract.cxx b/Source/Modules/contract.cxx index 518dc2997..9bf8decf6 100644 --- a/Source/Modules/contract.cxx +++ b/Source/Modules/contract.cxx @@ -46,7 +46,6 @@ public: int extendDirective(Node *n); int importDirective(Node *n); int includeDirective(Node *n); - int namespaceDeclaration(Node *n); int classDeclaration(Node *n); virtual int top(Node *n); }; @@ -321,23 +320,16 @@ int Contracts::constructorDeclaration(Node *n) { int Contracts::externDeclaration(Node *n) { return emit_children(n); } - int Contracts::extendDirective(Node *n) { return emit_children(n); } - int Contracts::importDirective(Node *n) { return emit_children(n); } - int Contracts::includeDirective(Node *n) { return emit_children(n); } -int Contracts::namespaceDeclaration(Node *n) { - return emit_children(n); -} - int Contracts::classDeclaration(Node *n) { int ret = SWIG_OK; InClass = 1; diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 2730b55d4..7ea10170a 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -24,7 +24,6 @@ class CSHARP:public Language { const String *protected_string; Hash *swig_types_hash; - File *f_begin; File *f_runtime; File *f_runtime_h; File *f_header; @@ -86,7 +85,7 @@ class CSHARP:public Language { enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum }; - static Parm *NewParmFromNode(SwigType *type, const_String_or_char_ptr name, Node *n) { + static Parm *NewParmFromNode(SwigType *type, const String_or_char *name, Node *n) { Parm *p = NewParm(type, name); Setfile(p, Getfile(n)); Setline(p, Getline(n)); @@ -103,7 +102,6 @@ public: public_string(NewString("public")), protected_string(NewString("protected")), swig_types_hash(NULL), - f_begin(NULL), f_runtime(NULL), f_runtime_h(NULL), f_header(NULL), @@ -288,8 +286,8 @@ public: SWIG_exit(EXIT_FAILURE); } - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } @@ -299,14 +297,13 @@ public: Printf(stderr, "Unable to determine outfile_h\n"); SWIG_exit(EXIT_FAILURE); } - f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); + f_runtime_h = NewFile(outfile_h, "w"); if (!f_runtime_h) { FileErrorDisplay(outfile_h); SWIG_exit(EXIT_FAILURE); } } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -316,7 +313,6 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("director", f_directors); @@ -362,17 +358,13 @@ public: if (!dllimport) dllimport = Copy(module_class_name); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGCSHARP\n"); + Swig_banner(f_runtime); // Print the SWIG banner message if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); /* Emit initial director header and director code: */ Swig_banner(f_directors_h); - Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name); @@ -384,8 +376,6 @@ public: Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); } - Printf(f_runtime, "\n"); - Swig_name_register((char *) "wrapper", (char *) "CSharp_%f"); if (old_variable_names) { Swig_name_register((char *) "set", (char *) "set_%v"); @@ -406,7 +396,7 @@ public: // Generate the intermediary class { String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), imclass_name); - File *f_im = NewFile(filen, "w", SWIG_output_files()); + File *f_im = NewFile(filen, "w"); if (!f_im) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -450,7 +440,7 @@ public: // Generate the C# module class { String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), module_class_name); - File *f_module = NewFile(filen, "w", SWIG_output_files()); + File *f_module = NewFile(filen, "w"); if (!f_module) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -577,11 +567,10 @@ public: n_dmethods = 0; /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); + Dump(f_header, f_runtime); if (directorsEnabled()) { - Dump(f_directors, f_begin); + Dump(f_directors, f_runtime); Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); @@ -596,14 +585,13 @@ public: f_directors_h = NULL; } - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -613,7 +601,11 @@ public: void emitBanner(File *f) { Printf(f, "/* ----------------------------------------------------------------------------\n"); - Swig_banner_target_lang(f, " *"); + Printf(f, " * This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f, " * Version %s\n", Swig_package_version()); + Printf(f, " *\n"); + Printf(f, " * Do not make changes to this file unless you know what you are doing--modify\n"); + Printf(f, " * the SWIG interface file instead.\n"); Printf(f, " * ----------------------------------------------------------------------------- */\n\n"); } @@ -1163,7 +1155,7 @@ public: } else { // Global enums are defined in their own file String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), symname); - File *f_enum = NewFile(filen, "w", SWIG_output_files()); + File *f_enum = NewFile(filen, "w"); if (!f_enum) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1742,7 +1734,7 @@ public: } String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), proxy_class_name); - f_proxy = NewFile(filen, "w", SWIG_output_files()); + f_proxy = NewFile(filen, "w"); if (!f_proxy) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1895,7 +1887,6 @@ public: bool setter_flag = false; String *pre_code = NewString(""); String *post_code = NewString(""); - String *terminator_code = NewString(""); if (!proxy_flag) return; @@ -2007,8 +1998,7 @@ public: if (!(variable_wrapper_flag && i == 0)) { SwigType *pt = Getattr(p, "type"); String *param_type = NewString(""); - if (setter_flag) - last_parm = p; + last_parm = p; /* Get the C# parameter type */ if ((tm = Getattr(p, "tmap:cstype"))) { @@ -2044,14 +2034,6 @@ public: Printf(post_code, "\n"); Printv(post_code, post, NIL); } - String *terminator = Getattr(p, "tmap:csin:terminator"); - if (terminator) { - substituteClassname(pt, terminator); - Replaceall(terminator, "$csinput", arg); - if (Len(terminator_code) > 0) - Insert(terminator_code, 0, "\n"); - Insert(terminator_code, 0, terminator); - } Printv(imcall, tm, NIL); } else { Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0)); @@ -2077,8 +2059,7 @@ public: excodeSubstitute(n, tm, "csout", n); bool is_pre_code = Len(pre_code) > 0; bool is_post_code = Len(post_code) > 0; - bool is_terminator_code = Len(terminator_code) > 0; - if (is_pre_code || is_post_code || is_terminator_code) { + if (is_pre_code || is_post_code) { Replaceall(tm, "\n ", "\n "); // add extra indentation to code in typemap if (is_post_code) { Insert(tm, 0, "\n try "); @@ -2090,9 +2071,6 @@ public: Insert(tm, 0, pre_code); Insert(tm, 0, "\n"); } - if (is_terminator_code) { - Printv(tm, "\n", terminator_code, NIL); - } Insert(tm, 0, "{"); Printf(tm, "\n }"); } @@ -2192,7 +2170,6 @@ public: Delete(pre_code); Delete(post_code); - Delete(terminator_code); Delete(function_code); Delete(return_type); Delete(imcall); @@ -2213,7 +2190,6 @@ public: String *helper_args = NewString(""); String *pre_code = NewString(""); String *post_code = NewString(""); - String *terminator_code = NewString(""); String *im_return_type = NewString(""); bool feature_director = (parentNode(n) && Swig_directorclass(n)); @@ -2309,14 +2285,6 @@ public: Printf(post_code, "\n"); Printv(post_code, post, NIL); } - String *terminator = Getattr(p, "tmap:csin:terminator"); - if (terminator) { - substituteClassname(pt, terminator); - Replaceall(terminator, "$csinput", arg); - if (Len(terminator_code) > 0) - Insert(terminator_code, 0, "\n"); - Insert(terminator_code, 0, terminator); - } cshin = Getattr(p, "tmap:csin:cshin"); if (cshin) Replaceall(cshin, "$csinput", arg); @@ -2373,8 +2341,7 @@ public: bool is_pre_code = Len(pre_code) > 0; bool is_post_code = Len(post_code) > 0; - bool is_terminator_code = Len(terminator_code) > 0; - if (is_pre_code || is_post_code || is_terminator_code) { + if (is_pre_code || is_post_code) { Printf(helper_code, " {\n"); if (is_pre_code) { Printv(helper_code, pre_code, "\n", NIL); @@ -2386,9 +2353,6 @@ public: } else { Printv(helper_code, " return ", imcall, ";", NIL); } - if (is_terminator_code) { - Printv(helper_code, "\n", terminator_code, NIL); - } Printf(helper_code, "\n }\n"); String *helper_name = NewStringf("%s.SwigConstruct%s(%s)", proxy_class_name, proxy_class_name, helper_args); String *im_outattributes = Getattr(n, "tmap:imtype:outattributes"); @@ -2407,7 +2371,6 @@ public: Delete(im_return_type); Delete(pre_code); Delete(post_code); - Delete(terminator_code); Delete(construct_tm); Delete(attributes); Delete(overloaded_name); @@ -2525,7 +2488,6 @@ public: bool setter_flag = false; String *pre_code = NewString(""); String *post_code = NewString(""); - String *terminator_code = NewString(""); if (l) { if (SwigType_type(Getattr(l, "type")) == T_VOID) { @@ -2630,14 +2592,6 @@ public: Printf(post_code, "\n"); Printv(post_code, post, NIL); } - String *terminator = Getattr(p, "tmap:csin:terminator"); - if (terminator) { - substituteClassname(pt, terminator); - Replaceall(terminator, "$csinput", arg); - if (Len(terminator_code) > 0) - Insert(terminator_code, 0, "\n"); - Insert(terminator_code, 0, terminator); - } Printv(imcall, tm, NIL); } else { Swig_warning(WARN_CSHARP_TYPEMAP_CSIN_UNDEF, input_file, line_number, "No csin typemap defined for %s\n", SwigType_str(pt, 0)); @@ -2662,8 +2616,7 @@ public: excodeSubstitute(n, tm, "csout", n); bool is_pre_code = Len(pre_code) > 0; bool is_post_code = Len(post_code) > 0; - bool is_terminator_code = Len(terminator_code) > 0; - if (is_pre_code || is_post_code || is_terminator_code) { + if (is_pre_code || is_post_code) { Replaceall(tm, "\n ", "\n "); // add extra indentation to code in typemap if (is_post_code) { Insert(tm, 0, "\n try "); @@ -2675,9 +2628,6 @@ public: Insert(tm, 0, pre_code); Insert(tm, 0, "\n"); } - if (is_terminator_code) { - Printv(tm, "\n", terminator_code, NIL); - } Insert(tm, 0, "{"); Printf(tm, "\n }"); } @@ -2753,7 +2703,6 @@ public: Delete(pre_code); Delete(post_code); - Delete(terminator_code); Delete(function_code); Delete(return_type); Delete(imcall); @@ -2968,7 +2917,7 @@ public: void emitTypeWrapperClass(String *classname, SwigType *type) { String *swigtype = NewString(""); String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), classname); - File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); + File *f_swigtype = NewFile(filen, "w"); if (!f_swigtype) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 158b53502..4363cd813 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -84,7 +84,7 @@ String *Swig_director_declaration(Node *n) { } -String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms) { +String *Swig_method_call(String_or_char *name, ParmList *parms) { String *func; int i = 0; int comma = 0; @@ -128,7 +128,7 @@ String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms) { * */ -String *Swig_method_decl(SwigType *returntype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values) { +String *Swig_method_decl(SwigType *returntype, SwigType *decl, const String_or_char *id, List *args, int strip, int values) { String *result; List *elements; String *element = 0, *nextelement; diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 0c72de8d0..f5f080034 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -47,7 +47,6 @@ Guile Options (available with -guile)\n\ -exportprimitive - Add the (export ...) code from scmstub into the\n\ GOOPS file.\n"; -static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -175,7 +174,7 @@ public: } } else if (strcmp(argv[i], "-procdoc") == 0) { if (argv[i + 1]) { - procdoc = NewFile(argv[i + 1], "w", SWIG_output_files()); + procdoc = NewFile(argv[i + 1], (char *) "w"); if (!procdoc) { FileErrorDisplay(argv[i + 1]); SWIG_exit(EXIT_FAILURE); @@ -300,12 +299,11 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -313,7 +311,6 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -325,10 +322,10 @@ public: goopscode = NewString(""); goopsexport = NewString(""); - Swig_banner(f_begin); + Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); + Swig_banner(f_runtime); - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGGUILE\n"); + Printf(f_runtime, "/* Implementation : GUILE */\n\n"); if (!use_scm_interface) { if (SwigRuntime == 1) @@ -361,8 +358,6 @@ public: Printf(f_runtime, "\n}\n"); } - Printf(f_runtime, "\n"); - Language::top(n); /* Close module */ @@ -397,16 +392,14 @@ public: Delete(goopstext); /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -506,15 +499,15 @@ public: SWIG_output_directory(), primitive_name); Delete(primitive_name); - File *scmstubfile = NewFile(fname, "w", SWIG_output_files()); + File *scmstubfile = NewFile(fname, (char *) "w"); if (!scmstubfile) { FileErrorDisplay(fname); SWIG_exit(EXIT_FAILURE); } Delete(fname); - Swig_banner_target_lang(scmstubfile, ";;;"); - Printf(scmstubfile, "\n"); + Printf(scmstubfile, ";;; -*- buffer-read-only: t -*- vi: set ro: */\n"); + Printf(scmstubfile, ";;; Automatically generated by SWIG; do not edit.\n\n"); if (linkage == GUILE_LSTYLE_SIMPLE || linkage == GUILE_LSTYLE_PASSIVE) Printf(scmstubfile, "(define-module (%s))\n\n", mod); Delete(mod); @@ -537,14 +530,14 @@ public: String *fname = NewStringf("%s%s.scm", SWIG_output_directory(), module_name); - File *goopsfile = NewFile(fname, "w", SWIG_output_files()); + File *goopsfile = NewFile(fname, (char *) "w"); if (!goopsfile) { FileErrorDisplay(fname); SWIG_exit(EXIT_FAILURE); } Delete(fname); - Swig_banner_target_lang(goopsfile, ";;;"); - Printf(goopsfile, "\n"); + Printf(goopsfile, ";;; -*- buffer-read-only: t -*- vi: set ro: */\n"); + Printf(goopsfile, ";;; Automatically generated by SWIG; do not edit.\n\n"); Printf(goopsfile, "(define-module (%s))\n", mod); Printf(goopsfile, "%s\n", goopstext); Printf(goopsfile, "(use-modules (oop goops) (Swig common))\n"); @@ -1660,7 +1653,7 @@ public: * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ - String *goopsNameMapping(String *name, const_String_or_char_ptr class_name) { + String *goopsNameMapping(String *name, String_or_char *class_name) { String *n = NewString(""); if (Strcmp(class_name, "") == 0) { diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 8dfa19624..b92fccdfb 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -24,7 +24,6 @@ class JAVA:public Language { const String *protected_string; Hash *swig_types_hash; - File *f_begin; File *f_runtime; File *f_runtime_h; File *f_header; @@ -71,7 +70,6 @@ class JAVA:public Language { String *imclass_cppcasts_code; //C++ casts up inheritance hierarchies intermediary class code String *imclass_directors; // Intermediate class director code String *destructor_call; //C++ destructor call if any - String *destructor_throws_clause; //C++ destructor throws clause if any // Director method stuff: List *dmethods_seq; @@ -83,7 +81,7 @@ class JAVA:public Language { enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum }; - static Parm *NewParmFromNode(SwigType *type, const_String_or_char_ptr name, Node *n) { + static Parm *NewParmFromNode(SwigType *type, const String_or_char *name, Node *n) { Parm *p = NewParm(type, name); Setfile(p, Getfile(n)); Setline(p, Getline(n)); @@ -100,7 +98,6 @@ public: public_string(NewString("public")), protected_string(NewString("protected")), swig_types_hash(NULL), - f_begin(NULL), f_runtime(NULL), f_runtime_h(NULL), f_header(NULL), @@ -144,7 +141,6 @@ public: imclass_cppcasts_code(NULL), imclass_directors(NULL), destructor_call(NULL), - destructor_throws_clause(NULL), dmethods_seq(NULL), dmethods_table(NULL), n_dmethods(0), @@ -297,8 +293,8 @@ public: SWIG_exit(EXIT_FAILURE); } - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } @@ -308,14 +304,13 @@ public: Printf(stderr, "Unable to determine outfile_h\n"); SWIG_exit(EXIT_FAILURE); } - f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); + f_runtime_h = NewFile(outfile_h, "w"); if (!f_runtime_h) { FileErrorDisplay(outfile_h); SWIG_exit(EXIT_FAILURE); } } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -323,7 +318,6 @@ public: f_directors = NewString(""); /* Register file targets with the SWIG file handler */ - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("runtime", f_runtime); @@ -371,16 +365,13 @@ public: jnipackage = NewString(""); package_path = NewString(""); - Swig_banner(f_begin); - - Printf(f_runtime, "\n#define SWIGJAVA\n"); + Swig_banner(f_runtime); // Print the SWIG banner message if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); /* Emit initial director header and director code: */ Swig_banner(f_directors_h); - Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name); @@ -392,8 +383,6 @@ public: Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); } - Printf(f_runtime, "\n"); - String *wrapper_name = NewString(""); if (Len(package)) { @@ -431,7 +420,7 @@ public: // Generate the intermediary class { String *filen = NewStringf("%s%s.java", SWIG_output_directory(), imclass_name); - File *f_im = NewFile(filen, "w", SWIG_output_files()); + File *f_im = NewFile(filen, "w"); if (!f_im) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -482,7 +471,7 @@ public: // Generate the Java module class { String *filen = NewStringf("%s%s.java", SWIG_output_directory(), module_class_name); - File *f_module = NewFile(filen, "w", SWIG_output_files()); + File *f_module = NewFile(filen, "w"); if (!f_module) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -534,7 +523,7 @@ public: // Generate the Java constants interface if (Len(module_class_constants_code) != 0) { String *filen = NewStringf("%s%sConstants.java", SWIG_output_directory(), module_class_name); - File *f_module = NewFile(filen, "w", SWIG_output_files()); + File *f_module = NewFile(filen, "w"); if (!f_module) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -671,10 +660,8 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Dump(f_runtime, f_begin); + Close(f_runtime); Delete(f_runtime); - Close(f_begin); - Delete(f_begin); return SWIG_OK; } @@ -684,7 +671,11 @@ public: void emitBanner(File *f) { Printf(f, "/* ----------------------------------------------------------------------------\n"); - Swig_banner_target_lang(f, " *"); + Printf(f, " * This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f, " * Version %s\n", Swig_package_version()); + Printf(f, " *\n"); + Printf(f, " * Do not make changes to this file unless you know what you are doing--modify\n"); + Printf(f, " * the SWIG interface file instead.\n"); Printf(f, " * ----------------------------------------------------------------------------- */\n\n"); } @@ -1219,7 +1210,7 @@ public: } else { // Global enums are defined in their own file String *filen = NewStringf("%s%s.java", SWIG_output_directory(), symname); - File *f_enum = NewFile(filen, "w", SWIG_output_files()); + File *f_enum = NewFile(filen, "w"); if (!f_enum) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1663,7 +1654,7 @@ public: else Replaceall(destruct, "$jnicall", "throw new UnsupportedOperationException(\"C++ destructor does not have public access\")"); if (*Char(destruct)) - Printv(proxy_class_def, "\n ", destruct_methodmodifiers, " void ", destruct_methodname, "()", destructor_throws_clause, " ", destruct, "\n", NIL); + Printv(proxy_class_def, "\n ", destruct_methodmodifiers, " void ", destruct_methodname, "() ", destruct, "\n", NIL); } /* Insert directordisconnect typemap, if this class has directors enabled */ @@ -1751,7 +1742,7 @@ public: } String *filen = NewStringf("%s%s.java", SWIG_output_directory(), proxy_class_name); - f_proxy = NewFile(filen, "w", SWIG_output_files()); + f_proxy = NewFile(filen, "w"); if (!f_proxy) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -1770,7 +1761,6 @@ public: Clear(proxy_class_code); destructor_call = NewString(""); - destructor_throws_clause = NewString(""); proxy_class_constants_code = NewString(""); } @@ -1829,8 +1819,6 @@ public: proxy_class_name = NULL; Delete(destructor_call); destructor_call = NULL; - Delete(destructor_throws_clause); - destructor_throws_clause = NULL; Delete(proxy_class_constants_code); proxy_class_constants_code = NULL; } @@ -2348,7 +2336,6 @@ public: if (proxy_flag) { Printv(destructor_call, imclass_name, ".", Swig_name_destroy(symname), "(swigCPtr)", NIL); - generateThrowsClause(n, destructor_throws_clause); } return SWIG_OK; } @@ -2811,7 +2798,7 @@ public: void emitTypeWrapperClass(String *classname, SwigType *type) { String *swigtype = NewString(""); String *filen = NewStringf("%s%s.java", SWIG_output_directory(), classname); - File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); + File *f_swigtype = NewFile(filen, "w"); if (!f_swigtype) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -2883,7 +2870,7 @@ public: String *throws_attribute = NewStringf("%s:throws", attribute); String *throws = Getattr(parameter, throws_attribute); - if (throws && Len(throws) > 0) { + if (throws) { String *throws_list = Getattr(n, "java:throwslist"); if (!throws_list) { throws_list = NewList(); diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 38658ce9c..6718903d0 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -61,7 +61,7 @@ static String *AttributeFunctionGet = 0; static String *AttributeFunctionSet = 0; static Node *CurrentClass = 0; int line_number = 0; -String *input_file = 0; +char *input_file = 0; int SmartPointer = 0; static Hash *classhash; @@ -352,7 +352,7 @@ int Language::emit_one(Node *n) { Extend = 1; line_number = Getline(n); - input_file = Getfile(n); + input_file = Char(Getfile(n)); /* symtab = Getattr(n,"symtab"); @@ -830,8 +830,9 @@ int Language::cDeclaration(Node *n) { if (!(directorsEnabled() && ((is_member_director(CurrentClass, n) && need_nonpublic_member(n)) || is_non_virtual_protected_access(n)))) { return SWIG_NOWRAP; } - // Prevent wrapping protected overloaded director methods more than once - - // This bit of code is only needed due to the cDeclaration call in classHandler() +#if 0 +// I don't see why this is needed - WSF + /* prevent wrapping the method twice due to overload */ String *wrapname = NewStringf("nonpublic_%s%s", symname, Getattr(n, "sym:overname")); if (Getattr(CurrentClass, wrapname)) { Delete(wrapname); @@ -839,6 +840,7 @@ int Language::cDeclaration(Node *n) { } SetFlag(CurrentClass, wrapname); Delete(wrapname); +#endif } } @@ -1422,39 +1424,36 @@ int Language::membervariableHandler(Node *n) { target = NewStringf("%s->%s", pname, name); Delete(pname); } - } else { - target = NewStringf("$extendgetcall"); // member variable access expanded later + tm = Swig_typemap_lookup("memberin", n, target, 0); } - tm = Swig_typemap_lookup("memberin", n, target, 0); int flags = Extend | SmartPointer | use_naturalvar_mode(n); if (is_non_virtual_protected_access(n)) flags = flags | CWRAP_ALL_PROTECTED_ACCESS; - String *call = 0; - Swig_MembersetToFunction(n, ClassType, flags, &call); + Swig_MembersetToFunction(n, ClassType, flags); Setattr(n, "memberset", "1"); + if (!Extend) { + /* Check for a member in typemap here */ - if (!tm) { - if (SwigType_isarray(type)) { - Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(type, 0)); - make_set_wrapper = 0; + if (!tm) { + if (SwigType_isarray(type)) { + Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(type, 0)); + make_set_wrapper = 0; + } + } else { + String *pname0 = Swig_cparm_name(0, 0); + String *pname1 = Swig_cparm_name(0, 1); + Replace(tm, "$source", pname1, DOH_REPLACE_ANY); + Replace(tm, "$target", target, DOH_REPLACE_ANY); + Replace(tm, "$input", pname1, DOH_REPLACE_ANY); + Replace(tm, "$self", pname0, DOH_REPLACE_ANY); + Setattr(n, "wrap:action", tm); + Delete(tm); + Delete(pname0); + Delete(pname1); } - } else { - String *pname0 = Swig_cparm_name(0, 0); - String *pname1 = Swig_cparm_name(0, 1); - Replace(tm, "$source", pname1, DOH_REPLACE_ANY); - Replace(tm, "$target", target, DOH_REPLACE_ANY); - Replace(tm, "$input", pname1, DOH_REPLACE_ANY); - Replace(tm, "$self", pname0, DOH_REPLACE_ANY); - Replace(tm, "$extendgetcall", call, DOH_REPLACE_ANY); - Setattr(n, "wrap:action", tm); - Delete(tm); - Delete(pname0); - Delete(pname1); + Delete(target); } - Delete(call); - Delete(target); - if (make_set_wrapper) { Setattr(n, "sym:name", mrename_set); functionWrapper(n); @@ -2477,13 +2476,6 @@ int Language::classHandler(Node *n) { Node *m = Copy(method); Setattr(m, "director", "1"); Setattr(m, "parentNode", n); - /* - * There is a bug that needs fixing still... - * This area of code is creating methods which have not been overidden in a derived class (director methods that are protected in the base) - * If the method is overloaded, then Swig_overload_dispatch() incorrectly generates a call to the base wrapper, _wrap_xxx method - * See director_protected_overloaded.i - Possibly sym:overname needs correcting here. - Printf(stdout, "new method: %s::%s(%s)\n", Getattr(parentNode(m), "name"), Getattr(m, "name"), ParmList_str_defaultargs(Getattr(m, "parms"))); - */ cDeclaration(m); Delete(m); } @@ -2963,9 +2955,14 @@ Node *Language::classLookup(SwigType *s) { n = Getattr(classtypes, s); if (!n) { Symtab *stab = 0; +// SwigType *lt = SwigType_ltype(s); +// SwigType *ty1 = SwigType_typedef_resolve_all(lt); SwigType *ty1 = SwigType_typedef_resolve_all(s); SwigType *ty2 = SwigType_strip_qualifiers(ty1); +// Printf(stdout, " stages... ty1: %s ty2: %s\n", ty1, ty2); +// Delete(lt); Delete(ty1); +// lt = 0; ty1 = 0; String *base = SwigType_base(ty2); @@ -2974,12 +2971,6 @@ Node *Language::classLookup(SwigType *s) { Replaceall(base, "struct ", ""); Replaceall(base, "union ", ""); - if (strncmp(Char(base), "::", 2) == 0) { - String *oldbase = base; - base = NewString(Char(base) + 2); - Delete(oldbase); - } - String *prefix = SwigType_prefix(ty2); /* Do a symbol table search on the base type */ @@ -3053,12 +3044,6 @@ Node *Language::enumLookup(SwigType *s) { Replaceall(base, "enum ", ""); String *prefix = SwigType_prefix(ty2); - if (strncmp(Char(base), "::", 2) == 0) { - String *oldbase = base; - base = NewString(Char(base) + 2); - Delete(oldbase); - } - /* Look for type in symbol table */ while (!n) { Hash *nstab; diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 78cd7ce96..6113da960 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -92,7 +92,6 @@ NEW LANGUAGE NOTE:END ************************************************/ class LUA:public Language { private: - File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -133,7 +132,6 @@ public: * --------------------------------------------------------------------- */ LUA() { - f_begin = 0; f_runtime = 0; f_header = 0; f_wrappers = 0; @@ -215,12 +213,11 @@ public: String *outfile = Getattr(n, "outfile"); /* Open the output file */ - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -229,7 +226,6 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("initbeforefunc", f_initbeforefunc); @@ -253,17 +249,11 @@ public: current=NO_CPP; /* Standard stuff for the SWIG runtime section */ - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGLUA\n"); - + Swig_banner(f_runtime); // if (NoInclude) { // Printf(f_runtime, "#define SWIG_NOINCLUDE\n"); // } - Printf(f_runtime, "\n"); - //String *init_name = NewStringf("%(title)s_Init", module); //Printf(f_header, "#define SWIG_init %s\n", init_name); //Printf(f_header, "#define SWIG_name \"%s\"\n", module); @@ -298,14 +288,13 @@ public: this basically combines several of the strings together and then writes it all to a file NEW LANGUAGE NOTE:END ************************************************/ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Dump(f_initbeforefunc, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Dump(f_initbeforefunc, f_runtime); /* for the Lua code it needs to be properly excaped to be added into the C/C++ code */ EscapeCode(s_luacode); - Printf(f_begin, "const char* SWIG_LUACODE=\n \"%s\";\n\n",s_luacode); - Wrapper_pretty_print(f_init, f_begin); + Printf(f_runtime, "const char* SWIG_LUACODE=\n \"%s\";\n\n",s_luacode); + Wrapper_pretty_print(f_init, f_runtime); /* Close all of the files */ Delete(s_luacode); Delete(s_cmd_tab); @@ -315,9 +304,8 @@ public: Delete(f_wrappers); Delete(f_init); Delete(f_initbeforefunc); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); /* Done */ return SWIG_OK; diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index c824db6f9..901ee812e 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -117,8 +117,7 @@ static const char *usage3 = (const char *) "\ -fastdispatch -fvirtual \n\ -o - Set name of the output file to \n\ -oh - Set name of the output header file to \n\ - -outcurrentdir - Set default output dir to current dir instead of input file's path\n\ - -outdir - Set language specific files output directory to \n\ + -outdir - Set language specific files output directory \n\ -small - Compile in virtual elimination & compact mode\n\ -swiglib - Report location of SWIG library and exit\n\ -templatereduce - Reduce all the typedefs in templates\n\ @@ -154,7 +153,6 @@ static char *cpp_extension = (char *) "cxx"; static char *depends_extension = (char *) "d"; static String *outdir = 0; static String *xmlout = 0; -static int outcurrentdir = 0; static int help = 0; static int checkout = 0; static int cpp_only = 0; @@ -182,16 +180,14 @@ static String *dependencies_target = 0; static int external_runtime = 0; static String *external_runtime_name = 0; enum { STAGE1=1, STAGE2=2, STAGE3=4, STAGE4=8, STAGEOVERFLOW=16 }; -static List *all_output_files = 0; // ----------------------------------------------------------------------------- -// check_suffix() +// check_suffix(char *name) // // Checks the suffix of a file to see if we should emit extern declarations. // ----------------------------------------------------------------------------- -static int check_suffix(String *filename) { - const char *name = Char(filename); +static int check_suffix(const char *name) { const char *c; if (!name) return 0; @@ -285,7 +281,7 @@ static void set_outdir(const String *c_wrapper_file_dir) { } /* This function sets the name of the configuration file */ -void SWIG_config_file(const_String_or_char_ptr filename) { +void SWIG_config_file(const String_or_char *filename) { lang_config = NewString(filename); } @@ -304,11 +300,6 @@ void SWIG_config_cppext(const char *ext) { cpp_extension = (char *) ext; } -List *SWIG_output_files() { - assert(all_output_files); - return all_output_files; -} - void SWIG_setfeature(const char *cfeature, const char *cvalue) { Hash *features_hash = Swig_cparse_features(); String *name = NewString(""); @@ -372,14 +363,13 @@ static void SWIG_dump_runtime() { } } - runtime = NewFile(outfile, "w", SWIG_output_files()); + runtime = NewFile(outfile, "w"); if (!runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } Swig_banner(runtime); - Printf(runtime, "\n"); s = Swig_include_sys("swiglabels.swg"); if (!s) { @@ -698,9 +688,6 @@ void SWIG_getoptions(int argc, char *argv[]) { } else { Swig_arg_error(); } - } else if (strcmp(argv[i], "-outcurrentdir") == 0) { - Swig_mark_arg(i); - outcurrentdir = 1; } else if (strcmp(argv[i], "-Wall") == 0) { Swig_mark_arg(i); Swig_warnall(); @@ -880,7 +867,6 @@ int SWIG_main(int argc, char *argv[], Language *l) { } libfiles = NewList(); - all_output_files = NewList(); /* Check for SWIG_FEATURES environment variable */ @@ -938,13 +924,12 @@ int SWIG_main(int argc, char *argv[], Language *l) { // If we made it this far, looks good. go for it.... - input_file = NewString(argv[argc - 1]); - Swig_filename_correct(input_file); + input_file = argv[argc - 1]; // If the user has requested to check out a file, handle that if (checkout) { DOH *s; - char *outfile = Char(input_file); + char *outfile = input_file; if (outfile_name) outfile = outfile_name; @@ -953,26 +938,30 @@ int SWIG_main(int argc, char *argv[], Language *l) { s = Swig_include(input_file); if (!s) { - Printf(stderr, "Unable to locate '%s' in the SWIG library.\n", input_file); + fprintf(stderr, "Unable to locate '%s' in the SWIG library.\n", input_file); } else { - FILE *f = Swig_open(outfile); + FILE *f = fopen(outfile, "r"); if (f) { fclose(f); - Printf(stderr, "File '%s' already exists. Checkout aborted.\n", outfile); + fprintf(stderr, "File '%s' already exists. Checkout aborted.\n", outfile); } else { - File *f_outfile = NewFile(outfile, "w", SWIG_output_files()); - if (!f_outfile) { - FileErrorDisplay(outfile); - SWIG_exit(EXIT_FAILURE); - } else { - if (Verbose) - Printf(stdout, "'%s' checked out from the SWIG library.\n", outfile); - Printv(f_outfile, s, NIL); - Close(f_outfile); - } + f = fopen(outfile, "w"); + if (!f) { + fprintf(stderr, "Unable to create file '%s'\n", outfile); + } else { + if (Verbose) + fprintf(stdout, "'%s' checked out from the SWIG library.\n", input_file); + fputs(Char(s), f); + fclose(f); + } } } } else { + // Check the suffix for a .c file. If so, we're going to + // declare everything we see as "extern" + + ForceExtern = check_suffix(input_file); + // Run the preprocessor if (Verbose) printf("Preprocessing...\n"); @@ -982,22 +971,17 @@ int SWIG_main(int argc, char *argv[], Language *l) { String *fs = NewString(""); FILE *df = Swig_open(input_file); if (!df) { - df = Swig_include_open(input_file); - if (!df) { - char *cfile = Char(input_file); - if (cfile && cfile[0] == '-') { - Printf(stderr, "Unable to find option or file '%s', ", input_file); - Printf(stderr, "use 'swig -help' for more information.\n"); - } else { - Printf(stderr, "Unable to find file '%s'.\n", input_file); - } - SWIG_exit(EXIT_FAILURE); + char *cfile = Char(input_file); + if (cfile && cfile[0] == '-') { + Printf(stderr, "Unable to find option or file '%s', ", input_file); + Printf(stderr, "use 'swig -help' for more information.\n"); } else { - Swig_warning(WARN_DEPRECATED_INPUT_FILE, "SWIG", 1, "Use of the include path to find the input file is deprecated and will not work with ccache. Please include the path when specifying the input file.\n"); // so that behaviour is like c/c++ compilers + Printf(stderr, "Unable to find file '%s'.\n", input_file); } + SWIG_exit(EXIT_FAILURE); } + fclose(df); if (!no_cpp) { - fclose(df); Printf(fs, "%%include \n"); if (allkw) { Printf(fs, "%%include \n"); @@ -1005,7 +989,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (lang_config) { Printf(fs, "\n%%include <%s>\n", lang_config); } - Printf(fs, "%%include(maininput=\"%s\") \"%s\"\n", Swig_filename_escape(input_file), Swig_last_file()); + Printf(fs, "%%include \"%s\"\n", Swig_last_file()); for (i = 0; i < Len(libfiles); i++) { Printf(fs, "\n%%include \"%s\"\n", Getitem(libfiles, i)); } @@ -1013,8 +997,8 @@ int SWIG_main(int argc, char *argv[], Language *l) { cpps = Preprocessor_parse(fs); Delete(fs); } else { - cpps = Swig_read_file(df); - fclose(df); + df = Swig_open(input_file); + cpps = NewFileFromFile(df); } if (Swig_error_count()) { SWIG_exit(EXIT_FAILURE); @@ -1024,55 +1008,47 @@ int SWIG_main(int argc, char *argv[], Language *l) { SWIG_exit(EXIT_SUCCESS); } if (depend) { - if (!no_cpp) { - String *outfile; - - char *basename = Swig_file_basename(outcurrentdir ? Swig_file_filename(input_file): Char(input_file)); - if (!outfile_name) { - if (CPlusPlus || lang->cplus_runtime_mode()) { - outfile = NewStringf("%s_wrap.%s", basename, cpp_extension); - } else { - outfile = NewStringf("%s_wrap.c", basename); - } + String *outfile; + if (!outfile_name) { + if (CPlusPlus || lang->cplus_runtime_mode()) { + outfile = NewStringf("%s_wrap.%s", Swig_file_basename(input_file), cpp_extension); } else { - outfile = NewString(outfile_name); + outfile = NewStringf("%s_wrap.c", Swig_file_basename(input_file)); } - if (dependencies_file && Len(dependencies_file) != 0) { - f_dependencies_file = NewFile(dependencies_file, "w", SWIG_output_files()); - if (!f_dependencies_file) { - FileErrorDisplay(dependencies_file); - SWIG_exit(EXIT_FAILURE); - } - } else if (!depend_only) { - String *filename = NewStringf("%s_wrap.%s", basename, depends_extension); - f_dependencies_file = NewFile(filename, "w", SWIG_output_files()); - if (!f_dependencies_file) { - FileErrorDisplay(filename); - SWIG_exit(EXIT_FAILURE); - } - } else - f_dependencies_file = stdout; - if (dependencies_target) { - Printf(f_dependencies_file, "%s: ", dependencies_target); - } else { - Printf(f_dependencies_file, "%s: ", outfile); - } - List *files = Preprocessor_depend(); - for (int i = 0; i < Len(files); i++) { - if ((depend != 2) || ((depend == 2) && (Strncmp(Getitem(files, i), SwigLib, Len(SwigLib)) != 0))) { - Printf(f_dependencies_file, "\\\n %s ", Getitem(files, i)); - } - } - Printf(f_dependencies_file, "\n"); - if (f_dependencies_file != stdout) - Close(f_dependencies_file); - if (depend_only) - SWIG_exit(EXIT_SUCCESS); } else { - Printf(stderr, "Cannot generate dependencies with -nopreprocess\n"); - // Actually we could but it would be inefficient when just generating dependencies, as it would be done after Swig_cparse - SWIG_exit(EXIT_FAILURE); + outfile = NewString(outfile_name); } + if (dependencies_file && Len(dependencies_file) != 0) { + f_dependencies_file = NewFile(dependencies_file, "w"); + if (!f_dependencies_file) { + FileErrorDisplay(dependencies_file); + SWIG_exit(EXIT_FAILURE); + } + } else if (!depend_only) { + String *filename = NewStringf("%s_wrap.%s", Swig_file_basename(input_file), depends_extension); + f_dependencies_file = NewFile(filename, "w"); + if (!f_dependencies_file) { + FileErrorDisplay(filename); + SWIG_exit(EXIT_FAILURE); + } + } else + f_dependencies_file = stdout; + if (dependencies_target) { + Printf(f_dependencies_file, "%s: ", dependencies_target); + } else { + Printf(f_dependencies_file, "%s: ", outfile); + } + List *files = Preprocessor_depend(); + for (int i = 0; i < Len(files); i++) { + if ((depend != 2) || ((depend == 2) && (Strncmp(Getitem(files, i), SwigLib, Len(SwigLib)) != 0))) { + Printf(f_dependencies_file, "\\\n %s ", Getitem(files, i)); + } + } + Printf(f_dependencies_file, "\n"); + if (f_dependencies_file != stdout) + Close(f_dependencies_file); + if (depend_only) + SWIG_exit(EXIT_SUCCESS); } Seek(cpps, 0, SEEK_SET); } @@ -1150,30 +1126,22 @@ int SWIG_main(int argc, char *argv[], Language *l) { } if (top) { if (!Getattr(top, "name")) { - Printf(stderr, "No module name specified using %%module or -module.\n"); + Printf(stderr, "*** No module name specified using %%module or -module.\n"); SWIG_exit(EXIT_FAILURE); } else { /* Set some filename information on the object */ - String *infile = scanner_get_main_input_file(); - if (!infile) { - Printf(stderr, "Missing input file in preprocessed output.\n"); - SWIG_exit(EXIT_FAILURE); - } - Setattr(top, "infile", infile); // Note: if nopreprocess then infile is the original input file, otherwise input_file - Setattr(top, "inputfile", input_file); - - char *basename = Swig_file_basename(outcurrentdir ? Swig_file_filename(infile): Char(infile)); + Setattr(top, "infile", input_file); if (!outfile_name) { if (CPlusPlus || lang->cplus_runtime_mode()) { - Setattr(top, "outfile", NewStringf("%s_wrap.%s", basename, cpp_extension)); + Setattr(top, "outfile", NewStringf("%s_wrap.%s", Swig_file_basename(input_file), cpp_extension)); } else { - Setattr(top, "outfile", NewStringf("%s_wrap.c", basename)); + Setattr(top, "outfile", NewStringf("%s_wrap.c", Swig_file_basename(input_file))); } } else { Setattr(top, "outfile", outfile_name); } if (!outfile_name_h) { - Setattr(top, "outfile_h", NewStringf("%s_wrap.%s", basename, hpp_extension)); + Setattr(top, "outfile_h", NewStringf("%s_wrap.%s", Swig_file_basename(input_file), hpp_extension)); } else { Setattr(top, "outfile_h", outfile_name_h); } @@ -1181,12 +1149,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (Swig_contract_mode_get()) { Swig_contracts(top); } - - // Check the suffix for a c/c++ file. If so, we're going to declare everything we see as "extern" - ForceExtern = check_suffix(input_file); - lang->top(top); - if (browse) { Swig_browser(top, 0); } @@ -1210,21 +1173,6 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (memory_debug) DohMemoryDebug(); - char *outfiles = getenv("CCACHE_OUTFILES"); - if (outfiles) { - File *f_outfiles = NewFile(outfiles, "w", 0); - if (!f_outfiles) { - Printf(stderr, "Failed to write list of output files to the filename '%s' specified in CCACHE_OUTFILES environment variable - ", outfiles); - FileErrorDisplay(outfiles); - SWIG_exit(EXIT_FAILURE); - } else { - int i; - for (i = 0; i < Len(all_output_files); i++) - Printf(f_outfiles, "%s\n", Getitem(all_output_files, i)); - Close(f_outfiles); - } - } - // Deletes Delete(libfiles); Preprocessor_delete(); diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index b3568c0bf..6cb24d39a 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -127,7 +127,7 @@ char cvsroot_modula3_cxx[] = "$Id$"; #include // for INT_MAX #include -#define USAGE_ARG_DIR "m3wrapargdir typemap expect values: in, out, inout\n" +const char usageArgDir[] = "m3wrapargdir typemap expect values: in, out, inout\n"; class MODULA3:public Language { public: @@ -172,7 +172,6 @@ private: const String *empty_string; Hash *swig_types_hash; - File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -238,7 +237,6 @@ public: MODULA3(): empty_string(NewString("")), swig_types_hash(NULL), - f_begin(NULL), f_runtime(NULL), f_header(NULL), f_wrappers(NULL), @@ -376,7 +374,7 @@ MODULA3(): } else if (Strcmp(dir, "out") == 0) { return false; } else { - printf("%s", USAGE_ARG_DIR); + printf(usageArgDir); return false; } } @@ -388,7 +386,7 @@ MODULA3(): } else if ((Strcmp(dir, "out") == 0) || (Strcmp(dir, "inout") == 0)) { return true; } else { - printf("%s", USAGE_ARG_DIR); + printf(usageArgDir); return false; } } @@ -544,7 +542,7 @@ MODULA3(): * ----------------------------------------------------------------------------- */ File *openWriteFile(String *name) { - File *file = NewFile(name, "w", SWIG_output_files()); + File *file = NewFile(name, "w"); if (!file) { FileErrorDisplay(name); SWIG_exit(EXIT_FAILURE); @@ -904,12 +902,11 @@ MODULA3(): /* Initialize all of the output files */ outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -919,7 +916,6 @@ MODULA3(): /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -960,11 +956,7 @@ MODULA3(): module_imports = NewString(""); upcasts_code = NewString(""); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGMODULA3\n"); - Printf(f_runtime, "\n"); + Swig_banner(f_runtime); // Print the SWIG banner message Swig_name_register((char *) "wrapper", (char *) "Modula3_%f"); if (old_variable_names) { @@ -1151,16 +1143,14 @@ MODULA3(): typemapfilename = NULL; /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -1169,9 +1159,14 @@ MODULA3(): * ----------------------------------------------------------------------------- */ void emitBanner(File *f) { - Printf(f, "(*******************************************************************************\n"); - Swig_banner_target_lang(f, " *"); - Printf(f, "*******************************************************************************)\n\n"); + Printf(f, "\ +(*******************************************************************************\n\ + * This file was automatically generated by SWIG (http://www.swig.org/).\n\ + * Version %s\n\ + *\n\ + * Do not make changes to this file unless you know what you are doing --\n\ + * modify the SWIG interface file instead.\n\ + *******************************************************************************)\n\n", Swig_package_version()); } /* ---------------------------------------------------------------------- @@ -2387,7 +2382,7 @@ MODULA3(): } String *filen = NewStringf("%s%s.m3", Swig_file_dirname(outfile), proxy_class_name); - f_proxy = NewFile(filen, "w", SWIG_output_files()); + f_proxy = NewFile(filen, "w"); if (!f_proxy) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -3179,7 +3174,8 @@ MODULA3(): Clear(result_m3wraptype); Printv(result_m3wraptype, tm, NIL); } else { - Swig_warning(WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN, input_file, line_number, + Swig_warning(WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN, + input_file, line_number, "Typemap m3wrapargdir set to 'out' for %s implies a RETURN value, but the routine %s has already one.\nUse %%multiretval feature.\n", SwigType_str(Getattr(p, "type"), 0), raw_name); } @@ -3766,7 +3762,7 @@ MODULA3(): void emitTypeWrapperClass(String *classname, SwigType *type) { String *filen = NewStringf("%s%s.m3", Swig_file_dirname(outfile), classname); - File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); + File *f_swigtype = NewFile(filen, "w"); if (!f_swigtype) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index 28dd8ecd2..78d4a4b65 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -39,7 +39,6 @@ static String *module = 0; static char *mzscheme_path = (char *) "mzscheme"; static String *init_func_def = 0; -static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -130,12 +129,11 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -143,17 +141,13 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); init_func_def = NewString(""); Swig_register_filebyname("init", init_func_def); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGMZSCHEME\n"); - Printf(f_runtime, "\n"); + Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); + Swig_banner(f_runtime); module = Getattr(n, "name"); @@ -192,16 +186,14 @@ public: } /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx old mode 100644 new mode 100755 index b925328a3..9f5677ba5 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -38,7 +38,6 @@ static Hash *seen_enumvalues = 0; static Hash *seen_constructors = 0; static File *f_header = 0; -static File *f_begin = 0; static File *f_runtime = 0; static File *f_wrappers = 0; static File *f_directors = 0; @@ -215,12 +214,11 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -249,7 +247,6 @@ public: Swig_register_filebyname("init", init_func_def); Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("mli", f_mlibody); Swig_register_filebyname("ml", f_mlbody); @@ -265,10 +262,7 @@ public: Swig_name_register("get", "%v__get__"); } - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGOCAML\n"); + Printf(f_runtime, "/* -*- buffer-read-only: t -*- vi: set ro: */\n"); Printf(f_runtime, "#define SWIG_MODULE \"%s\"\n", module); /* Module name */ Printf(f_mlbody, "let module_name = \"%s\"\n", module); @@ -282,12 +276,12 @@ public: Printf(f_int_to_enum, "let int_to_enum x y =\n" " match (x : c_enum_type) with\n" " `unknown -> C_enum (`Int y)\n"); + Swig_banner(f_runtime); + if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); } - Printf(f_runtime, "\n"); - /* Produce the enum_to_int and int_to_enum functions */ Printf(f_enumtypes_type, "open Swig\n" "type c_enum_type = [ \n `unknown\n"); @@ -299,12 +293,12 @@ public: Printv(mlifile, module, ".mli", NIL); String *mlfilen = NewStringf("%s%s", SWIG_output_directory(), mlfile); - if ((f_mlout = NewFile(mlfilen, "w", SWIG_output_files())) == 0) { + if ((f_mlout = NewFile(mlfilen, "w")) == 0) { FileErrorDisplay(mlfilen); SWIG_exit(EXIT_FAILURE); } String *mlifilen = NewStringf("%s%s", SWIG_output_directory(), mlifile); - if ((f_mliout = NewFile(mlifilen, "w", SWIG_output_files())) == 0) { + if ((f_mliout = NewFile(mlifilen, "w")) == 0) { FileErrorDisplay(mlifilen); SWIG_exit(EXIT_FAILURE); } @@ -328,18 +322,16 @@ public: SwigType_emit_type_table(f_runtime, f_wrappers); /* Close all of the files */ - Dump(f_runtime, f_begin); Dump(f_directors_h, f_header); - Dump(f_header, f_begin); + Dump(f_header, f_runtime); Dump(f_directors, f_wrappers); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); Dump(f_enumtypes_type, f_mlout); Dump(f_enumtypes_value, f_mlout); @@ -1300,50 +1292,56 @@ public: * which means looking up and registering by typedef and enum name. */ int enumDeclaration(Node *n) { String *name = Getattr(n, "name"); - if (name) { - String *oname = NewString(name); - /* name is now fully qualified */ - String *fully_qualified_name = NewString(name); - bool seen_enum = false; - if (name_qualifier) - Delete(name_qualifier); - char *strip_position; - name_qualifier = fully_qualify_enum_name(n, NewString("")); + String *oname = name ? NewString(name) : NULL; + /* name is now fully qualified */ + String *fully_qualified_name = NewString(name); + bool seen_enum = false; + if (name_qualifier) + Delete(name_qualifier); + char *strip_position; + name_qualifier = fully_qualify_enum_name(n, NewString("")); + /* Recent changes have distrubed enum and template naming again. + * Will try to keep it consistent by can't guarantee much given + * that these things move around a lot. + * + * I need to figure out a way to isolate this module better. + */ + if (oname) { strip_position = strstr(Char(oname), "::"); while (strip_position) { - strip_position += 2; - oname = NewString(strip_position); - strip_position = strstr(Char(oname), "::"); + strip_position += 2; + oname = NewString(strip_position); + strip_position = strstr(Char(oname), "::"); + } + } + + seen_enum = oname ? (Getattr(seen_enums, fully_qualified_name) ? true : false) : false; + + if (oname && !seen_enum) { + const_enum = true; + Printf(f_enum_to_int, "| `%s -> (match y with\n", oname); + Printf(f_int_to_enum, "| `%s -> C_enum (\n", oname); + /* * * * A note about enum name resolution * * * * + * This code should now work, but I think we can do a bit better. + * The problem I'm having is that swig isn't very precise about + * typedef name resolution. My opinion is that SwigType_typedef + * resolve_all should *always* return the enum tag if one exists, + * rather than the admittedly friendlier enclosing typedef. + * + * This would make one of the cases below unnecessary. + * * * */ + Printf(f_mlbody, "let _ = Callback.register \"%s_marker\" (`%s)\n", fully_qualified_name, oname); + if (!strncmp(Char(fully_qualified_name), "enum ", 5)) { + String *fq_noenum = NewString(Char(fully_qualified_name) + 5); + Printf(f_mlbody, + "let _ = Callback.register \"%s_marker\" (`%s)\n" "let _ = Callback.register \"%s_marker\" (`%s)\n", fq_noenum, oname, fq_noenum, name); } - seen_enum = (Getattr(seen_enums, fully_qualified_name) ? true : false); - - if (!seen_enum) { - const_enum = true; - Printf(f_enum_to_int, "| `%s -> (match y with\n", oname); - Printf(f_int_to_enum, "| `%s -> C_enum (\n", oname); - /* * * * A note about enum name resolution * * * * - * This code should now work, but I think we can do a bit better. - * The problem I'm having is that swig isn't very precise about - * typedef name resolution. My opinion is that SwigType_typedef - * resolve_all should *always* return the enum tag if one exists, - * rather than the admittedly friendlier enclosing typedef. - * - * This would make one of the cases below unnecessary. - * * * */ - Printf(f_mlbody, "let _ = Callback.register \"%s_marker\" (`%s)\n", fully_qualified_name, oname); - if (!strncmp(Char(fully_qualified_name), "enum ", 5)) { - String *fq_noenum = NewString(Char(fully_qualified_name) + 5); - Printf(f_mlbody, - "let _ = Callback.register \"%s_marker\" (`%s)\n" "let _ = Callback.register \"%s_marker\" (`%s)\n", fq_noenum, oname, fq_noenum, name); - } - - Printf(f_enumtypes_type, "| `%s\n", oname); - Insert(fully_qualified_name, 0, "enum "); - Setattr(seen_enums, fully_qualified_name, n); - } + Printf(f_enumtypes_type, "| `%s\n", oname); + Insert(fully_qualified_name, 0, "enum "); + Setattr(seen_enums, fully_qualified_name, n); } int ret = Language::enumDeclaration(n); diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index c5ff2eb44..d582e8a6c 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -7,7 +7,7 @@ * Octave language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_octave_cxx[] = "$Id: octave.cxx 10538 2008-06-21 14:51:02Z maciekd $"; +char cvsroot_octave_cxx[] = "$Id$"; #include "swigmod.h" @@ -18,7 +18,6 @@ Octave Options (available with -octave)\n\ class OCTAVE:public Language { private: - File *f_begin; File *f_runtime; File *f_header; File *f_doc; @@ -38,16 +37,9 @@ private: Hash *docs; public: - OCTAVE():f_begin(0), f_runtime(0), f_header(0), f_doc(0), f_wrappers(0), + OCTAVE():f_runtime(0), f_header(0), f_doc(0), f_wrappers(0), f_init(0), f_initbeforefunc(0), f_directors(0), f_directors_h(0), s_global_tab(0), s_members_tab(0), class_name(0) { - /* Add code to manage protected constructors and directors */ - director_prot_ctor_code = NewString(""); - Printv(director_prot_ctor_code, - "if ( $comparison ) { /* subclassed */\n", - " $director_new \n", - "} else {\n", " error(\"accessing abstract class or protected constructor\"); \n", " SWIG_fail;\n", "}\n", NIL); - enable_cplus_runtime_mode(); allow_overloading(); director_multiple_inheritance = 1; @@ -95,12 +87,11 @@ public: String *module = Getattr(n, "name"); String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_header = NewString(""); f_doc = NewString(""); f_wrappers = NewString(""); @@ -109,7 +100,6 @@ public: f_directors_h = NewString(""); f_directors = NewString(""); s_global_tab = NewString(""); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("header", f_header); Swig_register_filebyname("doc", f_doc); @@ -118,16 +108,11 @@ public: Swig_register_filebyname("initbeforefunc", f_initbeforefunc); Swig_register_filebyname("director", f_directors); Swig_register_filebyname("director_h", f_directors_h); - - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGOCTAVE\n"); + Swig_banner(f_runtime); Printf(f_runtime, "#define SWIG_name_d \"%s\"\n", module); Printf(f_runtime, "#define SWIG_name %s\n", module); if (directorsEnabled()) { - Printf(f_runtime, "#define SWIG_DIRECTORS\n"); Swig_banner(f_directors_h); if (dirprot_mode()) { // Printf(f_directors_h, "#include \n"); @@ -135,7 +120,6 @@ public: } } - Printf(f_runtime, "\n"); Printf(s_global_tab, "\nstatic const struct swig_octave_member swig_globals[] = {\n"); Printf(f_init, "static void SWIG_init_user(octave_swig_type* module_ns)\n{\n"); @@ -159,16 +143,15 @@ public: Printv(f_wrappers, s_global_tab, NIL); SwigType_emit_type_table(f_runtime, f_wrappers); - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_doc, f_begin); + Dump(f_header, f_runtime); + Dump(f_doc, f_runtime); if (directorsEnabled()) { - Dump(f_directors_h, f_begin); - Dump(f_directors, f_begin); + Dump(f_directors_h, f_runtime); + Dump(f_directors, f_runtime); } - Dump(f_wrappers, f_begin); - Dump(f_initbeforefunc, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_wrappers, f_runtime); + Dump(f_initbeforefunc, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(s_global_tab); Delete(f_initbeforefunc); @@ -178,9 +161,8 @@ public: Delete(f_header); Delete(f_directors); Delete(f_directors_h); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } diff --git a/Source/Modules/overload.cxx b/Source/Modules/overload.cxx index 511e55004..d16913885 100644 --- a/Source/Modules/overload.cxx +++ b/Source/Modules/overload.cxx @@ -316,7 +316,7 @@ static bool print_typecheck(String *f, int j, Parm *pj) { * ReplaceFormat() * ----------------------------------------------------------------------------- */ -static String *ReplaceFormat(const_String_or_char_ptr fmt, int j) { +static String *ReplaceFormat(const String_or_char *fmt, int j) { String *lfmt = NewString(fmt); char buf[50]; sprintf(buf, "%d", j); @@ -352,7 +352,7 @@ static String *ReplaceFormat(const_String_or_char_ptr fmt, int j) { /* Cast dispatch mechanism. */ -String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int *maxargs) { +String *Swig_overload_dispatch_cast(Node *n, const String_or_char *fmt, int *maxargs) { int i, j; *maxargs = 1; @@ -536,7 +536,7 @@ String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int * /* Fast dispatch mechanism, provided by Salvador Fandi~no Garc'ia (#930586). */ -String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int *maxargs) { +String *Swig_overload_dispatch_fast(Node *n, const String_or_char *fmt, int *maxargs) { int i, j; *maxargs = 1; @@ -695,7 +695,7 @@ String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int * return f; } -String *Swig_overload_dispatch(Node *n, const_String_or_char_ptr fmt, int *maxargs) { +String *Swig_overload_dispatch(Node *n, const String_or_char *fmt, int *maxargs) { if (fast_dispatch_mode || GetFlag(n, "feature:fastdispatch")) { return Swig_overload_dispatch_fast(n, fmt, maxargs); diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index eace179a7..6e706fc8d 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -78,7 +78,6 @@ static String *command_tab = 0; static String *constant_tab = 0; static String *variable_tab = 0; -static File *f_begin = 0; static File *f_runtime = 0; static File *f_header = 0; static File *f_wrappers = 0; @@ -208,7 +207,6 @@ public: } Preprocessor_define("SWIGPERL 1", 0); - // SWIGPERL5 is deprecated, and no longer documented. Preprocessor_define("SWIGPERL5 1", 0); SWIG_typemap_lang("perl5"); SWIG_config_file("perl5.swg"); @@ -224,12 +222,11 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -237,7 +234,6 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -256,12 +252,11 @@ public: constant_tab = NewString("static swig_constant_info swig_constants[] = {\n"); variable_tab = NewString("static swig_variable_info swig_variables[] = {\n"); - Swig_banner(f_begin); + Swig_banner(f_runtime); - Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGPERL\n"); Printf(f_runtime, "#define SWIG_CASTRANK_MODE\n"); - Printf(f_runtime, "\n"); + // Is the imported module in another package? (IOW, does it use the // %module(package="name") option and it's different than the package @@ -320,7 +315,7 @@ public: pmfile = NewStringf("%s.pm", m); } String *filen = NewStringf("%s%s", SWIG_output_directory(), pmfile); - if ((f_pm = NewFile(filen, "w", SWIG_output_files())) == 0) { + if ((f_pm = NewFile(filen, "w")) == 0) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); } @@ -337,7 +332,10 @@ public: Delete(boot_name); } - Swig_banner_target_lang(f_pm, "#"); + Printf(f_pm, "# This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f_pm, "# Version %s\n", Swig_package_version()); + Printf(f_pm, "#\n"); + Printf(f_pm, "# Don't modify this file, modify the SWIG interface instead.\n"); Printf(f_pm, "\n"); Printf(f_pm, "package %s;\n", module); @@ -526,16 +524,14 @@ public: Delete(underscore_module); /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -1145,9 +1141,8 @@ public: /* Do some work on the class name */ if (verbose > 0) { - String *modulename = Getattr(clsmodule, "name"); fprintf(stdout, "setclassname: Found sym:name: %s\n", Char(symname)); - fprintf(stdout, "setclassname: Found module: %s\n", Char(modulename)); + fprintf(stdout, "setclassname: Found module: %s\n", Char(clsmodule)); fprintf(stdout, "setclassname: No package found\n"); } @@ -1629,7 +1624,7 @@ public: } else if (Strcmp(code, "include") == 0) { /* Include a file into the .pm file */ if (value) { - FILE *f = Swig_include_open(value); + FILE *f = Swig_open(value); if (!f) { Printf(stderr, "%s : Line %d. Unable to locate file %s\n", input_file, line_number, value); } else { diff --git a/Source/Modules/php.cxx b/Source/Modules/php4.cxx similarity index 64% rename from Source/Modules/php.cxx rename to Source/Modules/php4.cxx index ee69c1864..42d71e79a 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php4.cxx @@ -2,9 +2,9 @@ * See the LICENSE file for information on copyright, usage and redistribution * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * php.cxx + * php4.cxx * - * PHP language module for SWIG. + * Php language module for SWIG. * ----------------------------------------------------------------------------- */ @@ -13,9 +13,11 @@ * Short term: * * Sort out auto-renaming of method and class names which are reserved - * words (e.g. empty, clone, exception, etc.) + * words (e.g. empty, clone, exception, etc.) vs -php4/-php5 in some + * sane way. * - * Sort out wrapping of static member variables in OO PHP5. + * Sort out wrapping of static member variables in OO PHP5 (which first may + * mean we need to sort them out for PHP4!) * * Medium term: * @@ -37,10 +39,10 @@ /* * TODO: Replace remaining stderr messages with Swig_error or Swig_warning - * (may need to add more WARN_PHP_xxx codes...) + * (may need to add more WARN_PHP4_xxx codes...) */ -char cvsroot_php_cxx[] = "$Id$"; +char cvsroot_php4_cxx[] = "$Id$"; #include "swigmod.h" @@ -48,13 +50,19 @@ char cvsroot_php_cxx[] = "$Id$"; #include static const char *usage = (char *) "\ -PHP Options (available with -php)\n\ +PHP Options (available with -php4 or -php5)\n\ -cppext - cpp file extension (default to .cpp)\n\ -noproxy - Don't generate proxy classes.\n\ - -prefix - Prepend to all class names in PHP wrappers\n\ + -prefix - Prepend to all class names in PHP5 wrappers\n\ + -make - Create simple makefile\n\ + -phpfull - Create full make files\n\ + -withincs - With -phpfull writes needed incs in config.m4\n\ + -withlibs - With -phpfull writes needed libs in config.m4\n\ + -withc - With -phpfull makes extra C files in Makefile.in\n\ + -withcxx - With -phpfull makes extra C++ files in Makefile.in\n\ \n"; -/* The original class wrappers for PHP stored the pointer to the C++ class in +/* The original class wrappers for PHP4 store the pointer to the C++ class in * the object property _cPtr. If we use the same name for the member variable * which we put the pointer to the C++ class in, then the flat function * wrappers will automatically pull it out without any changes being required. @@ -68,10 +76,16 @@ static Node *classnode = 0; static String *module = 0; static String *cap_module = 0; static String *prefix = 0; +static String *withlibs = 0; +static String *withincs = 0; +static String *withc = 0; +static String *withcxx = 0; static String *shadow_classname = 0; -static File *f_begin = 0; +static int gen_extra = 0; +static int gen_make = 0; + static File *f_runtime = 0; static File *f_h = 0; static File *f_phpcode = 0; @@ -102,6 +116,9 @@ static Node *current_class = 0; static Hash *shadow_get_vars; static Hash *shadow_set_vars; +#define NATIVE_CONSTRUCTOR 1 +#define ALTERNATIVE_CONSTRUCTOR 2 +static int native_constructor = 0; static Hash *zend_types = 0; static int shadow = 1; @@ -142,7 +159,7 @@ void SwigPHP_emit_resource_registrations() { Printf(s_wrappers, "/* NEW Destructor style */\nstatic ZEND_RSRC_DTOR_FUNC(_wrap_destroy%s) {\n", key); // write out body - if (class_node != NOTCLASS) { + if ((class_node != NOTCLASS)) { String *destructor = Getattr(class_node, "destructor"); human_name = Getattr(class_node, "sym:name"); if (!human_name) @@ -173,9 +190,12 @@ void SwigPHP_emit_resource_registrations() { } } -class PHP : public Language { +class PHP:public Language { + int php_version; + public: - PHP() { } + PHP(int php_version_):php_version(php_version_) { + } /* Test to see if a type corresponds to something wrapped with a shadow class. */ @@ -196,57 +216,327 @@ public: * ------------------------------------------------------------ */ virtual void main(int argc, char *argv[]) { - SWIG_library_directory("php"); + int i; + SWIG_library_directory("php4"); SWIG_config_cppext("cpp"); - for (int i = 1; i < argc; i++) { - if (strcmp(argv[i], "-prefix") == 0) { - if (argv[i + 1]) { - prefix = NewString(argv[i + 1]); + for (i = 1; i < argc; i++) { + if (argv[i]) { + if (strcmp(argv[i], "-phpfull") == 0) { + gen_extra = 1; Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); - } - } else if (strcmp(argv[i], "-cppext") == 0) { - if (argv[i + 1]) { - SWIG_config_cppext(argv[i + 1]); + } else if (strcmp(argv[i], "-dlname") == 0) { + Printf(stderr, "*** -dlname is no longer supported\n*** if you want to change the module name, use -module instead.\n"); + SWIG_exit(EXIT_FAILURE); + } else if (strcmp(argv[i], "-prefix") == 0) { + if (argv[i + 1]) { + prefix = NewString(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if (strcmp(argv[i], "-withlibs") == 0) { + if (argv[i + 1]) { + withlibs = NewString(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if (strcmp(argv[i], "-withincs") == 0) { + if (argv[i + 1]) { + withincs = NewString(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if (strcmp(argv[i], "-withc") == 0) { + if (argv[i + 1]) { + withc = NewString(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if (strcmp(argv[i], "-withcxx") == 0) { + if (argv[i + 1]) { + withcxx = NewString(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if (strcmp(argv[i], "-cppext") == 0) { + if (argv[i + 1]) { + SWIG_config_cppext(argv[i + 1]); + Swig_mark_arg(i); + Swig_mark_arg(i + 1); + i++; + } else { + Swig_arg_error(); + } + } else if ((strcmp(argv[i], "-noshadow") == 0) || (strcmp(argv[i], "-noproxy") == 0)) { + shadow = 0; Swig_mark_arg(i); - Swig_mark_arg(i + 1); - i++; - } else { - Swig_arg_error(); + } else if (strcmp(argv[i], "-make") == 0) { + gen_make = 1; + Swig_mark_arg(i); + } else if (strcmp(argv[i], "-help") == 0) { + fputs(usage, stdout); } - } else if ((strcmp(argv[i], "-noshadow") == 0) || (strcmp(argv[i], "-noproxy") == 0)) { - shadow = 0; - Swig_mark_arg(i); - } else if (strcmp(argv[i], "-help") == 0) { - fputs(usage, stdout); - } else if (strcmp(argv[i], "-make") == 0 || - strcmp(argv[i], "-withc") == 0 || - strcmp(argv[i], "-withcxx") == 0) { - Printf(stderr, "*** %s is no longer supported.\n", argv[i]); - SWIG_exit(EXIT_FAILURE); - } else if (strcmp(argv[i], "-phpfull") == 0 || - strcmp(argv[i], "-withlibs") == 0 || - strcmp(argv[i], "-withincs") == 0) { - Printf(stderr, "*** %s is no longer supported.\n*** We recommend building as a dynamically loadable module.\n", argv[i]); - SWIG_exit(EXIT_FAILURE); - } else if (strcmp(argv[i], "-dlname") == 0) { - Printf(stderr, "*** -dlname is no longer supported.\n*** If you want to change the module name, use -module instead.\n"); - SWIG_exit(EXIT_FAILURE); } } - Preprocessor_define("SWIGPHP 1", 0); - // SWIGPHP5 is deprecated, and no longer documented. - Preprocessor_define("SWIGPHP5 1", 0); - SWIG_typemap_lang("php"); - SWIG_config_file("php.swg"); + Preprocessor_define((void *) "SWIGPHP 1", 0); + if (php_version == 4) { + Preprocessor_define((void *) "SWIGPHP4 1", 0); + } else if (php_version == 5) { + Preprocessor_define((void *) "SWIGPHP5 1", 0); + } + SWIG_typemap_lang("php4"); + /* DB: Suggest using a language configuration file */ + SWIG_config_file("php4.swg"); allow_overloading(); } + void create_simple_make(void) { + File *f_make; + + f_make = NewFile((void *) "makefile", "w"); + Printf(f_make, "CC=gcc\n"); + Printf(f_make, "CXX=g++\n"); + Printf(f_make, "CXX_SOURCES=%s\n", withcxx); + Printf(f_make, "C_SOURCES=%s\n", withc); + Printf(f_make, "OBJS=%s_wrap.o $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cxx=.o)\n", module); + Printf(f_make, "MODULE=%s.so\n", module); + Printf(f_make, "CFLAGS=-fpic\n"); + Printf(f_make, "LDFLAGS=-shared\n"); + Printf(f_make, "PHP_INC=`php-config --includes`\n"); + Printf(f_make, "EXTRA_INC=\n"); + Printf(f_make, "EXTRA_LIB=\n\n"); + Printf(f_make, "$(MODULE): $(OBJS)\n"); + if (CPlusPlus || (withcxx != NULL)) { + Printf(f_make, "\t$(CXX) $(LDFLAGS) $(OBJS) -o $@ $(EXTRA_LIB)\n\n"); + } else { + Printf(f_make, "\t$(CC) $(LDFLAGS) $(OBJS) -o $@ $(EXTRA_LIB)\n\n"); + } + Printf(f_make, "%%.o: %%.cpp\n"); + Printf(f_make, "\t$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); + Printf(f_make, "%%.o: %%.cxx\n"); + Printf(f_make, "\t$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); + Printf(f_make, "%%.o: %%.c\n"); + Printf(f_make, "\t$(CC) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); + + Close(f_make); + } + + void create_extra_files(String *outfile) { + File *f_extra; + + static String *configm4 = 0; + static String *makefilein = 0; + static String *credits = 0; + + configm4 = NewStringEmpty(); + Printv(configm4, SWIG_output_directory(), "config.m4", NIL); + + makefilein = NewStringEmpty(); + Printv(makefilein, SWIG_output_directory(), "Makefile.in", NIL); + + credits = NewStringEmpty(); + Printv(credits, SWIG_output_directory(), "CREDITS", NIL); + + // are we a --with- or --enable- + int with = (withincs || withlibs) ? 1 : 0; + + // Note Makefile.in only copes with one source file + // also withincs and withlibs only take one name each now + // the code they generate should be adapted to take multiple lines + + /* Write out Makefile.in */ + f_extra = NewFile(makefilein, "w"); + if (!f_extra) { + FileErrorDisplay(makefilein); + SWIG_exit(EXIT_FAILURE); + } + + Printf(f_extra, "# $Id$\n\n" "LTLIBRARY_NAME = %s.la\n", module); + + // C++ has more and different entries to C in Makefile.in + if (!CPlusPlus) { + Printf(f_extra, "LTLIBRARY_SOURCES = %s %s\n", Swig_file_filename(outfile), withc); + Printf(f_extra, "LTLIBRARY_SOURCES_CPP = %s\n", withcxx); + } else { + Printf(f_extra, "LTLIBRARY_SOURCES = %s\n", withc); + Printf(f_extra, "LTLIBRARY_SOURCES_CPP = %s %s\n", Swig_file_filename(outfile), withcxx); + Printf(f_extra, "LTLIBRARY_OBJECTS_X = $(LTLIBRARY_SOURCES_CPP:.cpp=.lo) $(LTLIBRARY_SOURCES_CPP:.cxx=.lo)\n"); + } + Printf(f_extra, "LTLIBRARY_SHARED_NAME = %s.la\n", module); + Printf(f_extra, "LTLIBRARY_SHARED_LIBADD = $(%s_SHARED_LIBADD)\n\n", cap_module); + Printf(f_extra, "include $(top_srcdir)/build/dynlib.mk\n"); + + Printf(f_extra, "\n# patch in .cxx support to php build system to work like .cpp\n"); + Printf(f_extra, ".SUFFIXES: .cxx\n\n"); + + Printf(f_extra, ".cxx.o:\n"); + Printf(f_extra, "\t$(CXX_COMPILE) -c $<\n\n"); + + Printf(f_extra, ".cxx.lo:\n"); + Printf(f_extra, "\t$(CXX_PHP_COMPILE)\n\n"); + Printf(f_extra, ".cxx.slo:\n"); + + Printf(f_extra, "\t$(CXX_SHARED_COMPILE)\n\n"); + + Printf(f_extra, "\n# make it easy to test module\n"); + Printf(f_extra, "testmodule:\n"); + Printf(f_extra, "\tphp -q -d extension_dir=modules %s\n\n", Swig_file_filename(phpfilename)); + + Close(f_extra); + + /* Now config.m4 */ + // Note: # comments are OK in config.m4 if you don't mind them + // appearing in the final ./configure file + // (which can help with ./configure debugging) + + // NOTE2: phpize really ought to be able to write out a sample + // config.m4 based on some simple data, I'll take this up with + // the php folk! + f_extra = NewFile(configm4, "w"); + if (!f_extra) { + FileErrorDisplay(configm4); + SWIG_exit(EXIT_FAILURE); + } + + Printf(f_extra, "dnl $Id$\n"); + Printf(f_extra, "dnl ***********************************************************************\n"); + Printf(f_extra, "dnl ** THIS config.m4 is provided for PHPIZE and PHP's consumption NOT\n"); + Printf(f_extra, "dnl ** for any part of the rest of the %s build system\n", module); + Printf(f_extra, "dnl ***********************************************************************\n\n"); + + + if (!with) { // must be enable then + Printf(f_extra, "PHP_ARG_ENABLE(%s, whether to enable %s support,\n", module, module); + Printf(f_extra, "[ --enable-%s Enable %s support])\n\n", module, module); + } else { + Printf(f_extra, "PHP_ARG_WITH(%s, for %s support,\n", module, module); + Printf(f_extra, "[ --with-%s[=DIR] Include %s support.])\n\n", module, module); + // These tests try and file the library we need + Printf(f_extra, "dnl THESE TESTS try and find the library and header files\n"); + Printf(f_extra, "dnl your new php module needs. YOU MAY NEED TO EDIT THEM\n"); + Printf(f_extra, "dnl as written they assume your header files are all in the same place\n\n"); + + Printf(f_extra, "dnl ** are we looking for %s_lib.h or something else?\n", module); + if (withincs) + Printf(f_extra, "HNAMES=\"%s\"\n\n", withincs); + else + Printf(f_extra, "HNAMES=\"\"; # %s_lib.h ?\n\n", module); + + Printf(f_extra, "dnl ** Are we looking for lib%s.a or lib%s.so or something else?\n", module, module); + + if (withlibs) + Printf(f_extra, "LIBNAMES=\"%s\"\n\n", withlibs); + else + Printf(f_extra, "LIBNAMES=\"\"; # lib%s.so ?\n\n", module); + + Printf(f_extra, "dnl IF YOU KNOW one of the symbols in the library and you\n"); + Printf(f_extra, "dnl specify it below then we can have a link test to see if it works\n"); + Printf(f_extra, "LIBSYMBOL=\"\"\n\n"); + } + + // Now write out tests to find thing.. they may need to extend tests + Printf(f_extra, "if test \"$PHP_%s\" != \"no\"; then\n\n", cap_module); + + // Ready for when we add libraries as we find them + Printf(f_extra, " PHP_SUBST(%s_SHARED_LIBADD)\n\n", cap_module); + + if (withlibs) { // find more than one library + Printf(f_extra, " for LIBNAME in $LIBNAMES ; do\n"); + Printf(f_extra, " LIBDIR=\"\"\n"); + // For each path element to try... + Printf(f_extra, " for i in $PHP_%s $PHP_%s/lib /usr/lib /usr/local/lib ; do\n", cap_module, cap_module); + Printf(f_extra, " if test -r $i/lib$LIBNAME.a -o -r $i/lib$LIBNAME.so ; then\n"); + Printf(f_extra, " LIBDIR=\"$i\"\n"); + Printf(f_extra, " break\n"); + Printf(f_extra, " fi\n"); + Printf(f_extra, " done\n\n"); + Printf(f_extra, " dnl ** and $LIBDIR should be the library path\n"); + Printf(f_extra, " if test \"$LIBNAME\" != \"\" -a -z \"$LIBDIR\" ; then\n"); + Printf(f_extra, " AC_MSG_RESULT(Library files $LIBNAME not found)\n"); + Printf(f_extra, " AC_MSG_ERROR(Is the %s distribution installed properly?)\n", module); + Printf(f_extra, " else\n"); + Printf(f_extra, " AC_MSG_RESULT(Library files $LIBNAME found in $LIBDIR)\n"); + Printf(f_extra, " PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBDIR, %s_SHARED_LIBADD)\n", cap_module); + Printf(f_extra, " fi\n"); + Printf(f_extra, " done\n\n"); + } + + if (withincs) { // Find more than once include + Printf(f_extra, " for HNAME in $HNAMES ; do\n"); + Printf(f_extra, " INCDIR=\"\"\n"); + // For each path element to try... + Printf(f_extra, " for i in $PHP_%s $PHP_%s/include $PHP_%s/includes $PHP_%s/inc $PHP_%s/incs /usr/local/include /usr/include; do\n", cap_module, + cap_module, cap_module, cap_module, cap_module); + // Try and find header files + Printf(f_extra, " if test \"$HNAME\" != \"\" -a -r $i/$HNAME ; then\n"); + Printf(f_extra, " INCDIR=\"$i\"\n"); + Printf(f_extra, " break\n"); + Printf(f_extra, " fi\n"); + Printf(f_extra, " done\n\n"); + + Printf(f_extra, " dnl ** Now $INCDIR should be the include file path\n"); + Printf(f_extra, " if test \"$HNAME\" != \"\" -a -z \"$INCDIR\" ; then\n"); + Printf(f_extra, " AC_MSG_RESULT(Include files $HNAME not found)\n"); + Printf(f_extra, " AC_MSG_ERROR(Is the %s distribution installed properly?)\n", module); + Printf(f_extra, " else\n"); + Printf(f_extra, " AC_MSG_RESULT(Include files $HNAME found in $INCDIR)\n"); + Printf(f_extra, " PHP_ADD_INCLUDE($INCDIR)\n"); + Printf(f_extra, " fi\n\n"); + Printf(f_extra, " done\n\n"); + } + + if (CPlusPlus) { + Printf(f_extra, " # As this is a C++ module..\n"); + } + + Printf(f_extra, " PHP_REQUIRE_CXX\n"); + Printf(f_extra, " AC_CHECK_LIB(stdc++, cin)\n"); + + if (with) { + Printf(f_extra, " if test \"$LIBSYMBOL\" != \"\" ; then\n"); + Printf(f_extra, " old_LIBS=\"$LIBS\"\n"); + Printf(f_extra, " LIBS=\"$LIBS -L$TEST_DIR/lib -lm -ldl\"\n"); + Printf(f_extra, " AC_CHECK_LIB($LIBNAME, $LIBSYMBOL, [AC_DEFINE(HAVE_TESTLIB,1, [ ])],\n"); + Printf(f_extra, " [AC_MSG_ERROR(wrong test lib version or lib not found)])\n"); + Printf(f_extra, " LIBS=\"$old_LIBS\"\n"); + Printf(f_extra, " fi\n\n"); + } + + Printf(f_extra, " AC_DEFINE(HAVE_%s, 1, [ ])\n", cap_module); + Printf(f_extra, "dnl AC_DEFINE_UNQUOTED(PHP_%s_DIR, \"$%s_DIR\", [ ])\n", cap_module, cap_module); + Printf(f_extra, " PHP_EXTENSION(%s, $ext_shared)\n", module); + + // and thats all! + Printf(f_extra, "fi\n"); + + Close(f_extra); + + /* CREDITS */ + f_extra = NewFile(credits, "w"); + if (!f_extra) { + FileErrorDisplay(credits); + SWIG_exit(EXIT_FAILURE); + } + Printf(f_extra, "%s\n", module); + Close(f_extra); + } + /* ------------------------------------------------------------ * top() * ------------------------------------------------------------ */ @@ -260,12 +550,13 @@ public: String *outfile = Getattr(n, "outfile"); /* main output file */ - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); + + Swig_banner(f_runtime); /* sections of the output file */ s_init = NewString("/* init section */\n"); @@ -284,7 +575,6 @@ public: s_phpclasses = NewString("/* PHP Proxy Classes */\n"); /* Register file targets with the SWIG file handler */ - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", s_init); Swig_register_filebyname("rinit", r_init); @@ -293,12 +583,6 @@ public: Swig_register_filebyname("header", s_header); Swig_register_filebyname("wrapper", s_wrappers); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGPHP\n"); - Printf(f_runtime, "\n"); - /* Set the module name */ module = Copy(Getattr(n, "name")); cap_module = NewStringf("%(upper)s", module); @@ -310,7 +594,7 @@ public: Printv(filen, SWIG_output_directory(), module, ".php", NIL); phpfilename = NewString(filen); - f_phpcode = NewFile(filen, "w", SWIG_output_files()); + f_phpcode = NewFile(filen, "w"); if (!f_phpcode) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -320,14 +604,14 @@ public: Swig_banner(f_phpcode); - Printf(f_phpcode, "\n"); Printf(f_phpcode, "// Try to load our extension if it's not already loaded.\n"); Printf(f_phpcode, "if (!extension_loaded(\"%s\")) {\n", module); Printf(f_phpcode, " if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {\n"); Printf(f_phpcode, " if (!dl('php_%s.dll')) return;\n", module); Printf(f_phpcode, " } else {\n"); - Printf(f_phpcode, " // PHP_SHLIB_SUFFIX gives 'dylib' on MacOS X but modules are 'so'.\n"); - Printf(f_phpcode, " if (PHP_SHLIB_SUFFIX === 'dylib') {\n"); + Printf(f_phpcode, " // PHP_SHLIB_SUFFIX is available as of PHP 4.3.0, for older PHP assume 'so'.\n"); + Printf(f_phpcode, " // It gives 'dylib' on MacOS X which is for libraries, modules are 'so'.\n"); + Printf(f_phpcode, " if (PHP_SHLIB_SUFFIX === 'PHP_SHLIB_SUFFIX' || PHP_SHLIB_SUFFIX === 'dylib') {\n"); Printf(f_phpcode, " if (!dl('%s.so')) return;\n", module); Printf(f_phpcode, " } else {\n"); Printf(f_phpcode, " if (!dl('%s.'.PHP_SHLIB_SUFFIX)) return;\n", module); @@ -390,7 +674,7 @@ public: /* Create the .h file too */ filen = NewStringEmpty(); Printv(filen, SWIG_output_directory(), "php_", module, ".h", NIL); - f_h = NewFile(filen, "w", SWIG_output_files()); + f_h = NewFile(filen, "w"); if (!f_h) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); @@ -398,7 +682,7 @@ public: Swig_banner(f_h); - Printf(f_h, "\n"); + Printf(f_h, "\n\n"); Printf(f_h, "#ifndef PHP_%s_H\n", cap_module); Printf(f_h, "#define PHP_%s_H\n\n", cap_module); Printf(f_h, "extern zend_module_entry %s_module_entry;\n", module); @@ -443,6 +727,9 @@ public: Printf(s_init, "};\n"); Printf(s_init, "zend_module_entry* SWIG_module_entry = &%s_module_entry;\n\n", module); + if (gen_extra) { + Printf(s_init, "#ifdef COMPILE_DL_%s\n", cap_module); + } Printf(s_init, "#ifdef __cplusplus\n"); Printf(s_init, "extern \"C\" {\n"); Printf(s_init, "#endif\n"); @@ -453,6 +740,10 @@ public: Printf(s_init, "}\n"); Printf(s_init, "#endif\n\n"); + if (gen_extra) { + Printf(s_init, "#endif\n\n"); + } + /* We have to register the constants before they are (possibly) used * by the pointer typemaps. This all needs re-arranging really as * things are being called in the wrong order @@ -527,19 +818,16 @@ public: Printf(s_wrappers, "/* end wrapper section */\n"); Printf(s_vdecl, "/* end vdecl subsection */\n"); - Dump(f_runtime, f_begin); - Printv(f_begin, s_header, s_vdecl, s_wrappers, NIL); - Printv(f_begin, all_cs_entry, "\n\n", s_entry, "{NULL, NULL, NULL}\n};\n\n", NIL); - Printv(f_begin, s_init, NIL); + Printv(f_runtime, s_header, s_vdecl, s_wrappers, NIL); + Printv(f_runtime, all_cs_entry, "\n\n", s_entry, "{NULL, NULL, NULL}\n};\n\n", NIL); + Printv(f_runtime, s_init, NIL); Delete(s_header); Delete(s_wrappers); Delete(s_init); Delete(s_vdecl); Delete(all_cs_entry); Delete(s_entry); - Close(f_begin); - Delete(f_runtime); - Delete(f_begin); + Close(f_runtime); Printf(f_phpcode, "%s\n%s\n", pragma_incl, pragma_code); if (s_fakeoowrappers) { @@ -552,12 +840,22 @@ public: Printf(f_phpcode, "%s\n?>\n", s_phpclasses); Close(f_phpcode); + if (gen_extra) { + create_extra_files(outfile); + } else if (gen_make) { + create_simple_make(); + } + return SWIG_OK; } /* Just need to append function names to function table to register with PHP. */ void create_command(String *cname, String *iname) { // This is for the single main zend_function_entry record + if (shadow && php_version == 4) { + if (wrapperType != standard) + return; + } Printf(f_h, "ZEND_NAMED_FUNCTION(%s);\n", iname); String * s = cs_entry; if (!s) s = s_entry; @@ -574,6 +872,8 @@ public: String *tmp = NewStringEmpty(); String *dispatch = Swig_overload_dispatch(n, "return %s(INTERNAL_FUNCTION_PARAM_PASSTHRU);", &maxargs); + int has_this_ptr = (wrapperType == memberfn && shadow && php_version == 4); + /* Generate a dispatch wrapper for all overloaded functions */ Wrapper *f = NewWrapper(); @@ -590,7 +890,13 @@ public: Printf(f->code, "argc = ZEND_NUM_ARGS();\n"); - Printf(f->code, "zend_get_parameters_array_ex(argc,argv);\n"); + if (has_this_ptr) { + Printf(f->code, "argv[0] = &this_ptr;\n"); + Printf(f->code, "zend_get_parameters_array_ex(argc,argv+1);\n"); + Printf(f->code, "argc++;\n"); + } else { + Printf(f->code, "zend_get_parameters_array_ex(argc,argv);\n"); + } Replaceall(dispatch, "$args", "self,args"); @@ -598,7 +904,7 @@ public: Printf(f->code, "SWIG_ErrorCode() = E_ERROR;\n"); Printf(f->code, "SWIG_ErrorMsg() = \"No matching function for overloaded '%s'\";\n", symname); - Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n", NIL); + Printv(f->code, "zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());\n", NIL); Printv(f->code, "}\n", NIL); Wrapper_print(f, s_wrappers); @@ -639,6 +945,8 @@ public: int numopt; String *tm; Wrapper *f; + bool mvr = (shadow && php_version == 4 && wrapperType == membervar); + bool mvrset = (mvr && (Strcmp(iname, Swig_name_set(Swig_name_member(shadow_classname, name))) == 0)); String *wname; int overloaded = 0; @@ -663,6 +971,19 @@ public: if (overname) { Printf(wname, "%s", overname); } + // if PHP4, shadow and variable wrapper we want to snag the main contents + // of this function to stick in to the property handler... + if (mvr) { + String *php_function_name = NewString(iname); + if (Strcmp(iname, Swig_name_set(Swig_name_member(shadow_classname, name))) == 0) { + Setattr(shadow_set_vars, php_function_name, name); + } + if (Strcmp(iname, Swig_name_get(Swig_name_member(shadow_classname, name))) == 0) { + Setattr(shadow_get_vars, php_function_name, name); + } + + Delete(php_function_name); + } f = NewWrapper(); numopt = 0; @@ -670,11 +991,20 @@ public: String *outarg = NewStringEmpty(); String *cleanup = NewStringEmpty(); - // Not issued for overloaded functions or static member variables. - if (!overloaded && wrapperType != staticmembervar) { - create_command(iname, wname); + if (mvr) { // do prop[gs]et header + if (mvrset) { + Printf(f->def, "static int _wrap_%s(zend_property_reference *property_reference, pval *value) {\n", iname); + } else { + Printf(f->def, "static pval _wrap_%s(zend_property_reference *property_reference) {\n", iname); + } + } else { + // regular header + // Not issued for overloaded functions or static member variables. + if (!overloaded && wrapperType != staticmembervar) { + create_command(iname, wname); + } + Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL); } - Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL); emit_parameter_variables(l, f); /* Attach standard typemaps */ @@ -688,8 +1018,10 @@ public: int num_required = emit_num_required(l); numopt = num_arguments - num_required; - if (num_arguments > 0) { - String *args = NewStringf("zval **args[%d]", num_arguments); + int has_this_ptr = (wrapperType == memberfn && shadow && php_version == 4); + + if (num_arguments - has_this_ptr > 0) { + String *args = NewStringf("zval **args[%d]", num_arguments - has_this_ptr); Wrapper_add_local(f, "args", args); Delete(args); args = NULL; @@ -704,22 +1036,39 @@ public: Printf(f->code, "SWIG_ResetError();\n"); + if (has_this_ptr) + Printf(f->code, "/* This function uses a this_ptr*/\n"); + + if (native_constructor) { + if (native_constructor == NATIVE_CONSTRUCTOR) { + Printf(f->code, "/* NATIVE Constructor */\n"); + } else { + Printf(f->code, "/* ALTERNATIVE Constructor */\n"); + } + } + + if (mvr && !mvrset) { + Wrapper_add_local(f, "_return_value", "zval _return_value"); + Wrapper_add_local(f, "return_value", "zval *return_value=&_return_value"); + } + if (numopt > 0) { // membervariable wrappers do not have optional args Wrapper_add_local(f, "arg_count", "int arg_count"); Printf(f->code, "arg_count = ZEND_NUM_ARGS();\n"); Printf(f->code, "if(arg_count<%d || arg_count>%d ||\n", num_required, num_arguments); Printf(f->code, " zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)\n"); Printf(f->code, "\tWRONG_PARAM_COUNT;\n\n"); - } else { - if (num_arguments == 0) { + } else if (!mvr) { + int num = num_arguments - has_this_ptr; + if (num == 0) { Printf(f->code, "if(ZEND_NUM_ARGS() != 0) {\n"); } else { - Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n", num_arguments, num_arguments); + Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n", num, num); } Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n"); } - /* Now convert from PHP to C variables */ + /* Now convert from php to C variables */ // At this point, argcount if used is the number of deliberately passed args // not including this_ptr even if it is used. // It means error messages may be out by argbase with error @@ -740,7 +1089,19 @@ public: SwigType *pt = Getattr(p, "type"); - source = NewStringf("args[%d]", i); + if (mvr) { // do we assert that numargs=2, that i<2 + if (i == 0) { + source = NewString("&(property_reference->object)"); + } else { + source = NewString("&value"); + } + } else { + if (i == 0 && has_this_ptr) { + source = NewString("&this_ptr"); + } else { + source = NewStringf("args[%d]", i - has_this_ptr); + } + } String *ln = Getattr(p, "lname"); @@ -822,6 +1183,24 @@ public: Replaceall(tm, "$result", "return_value"); Replaceall(tm, "$owner", newobject ? "1" : "0"); Printf(f->code, "%s\n", tm); + // Are we returning a wrapable object? + if (shadow && php_version == 4 && is_shadow(d) && (SwigType_type(d) != T_ARRAY)) { + // Make object. + Printf(f->code, "{\n/* Wrap this return value */\n"); + Printf(f->code, "zval *_cPtr;\n"); + Printf(f->code, "ALLOC_ZVAL(_cPtr);\n"); + Printf(f->code, "*_cPtr = *return_value;\n"); + Printf(f->code, "INIT_ZVAL(*return_value);\n"); + if (native_constructor == NATIVE_CONSTRUCTOR) { + Printf(f->code, "add_property_zval(this_ptr,\"" SWIG_PTR "\",_cPtr);\n"); + } else { + String *shadowrettype = GetShadowReturnType(n); + Printf(f->code, "object_init_ex(return_value,ptr_ce_swig_%s);\n", shadowrettype); + Delete(shadowrettype); + Printf(f->code, "add_property_zval(return_value,\"" SWIG_PTR "\",_cPtr);\n"); + } + Printf(f->code, "}\n"); + } } else { Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), name); } @@ -849,12 +1228,21 @@ public: Delete(tm); } - Printf(f->code, "return;\n"); + + if (mvr) { + if (!mvrset) { + Printf(f->code, "return _return_value;\n"); + } else { + Printf(f->code, "return SUCCESS;\n"); + } + } else { + Printf(f->code, "return;\n"); + } /* Error handling code */ Printf(f->code, "fail:\n"); Printv(f->code, cleanup, NIL); - Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL); + Printv(f->code, "zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());", NIL); Printf(f->code, "}\n"); @@ -870,7 +1258,7 @@ public: Delete(wname); wname = NULL; - if (!shadow) { + if (!(shadow && php_version == 5)) { DelWrapper(f); return SWIG_OK; } @@ -1113,8 +1501,7 @@ public: case T_LONG: { char *p; errno = 0; - unsigned int n = strtol(Char(value), &p, 0); - (void) n; + (void) strtol(Char(value), &p, 0); if (errno || *p) { Clear(value); Append(value, "?"); @@ -1127,8 +1514,7 @@ public: case T_ULONG: { char *p; errno = 0; - unsigned int n = strtoul(Char(value), &p, 0); - (void) n; + (void) strtoul(Char(value), &p, 0); if (errno || *p) { Clear(value); Append(value, "?"); @@ -1252,8 +1638,8 @@ public: Setattr(seen, "this", seen); /* We use $r to store the return value, so disallow that as a parameter * name in case the user uses the "call-time pass-by-reference" feature - * (it's deprecated and off by default in PHP5, but we want to be - * maximally portable). + * (it's deprecated and off by default in PHP5 and even later PHP4 + * versions apparently, but we want to be maximally portable). */ Setattr(seen, "r", seen); @@ -1369,26 +1755,16 @@ public: Printf(output, "\n"); // If it's a member function or a class constructor... if (wrapperType == memberfn || (newobject && current_class)) { + Printf(output, "\tfunction %s(%s) {\n", methodname, args); // We don't need this code if the wrapped class has a copy ctor // since the flat function new_CLASSNAME will handle it for us. if (newobject && !Getattr(current_class, "allocate:copy_constructor")) { - const char * arg0; - if (max_num_of_arguments > 0) { - arg0 = Char(arg_names[0]); - } else { - arg0 = "res"; - Delete(args); - args = NewString("$res=null"); - } SwigType *t = Getattr(current_class, "classtype"); String *mangled_type = SwigType_manglestr(SwigType_ltype(t)); - Printf(output, "\tfunction %s(%s) {\n", methodname, args); - Printf(output, "\t\tif (is_resource($%s) && get_resource_type($%s) == \"_p%s\") {\n", arg0, arg0, mangled_type); - Printf(output, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg0); - Printf(output, "\t\t\treturn;\n"); - Printf(output, "\t\t}\n"); - } else { - Printf(output, "\tfunction %s(%s) {\n", methodname, args); + Printf(s_oowrappers, "\t\tif (is_resource($%s) && get_resource_type($%s) == \"_p%s\") {\n", arg_names[0], arg_names[0], mangled_type); + Printf(s_oowrappers, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg_names[0]); + Printf(s_oowrappers, "\t\t\treturn;\n"); + Printf(s_oowrappers, "\t\t}\n"); } } else { Printf(output, "\tstatic function %s(%s) {\n", methodname, args); @@ -1501,7 +1877,8 @@ public: Replaceall(tm, "$symname", iname); Printf(f_c->code, "%s\n", tm); } else { - Printf(stderr,"%s: Line %d, Unable to link with type %s\n", input_file, line_number, SwigType_str(t, 0)); + Printf(stderr,"%s: Line %d, Unable to link with type %s\n", + input_file, line_number, SwigType_str(t, 0)); } */ /* Now generate C -> PHP sync blocks */ @@ -1513,7 +1890,8 @@ public: Replaceall(tm, "$symname", iname); Printf(f_php->code, "%s\n", tm); } else { - Printf(stderr,"%s: Line %d, Unable to link with type %s\n", input_file, line_number, SwigType_str(t, 0)); + Printf(stderr,"%s: Line %d, Unable to link with type %s\n", + input_file, line_number, SwigType_str(t, 0)); } } */ @@ -1544,7 +1922,7 @@ public: Printf(s_cinit, "%s\n", tm); } - if (shadow) { + if (shadow && php_version == 5) { String *enumvalue = GetChar(n, "enumvalue"); String *set_to = iname; @@ -1586,8 +1964,8 @@ public: * * Pragma directive. * - * %pragma(php) code="String" # Includes a string in the .php file - * %pragma(php) include="file.pl" # Includes a file in the .php file + * %pragma(php4) code="String" # Includes a string in the .php file + * %pragma(php4) include="file.pl" # Includes a file in the .php file */ virtual int pragmaDirective(Node *n) { @@ -1596,7 +1974,7 @@ public: String *type = Getattr(n, "name"); String *value = Getattr(n, "value"); - if (Strcmp(lang, "php") == 0 || Strcmp(lang, "php4") == 0) { + if (Strcmp(lang, "php4") == 0) { if (Strcmp(type, "code") == 0) { if (value) { Printf(pragma_code, "%s\n", value); @@ -1610,7 +1988,7 @@ public: Printf(pragma_phpinfo, "%s\n", value); } } else { - Swig_warning(WARN_PHP_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", type); + Swig_warning(WARN_PHP4_UNKNOWN_PRAGMA, input_file, line_number, "Unrecognized pragma <%s>.\n", type); } } } @@ -1640,7 +2018,52 @@ public: current_class = n; // String *use_class_name=SwigType_manglestr(SwigType_ltype(t)); - if (shadow) { + if (shadow && php_version == 4) { + char *rename = GetChar(n, "sym:name"); + + if (!addSymbol(rename, n)) + return SWIG_ERROR; + shadow_classname = NewString(rename); + cs_entry = NewStringEmpty(); + Printf(cs_entry, "/* Function entries for %s */\n", shadow_classname); + Printf(cs_entry, "static zend_function_entry %s_functions[] = {\n", shadow_classname); + + if (Strcmp(shadow_classname, module) == 0) { + Printf(stderr, "class name cannot be equal to module name: %s\n", module); + SWIG_exit(1); + } + + shadow_get_vars = NewHash(); + shadow_set_vars = NewHash(); + + /* Deal with inheritance */ + List *baselist = Getattr(n, "bases"); + if (baselist) { + Iterator base = First(baselist); + while (base.item && GetFlag(base.item, "feature:ignore")) { + base = Next(base); + } + base = Next(base); + if (base.item) { + /* Warn about multiple inheritance for additional base class(es) */ + while (base.item) { + if (GetFlag(base.item, "feature:ignore")) { + base = Next(base); + continue; + } + String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0); + String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0); + Swig_warning(WARN_PHP4_MULTIPLE_INHERITANCE, input_file, line_number, + "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Php4.\n", proxyclassname, baseclassname); + base = Next(base); + } + } + } + + /* Write out class init code */ + Printf(s_vdecl, "static zend_class_entry ce_swig_%s;\n", shadow_classname); + Printf(s_vdecl, "static zend_class_entry* ptr_ce_swig_%s=NULL;\n", shadow_classname); + } else if (shadow && php_version == 5) { char *rename = GetChar(n, "sym:name"); if (!addSymbol(rename, n)) @@ -1667,7 +2090,7 @@ public: } String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0); String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0); - Swig_warning(WARN_PHP_MULTIPLE_INHERITANCE, input_file, line_number, + Swig_warning(WARN_PHP4_MULTIPLE_INHERITANCE, input_file, line_number, "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname); base = Next(base); } @@ -1679,7 +2102,217 @@ public: Language::classHandler(n); classnode = 0; - if (shadow) { + if (shadow && php_version == 4) { + DOH *key; + String *s_propget = NewStringEmpty(); + String *s_propset = NewStringEmpty(); + List *baselist = Getattr(n, "bases"); + Iterator ki, base; + + // If no constructor was generated (abstract class) we had better + // generate a constructor that raises an error about instantiating + // abstract classes + if (Getattr(n, "abstract") && constructors == 0) { + // have to write out fake constructor which raises an error when called + abstractConstructorHandler(n); + } + + Printf(s_oinit, "/* Define class %s */\n", shadow_classname); + Printf(s_oinit, "INIT_OVERLOADED_CLASS_ENTRY(ce_swig_%s,\"%(lower)s\",%s_functions,", shadow_classname, shadow_classname, shadow_classname); + Printf(s_oinit, "NULL,_wrap_propget_%s,_wrap_propset_%s);\n", shadow_classname, shadow_classname); + + // ******** Write property SET handlers + Printf(s_header, "static int _wrap_propset_%s(zend_property_reference *property_reference, pval *value);\n", shadow_classname); + Printf(s_header, "static int _propset_%s(zend_property_reference *property_reference, pval *value);\n", shadow_classname); + + Printf(s_propset, "static int _wrap_propset_%s(zend_property_reference *property_reference, pval *value) { \n", shadow_classname); + Printf(s_propset, " zval * _value;\n"); + Printf(s_propset, " zend_llist_element *element = property_reference->elements_list->head;\n"); + Printf(s_propset, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); + Printf(s_propset, " if (_propset_%s(property_reference, value)==SUCCESS) return SUCCESS;\n", shadow_classname); + Printf(s_propset, " /* set it ourselves as it is %s */\n", shadow_classname); + Printf(s_propset, " MAKE_STD_ZVAL(_value);\n"); + Printf(s_propset, " *_value=*value;\n"); + Printf(s_propset, " INIT_PZVAL(_value);\n"); + Printf(s_propset, " zval_copy_ctor(_value);\n"); + Printf(s_propset, + " return add_property_zval_ex(property_reference->object,Z_STRVAL_P(&(property->element)),1+Z_STRLEN_P(&(property->element)),_value);\n"); + Printf(s_propset, "}\n"); + Printf(s_propset, "static int _propset_%s(zend_property_reference *property_reference, pval *value) {\n", shadow_classname); + + + if (baselist) { + base = First(baselist); + } else { + base.item = NULL; + } + + while (base.item && GetFlag(base.item, "feature:ignore")) { + base = Next(base); + } + + ki = First(shadow_set_vars); + key = ki.key; + + // Print function header; we only need to find property name if there + // are properties for this class to look up... + if (key || !base.item) { // or if we are base class and set it ourselves + Printf(s_propset, " /* get the property name */\n"); + Printf(s_propset, " zend_llist_element *element = property_reference->elements_list->head;\n"); + Printf(s_propset, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); + Printf(s_propset, " char *propname=Z_STRVAL_P(&(property->element));\n"); + } else { + if (base.item) { + Printf(s_propset, " /* No extra properties for subclass %s */\n", shadow_classname); + } else { + Printf(s_propset, " /* No properties for base class %s */\n", shadow_classname); + } + } + + while (ki.key) { + key = ki.key; + Printf(s_propset, " if (strcmp(propname,\"%s\")==0) return _wrap_%s(property_reference, value);\n", ki.item, key); + + ki = Next(ki); + } + + // If the property wasn't in this class, try the handlers of each base + // class (if any) in turn until we succeed in setting the property or + // have tried all base classes. + if (base.item) { + Printf(s_propset, " /* Try base class(es) */\n"); + while (base.item) { + Printf(s_propset, " if (_propset_%s(property_reference, value)==SUCCESS) return SUCCESS;\n", GetChar(base.item, "sym:name")); + + base = Next(base); + while (base.item && GetFlag(base.item, "feature:ignore")) { + base = Next(base); + } + } + } + Printf(s_propset, " return FAILURE;\n}\n\n"); + + // ******** Write property GET handlers + Printf(s_header, "static pval _wrap_propget_%s(zend_property_reference *property_reference);\n", shadow_classname); + Printf(s_header, "static int _propget_%s(zend_property_reference *property_reference, pval *value);\n", shadow_classname); + + Printf(s_propget, "static pval _wrap_propget_%s(zend_property_reference *property_reference) {\n", shadow_classname); + Printf(s_propget, " pval result;\n"); + Printf(s_propget, " pval **_result;\n"); + Printf(s_propget, " zend_llist_element *element = property_reference->elements_list->head;\n"); + Printf(s_propget, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); + Printf(s_propget, " result.type = IS_NULL;\n"); + Printf(s_propget, " if (_propget_%s(property_reference, &result)==SUCCESS) return result;\n", shadow_classname); + Printf(s_propget, " /* return it ourselves */\n"); + Printf(s_propget, + " if (zend_hash_find(Z_OBJPROP_P(property_reference->object),Z_STRVAL_P(&(property->element)),1+Z_STRLEN_P(&(property->element)),(void**)&_result)==SUCCESS) {\n"); + Printf(s_propget, " zval *_value;\n"); + Printf(s_propget, " MAKE_STD_ZVAL(_value);"); + Printf(s_propget, " *_value=**_result;\n"); + Printf(s_propget, " INIT_PZVAL(_value);\n"); + Printf(s_propget, " zval_copy_ctor(_value);\n"); + Printf(s_propget, " return *_value;\n"); + Printf(s_propget, " }\n"); + Printf(s_propget, " result.type = IS_NULL;\n"); + Printf(s_propget, " return result;\n"); + Printf(s_propget, "}\n"); + Printf(s_propget, "static int _propget_%s(zend_property_reference *property_reference, pval *value) {\n", shadow_classname); + + if (baselist) { + base = First(baselist); + } else { + base.item = NULL; + } + while (base.item && GetFlag(base.item, "feature:ignore")) { + base = Next(base); + } + ki = First(shadow_get_vars); + + key = ki.key; + + // Print function header; we only need to find property name if there + // are properties for this class to look up... + if (key || !base.item) { // or if we are base class... + Printf(s_propget, " /* get the property name */\n"); + Printf(s_propget, " zend_llist_element *element = property_reference->elements_list->head;\n"); + Printf(s_propget, " zend_overloaded_element *property=(zend_overloaded_element *)element->data;\n"); + Printf(s_propget, " char *propname=Z_STRVAL_P(&(property->element));\n"); + } else { + if (base.item) { + Printf(s_propget, " /* No extra properties for subclass %s */\n", shadow_classname); + } else { + Printf(s_propget, " /* No properties for base class %s */\n", shadow_classname); + } + } + + while (ki.key) { + key = ki.key; + Printf(s_propget, " if (strcmp(propname,\"%s\")==0) {\n", ki.item); + Printf(s_propget, " *value=_wrap_%s(property_reference);\n", key); + Printf(s_propget, " return SUCCESS;\n"); + Printf(s_propget, " }\n"); + + ki = Next(ki); + } + + // If the property wasn't in this class, try the handlers of each base + // class (if any) in turn until we succeed in setting the property or + // have tried all base classes. + if (base.item) { + Printf(s_propget, " /* Try base class(es). */\n"); + while (base.item) { + Printf(s_propget, " if (_propget_%s(property_reference, value)==SUCCESS) return SUCCESS;\n", GetChar(base.item, "sym:name")); + + base = Next(base); + while (base.item && GetFlag(base.item, "feature:ignore")) { + base = Next(base); + } + } + } + Printf(s_propget, " return FAILURE;\n}\n\n"); + + // wrappers generated now... + + // add wrappers to output code + Printf(s_wrappers, "/* property handler for class %s */\n", shadow_classname); + Printv(s_wrappers, s_propget, s_propset, NIL); + + // Save class in class table + if (baselist) { + base = First(baselist); + } else { + base.item = NULL; + } + while (base.item && GetFlag(base.item, "feature:ignore")) { + base = Next(base); + } + + if (base.item) { + Printf(s_oinit, + "if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n", + shadow_classname, shadow_classname, GetChar(base.item, "sym:name"), shadow_classname); + } else { + Printf(s_oinit, + "if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n", + shadow_classname, shadow_classname, shadow_classname); + } + Printf(s_oinit, "\n"); + + // Write the enum initialisation code in a static block + // These are all the enums defined within the C++ class. + + Delete(shadow_classname); + shadow_classname = NULL; + + Delete(shadow_set_vars); + shadow_set_vars = NULL; + Delete(shadow_get_vars); + shadow_get_vars = NULL; + + Printv(all_cs_entry, cs_entry, " { NULL, NULL, NULL}\n};\n", NIL); + Delete(cs_entry); + cs_entry = NULL; + } else if (shadow && php_version == 5) { DOH *key; List *baselist = Getattr(n, "bases"); Iterator ki, base; @@ -1801,10 +2434,21 @@ public: * ------------------------------------------------------------ */ virtual int memberfunctionHandler(Node *n) { + char *name = GetChar(n, "name"); + char *iname = GetChar(n, "sym:name"); + wrapperType = memberfn; this->Language::memberfunctionHandler(n); wrapperType = standard; + // Only declare the member function if + // we are doing shadow classes, and the function + // is not overloaded, or if it is overloaded, it is the dispatch function. + if (shadow && php_version == 4 && (!Getattr(n, "sym:overloaded") || !Getattr(n, "sym:nextSibling"))) { + char *realname = iname ? iname : name; + String *php_function_name = Swig_name_member(shadow_classname, realname); + create_command(realname, Swig_name_wrapper(php_function_name)); + } return SWIG_OK; } @@ -1813,6 +2457,7 @@ public: * ------------------------------------------------------------ */ virtual int membervariableHandler(Node *n) { + wrapperType = membervar; Language::membervariableHandler(n); wrapperType = standard; @@ -1825,6 +2470,7 @@ public: * ------------------------------------------------------------ */ virtual int staticmembervariableHandler(Node *n) { + wrapperType = staticmembervar; Language::staticmembervariableHandler(n); wrapperType = standard; @@ -1834,7 +2480,7 @@ public: String *iname = Getattr(n, "sym:name"); /* A temporary(!) hack for static member variables. - * PHP currently supports class functions, but not class variables. + * Php currently supports class functions, but not class variables. * Until it does, we convert a class variable to a class function * that returns the current value of the variable. E.g. * @@ -1843,16 +2489,15 @@ public: * static int ncount; * }; * - * would be available in PHP as Example::ncount() + * would be available in php as Example::ncount() */ - // If the variable is const, then it's wrapped as a constant with set/get - // functions. + // If the variable is const, then it's wrapped as a constant with set/get functions. if (SwigType_isconst(type)) return SWIG_OK; - // This duplicates the logic from Language::variableWrapper() to test if - // the set wrapper is made. + // This duplicates the logic from Language::variableWrapper() to test if the set wrapper + // is made. int assignable = is_assignable(n); if (assignable) { String *tm = Swig_typemap_lookup("globalin", n, name, 0); @@ -1897,10 +2542,20 @@ public: * ------------------------------------------------------------ */ virtual int staticmemberfunctionHandler(Node *n) { + char *name = GetChar(n, "name"); + char *iname = GetChar(n, "sym:name"); + wrapperType = staticmemberfn; Language::staticmemberfunctionHandler(n); wrapperType = standard; + if (shadow && php_version == 4) { + String *symname = Getattr(n, "sym:name"); + char *realname = iname ? iname : name; + String *php_function_name = Swig_name_member(shadow_classname, realname); + create_command(symname, Swig_name_wrapper(php_function_name)); + } + return SWIG_OK; } @@ -1942,7 +2597,7 @@ public: return NewStringEmpty(); } - String *PhpTypeFromTypemap(char *op, Node *n, const_String_or_char_ptr lname) { + String *PhpTypeFromTypemap(char *op, Node *n, String_or_char *lname) { String *tms = Swig_typemap_lookup(op, n, lname, 0); if (!tms) return 0; @@ -1950,20 +2605,54 @@ public: return NewStringf("%s", tms); } - int abstractConstructorHandler(Node *) { + int abstractConstructorHandler(Node *n) { + String *iname = GetChar(n, "sym:name"); + if (shadow && php_version == 4) { + Wrapper *f = NewWrapper(); + + String *wname = NewStringf("_wrap_new_%s", iname); + create_command(iname, wname); + + Printf(f->def, "ZEND_NAMED_FUNCTION(_wrap_new_%s) {\n", iname); + Printf(f->def, " zend_error(E_ERROR,\"Cannot create swig object type: %s as the underlying class is abstract\");\n", iname); + Printf(f->def, "}\n\n"); + Wrapper_print(f, s_wrappers); + DelWrapper(f); + Delete(wname); + } return SWIG_OK; } - /* ------------------------------------------------------------ * constructorHandler() * ------------------------------------------------------------ */ virtual int constructorHandler(Node *n) { + char *name = GetChar(n, "name"); + char *iname = GetChar(n, "sym:name"); + + if (shadow && php_version == 4) { + if (iname && strcmp(iname, Char(shadow_classname)) == 0) { + native_constructor = NATIVE_CONSTRUCTOR; + } else { + native_constructor = ALTERNATIVE_CONSTRUCTOR; + } + } else { + native_constructor = 0; + } constructors++; wrapperType = constructor; Language::constructorHandler(n); wrapperType = standard; + if (shadow && php_version == 4) { + if (!Getattr(n, "sym:overloaded") || !Getattr(n, "sym:nextSibling")) { + char *realname = iname ? iname : name; + String *php_function_name = Swig_name_construct(realname); + create_command(realname, Swig_name_wrapper(php_function_name)); + } + } + + native_constructor = 0; return SWIG_OK; } @@ -2018,6 +2707,7 @@ public: Wrapper_print(f, s_wrappers); return SWIG_OK; + } /* ------------------------------------------------------------ @@ -2025,7 +2715,7 @@ public: * ------------------------------------------------------------ */ virtual int memberconstantHandler(Node *n) { - wrapping_member_constant = Getattr(n, "sym:name"); + wrapping_member_constant = Getattr(n, "name"); Language::memberconstantHandler(n); wrapping_member_constant = NULL; return SWIG_OK; @@ -2033,6 +2723,10 @@ public: }; /* class PHP */ +/* ----------------------------------------------------------------------------- + * swig_php() - Instantiate module + * ----------------------------------------------------------------------------- */ + static PHP *maininstance = 0; // We use this function to be able to write out zend_register_list_destructor_ex @@ -2059,12 +2753,8 @@ extern "C" void typetrace(SwigType *ty, String *mangled, String *clientdata) { (*r_prevtracefunc) (ty, mangled, (String *) clientdata); } -/* ----------------------------------------------------------------------------- - * new_swig_php() - Instantiate module - * ----------------------------------------------------------------------------- */ - -static Language *new_swig_php() { - maininstance = new PHP; +static Language *new_swig_php(int php_version) { + maininstance = new PHP(php_version); if (!r_prevtracefunc) { r_prevtracefunc = SwigType_remember_trace(typetrace); } else { @@ -2073,14 +2763,9 @@ static Language *new_swig_php() { } return maininstance; } - extern "C" Language *swig_php4(void) { - Printf(stderr, "*** -php4 is no longer supported.\n" - "*** Either upgrade to PHP5 or use SWIG 1.3.36 or earlier.\n"); - SWIG_exit(EXIT_FAILURE); - return NULL; // To avoid compiler warnings. + return new_swig_php(4); } - -extern "C" Language *swig_php(void) { - return new_swig_php(); +extern "C" Language *swig_php5(void) { + return new_swig_php(5); } diff --git a/Source/Modules/pike.cxx b/Source/Modules/pike.cxx index 98f63056c..30f9b3d74 100644 --- a/Source/Modules/pike.cxx +++ b/Source/Modules/pike.cxx @@ -39,7 +39,6 @@ Pike Options (available with -pike)\n\ class PIKE:public Language { private: - File *f_begin; File *f_runtime; File *f_header; File *f_wrappers; @@ -70,7 +69,6 @@ public: * --------------------------------------------------------------------- */ PIKE() { - f_begin = 0; f_runtime = 0; f_header = 0; f_wrappers = 0; @@ -125,12 +123,11 @@ public: String *outfile = Getattr(n, "outfile"); /* Open the output file */ - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_classInit = NewString(""); f_header = NewString(""); @@ -139,17 +136,12 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("classInit", f_classInit); /* Standard stuff for the SWIG runtime section */ - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGPIKE\n"); - Printf(f_runtime, "\n"); + Swig_banner(f_runtime); Printf(f_header, "#define SWIG_init pike_module_init\n"); Printf(f_header, "#define SWIG_name \"%s\"\n\n", module); @@ -169,19 +161,17 @@ public: SwigType_emit_type_table(f_runtime, f_wrappers); /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_header, f_runtime); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); Delete(f_classInit); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); /* Done */ return SWIG_OK; @@ -231,7 +221,7 @@ public: * name (i.e. "enum_test"). * ------------------------------------------------------------ */ - String *strip(const DOHconst_String_or_char_ptr name) { + String *strip(const DOHString_or_char *name) { String *s = Copy(name); if (Strncmp(name, PrefixPlusUnderscore, Len(PrefixPlusUnderscore)) != 0) { return s; @@ -244,7 +234,7 @@ public: * add_method() * ------------------------------------------------------------ */ - void add_method(const DOHconst_String_or_char_ptr name, const DOHconst_String_or_char_ptr function, const DOHconst_String_or_char_ptr description) { + void add_method(const DOHString_or_char *name, const DOHString_or_char *function, const DOHString_or_char *description) { String *rename = NULL; switch (current) { case NO_CPP: diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index ffeea430d..f0e335c37 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -10,8 +10,11 @@ char cvsroot_python_cxx[] = "$Id$"; #include "swigmod.h" -#include "cparse.h" +#define ctab2 " " +#define ctab4 " " +#define ctab8 " " +#include "cparse.h" static int treduce = SWIG_cparse_template_reduce(0); #include @@ -28,7 +31,6 @@ static int shadow = 1; static int use_kw = 0; static int director_method_index = 0; -static File *f_begin = 0; static File *f_runtime = 0; static File *f_runtime_h = 0; static File *f_header = 0; @@ -47,11 +49,10 @@ static String *shadow_indent = 0; static int in_class = 0; static int classic = 0; static int modern = 0; +static int apply = 0; static int new_repr = 1; static int no_header_file = 0; -static int py3 = 0; - /* C++ Support + Shadow Classes */ static int have_constructor; @@ -95,6 +96,7 @@ enum autodoc_t { static const char *usage1 = (char *) "\ Python Options (available with -python)\n\ -aliasobj0 - Alias obj0 when using fastunpack, needed for some old typemaps \n\ + -apply - Use apply() in proxy classes\n\ -buildnone - Use Py_BuildValue(" ") to obtain Py_None (default in Windows)\n\ -castmode - Enable the casting mode, which allows implicit cast between types in python\n\ -classic - Use classic classes only\n\ @@ -146,8 +148,6 @@ static const char *usage3 = (char *) "\ -O - Enable all the optimization options: \n\ -modern -fastdispatch -dirvtable -nosafecstrings -fvirtual -noproxydel \n\ -fastproxy -fastinit -fastunpack -fastquery -modernargs -nobuildnone \n\ - -py3 - Generate code with Python 3 specific features:\n\ - Function annotation \n\ \n"; class PYTHON:public Language { @@ -259,6 +259,9 @@ public: } else if ((strcmp(argv[i], "-shadow") == 0) || ((strcmp(argv[i], "-proxy") == 0))) { shadow = 1; Swig_mark_arg(i); + } else if (strcmp(argv[i], "-apply") == 0) { + apply = 1; + Swig_mark_arg(i); } else if ((strcmp(argv[i], "-new_repr") == 0) || (strcmp(argv[i], "-newrepr") == 0)) { new_repr = 1; Swig_mark_arg(i); @@ -281,6 +284,7 @@ public: } else if (strcmp(argv[i], "-classic") == 0) { classic = 1; modernargs = 0; + apply = 1; modern = 0; Swig_mark_arg(i); } else if (strcmp(argv[i], "-cppcast") == 0) { @@ -386,6 +390,7 @@ public: proxydel = 0; Swig_mark_arg(i); } else if (strcmp(argv[i], "-modern") == 0) { + apply = 0; classic = 0; modern = 1; modernargs = 1; @@ -403,6 +408,7 @@ public: no_header_file = 1; Swig_mark_arg(i); } else if (strcmp(argv[i], "-O") == 0) { + apply = 0; classic = 0; modern = 1; dirvtable = 1; @@ -423,17 +429,8 @@ public: fputs(usage1, stdout); fputs(usage2, stdout); fputs(usage3, stdout); - } else if (strcmp(argv[i], "-py3") == 0) { - py3 = 1; - Swig_mark_arg(i); - } - + } } - } /* for */ - - if (py3) { - /* force disable features that not compatible with Python 3.x */ - classic = 0; } if (cppcast) { @@ -514,21 +511,15 @@ public: String *outfile = Getattr(n, "outfile"); String *outfile_h = !no_header_file ? Getattr(n, "outfile_h") : 0; - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); - f_init = NewString(""); - f_header = NewString(""); - f_wrappers = NewString(""); - f_directors_h = NewString(""); - f_directors = NewString(""); if (directorsEnabled()) { if (!no_header_file) { - f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); + f_runtime_h = NewFile(outfile_h, "w"); if (!f_runtime_h) { FileErrorDisplay(outfile_h); SWIG_exit(EXIT_FAILURE); @@ -538,10 +529,15 @@ public: } } + f_init = NewString(""); + f_header = NewString(""); + f_wrappers = NewString(""); + f_directors_h = NewString(""); + f_directors = NewString(""); + /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("director", f_directors); @@ -550,9 +546,8 @@ public: const_code = NewString(""); methods = NewString(""); - Swig_banner(f_begin); + Swig_banner(f_runtime); - Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGPYTHON\n"); if (directorsEnabled()) { @@ -604,8 +599,6 @@ public: Printf(f_runtime, "#define SWIG_PYTHON_CLASSIC\n"); } - Printf(f_runtime, "\n"); - Printf(f_header, "#if (PY_VERSION_HEX <= 0x02000000)\n"); Printf(f_header, "# if !defined(SWIG_PYTHON_CLASSIC)\n"); Printf(f_header, "# error \"This python version requires swig to be run with the '-classic' option\"\n"); @@ -644,7 +637,6 @@ public: if (directorsEnabled()) { Swig_banner(f_directors_h); - Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module); if (dirprot_mode()) { @@ -668,7 +660,7 @@ public: module = interface; else Insert(module, 0, "_"); - if ((f_shadow_py = NewFile(filen, "w", SWIG_output_files())) == 0) { + if ((f_shadow_py = NewFile(filen, "w")) == 0) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); } @@ -682,7 +674,10 @@ public: Swig_register_filebyname("shadow", f_shadow); Swig_register_filebyname("python", f_shadow); - Swig_banner_target_lang(f_shadow, "#"); + Printf(f_shadow, "# This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f_shadow, "# Version %s\n", Swig_package_version()); + Printf(f_shadow, "#\n"); + Printf(f_shadow, "# Don't modify this file, modify the SWIG interface instead.\n"); if (!modern) { Printv(f_shadow, "# This file is compatible with both classic and new-style classes.\n", NIL); @@ -694,53 +689,13 @@ public: mod_docstring = NULL; } - Printv(f_shadow, "\nfrom sys import version_info\n", NULL); - - if(fastproxy) - { - Printv(f_shadow, "if version_info >= (3,0,0):\n", NULL); - Printf(f_shadow, tab4 "new_instancemethod = lambda func, inst, cls: %s.SWIG_PyInstanceMethod_New(func)\n", module); - Printv(f_shadow, "else:\n", NULL); - Printv(f_shadow, tab4, "from new import instancemethod as new_instancemethod\n", NULL); - } - /* Import the C-extension module. This should be a relative import, - * since the shadow module may also have been imported by a relative - * import, and there is thus no guarantee that the C-extension is on - * sys.path. Relative imports must be explicitly specified from 2.6.0 - * onwards (implicit relative imports will raise a DeprecationWarning - * in 2.6, and fail in 2.7 onwards), but the relative import syntax - * isn't available in python 2.4 or earlier, so we have to write some - * code conditional on the python version. - */ - Printv(f_shadow, "if version_info >= (2,6,0):\n", NULL); - Printv(f_shadow, tab4, "def swig_import_helper():\n", NULL); - Printv(f_shadow, tab8, "from os.path import dirname\n", NULL); - Printv(f_shadow, tab8, "import imp\n", NULL); - Printv(f_shadow, tab8, "fp = None\n", NULL); - Printv(f_shadow, tab8, "try:\n", NULL); - Printf(f_shadow, tab4 tab8 "fp, pathname, description = imp.find_module('%s', [dirname(__file__)])\n", module); - Printf(f_shadow, tab8 "except ImportError:\n"); - /* At here, the module may already loaded, so simply import it. */ - Printf(f_shadow, tab4 tab8 "import %s\n", module); - Printf(f_shadow, tab4 tab8 "return %s\n", module); - Printv(f_shadow, tab8 "if fp is not None:\n", NULL); - Printv(f_shadow, tab4 tab8 "try:\n", NULL); - Printf(f_shadow, tab8 tab8 "_mod = imp.load_module('%s', fp, pathname, description)\n", module); - Printv(f_shadow, tab4 tab8, "finally:\n", NULL); - Printv(f_shadow, tab8 tab8, "fp.close()\n", NULL); - Printv(f_shadow, tab8 tab8, "return _mod\n", NULL); - Printf(f_shadow, tab4 "%s = swig_import_helper()\n", module); - Printv(f_shadow, tab4, "del swig_import_helper\n", NULL); - Printv(f_shadow, "else:\n", NULL); - Printf(f_shadow, tab4 "import %s\n", module); - - /* Delete the version_info symbol since we don't use it elsewhere in the - * module. */ - Printv(f_shadow, "del version_info\n", NULL); + Printf(f_shadow, "\nimport %s\n", module); + Printv(f_shadow, "import new\n", NULL); + Printv(f_shadow, "new_instancemethod = new.instancemethod\n", NULL); if (modern || !classic) { Printv(f_shadow, "try:\n", tab4, "_swig_property = property\n", "except NameError:\n", tab4, "pass # Python < 2.2 doesn't have 'property'.\n", NULL); - } + } /* if (!modern) */ /* always needed, a class can be forced to be no-modern, such as an exception */ { @@ -748,7 +703,7 @@ public: Printv(f_shadow, "def _swig_setattr_nondynamic(self,class_type,name,value,static=1):\n", tab4, "if (name == \"thisown\"): return self.this.own(value)\n", - tab4, "if (name == \"this\"):\n", tab4, tab4, "if type(value).__name__ == 'SwigPyObject':\n", tab4, tab8, "self.__dict__[name] = value\n", + tab4, "if (name == \"this\"):\n", tab4, tab4, "if type(value).__name__ == 'PySwigObject':\n", tab4, tab8, "self.__dict__[name] = value\n", #ifdef USE_THISOWN tab4, tab8, "if hasattr(value,\"thisown\"): self.__dict__[\"thisown\"] = value.thisown\n", tab4, tab8, "del value.thisown\n", #endif @@ -767,7 +722,7 @@ public: "def _swig_getattr(self,class_type,name):\n", tab4, "if (name == \"thisown\"): return self.this.own()\n", tab4, "method = class_type.__swig_getmethods__.get(name,None)\n", - tab4, "if method: return method(self)\n", tab4, "raise AttributeError(name)\n\n", NIL); + tab4, "if method: return method(self)\n", tab4, "raise AttributeError,name\n\n", NIL); Printv(f_shadow, "def _swig_repr(self):\n", @@ -775,17 +730,11 @@ public: tab4, "except: strthis = \"\"\n", tab4, "return \"<%s.%s; %s >\" % (self.__class__.__module__, self.__class__.__name__, strthis,)\n\n", NIL); if (!classic) { - /* Usage of types.ObjectType is deprecated. - * But don't sure wether this would broken old Python? - */ Printv(f_shadow, -// "import types\n", + "import types\n", "try:\n", -// " _object = types.ObjectType\n", - " _object = object\n", - " _newclass = 1\n", "except AttributeError:\n", " class _object : pass\n", " _newclass = 0\n", -// "del types\n", - "\n\n", NIL); + " _object = types.ObjectType\n", + " _newclass = 1\n", "except AttributeError:\n", " class _object : pass\n", " _newclass = 0\n", "del types\n", "\n\n", NIL); } } if (modern) { @@ -811,11 +760,7 @@ public: } - Printf(f_header, "#if PY_VERSION_HEX >= 0x03000000\n"); - Printf(f_header, "# define SWIG_init PyInit_%s\n\n", module); - Printf(f_header, "#else\n"); - Printf(f_header, "# define SWIG_init init%s\n\n", module); - Printf(f_header, "#endif\n"); + Printf(f_header, "#define SWIG_init init%s\n\n", module); Printf(f_header, "#define SWIG_name \"%s\"\n", module); Printf(f_wrappers, "#ifdef __cplusplus\n"); @@ -824,9 +769,6 @@ public: Append(const_code, "static swig_const_info swig_const_table[] = {\n"); Append(methods, "static PyMethodDef SwigMethods[] = {\n"); - /* the method exported for replacement of new.instancemethod in Python 3 */ - add_pyinstancemethod_new(); - /* emit code */ Language::top(n); @@ -845,12 +787,6 @@ public: Append(const_code, "{0, 0, 0, 0.0, 0, 0}};\n"); Printf(f_wrappers, "%s\n", const_code); initialize_threads(f_init); - - Printf(f_init, "#if PY_VERSION_HEX >= 0x03000000\n"); - Printf(f_init, " return m;\n"); - Printf(f_init, "#else\n"); - Printf(f_init, " return;\n"); - Printf(f_init, "#endif\n"); Printf(f_init, "}\n"); Printf(f_wrappers, "#ifdef __cplusplus\n"); @@ -858,6 +794,10 @@ public: Printf(f_wrappers, "#endif\n"); if (shadow) { + /* + Printf(f_shadow_imports,"\nimport %s\n", module); + Printv(f_shadow_py, f_shadow_imports, "\n",NIL); + */ Printv(f_shadow_py, f_shadow, "\n", NIL); Printv(f_shadow_py, f_shadow_stubs, "\n", NIL); @@ -866,20 +806,19 @@ public: } /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); + Dump(f_header, f_runtime); if (directorsEnabled()) { Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - if (f_runtime_h != f_begin) + if (f_runtime_h != f_runtime) Close(f_runtime_h); - Dump(f_directors, f_begin); + Dump(f_directors, f_runtime); } - Dump(f_wrappers, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_wrappers, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); @@ -887,25 +826,11 @@ public: Delete(f_directors); Delete(f_directors_h); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } - - /* ------------------------------------------------------------ - * Emit the wrapper for PyInstanceMethod_New to MethodDef array. - * This wrapper is used to implement -fastproxy, - * as a replacement of new.instancemethod in Python 3. - * ------------------------------------------------------------ */ - int add_pyinstancemethod_new() - { - String* name = NewString("SWIG_PyInstanceMethod_New"); - Printf(methods, "\t { (char *)\"%s\", (PyCFunction)%s, METH_O, NULL},\n", name, name); - Delete(name); - return 0; - } /* ------------------------------------------------------------ * importDirective() @@ -937,11 +862,7 @@ public: if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) { Printf(import, "_%s\n", modname); if (!Strstr(f_shadow_imports, import)) { - if (pkg && (!package || Strcmp(pkg, package) != 0)) { - Printf(f_shadow, "import %s.%s\n", pkg, modname); - } else { - Printf(f_shadow, "import %s\n", modname); - } + Printf(f_shadow, "import %s\n", modname); Printv(f_shadow_imports, import, NULL); } } @@ -953,25 +874,31 @@ public: return Language::importDirective(n); } + /* ------------------------------------------------------------ - * funcCall() - * Emit shadow code to call a function in the extension - * module. Using proper argument and calling style for - * given node n. + * emitFuncCallHelper() + * Write the shadow code to call a function in the extension + * module. Takes into account the -apply flag and whether + * to use keyword args or not. * ------------------------------------------------------------ */ - String *funcCall(String *name, String *parms) { - String *str = NewString(""); - Printv(str, module, ".", name, "(", parms, ")", NIL); + String *funcCallHelper(String *name, int kw) { + String *str; + + str = NewString(""); + if (apply) { + Printv(str, "apply(", module, ".", name, ", args", (kw ? ", kwargs" : ""), ")", NIL); + } else { + Printv(str, module, ".", name, "(*args", (kw ? ", **kwargs" : ""), ")", NIL); + } return str; - } - + } /* ------------------------------------------------------------ * pythoncode() - Output python code into the shadow file * ------------------------------------------------------------ */ - String *pythoncode(String *code, const_String_or_char_ptr indent) { + String *pythoncode(String *code, const String *indent) { String *out = NewString(""); String *temp; char *t; @@ -1133,84 +1060,29 @@ public: return doc; } - /* ----------------------------------------------------------------------------- - * makeParameterName() - * Note: the generated name should consist with that in kwnames[] - * - * Inputs: - * n - Node - * p - parameter node - * arg_num - parameter argument number - * Return: - * arg - a unique parameter name - * ----------------------------------------------------------------------------- */ - - String *makeParameterName(ParmList *plist, Parm *p, int arg_num) { - String *arg = 0; - String *pn = Swig_name_make(p, 0, Getattr(p, "name"), 0, 0); - // Use C parameter name unless it is a duplicate or an empty parameter name - int count = 0; - if ( SwigType_isvarargs(Getattr(p, "type")) ) { - return NewString("*args"); - } - while (plist) { - if ((Cmp(pn, Getattr(plist, "name")) == 0)) - count++; - plist = nextSibling(plist); - } - arg = (!pn || !Len(pn) || (count > 1)) ? NewStringf("arg%d", arg_num) : Copy(pn); - return arg; - } - - /* ------------------------------------------------------------ * make_autodocParmList() * Generate the documentation for the function parameters - * Parameters: - * func_annotation: Function annotation support * ------------------------------------------------------------ */ - String *make_autodocParmList(Node *n, bool showTypes, bool calling=false, bool func_annotation=false) { - - + String *make_autodocParmList(Node *n, bool showTypes) { String *doc = NewString(""); String *pdocs = Copy(Getattr(n, "feature:pdocs")); ParmList *plist = CopyParmList(Getattr(n, "parms")); Parm *p; Parm *pnext; - Node *lookup; - - + Node *lookup; int lines = 0; - int arg_num = 0; const int maxwidth = 50; - if(calling) - func_annotation = false; - if (pdocs) Append(pdocs, "\n"); + Swig_typemap_attach_parms("in", plist, 0); Swig_typemap_attach_parms("doc", plist, 0); - - if (Strcmp(ParmList_protostr(plist), "void")==0) { - //No parameters actually - return doc; - } - + for (p = plist; p; p = pnext) { - - String *tm = Getattr(p, "tmap:in"); - if (tm) { - pnext = Getattr(p, "tmap:in:next"); - if (checkAttribute(p, "tmap:in:numinputs", "0")) { - continue; - } - } else { - pnext = nextSibling(p); - } - String *name = 0; String *type = 0; String *value = 0; @@ -1227,14 +1099,12 @@ public: type = type ? type : Getattr(p, "type"); value = value ? value : Getattr(p, "value"); - name = makeParameterName(plist, p, arg_num); - // Reset it for convinient in further use. (mainly for makeParameterName()) - // Since the plist is created by CopyParmList, - // we can hope that the set would have no side effect - Setattr(p, "name", name); - - arg_num++; - + String *tm = Getattr(p, "tmap:in"); + if (tm) { + pnext = Getattr(p, "tmap:in:next"); + } else { + pnext = nextSibling(p); + } if (Len(doc)) { // add a comma to the previous one if any @@ -1246,40 +1116,39 @@ public: lines += 1; } } - - type = SwigType_base(type); - lookup = Swig_symbol_clookup(type, 0); - if (lookup) - type = Getattr(lookup, "sym:name"); - // Do the param type too? - if (showTypes) - Printf(doc, "%s ", type); - - - Append(doc, name); - if (pdoc) { - if (!pdocs) - pdocs = NewString("Parameters:\n"); - Printf(pdocs, " %s\n", pdoc); + if (showTypes) { + type = SwigType_base(type); + lookup = Swig_symbol_clookup(type, 0); + if (lookup) + type = Getattr(lookup, "sym:name"); + Printf(doc, "%s ", type); } - // Write the function annoation - if (func_annotation) - Printf(doc, " : '%s'", type); + if (name) { + Append(doc, name); + if (pdoc) { + if (!pdocs) + pdocs = NewString("Parameters:\n"); + Printf(pdocs, " %s\n", pdoc); + } + } else { + Append(doc, "?"); + } - // Write default value - if (value && !calling) { - String* pv = pyvalue(value, Getattr(p, "type")); - if (pv) - value = pv; + if (value) { + if (Strcmp(value, "NULL") == 0) + value = NewString("None"); + else if (Strcmp(value, "true") == 0 || Strcmp(value, "TRUE") == 0) + value = NewString("True"); + else if (Strcmp(value, "false") == 0 || Strcmp(value, "FALSE") == 0) + value = NewString("False"); else { lookup = Swig_symbol_clookup(value, 0); - if (lookup) { + if (lookup) value = Getattr(lookup, "sym:name"); - } } - Printf(doc, " = %s", value); + Printf(doc, "=%s", value); } } if (pdocs) @@ -1357,9 +1226,9 @@ public: String *str = Getattr(n, "feature:docstring"); if (str == NULL || Len(str) == 0) { if (CPlusPlus) { - Printf(doc, "Proxy of C++ %s class", real_classname); + Printf(doc, "Proxy of C++ %s class", class_name); } else { - Printf(doc, "Proxy of C %s struct", real_classname); + Printf(doc, "Proxy of C %s struct", class_name); } } } @@ -1417,132 +1286,6 @@ public: return doc; } - - /* ------------------------------------------------------------ - * pyvalue() - * Check if string v can be a Python value literal, - * (eg. number or string), or translate it to a Python literal. - * ------------------------------------------------------------ */ - String* pyvalue(String *v, SwigType *t) - { - if (v && Len(v)>0) { - char fc = (Char(v))[0]; - if (('0'<=fc && fc<='9') || '\''==fc || '"'==fc) { - /* number or string (or maybe NULL pointer)*/ - if (SwigType_ispointer(t) && Strcmp(v, "0")==0) - return NewString("None"); - else - return v; - } - if (Strcmp(v, "true")==0 || Strcmp(v, "FALSE")==0) - return NewString("True"); - if (Strcmp(v, "false")==0 || Strcmp(v, "FALSE")==0) - return NewString("False"); - if (Strcmp(v, "NULL")==0) - return NewString("None"); - } - return 0; - } - /* ------------------------------------------------------------ - * is_primitive_defaultargs() - * Check if all the default args have primitive type. - * (So we can generate proper parameter list with default - * values..) - * ------------------------------------------------------------ */ - bool is_primitive_defaultargs(Node *n) - { - ParmList *plist = CopyParmList(Getattr(n, "parms")); - Parm *p; - Parm *pnext; - - Swig_typemap_attach_parms("in", plist, 0); - for (p = plist; p; p = pnext) { - String *tm = Getattr(p, "tmap:in"); - if (tm) { - pnext = Getattr(p, "tmap:in:next"); - if (checkAttribute(p, "tmap:in:numinputs", "0")) { - continue; - } - } else { - pnext = nextSibling(p); - } - String *type = Getattr(p, "type"); - String *value = Getattr(p, "value"); - if (!pyvalue(value, type)) - return false; - } - return true; - } - - - /* ------------------------------------------------------------ - * is_real_overloaded() - * Check if the function is overloaded, but not just have some - * siblings generated due to the original function have - * default arguments. - * ------------------------------------------------------------ */ - bool is_real_overloaded(Node *n) - { - Node *h = Getattr(n, "sym:overloaded"); - Node *i; - if (!h) - return false; - - i = Getattr(h, "sym:nextSibling"); - while (i) { - Node *nn = Getattr(i, "defaultargs"); - if (nn != h) { - /* Check if overloaded function has defaultargs and - * pointed to the first overloaded. */ - return true; - } - i = Getattr(i, "sym:nextSibling"); - } - - return false; - } - - /* ------------------------------------------------------------ - * make_pyParmList() - * Generate parameter list for Python functions or methods, - * reuse make_autodocParmList() to do so. - * ------------------------------------------------------------ */ - String* make_pyParmList(Node *n, bool in_class, bool is_calling, int kw) - { - /* Get the original function for a defaultargs copy, - * see default_arguments() in parser.y. */ - Node *nn = Getattr(n, "defaultargs"); - if (nn) n = nn; - - /* For overloaded function, just use *args */ - if (is_real_overloaded(n) || - GetFlag(n, "feature:compactdefaultargs") || - !is_primitive_defaultargs(n)) - { - String *parms = NewString(""); - if(in_class) - Printf(parms, "self, "); - Printf(parms, "*args"); - if (kw) - Printf(parms, ", **kwargs"); - return parms; - } - - bool funcanno = py3 ? true : false; - String *params = NewString(""); - String *_params = make_autodocParmList(n, false, is_calling, funcanno); - - if (in_class) - { - Printf(params, "self"); - if(Len(_params) > 0) - Printf(params, ", "); - } - - Printv(params, _params, NULL); - - return params; - } /* ------------------------------------------------------------ * have_pythonprepend() @@ -1608,40 +1351,6 @@ public: return have_pythonappend(n) || have_pythonprepend(n) || have_docstring(n); } - - /* ------------------------------------------------------------ - * returnTypeAnnotation() - * Helper function for constructing the function annotation - * of the returning type, return a empty string for Python 2.x - * ------------------------------------------------------------ */ - String* returnTypeAnnotation(Node *n) - { - String *ret=0; - Parm *p = Getattr(n, "parms"); - String *tm; - /* Try to guess the returning type by argout typemap, - * however the result may not accurate. */ - while (p) { - if ((tm=Getattr(p, "tmap:argout:match_type"))) { - tm = SwigType_str(tm, 0); - if (ret) - Printv(ret, ", ", tm, NULL); - else - ret = tm; - p = Getattr(p, "tmap:argout:next"); - } else { - p = nextSibling(p); - } - } - /* If no argout typemap, then get the returning type from - * the function prototype. */ - if (!ret) { - ret = Getattr(n, "type"); - if (ret) ret = SwigType_str(ret, 0); - } - return (ret && py3) ? NewStringf(" -> \"%s\" ", ret) - : NewString(""); - } /* ------------------------------------------------------------ * emitFunctionShadowHelper() @@ -1651,26 +1360,24 @@ public: * ------------------------------------------------------------ */ void emitFunctionShadowHelper(Node *n, File *f_dest, String *name, int kw) { - String *parms = make_pyParmList(n, false, false, kw); - String *callParms = make_pyParmList(n, false, true, kw); - /* Make a wrapper function to insert the code into */ - Printv(f_dest, "\ndef ", name, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); - if (have_docstring(n)) - Printv(f_dest, " ", docstring(n, AUTODOC_FUNC, tab4), "\n", NIL); - if (have_pythonprepend(n)) - Printv(f_dest, pythoncode(pythonprepend(n), " "), "\n", NIL); - if (have_pythonappend(n)) { - Printv(f_dest, " val = ", funcCall(name, callParms), "\n", NIL); - Printv(f_dest, pythoncode(pythonappend(n), " "), "\n", NIL); - Printv(f_dest, " return val\n", NIL); - } else { - Printv(f_dest, " return ", funcCall(name, callParms), "\n", NIL); - } - if (Getattr(n, "feature:python:callback") || !have_addtofunc(n)) { - /* If there is no addtofunc directive then just assign from the extension module (for speed up) */ + /* If there is no addtofunc directive then just assign from the extension module */ Printv(f_dest, name, " = ", module, ".", name, "\n", NIL); - } + } else { + /* Otherwise make a wrapper function to insert the code into */ + Printv(f_dest, "\ndef ", name, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); + if (have_docstring(n)) + Printv(f_dest, ctab4, docstring(n, AUTODOC_FUNC, tab4), "\n", NIL); + if (have_pythonprepend(n)) + Printv(f_dest, ctab4, pythonprepend(n), "\n", NIL); + if (have_pythonappend(n)) { + Printv(f_dest, ctab4, "val = ", funcCallHelper(name, kw), "\n", NIL); + Printv(f_dest, ctab4, pythonappend(n), "\n", NIL); + Printv(f_dest, ctab4, "return val\n", NIL); + } else { + Printv(f_dest, ctab4, "return ", funcCallHelper(name, kw), "\n", NIL); + } + } } @@ -2071,7 +1778,7 @@ public: /* finish argument marshalling */ Append(kwargs, " NULL }"); if (allow_kwargs) { - Printv(f->locals, " char * kwnames[] = ", kwargs, ";\n", NIL); + Printv(f->locals, ctab4, "char * kwnames[] = ", kwargs, ";\n", NIL); } if (use_parse || allow_kwargs || !modernargs) { @@ -2343,7 +2050,7 @@ public: } if (allow_thread) thread_end_block(n, f->code); - Printv(f->code, " return NULL;\n", NIL); + Printv(f->code, ctab4, "return NULL;\n", NIL); if (funpack) { @@ -2475,9 +2182,9 @@ public: } else { Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0)); } - Printv(setf->code, " return 0;\n", NULL); + Printv(setf->code, ctab4, "return 0;\n", NULL); Append(setf->code, "fail:\n"); - Printv(setf->code, " return 1;\n", NULL); + Printv(setf->code, ctab4, "return 1;\n", NULL); } else { /* Is a readonly variable. Issue an error */ if (CPlusPlus) { @@ -2485,7 +2192,7 @@ public: } else { Printf(setf->def, "SWIGINTERN int %s(PyObject *_val SWIGUNUSED) {", varsetname); } - Printv(setf->code, " SWIG_Error(SWIG_AttributeError,\"Variable ", iname, " is read-only.\");\n", " return 1;\n", NIL); + Printv(setf->code, ctab4, "SWIG_Error(SWIG_AttributeError,\"Variable ", iname, " is read-only.\");\n", ctab4, "return 1;\n", NIL); } Append(setf->code, "}\n"); @@ -2753,7 +2460,7 @@ public: Printf(f_directors_h, " PyObject *swig_get_method(size_t method_index, const char *method_name) const {\n"); Printf(f_directors_h, " PyObject *method = vtable[method_index];\n"); Printf(f_directors_h, " if (!method) {\n"); - Printf(f_directors_h, " swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);\n"); + Printf(f_directors_h, " swig::PyObject_var name = PyString_FromString(method_name);\n"); Printf(f_directors_h, " method = PyObject_GetAttr(swig_get_self(), name);\n"); Printf(f_directors_h, " if (method == NULL) {\n"); Printf(f_directors_h, " std::string msg = \"Method in class %s doesn't exist, undefined \";\n", classname); @@ -2765,7 +2472,7 @@ public: Printf(f_directors_h, " return method;\n"); Printf(f_directors_h, " }\n"); Printf(f_directors_h, "private:\n"); - Printf(f_directors_h, " mutable swig::SwigVar_PyObject vtable[%d];\n", director_method_index); + Printf(f_directors_h, " mutable swig::PyObject_var vtable[%d];\n", director_method_index); Printf(f_directors_h, "#endif\n\n"); } @@ -2877,12 +2584,7 @@ public: b = First(baselist); while (b.item) { String *bname = Getattr(b.item, "python:proxy"); - bool ignore = GetFlag(b.item, "feature:ignore") ? true : false; - if (!bname || ignore) { - if (!bname && !ignore) { - Swig_warning(WARN_TYPE_UNDEFINED_CLASS, input_file, line_number, - "Base class '%s' ignored - unknown module name for base. Either import the appropriate module interface file or specify the name of the module in the %%import directive.\n", SwigType_namestr(Getattr(b.item, "name"))); - } + if (!bname || GetFlag(b.item, "feature:ignore")) { b = Next(b); continue; } @@ -2893,16 +2595,6 @@ public: } } } - - /* dealing with abstract base class */ - String *abcs = Getattr(n, "feature:python:abc"); - if (py3 && abcs) { - if (Len(base_class)) { - Putc(',', base_class); - } - Printv(base_class, abcs, NIL); - } - Printv(f_shadow, "class ", class_name, NIL); if (Len(base_class)) { @@ -2911,9 +2603,6 @@ public: if (!classic) { Printf(f_shadow, modern ? "(object)" : "(_object)"); } - if (GetFlag(n, "feature:exceptionclass") ) { - Printf(f_shadow, "(Exception)"); - } } Printf(f_shadow, ":\n"); if (have_docstring(n)) { @@ -2982,20 +2671,20 @@ public: SwigType_add_pointer(realct); SwigType_remember(realct); Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL); - Printv(f_wrappers, " PyObject *obj;\n", NIL); + Printv(f_wrappers, ctab4, "PyObject *obj;\n", NIL); if (modernargs) { if (fastunpack) { - Printv(f_wrappers, " if (!SWIG_Python_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); + Printv(f_wrappers, ctab4, "if (!SWIG_Python_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); } else { - Printv(f_wrappers, " if (!PyArg_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); + Printv(f_wrappers, ctab4, "if (!PyArg_UnpackTuple(args,(char*)\"swigregister\", 1, 1,&obj)) return NULL;\n", NIL); } } else { - Printv(f_wrappers, " if (!PyArg_ParseTuple(args,(char*)\"O:swigregister\", &obj)) return NULL;\n", NIL); + Printv(f_wrappers, ctab4, "if (!PyArg_ParseTuple(args,(char*)\"O:swigregister\", &obj)) return NULL;\n", NIL); } Printv(f_wrappers, - " SWIG_TypeNewClientData(SWIGTYPE", SwigType_manglestr(ct), ", SWIG_NewClientData(obj));\n", - " return SWIG_Py_Void();\n", "}\n\n", NIL); + ctab4, "SWIG_TypeNewClientData(SWIGTYPE", SwigType_manglestr(ct), ", SWIG_NewClientData(obj));\n", + ctab4, "return SWIG_Py_Void();\n", "}\n\n", NIL); String *cname = NewStringf("%s_swigregister", class_name); add_method(cname, cname, 0); Delete(smart); @@ -3004,11 +2693,11 @@ public: Delete(realct); } if (!have_constructor) { - Printv(f_shadow_file, tab4, "def __init__(self, *args, **kwargs): raise AttributeError(\"No constructor defined\")\n", NIL); + Printv(f_shadow_file, tab4, "def __init__(self, *args, **kwargs): raise AttributeError, \"No constructor defined\"\n", NIL); } else if (fastinit) { Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL); - Printv(f_wrappers, " return SWIG_Python_InitShadowInstance(args);\n", "}\n\n", NIL); + Printv(f_wrappers, ctab4, "return SWIG_Python_InitShadowInstance(args);\n", "}\n\n", NIL); String *cname = NewStringf("%s_swiginit", class_name); add_method(cname, cname, 0); Delete(cname); @@ -3117,29 +2806,27 @@ public: Delete(pycode); fproxy = 0; } else { - String *parms = make_pyParmList(n, true, false, allow_kwargs); - String *callParms = make_pyParmList(n, true, true, allow_kwargs); if (!have_addtofunc(n)) { if (!fastproxy || olddefs) { - Printv(f_shadow, tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":", NIL); - Printv(f_shadow, " return ", funcCall(Swig_name_member(class_name, symname), callParms), "\n", NIL); + Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL); + Printv(f_shadow, " return ", funcCallHelper(Swig_name_member(class_name, symname), allow_kwargs), "\n", NIL); } } else { - Printv(f_shadow, tab4, "def ", symname, "(",parms , ")", returnTypeAnnotation(n), ":", NIL); + Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL); Printv(f_shadow, "\n", NIL); if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL); if (have_pythonprepend(n)) { fproxy = 0; - Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); } if (have_pythonappend(n)) { fproxy = 0; - Printv(f_shadow, tab8, "val = ", funcCall(Swig_name_member(class_name, symname), callParms), "\n", NIL); - Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), allow_kwargs), "\n", NIL); + Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); Printv(f_shadow, tab8, "return val\n\n", NIL); } else { - Printv(f_shadow, tab8, "return ", funcCall(Swig_name_member(class_name, symname), callParms), "\n\n", NIL); + Printv(f_shadow, tab8, "return ", funcCallHelper(Swig_name_member(class_name, symname), allow_kwargs), "\n\n", NIL); } } } @@ -3172,19 +2859,17 @@ public: if (shadow) { if (!classic && !Getattr(n, "feature:python:callback") && have_addtofunc(n)) { int kw = (check_kwargs(n) && !Getattr(n, "sym:overloaded")) ? 1 : 0; - String *parms = make_pyParmList(n, false, false, kw); - String *callParms = make_pyParmList(n, false, true, kw); - Printv(f_shadow, tab4, "def ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); + Printv(f_shadow, tab4, "def ", symname, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL); if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); if (have_pythonappend(n)) { - Printv(f_shadow, tab8, "val = ", funcCall(Swig_name_member(class_name, symname), callParms), "\n", NIL); - Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n", NIL); + Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); Printv(f_shadow, tab8, "return val\n\n", NIL); } else { - Printv(f_shadow, tab8, "return ", funcCall(Swig_name_member(class_name, symname), callParms), "\n\n", NIL); + Printv(f_shadow, tab8, "return ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n\n", NIL); } Printv(f_shadow, tab4, modern ? "" : "if _newclass:", symname, " = staticmethod(", symname, ")\n", NIL); @@ -3256,8 +2941,8 @@ public: handled_as_init = (Strcmp(nname, sname) == 0) || (Strcmp(nname, cname) == 0); Delete(cname); } - - if (!have_constructor && handled_as_init) { + + if (!have_constructor && handled_as_init) { if (Getattr(n, "feature:shadow")) { String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4); String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(symname)); @@ -3271,34 +2956,27 @@ public: String *classname = Swig_class_name(parent); String *rclassname = Swig_class_name(getCurrentClass()); assert(rclassname); - - String *parms = make_pyParmList(n, true, false, allow_kwargs); - /* Pass 'self' only if using director */ - String *callParms = make_pyParmList(n, false, true, allow_kwargs); - - if (use_director) { - Insert(callParms, 0, "_self, "); + if (use_director) { Printv(pass_self, tab8, NIL); Printf(pass_self, "if self.__class__ == %s:\n", classname); - //Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL); - Printv(pass_self, tab8, tab4, "_self = None\n", tab8, "else:\n", tab8, tab4, "_self = self\n", NIL); + Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL); } - Printv(f_shadow, tab4, "def __init__(", parms, ")", returnTypeAnnotation(n), ": \n", NIL); + Printv(f_shadow, tab4, "def __init__(self, *args", (allow_kwargs ? ", **kwargs" : ""), "): \n", NIL); if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); Printv(f_shadow, pass_self, NIL); if (fastinit) { - Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCall(Swig_name_construct(symname), callParms), ")\n", NIL); + Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL); } else { Printv(f_shadow, - tab8, "this = ", funcCall(Swig_name_construct(symname), callParms), "\n", + tab8, "this = ", funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", tab8, "try: self.this.append(this)\n", tab8, "except: self.this = this\n", NIL); } if (have_pythonappend(n)) - Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n\n", NIL); + Printv(f_shadow, tab8, pythonappend(n), "\n\n", NIL); Delete(pass_self); } have_constructor = 1; @@ -3314,20 +2992,18 @@ public: Printv(f_shadow_stubs, pycode, "\n", NIL); Delete(pycode); } else { - String *parms = make_pyParmList(n, true, false, allow_kwargs); - String *callParms = make_pyParmList(n, true, true, allow_kwargs); - Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); + Printv(f_shadow_stubs, "\ndef ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):\n", NIL); if (have_docstring(n)) Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow_stubs, pythoncode(pythonprepend(n), tab4), "\n", NIL); - Printv(f_shadow_stubs, tab4, "val = ", funcCall(Swig_name_construct(symname), callParms), "\n", NIL); + Printv(f_shadow_stubs, tab4, pythonprepend(n), "\n", NIL); + Printv(f_shadow_stubs, tab4, "val = ", funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL); #ifdef USE_THISOWN Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL); #endif if (have_pythonappend(n)) - Printv(f_shadow_stubs, pythoncode(pythonappend(n), tab4), "\n", NIL); + Printv(f_shadow_stubs, tab4, pythonappend(n), "\n", NIL); Printv(f_shadow_stubs, tab4, "return val\n", NIL); } } @@ -3369,7 +3045,7 @@ public: if (have_docstring(n)) Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR, tab8), "\n", NIL); if (have_pythonprepend(n)) - Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, pythonprepend(n), "\n", NIL); #ifdef USE_THISOWN Printv(f_shadow, tab8, "try:\n", NIL); Printv(f_shadow, tab8, tab4, "if self.thisown: ", module, ".", Swig_name_destroy(symname), "(self)\n", NIL); @@ -3377,7 +3053,7 @@ public: #else #endif if (have_pythonappend(n)) - Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL); + Printv(f_shadow, tab8, pythonappend(n), "\n", NIL); Printv(f_shadow, tab8, "pass\n", NIL); Printv(f_shadow, "\n", NIL); } @@ -3765,8 +3441,8 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Replaceall(tm, "$input", input); Delete(input); Replaceall(tm, "$owner", "0"); - /* Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); */ - Printv(wrap_args, "swig::SwigVar_PyObject ", source, ";\n", NIL); + /* Wrapper_add_localv(w, source, "swig::PyObject_var", source, "= 0", NIL); */ + Printv(wrap_args, "swig::PyObject_var ", source, ";\n", NIL); Printv(wrap_args, tm, "\n", NIL); Printv(arglist, "(PyObject *)", source, NIL); @@ -3822,7 +3498,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { if (target) { String *director = NewStringf("director_%s", mangle); Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL); - Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); + Wrapper_add_localv(w, source, "swig::PyObject_var", source, "= 0", NIL); Printf(wrap_args, "%s = SWIG_DIRECTOR_CAST(%s);\n", director, nonconst); Printf(wrap_args, "if (!%s) {\n", director); Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle); @@ -3833,7 +3509,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Delete(director); Printv(arglist, source, NIL); } else { - Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); + Wrapper_add_localv(w, source, "swig::PyObject_var", source, "= 0", NIL); Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle); //Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE_p_%s, 0);\n", // source, nonconst, base); @@ -3884,33 +3560,33 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Append(w->code, "PyObject* method = swig_get_method(swig_method_index, swig_method_name);\n"); if (Len(parse_args) > 0) { if (use_parse || !modernargs) { - Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)\"(%s)\" %s);\n", parse_args, arglist); + Printf(w->code, "swig::PyObject_var result = PyObject_CallFunction(method, (char *)\"(%s)\" %s);\n", parse_args, arglist); } else { - Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method %s, NULL);\n", arglist); + Printf(w->code, "swig::PyObject_var result = PyObject_CallFunctionObjArgs(method %s, NULL);\n", arglist); } } else { if (modernargs) { - Append(w->code, "swig::SwigVar_PyObject args = PyTuple_New(0);\n"); - Append(w->code, "swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject*) args, NULL);\n"); + Append(w->code, "swig::PyObject_var args = PyTuple_New(0);\n"); + Append(w->code, "swig::PyObject_var result = PyObject_Call(method, (PyObject*) args, NULL);\n"); } else { - Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);\n"); + Printf(w->code, "swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);\n"); } } Append(w->code, "#else\n"); if (Len(parse_args) > 0) { if (use_parse || !modernargs) { - Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)\"%s\", (char *)\"(%s)\" %s);\n", + Printf(w->code, "swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)\"%s\", (char *)\"(%s)\" %s);\n", pyname, parse_args, arglist); - } else { - Printf(w->code, "swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar((char *)\"%s\");\n", pyname); - Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name %s, NULL);\n", arglist); + } else { + Printf(w->code, "swig::PyObject_var swig_method_name = PyString_FromString((char *)\"%s\");\n", pyname); + Printf(w->code, "swig::PyObject_var result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name %s, NULL);\n", arglist); } } else { if (!modernargs) { - Printf(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) \"%s\", NULL);\n", pyname); + Printf(w->code, "swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) \"%s\", NULL);\n", pyname); } else { - Printf(w->code, "swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar((char *)\"%s\");\n", pyname); - Append(w->code, "swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);\n"); + Printf(w->code, "swig::PyObject_var swig_method_name = PyString_FromString((char *)\"%s\");\n", pyname); + Append(w->code, "swig::PyObject_var result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);\n"); } } Append(w->code, "#endif\n"); diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 8e9aa557d..49d3ecc89 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -424,7 +424,6 @@ protected: String *sfile; String *f_init; String *s_classes; - String *f_begin; String *f_runtime; String *f_wrapper; String *s_header; @@ -488,7 +487,6 @@ R::R() : sfile(0), f_init(0), s_classes(0), - f_begin(0), f_runtime(0), f_wrapper(0), s_header(0), @@ -769,7 +767,6 @@ void R::init() { sfile = NewString(""); f_init = NewString(""); s_header = NewString(""); - f_begin = NewString(""); f_runtime = NewString(""); f_wrapper = NewString(""); s_classes = NewString(""); @@ -814,22 +811,16 @@ int R::top(Node *n) { Swig_register_filebyname("sinit", s_init); Swig_register_filebyname("sinitroutine", s_init_routine); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("header", s_header); Swig_register_filebyname("wrapper", f_wrapper); Swig_register_filebyname("s", sfile); + Swig_register_filebyname("sclasses", s_classes); - Swig_banner(f_begin); - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGR\n"); - Printf(f_runtime, "\n"); - - - Swig_banner_target_lang(s_init, "#"); + Printf(s_init, "# This is an automatically generated file by the R module for SWIG.\n\n"); outputCommandLineArguments(s_init); Printf(f_wrapper, "#ifdef __cplusplus\n"); @@ -867,9 +858,7 @@ int R::top(Node *n) { Delete(f_init); Delete(s_header); - Close(f_begin); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -889,7 +878,7 @@ int R::DumpCode(Node *n) { Printf(stderr, "Writing S code to %s\n", output_filename); #endif - File *scode = NewFile(output_filename, "w", SWIG_output_files()); + File *scode = NewFile(output_filename, "w"); if (!scode) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); @@ -904,16 +893,25 @@ int R::DumpCode(Node *n) { Close(scode); // Delete(scode); String *outfile = Getattr(n,"outfile"); - File *runtime = NewFile(outfile,"w", SWIG_output_files()); + File *runtime = NewFile(outfile,"w"); if (!runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - Printf(runtime, "%s", f_begin); + Swig_banner(runtime); + + + Printf(runtime, "/* Runtime */\n"); Printf(runtime, "%s\n", f_runtime); + + Printf(runtime, "/* Header */\n"); Printf(runtime, "%s\n", s_header); + + Printf(runtime, "/* Wrapper */\n"); Printf(runtime, "%s\n", f_wrapper); + + Printf(runtime, "/* Init code */\n"); Printf(runtime, "%s\n", f_init); Close(runtime); @@ -922,7 +920,7 @@ int R::DumpCode(Node *n) { if(outputNamespaceInfo) { output_filename = NewString(""); Printf(output_filename, "%sNAMESPACE", SWIG_output_directory()); - File *ns = NewFile(output_filename, "w", SWIG_output_files()); + File *ns = NewFile(output_filename, "w"); if (!ns) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); @@ -2576,9 +2574,9 @@ String * R::runtimeCode() { void R::main(int argc, char *argv[]) { bool cppcast = true; init(); - Preprocessor_define("SWIGR 1", 0); SWIG_library_directory("r"); SWIG_config_file("r.swg"); + Preprocessor_define("SWIGR 1", 0); debugMode = false; copyStruct = true; memoryProfile = false; @@ -2661,7 +2659,7 @@ int R::outputCommandLineArguments(File *out) if(Argc < 1 || !Argv || !Argv[0]) return(-1); - Printf(out, "\n## Generated via the command line invocation:\n##\t"); + Printf(out, "## Generated via the command line invocation:\n##\t"); for(int i = 0; i < Argc ; i++) { Printf(out, " %s", Argv[i]); } diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 1c13747e5..ad448d34e 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -30,7 +30,7 @@ public: /** * The C variable name used in the SWIG-generated wrapper code to refer to - * this class; usually it is of the form "SwigClassXXX.klass", where SwigClassXXX + * this class; usually it is of the form "cClassName.klass", where cClassName * is a swig_class struct instance and klass is a member of that struct. */ String *vname; @@ -39,7 +39,7 @@ public: * The C variable name used in the SWIG-generated wrapper code to refer to * the module that implements this class's methods (when we're trying to * support C++ multiple inheritance). Usually it is of the form - * "SwigClassClassName.mImpl", where SwigClassXXX is a swig_class struct instance + * "cClassName.mImpl", where cClassName is a swig_class struct instance * and mImpl is a member of that struct. */ String *mImpl; @@ -78,7 +78,7 @@ public: Delete(temp); } - void set_name(const_String_or_char_ptr cn, const_String_or_char_ptr rn, const_String_or_char_ptr valn) { + void set_name(const String_or_char *cn, const String_or_char *rn, const String_or_char *valn) { /* Original C/C++ class (or struct) name */ Clear(cname); Append(cname, cn); @@ -93,18 +93,18 @@ public: /* Variable name for the VALUE that refers to the Ruby Class object */ Clear(vname); - Printf(vname, "SwigClass%s.klass", name); + Printf(vname, "c%s.klass", name); /* Variable name for the VALUE that refers to the Ruby Class object */ Clear(mImpl); - Printf(mImpl, "SwigClass%s.mImpl", name); + Printf(mImpl, "c%s.mImpl", name); /* Prefix */ Clear(prefix); Printv(prefix, (rn ? rn : cn), "_", NIL); } - char *strip(const_String_or_char_ptr s) { + char *strip(const String_or_char *s) { Clear(temp); Append(temp, s); if (Strncmp(s, prefix, Len(prefix)) == 0) { @@ -158,7 +158,6 @@ private: File *f_directors; File *f_directors_h; File *f_directors_helpers; - File *f_begin; File *f_runtime; File *f_runtime_h; File *f_header; @@ -763,7 +762,6 @@ public: classes = 0; klass = 0; special_methods = 0; - f_begin = 0; f_runtime = 0; f_header = 0; f_wrappers = 0; @@ -994,13 +992,24 @@ public: SWIG_exit(EXIT_FAILURE); } - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); + if (directorsEnabled()) { + if (!outfile_h) { + Printf(stderr, "Unable to determine outfile_h\n"); + SWIG_exit(EXIT_FAILURE); + } + f_runtime_h = NewFile(outfile_h, "w"); + if (!f_runtime_h) { + FileErrorDisplay(outfile_h); + SWIG_exit(EXIT_FAILURE); + } + } + f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -1009,22 +1018,9 @@ public: f_directors_helpers = NewString(""); f_initbeforefunc = NewString(""); - if (directorsEnabled()) { - if (!outfile_h) { - Printf(stderr, "Unable to determine outfile_h\n"); - SWIG_exit(EXIT_FAILURE); - } - f_runtime_h = NewFile(outfile_h, "w", SWIG_output_files()); - if (!f_runtime_h) { - FileErrorDisplay(outfile_h); - SWIG_exit(EXIT_FAILURE); - } - } - /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); Swig_register_filebyname("director", f_directors); @@ -1039,17 +1035,14 @@ public: registerMagicMethods(); - Swig_banner(f_begin); + Swig_banner(f_runtime); - Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGRUBY\n"); if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); } - Printf(f_runtime, "\n"); - /* typedef void *VALUE */ SwigType *value = NewSwigType(T_VOID); SwigType_add_pointer(value); @@ -1065,7 +1058,6 @@ public: Replaceall(module_macro, "::", "__"); Swig_banner(f_directors_h); - Printf(f_directors_h, "\n"); Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_macro); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_macro); Printf(f_directors_h, "namespace Swig {\n"); @@ -1118,29 +1110,27 @@ public: SwigType_emit_type_table(f_runtime, f_wrappers); /* Close all of the files */ - Dump(f_runtime, f_begin); - Dump(f_header, f_begin); + Dump(f_header, f_runtime); if (directorsEnabled()) { - Dump(f_directors_helpers, f_begin); - Dump(f_directors, f_begin); + Dump(f_directors_helpers, f_runtime); + Dump(f_directors, f_runtime); Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); Close(f_runtime_h); } - Dump(f_wrappers, f_begin); - Dump(f_initbeforefunc, f_begin); - Wrapper_pretty_print(f_init, f_begin); + Dump(f_wrappers, f_runtime); + Dump(f_initbeforefunc, f_runtime); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); Delete(f_initbeforefunc); - Close(f_begin); + Close(f_runtime); Delete(f_runtime); - Delete(f_begin); return SWIG_OK; } @@ -1236,7 +1226,7 @@ public: /** * Process the comma-separated list of aliases (if any). */ - void defineAliases(Node *n, const_String_or_char_ptr iname) { + void defineAliases(Node *n, const String_or_char *iname) { String *aliasv = Getattr(n, "feature:alias"); if (aliasv) { List *aliases = Split(aliasv, ',', INT_MAX); @@ -1270,7 +1260,7 @@ public: * as another instance of the same class. * --------------------------------------------------------------------- */ - void create_command(Node *n, const_String_or_char_ptr iname) { + void create_command(Node *n, const String_or_char *iname) { String *alloc_func = Swig_name_wrapper(iname); String *wname = Swig_name_wrapper(iname); @@ -2402,9 +2392,9 @@ public: void handleMarkFuncDirective(Node *n) { String *markfunc = Getattr(n, "feature:markfunc"); if (markfunc) { - Printf(klass->init, "SwigClass%s.mark = (void (*)(void *)) %s;\n", klass->name, markfunc); + Printf(klass->init, "c%s.mark = (void (*)(void *)) %s;\n", klass->name, markfunc); } else { - Printf(klass->init, "SwigClass%s.mark = 0;\n", klass->name); + Printf(klass->init, "c%s.mark = 0;\n", klass->name); } } @@ -2414,10 +2404,10 @@ public: void handleFreeFuncDirective(Node *n) { String *freefunc = Getattr(n, "feature:freefunc"); if (freefunc) { - Printf(klass->init, "SwigClass%s.destroy = (void (*)(void *)) %s;\n", klass->name, freefunc); + Printf(klass->init, "c%s.destroy = (void (*)(void *)) %s;\n", klass->name, freefunc); } else { if (klass->destructor_defined) { - Printf(klass->init, "SwigClass%s.destroy = (void (*)(void *)) free_%s;\n", klass->name, klass->mname); + Printf(klass->init, "c%s.destroy = (void (*)(void *)) free_%s;\n", klass->name, klass->mname); } } } @@ -2428,9 +2418,9 @@ public: void handleTrackDirective(Node *n) { int trackObjects = GetFlag(n, "feature:trackobjects"); if (trackObjects) { - Printf(klass->init, "SwigClass%s.trackObjects = 1;\n", klass->name); + Printf(klass->init, "c%s.trackObjects = 1;\n", klass->name); } else { - Printf(klass->init, "SwigClass%s.trackObjects = 0;\n", klass->name); + Printf(klass->init, "c%s.trackObjects = 0;\n", klass->name); } } @@ -2455,7 +2445,7 @@ public: Clear(klass->type); Printv(klass->type, Getattr(n, "classtype"), NIL); - Printv(f_wrappers, "swig_class SwigClass", valid_name, ";\n\n", NIL); + Printv(f_wrappers, "swig_class c", valid_name, ";\n\n", NIL); Printv(klass->init, "\n", tab4, NIL); if (!useGlobalModule) { @@ -2473,7 +2463,7 @@ public: SwigType_add_pointer(tt); SwigType_remember(tt); String *tm = SwigType_manglestr(tt); - Printf(klass->init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) &SwigClass%s);\n", tm, valid_name); + Printf(klass->init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) &c%s);\n", tm, valid_name); Delete(tm); Delete(tt); Delete(valid_name); @@ -2574,7 +2564,7 @@ public: /* First wrap the allocate method */ current = CONSTRUCTOR_ALLOCATE; - Swig_name_register((const_String_or_char_ptr ) "construct", (const_String_or_char_ptr ) "%c_allocate"); + Swig_name_register((String_or_char *) "construct", (String_or_char *) "%c_allocate"); Language::constructorHandler(n); @@ -2609,7 +2599,7 @@ public: Delete(docs); current = CONSTRUCTOR_INITIALIZE; - Swig_name_register((const_String_or_char_ptr ) "construct", (const_String_or_char_ptr ) "new_%c"); + Swig_name_register((String_or_char *) "construct", (String_or_char *) "new_%c"); Language::constructorHandler(n); /* Restore original parameter list */ @@ -2617,7 +2607,7 @@ public: Swig_restore(n); /* Done */ - Swig_name_unregister((const_String_or_char_ptr ) "construct"); + Swig_name_unregister((String_or_char *) "construct"); current = NO_CPP; klass->constructor_defined = 1; return SWIG_OK; @@ -2631,7 +2621,7 @@ public: /* First wrap the allocate method */ current = CONSTRUCTOR_ALLOCATE; - Swig_name_register((const_String_or_char_ptr ) "construct", (const_String_or_char_ptr ) "%c_allocate"); + Swig_name_register((String_or_char *) "construct", (String_or_char *) "%c_allocate"); return Language::copyconstructorHandler(n); } diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 90791ec70..b89b3097f 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -29,9 +29,6 @@ public: } virtual void main(int argc, char *argv[]) { - // Add a symbol to the parser for conditional compilation - Preprocessor_define("SWIGSEXP 1", 0); - SWIG_typemap_lang("sexp"); for (int iX = 0; iX < argc; iX++) { if (strcmp(argv[iX], "-typemaplang") == 0) { @@ -45,6 +42,9 @@ public: fputs(usage, stdout); } } + + // Add a symbol to the parser for conditional compilation + Preprocessor_define("SWIGSEXP 1", 0); } DOHHash *print_circle_hash; @@ -59,7 +59,7 @@ public: String *outfile = Getattr(n, "outfile"); Replaceall(outfile, "_wrap.cxx", ".lisp"); Replaceall(outfile, "_wrap.c", ".lisp"); - out = NewFile(outfile, "w", SWIG_output_files()); + out = NewFile(outfile, "w"); if (!out) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -68,14 +68,10 @@ public: String *f_sink = NewString(""); Swig_register_filebyname("header", f_sink); Swig_register_filebyname("wrapper", f_sink); - Swig_register_filebyname("begin", f_sink); Swig_register_filebyname("runtime", f_sink); Swig_register_filebyname("init", f_sink); - Swig_banner_target_lang(out, ";;;"); - Language::top(n); - Printf(out, "\n"); Printf(out, ";;; Lisp parse tree produced by SWIG\n"); print_circle_hash = DohNewHash(); print_circle_count = 0; diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx index b121dc9b7..b727b9c67 100644 --- a/Source/Modules/swigmain.cxx +++ b/Source/Modules/swigmain.cxx @@ -32,8 +32,8 @@ extern "C" { Language *swig_modula3(void); Language *swig_mzscheme(void); Language *swig_java(void); - Language *swig_php(void); Language *swig_php4(void); + Language *swig_php5(void); Language *swig_ocaml(void); Language *swig_octave(void); Language *swig_pike(void); @@ -76,9 +76,9 @@ static swig_module modules[] = { {"-octave", swig_octave, "Octave"}, {"-perl", swig_perl5, "Perl"}, {"-perl5", swig_perl5, 0}, - {"-php", swig_php, "PHP"}, - {"-php4", swig_php4, 0}, - {"-php5", swig_php, 0}, + {"-php", swig_php4, 0}, + {"-php4", swig_php4, "PHP4"}, + {"-php5", swig_php5, "PHP5"}, {"-pike", swig_pike, "Pike"}, {"-python", swig_python, "Python"}, {"-r", swig_r, "R (aka GNU S)"}, diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h index 8dec8d0af..5835c6362 100644 --- a/Source/Modules/swigmod.h +++ b/Source/Modules/swigmod.h @@ -26,7 +26,7 @@ typedef int bool; #define PLAIN_VIRTUAL 1 #define PURE_VIRTUAL 2 -extern String *input_file; +extern char *input_file; extern int line_number; extern int start_line; extern int CPlusPlus; // C++ mode @@ -114,8 +114,8 @@ protected: class Language:public Dispatcher { public: - Language(); - virtual ~Language(); + Language (); + virtual ~ Language (); virtual int emit_one(Node *n); /* Parse command line options */ @@ -313,13 +313,10 @@ int SWIG_main(int, char **, Language *); void emit_parameter_variables(ParmList *l, Wrapper *f); void emit_return_variable(Node *n, SwigType *rt, Wrapper *f); void SWIG_exit(int); /* use EXIT_{SUCCESS,FAILURE} */ -void SWIG_config_file(const_String_or_char_ptr ); +void SWIG_config_file(const String_or_char *); const String *SWIG_output_directory(); void SWIG_config_cppext(const char *ext); -/* get the list of generated files */ -List *SWIG_output_files(); - void SWIG_library_directory(const char *); int emit_num_arguments(ParmList *); int emit_num_required(ParmList *); @@ -329,17 +326,17 @@ void emit_mark_varargs(ParmList *l); String *emit_action(Node *n); int emit_action_code(Node *n, String *wrappercode, String *action); void Swig_overload_check(Node *n); -String *Swig_overload_dispatch(Node *n, const_String_or_char_ptr fmt, int *); -String *Swig_overload_dispatch_cast(Node *n, const_String_or_char_ptr fmt, int *); -String *Swig_overload_dispatch_fast(Node *n, const_String_or_char_ptr fmt, int *); +String *Swig_overload_dispatch(Node *n, const String_or_char *fmt, int *); +String *Swig_overload_dispatch_cast(Node *n, const String_or_char *fmt, int *); +String *Swig_overload_dispatch_fast(Node *n, const String_or_char *fmt, int *); SwigType *cplus_value_type(SwigType *t); /* directors.cxx start */ String *Swig_csuperclass_call(String *base, String *method, ParmList *l); String *Swig_class_declaration(Node *n, String *name); String *Swig_class_name(Node *n); -String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms); -String *Swig_method_decl(SwigType *rtype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values); +String *Swig_method_call(String_or_char *name, ParmList *parms); +String *Swig_method_decl(SwigType *rtype, SwigType *decl, const String_or_char *id, List *args, int strip, int values); String *Swig_director_declaration(Node *n); void Swig_director_emit_dynamic_cast(Node *n, Wrapper *f); /* directors.cxx end */ diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 015ac5e45..09bd266c3 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -46,7 +46,6 @@ static int nosafe = 0; static File *f_header = 0; static File *f_wrappers = 0; static File *f_init = 0; -static File *f_begin = 0; static File *f_runtime = 0; @@ -122,7 +121,6 @@ public: } Preprocessor_define("SWIGTCL 1", 0); - // SWIGTCL8 is deprecated, and no longer documented. Preprocessor_define("SWIGTCL8 1", 0); SWIG_typemap_lang("tcl8"); SWIG_config_file("tcl8.swg"); @@ -138,12 +136,11 @@ public: /* Initialize all of the output files */ String *outfile = Getattr(n, "outfile"); - f_begin = NewFile(outfile, "w", SWIG_output_files()); - if (!f_begin) { + f_runtime = NewFile(outfile, "w"); + if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } - f_runtime = NewString(""); f_init = NewString(""); f_header = NewString(""); f_wrappers = NewString(""); @@ -151,7 +148,6 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("begin", f_begin); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); @@ -162,11 +158,7 @@ public: methods_tab = NewString(""); const_tab = NewString(""); - Swig_banner(f_begin); - - Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIGTCL\n"); - Printf(f_runtime, "\n"); + Swig_banner(f_runtime); /* Set the module name, namespace, and prefix */ @@ -185,7 +177,7 @@ public: Insert(module, 0, "_"); - if ((f_shadow = NewFile(filen, "w", SWIG_output_files())) == 0) { + if ((f_shadow = NewFile(filen, "w")) == 0) { FileErrorDisplay(filen); SWIG_exit(EXIT_FAILURE); } @@ -194,7 +186,10 @@ public: Swig_register_filebyname("shadow", f_shadow); Swig_register_filebyname("itcl", f_shadow); - Swig_banner_target_lang(f_shadow, "#"); + Printf(f_shadow, "# This file was automatically generated by SWIG (http://www.swig.org).\n"); + Printf(f_shadow, "# Version %s\n", Swig_package_version()); + Printf(f_shadow, "#\n"); + Printf(f_shadow, "# Don't modify this file, modify the SWIG interface instead.\n"); Printv(f_shadow, "\npackage require Itcl\n\n", NIL); Delete(filen); @@ -249,15 +244,12 @@ public: } /* Close all of the files */ - Dump(f_runtime, f_begin); - Printv(f_begin, f_header, f_wrappers, NIL); - Wrapper_pretty_print(f_init, f_begin); + Printv(f_runtime, f_header, f_wrappers, NIL); + Wrapper_pretty_print(f_init, f_runtime); Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); - Delete(f_runtime); - Delete(f_begin); + Close(f_runtime); return SWIG_OK; } diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index d3f8401f0..7a94b77bb 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -26,6 +26,7 @@ public: }; static File *f_cl = 0; +static File *f_null = 0; static struct { int count; @@ -131,7 +132,7 @@ static void add_defined_foreign_type(String *type) { } -static String *get_ffi_type(SwigType *ty, const_String_or_char_ptr name) { +static String *get_ffi_type(SwigType *ty, const String_or_char *name) { Hash *typemap = Swig_typemap_search("ffitype", ty, name, 0); if (typemap) { String *typespec = Getattr(typemap, "code"); @@ -167,7 +168,7 @@ static String *get_ffi_type(SwigType *ty, const_String_or_char_ptr name) { return 0; } -static String *get_lisp_type(SwigType *ty, const_String_or_char_ptr name) { +static String *get_lisp_type(SwigType *ty, const String_or_char *name) { Hash *typemap = Swig_typemap_search("lisptype", ty, name, 0); if (typemap) { String *typespec = Getattr(typemap, "code"); @@ -180,7 +181,6 @@ static String *get_lisp_type(SwigType *ty, const_String_or_char_ptr name) { void UFFI::main(int argc, char *argv[]) { int i; - Preprocessor_define("SWIGUFFI 1", 0); SWIG_library_directory("uffi"); SWIG_config_file("uffi.swg"); @@ -225,26 +225,31 @@ void UFFI::main(int argc, char *argv[]) { int UFFI::top(Node *n) { String *module = Getattr(n, "name"); String *output_filename = NewString(""); - File *f_null = NewString(""); + String *devnull = NewString("/dev/null"); + + f_null = NewFile(devnull, "w+"); + if (!f_null) { + FileErrorDisplay(devnull); + SWIG_exit(EXIT_FAILURE); + } + Delete(devnull); + Printf(output_filename, "%s%s.cl", SWIG_output_directory(), module); - f_cl = NewFile(output_filename, "w", SWIG_output_files()); + f_cl = NewFile(output_filename, "w"); if (!f_cl) { FileErrorDisplay(output_filename); SWIG_exit(EXIT_FAILURE); } Swig_register_filebyname("header", f_null); - Swig_register_filebyname("begin", f_null); Swig_register_filebyname("runtime", f_null); Swig_register_filebyname("wrapper", f_cl); - Swig_banner_target_lang(f_cl, ";;"); - - Printf(f_cl, "\n" - ";; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; package: %s -*-\n\n(defpackage :%s\n (:use :common-lisp :uffi))\n\n(in-package :%s)\n", + Printf(f_cl, + ";; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; package: %s -*-\n;; This is an automatically generated file. Make changes in\n;; the definition file, not here.\n\n(defpackage :%s\n (:use :common-lisp :uffi))\n\n(in-package :%s)\n", module, module, module); Printf(f_cl, "(eval-when (compile load eval)\n (defparameter *swig-identifier-converter* '%s))\n", identifier_converter); diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index 2edd01cf0..c74b48d7c 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -47,7 +47,7 @@ public: iX++; Swig_mark_arg(iX); String *outfile = NewString(argv[iX]); - out = NewFile(outfile, "w", SWIG_output_files()); + out = NewFile(outfile, "w"); if (!out) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -82,7 +82,7 @@ public: Replaceall(outfile, ".cxx", ".xml"); Replaceall(outfile, ".cpp", ".xml"); Replaceall(outfile, ".c", ".xml"); - out = NewFile(outfile, "w", SWIG_output_files()); + out = NewFile(outfile, "w"); if (!out) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -301,7 +301,7 @@ void Swig_print_xml(DOH *obj, String *filename) { if (!filename) { out = stdout; } else { - out = NewFile(filename, "w", SWIG_output_files()); + out = NewFile(filename, "w"); if (!out) { FileErrorDisplay(filename); SWIG_exit(EXIT_FAILURE); diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 81646171a..c04f95f00 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -74,7 +74,7 @@ static void copy_location(const DOH *s1, DOH *s2) { Setline(s2, Getline((DOH *) s1)); } -static String *cpp_include(const_String_or_char_ptr fn, int sysfile) { +static String *cpp_include(String_or_char *fn, int sysfile) { String *s = sysfile ? Swig_include_sys(fn) : Swig_include(fn); if (s && single_include) { String *file = Getfile(s); @@ -85,8 +85,7 @@ static String *cpp_include(const_String_or_char_ptr fn, int sysfile) { Setattr(included_files, file, file); } if (!s) { - /* XXX(bhy) may not need the seek */ - /* Seek(fn, 0, SEEK_SET); */ + Seek(fn, 0, SEEK_SET); if (ignore_missing) { Swig_warning(WARN_PP_MISSING_FILE, Getfile(fn), Getline(fn), "Unable to find '%s'\n", fn); } else { @@ -262,9 +261,8 @@ void Preprocessor_error_as_warning(int a) { * ----------------------------------------------------------------------------- */ -String *Macro_vararg_name(const_String_or_char_ptr str, const_String_or_char_ptr line) { - String *argname; - String *varargname; +String_or_char *Macro_vararg_name(String_or_char *str, String_or_char *line) { + String_or_char *argname, *varargname; char *s, *dots; argname = Copy(str); @@ -290,24 +288,24 @@ String *Macro_vararg_name(const_String_or_char_ptr str, const_String_or_char_ptr return varargname; } -Hash *Preprocessor_define(const_String_or_char_ptr _str, int swigmacro) { +Hash *Preprocessor_define(const String_or_char *_str, int swigmacro) { String *macroname = 0, *argstr = 0, *macrovalue = 0, *file = 0, *s = 0; Hash *macro = 0, *symbols = 0, *m1; List *arglist = 0; int c, line; int varargs = 0; - String *str; + String_or_char *str = (String_or_char *) _str; assert(cpp); - assert(_str); + assert(str); /* First make sure that string is actually a string */ - if (DohCheck(_str)) { - s = Copy(_str); - copy_location(_str, s); + if (DohCheck(str)) { + s = Copy(str); + copy_location(str, s); str = s; } else { - str = NewString((char *) _str); + str = NewString((char *) str); } Seek(str, 0, SEEK_SET); line = Getline(str); @@ -534,7 +532,7 @@ macro_error: * * Undefines a macro. * ----------------------------------------------------------------------------- */ -void Preprocessor_undef(const_String_or_char_ptr str) { +void Preprocessor_undef(const String_or_char *str) { Hash *symbols; assert(cpp); symbols = Getattr(cpp, kpp_symbols); @@ -652,7 +650,14 @@ static String *get_filename(String *str, int *sysfile) { if (isspace(c)) Ungetc(c, str); } - Swig_filename_correct(fn); +#if defined(_WIN32) || defined(MACSWIG) + /* accept Unix path separator on non-Unix systems */ + Replaceall(fn, "/", SWIG_FILE_DELIMITER); +#endif +#if defined(__CYGWIN__) + /* accept Windows path separator in addition to Unix path separator */ + Replaceall(fn, "\\", SWIG_FILE_DELIMITER); +#endif Seek(fn, 0, SEEK_SET); return fn; } diff --git a/Source/Preprocessor/preprocessor.h b/Source/Preprocessor/preprocessor.h index 3579eede2..4f7ff8804 100644 --- a/Source/Preprocessor/preprocessor.h +++ b/Source/Preprocessor/preprocessor.h @@ -19,8 +19,8 @@ extern "C" { #endif extern int Preprocessor_expr(String *s, int *error); extern char *Preprocessor_expr_error(void); - extern Hash *Preprocessor_define(const_String_or_char_ptr str, int swigmacro); - extern void Preprocessor_undef(const_String_or_char_ptr name); + extern Hash *Preprocessor_define(const String_or_char *str, int swigmacro); + extern void Preprocessor_undef(const String_or_char *name); extern void Preprocessor_init(void); extern void Preprocessor_delete(void); extern String *Preprocessor_parse(String *s); diff --git a/Source/README b/Source/README index 814ec45bd..8d910e405 100644 --- a/Source/README +++ b/Source/README @@ -1,5 +1,9 @@ SWIG Source directory +This directory currently contains a mix of legacy SWIG1.1 code and +recent development work. As a result, it's still a little messy. +Here is a rough breakdown of the directories: + Source/DOH - A core set of basic datatypes including strings, lists, hashes, and files. Used extensively by the rest of SWIG. @@ -12,9 +16,8 @@ SWIG Source directory Source/Modules - Language modules. - Source/Include - Include files. -Historic directories which may be in CVS, but have been removed: +The following directories may be in CVS, but are largely deprecated: Source/Modules1.1 - Old SWIG-1.1 modules. Empty. @@ -23,3 +26,5 @@ Historic directories which may be in CVS, but have been removed: Source/SWIG1.1 - Old SWIG1.1 core. Completely empty now. + + diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 7c6837a2b..18920ecc2 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -45,7 +45,7 @@ String *Swig_cparm_name(Parm *p, int i) { * and user defined types to pointers. * ----------------------------------------------------------------------------- */ -static String *Swig_clocal(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr value) { +static String *Swig_clocal(SwigType *t, const String_or_char *name, const String_or_char *value) { String *decl; decl = NewStringEmpty(); @@ -147,7 +147,7 @@ String *Swig_wrapped_member_var_type(SwigType *t, int varcref) { } -static String *Swig_wrapped_var_deref(SwigType *t, const_String_or_char_ptr name, int varcref) { +static String *Swig_wrapped_var_deref(SwigType *t, String_or_char *name, int varcref) { if (SwigType_isclass(t)) { if (varcref) { if (cparse_cplusplus) { @@ -163,7 +163,7 @@ static String *Swig_wrapped_var_deref(SwigType *t, const_String_or_char_ptr name } } -static String *Swig_wrapped_var_assign(SwigType *t, const_String_or_char_ptr name, int varcref) { +static String *Swig_wrapped_var_assign(SwigType *t, const String_or_char *name, int varcref) { if (SwigType_isclass(t)) { if (varcref) { return NewStringf("%s", name); @@ -251,7 +251,7 @@ int Swig_cargs(Wrapper *w, ParmList *p) { * function call. * ----------------------------------------------------------------------------- */ -String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr decl) { +String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_char *decl) { String *fcall; fcall = NewStringEmpty(); @@ -260,9 +260,10 @@ String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or break; case T_REFERENCE: { - String *lstr = SwigType_lstr(t, 0); - Printf(fcall, "%s = (%s) &", name, lstr); - Delete(lstr); + String *str = SwigType_str(t, "_result_ref"); + Printf(fcall, "{\n"); + Printf(fcall, "%s = ", str); + Delete(str); } break; case T_USER: @@ -289,6 +290,12 @@ String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or Append(fcall, ";"); } + if (SwigType_type(t) == T_REFERENCE) { + String *lstr = SwigType_lstr(t, 0); + Printf(fcall, "\n%s = (%s) &_result_ref;\n", name, lstr); + Append(fcall, "}"); + Delete(lstr); + } return fcall; } @@ -302,7 +309,7 @@ String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or * * ----------------------------------------------------------------------------- */ -String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms) { +String *Swig_cfunction_call(String_or_char *name, ParmList *parms) { String *func; int i = 0; int comma = 0; @@ -369,7 +376,7 @@ String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms) { * set to "(*this)->" or some similar sequence. * ----------------------------------------------------------------------------- */ -static String *Swig_cmethod_call(const_String_or_char_ptr name, ParmList *parms, const_String_or_char_ptr self, String *explicit_qualifier, SwigType *director_type) { +static String *Swig_cmethod_call(String_or_char *name, ParmList *parms, String_or_char *self, String *explicit_qualifier, SwigType *director_type) { String *func, *nname; int i = 0; Parm *p = parms; @@ -461,7 +468,7 @@ static String *Swig_cmethod_call(const_String_or_char_ptr name, ParmList *parms, * calloc(1,sizeof(name)); * ----------------------------------------------------------------------------- */ -String *Swig_cconstructor_call(const_String_or_char_ptr name) { +String *Swig_cconstructor_call(String_or_char *name) { DOH *func; func = NewStringEmpty(); @@ -480,7 +487,7 @@ String *Swig_cconstructor_call(const_String_or_char_ptr name) { * * ----------------------------------------------------------------------------- */ -String *Swig_cppconstructor_base_call(const_String_or_char_ptr name, ParmList *parms, int skip_self) { +String *Swig_cppconstructor_base_call(String_or_char *name, ParmList *parms, int skip_self) { String *func; String *nname; int i = 0; @@ -525,15 +532,15 @@ String *Swig_cppconstructor_base_call(const_String_or_char_ptr name, ParmList *p return func; } -String *Swig_cppconstructor_call(const_String_or_char_ptr name, ParmList *parms) { +String *Swig_cppconstructor_call(String_or_char *name, ParmList *parms) { return Swig_cppconstructor_base_call(name, parms, 0); } -String *Swig_cppconstructor_nodirector_call(const_String_or_char_ptr name, ParmList *parms) { +String *Swig_cppconstructor_nodirector_call(String_or_char *name, ParmList *parms) { return Swig_cppconstructor_base_call(name, parms, 1); } -String *Swig_cppconstructor_director_call(const_String_or_char_ptr name, ParmList *parms) { +String *Swig_cppconstructor_director_call(String_or_char *name, ParmList *parms) { return Swig_cppconstructor_base_call(name, parms, 0); } @@ -676,7 +683,7 @@ String *Swig_cppdestructor_call(Node *n) { * * ----------------------------------------------------------------------------- */ -String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref) { +String *Swig_cmemberset_call(String_or_char *name, SwigType *type, String_or_char *self, int varcref) { String *func; String *pname0 = Swig_cparm_name(0, 0); String *pname1 = Swig_cparm_name(0, 1); @@ -711,7 +718,7 @@ String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, Stri * * ----------------------------------------------------------------------------- */ -String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref) { +String *Swig_cmemberget_call(const String_or_char *name, SwigType *t, String_or_char *self, int varcref) { String *func; String *call; String *pname0 = Swig_cparm_name(0, 0); @@ -1203,7 +1210,7 @@ int Swig_DestructorToFunction(Node *n, String *classname, int cplus, int flags) * This function creates a C wrapper for setting a structure member. * ----------------------------------------------------------------------------- */ -int Swig_MembersetToFunction(Node *n, String *classname, int flags, String **call) { +int Swig_MembersetToFunction(Node *n, String *classname, int flags) { String *name; ParmList *parms; Parm *p; @@ -1251,21 +1258,23 @@ int Swig_MembersetToFunction(Node *n, String *classname, int flags, String **cal Delete(p); if (flags & CWRAP_EXTEND) { + String *call; String *cres; String *code = Getattr(n, "code"); if (code) { /* I don't think this ever gets run - WSF */ Swig_add_extension_code(n, mangled, parms, void_type, code, cparse_cplusplus, "self"); } - *call = Swig_cfunction_call(mangled, parms); - cres = NewStringf("%s;", *call); + call = Swig_cfunction_call(mangled, parms); + cres = NewStringf("%s;", call); Setattr(n, "wrap:action", cres); + Delete(call); Delete(cres); } else { - String *cres; - *call = Swig_cmemberset_call(name, type, self, varcref); - cres = NewStringf("%s;", *call); + String *call = Swig_cmemberset_call(name, type, self, varcref); + String *cres = NewStringf("%s;", call); Setattr(n, "wrap:action", cres); + Delete(call); Delete(cres); } Setattr(n, "type", void_type); diff --git a/Source/Swig/error.c b/Source/Swig/error.c index 156fe06a7..1eaba1f17 100644 --- a/Source/Swig/error.c +++ b/Source/Swig/error.c @@ -50,7 +50,7 @@ static char wrn_nnum_fmt[64]; static char err_line_fmt[64]; static char err_eof_fmt[64]; -static String *format_filename(const_String_or_char_ptr filename); +static String *format_filename(const String_or_char *filename); /* ----------------------------------------------------------------------------- * Swig_warning() @@ -58,7 +58,7 @@ static String *format_filename(const_String_or_char_ptr filename); * Issue a warning message * ----------------------------------------------------------------------------- */ -void Swig_warning(int wnum, const_String_or_char_ptr filename, int line, const char *fmt, ...) { +void Swig_warning(int wnum, const String_or_char *filename, int line, const char *fmt, ...) { String *out; char *msg; int wrn = 1; @@ -121,7 +121,7 @@ void Swig_warning(int wnum, const_String_or_char_ptr filename, int line, const c * Issue an error message * ----------------------------------------------------------------------------- */ -void Swig_error(const_String_or_char_ptr filename, int line, const char *fmt, ...) { +void Swig_error(const String_or_char *filename, int line, const char *fmt, ...) { va_list ap; String *formatted_filename = NULL; @@ -170,7 +170,7 @@ void Swig_error_silent(int s) { * Takes a comma separate list of warning numbers and puts in the filter. * ----------------------------------------------------------------------------- */ -void Swig_warnfilter(const_String_or_char_ptr wlist, int add) { +void Swig_warnfilter(const String_or_char *wlist, int add) { char *c; char *cw; String *s; @@ -268,7 +268,7 @@ void Swig_error_msg_format(ErrorMessageFormat format) { * * Remove double backslashes in Windows filename paths for display * ----------------------------------------------------------------------------- */ -static String *format_filename(const_String_or_char_ptr filename) { +static String *format_filename(const String_or_char *filename) { String *formatted_filename = NewString(filename); #if defined(_WIN32) Replaceall(formatted_filename, "\\\\", "\\"); diff --git a/Source/Swig/getopt.c b/Source/Swig/getopt.c index cbd051d9f..87b0f7c9d 100644 --- a/Source/Swig/getopt.c +++ b/Source/Swig/getopt.c @@ -100,7 +100,7 @@ void Swig_check_options(int check_input) { * Generates a generic error message and exits. * ----------------------------------------------------------------------------- */ -void Swig_arg_error(void) { +void Swig_arg_error() { Printf(stderr, "SWIG : Unable to parse command line options.\n"); Printf(stderr, "Use 'swig -help' for available options.\n"); exit(1); diff --git a/Source/Swig/include.c b/Source/Swig/include.c index f42eb5d45..3f47be15b 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -33,7 +33,7 @@ int Swig_get_push_dir(void) { * Adds a directory to the SWIG search path. * ----------------------------------------------------------------------------- */ -List *Swig_add_directory(const_String_or_char_ptr dirname) { +List *Swig_add_directory(const String_or_char *dirname) { String *adirname; if (!directories) directories = NewList(); @@ -53,7 +53,7 @@ List *Swig_add_directory(const_String_or_char_ptr dirname) { * the preprocessor to grab files in the same directory as other included files. * ----------------------------------------------------------------------------- */ -void Swig_push_directory(const_String_or_char_ptr dirname) { +void Swig_push_directory(const String_or_char *dirname) { String *pdirname; if (!Swig_get_push_dir()) return; @@ -73,7 +73,7 @@ void Swig_push_directory(const_String_or_char_ptr dirname) { * the preprocessor. * ----------------------------------------------------------------------------- */ -void Swig_pop_directory(void) { +void Swig_pop_directory() { if (!Swig_get_push_dir()) return; if (!pdirectories) @@ -87,13 +87,13 @@ void Swig_pop_directory(void) { * Returns the full pathname of the last file opened. * ----------------------------------------------------------------------------- */ -String *Swig_last_file(void) { +String *Swig_last_file() { assert(lastpath); return lastpath; } /* ----------------------------------------------------------------------------- - * Swig_search_path_any() + * Swig_search_path() * * Returns a list of the current search paths. * ----------------------------------------------------------------------------- */ @@ -151,11 +151,10 @@ List *Swig_search_path() { /* ----------------------------------------------------------------------------- * Swig_open() * - * open a file, optionally looking for it in the include path. Returns an open - * FILE * on success. + * Looks for a file and open it. Returns an open FILE * on success. * ----------------------------------------------------------------------------- */ -static FILE *Swig_open_file(const_String_or_char_ptr name, int sysfile, int use_include_path) { +static FILE *Swig_open_any(const String_or_char *name, int sysfile) { FILE *f; String *filename; List *spath = 0; @@ -170,7 +169,7 @@ static FILE *Swig_open_file(const_String_or_char_ptr name, int sysfile, int use_ filename = NewString(cname); assert(filename); f = fopen(Char(filename), "r"); - if (!f && use_include_path) { + if (!f) { spath = Swig_search_path_any(sysfile); ilen = Len(spath); for (i = 0; i < ilen; i++) { @@ -183,21 +182,19 @@ static FILE *Swig_open_file(const_String_or_char_ptr name, int sysfile, int use_ Delete(spath); } if (f) { +#if defined(_WIN32) /* Note not on Cygwin else filename is displayed with double '/' */ + Replaceall(filename, "\\\\", "\\"); /* remove double '\' in case any already present */ + Replaceall(filename, "\\", "\\\\"); +#endif Delete(lastpath); - lastpath = Swig_filename_escape(filename); + lastpath = Copy(filename); } Delete(filename); return f; } -/* Open a file - searching the include paths to find it */ -FILE *Swig_include_open(const_String_or_char_ptr name) { - return Swig_open_file(name, 0, 1); -} - -/* Open a file - does not use include paths to find it */ -FILE *Swig_open(const_String_or_char_ptr name) { - return Swig_open_file(name, 0, 0); +FILE *Swig_open(const String_or_char *name) { + return Swig_open_any(name, 0); } @@ -233,12 +230,12 @@ String *Swig_read_file(FILE *f) { * Opens a file and returns it as a string. * ----------------------------------------------------------------------------- */ -static String *Swig_include_any(const_String_or_char_ptr name, int sysfile) { +static String *Swig_include_any(const String_or_char *name, int sysfile) { FILE *f; String *str; String *file; - f = Swig_open_file(name, sysfile, 1); + f = Swig_open_any(name, sysfile); if (!f) return 0; str = Swig_read_file(f); @@ -251,11 +248,11 @@ static String *Swig_include_any(const_String_or_char_ptr name, int sysfile) { return str; } -String *Swig_include(const_String_or_char_ptr name) { +String *Swig_include(const String_or_char *name) { return Swig_include_any(name, 0); } -String *Swig_include_sys(const_String_or_char_ptr name) { +String *Swig_include_sys(const String_or_char *name) { return Swig_include_any(name, 1); } @@ -265,10 +262,10 @@ String *Swig_include_sys(const_String_or_char_ptr name) { * Copies the contents of a file into another file * ----------------------------------------------------------------------------- */ -int Swig_insert_file(const_String_or_char_ptr filename, File *outfile) { +int Swig_insert_file(const String_or_char *filename, File *outfile) { char buffer[4096]; int nbytes; - FILE *f = Swig_include_open(filename); + FILE *f = Swig_open(filename); if (!f) return -1; @@ -289,7 +286,7 @@ int Swig_insert_file(const_String_or_char_ptr filename, File *outfile) { static Hash *named_files = 0; -void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile) { +void Swig_register_filebyname(const String_or_char *filename, File *outfile) { if (!named_files) named_files = NewHash(); Setattr(named_files, filename, outfile); @@ -301,7 +298,7 @@ void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile) * Get a named file * ----------------------------------------------------------------------------- */ -File *Swig_filebyname(const_String_or_char_ptr filename) { +File *Swig_filebyname(const String_or_char *filename) { if (!named_files) return 0; return Getattr(named_files, filename); @@ -313,7 +310,7 @@ File *Swig_filebyname(const_String_or_char_ptr filename) { * Returns the suffix of a file * ----------------------------------------------------------------------------- */ -char *Swig_file_suffix(const_String_or_char_ptr filename) { +char *Swig_file_suffix(const String_or_char *filename) { char *d; char *c = Char(filename); int len = Len(filename); @@ -335,7 +332,7 @@ char *Swig_file_suffix(const_String_or_char_ptr filename) { * Returns the filename with no suffix attached. * ----------------------------------------------------------------------------- */ -char *Swig_file_basename(const_String_or_char_ptr filename) { +char *Swig_file_basename(const String_or_char *filename) { static char tmp[1024]; char *c; strcpy(tmp, Char(filename)); @@ -349,7 +346,7 @@ char *Swig_file_basename(const_String_or_char_ptr filename) { * * Return the file with any leading path stripped off * ----------------------------------------------------------------------------- */ -char *Swig_file_filename(const_String_or_char_ptr filename) { +char *Swig_file_filename(const String_or_char *filename) { static char tmp[1024]; const char *delim = SWIG_FILE_DELIMITER; char *c; @@ -367,7 +364,7 @@ char *Swig_file_filename(const_String_or_char_ptr filename) { * * Return the name of the directory associated with a file * ----------------------------------------------------------------------------- */ -char *Swig_file_dirname(const_String_or_char_ptr filename) { +char *Swig_file_dirname(const String_or_char *filename) { static char tmp[1024]; const char *delim = SWIG_FILE_DELIMITER; char *c; diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 050e5357a..d29250517 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -54,7 +54,7 @@ const char *Swig_package_version(void) { /* ----------------------------------------------------------------------------- * Swig_banner() * - * Emits the SWIG identifying banner for the C/C++ wrapper file. + * Emits the SWIG identifying banner. * ----------------------------------------------------------------------------- */ void Swig_banner(File *f) { @@ -67,24 +67,10 @@ void Swig_banner(File *f) { * changes to this file unless you know what you are doing--modify the SWIG \n\ * interface file instead. \n", Swig_package_version()); /* String too long for ISO compliance */ - Printf(f, " * ----------------------------------------------------------------------------- */\n"); + Printf(f, " * ----------------------------------------------------------------------------- */\n\n"); } -/* ----------------------------------------------------------------------------- - * Swig_banner_target_lang() - * - * Emits a SWIG identifying banner in the target language - * ----------------------------------------------------------------------------- */ - -void Swig_banner_target_lang(File *f, const_String_or_char_ptr commentchar) { - Printf(f, "%s This file was automatically generated by SWIG (http://www.swig.org).\n", commentchar); - Printf(f, "%s Version %s\n", commentchar, Swig_package_version()); - Printf(f, "%s\n", commentchar); - Printf(f, "%s Do not make changes to this file unless you know what you are doing--modify\n", commentchar); - Printf(f, "%s the SWIG interface file instead.\n", commentchar); -} - /* ----------------------------------------------------------------------------- * Swig_strip_c_comments() * @@ -131,39 +117,6 @@ String *Swig_strip_c_comments(const String *s) { } -/* ----------------------------------------------------------------------------- - * Swig_filename_correct() - * - * Corrects filenames on non-unix systems - * ----------------------------------------------------------------------------- */ - -void Swig_filename_correct(String *filename) { - (void)filename; -#if defined(_WIN32) || defined(MACSWIG) - /* accept Unix path separator on non-Unix systems */ - Replaceall(filename, "/", SWIG_FILE_DELIMITER); -#endif -#if defined(__CYGWIN__) - /* accept Windows path separator in addition to Unix path separator */ - Replaceall(filename, "\\", SWIG_FILE_DELIMITER); -#endif -} - -/* ----------------------------------------------------------------------------- - * Swig_filename_escape() - * - * Escapes backslashes in filename - for Windows - * ----------------------------------------------------------------------------- */ - -String *Swig_filename_escape(String *filename) { - String *adjusted_filename = Copy(filename); -#if defined(_WIN32) /* Note not on Cygwin else filename is displayed with double '/' */ - Replaceall(adjusted_filename, "\\\\", "\\"); /* remove double '\' in case any already present */ - Replaceall(adjusted_filename, "\\", "\\\\"); -#endif - return adjusted_filename; -} - /* ----------------------------------------------------------------------------- * Swig_string_escape() * @@ -651,7 +604,7 @@ String *Swig_string_emangle(String *s) { * In this case, "A::B". Returns NULL if there is no base. * ----------------------------------------------------------------------------- */ -void Swig_scopename_split(const String *s, String **rprefix, String **rlast) { +void Swig_scopename_split(String *s, String **rprefix, String **rlast) { char *tmp = Char(s); char *c = tmp; char *cc = c; @@ -705,7 +658,7 @@ void Swig_scopename_split(const String *s, String **rprefix, String **rlast) { } -String *Swig_scopename_prefix(const String *s) { +String *Swig_scopename_prefix(String *s) { char *tmp = Char(s); char *c = tmp; char *cc = c; @@ -757,7 +710,7 @@ String *Swig_scopename_prefix(const String *s) { * case, "C". * ----------------------------------------------------------------------------- */ -String *Swig_scopename_last(const String *s) { +String *Swig_scopename_last(String *s) { char *tmp = Char(s); char *c = tmp; char *cc = c; @@ -801,7 +754,7 @@ String *Swig_scopename_last(const String *s) { * In this case, "A". Returns NULL if there is no base. * ----------------------------------------------------------------------------- */ -String *Swig_scopename_first(const String *s) { +String *Swig_scopename_first(String *s) { char *tmp = Char(s); char *c = tmp; char *co = 0; @@ -851,7 +804,7 @@ String *Swig_scopename_first(const String *s) { * In this case, "B::C". Returns NULL if there is no suffix. * ----------------------------------------------------------------------------- */ -String *Swig_scopename_suffix(const String *s) { +String *Swig_scopename_suffix(String *s) { char *tmp = Char(s); char *c = tmp; char *co = 0; @@ -895,7 +848,7 @@ String *Swig_scopename_suffix(const String *s) { * Checks to see if a name is qualified with a scope name * ----------------------------------------------------------------------------- */ -int Swig_scopename_check(const String *s) { +int Swig_scopename_check(String *s) { char *c = Char(s); char *co = strstr(c, "operator "); @@ -973,37 +926,6 @@ String *Swig_string_command(String *s) { } -/* ----------------------------------------------------------------------------- - * Swig_string_strip() - * - * Strip given prefix from identifiers - * - * Printf(stderr,"%(strip:[wx])s","wxHello") -> Hello - * ----------------------------------------------------------------------------- */ - -String *Swig_string_strip(String *s) { - String *ns; - if (!Len(s)) { - ns = NewString(s); - } else { - const char *cs = Char(s); - const char *ce = Strchr(cs, ']'); - if (*cs != '[' || ce == NULL) { - ns = NewString(s); - } else { - String *fmt = NewStringf("%%.%ds", ce-cs-1); - String *prefix = NewStringf(fmt, cs+1); - if (0 == Strncmp(ce+1, prefix, Len(prefix))) { - ns = NewString(ce+1+Len(prefix)); - } else { - ns = NewString(ce+1); - } - } - } - return ns; -} - - /* ----------------------------------------------------------------------------- * Swig_string_rxspencer() * @@ -1131,7 +1053,6 @@ void Swig_init() { DohEncoding("command", Swig_string_command); DohEncoding("rxspencer", Swig_string_rxspencer); DohEncoding("schemify", Swig_string_schemify); - DohEncoding("strip", Swig_string_strip); /* aliases for the case encoders */ DohEncoding("uppercase", Swig_string_upper); diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 013ce5929..f34a24612 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -27,13 +27,13 @@ static Hash *naming_hash = 0; * Register a new naming format. * ----------------------------------------------------------------------------- */ -void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format) { +void Swig_name_register(const String_or_char *method, const String_or_char *format) { if (!naming_hash) naming_hash = NewHash(); Setattr(naming_hash, method, format); } -void Swig_name_unregister(const_String_or_char_ptr method) { +void Swig_name_unregister(const String_or_char *method) { if (naming_hash) { Delattr(naming_hash, method); } @@ -127,7 +127,7 @@ static int name_mangle(String *r) { * Converts all of the non-identifier characters of a string to underscores. * ----------------------------------------------------------------------------- */ -String *Swig_name_mangle(const_String_or_char_ptr s) { +String *Swig_name_mangle(const String_or_char *s) { #if 0 String *r = NewString(s); name_mangle(r); @@ -143,7 +143,7 @@ String *Swig_name_mangle(const_String_or_char_ptr s) { * Returns the name of a wrapper function. * ----------------------------------------------------------------------------- */ -String *Swig_name_wrapper(const_String_or_char_ptr fname) { +String *Swig_name_wrapper(const String_or_char *fname) { String *r; String *f; @@ -168,7 +168,7 @@ String *Swig_name_wrapper(const_String_or_char_ptr fname) { * Returns the name of a class method. * ----------------------------------------------------------------------------- */ -String *Swig_name_member(const_String_or_char_ptr classname, const_String_or_char_ptr mname) { +String *Swig_name_member(const String_or_char *classname, const String_or_char *mname) { String *r; String *f; String *rclassname; @@ -201,7 +201,7 @@ String *Swig_name_member(const_String_or_char_ptr classname, const_String_or_cha * Returns the name of the accessor function used to get a variable. * ----------------------------------------------------------------------------- */ -String *Swig_name_get(const_String_or_char_ptr vname) { +String *Swig_name_get(const String_or_char *vname) { String *r; String *f; @@ -229,7 +229,7 @@ String *Swig_name_get(const_String_or_char_ptr vname) { * Returns the name of the accessor function used to set a variable. * ----------------------------------------------------------------------------- */ -String *Swig_name_set(const_String_or_char_ptr vname) { +String *Swig_name_set(const String_or_char *vname) { String *r; String *f; @@ -253,7 +253,7 @@ String *Swig_name_set(const_String_or_char_ptr vname) { * Returns the name of the accessor function used to create an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_construct(const_String_or_char_ptr classname) { +String *Swig_name_construct(const String_or_char *classname) { String *r; String *f; String *rclassname; @@ -286,7 +286,7 @@ String *Swig_name_construct(const_String_or_char_ptr classname) { * Returns the name of the accessor function used to copy an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_copyconstructor(const_String_or_char_ptr classname) { +String *Swig_name_copyconstructor(const String_or_char *classname) { String *r; String *f; String *rclassname; @@ -319,7 +319,7 @@ String *Swig_name_copyconstructor(const_String_or_char_ptr classname) { * Returns the name of the accessor function used to destroy an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_destroy(const_String_or_char_ptr classname) { +String *Swig_name_destroy(const String_or_char *classname) { String *r; String *f; String *rclassname; @@ -351,7 +351,7 @@ String *Swig_name_destroy(const_String_or_char_ptr classname) { * Returns the name of the accessor function used to disown an object. * ----------------------------------------------------------------------------- */ -String *Swig_name_disown(const_String_or_char_ptr classname) { +String *Swig_name_disown(const String_or_char *classname) { String *r; String *f; String *rclassname; @@ -600,7 +600,7 @@ static void merge_features(Hash *features, Node *n) { * ----------------------------------------------------------------------------- */ static -void features_get(Hash *features, const String *tname, SwigType *decl, SwigType *ncdecl, Node *node) { +void features_get(Hash *features, String *tname, SwigType *decl, SwigType *ncdecl, Node *node) { Node *n = Getattr(features, tname); #ifdef SWIG_DEBUG Printf(stdout, " features_get: %s\n", tname); @@ -655,7 +655,7 @@ void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *d } #ifdef SWIG_DEBUG - Printf(stdout, "Swig_features_get: '%s' '%s' '%s'\n", prefix, name, decl); + Printf(stdout, "Swig_features_get: %s %s %s\n", prefix, name, decl); #endif /* Global features */ @@ -727,12 +727,12 @@ void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *d * concatenating the feature name plus ':' plus the attribute name. * ----------------------------------------------------------------------------- */ -void Swig_feature_set(Hash *features, const_String_or_char_ptr name, SwigType *decl, const_String_or_char_ptr featurename, String *value, Hash *featureattribs) { +void Swig_feature_set(Hash *features, const String_or_char *name, SwigType *decl, const String_or_char *featurename, String *value, Hash *featureattribs) { Hash *n; Hash *fhash; #ifdef SWIG_DEBUG - Printf(stdout, "Swig_feature_set: '%s' '%s' '%s' '%s'\n", name, decl, featurename, value); + Printf(stdout, "Swig_feature_set: %s %s %s %s\n", name, decl, featurename, value); #endif n = Getattr(features, name); @@ -1436,7 +1436,7 @@ static String *apply_rename(String *newname, int fullname, String *prefix, Strin * * ----------------------------------------------------------------------------- */ -String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, SwigType *decl, String *oldname) { +String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType *decl, String *oldname) { String *nname = 0; String *result = 0; String *name = NewString(cname); diff --git a/Source/Swig/parms.c b/Source/Swig/parms.c index 9b58f5fcb..baa1dfbf3 100644 --- a/Source/Swig/parms.c +++ b/Source/Swig/parms.c @@ -17,7 +17,7 @@ char cvsroot_parms_c[] = "$Id$"; * Create a new parameter from datatype 'type' and name 'name'. * ------------------------------------------------------------------------ */ -Parm *NewParm(SwigType *type, const_String_or_char_ptr name) { +Parm *NewParm(SwigType *type, const String_or_char *name) { Parm *p = NewHash(); set_nodeType(p, "parm"); if (type) { diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 53f1ad4a0..06e78db37 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -15,9 +15,6 @@ char cvsroot_scanner_c[] = "$Id$"; #include "swig.h" #include -extern String *cparse_file; -extern int cparse_start_line; - struct Scanner { String *text; /* Current token value */ List *scanobjs; /* Objects being scanned */ @@ -39,7 +36,7 @@ struct Scanner { * Create a new scanner object * ----------------------------------------------------------------------------- */ -Scanner *NewScanner(void) { +Scanner *NewScanner() { Scanner *s; s = (Scanner *) malloc(sizeof(Scanner)); s->line = 1; @@ -118,11 +115,11 @@ void Scanner_push(Scanner * s, String *txt) { * call to Scanner_token(). * ----------------------------------------------------------------------------- */ -void Scanner_pushtoken(Scanner * s, int nt, const_String_or_char_ptr val) { +void Scanner_pushtoken(Scanner * s, int nt, const String_or_char *val) { assert(s); assert((nt >= 0) && (nt < SWIG_MAXTOKENS)); s->nexttoken = nt; - if ( Char(val) != Char(s->text) ) { + if (val != s->text) { Clear(s->text); Append(s->text,val); } @@ -212,7 +209,7 @@ static char nextchar(Scanner * s) { * Sets error information on the scanner. * ----------------------------------------------------------------------------- */ -static void set_error(Scanner *s, int line, const_String_or_char_ptr msg) { +static void set_error(Scanner *s, int line, String_or_char *msg) { s->error_line = line; s->error = NewString(msg); } @@ -539,7 +536,7 @@ static int look(Scanner * s) { break; case 10: /* C++ style comment */ if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n"); + set_error(s,s->start_line,"Unterminated comment"); return SWIG_TOKEN_ERROR; } if (c == '\n') { @@ -551,7 +548,7 @@ static int look(Scanner * s) { break; case 11: /* C style comment block */ if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n"); + set_error(s,s->start_line,"Unterminated comment"); return SWIG_TOKEN_ERROR; } if (c == '*') { @@ -562,7 +559,7 @@ static int look(Scanner * s) { break; case 12: /* Still in C style comment */ if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated comment\n"); + set_error(s,s->start_line,"Unterminated comment"); return SWIG_TOKEN_ERROR; } if (c == '*') { @@ -576,7 +573,7 @@ static int look(Scanner * s) { case 2: /* Processing a string */ if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated string\n"); + set_error(s,s->start_line, "Unterminated string"); return SWIG_TOKEN_ERROR; } if (c == '\"') { @@ -659,7 +656,7 @@ static int look(Scanner * s) { case 40: /* Process an include block */ if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated block\n"); + set_error(s,s->start_line,"Unterminated code block"); return SWIG_TOKEN_ERROR; } if (c == '%') @@ -936,7 +933,7 @@ static int look(Scanner * s) { /* A character constant */ case 9: if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated character constant\n"); + set_error(s,s->start_line,"Unterminated character constant"); return SWIG_TOKEN_ERROR; } if (c == '\'') { @@ -1051,7 +1048,7 @@ static int look(Scanner * s) { /* Reverse string */ case 900: if ((c = nextchar(s)) == 0) { - Swig_error(cparse_file, cparse_start_line, "Unterminated character constant\n"); + set_error(s,s->start_line,"Unterminated character constant"); return SWIG_TOKEN_ERROR; } if (c == '`') { diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index 8a7700bec..b6960f4d6 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -270,6 +270,20 @@ int SwigType_issimple(SwigType *t) { return 1; } +int SwigType_isbuiltin(SwigType *t) { + const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; + int i = 0; + char *c = Char(t); + if (!t) + return 0; + while (builtins[i]) { + if (strcmp(c, builtins[i]) == 0) + return 1; + i++; + } + return 0; +} + /* ----------------------------------------------------------------------------- * SwigType_default() * @@ -537,7 +551,7 @@ String *SwigType_namestr(const SwigType *t) { * Create a C string representation of a datatype. * ----------------------------------------------------------------------------- */ -String *SwigType_str(SwigType *s, const_String_or_char_ptr id) { +String *SwigType_str(SwigType *s, const String_or_char *id) { String *result; String *element = 0, *nextelement; List *elements; @@ -732,7 +746,7 @@ SwigType *SwigType_ltype(SwigType *s) { * with an equivalent assignable version. * -------------------------------------------------------------------- */ -String *SwigType_lstr(SwigType *s, const_String_or_char_ptr id) { +String *SwigType_lstr(SwigType *s, const String_or_char *id) { String *result; SwigType *tc; @@ -749,7 +763,7 @@ String *SwigType_lstr(SwigType *s, const_String_or_char_ptr id) { * datatype printed by str(). * ----------------------------------------------------------------------------- */ -String *SwigType_rcaststr(SwigType *s, const_String_or_char_ptr name) { +String *SwigType_rcaststr(SwigType *s, const String_or_char *name) { String *result, *cast; String *element = 0, *nextelement; SwigType *td, *rs, *tc = 0; @@ -892,7 +906,7 @@ String *SwigType_rcaststr(SwigType *s, const_String_or_char_ptr name) { * Casts a variable from the real type to the local datatype. * ----------------------------------------------------------------------------- */ -String *SwigType_lcaststr(SwigType *s, const_String_or_char_ptr name) { +String *SwigType_lcaststr(SwigType *s, const String_or_char *name) { String *result; result = NewStringEmpty(); diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 2b2c797c9..20bd95e6a 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -110,15 +110,15 @@ extern "C" { extern SwigType *NewSwigType(int typecode); extern SwigType *SwigType_del_element(SwigType *t); extern SwigType *SwigType_add_pointer(SwigType *t); - extern SwigType *SwigType_add_memberpointer(SwigType *t, const_String_or_char_ptr qual); + extern SwigType *SwigType_add_memberpointer(SwigType *t, const String_or_char *qual); extern SwigType *SwigType_del_memberpointer(SwigType *t); extern SwigType *SwigType_del_pointer(SwigType *t); - extern SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size); + extern SwigType *SwigType_add_array(SwigType *t, const String_or_char *size); extern SwigType *SwigType_del_array(SwigType *t); extern SwigType *SwigType_pop_arrays(SwigType *t); extern SwigType *SwigType_add_reference(SwigType *t); extern SwigType *SwigType_del_reference(SwigType *t); - extern SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual); + extern SwigType *SwigType_add_qualifier(SwigType *t, const String_or_char *qual); extern SwigType *SwigType_del_qualifier(SwigType *t); extern SwigType *SwigType_add_function(SwigType *t, ParmList *parms); extern SwigType *SwigType_add_template(SwigType *t, ParmList *parms); @@ -129,10 +129,10 @@ extern "C" { extern void SwigType_push(SwigType *t, SwigType *s); extern List *SwigType_parmlist(const SwigType *p); extern String *SwigType_parm(String *p); - extern String *SwigType_str(SwigType *s, const_String_or_char_ptr id); - extern String *SwigType_lstr(SwigType *s, const_String_or_char_ptr id); - extern String *SwigType_rcaststr(SwigType *s, const_String_or_char_ptr id); - extern String *SwigType_lcaststr(SwigType *s, const_String_or_char_ptr id); + extern String *SwigType_str(SwigType *s, const String_or_char *id); + extern String *SwigType_lstr(SwigType *s, const String_or_char *id); + extern String *SwigType_rcaststr(SwigType *s, const String_or_char *id); + extern String *SwigType_lcaststr(SwigType *s, const String_or_char *id); extern String *SwigType_manglestr(SwigType *t); extern SwigType *SwigType_ltype(SwigType *t); extern int SwigType_ispointer(SwigType *t); @@ -151,7 +151,8 @@ extern "C" { extern int SwigType_isvarargs(const SwigType *t); extern int SwigType_istemplate(const SwigType *t); extern int SwigType_isenum(SwigType *t); - extern int SwigType_check_decl(SwigType *t, const_String_or_char_ptr decl); + extern int SwigType_isbuiltin(SwigType *t); + extern int SwigType_check_decl(SwigType *t, const String_or_char *decl); extern SwigType *SwigType_strip_qualifiers(SwigType *t); extern SwigType *SwigType_functionpointer_decompose(SwigType *t); extern String *SwigType_base(const SwigType *t); @@ -162,7 +163,7 @@ extern "C" { extern String *SwigType_prefix(const SwigType *t); extern int SwigType_array_ndim(SwigType *t); extern String *SwigType_array_getdim(SwigType *t, int n); - extern void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep); + extern void SwigType_array_setdim(SwigType *t, int n, const String_or_char *rep); extern SwigType *SwigType_array_type(SwigType *t); extern String *SwigType_default(SwigType *t); extern void SwigType_typename_replace(SwigType *t, String *pat, String *rep); @@ -173,27 +174,27 @@ extern "C" { /* --- Type-system managment --- */ extern void SwigType_typesystem_init(void); - extern int SwigType_typedef(SwigType *type, const_String_or_char_ptr name); - extern int SwigType_typedef_class(const_String_or_char_ptr name); - extern int SwigType_typedef_using(const_String_or_char_ptr qname); + extern int SwigType_typedef(SwigType *type, String_or_char *name); + extern int SwigType_typedef_class(String_or_char *name); + extern int SwigType_typedef_using(String_or_char *qname); extern void SwigType_inherit(String *subclass, String *baseclass, String *cast, String *conversioncode); extern int SwigType_issubtype(SwigType *subtype, SwigType *basetype); extern void SwigType_scope_alias(String *aliasname, Typetab *t); extern void SwigType_using_scope(Typetab *t); - extern void SwigType_new_scope(const_String_or_char_ptr name); + extern void SwigType_new_scope(const String_or_char *name); extern void SwigType_inherit_scope(Typetab *scope); extern Typetab *SwigType_pop_scope(void); extern Typetab *SwigType_set_scope(Typetab *h); extern void SwigType_print_scope(Typetab *t); - extern SwigType *SwigType_typedef_resolve(const SwigType *t); + extern SwigType *SwigType_typedef_resolve(SwigType *t); extern SwigType *SwigType_typedef_resolve_all(SwigType *t); extern SwigType *SwigType_typedef_qualified(SwigType *t); extern int SwigType_istypedef(SwigType *t); extern int SwigType_isclass(SwigType *t); extern void SwigType_attach_symtab(Symtab *syms); extern void SwigType_remember(SwigType *t); - extern void SwigType_remember_clientdata(SwigType *t, const_String_or_char_ptr clientdata); - extern void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr clientdata); + extern void SwigType_remember_clientdata(SwigType *t, const String_or_char *clientdata); + extern void SwigType_remember_mangleddata(String *mangled, const String_or_char *clientdata); extern void (*SwigType_remember_trace(void (*tf) (SwigType *, String *, String *))) (SwigType *, String *, String *); extern void SwigType_emit_type_table(File *f_headers, File *f_table); extern int SwigType_type(SwigType *t); @@ -201,25 +202,25 @@ extern "C" { /* --- Symbol table module --- */ extern void Swig_symbol_init(void); - extern void Swig_symbol_setscopename(const_String_or_char_ptr name); + extern void Swig_symbol_setscopename(const String_or_char *name); extern String *Swig_symbol_getscopename(void); extern String *Swig_symbol_qualifiedscopename(Symtab *symtab); extern Symtab *Swig_symbol_newscope(void); extern Symtab *Swig_symbol_setscope(Symtab *); - extern Symtab *Swig_symbol_getscope(const_String_or_char_ptr symname); + extern Symtab *Swig_symbol_getscope(const String_or_char *symname); extern Symtab *Swig_symbol_current(void); extern Symtab *Swig_symbol_popscope(void); - extern Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *node); - extern void Swig_symbol_cadd(const_String_or_char_ptr symname, Node *node); - extern Node *Swig_symbol_clookup(const_String_or_char_ptr symname, Symtab *tab); - extern Node *Swig_symbol_clookup_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *)); - extern Symtab *Swig_symbol_cscope(const_String_or_char_ptr symname, Symtab *tab); - extern Node *Swig_symbol_clookup_local(const_String_or_char_ptr symname, Symtab *tab); - extern Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *)); + extern Node *Swig_symbol_add(String_or_char *symname, Node *node); + extern void Swig_symbol_cadd(String_or_char *symname, Node *node); + extern Node *Swig_symbol_clookup(String_or_char *symname, Symtab *tab); + extern Node *Swig_symbol_clookup_check(String_or_char *symname, Symtab *tab, int (*check) (Node *)); + extern Symtab *Swig_symbol_cscope(String_or_char *symname, Symtab *tab); + extern Node *Swig_symbol_clookup_local(String_or_char *symname, Symtab *tab); + extern Node *Swig_symbol_clookup_local_check(String_or_char *symname, Symtab *tab, int (*check) (Node *)); extern String *Swig_symbol_qualified(Node *node); extern Node *Swig_symbol_isoverloaded(Node *node); extern void Swig_symbol_remove(Node *node); - extern void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *tab); + extern void Swig_symbol_alias(String_or_char *aliasname, Symtab *tab); extern void Swig_symbol_inherit(Symtab *tab); extern SwigType *Swig_symbol_type_qualify(const SwigType *ty, Symtab *tab); extern String *Swig_symbol_string_qualify(String *s, Symtab *tab); @@ -246,17 +247,17 @@ extern int ParmList_is_compactdefargs(ParmList *p); /* --- Naming functions --- */ - extern void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format); - extern void Swig_name_unregister(const_String_or_char_ptr method); - extern String *Swig_name_mangle(const_String_or_char_ptr s); - extern String *Swig_name_wrapper(const_String_or_char_ptr fname); - extern String *Swig_name_member(const_String_or_char_ptr classname, const_String_or_char_ptr mname); - extern String *Swig_name_get(const_String_or_char_ptr vname); - extern String *Swig_name_set(const_String_or_char_ptr vname); - extern String *Swig_name_construct(const_String_or_char_ptr classname); - extern String *Swig_name_copyconstructor(const_String_or_char_ptr classname); - extern String *Swig_name_destroy(const_String_or_char_ptr classname); - extern String *Swig_name_disown(const_String_or_char_ptr classname); + extern void Swig_name_register(const String_or_char *method, const String_or_char *format); + extern void Swig_name_unregister(const String_or_char *method); + extern String *Swig_name_mangle(const String_or_char *s); + extern String *Swig_name_wrapper(const String_or_char *fname); + extern String *Swig_name_member(const String_or_char *classname, const String_or_char *mname); + extern String *Swig_name_get(const String_or_char *vname); + extern String *Swig_name_set(const String_or_char *vname); + extern String *Swig_name_construct(const String_or_char *classname); + extern String *Swig_name_copyconstructor(const String_or_char *classname); + extern String *Swig_name_destroy(const String_or_char *classname); + extern String *Swig_name_disown(const String_or_char *classname); extern void Swig_naming_init(void); extern void Swig_name_namewarn_add(String *prefix, String *name, SwigType *decl, Hash *namewrn); @@ -267,36 +268,33 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern int Swig_need_name_warning(Node *n); extern int Swig_need_redefined_warn(Node *a, Node *b, int InClass); - extern String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, SwigType *decl, String *oldname); + extern String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType *decl, String *oldname); extern String *Swig_name_warning(Node *n, String *prefix, String *name, SwigType *decl); extern String *Swig_name_decl(Node *n); extern String *Swig_name_fulldecl(Node *n); /* --- parameterized rename functions --- */ - extern void Swig_name_object_set(Hash *namehash, String *name, SwigType *decl, DOH *object); - extern DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *decl); + extern void Swig_name_object_set(Hash *namehash, String_or_char *name, SwigType *decl, DOH *object); + extern DOH *Swig_name_object_get(Hash *namehash, String_or_char *prefix, String_or_char *name, SwigType *decl); extern void Swig_name_object_inherit(Hash *namehash, String *base, String *derived); - extern void Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl, Node *n); - extern void Swig_feature_set(Hash *features, const_String_or_char_ptr name, SwigType *decl, const_String_or_char_ptr featurename, String *value, Hash *featureattribs); + extern void Swig_features_get(Hash *features, String_or_char *prefix, String_or_char *name, SwigType *decl, Node *n); + extern void Swig_feature_set(Hash *features, const String_or_char *name, SwigType *decl, const String_or_char *featurename, String *value, Hash *featureattribs); /* --- Misc --- */ extern char *Swig_copy_string(const char *c); extern void Swig_set_fakeversion(const char *version); extern const char *Swig_package_version(void); extern void Swig_banner(File *f); - extern void Swig_banner_target_lang(File *f, const_String_or_char_ptr commentchar); extern String *Swig_strip_c_comments(const String *s); - extern String *Swig_filename_escape(String *filename); - extern void Swig_filename_correct(String *filename); extern String *Swig_string_escape(String *s); extern String *Swig_string_mangle(const String *s); - extern void Swig_scopename_split(const String *s, String **prefix, String **last); - extern String *Swig_scopename_prefix(const String *s); - extern String *Swig_scopename_last(const String *s); - extern String *Swig_scopename_first(const String *s); - extern String *Swig_scopename_suffix(const String *s); - extern int Swig_scopename_check(const String *s); + extern void Swig_scopename_split(String *s, String **prefix, String **last); + extern String *Swig_scopename_prefix(String *s); + extern String *Swig_scopename_last(String *s); + extern String *Swig_scopename_first(String *s); + extern String *Swig_scopename_suffix(String *s); + extern int Swig_scopename_check(String *s); extern String *Swig_string_lower(String *s); extern String *Swig_string_upper(String *s); extern String *Swig_string_title(String *s); @@ -311,11 +309,11 @@ extern int ParmList_is_compactdefargs(ParmList *p); typedef enum { EMF_STANDARD, EMF_MICROSOFT } ErrorMessageFormat; - extern void Swig_warning(int num, const_String_or_char_ptr filename, int line, const char *fmt, ...); - extern void Swig_error(const_String_or_char_ptr filename, int line, const char *fmt, ...); + extern void Swig_warning(int num, const String_or_char *filename, int line, const char *fmt, ...); + extern void Swig_error(const String_or_char *filename, int line, const char *fmt, ...); extern int Swig_error_count(void); extern void Swig_error_silent(int s); - extern void Swig_warnfilter(const_String_or_char_ptr wlist, int val); + extern void Swig_warnfilter(const String_or_char *wlist, int val); extern void Swig_warnall(void); extern int Swig_warn_count(void); extern void Swig_error_msg_format(ErrorMessageFormat format); @@ -324,17 +322,17 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern String *Swig_cparm_name(Parm *p, int i); extern String *Swig_wrapped_var_type(SwigType *t, int varcref); extern int Swig_cargs(Wrapper *w, ParmList *l); - extern String *Swig_cresult(SwigType *t, const_String_or_char_ptr name, const_String_or_char_ptr decl); + extern String *Swig_cresult(SwigType *t, const String_or_char *name, const String_or_char *decl); - extern String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms); - extern String *Swig_cconstructor_call(const_String_or_char_ptr name); - extern String *Swig_cppconstructor_call(const_String_or_char_ptr name, ParmList *parms); + extern String *Swig_cfunction_call(String_or_char *name, ParmList *parms); + extern String *Swig_cconstructor_call(String_or_char *name); + extern String *Swig_cppconstructor_call(String_or_char *name, ParmList *parms); extern String *Swig_unref_call(Node *n); extern String *Swig_ref_call(Node *n, const String *lname); extern String *Swig_cdestructor_call(Node *n); extern String *Swig_cppdestructor_call(Node *n); - extern String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref); - extern String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref); + extern String *Swig_cmemberset_call(String_or_char *name, SwigType *type, String_or_char *self, int varcref); + extern String *Swig_cmemberget_call(const String_or_char *name, SwigType *t, String_or_char *self, int varcref); extern int Swig_add_extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self); @@ -343,7 +341,7 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern int Swig_MethodToFunction(Node *n, String *classname, int flags, SwigType *director_type, int is_director); extern int Swig_ConstructorToFunction(Node *n, String *classname, String *none_comparison, String *director_ctor, int cplus, int flags); extern int Swig_DestructorToFunction(Node *n, String *classname, int cplus, int flags); - extern int Swig_MembersetToFunction(Node *n, String *classname, int flags, String **call); + extern int Swig_MembersetToFunction(Node *n, String *classname, int flags); extern int Swig_MembergetToFunction(Node *n, String *classname, int flags); extern int Swig_VargetToFunction(Node *n, int flags); extern int Swig_VarsetToFunction(Node *n, int flags); @@ -363,22 +361,22 @@ extern int ParmList_is_compactdefargs(ParmList *p); /* --- Legacy Typemap API (somewhat simplified, ha!) --- */ extern void Swig_typemap_init(void); - extern void Swig_typemap_register(const_String_or_char_ptr op, ParmList *pattern, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs); - extern int Swig_typemap_copy(const_String_or_char_ptr op, ParmList *srcpattern, ParmList *pattern); - extern void Swig_typemap_clear(const_String_or_char_ptr op, ParmList *pattern); + extern void Swig_typemap_register(const String_or_char *op, ParmList *pattern, String_or_char *code, ParmList *locals, ParmList *kwargs); + extern int Swig_typemap_copy(const String_or_char *op, ParmList *srcpattern, ParmList *pattern); + extern void Swig_typemap_clear(const String_or_char *op, ParmList *pattern); extern int Swig_typemap_apply(ParmList *srcpat, ParmList *destpat); extern void Swig_typemap_clear_apply(ParmList *pattern); extern void Swig_typemap_debug(void); - extern Hash *Swig_typemap_search(const_String_or_char_ptr op, SwigType *type, const_String_or_char_ptr pname, SwigType **matchtype); - extern Hash *Swig_typemap_search_multi(const_String_or_char_ptr op, ParmList *parms, int *nmatch); - extern String *Swig_typemap_lookup(const_String_or_char_ptr op, Node *n, const_String_or_char_ptr lname, Wrapper *f); - extern String *Swig_typemap_lookup_out(const_String_or_char_ptr op, Node *n, const_String_or_char_ptr lname, Wrapper *f, String *actioncode); - extern void Swig_typemap_attach_kwargs(Hash *tm, const_String_or_char_ptr op, Parm *p); + extern Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String_or_char *pname, SwigType **matchtype); + extern Hash *Swig_typemap_search_multi(const String_or_char *op, ParmList *parms, int *nmatch); + extern String *Swig_typemap_lookup(const String_or_char *op, Node *n, const String_or_char *lname, Wrapper *f); + extern String *Swig_typemap_lookup_out(const String_or_char *op, Node *n, const String_or_char *lname, Wrapper *f, String *actioncode); + extern void Swig_typemap_attach_kwargs(Hash *tm, const String_or_char *op, Parm *p); extern void Swig_typemap_new_scope(void); extern Hash *Swig_typemap_pop_scope(void); - extern void Swig_typemap_attach_parms(const_String_or_char_ptr op, ParmList *parms, Wrapper *f); + extern void Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f); /* --- Code fragment support --- */ diff --git a/Source/Swig/swigfile.h b/Source/Swig/swigfile.h index 92c7945e6..c945fb1ac 100644 --- a/Source/Swig/swigfile.h +++ b/Source/Swig/swigfile.h @@ -9,25 +9,24 @@ /* $Id: swig.h 9603 2006-12-05 21:47:01Z beazley $ */ -extern List *Swig_add_directory(const_String_or_char_ptr dirname); -extern void Swig_push_directory(const_String_or_char_ptr dirname); -extern void Swig_pop_directory(void); -extern String *Swig_last_file(void); -extern List *Swig_search_path(void); -extern FILE *Swig_include_open(const_String_or_char_ptr name); -extern FILE *Swig_open(const_String_or_char_ptr name); +extern List *Swig_add_directory(const String_or_char *dirname); +extern void Swig_push_directory(const String_or_char *dirname); +extern void Swig_pop_directory(); +extern String *Swig_last_file(); +extern List *Swig_search_path(); +extern FILE *Swig_open(const String_or_char *name); extern String *Swig_read_file(FILE *f); -extern String *Swig_include(const_String_or_char_ptr name); -extern String *Swig_include_sys(const_String_or_char_ptr name); -extern int Swig_insert_file(const_String_or_char_ptr name, File *outfile); +extern String *Swig_include(const String_or_char *name); +extern String *Swig_include_sys(const String_or_char *name); +extern int Swig_insert_file(const String_or_char *name, File *outfile); extern void Swig_set_push_dir(int dopush); extern int Swig_get_push_dir(void); -extern void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile); -extern File *Swig_filebyname(const_String_or_char_ptr filename); -extern char *Swig_file_suffix(const_String_or_char_ptr filename); -extern char *Swig_file_basename(const_String_or_char_ptr filename); -extern char *Swig_file_filename(const_String_or_char_ptr filename); -extern char *Swig_file_dirname(const_String_or_char_ptr filename); +extern void Swig_register_filebyname(const String_or_char *filename, File *outfile); +extern File *Swig_filebyname(const String_or_char *filename); +extern char *Swig_file_suffix(const String_or_char *filename); +extern char *Swig_file_basename(const String_or_char *filename); +extern char *Swig_file_filename(const String_or_char *filename); +extern char *Swig_file_dirname(const String_or_char *filename); /* Delimiter used in accessing files and directories */ diff --git a/Source/Swig/swigopt.h b/Source/Swig/swigopt.h index 11eb5ba99..428d90dce 100644 --- a/Source/Swig/swigopt.h +++ b/Source/Swig/swigopt.h @@ -13,4 +13,4 @@ extern void Swig_mark_arg(int n); extern int Swig_check_marked(int n); extern void Swig_check_options(int check_input); - extern void Swig_arg_error(void); + extern void Swig_arg_error(); diff --git a/Source/Swig/swigparm.h b/Source/Swig/swigparm.h index 49ae7992e..529438bae 100644 --- a/Source/Swig/swigparm.h +++ b/Source/Swig/swigparm.h @@ -11,7 +11,7 @@ /* $Id: swig.h 9629 2006-12-30 18:27:47Z beazley $ */ /* Individual parameters */ -extern Parm *NewParm(SwigType *type, const_String_or_char_ptr name); +extern Parm *NewParm(SwigType *type, const String_or_char *name); extern Parm *CopyParm(Parm *p); /* Parameter lists */ diff --git a/Source/Swig/swigscan.h b/Source/Swig/swigscan.h index 3403098df..2486286a9 100644 --- a/Source/Swig/swigscan.h +++ b/Source/Swig/swigscan.h @@ -11,11 +11,11 @@ typedef struct Scanner Scanner; -extern Scanner *NewScanner(void); +extern Scanner *NewScanner(); extern void DelScanner(Scanner *); extern void Scanner_clear(Scanner *); extern void Scanner_push(Scanner *, String *); -extern void Scanner_pushtoken(Scanner *, int, const_String_or_char_ptr value); +extern void Scanner_pushtoken(Scanner *, int, const String_or_char *value); extern int Scanner_token(Scanner *); extern String *Scanner_text(Scanner *); extern void Scanner_skip_line(Scanner *); diff --git a/Source/Swig/swigtree.h b/Source/Swig/swigtree.h index 5b43006a9..2e5c4da36 100644 --- a/Source/Swig/swigtree.h +++ b/Source/Swig/swigtree.h @@ -31,7 +31,7 @@ /* Utility functions */ -extern int checkAttribute(Node *obj, const_String_or_char_ptr name, const_String_or_char_ptr value); +extern int checkAttribute(Node *obj, const String_or_char *name, const String_or_char *value); extern void appendChild(Node *node, Node *child); extern void prependChild(Node *node, Node *child); extern void removeNode(Node *node); diff --git a/Source/Swig/swigwrap.h b/Source/Swig/swigwrap.h index 0dcf88059..25eeb6f7f 100644 --- a/Source/Swig/swigwrap.h +++ b/Source/Swig/swigwrap.h @@ -16,14 +16,14 @@ typedef struct Wrapper { String *code; } Wrapper; -extern Wrapper *NewWrapper(void); +extern Wrapper *NewWrapper(); extern void DelWrapper(Wrapper *w); extern void Wrapper_compact_print_mode_set(int flag); extern void Wrapper_pretty_print(String *str, File *f); extern void Wrapper_compact_print(String *str, File *f); extern void Wrapper_print(Wrapper *w, File *f); -extern int Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl); -extern int Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...); -extern int Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name); -extern char *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl); -extern char *Wrapper_new_localv(Wrapper *w, const_String_or_char_ptr name, ...); +extern int Wrapper_add_local(Wrapper *w, const String_or_char *name, const String_or_char *decl); +extern int Wrapper_add_localv(Wrapper *w, const String_or_char *name, ...); +extern int Wrapper_check_local(Wrapper *w, const String_or_char *name); +extern char *Wrapper_new_local(Wrapper *w, const String_or_char *name, const String_or_char *decl); +extern char *Wrapper_new_localv(Wrapper *w, const String_or_char *name, ...); diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 055af854f..c9691fa54 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -220,7 +220,7 @@ void Swig_symbol_init() { * Set the C scopename of the current symbol table. * ----------------------------------------------------------------------------- */ -void Swig_symbol_setscopename(const_String_or_char_ptr name) { +void Swig_symbol_setscopename(const String_or_char *name) { String *qname; /* assert(!Getattr(current_symtab,"name")); */ Setattr(current_symtab, "name", name); @@ -250,10 +250,10 @@ String *Swig_symbol_getscopename() { * Given a fully qualified C scopename, this function returns a symbol table * ----------------------------------------------------------------------------- */ -Symtab *Swig_symbol_getscope(const_String_or_char_ptr name) { +Symtab *Swig_symbol_getscope(const String_or_char *name) { if (!symtabs) return 0; - if (Equal("::", (const_String_or_char_ptr ) name)) + if (Equal("::", (String_or_char *) name)) name = ""; return Getattr(symtabs, name); } @@ -373,7 +373,7 @@ Symtab *Swig_symbol_current() { * Makes an alias for a symbol in the global symbol table. * ----------------------------------------------------------------------------- */ -void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *s) { +void Swig_symbol_alias(String_or_char *aliasname, Symtab *s) { String *qname = Swig_symbol_qualifiedscopename(current_symtab); if (qname) { Printf(qname, "::%s", aliasname); @@ -421,7 +421,7 @@ void Swig_symbol_inherit(Symtab *s) { * Adds a node to the C symbol table only. * ----------------------------------------------------------------------------- */ -void Swig_symbol_cadd(const_String_or_char_ptr name, Node *n) { +void Swig_symbol_cadd(String_or_char *name, Node *n) { Node *append = 0; Node *cn; @@ -594,7 +594,7 @@ void Swig_symbol_cadd(const_String_or_char_ptr name, Node *n) { * for namespace support, type resolution, and other issues. * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *n) { +Node *Swig_symbol_add(String_or_char *symname, Node *n) { Hash *c, *cn, *cl = 0; SwigType *decl, *ndecl; String *cstorage, *nstorage; @@ -827,7 +827,7 @@ Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *n) { * verifying that a class hierarchy implements all pure virtual methods. * ----------------------------------------------------------------------------- */ -static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (Node *n)) { +static Node *_symbol_lookup(String *name, Symtab *symtab, int (*check) (Node *n)) { Node *n; List *inherit; Hash *sym = Getattr(symtab, "csymtab"); @@ -890,7 +890,7 @@ static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (No return 0; } -static Node *symbol_lookup(const_String_or_char_ptr name, Symtab *symtab, int (*check) (Node *n)) { +static Node *symbol_lookup(String_or_char *name, Symtab *symtab, int (*check) (Node *n)) { Node *n = 0; if (DohCheck(name)) { n = _symbol_lookup(name, symtab, check); @@ -908,7 +908,7 @@ static Node *symbol_lookup(const_String_or_char_ptr name, Symtab *symtab, int (* * symbol_lookup_qualified() * ----------------------------------------------------------------------------- */ -static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symtab, const String *prefix, int local, int (*checkfunc) (Node *n)) { +static Node *symbol_lookup_qualified(String_or_char *name, Symtab *symtab, String *prefix, int local, int (*checkfunc) (Node *n)) { /* This is a little funky, we search by fully qualified names */ if (!symtab) @@ -928,7 +928,6 @@ static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symt /* Make qualified name of current scope */ String *qalloc = 0; String *qname = Swig_symbol_qualifiedscopename(symtab); - const String *cqname; if (qname) { if (Len(qname)) { if (prefix && Len(prefix)) { @@ -938,11 +937,10 @@ static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symt Append(qname, prefix); } qalloc = qname; - cqname = qname; } else { - cqname = prefix; + qname = prefix; } - st = Getattr(symtabs, cqname); + st = Getattr(symtabs, qname); /* Found a scope match */ if (st) { if (!name) { @@ -976,7 +974,7 @@ static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symt * to get the real node. * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup(const_String_or_char_ptr name, Symtab *n) { +Node *Swig_symbol_clookup(String_or_char *name, Symtab *n) { Hash *hsym = 0; Node *s = 0; @@ -1048,7 +1046,7 @@ Node *Swig_symbol_clookup(const_String_or_char_ptr name, Symtab *n) { * inheritance hierarchy. * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup_check(const_String_or_char_ptr name, Symtab *n, int (*checkfunc) (Node *n)) { +Node *Swig_symbol_clookup_check(String_or_char *name, Symtab *n, int (*checkfunc) (Node *n)) { Hash *hsym = 0; Node *s = 0; @@ -1112,7 +1110,7 @@ Node *Swig_symbol_clookup_check(const_String_or_char_ptr name, Symtab *n, int (* * Swig_symbol_clookup_local() * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup_local(const_String_or_char_ptr name, Symtab *n) { +Node *Swig_symbol_clookup_local(String_or_char *name, Symtab *n) { Hash *h, *hsym; Node *s = 0; @@ -1160,7 +1158,7 @@ Node *Swig_symbol_clookup_local(const_String_or_char_ptr name, Symtab *n) { * Swig_symbol_clookup_local_check() * ----------------------------------------------------------------------------- */ -Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n, int (*checkfunc) (Node *)) { +Node *Swig_symbol_clookup_local_check(String_or_char *name, Symtab *n, int (*checkfunc) (Node *)) { Hash *h, *hsym; Node *s = 0; @@ -1211,7 +1209,7 @@ Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n, * Look up a scope name. * ----------------------------------------------------------------------------- */ -Symtab *Swig_symbol_cscope(const_String_or_char_ptr name, Symtab *symtab) { +Symtab *Swig_symbol_cscope(String_or_char *name, Symtab *symtab) { char *cname = Char(name); if (strncmp(cname, "::", 2) == 0) return symbol_lookup_qualified(0, global_scope, name, 0, 0); diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index 14d231afa..61dca8353 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -229,7 +229,7 @@ Node *copyNode(Node *n) { * checkAttribute() * ----------------------------------------------------------------------------- */ -int checkAttribute(Node *n, const_String_or_char_ptr name, const_String_or_char_ptr value) { +int checkAttribute(Node *n, const String_or_char *name, const String_or_char *value) { String *v = Getattr(n, name); return v ? Equal(v, value) : 0; } diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 401a99801..6cbeb67ea 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -107,7 +107,7 @@ void Swig_typemap_init() { tm_scope = 0; } -static String *tmop_name(const_String_or_char_ptr op) { +static String *tmop_name(const String_or_char *op) { static Hash *names = 0; String *s; /* Due to "interesting" object-identity semantics of DOH, @@ -164,7 +164,7 @@ Hash *Swig_typemap_pop_scope() { * Add a new multi-valued typemap * ----------------------------------------------------------------------------- */ -void Swig_typemap_register(const_String_or_char_ptr op, ParmList *parms, const_String_or_char_ptr code, ParmList *locals, ParmList *kwargs) { +void Swig_typemap_register(const String_or_char *op, ParmList *parms, String_or_char *code, ParmList *locals, ParmList *kwargs) { Hash *tm; Hash *tm1; Hash *tm2; @@ -270,7 +270,7 @@ void Swig_typemap_register(const_String_or_char_ptr op, ParmList *parms, const_S * Retrieve typemap information from current scope. * ----------------------------------------------------------------------------- */ -static Hash *Swig_typemap_get(SwigType *type, const_String_or_char_ptr name, int scope) { +static Hash *Swig_typemap_get(SwigType *type, String_or_char *name, int scope) { Hash *tm, *tm1; /* See if this type has been seen before */ if ((scope < 0) || (scope > tm_scope)) @@ -292,7 +292,7 @@ static Hash *Swig_typemap_get(SwigType *type, const_String_or_char_ptr name, int * Copy a typemap * ----------------------------------------------------------------------------- */ -int Swig_typemap_copy(const_String_or_char_ptr op, ParmList *srcparms, ParmList *parms) { +int Swig_typemap_copy(const String_or_char *op, ParmList *srcparms, ParmList *parms) { Hash *tm = 0; String *tmop; Parm *p; @@ -347,7 +347,7 @@ int Swig_typemap_copy(const_String_or_char_ptr op, ParmList *srcparms, ParmList * Delete a multi-valued typemap * ----------------------------------------------------------------------------- */ -void Swig_typemap_clear(const_String_or_char_ptr op, ParmList *parms) { +void Swig_typemap_clear(const String_or_char *op, ParmList *parms) { SwigType *type; String *name; Parm *p; @@ -590,7 +590,7 @@ static SwigType *strip_arrays(SwigType *type) { * that includes a 'code' attribute. * ----------------------------------------------------------------------------- */ -Hash *Swig_typemap_search(const_String_or_char_ptr op, SwigType *type, const_String_or_char_ptr name, SwigType **matchtype) { +Hash *Swig_typemap_search(const String_or_char *op, SwigType *type, const String_or_char *name, SwigType **matchtype) { Hash *result = 0, *tm, *tm1, *tma; Hash *backup = 0; SwigType *noarrays = 0; @@ -737,7 +737,7 @@ ret_result: * Search for a multi-valued typemap. * ----------------------------------------------------------------------------- */ -Hash *Swig_typemap_search_multi(const_String_or_char_ptr op, ParmList *parms, int *nmatch) { +Hash *Swig_typemap_search_multi(const String_or_char *op, ParmList *parms, int *nmatch) { SwigType *type; SwigType *mtype = 0; String *name; @@ -1173,7 +1173,7 @@ static void typemap_locals(DOHString * s, ParmList *l, Wrapper *f, int argnum) { * $1 in the out typemap will be replaced by the code in actioncode. * ----------------------------------------------------------------------------- */ -static String *Swig_typemap_lookup_impl(const_String_or_char_ptr op, Node *node, const_String_or_char_ptr lname, Wrapper *f, String *actioncode) { +static String *Swig_typemap_lookup_impl(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f, String *actioncode) { SwigType *type; SwigType *mtype = 0; String *pname; @@ -1384,13 +1384,13 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr op, Node *node, return s; } -String *Swig_typemap_lookup_out(const_String_or_char_ptr op, Node *node, const_String_or_char_ptr lname, Wrapper *f, String *actioncode) { +String *Swig_typemap_lookup_out(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f, String *actioncode) { assert(actioncode); assert(Cmp(op, "out") == 0); return Swig_typemap_lookup_impl(op, node, lname, f, actioncode); } -String *Swig_typemap_lookup(const_String_or_char_ptr op, Node *node, const_String_or_char_ptr lname, Wrapper *f) { +String *Swig_typemap_lookup(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f) { return Swig_typemap_lookup_impl(op, node, lname, f, 0); } @@ -1406,7 +1406,7 @@ String *Swig_typemap_lookup(const_String_or_char_ptr op, Node *node, const_Strin * A new attribute called "tmap:in:foo" with value "xyz" is attached to p. * ----------------------------------------------------------------------------- */ -void Swig_typemap_attach_kwargs(Hash *tm, const_String_or_char_ptr op, Parm *p) { +void Swig_typemap_attach_kwargs(Hash *tm, const String_or_char *op, Parm *p) { String *temp = NewStringEmpty(); Parm *kw = Getattr(tm, "kwargs"); while (kw) { @@ -1438,7 +1438,7 @@ void Swig_typemap_attach_kwargs(Hash *tm, const_String_or_char_ptr op, Parm *p) * attribute, print that warning message. * ----------------------------------------------------------------------------- */ -static void Swig_typemap_warn(const_String_or_char_ptr op, Parm *p) { +static void Swig_typemap_warn(const String_or_char *op, Parm *p) { String *temp = NewStringf("%s:warning", op); String *w = Getattr(p, tmop_name(temp)); Delete(temp); @@ -1447,7 +1447,7 @@ static void Swig_typemap_warn(const_String_or_char_ptr op, Parm *p) { } } -static void Swig_typemap_emit_code_fragments(const_String_or_char_ptr op, Parm *p) { +static void Swig_typemap_emit_code_fragments(const String_or_char *op, Parm *p) { String *temp = NewStringf("%s:fragment", op); String *f = Getattr(p, tmop_name(temp)); if (f) { @@ -1467,7 +1467,7 @@ static void Swig_typemap_emit_code_fragments(const_String_or_char_ptr op, Parm * * given typemap type * ----------------------------------------------------------------------------- */ -String *Swig_typemap_get_option(Hash *tm, const_String_or_char_ptr name) { +String *Swig_typemap_get_option(Hash *tm, String *name) { Parm *kw = Getattr(tm, "kwargs"); while (kw) { String *kname = Getattr(kw, "name"); @@ -1479,7 +1479,7 @@ String *Swig_typemap_get_option(Hash *tm, const_String_or_char_ptr name) { return 0; } -void Swig_typemap_attach_parms(const_String_or_char_ptr op, ParmList *parms, Wrapper *f) { +void Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f) { Parm *p, *firstp; Hash *tm; int nmatch = 0; diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 8ff31bc0b..18d1b2304 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -110,7 +110,7 @@ char cvsroot_typeobj_c[] = "$Id$"; * ----------------------------------------------------------------------------- */ #ifdef NEW -SwigType *NewSwigType(const_String_or_char_ptr initial) { +SwigType *NewSwigType(const String_or_char *initial) { return NewString(initial); } @@ -419,7 +419,7 @@ int SwigType_isreference(SwigType *t) { * stored in exactly the same way as "q(const volatile)". * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { +SwigType *SwigType_add_qualifier(SwigType *t, const String_or_char *qual) { char temp[256], newq[256]; int sz, added = 0; char *q, *cqual; @@ -537,7 +537,7 @@ SwigType *SwigType_functionpointer_decompose(SwigType *t) { * Add, remove, and test for C++ pointer to members. * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_memberpointer(SwigType *t, const_String_or_char_ptr name) { +SwigType *SwigType_add_memberpointer(SwigType *t, const String_or_char *name) { String *temp = NewStringf("m(%s).", name); Insert(t, 0, temp); Delete(temp); @@ -579,7 +579,7 @@ int SwigType_ismemberpointer(SwigType *t) { * SwigType_pop_arrays() - Remove all arrays * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size) { +SwigType *SwigType_add_array(SwigType *t, const String_or_char *size) { char temp[512]; strcpy(temp, "a("); strcat(temp, Char(size)); @@ -673,7 +673,7 @@ String *SwigType_array_getdim(SwigType *t, int n) { } /* Replace nth array dimension */ -void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep) { +void SwigType_array_setdim(SwigType *t, int n, const String_or_char *rep) { String *result = 0; char temp; char *start; diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 2562e12f8..ae6ab3dc8 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -163,7 +163,7 @@ void SwigType_typesystem_init() { * already defined. * ----------------------------------------------------------------------------- */ -int SwigType_typedef(SwigType *type, const_String_or_char_ptr name) { +int SwigType_typedef(SwigType *type, String_or_char *name) { if (Getattr(current_typetab, name)) return -1; /* Already defined */ if (Strcmp(type, name) == 0) { /* Can't typedef a name to itself */ @@ -193,7 +193,7 @@ int SwigType_typedef(SwigType *type, const_String_or_char_ptr name) { * Defines a class in the current scope. * ----------------------------------------------------------------------------- */ -int SwigType_typedef_class(const_String_or_char_ptr name) { +int SwigType_typedef_class(String_or_char *name) { String *cname; /* Printf(stdout,"class : '%s'\n", name); */ if (Getattr(current_typetab, name)) @@ -232,7 +232,7 @@ String *SwigType_scope_name(Typetab *ttab) { * Creates a new scope * ----------------------------------------------------------------------------- */ -void SwigType_new_scope(const_String_or_char_ptr name) { +void SwigType_new_scope(const String_or_char *name) { Typetab *s; Hash *ttab; String *qname; @@ -539,7 +539,7 @@ static SwigType *typedef_resolve(Typetab *s, String *base) { * ----------------------------------------------------------------------------- */ /* #define SWIG_DEBUG */ -SwigType *SwigType_typedef_resolve(const SwigType *t) { +SwigType *SwigType_typedef_resolve(SwigType *t) { String *base; String *type = 0; String *r = 0; @@ -840,7 +840,6 @@ SwigType *SwigType_typedef_resolve_all(SwigType *t) { * * Given a type declaration, this function tries to fully qualify it according to * typedef scope rules. - * Inconsistency to be fixed: ::Foo returns ::Foo, whereas ::Foo * returns Foo * * ----------------------------------------------------------------------------- */ SwigType *SwigType_typedef_qualified(SwigType *t) { @@ -848,7 +847,7 @@ SwigType *SwigType_typedef_qualified(SwigType *t) { String *result; int i, len; - if (strncmp(Char(t), "::", 2) == 0) { + if (t && strncmp(Char(t), "::", 2) == 0) { return Copy(t); } @@ -1072,7 +1071,7 @@ int SwigType_istypedef(SwigType *t) { * Name is a qualified name like A::B. * ----------------------------------------------------------------------------- */ -int SwigType_typedef_using(const_String_or_char_ptr name) { +int SwigType_typedef_using(String_or_char *name) { String *base; String *td; String *prefix; @@ -1416,7 +1415,7 @@ static Hash *r_remembered = 0; /* Hash of types we remembered already */ static void (*r_tracefunc) (SwigType *t, String *mangled, String *clientdata) = 0; -void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr clientdata) { +void SwigType_remember_mangleddata(String *mangled, const String_or_char *clientdata) { if (!r_mangleddata) { r_mangleddata = NewHash(); } @@ -1424,7 +1423,7 @@ void SwigType_remember_mangleddata(String *mangled, const_String_or_char_ptr cli } -void SwigType_remember_clientdata(SwigType *t, const_String_or_char_ptr clientdata) { +void SwigType_remember_clientdata(SwigType *t, const String_or_char *clientdata) { String *mt; SwigType *lt; Hash *h; diff --git a/Source/Swig/wrapfunc.c b/Source/Swig/wrapfunc.c index 11518bfc2..3778066ce 100644 --- a/Source/Swig/wrapfunc.c +++ b/Source/Swig/wrapfunc.c @@ -23,7 +23,7 @@ static int Max_line_size = 128; * Create a new wrapper function object. * ----------------------------------------------------------------------------- */ -Wrapper *NewWrapper(void) { +Wrapper *NewWrapper() { Wrapper *w; w = (Wrapper *) malloc(sizeof(Wrapper)); w->localh = NewHash(); @@ -406,7 +406,7 @@ void Wrapper_print(Wrapper *w, File *f) { * present (which may or may not be okay to the caller). * ----------------------------------------------------------------------------- */ -int Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl) { +int Wrapper_add_local(Wrapper *w, const String_or_char *name, const String_or_char *decl) { /* See if the local has already been declared */ if (Getattr(w->localh, name)) { return -1; @@ -424,7 +424,7 @@ int Wrapper_add_local(Wrapper *w, const_String_or_char_ptr name, const_String_or * to manually construct the 'decl' string before calling. * ----------------------------------------------------------------------------- */ -int Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...) { +int Wrapper_add_localv(Wrapper *w, const String_or_char *name, ...) { va_list ap; int ret; String *decl; @@ -451,7 +451,7 @@ int Wrapper_add_localv(Wrapper *w, const_String_or_char_ptr name, ...) { * Check to see if a local name has already been declared * ----------------------------------------------------------------------------- */ -int Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name) { +int Wrapper_check_local(Wrapper *w, const String_or_char *name) { if (Getattr(w->localh, name)) { return 1; } @@ -465,7 +465,7 @@ int Wrapper_check_local(Wrapper *w, const_String_or_char_ptr name) { * used. Returns the name that was actually selected. * ----------------------------------------------------------------------------- */ -char *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_or_char_ptr decl) { +char *Wrapper_new_local(Wrapper *w, const String_or_char *name, const String_or_char *decl) { int i; String *nname = NewString(name); String *ndecl = NewString(decl); @@ -496,7 +496,7 @@ char *Wrapper_new_local(Wrapper *w, const_String_or_char_ptr name, const_String_ * to manually construct the 'decl' string before calling. * ----------------------------------------------------------------------------- */ -char *Wrapper_new_localv(Wrapper *w, const_String_or_char_ptr name, ...) { +char *Wrapper_new_localv(Wrapper *w, const String_or_char *name, ...) { va_list ap; char *ret; String *decl; diff --git a/TODO b/TODO index 879e65f1f..103185d23 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,7 @@ SWIG TO-DO +Release: SWIG-1.3.36 + ----------------------------------------------------------------------------- **** = High Priority @@ -337,14 +339,6 @@ Common Lisp typemaps would be written as Lisp programs that generate Lisp code. -ALLEGROCL ------ -These first three will remove most of the warnings from most of the -remaining checkpartial tests that are failing. -**** Throws typemap support -**** const typemaps -**** long long typemaps - Ocaml ----- ** I've been working with my camlp4 module and type information diff --git a/Tools/config/config.guess b/Tools/config/config.guess new file mode 100755 index 000000000..7b24a8728 --- /dev/null +++ b/Tools/config/config.guess @@ -0,0 +1,1542 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. + +timestamp='2008-11-15' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/Tools/config/config.sub b/Tools/config/config.sub new file mode 100755 index 000000000..053e7381f --- /dev/null +++ b/Tools/config/config.sub @@ -0,0 +1,1677 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. + +timestamp='2008-09-08' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/Tools/mkdist.py b/Tools/mkdist.py index 0e2eafa79..f5bdd01c7 100755 --- a/Tools/mkdist.py +++ b/Tools/mkdist.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/local/bin/python # This script builds a swig-1.3 distribution. # Usage : mkdist.py version, where version should be 1.3.x @@ -43,6 +43,11 @@ os.system("svn export -r HEAD https://swig.svn.sourceforge.net/svnroot/swig/trun os.system("rm -Rf "+dirname+"/debian") == 0 or failed() +# Blow away all .cvsignore files + +print "Blowing away .cvsignore files" +os.system("find "+dirname+" -name .cvsignore -exec rm {} \\;") == 0 or failed() + # Go build the system print "Building system" @@ -56,8 +61,7 @@ os.system("find "+dirname+" -name autom4te.cache -exec rm -rf {} \\;") # Build documentation print "Building documentation" -os.system("cd "+dirname+"/Doc/Manual && make all clean-baks") == 0 or failed() -os.system("cd "+dirname+"/CCache && yodl2man -o ccache-swig.1 ccache.yo") == 0 or failed() +os.system("cd "+dirname+"/Doc/Manual && make && rm *.bak") == 0 or failed() # Build the tar-ball os.system("tar -cf "+dirname+".tar "+dirname) == 0 or failed() diff --git a/Tools/mkrelease.py b/Tools/mkrelease.py index edf3b07fe..d7927f8e6 100755 --- a/Tools/mkrelease.py +++ b/Tools/mkrelease.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # This script builds the SWIG source tarball, creates the Windows executable and the Windows zip package # and uploads them both to SF ready for release diff --git a/Tools/mkwindows.sh b/Tools/mkwindows.sh index fb2547e14..116e32d11 100755 --- a/Tools/mkwindows.sh +++ b/Tools/mkwindows.sh @@ -82,13 +82,10 @@ if test -f "$tarball"; then echo "Compiling (quietly)..." make > build.log echo "Simple check to see if swig.exe runs..." - env LD_LIBRARY_PATH= PATH= ./swig.exe -version || exit 1 - echo "Simple check to see if ccache-swig.exe runs..." - env LD_LIBRARY_PATH= PATH= ./CCache/ccache-swig.exe -V || exit 1 + env LD_LIBRARY_PATH= PATH= ./swig.exe -version echo "Creating $swigwinbasename.zip..." cd .. cp $swigbasename/swig.exe $swigwinbasename - cp $swigbasename/CCache/ccache-swig.exe $swigwinbasename/CCache cp $swigbasename/Lib/swigwarn.swg $swigwinbasename/Lib sleep 2 # fix strange not finding swig.exe echo "Unzip into a directory of your choice. Please read the README file as well as Doc\Manual\Windows.html for installation instructions." > swig_windows_zip_comments.txt diff --git a/Tools/pyname_patch.py b/Tools/pyname_patch.py deleted file mode 100644 index 5931269f9..000000000 --- a/Tools/pyname_patch.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python -""" -From SWIG 1.3.37 we deprecated all SWIG symbols that start with Py, -since they are inappropriate and discouraged in Python documentation -(from http://www.python.org/doc/2.5.2/api/includes.html): - -"All user visible names defined by Python.h (except those defined by the included -standard headers) have one of the prefixes "Py" or "_Py". Names beginning with -"_Py" are for internal use by the Python implementation and should not be used -by extension writers. Structure member names do not have a reserved prefix. - -Important: user code should never define names that begin with "Py" or "_Py". -This confuses the reader, and jeopardizes the portability of the user code to -future Python versions, which may define additional names beginning with one -of these prefixes." - -This file is a simple script used for change all of these symbols, for user code -or SWIG itself. -""" -import re -from shutil import copyfile -import sys - -symbols = [ - #(old name, new name) - ("PySequence_Base", "SwigPySequence_Base"), - ("PySequence_Cont", "SwigPySequence_Cont"), - ("PySwigIterator_T", "SwigPyIterator_T"), - ("PyPairBoolOutputIterator", "SwigPyPairBoolOutputIterator"), - ("PySwigIterator", "SwigPyIterator"), - ("PySwigIterator_T", "SwigPyIterator_T"), - ("PyMapIterator_T", "SwigPyMapIterator_T"), - ("PyMapKeyIterator_T", "SwigPyMapKeyIterator_T"), - ("PyMapValueIterator_T", "SwigPyMapValueITerator_T"), - ("PyObject_ptr", "SwigPtr_PyObject"), - ("PyObject_var", "SwigVar_PyObject"), - ("PyOper", "SwigPyOper"), - ("PySeq", "SwigPySeq"), - ("PySequence_ArrowProxy", "SwigPySequence_ArrowProxy"), - ("PySequence_Cont", "SwigPySequence_Cont"), - ("PySequence_InputIterator", "SwigPySequence_InputIterator"), - ("PySequence_Ref", "SwigPySequence_Ref"), - ("PySwigClientData", "SwigPyClientData"), - ("PySwigClientData_Del", "SwigPyClientData_Del"), - ("PySwigClientData_New", "SwigPyClientData_New"), - ("PySwigIterator", "SwigPyIterator"), - ("PySwigIteratorClosed_T", "SwigPyIteratorClosed_T"), - ("PySwigIteratorOpen_T", "SwigPyIteratorOpen_T"), - ("PySwigIterator_T", "SwigPyIterator_T"), - ("PySwigObject", "SwigPyObject"), - ("PySwigObject_Check", "SwigPyObject_Check"), - ("PySwigObject_GetDesc", "SwigPyObject_GetDesc"), - ("PySwigObject_New", "SwigPyObject_New"), - ("PySwigObject_acquire", "SwigPyObject_acquire"), - ("PySwigObject_append", "SwigPyObject_append"), - ("PySwigObject_as_number", "SwigPyObject_as_number"), - ("PySwigObject_compare", "SwigPyObject_compare"), - ("PySwigObject_dealloc", "SwigPyObject_dealloc"), - ("PySwigObject_disown", "SwigPyObject_disown"), - ("PySwigObject_format", "SwigPyObject_format"), - ("PySwigObject_getattr", "SwigPyObject_getattr"), - ("PySwigObject_hex", "SwigPyObject_hex"), - ("PySwigObject_long", "SwigPyObject_long"), - ("PySwigObject_next", "SwigPyObject_next"), - ("PySwigObject_oct", "SwigPyObject_oct"), - ("PySwigObject_own", "SwigPyObject_own"), - ("PySwigObject_print", "SwigPyObject_print"), - ("PySwigObject_repr", "SwigPyObject_repr"), - ("PySwigObject_richcompare", "SwigPyObject_richcompare"), - ("PySwigObject_str", "SwigPyObject_str"), - ("PySwigObject_type", "SwigPyObject_type"), - ("PySwigPacked", "SwigPyPacked"), - ("PySwigPacked_Check", "SwigPyPacked_Check"), - ("PySwigPacked_New", "SwigPyPacked_New"), - ("PySwigPacked_UnpackData", "SwigPyPacked_UnpackData"), - ("PySwigPacked_compare", "SwigPyPacked_compare"), - ("PySwigPacked_dealloc", "SwigPyPacked_dealloc"), - ("PySwigPacked_print", "SwigPyPacked_print"), - ("PySwigPacked_repr", "SwigPyPacked_repr"), - ("PySwigPacked_str", "SwigPyPacked_str"), - ("PySwigPacked_type", "SwigPyPacked_type"), - ("pyseq", "swigpyseq"), - ("pyswigobject_type", "swigpyobject_type"), - ("pyswigpacked_type", "swigpypacked_type"), - ] - -res = [(re.compile("\\b(%s)\\b"%oldname), newname) for oldname, newname in symbols] - -def patch_file(fn): - newf = [] - changed = False - for line in open(fn): - for r, newname in res: - line, n = r.subn(newname, line) - if n>0: - changed = True - newf.append(line) - - if changed: - copyfile(fn, fn+".bak") - f = open(fn, "w") - f.write("".join(newf)) - f.close() - return changed - -def main(fns): - for fn in fns: - try: - if patch_file(fn): - print "Patched file", fn - except IOError: - print "Error occured during patching", fn - return - -if __name__=="__main__": - if len(sys.argv) > 1: - main(sys.argv[1:]) - else: - print "Patch your interface file for SWIG's Py* symbol name deprecation." - print "Usage:" - print " %s files..."%sys.argv[0] - - diff --git a/autogen.sh b/autogen.sh index 97916d9f3..33f54aa7c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,8 +2,9 @@ # Bootstrap the development environment - add extra files needed to run configure. # Note autoreconf should do what this file achieves, but it has a bug when working with automake! -# The latest config.guess and config.sub should be copied into Tools/config. -# This script will ensure the latest is copied from your autotool installation. +# The latest config.guess and config.sub should be copied into Tools/config and checked into SVN +# when upgrading the autotools. Otherwise this script will ensure the latest is copied from +# your autotool installation. set -e set -x @@ -12,4 +13,3 @@ ${ACLOCAL-aclocal} -I Tools/config ${AUTOHEADER-autoheader} ${AUTOMAKE-automake} --add-missing --copy --force-missing ${AUTOCONF-autoconf} -cd CCache && ${AUTORECONF-autoreconf} diff --git a/configure.in b/configure.in index c6f2c2970..a8b8be5f3 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[1.3.40],[http://www.swig.org]) +AC_INIT([swig],[1.3.37],[http://www.swig.org]) AC_PREREQ(2.58) AC_CONFIG_SRCDIR([Source/Swig/swig.h]) AC_CONFIG_AUX_DIR([Tools/config]) @@ -21,83 +21,26 @@ AH_BOTTOM([ #endif ]) -dnl Check for programs that a user requires to build SWIG +dnl Checks for programs. AC_PROG_CC AC_PROG_CXX +AC_PROG_YACC AC_EXEEXT AC_OBJEXT +AC_PROG_RANLIB AM_PROG_CC_C_O # Needed for subdir-objects in AUTOMAKE_OPTIONS +AC_CHECK_PROGS(AR, ar aal, ar) +AC_SUBST(AR) AC_COMPILE_WARNINGS # Increase warning levels AC_DEFINE_UNQUOTED(SWIG_CXX, ["$CXX"], [Compiler that built SWIG]) AC_DEFINE_UNQUOTED(SWIG_PLATFORM, ["$build"], [Platform that SWIG is built for]) + dnl Checks for header files. AC_HEADER_STDC -dnl Checks for types. -AC_LANG_PUSH([C++]) -AC_CHECK_TYPES([bool]) -AC_LANG_POP([C++]) - -dnl Look for popen -AC_ARG_WITH(popen, AS_HELP_STRING([--without-popen], [Disable popen]), with_popen="$withval") -if test x"${with_popen}" = xno ; then -AC_MSG_NOTICE([Disabling popen]) -else -AC_CHECK_FUNC(popen, AC_DEFINE(HAVE_POPEN, 1, [Define if popen is available]), AC_MSG_NOTICE([Disabling popen])) -fi - -dnl Look for RxSpencer -AC_ARG_WITH(rxspencer, AS_HELP_STRING([--with-rxspencer], [Enable RxSpencer]), with_rxspencer="yes") -if test x"${with_rxspencer}" = xyes ; then -#check first for the header - AC_CHECK_HEADER(rxspencer/regex.h,with_rxspencer="yes",with_rxspencer="no") - if test x"${with_rxspencer}" = xyes ; then -# now check for the library - AC_CHECK_LIB(rxspencer, regcomp,with_rxspencer="yes",with_rxspencer="no") - fi - if test x"${with_rxspencer}" = xyes ; then -# library and header are available - AC_DEFINE(HAVE_RXSPENCER, 1,[Define if rxspencer is available]) - LIBS="$LIBS -lrxspencer" - else - AC_MSG_NOTICE([RxSpencer not found. Obtain it at http://arglist.com/regex or http://gnuwin32.sourceforge.net/packages.html]) - fi -fi - -dnl CCache -AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes]) -AC_MSG_CHECKING([whether to enable ccache-swig]) -AC_MSG_RESULT([$enable_ccache]) - -if test "$enable_ccache" = yes; then - AC_CONFIG_SUBDIRS(CCache) - ENABLE_CCACHE=1 -fi -AC_SUBST(ENABLE_CCACHE) - - -echo "" -echo "Checking packages required for SWIG developers." -echo "Note : None of the following packages are required for users to compile and install SWIG" -echo "" - -AC_PROG_YACC -AC_PROG_RANLIB -AC_CHECK_PROGS(AR, ar aal, ar) -AC_SUBST(AR) -AC_CHECK_PROGS(YODL2MAN, yodl2man) -AC_CHECK_PROGS(YODL2HTML, yodl2html) - - -echo "" -echo "Checking for installed target languages and other information in order to compile and run the examples." -echo "Note : None of the following packages are required for users to compile and install SWIG" -echo "" - - dnl How to specify include directories that may be system directories. # -I should not be used on system directories (GCC) if test "$GCC" = yes; then @@ -107,9 +50,21 @@ else fi -dnl Info for building shared libraries ... in order to run the examples +dnl Checks for types. +AC_LANG_PUSH([C++]) +AC_CHECK_TYPES([bool]) +AC_LANG_POP([C++]) -# SO is the extension of shared libraries (including the dot!) + +# Set info about shared libraries. +AC_SUBST(SO) +AC_SUBST(LDSHARED) +AC_SUBST(CCSHARED) +AC_SUBST(CXXSHARED) +AC_SUBST(TRYLINKINGWITHCXX) +AC_SUBST(LINKFORSHARED) + +# SO is the extension of shared libraries `(including the dot!) AC_MSG_CHECKING(SO) if test -z "$SO" then @@ -246,6 +201,7 @@ then esac fi AC_MSG_RESULT($RPATH) +AC_SUBST(RPATH) # LINKFORSHARED are the flags passed to the $(CC) command that links # the a few executables -- this is only needed for a few systems @@ -265,15 +221,6 @@ then fi AC_MSG_RESULT($LINKFORSHARED) -# Set info about shared libraries. -AC_SUBST(SO) -AC_SUBST(LDSHARED) -AC_SUBST(CCSHARED) -AC_SUBST(CXXSHARED) -AC_SUBST(TRYLINKINGWITHCXX) -AC_SUBST(LINKFORSHARED) -AC_SUBST(RPATH) - # This variation is needed on OS-X because there is no (apparent) consistency in shared library naming. # Sometimes .bundle works, but sometimes .so is needed. It depends on the target language @@ -296,10 +243,10 @@ case $host in *) GUILE_SO=$SO;; esac -AC_SUBST(PHP_SO) +AC_SUBST(PHP4_SO) case $host in - *-*-darwin*) PHP_SO=.so;; - *) PHP_SO=$SO;; + *-*-darwin*) PHP4_SO=.so;; + *) PHP4_SO=$SO;; esac AC_SUBST(MZSCHEME_SO) @@ -322,6 +269,46 @@ case $host in esac + +echo "" +echo "Checking for installed packages." +echo "Note : None of the following packages are required to compile SWIG" +echo "" + +#---------------------------------------------------------------- +# Look for popen +#---------------------------------------------------------------- + +AC_ARG_WITH(popen, AS_HELP_STRING([--without-popen], [Disable popen]), with_popen="$withval") +if test x"${with_popen}" = xno ; then +AC_MSG_NOTICE([Disabling popen]) +else +AC_CHECK_FUNC(popen, AC_DEFINE(HAVE_POPEN, 1, [Define if popen is available]), AC_MSG_NOTICE([Disabling popen])) +fi + +#---------------------------------------------------------------- +# Look for RxSpencer +#---------------------------------------------------------------- + +AC_ARG_WITH(rxspencer, AS_HELP_STRING([--with-rxspencer], [Enable RxSpencer]), with_rxspencer="yes") +if test x"${with_rxspencer}" = xyes ; then +#check first for the header + AC_CHECK_HEADER(rxspencer/regex.h,with_rxspencer="yes",with_rxspencer="no") + if test x"${with_rxspencer}" = xyes ; then +# now check for the library + AC_CHECK_LIB(rxspencer, regcomp,with_rxspencer="yes",with_rxspencer="no") + fi + if test x"${with_rxspencer}" = xyes ; then +# library and header are available + AC_DEFINE(HAVE_RXSPENCER, 1,[Define if rxspencer is available]) + LIBS="$LIBS -lrxspencer" + else + AC_MSG_NOTICE([RxSpencer not found. Obtain it at http://arglist.com/regex or http://gnuwin32.sourceforge.net/packages.html]) + fi +fi + +#---------------------------------------------------------------- + # Check for specific libraries. Used for SWIG examples AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX @@ -389,12 +376,12 @@ if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include /usr/X11R6/include /usr/include/X11R6" for i in $dirs ; do if test -r $i/X11/Intrinsic.h; then + AC_MSG_RESULT($i) XINCLUDES=" -I$i" break fi done fi - AC_MSG_RESULT($XINCLUDES) else if test "$x_includes" != ""; then XINCLUDES=-I$x_includes @@ -546,27 +533,14 @@ fi # Cygwin (Windows) needs the library for dynamic linking case $host in *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; +*-*-darwin*) TCLDYNAMICLINKING="-dynamiclib -flat_namespace -undefined suppress";; *)TCLDYNAMICLINKING="";; esac - -case $host in -*-*-darwin*) - TCLLDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace' - TCLCXXSHARED='$(CXX) -dynamiclib -undefined suppress -flat_namespace' - ;; -*) - TCLLDSHARED='$(LDSHARED)' - TCLCXXSHARED='$(CXXSHARED)' - ;; -esac - fi AC_SUBST(TCLINCLUDE) AC_SUBST(TCLLIB) AC_SUBST(TCLDYNAMICLINKING) -AC_SUBST(TCLLDSHARED) -AC_SUBST(TCLCXXSHARED) #---------------------------------------------------------------- # Look for Python @@ -586,7 +560,7 @@ else # First figure out the name of the Python executable if test "x$PYBIN" = xyes; then -AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python]) +AC_CHECK_PROGS(PYTHON, python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python) else PYTHON="$PYBIN" fi @@ -670,107 +644,6 @@ AC_SUBST(PYLIB) AC_SUBST(PYLINK) AC_SUBST(PYTHONDYNAMICLINKING) - -#---------------------------------------------------------------- -# Look for Python 3.x -#---------------------------------------------------------------- - -# mostly copy & pasted from "Look for Python" section, -# did some trim, fix and rename - -PY3INCLUDE= -PY3LIB= -PY3PACKAGE= - -AC_ARG_WITH(python3, AS_HELP_STRING([--without-python3], [Disable Python 3.x support]) -AS_HELP_STRING([--with-python3=path], [Set location of Python 3.x executable]),[ PY3BIN="$withval"], [PY3BIN=yes]) - -# First, check for "--without-python3" or "--with-python3=no". -if test x"${PY3BIN}" = xno -o x"${with_alllang}" = xno ; then -AC_MSG_NOTICE([Disabling Python 3.x support]) -else -# First figure out the name of the Python3 executable - -if test "x$PY3BIN" = xyes; then - AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1]) -else - PYTHON3="$PY3BIN" -fi - -# Check for Python 3.x development tools (header files, static library and python3-config) -if test "x$PYTHON3" = x; then - AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config]) -else - AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config]) -fi - -if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then - AC_MSG_CHECKING([for Python 3.x prefix]) - PY3PREFIX=`($PY3CONFIG --prefix) 2>/dev/null` - AC_MSG_RESULT($PY3PREFIX) - AC_MSG_CHECKING(for Python 3.x exec-prefix) - PY3EPREFIX=`($PY3CONFIG --exec-prefix) 2>/dev/null` - AC_MSG_RESULT($PY3EPREFIX) - - # Note: I could not think of a standard way to get the version string from different versions. - # This trick pulls it out of the file location for a standard library file. - - AC_MSG_CHECKING([for Python 3.x version]) - - # Need to do this hack since autoconf replaces __file__ with the name of the configure file - filehack="file__" - PY3VERSION=`($PYTHON3 -c "import string,operator,os.path; print(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")` - AC_MSG_RESULT($PY3VERSION) - - # Find the directory for libraries this is necessary to deal with - # platforms that can have apps built for multiple archs: e.g. x86_64 - AC_MSG_CHECKING([for Python 3.x lib dir]) - PY3LIBDIR=`($PYTHON3 -c "import sys; print(sys.lib)") 2>/dev/null` - if test -z "$PY3LIBDIR"; then - # some dists don't have sys.lib so the best we can do is assume lib - PY3LIBDIR="lib" - fi - AC_MSG_RESULT($PY3LIBDIR) - - # Set the include directory - - AC_MSG_CHECKING([for Python 3.x header files]) - PY3INCLUDE=`($PY3CONFIG --includes) 2>/dev/null` - AC_MSG_RESULT($PY3INCLUDE) - - # Set the library directory blindly. This probably won't work with older versions - AC_MSG_CHECKING([for Python 3.x library]) - dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR" - for i in $dirs; do - if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then - PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i" - break - fi - done - if test -z "$PY3LIB"; then - AC_MSG_RESULT([Not found]) - else - AC_MSG_RESULT($PY3LIB) - fi - - PY3LINK="-l$PY3VERSION" -fi - -# Cygwin (Windows) needs the library for dynamic linking -case $host in -*-*-cygwin* | *-*-mingw*) PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK" - DEFS="-DUSE_DL_IMPORT $DEFS" PY3INCLUDE="$PY3INCLUDE" - ;; -*)PYTHON3DYNAMICLINKING="";; -esac -fi - -AC_SUBST(PY3INCLUDE) -AC_SUBST(PY3LIB) -AC_SUBST(PY3LINK) -AC_SUBST(PYTHON3DYNAMICLINKING) - - #---------------------------------------------------------------- # Look for Perl5 #---------------------------------------------------------------- @@ -859,13 +732,13 @@ OCTAVEDYNAMICLINKING= OCTAVE_SO=.oct AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave]) -AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN=yes]) +AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[ OCTAVEBIN="$withval"], [OCTAVEBIN=yes]) # First, check for "--without-octave" or "--with-octave=no". if test x"${OCTAVEBIN}" = xno -o x"${with_alllang}" = xno ; then AC_MSG_NOTICE([Disabling Octave]) OCTAVE= -else +fi # First figure out what the name of Octave is @@ -906,8 +779,6 @@ else AC_MSG_RESULT(could not figure out how to run octave) fi -fi - AC_SUBST(OCTAVE) AC_SUBST(OCTAVEEXT) AC_SUBST(OCTAVE_SO) @@ -1195,35 +1066,25 @@ AC_ARG_WITH(mzc, AS_HELP_STRING([--with-mzc=path], [Set location of MzScheme's m # First, check for "--without-mzscheme" or "--with-mzscheme=no". if test x"${MZSCHEMEBIN}" = xno -o x"${with_alllang}" = xno ; then - AC_MSG_NOTICE([Disabling MzScheme]) - MZC= +AC_MSG_NOTICE([Disabling MzScheme]) +MZC= else - if test "x$MZSCHEMEBIN" = xyes; then - AC_PATH_PROG(MZSCHEME, mzscheme) - else - MZSCHEME="$MZSCHEMEBIN" - fi - - if test -z "$MZCBIN"; then - AC_PATH_PROG(MZC, mzc) - fi - if test -n "$MZSCHEME"; then - AC_MSG_CHECKING(for MzScheme dynext object) - MZDYNOBJ=`$MZSCHEME --eval '(begin (require dynext/link) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (printf "~a" x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` - if test -f "$MZDYNOBJ"; then - MZDYNOBJ="$MZDYNOBJ" - else - # older versions (3.72 approx and earlier) - MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` - fi - if test -f "$MZDYNOBJ"; then - AC_MSG_RESULT($MZDYNOBJ) - else - AC_MSG_RESULT(not found) - MZDYNOBJ="" - fi - fi +if test "x$MZSCHEMEBIN" = xyes; then + AC_PATH_PROG(MZSCHEME, mzscheme) +else + MZSCHEME="$MZSCHEMEBIN" +fi + +if test -z "$MZCBIN"; then + AC_PATH_PROG(MZC, mzc) +fi + +if test -n "$MZSCHEME"; then +AC_MSG_CHECKING(for MzScheme dynext object) +MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) (expand-for-link-variant (current-standard-link-libraries)))))'` +AC_MSG_RESULT($MZDYNOBJ) +fi fi AC_SUBST(MZDYNOBJ) @@ -1253,7 +1114,7 @@ fi AC_MSG_CHECKING(for Ruby header files) if test -n "$RUBY"; then RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null` - if test x"$RUBYDIR" != x""; then + if test "$RUBYDIR" != ""; then dirs="$RUBYDIR" RUBYINCLUDE=none for i in $dirs; do @@ -1352,37 +1213,37 @@ AC_SUBST(RUBYDYNAMICLINKING) # Look for PHP #------------------------------------------------------------------------- -PHPBIN= +PHP4BIN= -AC_ARG_WITH(php, AS_HELP_STRING([--without-php], [Disable PHP]) -AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHPBIN="$withval"], [PHPBIN=yes]) +AC_ARG_WITH(php4, AS_HELP_STRING([--without-php4], [Disable PHP]) +AS_HELP_STRING([--with-php4=path], [Set location of PHP executable]),[ PHP4BIN="$withval"], [PHP4BIN=yes]) -# First, check for "--without-php" or "--with-php=no". -if test x"${PHPBIN}" = xno -o x"${with_alllang}" = xno ; then +# First, check for "--without-php4" or "--with-php4=no". +if test x"${PHP4BIN}" = xno -o x"${with_alllang}" = xno ; then AC_MSG_NOTICE([Disabling PHP]) - PHP= + PHP4= else - if test "x$PHPBIN" = xyes; then - AC_CHECK_PROGS(PHP, [php5 php]) + if test "x$PHP4BIN" = xyes; then + AC_CHECK_PROGS(PHP4, [php5 php]) else - PHP=$PHPBIN + PHP4=$PHP4BIN fi AC_MSG_CHECKING(for PHP header files) dnl /usr/bin/php5 -> /usr/bin/php-config5 - case $PHP in + case $PHP4 in *5) - PHPCONFIG=`echo "$PHP"|sed 's/5$/-config5/'` ;; + PHP4CONFIG=`echo "$PHP4"|sed 's/5$/-config5/'` ;; *) - PHPCONFIG=$PHP-config ;; + PHP4CONFIG=$PHP4-config ;; esac - php_version=`$PHPCONFIG --version 2>/dev/null` + php_version=`$PHP4CONFIG --version 2>/dev/null` case $php_version in 5*) - PHPINC=`$PHPCONFIG --includes 2>/dev/null` - if test -n "$PHPINC"; then - AC_MSG_RESULT($PHPINC) + PHP4INC=`$PHP4CONFIG --includes 2>/dev/null` + if test -n "$PHP4INC"; then + AC_MSG_RESULT($PHP4INC) else AC_MSG_RESULT(not found) fi @@ -1391,8 +1252,8 @@ else AC_MSG_RESULT([found PHP $version, but only PHP 5 is supported]) ;; esac fi -AC_SUBST(PHP) -AC_SUBST(PHPINC) +AC_SUBST(PHP4) +AC_SUBST(PHP4INC) #---------------------------------------------------------------- # Look for ocaml @@ -1998,17 +1859,11 @@ AC_SUBST(SKIP_OCTAVE) SKIP_PYTHON= -if (test -z "$PYINCLUDE" || test -z "$PYLIB") && - (test -z "$PY3INCLUDE" || test -z "PY3LIB") ; then +if test -z "$PYINCLUDE" || test -z "$PYLIB" ; then SKIP_PYTHON="1" fi AC_SUBST(SKIP_PYTHON) -SKIP_PYTHON3= -if test -z "$PY3INCLUDE" || test -z "$PY3LIB" ; then - SKIP_PYTHON3="1" -fi -AC_SUBST(SKIP_PYTHON3) SKIP_JAVA= if test -z "$JAVA" || test -z "$JAVAC" || test -z "$JAVAINC" ; then @@ -2031,7 +1886,7 @@ AC_SUBST(SKIP_GUILESCM) SKIP_MZSCHEME= -if test -z "$MZC" || test -z "$MZDYNOBJ" ; then +if test -z "$MZC" ; then SKIP_MZSCHEME="1" fi AC_SUBST(SKIP_MZSCHEME) @@ -2044,11 +1899,11 @@ fi AC_SUBST(SKIP_RUBY) -SKIP_PHP= -if test -z "$PHP" || test -z "$PHPINC" ; then - SKIP_PHP="1" +SKIP_PHP4= +if test -z "$PHP4" || test -z "$PHP4INC" ; then + SKIP_PHP4="1" fi -AC_SUBST(SKIP_PHP) +AC_SUBST(SKIP_PHP4) SKIP_OCAML= @@ -2146,7 +2001,6 @@ AC_SUBST(SKIP_GCJ) # Miscellaneous #---------------------------------------------------------------- - # Root directory # Translate path for native Windows compilers for use with 'make check' ROOT_DIR=`pwd` @@ -2179,6 +2033,7 @@ case $host in esac AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)]) + AC_CONFIG_FILES([ \ Makefile \ swig.spec \ @@ -2197,7 +2052,7 @@ AC_CONFIG_FILES([ \ Examples/test-suite/ocaml/Makefile \ Examples/test-suite/octave/Makefile \ Examples/test-suite/perl5/Makefile \ - Examples/test-suite/php/Makefile \ + Examples/test-suite/php4/Makefile \ Examples/test-suite/pike/Makefile \ Examples/test-suite/python/Makefile \ Examples/test-suite/ruby/Makefile \ @@ -2208,11 +2063,11 @@ AC_CONFIG_FILES([ \ Examples/test-suite/cffi/Makefile \ Examples/test-suite/uffi/Makefile \ Examples/test-suite/r/Makefile \ - Examples/test-suite/c/Makefile \ + Examples/test-suite/c/Makefile \ Lib/ocaml/swigp4.ml ]) AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig]) -AC_CONFIG_FILES([CCache/ccache_swig_config.h]) - AC_OUTPUT + + dnl configure.in ends here From 1acc0167d14d79f8800423c4d6232c0c276b6768 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 6 May 2012 01:17:11 +0000 Subject: [PATCH 058/508] Revert rev 10606 "Merged revisions 10498-10499,10503-10504,10506,10508,10511,10515-10516,10518-10519,10527,10530-10531,10536-10537,10539-10552,10558-10568,10574-10580,10582,10584,10588-10589,10594 via svnmerge from " This reverts commit 379b9bcdf44dcd87c5eca7eb9a773aea793e7caf. From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13034 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 10 +- CHANGES | 159 +----------------- CHANGES.current | 103 ++++++++++++ Doc/Manual/Contents.html | 3 +- Doc/Manual/Java.html | 21 --- Doc/Manual/SWIGPlus.html | 5 +- Doc/Manual/Sections.html | 2 +- Doc/Manual/Typemaps.html | 15 +- Doc/Manual/Warnings.html | 2 +- Examples/Makefile.in | 17 +- Examples/guile/multimap/example.i | 4 +- Examples/guile/multivalue/example.i | 6 - Examples/lua/arrays/example.c | 2 +- Examples/lua/embed2/embed2.c | 13 +- Examples/lua/embed3/embed3.cpp | 14 +- Examples/lua/owner/example.cxx | 4 +- Examples/perl5/import/base.h | 2 +- Examples/perl5/multiple_inheritance/example.h | 23 +-- Examples/ruby/class/example.dsp | 4 +- Examples/ruby/free_function/example.cxx | 2 +- Examples/ruby/free_function/example.dsp | 4 +- Examples/ruby/import/bar.dsp | 4 +- Examples/ruby/import/base.dsp | 4 +- Examples/ruby/import/foo.dsp | 4 +- Examples/ruby/import/spam.dsp | 4 +- Examples/ruby/mark_function/example.dsp | 4 +- Examples/tcl/import/base.h | 2 +- Examples/test-suite/apply_signed_char.i | 2 - Examples/test-suite/bools.i | 2 - Examples/test-suite/char_strings.i | 2 +- Examples/test-suite/chicken/Makefile.in | 12 +- Examples/test-suite/common.mk | 2 - Examples/test-suite/constant_pointers.i | 6 - Examples/test-suite/cpp_basic.i | 2 - Examples/test-suite/csharp/Makefile.in | 4 +- .../test-suite/csharp/char_strings_runme.cs | 2 +- Examples/test-suite/enum_thorough.i | 2 - Examples/test-suite/fvirtual.i | 4 +- Examples/test-suite/guilescm/Makefile.in | 8 +- Examples/test-suite/java/Makefile.in | 4 +- .../test-suite/java/char_strings_runme.java | 2 +- Examples/test-suite/java_typemaps_proxy.i | 2 - Examples/test-suite/keyword_rename.i | 32 ---- Examples/test-suite/li_std_string.i | 2 +- Examples/test-suite/lua/li_typemaps_runme.lua | 40 ----- Examples/test-suite/minherit.i | 2 +- Examples/test-suite/octave/fvirtual_runme.m | 2 +- .../test-suite/octave/li_std_string_runme.m | 2 +- .../test-suite/perl5/li_std_string_runme.pl | 4 +- Examples/test-suite/perl5/run-perl-test.pl | 2 +- Examples/test-suite/php4/Makefile.in | 6 +- Examples/test-suite/python/fvirtual_runme.py | 2 +- .../test-suite/python/keyword_rename_runme.py | 4 - .../test-suite/python/li_std_string_runme.py | 2 +- Examples/test-suite/r/Makefile.in | 4 +- .../test-suite/ruby/li_std_string_runme.rb | 2 +- Examples/test-suite/samename.i | 13 +- Examples/test-suite/template_int_const.i | 8 +- Examples/test-suite/template_typedef_rec.i | 6 +- Examples/test-suite/typemap_namespace.i | 2 +- Lib/chicken/chickenkw.swg | 2 +- Lib/csharp/csharphead.swg | 4 +- Lib/csharp/csharpkw.swg | 2 +- Lib/java/director.swg | 10 +- Lib/java/javakw.swg | 2 +- Lib/java/various.i | 2 +- Lib/lua/luatypemaps.swg | 4 +- Lib/lua/typemaps.i | 21 --- Lib/ocaml/ocamlkw.swg | 2 +- Lib/perl5/perlkw.swg | 4 +- Lib/php4/php4kw.swg | 10 +- Lib/pike/pikekw.swg | 2 +- Lib/python/pycontainer.swg | 4 +- Lib/python/pyiterators.swg | 6 +- Lib/python/pythonkw.swg | 4 +- Lib/r/r.swg | 2 - Lib/r/rkw.swg | 32 ---- Lib/ruby/rubycontainer.swg | 6 +- Lib/ruby/rubykw.swg | 2 +- Lib/swiglabels.swg | 6 - Lib/typemaps/primtypes.swg | 1 - README | 9 +- Source/CParse/cscanner.c | 2 +- Source/CParse/parser.y | 29 ++-- Source/CParse/templ.c | 4 +- Source/DOH/hash.c | 31 ++-- Source/Modules/allegrocl.cxx | 32 ++-- Source/Modules/chicken.cxx | 13 +- Source/Modules/csharp.cxx | 41 ++--- Source/Modules/guile.cxx | 2 +- Source/Modules/java.cxx | 35 ++-- Source/Modules/lang.cxx | 57 ++++--- Source/Modules/lua.cxx | 4 + Source/Modules/main.cxx | 10 +- Source/Modules/modula3.cxx | 4 +- Source/Modules/php4.cxx | 93 +++++----- Source/Modules/python.cxx | 1 + Source/Modules/r.cxx | 17 +- Source/Modules/ruby.cxx | 10 +- Source/Preprocessor/cpp.c | 5 +- Source/Swig/cwrap.c | 3 +- Source/Swig/include.c | 3 +- Source/Swig/misc.c | 23 +-- Source/Swig/naming.c | 6 +- Source/Swig/scanner.c | 4 +- Source/Swig/typeobj.c | 3 +- Source/Swig/typesys.c | 15 +- TODO | 2 +- Tools/WAD/Python/type.c | 2 +- Tools/mkrelease.py | 8 +- configure.in | 15 +- 111 files changed, 482 insertions(+), 757 deletions(-) delete mode 100644 Examples/test-suite/keyword_rename.i delete mode 100644 Examples/test-suite/lua/li_typemaps_runme.lua delete mode 100644 Examples/test-suite/python/keyword_rename_runme.py delete mode 100644 Lib/r/rkw.swg diff --git a/ANNOUNCE b/ANNOUNCE index 7c0e95e3f..0fb688344 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,10 +1,10 @@ -*** ANNOUNCE: SWIG 1.3.36 (24 June 2008) *** +*** ANNOUNCE: SWIG 1.3.35 (7 April 2008) *** http://www.swig.org -We're pleased to announce SWIG-1.3.36, the latest installment in the -SWIG development effort. SWIG-1.3.36 includes a number of bug fixes +We're pleased to announce SWIG-1.3.35, the latest installment in the +SWIG development effort. SWIG-1.3.35 includes a number of bug fixes and large number of enhancements throughout. What is SWIG? @@ -24,11 +24,11 @@ Availability: ------------- The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-1.3.36.tar.gz + http://prdownloads.sourceforge.net/swig/swig-1.3.35.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-1.3.36.zip + http://prdownloads.sourceforge.net/swig/swigwin-1.3.35.zip Release numbers --------------- diff --git a/CHANGES b/CHANGES index 782849c6f..fc3018a1d 100644 --- a/CHANGES +++ b/CHANGES @@ -2,162 +2,6 @@ SWIG (Simplified Wrapper and Interface Generator) See CHANGES.current for current version. -Version 1.3.36 (24 June 2008) -============================= - -06/24/2008: wsfulton - Remove deprecated -c commandline option (runtime library generation). - -06/24/2008: olly - [PHP] Fix assertion failure when handling %typemap(in,numinputs=0) - (testcase ignore_parameter). - -06/24/2008: olly - [PHP] Fix segfault when wrapping a non-class function marked with - %newobject (testcase char_strings). - -06/22/2008: wsfulton - [Java] Add a way to use AttachCurrentThreadAsDaemon instead of AttachCurrentThread - in director code. Define the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro, see - Lib/java/director.swg. - -06/21/2008: wsfulton - [Ruby] Fix crashing in the STL wrappers (reject! and delete_if methods) - -06/19/2008: wsfulton - [Java, C#] C# and Java keywords will be renamed instead of just issuing a warning - and then generating uncompileable code. Warning 314 gives the new name when a - keyword is found. - -06/19/2008: wsfulton - [R] Keyword handling added. R Keywords will be renamed as necessary. - Warning 314 gives the new name when a keyword is found. - -06/17/2008: mgossage - [Lua] Added missing support for bool& and bool*. Added runtest for li_typemaps testcase. - (Bug #1938142) - -06/07/2008: bhy - Added test case keyword_rename, then made the keyword renaming works properly - by fixing Swig_name_make() for a incomplete condition checking. - -06/02/2008: wsfulton - [Java, C#] Fix enum wrappers when using -noproxy. - -05/30/2008: bhy - Added std::wstring into Lib/typemaps/primtypes.swg, since it is also a primitive - type in SWIG - fixed SF #1976978. - -05/29/2008: wsfulton - [Java, C#] Fix variable wrappers when using -noproxy. - -05/29/2008: bhy - [Python] Fixed a typo of %#ifdef in Lib/python/pycontainer.swg, which is related - to -extranative SWIG option - SF #1971977. - -05/20/2008: wsfulton - New partialcheck makefile targets for partial testing of the test-suite. These - just invoke SWIG, ie no compilation and no runtime testing. It can be faster - when developing by just doing a directory diff of the files SWIG generates - against those from a previous run. Example usage from the top level directory: - - make partialcheck-test-suite - make partialcheck-java-test-suite - - This change also encompasses more flexibility in running the test-suite, eg - it is possible to prefix the command line which runs any target language test - with a tool. See the RUNTOOL, COMPILETOOL and SWIGTOOL targets in the common.mk - file and makefiles in the test-suite directory. For example it is possible to - run the runtime tests through valgrind using: - - make check RUNTOOL="valgrind --leak-check=full" - - or invoke SWIG under valgrind using: - - make check SWIGTOOL="valgrind --tool=memcheck" - -05/19/2008: drjoe - [R] Fixed define that was breaking pre-2.7. Checked in - patch from Soren Sonnenburg that creates strings in - version independent way - -05/15/2008: wsfulton - [Java] Fix variable name clash in directors - SF #1963316 reported by Tristan. - -05/14/2008: wsfulton - Add an optimisation for functions that return objects by value, reducing - the number of copies of the object that are made. Implemented using an - optional attribute in the "out" typemap called "optimal". Details in - Typemaps.html. - -05/11/2008: olly - [PHP] Check for %feature("notabstract") when generating PHP5 class - wrapper. - -05/11/2008: wsfulton - Fix SF #1943608 - $self substitution in %contract, patch submitted by - Toon Verstraelen. - -05/09/2008: olly - [PHP] Fix char * typemaps to work when applied to signed char * and - unsigned char * (uncovered by testcase apply_strings). - -05/09/2008: wsfulton - Fix wrapping of char * member variables when using allprotected mode. - Bug reported by Warren Wang. - -05/09/2008: olly - [PHP] Fix bad PHP code generated when wrapping an enum in a - namespace (uncovered by testcase arrays_scope). - -05/09/2008: olly - [PHP] SWIG now runs the PHP testsuite using PHP5, not PHP4. PHP4 - is essentially obsolete now, so we care much more about solid PHP5 - support. - -05/07/2008: wsfulton - STL fixes when using %import rather than %include and the Solaris Workshop - compiler and the Roguewave STL. - -05/07/2008: wsfulton - Fix wrapping of overloaded protected methods when using allprotected mode. - Bug reported by Warren Wang. - -05/03/2008: wsfulton - Commit patch #1956607 to add -MT support from Richard Boulton. - This patch mirrors the gcc -MT option which allows one to change the default - Makefile target being generated when generating makefiles with the -M family - of options. For example: - - $ swig -java -MM -MT overiddenname -c++ example.i - overiddenname: \ - example.i \ - example.h - -04/30/2008: mgossage - [Lua] Removed generation of _wrap_delete_XXXXX (wrappered destructor) - which was unused and causing warning with g++ -Wall. - Removed other unused warning in typemaps.i and other places. - Added Examples/lua/embed3, and run tests a few test cases. - -04/24/2008: olly - [Python] Fix generated code for IBM's C++ compiler on AIX (patch - from Goeran Uddeborg in SF#1928048). - -04/24/2008: olly - Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to - avoid a clash with BSIZE defined by headers on AIX with Perl - (reported in SF#1928048). - -04/20/2008: wsfulton - Add the ability to wrap all protected members when using directors. - Previously only the virtual methods were available to the target language. - Now all protected members, (static and non-static variables, non-virtual methods - and static methods) are wrapped when using the allprotected mode. The allprotected - mode is turned on in the module declaration: - - %module(directors="1", allprotected="1") modulename - Version 1.3.35 (7 April 2008) ============================= @@ -12279,8 +12123,7 @@ Version 1.3.14 (August 12, 2002) with helper functions even if they aren't used. To fix this, a new fragment directive is available. For example: - (corrected typo in line below - 06/26/2008) - %fragment("type_header","header") %{ + %fragment("type_helper","header") %{ void some_helper_function() { ... } diff --git a/CHANGES.current b/CHANGES.current index ef3fcca54..27e9925d2 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -1,3 +1,106 @@ Version 1.3.36 (in progress) ============================= +05/20/2008: wsfulton + New partialcheck makefile targets for partial testing of the test-suite. These + just invoke SWIG, ie no compilation and no runtime testing. It can be faster + when developing by just doing a directory diff of the files SWIG generates + against those from a previous run. Example usage from the top level directory: + + make partialcheck-test-suite + make partialcheck-java-test-suite + + This change also encompasses more flexibility in running the test-suite, eg + it is possible to prefix the command line which runs any target language test + with a tool. See the RUNTOOL, COMPILETOOL and SWIGTOOL targets in the common.mk + file and makefiles in the test-suite directory. For example it is possible to + run the runtime tests through valgrind using: + + make check RUNTOOL="valgrind --leak-check=full" + + or invoke SWIG under valgrind using: + + make check SWIGTOOL="valgrind --tool=memcheck" + +05/19/2008: drjoe + [R] Fixed define that was breaking pre-2.7. Checked in + patch from Soren Sonnenburg that creates strings in + version independent way + +05/15/2008: wsfulton + [Java] Fix variable name clash in directors - SF #1963316 reported by Tristan. + +05/14/2008: wsfulton + Add an optimisation for functions that return objects by value, reducing + the number of copies of the object that are made. Implemented using an + optional attribute in the "out" typemap called "optimal". Details in + Typemaps.html. + +05/11/2008: olly + [PHP] Check for %feature("notabstract") when generating PHP5 class + wrapper. + +05/11/2008: wsfulton + Fix SF #1943608 - $self substitution in %contract, patch submitted by + Toon Verstraelen. + +05/09/2008: olly + [PHP] Fix char * typemaps to work when applied to signed char * and + unsigned char * (uncovered by testcase apply_strings). + +05/09/2008: wsfulton + Fix wrapping of char * member variables when using allprotected mode. + Bug reported by Warren Wang. + +05/09/2008: olly + [PHP] Fix bad PHP code generated when wrapping an enum in a + namespace (uncovered by testcase arrays_scope). + +05/09/2008: olly + [PHP] SWIG now runs the PHP testsuite using PHP5, not PHP4. PHP4 + is essentially obsolete now, so we care much more about solid PHP5 + support. + +05/07/2008: wsfulton + STL fixes when using %import rather than %include and the Solaris Workshop + compiler and the Roguewave STL. + +05/07/2008: wsfulton + Fix wrapping of overloaded protected methods when using allprotected mode. + Bug reported by Warren Wang. + +05/03/2008: wsfulton + Commit patch #1956607 to add -MT support from Richard Boulton. + This patch mirrors the gcc -MT option which allows one to change the default + Makefile target being generated when generating makefiles with the -M family + of options. For example: + + $ swig -java -MM -MT overiddenname -c++ example.i + overiddenname: \ + example.i \ + example.h + +04/30/2008: mgossage + [Lua] Removed generation of _wrap_delete_XXXXX (wrappered destructor) + which was unused and causing warning with g++ -Wall. + Removed other unused warning in typemaps.i and other places. + Added Examples/lua/embed3, and run tests a few test cases. + +04/24/2008: olly + [Python] Fix generated code for IBM's C++ compiler on AIX (patch + from Goeran Uddeborg in SF#1928048). + +04/24/2008: olly + Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to + avoid a clash with BSIZE defined by headers on AIX with Perl + (reported in SF#1928048). + +04/20/2008: wsfulton + Add the ability to wrap all protected members when using directors. + Previously only the virtual methods were available to the target language. + Now all protected members, (static and non-static variables, non-virtual methods + and static methods) are wrapped when using the allprotected mode. The allprotected + mode is turned on in the module declaration: + + %module(directors="1", allprotected="1") modulename + diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index c3197b9dc..5c7a18eaf 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -380,7 +380,7 @@
    • Typemaps for multiple languages
    • Optimal code generation when returning by value -
    • Multi-argument typemaps +
    • Multi-argument typemaps
    • The run-time type checker
    • Accessing protected members
    • Common customization features diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 164fc21e7..88963caf5 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -85,7 +85,6 @@
    • Director classes
    • Overhead and code bloat
    • Simple directors example -
    • Director threading issues
    • Accessing protected members
    • Common customization features @@ -3451,26 +3450,6 @@ DirectorDerived::upcall_method() invoked. -

      20.5.5 Director threading issues

      - - -

      -Depending on your operating system and version of Java and how you are using threads, you might find the JVM hangs on exit. -There are a couple of solutions to try out. The preferred solution requires jdk-1.4 and later and uses AttachCurrentThreadAsDaemon instead of AttachCurrentThread whenever a call into the JVM is required. This can be enabled by defining the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro when compiling the C++ wrapper code. For older JVMs define SWIG_JAVA_NO_DETACH_CURRENT_THREAD instead, to avoid the DetachCurrentThread call but this will result in a memory leak instead. For further details inspect the source code in the java/director.swg library file. -

      - -

      -Macros can be defined on the commandline when compiling your C++ code, or alternatively added to the C++ wrapper file as shown below: -

      - -
      -
      -%insert("runtime") %{
-#define SWIG_JAVA_NO_DETACH_CURRENT_THREAD
-%}
-
      -
      -

      20.6 Accessing protected members

      diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html index ef7487ff8..faf0b254c 100644 --- a/Doc/Manual/SWIGPlus.html +++ b/Doc/Manual/SWIGPlus.html @@ -1153,9 +1153,8 @@ public:

      -This is great for reducing the size of the wrappers, but the caveat is it does not work for the statically typed languages, -such as C# and Java, -which don't have optional arguments in the language, +This is great for reducing the size of the wrappers, but the caveat is it does not work for the strongly typed languages +which don't have optional arguments in the language, such as C# and Java. Another restriction of this feature is that it cannot handle default arguments that are not public. The following example illustrates this:

      diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html index 5406f44ea..b7b4798e7 100644 --- a/Doc/Manual/Sections.html +++ b/Doc/Manual/Sections.html @@ -6,7 +6,7 @@

      SWIG-1.3 Development Documentation

      -Last update : SWIG-1.3.37 (in progress) +Last update : SWIG-1.3.36 (in progress)

      Sections

      diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html index 8f3035dc8..e07f9f87e 100644 --- a/Doc/Manual/Typemaps.html +++ b/Doc/Manual/Typemaps.html @@ -65,7 +65,7 @@
    • Typemaps for multiple languages
    • Optimal code generation when returning by value -
    • Multi-argument typemaps +
    • Multi-argument typemaps
    • The run-time type checker
      • Implementation @@ -702,7 +702,7 @@ variables (parms). The purpose of these variables will be explained shortly.

        code specifies the code used in the typemap. -Usually this is C/C++ code, but in the statically typed target languages, such as Java and C#, this can contain target language code for certain typemaps. +Usually this is C/C++ code, but in the strongly typed target languages, such as Java and C#, this can contain target language code for certain typemaps. It can take any one of the following forms:

        @@ -1933,7 +1933,7 @@ to implement customized conversions.

        In addition, the "in" typemap allows the number of converted arguments to be -specified. The numinputs attributes facilitates this. For example: +specified. For example:

        @@ -1946,12 +1946,7 @@ specified. The numinputs attributes facilitates this. For example:

        -At this time, only zero or one arguments may be converted. -When numinputs is set to 0, the argument is effectively ignored and cannot be supplied from the target language. -The argument is still required when making the C/C++ call and the above typemap -shows the value used is instead obtained from a locally declared variable called temp. -Usually numinputs is not specified, whereupon the default value is 1, that is, there is a one to one mapping of the number of arguments when used from the target language to the C/C++ call. -Multi-argument typemaps provide a similar concept where the number of arguments mapped from the target language to C/C++ can be changed for more tha multiple adjacent C/C++ arguments. +At this time, only zero or one arguments may be converted.

        @@ -2816,7 +2811,7 @@ optimal attribute usage in the out typemap at example.i:7. However, it doesn't always get it right, for example when $1 is within some commented out code.

        -

        10.9 Multi-argument typemaps

        +

        10.9 Multi-argument typemaps

        diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html index 0b3cb37e9..39d5d3f01 100644 --- a/Doc/Manual/Warnings.html +++ b/Doc/Manual/Warnings.html @@ -373,7 +373,7 @@ example.i(4): Syntax error in input.

      • 117. Deprecated %new directive.
      • 118. Deprecated %typemap(except).
      • 119. Deprecated %typemap(ignore). -
      • 120. Deprecated command line option (-runtime, -noruntime). +
      • 120. Deprecated command line option (-c).
      • 121. Deprecated %name directive.
      diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c47bb6a7b..d0235bb76 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -40,9 +40,8 @@ LIBCRYPT = @LIBCRYPT@ SYSLIBS = $(LIBM) $(LIBC) $(LIBCRYPT) LIBPREFIX = -# RUNTOOL is for use with runtime tools, eg set it to valgrind +# RUNTOOL is for use as with runtime tools, eg set it to valgrind RUNTOOL = -# COMPILETOOL is a way to run the compiler under another tool, or more commonly just to stop the compiler executing COMPILETOOL= # X11 options @@ -95,6 +94,8 @@ TK_OPTS = -ltk -ltcl @LIBS@ # Extra Tcl specific dynamic linking options TCL_DLNK = @TCLDYNAMICLINKING@ +TCL_LDSHARED = @TCL_LDSHARED@ +TCL_CXXSHARED = @TCL_CXXSHARED@ TCL_SO = @TCL_SO@ # ----------------------------------------------------------- @@ -134,7 +135,7 @@ wish_cpp: $(SRCS) tcl: $(SRCS) $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(TCL_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------- # Build a Tcl7.5 dynamic loadable module for C++ @@ -143,7 +144,7 @@ tcl: $(SRCS) tcl_cpp: $(SRCS) $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(TCL_CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) # ----------------------------------------------------------------- # Cleaning the Tcl examples @@ -879,11 +880,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) chicken: $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) - $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) + $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) chicken_cpp: $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) - $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) + $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) chicken_externalhdr: $(SWIG) -chicken -external-runtime $(TARGET) @@ -1077,11 +1078,11 @@ RRSRC = $(INTERFACE:.i=.R) r: $(SRCS) $(SWIG) -r $(SWIGOPT) $(INTERFACE) - +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) + +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) r_cpp: $(CXXSRCS) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE) - +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) + +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) r_clean: rm -f *_wrap* *~ .~* diff --git a/Examples/guile/multimap/example.i b/Examples/guile/multimap/example.i index 7337d1e9e..a1cc0bb67 100644 --- a/Examples/guile/multimap/example.i +++ b/Examples/guile/multimap/example.i @@ -20,7 +20,7 @@ extern int gcd(int x, int y); SCM *v; if (!(SCM_NIMP($input) && SCM_VECTORP($input))) { SWIG_exception(SWIG_ValueError, "Expecting a vector"); - return 0; + return; } $1 = SCM_LENGTH($input); if ($1 == 0) { @@ -32,7 +32,7 @@ extern int gcd(int x, int y); if (!(SCM_NIMP(v[i]) && SCM_STRINGP(v[i]))) { free($2); SWIG_exception(SWIG_ValueError, "Vector items must be strings"); - return 0; + return; } $2[i] = SCM_CHARS(v[i]); } diff --git a/Examples/guile/multivalue/example.i b/Examples/guile/multivalue/example.i index 135389487..abc2a6fbc 100644 --- a/Examples/guile/multivalue/example.i +++ b/Examples/guile/multivalue/example.i @@ -2,12 +2,6 @@ %module example; -%{ -void divide_l(int a, int b, int *quotient_p, int *remainder_p); -void divide_v(int a, int b, int *quotient_p, int *remainder_p); -void divide_mv(int a, int b, int *quotient_p, int *remainder_p); -%} - /* Multiple values as lists. By default, if more than one value is to be returned, a list of the values is created and returned; to switch back to this behavior, use: */ diff --git a/Examples/lua/arrays/example.c b/Examples/lua/arrays/example.c index 56c7b19d9..40ed12c79 100644 --- a/Examples/lua/arrays/example.c +++ b/Examples/lua/arrays/example.c @@ -16,7 +16,7 @@ void sort_int(int* arr, int len) // ditto doubles int compare_double(const void * a, const void * b) { - return (int)( *(double*)a - *(double*)b ); + return ( *(double*)a - *(double*)b ); } void sort_double(double* arr, int len) diff --git a/Examples/lua/embed2/embed2.c b/Examples/lua/embed2/embed2.c index dac527eb4..07b7a44d2 100644 --- a/Examples/lua/embed2/embed2.c +++ b/Examples/lua/embed2/embed2.c @@ -11,17 +11,6 @@ We will be using the luaL_dostring()/lua_dostring() function to call into lua */ -/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ -#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) -# define _CRT_SECURE_NO_DEPRECATE -#endif - -/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ -#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) -# define _SCL_SECURE_NO_DEPRECATE -#endif - - #include #include @@ -119,7 +108,7 @@ int call_va (lua_State *L,const char *func, const char *sig, ...) { endwhile: /* do the call */ - nres = (int)strlen(sig); /* number of expected results */ + nres = strlen(sig); /* number of expected results */ if (lua_pcall(L, narg, nres, 0) != 0) /* do the call */ { printf("error running function `%s': %s\n",func, lua_tostring(L, -1)); diff --git a/Examples/lua/embed3/embed3.cpp b/Examples/lua/embed3/embed3.cpp index c2424f9af..e42401cda 100644 --- a/Examples/lua/embed3/embed3.cpp +++ b/Examples/lua/embed3/embed3.cpp @@ -5,17 +5,6 @@ passing C++ objects to this function. */ -/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ -#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) -# define _CRT_SECURE_NO_DEPRECATE -#endif - -/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ -#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) -# define _SCL_SECURE_NO_DEPRECATE -#endif - - #include #include #include @@ -81,6 +70,9 @@ int call_onEvent(lua_State *L, Event e) { int main(int argc, char* argv[]) { + int ok; + int res; + char str[80]; printf("[C++] Welcome to the simple embedded Lua example v3\n"); printf("[C++] We are in C++\n"); printf("[C++] opening a Lua state & loading the libraries\n"); diff --git a/Examples/lua/owner/example.cxx b/Examples/lua/owner/example.cxx index d6caeef15..6e4091327 100644 --- a/Examples/lua/owner/example.cxx +++ b/Examples/lua/owner/example.cxx @@ -54,14 +54,14 @@ void ShapeOwner::add(Shape* ptr) // this method takes ownership of the object Shape* ShapeOwner::get(int idx) // this pointer is still owned by the class (assessor) { - if (idx < 0 || idx >= static_cast(shapes.size())) + if (idx<0 || idx>=shapes.size()) return NULL; return shapes[idx]; } Shape* ShapeOwner::remove(int idx) // this method returns memory which must be deleted { - if (idx < 0 || idx >= static_cast(shapes.size())) + if (idx<0 || idx>=shapes.size()) return NULL; Shape* ptr=shapes[idx]; shapes.erase(shapes.begin()+idx); diff --git a/Examples/perl5/import/base.h b/Examples/perl5/import/base.h index 5a266f68c..be3cdef7d 100644 --- a/Examples/perl5/import/base.h +++ b/Examples/perl5/import/base.h @@ -3,7 +3,7 @@ class Base { public: Base() { }; - virtual ~Base() { }; + ~Base() { }; virtual void A() { printf("I'm Base::A\n"); } diff --git a/Examples/perl5/multiple_inheritance/example.h b/Examples/perl5/multiple_inheritance/example.h index a8f544898..ce7dfe6a7 100644 --- a/Examples/perl5/multiple_inheritance/example.h +++ b/Examples/perl5/multiple_inheritance/example.h @@ -7,25 +7,26 @@ using namespace std; class Bar { public: - virtual void bar () { - cout << "bar" << endl; - } - virtual ~Bar() {} + virtual void bar () + { + cout << "bar" << endl; + } }; class Foo { public: - virtual void foo () { - cout << "foo" << endl; - } - virtual ~Foo() {} + virtual void foo () + { + cout << "foo" << endl; + } }; class Foo_Bar : public Foo, public Bar { public: - virtual void fooBar () { - cout << "foobar" << endl; - } + virtual void fooBar () + { + cout << "foobar" << endl; + } }; diff --git a/Examples/ruby/class/example.dsp b/Examples/ruby/class/example.dsp index 9a26322ec..49c480575 100644 --- a/Examples/ruby/class/example.dsp +++ b/Examples/ruby/class/example.dsp @@ -123,7 +123,7 @@ SOURCE=.\example.i InputPath=.\example.i InputName=example -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -138,7 +138,7 @@ InputName=example InputPath=.\example.i InputName=example -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/free_function/example.cxx b/Examples/ruby/free_function/example.cxx index 402a947e9..9e0d24b1a 100644 --- a/Examples/ruby/free_function/example.cxx +++ b/Examples/ruby/free_function/example.cxx @@ -23,7 +23,7 @@ Zoo::~Zoo() IterType iter = this->animals.begin(); IterType end = this->animals.end(); - for(; iter != end; ++iter) + for(iter; iter != end; ++iter) { Animal* animal = *iter; delete animal; diff --git a/Examples/ruby/free_function/example.dsp b/Examples/ruby/free_function/example.dsp index 9a26322ec..49c480575 100644 --- a/Examples/ruby/free_function/example.dsp +++ b/Examples/ruby/free_function/example.dsp @@ -123,7 +123,7 @@ SOURCE=.\example.i InputPath=.\example.i InputName=example -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -138,7 +138,7 @@ InputName=example InputPath=.\example.i InputName=example -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp index dd09ca021..e897f8d5c 100644 --- a/Examples/ruby/import/bar.dsp +++ b/Examples/ruby/import/bar.dsp @@ -115,7 +115,7 @@ SOURCE=.\bar.i InputPath=.\bar.i InputName=bar -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=bar InputPath=.\bar.i InputName=bar -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp index 2bd4fa243..45d2fe2ea 100644 --- a/Examples/ruby/import/base.dsp +++ b/Examples/ruby/import/base.dsp @@ -115,7 +115,7 @@ SOURCE=.\base.i InputPath=.\base.i InputName=base -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=base InputPath=.\base.i InputName=base -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp index 2a764bbd7..2dfba9d60 100644 --- a/Examples/ruby/import/foo.dsp +++ b/Examples/ruby/import/foo.dsp @@ -115,7 +115,7 @@ SOURCE=.\foo.i InputPath=.\foo.i InputName=foo -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=foo InputPath=.\foo.i InputName=foo -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp index d2d7158bb..0530b7303 100644 --- a/Examples/ruby/import/spam.dsp +++ b/Examples/ruby/import/spam.dsp @@ -115,7 +115,7 @@ SOURCE=.\spam.i InputPath=.\spam.i InputName=spam -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -130,7 +130,7 @@ InputName=spam InputPath=.\spam.i InputName=spam -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/ruby/mark_function/example.dsp b/Examples/ruby/mark_function/example.dsp index 9a26322ec..49c480575 100644 --- a/Examples/ruby/mark_function/example.dsp +++ b/Examples/ruby/mark_function/example.dsp @@ -123,7 +123,7 @@ SOURCE=.\example.i InputPath=.\example.i InputName=example -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% @@ -138,7 +138,7 @@ InputName=example InputPath=.\example.i InputName=example -"$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)_wrap.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" echo In order to function correctly, please ensure the following environment variables are correctly set: echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% diff --git a/Examples/tcl/import/base.h b/Examples/tcl/import/base.h index 5a266f68c..be3cdef7d 100644 --- a/Examples/tcl/import/base.h +++ b/Examples/tcl/import/base.h @@ -3,7 +3,7 @@ class Base { public: Base() { }; - virtual ~Base() { }; + ~Base() { }; virtual void A() { printf("I'm Base::A\n"); } diff --git a/Examples/test-suite/apply_signed_char.i b/Examples/test-suite/apply_signed_char.i index c0fa00cfe..ff1f1d83f 100644 --- a/Examples/test-suite/apply_signed_char.i +++ b/Examples/test-suite/apply_signed_char.i @@ -31,7 +31,5 @@ const char memberconstchar; virtual ~DirectorTest() {} - private: - DirectorTest& operator=(const DirectorTest &); }; %} diff --git a/Examples/test-suite/bools.i b/Examples/test-suite/bools.i index 7b94fcf88..40e8989bd 100644 --- a/Examples/test-suite/bools.i +++ b/Examples/test-suite/bools.i @@ -57,8 +57,6 @@ struct BoolStructure { m_rbool(m_bool2), m_const_pbool(m_pbool), m_const_rbool(m_rbool) {} -private: - BoolStructure& operator=(const BoolStructure &); }; %} diff --git a/Examples/test-suite/char_strings.i b/Examples/test-suite/char_strings.i index b06eba773..a91afaded 100644 --- a/Examples/test-suite/char_strings.i +++ b/Examples/test-suite/char_strings.i @@ -10,7 +10,7 @@ below. %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK_MSG) global_const_char; // Setting a const char * variable may leak memory. %{ -#define OTHERLAND_MSG "Little message from the safe world." +#define OTHERLAND_MSG "Little message from the the safe world." #define CPLUSPLUS_MSG "A message from the deep dark world of C++, where anything is possible." static char *global_str = NULL; const int UINT_DIGITS = 10; // max unsigned int is 4294967295 diff --git a/Examples/test-suite/chicken/Makefile.in b/Examples/test-suite/chicken/Makefile.in index ef6d7056c..0ac37d16a 100644 --- a/Examples/test-suite/chicken/Makefile.in +++ b/Examples/test-suite/chicken/Makefile.in @@ -40,7 +40,7 @@ SWIGOPT += -nounit $(setup) +$(swig_and_compile_c) $(run_testcase) - if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \ + +if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \ $(MAKE) $*.cproxy; ) \ fi; @@ -54,7 +54,7 @@ SWIGOPT += -nounit %.externaltest: $(setup) - +$(swig_and_compile_external) + $(swig_and_compile_external) $(run_testcase) # Runs the testcase. A testcase is only run if @@ -69,21 +69,21 @@ run_testcase = \ %.cppproxy: SWIGOPT += -proxy %.cppproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.cppproxy: - echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" - +$(swig_and_compile_cpp) + echo "Checking testcase $* (with run test) under chicken with -proxy" + $(swig_and_compile_cpp) $(run_testcase) %.cproxy: SWIGOPT += -proxy %.cproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.cproxy: - echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" + echo "Checking testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_c) $(run_testcase) %.multiproxy: SWIGOPT += -proxy -noclosuses %.multiproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.multiproxy: - echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" + echo "Checking testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_multi_cpp) $(run_testcase) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index d2e4f96a7..e344efc41 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -203,7 +203,6 @@ CPP_TEST_CASES += \ inherit_target_language \ inherit_void_arg \ inline_initializer \ - keyword_rename \ kind \ langobj \ li_attribute \ @@ -424,7 +423,6 @@ C_TEST_CASES += \ immutable \ inctest \ integers \ - keyword_rename \ lextype \ li_carrays \ li_cdata \ diff --git a/Examples/test-suite/constant_pointers.i b/Examples/test-suite/constant_pointers.i index 5bd2fd533..367baf49c 100644 --- a/Examples/test-suite/constant_pointers.i +++ b/Examples/test-suite/constant_pointers.i @@ -46,8 +46,6 @@ public: int* array_member1[ARRAY_SIZE]; ParametersTest* array_member2[ARRAY_SIZE]; MemberVariablesTest() : member3(NULL), member4(NULL) {} -private: - MemberVariablesTest& operator=(const MemberVariablesTest&); }; void foo(const int *const i) {} @@ -71,8 +69,6 @@ public: void ret6(int*& a) {} int*& ret7() {return GlobalIntPtr;} ReturnValuesTest() : int3(NULL) {} -private: - ReturnValuesTest& operator=(const ReturnValuesTest&); }; const int* globalRet1() {return &GlobalInt;} @@ -104,8 +100,6 @@ int* const globalRet2() {return &GlobalInt;} A* ap; const A* cap; Acptr acptr; - private: - B& operator=(const B&); }; const B* bar(const B* b) { diff --git a/Examples/test-suite/cpp_basic.i b/Examples/test-suite/cpp_basic.i index a247dd268..becf84708 100644 --- a/Examples/test-suite/cpp_basic.i +++ b/Examples/test-suite/cpp_basic.i @@ -55,8 +55,6 @@ class Bar { Foo *testFoo(int a, Foo *f) { return new Foo(2 * a + (f ? f->num : 0) + fval.num); } -private: - Bar& operator=(const Bar&); }; %} diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in index 5fd576ed8..44a1b3675 100644 --- a/Examples/test-suite/csharp/Makefile.in +++ b/Examples/test-suite/csharp/Makefile.in @@ -51,9 +51,9 @@ intermediary_classname.customtest: # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ + echo "Checking testcase $* under $(LANGUAGE)" ; \ fi; \ if [ ! -d $* ]; then \ mkdir $*; \ diff --git a/Examples/test-suite/csharp/char_strings_runme.cs b/Examples/test-suite/csharp/char_strings_runme.cs index a8907fb16..a1e878016 100644 --- a/Examples/test-suite/csharp/char_strings_runme.cs +++ b/Examples/test-suite/csharp/char_strings_runme.cs @@ -5,7 +5,7 @@ using char_stringsNamespace; public class char_strings_runme { private static string CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; - private static string OTHERLAND_MSG = "Little message from the safe world."; + private static string OTHERLAND_MSG = "Little message from the the safe world."; public static void Main() { diff --git a/Examples/test-suite/enum_thorough.i b/Examples/test-suite/enum_thorough.i index 31e3e2105..4aa0613f2 100644 --- a/Examples/test-suite/enum_thorough.i +++ b/Examples/test-suite/enum_thorough.i @@ -81,8 +81,6 @@ struct SpeedClass { const colour myColour2; speedtd1 mySpeedtd1; SpeedClass() : myColour2(red), mySpeedtd1(slow) { } -private: - SpeedClass& operator=(const SpeedClass&); }; int speedTest0(int s) { return s; } diff --git a/Examples/test-suite/fvirtual.i b/Examples/test-suite/fvirtual.i index af189ed1f..074202bee 100644 --- a/Examples/test-suite/fvirtual.i +++ b/Examples/test-suite/fvirtual.i @@ -10,11 +10,11 @@ virtual ~Node() {} }; - class NodeSwitch : public Node { + class Switch : public Node { public : virtual int addChild( Node *child ) { return 2; } // This was hidden with -fvirtual virtual int addChild( Node *child, bool value ) { return 3; } - virtual ~NodeSwitch() {} + virtual ~Switch() {} }; %} diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilescm/Makefile.in index 04de236db..285426ee8 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilescm/Makefile.in @@ -21,9 +21,9 @@ run_testcase = \ setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "Checking testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ + echo "Checking testcase $* under $(LANGUAGE) (with SCM API)" ; \ fi; swig_and_compile_multi_cpp = \ @@ -43,9 +43,9 @@ swig_and_compile_multi_cpp = \ # Same as setup and run_testcase, but without the SCRIPTPREFIX (so the runme comes from the guilescm directory) local_setup = \ if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "Checking testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ + echo "Checking testcase $* under $(LANGUAGE) (with SCM API)" ; \ fi; local_run_testcase = \ diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index ace8dee86..53816f6d0 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -57,9 +57,9 @@ SWIGOPT += -package $* # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ + echo "Checking testcase $* under $(LANGUAGE)" ; \ fi; \ if [ ! -d $* ]; then \ mkdir $*; \ diff --git a/Examples/test-suite/java/char_strings_runme.java b/Examples/test-suite/java/char_strings_runme.java index 2c71d3ea7..2e62080f5 100644 --- a/Examples/test-suite/java/char_strings_runme.java +++ b/Examples/test-suite/java/char_strings_runme.java @@ -12,7 +12,7 @@ public class char_strings_runme { } private static String CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; - private static String OTHERLAND_MSG = "Little message from the safe world."; + private static String OTHERLAND_MSG = "Little message from the the safe world."; public static void main(String argv[]) { diff --git a/Examples/test-suite/java_typemaps_proxy.i b/Examples/test-suite/java_typemaps_proxy.i index e315a36b5..5a1e61bb2 100644 --- a/Examples/test-suite/java_typemaps_proxy.i +++ b/Examples/test-suite/java_typemaps_proxy.i @@ -119,8 +119,6 @@ public: void const_member_method(const ConstWithout *p) const {} const ConstWithout * const_var; const ConstWithout * const var_const; -private: - ConstWithout& operator=(const ConstWithout &); }; const ConstWithout * global_constwithout = 0; void global_method_constwithout(const ConstWithout *p) {} diff --git a/Examples/test-suite/keyword_rename.i b/Examples/test-suite/keyword_rename.i deleted file mode 100644 index da9328868..000000000 --- a/Examples/test-suite/keyword_rename.i +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Test reserved keyword renaming - */ - -%module keyword_rename - -#pragma SWIG nowarn=SWIGWARN_PARSE_KEYWORD - -%inline %{ - -#define KW(x, y) int x (int y) { return y; } - -/* Python keywords */ -KW(in, except) -KW(except, in) -KW(pass, in) - -/* Perl keywords */ -KW(tie, die) -KW(use, next) - -/* Java keywords */ -KW(implements, native) -KW(synchronized, final) - -/* C# Keywords */ -KW(string, out) -struct sealed {int i;}; - -%} - - diff --git a/Examples/test-suite/li_std_string.i b/Examples/test-suite/li_std_string.i index 2d0b7503d..8c2f1b857 100644 --- a/Examples/test-suite/li_std_string.i +++ b/Examples/test-suite/li_std_string.i @@ -129,7 +129,7 @@ public: %} %inline %{ - std::string stdstring_empty() { + std::string empty() { return std::string(); } diff --git a/Examples/test-suite/lua/li_typemaps_runme.lua b/Examples/test-suite/lua/li_typemaps_runme.lua deleted file mode 100644 index 77aeb54e4..000000000 --- a/Examples/test-suite/lua/li_typemaps_runme.lua +++ /dev/null @@ -1,40 +0,0 @@ -require("import") -- the import fn -import("li_typemaps") -- import code - --- catch "undefined" global variables -setmetatable(getfenv(),{__index=function (t,i) error("undefined global variable `"..i.."'",2) end}) - --- Check double INPUT typemaps -assert(li_typemaps.in_double(22.22) == 22.22) -assert(li_typemaps.inr_double(22.22) == 22.22) - --- Check double OUTPUT typemaps -assert(li_typemaps.out_double(22.22) == 22.22) -assert(li_typemaps.outr_double(22.22) == 22.22) - --- Check double INOUT typemaps -assert(li_typemaps.inout_double(22.22) == 22.22) -assert(li_typemaps.inoutr_double(22.22) == 22.22) - --- check long long -assert(li_typemaps.in_ulonglong(20)==20) -assert(li_typemaps.inr_ulonglong(20)==20) -assert(li_typemaps.out_ulonglong(20)==20) -assert(li_typemaps.outr_ulonglong(20)==20) -assert(li_typemaps.inout_ulonglong(20)==20) -assert(li_typemaps.inoutr_ulonglong(20)==20) - --- check bools -assert(li_typemaps.in_bool(true)==true) -assert(li_typemaps.inr_bool(false)==false) -assert(li_typemaps.out_bool(true)==true) -assert(li_typemaps.outr_bool(false)==false) -assert(li_typemaps.inout_bool(true)==true) -assert(li_typemaps.inoutr_bool(false)==false) - --- the others -a,b=li_typemaps.inoutr_int2(1,2) -assert(a==1 and b==2) - -f,i=li_typemaps.out_foo(10) -assert(f.a==10 and i==20) diff --git a/Examples/test-suite/minherit.i b/Examples/test-suite/minherit.i index 24092b6c6..aba299387 100644 --- a/Examples/test-suite/minherit.i +++ b/Examples/test-suite/minherit.i @@ -6,7 +6,7 @@ %module(ruby_minherit="1") minherit -#if defined(SWIGPYTHON) || defined(SWIGRUBY) || defined(SWIGOCAML) || defined(SWIGOCTAVE) || defined(SWIGPERL) +#if defined(SWIGPYTHON) || defined(SWIGRUBY) || defined(SWIGOCAML) || defined(SWIGOCTAVE) %inline %{ diff --git a/Examples/test-suite/octave/fvirtual_runme.m b/Examples/test-suite/octave/fvirtual_runme.m index e755a559a..06c6e7ccb 100644 --- a/Examples/test-suite/octave/fvirtual_runme.m +++ b/Examples/test-suite/octave/fvirtual_runme.m @@ -1,6 +1,6 @@ fvirtual -sw = NodeSwitch(); +sw = Switch(); n = Node(); i = sw.addChild(n); diff --git a/Examples/test-suite/octave/li_std_string_runme.m b/Examples/test-suite/octave/li_std_string_runme.m index fa0e260e0..1c24ac344 100644 --- a/Examples/test-suite/octave/li_std_string_runme.m +++ b/Examples/test-suite/octave/li_std_string_runme.m @@ -148,7 +148,7 @@ if (s != "hellohello") endif -if (li_std_string.stdstring_empty() != "") +if (li_std_string.empty() != "") error endif diff --git a/Examples/test-suite/perl5/li_std_string_runme.pl b/Examples/test-suite/perl5/li_std_string_runme.pl index 9ec7dd08c..0ee11bdc7 100644 --- a/Examples/test-suite/perl5/li_std_string_runme.pl +++ b/Examples/test-suite/perl5/li_std_string_runme.pl @@ -98,7 +98,7 @@ SKIP: { is($gen1->testl("9234567890121111113"), "9234567890121111114", "ulonglong big number"); -is(li_std_string::stdstring_empty(), "", "stdstring_empty"); +is(li_std_string::empty(), "", "empty"); is(li_std_string::c_empty(), "", "c_empty"); @@ -110,4 +110,4 @@ is(li_std_string::get_null(li_std_string::c_null()), undef, "c_empty"); is(li_std_string::get_null(li_std_string::c_empty()), "non-null", "c_empty"); -is(li_std_string::get_null(li_std_string::stdstring_empty()), "non-null", "stdstring_empty"); +is(li_std_string::get_null(li_std_string::empty()), "non-null", "c_empty"); diff --git a/Examples/test-suite/perl5/run-perl-test.pl b/Examples/test-suite/perl5/run-perl-test.pl index 106bf002b..f0e1b0288 100755 --- a/Examples/test-suite/perl5/run-perl-test.pl +++ b/Examples/test-suite/perl5/run-perl-test.pl @@ -7,7 +7,7 @@ use strict; my $command = shift @ARGV; -my $output = `$^X $command 2>&1`; +my $output = `perl $command 2>&1`; die "SWIG Perl test failed: \n\n$output\n" if $?; diff --git a/Examples/test-suite/php4/Makefile.in b/Examples/test-suite/php4/Makefile.in index 2e14ef9a2..dbd239964 100644 --- a/Examples/test-suite/php4/Makefile.in +++ b/Examples/test-suite/php4/Makefile.in @@ -42,17 +42,17 @@ missingtests: missingcpptests missingctests %.cpptest: $(setup) +$(swig_and_compile_cpp) - +$(run_testcase) + $(run_testcase) %.ctest: $(setup) +$(swig_and_compile_c) - +$(run_testcase) + $(run_testcase) %.multicpptest: $(setup) +$(swig_and_compile_multi_cpp) - +$(run_testcase) + $(run_testcase) # Runs the testcase. A testcase is only run if # a file is found which has _runme.php4 appended after the testcase name. diff --git a/Examples/test-suite/python/fvirtual_runme.py b/Examples/test-suite/python/fvirtual_runme.py index ada3313de..e06ab5b4f 100644 --- a/Examples/test-suite/python/fvirtual_runme.py +++ b/Examples/test-suite/python/fvirtual_runme.py @@ -1,6 +1,6 @@ from fvirtual import * -sw = NodeSwitch() +sw = Switch() n = Node() i = sw.addChild(n); diff --git a/Examples/test-suite/python/keyword_rename_runme.py b/Examples/test-suite/python/keyword_rename_runme.py deleted file mode 100644 index 5646ce7d6..000000000 --- a/Examples/test-suite/python/keyword_rename_runme.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python -import keyword_rename -keyword_rename._in(1) -keyword_rename._except(1) diff --git a/Examples/test-suite/python/li_std_string_runme.py b/Examples/test-suite/python/li_std_string_runme.py index c0dae1e25..ed79718d2 100644 --- a/Examples/test-suite/python/li_std_string_runme.py +++ b/Examples/test-suite/python/li_std_string_runme.py @@ -121,7 +121,7 @@ if s != "hellohello": raise RuntimeError -if li_std_string.stdstring_empty() != "": +if li_std_string.empty() != "": raise RuntimeError diff --git a/Examples/test-suite/r/Makefile.in b/Examples/test-suite/r/Makefile.in index 70dd62ec5..0a1b3567e 100644 --- a/Examples/test-suite/r/Makefile.in +++ b/Examples/test-suite/r/Makefile.in @@ -42,7 +42,7 @@ run_testcase = \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \ $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ;) \ else \ - ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \ + ($(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \ fi; run_multitestcase = \ @@ -51,7 +51,7 @@ run_multitestcase = \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \ $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ;) \ else \ - ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \ + ($(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \ fi; \ done # Clean diff --git a/Examples/test-suite/ruby/li_std_string_runme.rb b/Examples/test-suite/ruby/li_std_string_runme.rb index dc85b5dab..f572573bc 100644 --- a/Examples/test-suite/ruby/li_std_string_runme.rb +++ b/Examples/test-suite/ruby/li_std_string_runme.rb @@ -124,7 +124,7 @@ if (s != "hellohello") end -if (stdstring_empty() != "") +if (empty() != "") raise RuntimeError end diff --git a/Examples/test-suite/samename.i b/Examples/test-suite/samename.i index 819cb4abd..1e9645e70 100644 --- a/Examples/test-suite/samename.i +++ b/Examples/test-suite/samename.i @@ -1,15 +1,6 @@ %module samename -#if !(defined(SWIGCSHARP) || defined(SWIGJAVA)) -class samename { - public: - void do_something() { - // ... - } -}; -#endif - -%{ +%inline { class samename { public: @@ -18,5 +9,5 @@ class samename { } }; -%} +} diff --git a/Examples/test-suite/template_int_const.i b/Examples/test-suite/template_int_const.i index e69a53c4f..37b1cf998 100644 --- a/Examples/test-suite/template_int_const.i +++ b/Examples/test-suite/template_int_const.i @@ -10,7 +10,7 @@ static const Polarization polarization = UnaryPolarization; }; template - struct Interface_ + struct Interface { }; @@ -26,16 +26,16 @@ }; %} -%template(Interface_UP) Interface_; +%template(Interface_UP) Interface; %template(Module_1) Module<1>; %inline %{ struct ExtInterface1 : - Interface_ // works + Interface // works { }; struct ExtInterface2 : - Interface_ // doesn't work + Interface // doesn't work { }; struct ExtModule1 : diff --git a/Examples/test-suite/template_typedef_rec.i b/Examples/test-suite/template_typedef_rec.i index abdf11382..83fe2104a 100644 --- a/Examples/test-suite/template_typedef_rec.i +++ b/Examples/test-suite/template_typedef_rec.i @@ -16,7 +16,7 @@ public: template -class ArrayIterator_ +class ArrayIterator { public: typedef test_Array::intT intT; @@ -38,8 +38,8 @@ class ArrayPrimitiveT public: typedef T ValueT; typedef T valueT; - typedef ArrayIterator_ Iterator; - typedef ArrayIterator_ ConstIterator; + typedef ArrayIterator Iterator; + typedef ArrayIterator ConstIterator; typedef ArrayReverseIterator ReverseIterator; typedef ArrayReverseIterator ConstReverseIterator; }; diff --git a/Examples/test-suite/typemap_namespace.i b/Examples/test-suite/typemap_namespace.i index 5375c43b6..d30a4ddb1 100644 --- a/Examples/test-suite/typemap_namespace.i +++ b/Examples/test-suite/typemap_namespace.i @@ -27,7 +27,7 @@ namespace Foo { %typemap(javaout) Str1 * = char *; #endif %typemap(in) Str1 * = char *; -#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP)) +#if !(defined(SWIGCSHARP) || defined(SWIGLUA)) %typemap(freearg) Str1 * = char *; #endif %typemap(typecheck) Str1 * = char *; diff --git a/Lib/chicken/chickenkw.swg b/Lib/chicken/chickenkw.swg index d2c26c74c..f01faf14f 100644 --- a/Lib/chicken/chickenkw.swg +++ b/Lib/chicken/chickenkw.swg @@ -3,7 +3,7 @@ /* Warnings for certain CHICKEN keywords. From Section 7.1.1 of Revised^5 Report on the Algorithmic Language Scheme */ -#define CHICKENKW(x) %namewarn("314: '" #x "' is a R^5RS syntatic keyword") #x +#define CHICKENKW(x) %namewarn("314:" #x " is a R^5RS syntatic keyword") #x CHICKENKW(else); CHICKENKW(=>); diff --git a/Lib/csharp/csharphead.swg b/Lib/csharp/csharphead.swg index ffff70372..7938dee04 100644 --- a/Lib/csharp/csharphead.swg +++ b/Lib/csharp/csharphead.swg @@ -73,7 +73,7 @@ static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = { static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) { SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback; - if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) { + if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) { callback = SWIG_csharp_exceptions[code].callback; } callback(msg); @@ -81,7 +81,7 @@ static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) { SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback; - if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) { + if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) { callback = SWIG_csharp_exceptions_argument[code].callback; } callback(msg, param_name); diff --git a/Lib/csharp/csharpkw.swg b/Lib/csharp/csharpkw.swg index 9a6d979f1..c96042d2d 100644 --- a/Lib/csharp/csharpkw.swg +++ b/Lib/csharp/csharpkw.swg @@ -2,7 +2,7 @@ #define CSHARP_CSHARPKW_SWG_ /* Warnings for C# keywords */ -#define CSHARPKW(x) %keywordwarn("'" `x` "' is a C# keyword, renaming to '_" `x` "'",rename="_%s") `x` +#define CSHARPKW(x) %namewarn("314:" #x " is a csharp keyword") #x /* from diff --git a/Lib/java/director.swg b/Lib/java/director.swg index fa588671d..bade80c9d 100644 --- a/Lib/java/director.swg +++ b/Lib/java/director.swg @@ -117,18 +117,12 @@ namespace Swig { JNIEnv *jenv_; public: JNIEnvWrapper(const Director *director) : director_(director), jenv_(0) { -#if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON) - // Attach a daemon thread to the JVM. Useful when the JVM should not wait for - // the thread to exit upon shutdown. Only for jdk-1.4 and later. - director_->swig_jvm_->AttachCurrentThreadAsDaemon((void **) &jenv_, NULL); -#else director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL); -#endif } ~JNIEnvWrapper() { +// Some JVMs, eg JDK 1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call. +// However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak. #if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD) - // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call. - // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak. director_->swig_jvm_->DetachCurrentThread(); #endif } diff --git a/Lib/java/javakw.swg b/Lib/java/javakw.swg index 99cd54770..9dcd97062 100644 --- a/Lib/java/javakw.swg +++ b/Lib/java/javakw.swg @@ -2,7 +2,7 @@ #define JAVA_JAVAKW_SWG_ /* Warnings for Java keywords */ -#define JAVAKW(x) %keywordwarn("'" `x` "' is a java keyword, renaming to '_"`x`"'",rename="_%s") `x` +#define JAVAKW(x) %namewarn("314:" #x " is a java keyword") #x /* from diff --git a/Lib/java/various.i b/Lib/java/various.i index 733b8fa79..c53f08aa2 100644 --- a/Lib/java/various.i +++ b/Lib/java/various.i @@ -60,7 +60,7 @@ #endif } -%typemap(out) char **STRING_ARRAY { +%typemap(out) char **STRING_ARRAY (char *s) { int i; int len=0; jstring temp_string; diff --git a/Lib/lua/luatypemaps.swg b/Lib/lua/luatypemaps.swg index 0941c9da1..462d6a055 100644 --- a/Lib/lua/luatypemaps.swg +++ b/Lib/lua/luatypemaps.swg @@ -73,7 +73,7 @@ %{$1 = (lua_toboolean(L, $input)!=0);%} %typemap(out) bool -%{ lua_pushboolean(L,(int)($1!=0)); SWIG_arg++;%} +%{ lua_pushboolean(L,(int)($1==true)); SWIG_arg++;%} // for const bool&, SWIG treats this as a const bool* so we must dereference it %typemap(in,checkfn="lua_isboolean") const bool& (bool temp) @@ -81,7 +81,7 @@ $1=&temp;%} %typemap(out) const bool& -%{ lua_pushboolean(L,(int)((*$1)!=0)); SWIG_arg++;%} +%{ lua_pushboolean(L,(int)(*$1==true)); SWIG_arg++;%} // strings (char* and char[]) %typemap(in,checkfn="lua_isstring") const char*, char* diff --git a/Lib/lua/typemaps.i b/Lib/lua/typemaps.i index fa0c0d0e5..e0adcf192 100644 --- a/Lib/lua/typemaps.i +++ b/Lib/lua/typemaps.i @@ -80,22 +80,6 @@ SWIG_NUMBER_TYPEMAP(long long); SWIG_NUMBER_TYPEMAP(unsigned long long); SWIG_NU // note we dont do char, as a char* is probably a string not a ptr to a single char -// similar for booleans -%typemap(in,checkfn="lua_isboolean") bool *INPUT(bool temp), bool &INPUT(bool temp) -%{ temp = (lua_toboolean(L,$input)!=0); - $1 = &temp; %} - -%typemap(in, numinputs=0) bool *OUTPUT (bool temp),bool &OUTPUT (bool temp) -%{ $1 = &temp; %} - -%typemap(argout) bool *OUTPUT,bool &OUTPUT -%{ lua_pushboolean(L, (int)((*$1)!=0)); SWIG_arg++;%} - -%typemap(in) bool *INOUT = bool *INPUT; -%typemap(argout) bool *INOUT = bool *OUTPUT; -%typemap(in) bool &INOUT = bool &INPUT; -%typemap(argout) bool &INOUT = bool &OUTPUT; - /* ----------------------------------------------------------------------------- * Basic Array typemaps * ----------------------------------------------------------------------------- */ @@ -336,11 +320,6 @@ for array handling %typemap(freearg) (TYPE *INOUT,int)=(TYPE *INPUT,int); // TODO out variable arrays (is there a standard form for such things?) - -// referencing so that (int *INPUT,int) and (int INPUT[],int) are the same -%typemap(in) (TYPE INPUT[],int)=(TYPE *INPUT,int); -%typemap(freearg) (TYPE INPUT[],int)=(TYPE *INPUT,int); - %enddef // the following line of code diff --git a/Lib/ocaml/ocamlkw.swg b/Lib/ocaml/ocamlkw.swg index 9b9096e2b..ba06f238e 100644 --- a/Lib/ocaml/ocamlkw.swg +++ b/Lib/ocaml/ocamlkw.swg @@ -2,7 +2,7 @@ #define OCAML_OCAMLKW_SWG_ /* Warnings for Ocaml keywords */ -#define OCAMLKW(x) %namewarn("314: '" #x "' is a ocaml keyword and it will properly renamed") #x +#define OCAMLKW(x) %namewarn("314:" #x " is a ocaml keyword and it will properly renamed") #x /* from diff --git a/Lib/perl5/perlkw.swg b/Lib/perl5/perlkw.swg index 00648e0bf..71a229c66 100644 --- a/Lib/perl5/perlkw.swg +++ b/Lib/perl5/perlkw.swg @@ -1,6 +1,6 @@ /* Warnings for Perl keywords */ -#define PERLKW(x) %keywordwarn("'" `x` "' is a perl keyword") `x` -#define PERLBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in perl") "::" `x` +#define PERLKW(x) %keywordwarn(`x` " is a perl keyword") `x` +#define PERLBN(x) %builtinwarn(`x` " conflicts with a built-in name in perl") "::" `x` /* diff --git a/Lib/php4/php4kw.swg b/Lib/php4/php4kw.swg index a6b519445..0d28994c5 100644 --- a/Lib/php4/php4kw.swg +++ b/Lib/php4/php4kw.swg @@ -8,15 +8,15 @@ * when used as class methods. * ----------------------------------------------------------------------------- */ -#define PHPKW(x) %keywordwarn("'" `x` "' is a php keyword, renamed as 'c_" `x` "'",sourcefmt="%(lower)s", rename="c_%s",fullname=1) `x` +#define PHPKW(x) %keywordwarn(`x` " is a php keyword, renamed as c_"`x`,sourcefmt="%(lower)s", rename="c_%s",fullname=1) `x` %define PHPCN(x) -%keywordwarn("'" `x` "' is a php reserved class name, class renamed as 'c_" `x` "'",%$isclass,rename="c_%s") `x`; -%keywordwarn("'" `x` "' is a php reserved class name, constructor renamed as 'c_" `x` "'",%$isconstructor,rename="c_%s") `x`; +%keywordwarn(`x` " is a php reserved class name, class renamed as c_"`x`,%$isclass,rename="c_%s") `x`; +%keywordwarn(`x` " is a php reserved class name, constructor renamed as c_"`x`,%$isconstructor,rename="c_%s") `x`; %enddef -#define PHPBN1(x) %builtinwarn("'" `x` "' conflicts with a built-in name in php",sourcefmt="%(lower)s",fullname=1) `x` -#define PHPBN2(x) %builtinwarn("'" `x` "' conflicts with a built-in name in php") "::" `x` +#define PHPBN1(x) %builtinwarn(`x` " conflicts with a built-in name in php",sourcefmt="%(lower)s",fullname=1) `x` +#define PHPBN2(x) %builtinwarn(`x` " conflicts with a built-in name in php") "::" `x` /* diff --git a/Lib/pike/pikekw.swg b/Lib/pike/pikekw.swg index 844b1f189..85fd091a8 100644 --- a/Lib/pike/pikekw.swg +++ b/Lib/pike/pikekw.swg @@ -2,7 +2,7 @@ #define PIKE_PIKEKW_SWG_ /* Warnings for Pike keywords */ -#define PIKEKW(x) %namewarn("314: '" #x "' is a pike keyword") #x +#define PIKEKW(x) %namewarn("314:" #x " is a pike keyword") #x /* from diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index ed0eb7f0b..8f1db7ce1 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -738,12 +738,12 @@ namespace swig { typedef typename sequence::const_iterator const_iterator; static PyObject *from(const sequence& seq) { -%#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS +#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS swig_type_info *desc = swig::type_info(); if (desc && desc->clientdata) { return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN); } -%#endif +#endif size_type size = seq.size(); if (size <= (size_type)INT_MAX) { PyObject *obj = PyTuple_New((int)size); diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg index 38f1791a9..e2dfbc3f5 100644 --- a/Lib/python/pyiterators.swg +++ b/Lib/python/pyiterators.swg @@ -38,18 +38,18 @@ namespace swig { virtual PySwigIterator *incr(size_t n = 1) = 0; // Backward iterator method, very common in C++, but not required in Python - virtual PySwigIterator *decr(size_t /*n*/ = 1) + virtual PySwigIterator *decr(size_t n = 1) { throw stop_iteration(); } // Random access iterator methods, but not required in Python - virtual ptrdiff_t distance(const PySwigIterator &/*x*/) const + virtual ptrdiff_t distance(const PySwigIterator &x) const { throw std::invalid_argument("operation not supported"); } - virtual bool equal (const PySwigIterator &/*x*/) const + virtual bool equal (const PySwigIterator &x) const { throw std::invalid_argument("operation not supported"); } diff --git a/Lib/python/pythonkw.swg b/Lib/python/pythonkw.swg index 2ee233516..f57d34ce4 100644 --- a/Lib/python/pythonkw.swg +++ b/Lib/python/pythonkw.swg @@ -2,8 +2,8 @@ Warnings for Python keywords, built-in names and bad names. */ -#define PYTHONKW(x) %keywordwarn("'" `x` "' is a python keyword, renaming to '_" `x` "'", rename="_%s") `x` -#define PYTHONBN(x) %builtinwarn("'" `x` "' conflicts with a built-in name in python") "::"`x` +#define PYTHONKW(x) %keywordwarn(`x` " is a python keyword, symbol will be renamed as '_" `x`"'", rename="_%s") `x` +#define PYTHONBN(x) %builtinwarn(`x` " conflicts with a built-in name in python") "::"`x` /* diff --git a/Lib/r/r.swg b/Lib/r/r.swg index 0ab7e11a0..3095529a0 100644 --- a/Lib/r/r.swg +++ b/Lib/r/r.swg @@ -12,8 +12,6 @@ SWIGEXPORT void SWIG_init(void) { %} -%include - #define %Rruntime %insert("s") #define SWIG_Object SEXP diff --git a/Lib/r/rkw.swg b/Lib/r/rkw.swg deleted file mode 100644 index 2c181faa0..000000000 --- a/Lib/r/rkw.swg +++ /dev/null @@ -1,32 +0,0 @@ -/* - Warnings for R keywords, built-in names and bad names. -*/ - -#define RKW(x) %keywordwarn("'" `x` "' is a R keyword, renaming to '_" `x`"'", rename="_%s") `x` - -/* - Warnings for R reserved words taken from - http://cran.r-project.org/doc/manuals/R-lang.html#Reserved-words -*/ - -RKW(if); -RKW(else); -RKW(repeat); -RKW(while); -RKW(function); -RKW(for); -RKW(in); -RKW(next); -RKW(break); -RKW(TRUE); -RKW(FALSE); -RKW(NULL); -RKW(Inf); -RKW(NaN); -RKW(NA); -RKW(NA_integer_); -RKW(NA_real_); -RKW(NA_complex_); -RKW(NA_character_); - -#undef RKW diff --git a/Lib/ruby/rubycontainer.swg b/Lib/ruby/rubycontainer.swg index 919695ec2..e3cae5778 100644 --- a/Lib/ruby/rubycontainer.swg +++ b/Lib/ruby/rubycontainer.swg @@ -691,12 +691,10 @@ namespace swig for ( ; i != e; ) { VALUE r = swig::from< Sequence::value_type >(*i); - if ( RTEST( rb_yield(r) ) ) { + if ( RTEST( rb_yield(r) ) ) $self->erase(i++); - e = self->end(); - } else { + else ++i; - } } return self; diff --git a/Lib/ruby/rubykw.swg b/Lib/ruby/rubykw.swg index 194687b95..fec47baff 100644 --- a/Lib/ruby/rubykw.swg +++ b/Lib/ruby/rubykw.swg @@ -2,7 +2,7 @@ #define RUBY_RUBYKW_SWG_ /* Warnings for Ruby keywords */ -#define RUBYKW(x) %keywordwarn("'" `x` "' is a ruby keyword, renaming to 'C_" `x` "'",rename="C_%s",fullname=1) `x` +#define RUBYKW(x) %keywordwarn("'" `x` "' is a ruby keyword, and it will renamed as 'C_"`x`"'",rename="C_%s",fullname=1) `x` /* diff --git a/Lib/swiglabels.swg b/Lib/swiglabels.swg index b943afb47..09de6c969 100644 --- a/Lib/swiglabels.swg +++ b/Lib/swiglabels.swg @@ -40,12 +40,6 @@ # endif #endif -#ifndef SWIG_MSC_UNSUPPRESS_4505 -# if defined(_MSC_VER) -# pragma warning(disable : 4505) /* unreferenced local function has been removed */ -# endif -#endif - #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) diff --git a/Lib/typemaps/primtypes.swg b/Lib/typemaps/primtypes.swg index 42728e5fe..c59aa1d1e 100644 --- a/Lib/typemaps/primtypes.swg +++ b/Lib/typemaps/primtypes.swg @@ -283,7 +283,6 @@ _apply_macro(Macro, ptrdiff_t , Arg2); _apply_macro(Macro, std::size_t, Arg2); _apply_macro(Macro, std::ptrdiff_t, Arg2); _apply_macro(Macro, std::string, Arg2); -_apply_macro(Macro, std::wstring, Arg2); _apply_macro(Macro, std::complex, Arg2); _apply_macro(Macro, std::complex, Arg2); %enddef diff --git a/README b/README index 2898130b0..61550e558 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 1.3.36 (24 June 2008) +Version: 1.3.35 (7 April 2008) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, @@ -91,13 +91,6 @@ A SWIG FAQ and other hints can be found on the SWIG Wiki: What's New? =========== -SWIG-1.3.36 summary: -- Enhancement to directors to wrap all protected members -- Optimisation feature for objects returned by value -- A few bugs fixes in the PHP, Java, Ruby, R, C#, Python, Lua and - Perl modules -- Other minor generic bug fixes - SWIG-1.3.35 summary: - Octave language module added - Bug fixes in Python, Lua, Java, C#, Perl modules diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index 032c71f7e..2a0d341b5 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -423,7 +423,7 @@ int yylook(void) { { String *cmt = Scanner_text(scan); char *loc = Char(cmt); - if ((strncmp(loc,"/*@SWIG",7) == 0) && (loc[Len(cmt)-3] == '@')) { + if ((strncmp(loc,"/*@SWIG@",6) == 0) && (loc[Len(cmt)-3] == '@')) { scanner_locator(cmt); } } diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 58e0c0c41..4fe8b47ed 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -331,9 +331,7 @@ static void add_symbols(Node *n) { Delete(prefix); } - /* - if (!Getattr(n,"parentNode") && class_level) set_parentNode(n,class_decl[class_level - 1]); - */ + if (0 && !Getattr(n,"parentNode") && class_level) set_parentNode(n,class_decl[class_level - 1]); Setattr(n,"ismember","1"); } } @@ -4111,11 +4109,10 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end { /* Check for template names. If the class is a template and the constructor is missing the template part, we add it */ - if (Classprefix) { - c = strchr(Char(Classprefix),'<'); - if (c && !Strchr($3,'<')) { - $3 = NewStringf("%s%s",$3,c); - } + if (Classprefix && (c = strchr(Char(Classprefix),'<'))) { + if (!Strchr($3,'<')) { + $3 = NewStringf("%s%s",$3,c); + } } Setattr($$,"storage","virtual"); name = NewStringf("%s",$3); @@ -4431,8 +4428,12 @@ parms : rawparms { ; rawparms : parm ptail { - set_nextSibling($1,$2); - $$ = $1; + if (1) { + set_nextSibling($1,$2); + $$ = $1; + } else { + $$ = $2; + } } | empty { $$ = 0; } ; @@ -4485,8 +4486,12 @@ valparms : rawvalparms { ; rawvalparms : valparm valptail { - set_nextSibling($1,$2); - $$ = $1; + if (1) { + set_nextSibling($1,$2); + $$ = $1; + } else { + $$ = $2; + } } | empty { $$ = 0; } ; diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index 8142125a7..a1f0c8e08 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -281,13 +281,13 @@ int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab Delete(ptargs); } - /* + if (0) { Parm *p = tparms; while (p) { Printf(stdout, "tparm: '%s' '%s' '%s'\n", Getattr(p, "name"), Getattr(p, "type"), Getattr(p, "value")); p = nextSibling(p); } - */ + } /* Printf(stdout,"targs = '%s'\n", templateargs); Printf(stdout,"rname = '%s'\n", rname); diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 62aef10f2..ccb94314a 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -112,11 +112,12 @@ static void DelHash(DOH *ho) { int i; for (i = 0; i < h->hashsize; i++) { - n = h->hashtable[i]; - while (n) { - next = n->next; - DelNode(n); - n = next; + if ((n = h->hashtable[i])) { + while (n) { + next = n->next; + DelNode(n); + n = next; + } } } DohFree(h->hashtable); @@ -137,11 +138,12 @@ static void Hash_clear(DOH *ho) { int i; for (i = 0; i < h->hashsize; i++) { - n = h->hashtable[i]; - while (n) { - next = n->next; - DelNode(n); - n = next; + if ((n = h->hashtable[i])) { + while (n) { + next = n->next; + DelNode(n); + n = next; + } } h->hashtable[i] = 0; } @@ -452,10 +454,11 @@ static DOH *CopyHash(DOH *ho) { nho = DohObjMalloc(&DohHashType, nh); for (i = 0; i < h->hashsize; i++) { - n = h->hashtable[i]; - while (n) { - Hash_setattr(nho, n->key, n->object); - n = n->next; + if ((n = h->hashtable[i])) { + while (n) { + Hash_setattr(nho, n->key, n->object); + n = n->next; + } } } return nho; diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index a968e506c..561997276 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -2271,7 +2271,7 @@ int ALLEGROCL::emit_dispatch_defun(Node *n) { return SWIG_OK; } -int ALLEGROCL::emit_defun(Node *n, File *fcl) { +int ALLEGROCL::emit_defun(Node *n, File *f_cl) { #ifdef ALLEGROCL_WRAP_DEBUG Printf(stderr, "emit_defun: ENTER... "); #endif @@ -2307,27 +2307,27 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { if (Generate_Wrapper) { String *extra_parms = id_converter_arguments(n)->noname_str(); if (Getattr(n, "sym:overloaded")) - Printf(fcl, "(swig-defmethod (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); + Printf(f_cl, "(swig-defmethod (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); else - Printf(fcl, "(swig-defun (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); + Printf(f_cl, "(swig-defun (\"%s\" \"%s\"%s)\n", funcname, mangled_name, extra_parms); Delete(extra_parms); } // Just C else { - Printf(fcl, "(swig-defun (\"%s\" \"%s\")\n", funcname, Generate_Wrapper ? mangled_name : funcname); + Printf(f_cl, "(swig-defun (\"%s\" \"%s\")\n", funcname, Generate_Wrapper ? mangled_name : funcname); } ////////////////////////////////////// // Lisp foreign call parameter list // ////////////////////////////////////// - Printf(fcl, " ("); + Printf(f_cl, " ("); /* Special cases */ if (ParmList_len(pl) == 0) { - Printf(fcl, ":void"); + Printf(f_cl, ":void"); /* } else if (any_varargs(pl)) { - Printf(fcl, "#| varargs |#"); + Printf(f_cl, "#| varargs |#"); varargs=1; */ } else { String *largs = NewString(""); @@ -2337,7 +2337,7 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { SwigType *argtype = Swig_cparse_type(Getattr(p, "tmap:ctype")); if (!first) { - Printf(fcl, "\n "); + Printf(f_cl, "\n "); } if (SwigType_isvarargs(argtype)) { @@ -2393,7 +2393,7 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { // if this parameter has been removed from the C/++ wrapper // it shouldn't be in the lisp wrapper either. if (!checkAttribute(p, "tmap:in:numinputs", "0")) { - Printf(fcl, "(%s %s %s %s %s)", + Printf(f_cl, "(%s %s %s %s %s)", // parms in the ff wrapper, but not in the lisp wrapper. (checkAttribute(p, "tmap:lin:numinputs", "0") ? ":p-" : ":p+"), argname, dispatchtype, ffitype, lisptype); @@ -2479,12 +2479,12 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { Replaceall(wrap->code, "$ldestructor", ldestructor); Delete(ldestructor); - Printf(fcl, ")\n"); /* finish arg list */ + Printf(f_cl, ")\n"); /* finish arg list */ ///////////////////////////////////////////////////// // Lisp foreign call return type and optimizations // ///////////////////////////////////////////////////// - Printf(fcl, " (:returning (%s %s)", compose_foreign_type(result_type), get_lisp_type(Getattr(n, "type"), "result")); + Printf(f_cl, " (:returning (%s %s)", compose_foreign_type(result_type), get_lisp_type(Getattr(n, "type"), "result")); for (Iterator option = First(n); option.item; option = Next(option)) { if (Strncmp("feature:ffargs:", option.key, 15)) @@ -2494,12 +2494,12 @@ int ALLEGROCL::emit_defun(Node *n, File *fcl) { Replaceall(option_name, "_", "-"); // TODO: varargs vs call-direct ? - Printf(fcl, "\n %s %s", option_name, option_val); + Printf(f_cl, "\n %s %s", option_name, option_val); Delete(option_name); } - Printf(fcl, ")\n %s)\n\n", wrap->code); + Printf(f_cl, ")\n %s)\n\n", wrap->code); // Wrapper_print(wrap, stderr); Delete(result_type); @@ -2935,9 +2935,11 @@ int ALLEGROCL::classHandler(Node *n) { #endif if (Generate_Wrapper) - return cppClassHandler(n); + return cppClassHandler(n); else - return cClassHandler(n); + return cClassHandler(n); + + return SWIG_OK; } int ALLEGROCL::cClassHandler(Node *n) { diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index 2298d2939..a76e09945 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -329,6 +329,7 @@ int CHICKEN::functionWrapper(Node *n) { Parm *p; int i; String *wname; + String *source; Wrapper *f; String *mangle = NewString(""); String *get_pointers; @@ -397,6 +398,8 @@ int CHICKEN::functionWrapper(Node *n) { SwigType *pt = Getattr(p, "type"); String *ln = Getattr(p, "lname"); + source = NewStringf("scm%d", i + 1); + Printf(f->def, ", C_word scm%d", i + 1); Printf(declfunc, ",C_word"); @@ -404,7 +407,6 @@ int CHICKEN::functionWrapper(Node *n) { if ((tm = Getattr(p, "tmap:in"))) { String *parse = Getattr(p, "tmap:in:parse"); if (!parse) { - String *source = NewStringf("scm%d", i + 1); Replaceall(tm, "$source", source); Replaceall(tm, "$target", ln); Replaceall(tm, "$input", source); @@ -443,15 +445,20 @@ int CHICKEN::functionWrapper(Node *n) { } } } - Delete(source); + + } else { } + p = Getattr(p, "tmap:in:next"); continue; } else { Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0)); break; } + + Delete(source); + p = nextSibling(p); } /* finish argument marshalling */ @@ -1503,7 +1510,7 @@ int CHICKEN::validIdentifier(String *s) { /* ------------------------------------------------------------ * closNameMapping() * Maps the identifier from C++ to the CLOS based on command - * line parameters and such. + * line paramaters and such. * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 7ea10170a..df4677e26 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -1073,9 +1073,7 @@ public: global_variable_flag = false; generate_property_declaration_flag = false; - if (proxy_flag) { - Printf(module_class_code, "\n }\n\n"); - } + Printf(module_class_code, "\n }\n\n"); return ret; } @@ -1926,7 +1924,7 @@ public: Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(t, 0)); } - if (wrapping_member_flag && !enum_constant_flag) { + if (proxy_flag && wrapping_member_flag && !enum_constant_flag) { // Properties setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(Swig_name_member(proxy_class_name, variable_name))) == 0); if (setter_flag) @@ -2109,7 +2107,7 @@ public: Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csout typemap defined for %s\n", SwigType_str(t, 0)); } - if (wrapping_member_flag && !enum_constant_flag) { + if (proxy_flag && wrapping_member_flag && !enum_constant_flag) { // Properties if (generate_property_declaration_flag) { // Ensure the declaration is generated just once should the property contain both a set and get // Get the C# variable type - obtained differently depending on whether a setter is required. @@ -2543,7 +2541,6 @@ public: num_arguments = emit_num_arguments(l); num_required = emit_num_required(l); - bool global_or_member_variable = global_variable_flag || (wrapping_member_flag && !enum_constant_flag); int gencomma = 0; /* Output each parameter */ @@ -2570,7 +2567,7 @@ public: if (gencomma) Printf(imcall, ", "); - String *arg = makeParameterName(n, p, i, global_or_member_variable); + String *arg = makeParameterName(n, p, i, setter_flag); // Use typemaps to transform type used in C# wrapper function (in proxy class) to type used in PInvoke function (in intermediary class) if ((tm = Getattr(p, "tmap:csin"))) { @@ -2758,7 +2755,7 @@ public: value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); } else { // Get the enumvalue from a PINVOKE call - if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) { + if (!getCurrentClass() || !cparse_cplusplus) { // Strange hack to change the name Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ constantWrapper(n); @@ -2880,7 +2877,7 @@ public: * n - Node * p - parameter node * arg_num - parameter argument number - * setter - set this flag when wrapping variables + * setter - set this flag when wrapping member variables * Return: * arg - a unique parameter name * ----------------------------------------------------------------------------- */ @@ -2889,22 +2886,20 @@ public: String *arg = 0; String *pn = Getattr(p, "name"); - - // Use C parameter name unless it is a duplicate or an empty parameter name - int count = 0; - ParmList *plist = Getattr(n, "parms"); - while (plist) { - if ((Cmp(pn, Getattr(plist, "name")) == 0)) - count++; - plist = nextSibling(plist); - } - String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; - arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); - - if (setter && Cmp(arg, "self") != 0) { + if (setter) { // Note that in C# properties, the input variable name is always called 'value' - Delete(arg); arg = NewString("value"); + } else { + // Use C parameter name unless it is a duplicate or an empty parameter name + int count = 0; + ParmList *plist = Getattr(n, "parms"); + while (plist) { + if ((Cmp(pn, Getattr(plist, "name")) == 0)) + count++; + plist = nextSibling(plist); + } + String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; + arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); } return arg; diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index f5f080034..2390e8ad6 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -1649,7 +1649,7 @@ public: /* ------------------------------------------------------------ * goopsNameMapping() * Maps the identifier from C++ to the GOOPS based * on command - * line parameters and such. + * line paramaters and such. * If class_name = "" that means the mapping is for a function or * variable not attached to any class. * ------------------------------------------------------------ */ diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index b92fccdfb..5660b4885 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1932,7 +1932,7 @@ public: Swig_warning(WARN_JAVA_TYPEMAP_JSTYPE_UNDEF, input_file, line_number, "No jstype typemap defined for %s\n", SwigType_str(t, 0)); } - if (wrapping_member_flag && !enum_constant_flag) { + if (proxy_flag && wrapping_member_flag && !enum_constant_flag) { // For wrapping member variables (Javabean setter) setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(Swig_name_member(proxy_class_name, variable_name))) == 0); } @@ -2463,7 +2463,6 @@ public: num_arguments = emit_num_arguments(l); num_required = emit_num_required(l); - bool global_or_member_variable = global_variable_flag || (wrapping_member_flag && !enum_constant_flag); int gencomma = 0; /* Output each parameter */ @@ -2488,7 +2487,7 @@ public: if (gencomma) Printf(imcall, ", "); - String *arg = makeParameterName(n, p, i, global_or_member_variable); + String *arg = makeParameterName(n, p, i, setter_flag); // Use typemaps to transform type used in Java wrapper function (in proxy class) to type used in JNI function (in intermediary class) if ((tm = Getattr(p, "tmap:javain"))) { @@ -2633,7 +2632,7 @@ public: value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); } else { // Get the enumvalue from a JNI call - if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) { + if (!getCurrentClass() || !cparse_cplusplus) { // Strange hack to change the name Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ constantWrapper(n); @@ -2760,7 +2759,7 @@ public: * n - Node * p - parameter node * arg_num - parameter argument number - * setter - set this flag when wrapping variables + * setter - set this flag when wrapping member variables * Return: * arg - a unique parameter name * ----------------------------------------------------------------------------- */ @@ -2769,23 +2768,21 @@ public: String *arg = 0; String *pn = Getattr(p, "name"); - - // Use C parameter name unless it is a duplicate or an empty parameter name - int count = 0; - ParmList *plist = Getattr(n, "parms"); - while (plist) { - if ((Cmp(pn, Getattr(plist, "name")) == 0)) - count++; - plist = nextSibling(plist); - } - String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; - arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); - - if (setter && Cmp(arg, "self") != 0) { + if (setter) { // Note that for setters the parameter name is always set but sometimes includes C++ // scope resolution, so we need to strip off the scope resolution to make a valid name. - Delete(arg); arg = NewString("value"); //Swig_scopename_last(pn); + } else { + // Use C parameter name unless it is a duplicate or an empty parameter name + int count = 0; + ParmList *plist = Getattr(n, "parms"); + while (plist) { + if ((Cmp(pn, Getattr(plist, "name")) == 0)) + count++; + plist = nextSibling(plist); + } + String *wrn = pn ? Swig_name_warning(p, 0, pn, 0) : 0; + arg = (!pn || (count > 1) || wrn) ? NewStringf("arg%d", arg_num) : Copy(pn); } return arg; diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 6718903d0..4a7bf8813 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1097,33 +1097,38 @@ int Language::globalfunctionHandler(Node *n) { String *name = Getattr(n, "name"); String *symname = Getattr(n, "sym:name"); SwigType *type = Getattr(n, "type"); + String *storage = Getattr(n, "storage"); ParmList *parms = Getattr(n, "parms"); - /* Check for callback mode */ - String *cb = GetFlagAttr(n, "feature:callback"); - if (cb) { - String *cbname = Getattr(n, "feature:callback:name"); - if (!cbname) { - cbname = NewStringf(cb, symname); - Setattr(n, "feature:callback:name", cbname); - } + if (0 && (Cmp(storage, "static") == 0)) { + Swig_restore(n); + return SWIG_NOWRAP; /* Can't wrap static functions */ + } else { + /* Check for callback mode */ + String *cb = GetFlagAttr(n, "feature:callback"); + if (cb) { + String *cbname = Getattr(n, "feature:callback:name"); + if (!cbname) { + cbname = NewStringf(cb, symname); + Setattr(n, "feature:callback:name", cbname); + } - callbackfunctionHandler(n); - if (Cmp(cbname, symname) == 0) { + callbackfunctionHandler(n); + if (Cmp(cbname, symname) == 0) { + Delete(cbname); + Swig_restore(n); + return SWIG_NOWRAP; + } Delete(cbname); - Swig_restore(n); - return SWIG_NOWRAP; } - Delete(cbname); + Setattr(n, "parms", nonvoid_parms(parms)); + String *call = Swig_cfunction_call(name, parms); + String *cres = Swig_cresult(type, "result", call); + Setattr(n, "wrap:action", cres); + Delete(cres); + Delete(call); + functionWrapper(n); } - Setattr(n, "parms", nonvoid_parms(parms)); - String *call = Swig_cfunction_call(name, parms); - String *cres = Swig_cresult(type, "result", call); - Setattr(n, "wrap:action", cres); - Delete(cres); - Delete(call); - functionWrapper(n); - Swig_restore(n); return SWIG_OK; } @@ -1371,6 +1376,9 @@ int Language::variableHandler(Node *n) { * ---------------------------------------------------------------------- */ int Language::globalvariableHandler(Node *n) { + String *storage = Getattr(n, "storage"); + if (0 && (Cmp(storage, "static") == 0)) + return SWIG_NOWRAP; variableWrapper(n); return SWIG_OK; } @@ -2100,8 +2108,8 @@ int Language::classDirector(Node *n) { String *using_protected_members_code = NewString(""); for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) { Node *nodeType = Getattr(ni, "nodeType"); - bool cdeclaration = (Cmp(nodeType, "cdecl") == 0); - if (cdeclaration && !GetFlag(ni, "feature:ignore")) { + bool cdecl = (Cmp(nodeType, "cdecl") == 0); + if (cdecl && !GetFlag(ni, "feature:ignore")) { if (is_non_virtual_protected_access(ni)) { Node *overloaded = Getattr(ni, "sym:overloaded"); // emit the using base::member statement (but only once if the method is overloaded) @@ -3383,8 +3391,7 @@ int Language::is_assignable(Node *n) { SwigType *ftd = SwigType_typedef_resolve_all(type); SwigType *td = SwigType_strip_qualifiers(ftd); if (SwigType_type(td) == T_USER) { - cn = Swig_symbol_clookup(td, 0); - if (cn) { + if ((cn = Swig_symbol_clookup(td, 0))) { if ((Strcmp(nodeType(cn), "class") == 0)) { if (Getattr(cn, "allocate:noassign")) { SetFlag(n, "feature:immutable"); diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 6113da960..f46c9e809 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -490,6 +490,8 @@ public: Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0)); break; } + + p = nextSibling(p); } // add all argcheck code @@ -1099,6 +1101,7 @@ public: virtual int staticmemberfunctionHandler(Node *n) { current = STATIC_FUNC; return Language::staticmemberfunctionHandler(n); + current = NO_CPP; } /* ------------------------------------------------------------ @@ -1120,6 +1123,7 @@ public: // REPORT("staticmembervariableHandler",n); current = STATIC_VAR; return Language::staticmembervariableHandler(n); + current = NO_CPP; } /* --------------------------------------------------------------------- diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index 901ee812e..3453f5de2 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -33,7 +33,7 @@ int GenerateDefault = 1; // Generate default constructors int Verbose = 0; int AddExtern = 0; int NoExcept = 0; -int SwigRuntime = 0; // 0 = no option, 1 = -runtime, 2 = -noruntime +int SwigRuntime = 0; // 0 = no option, 1 = -c or -runtime, 2 = -noruntime /* Suppress warning messages for private inheritance, preprocessor evaluation etc... WARN_PP_EVALUATION 202 @@ -491,13 +491,13 @@ void SWIG_getoptions(int argc, char *argv[]) { Wrapper_compact_print_mode_set(1); Wrapper_virtual_elimination_mode_set(1); Swig_mark_arg(i); - } else if (strcmp(argv[i], "-runtime") == 0) { // Used to also accept -c. removed in swig-1.3.36 + } else if (strcmp(argv[i], "-runtime") == 0) { Swig_mark_arg(i); - Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n"); + Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-c, -runtime, -noruntime command line options are deprecated.\n"); SwigRuntime = 1; - } else if (strcmp(argv[i], "-noruntime") == 0) { + } else if ((strcmp(argv[i], "-c") == 0) || (strcmp(argv[i], "-noruntime") == 0)) { Swig_mark_arg(i); - Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n"); + Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-c, -runtime, -noruntime command line options are deprecated.\n"); SwigRuntime = 2; } else if (strcmp(argv[i], "-external-runtime") == 0) { external_runtime = 1; diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index 6cb24d39a..99d28e167 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -472,9 +472,9 @@ MODULA3(): cap = true; } else { if (cap) { - m3sym[i] = (char)toupper(c); + m3sym[i] = toupper(c); } else { - m3sym[i] = (char)tolower(c); + m3sym[i] = tolower(c); } cap = false; } diff --git a/Source/Modules/php4.cxx b/Source/Modules/php4.cxx index 42d71e79a..cfe948e3f 100644 --- a/Source/Modules/php4.cxx +++ b/Source/Modules/php4.cxx @@ -150,44 +150,45 @@ void SwigPHP_emit_resource_registrations() { ki = First(zend_types); if (ki.key) Printf(s_oinit, "\n/* Register resource destructors for pointer types */\n"); - while (ki.key) { - DOH *key = ki.key; - Node *class_node = ki.item; - String *human_name = key; + while (ki.key) + if (1 /* is pointer type */ ) { + DOH *key = ki.key; + Node *class_node = ki.item; + String *human_name = key; - // Write out destructor function header - Printf(s_wrappers, "/* NEW Destructor style */\nstatic ZEND_RSRC_DTOR_FUNC(_wrap_destroy%s) {\n", key); + // Write out destructor function header + Printf(s_wrappers, "/* NEW Destructor style */\nstatic ZEND_RSRC_DTOR_FUNC(_wrap_destroy%s) {\n", key); - // write out body - if ((class_node != NOTCLASS)) { - String *destructor = Getattr(class_node, "destructor"); - human_name = Getattr(class_node, "sym:name"); - if (!human_name) - human_name = Getattr(class_node, "name"); - // Do we have a known destructor for this type? - if (destructor) { - Printf(s_wrappers, " %s(rsrc, SWIGTYPE%s->name TSRMLS_CC);\n", destructor, key); + // write out body + if ((class_node != NOTCLASS)) { + String *destructor = Getattr(class_node, "destructor"); + human_name = Getattr(class_node, "sym:name"); + if (!human_name) + human_name = Getattr(class_node, "name"); + // Do we have a known destructor for this type? + if (destructor) { + Printf(s_wrappers, " %s(rsrc, SWIGTYPE%s->name TSRMLS_CC);\n", destructor, key); + } else { + Printf(s_wrappers, " /* No destructor for class %s */\n", human_name); + } } else { - Printf(s_wrappers, " /* No destructor for class %s */\n", human_name); + Printf(s_wrappers, " /* No destructor for simple type %s */\n", key); } - } else { - Printf(s_wrappers, " /* No destructor for simple type %s */\n", key); + + // close function + Printf(s_wrappers, "}\n"); + + // declare le_swig_ to store php registration + Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name); + + // register with php + Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex" "(_wrap_destroy%s,NULL,(char *)(SWIGTYPE%s->name),module_number);\n", key, key, key); + + // store php type in class struct + Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key); + + ki = Next(ki); } - - // close function - Printf(s_wrappers, "}\n"); - - // declare le_swig_ to store php registration - Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name); - - // register with php - Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex" "(_wrap_destroy%s,NULL,(char *)(SWIGTYPE%s->name),module_number);\n", key, key, key); - - // store php type in class struct - Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key); - - ki = Next(ki); - } } class PHP:public Language { @@ -1194,7 +1195,7 @@ public: if (native_constructor == NATIVE_CONSTRUCTOR) { Printf(f->code, "add_property_zval(this_ptr,\"" SWIG_PTR "\",_cPtr);\n"); } else { - String *shadowrettype = GetShadowReturnType(n); + String *shadowrettype = SwigToPhpType(n, true); Printf(f->code, "object_init_ex(return_value,ptr_ce_swig_%s);\n", shadowrettype); Delete(shadowrettype); Printf(f->code, "add_property_zval(return_value,\"" SWIG_PTR "\",_cPtr);\n"); @@ -1439,10 +1440,6 @@ public: if (wrapperType == memberfn) p = nextSibling(p); while (p) { - if (GetInt(p, "tmap:in:numinputs") == 0) { - p = nextSibling(p); - continue; - } assert(0 <= argno && argno < max_num_of_arguments); String *&pname = arg_names[argno]; const char *pname_cstr = GetChar(p, "name"); @@ -1753,8 +1750,7 @@ public: } Printf(output, "\n"); - // If it's a member function or a class constructor... - if (wrapperType == memberfn || (newobject && current_class)) { + if (wrapperType == memberfn || newobject) { Printf(output, "\tfunction %s(%s) {\n", methodname, args); // We don't need this code if the wrapped class has a copy ctor // since the flat function new_CLASSNAME will handle it for us. @@ -2559,9 +2555,20 @@ public: return SWIG_OK; } - String * GetShadowReturnType(Node *n) { + + String * SwigToPhpType(Node *n, int shadow_flag) { + String *ptype = 0; SwigType *t = Getattr(n, "type"); + if (shadow_flag) { + ptype = PhpTypeFromTypemap((char *) "pstype", n, (char *) ""); + } + if (!ptype) { + ptype = PhpTypeFromTypemap((char *) "ptype", n, (char *) ""); + } + + if (ptype) return ptype; + /* Map type here */ switch (SwigType_type(t)) { case T_CHAR: @@ -2582,7 +2589,7 @@ public: case T_POINTER: case T_REFERENCE: case T_USER: - if (is_shadow(t)) { + if (shadow_flag && is_shadow(t)) { return NewString(Char(is_shadow(t))); } break; @@ -2590,7 +2597,7 @@ public: /* TODO */ break; default: - Printf(stderr, "GetShadowReturnType: unhandled data type: %s\n", SwigType_str(t, 0)); + Printf(stderr, "SwigToPhpType: unhandled data type: %s\n", SwigType_str(t, 0)); break; } diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index f0e335c37..bfdec0d76 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1773,6 +1773,7 @@ public: Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0)); break; } + p = nextSibling(p); } /* finish argument marshalling */ diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 49d3ecc89..989136a9d 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -57,13 +57,11 @@ static String * getRTypeName(SwigType *t, int *outCount = NULL) { Insert(tmp, 0, retName); return tmp; - /* if(count) return(b); Delete(b); return(NewString("")); - */ } #if 0 @@ -106,7 +104,7 @@ static String * getRType(Node *n) { Now handles arrays, i.e. struct A[2] ****************/ -static String *getRClassName(String *retType, int /*addRef*/ = 1, int upRef=0) { +static String *getRClassName(String *retType, int addRef = 1, int upRef=0) { String *tmp = NewString(""); SwigType *resolved = SwigType_typedef_resolve_all(retType); char *retName = Char(SwigType_manglestr(resolved)); @@ -117,7 +115,6 @@ static String *getRClassName(String *retType, int /*addRef*/ = 1, int upRef=0) { } return tmp; -/* #if 1 List *l = SwigType_split(retType); int n = Len(l); @@ -163,7 +160,6 @@ static String *getRClassName(String *retType, int /*addRef*/ = 1, int upRef=0) { #endif return tmp; -*/ } /********************* @@ -1845,9 +1841,6 @@ int R::functionWrapper(Node *n) { String *name = Getattr(p,"name"); String *lname = Getattr(p,"lname"); - // R keyword renaming - if (name && Swig_name_warning(p, 0, name, 0)) - name = 0; /* If we have a :: in the parameter name because we are accessing a static member of a class, say, then we need to remove that prefix. */ @@ -2034,18 +2027,14 @@ int R::functionWrapper(Node *n) { Replaceall(tm,"$owner", "R_SWIG_EXTERNAL"); } -#if 0 - if(addCopyParam) { + if(0 && addCopyParam) { Printf(f->code, "if(LOGICAL(s_swig_copy)[0]) {\n"); Printf(f->code, "/* Deal with returning a reference. */\nr_ans = R_NilValue;\n"); Printf(f->code, "}\n else {\n"); } -#endif Printf(f->code, "%s\n", tm); -#if 0 - if(addCopyParam) + if(0 && addCopyParam) Printf(f->code, "}\n"); /* end of if(s_swig_copy) ... else { ... } */ -#endif } else { Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index ad448d34e..a57571bb8 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -448,7 +448,7 @@ private: parent_name = Copy( Getattr(mod, "name") ); if ( parent_name ) { - (Char(parent_name))[0] = (char)toupper((Char(parent_name))[0]); + (Char(parent_name))[0] = toupper((Char(parent_name))[0]); } } if ( parent_name ) @@ -1194,7 +1194,7 @@ public: while (m.item) { if (Len(m.item) > 0) { String *cap = NewString(m.item); - (Char(cap))[0] = (char)toupper((Char(cap))[0]); + (Char(cap))[0] = toupper((Char(cap))[0]); if (last != 0) { Append(module, "::"); } @@ -1206,7 +1206,7 @@ public: if (feature == 0) { feature = Copy(last); } - (Char(last))[0] = (char)toupper((Char(last))[0]); + (Char(last))[0] = toupper((Char(last))[0]); modvar = NewStringf("m%s", last); Delete(modules); } @@ -2219,7 +2219,7 @@ public: return name; if (islower(name[0])) { - name[0] = (char)toupper(name[0]); + name[0] = toupper(name[0]); Swig_warning(WARN_RUBY_WRONG_NAME, input_file, line_number, "Wrong %s name (corrected to `%s')\n", reason, name); return name; } @@ -2545,7 +2545,7 @@ public: String *name = Copy(symname); char *cname = Char(name); if (cname) - cname[0] = (char)toupper(cname[0]); + cname[0] = toupper(cname[0]); Printv(director_prot_ctor_code, "if ( $comparison ) { /* subclassed */\n", " $director_new \n", diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index c04f95f00..560d12998 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -36,7 +36,6 @@ static int error_as_warning = 0; /* Understand the cpp #error directive as a spe /* Test a character to see if it valid in an identifier (after the first letter) */ #define isidchar(c) ((isalnum(c)) || (c == '_') || (c == '$')) -DOH *Preprocessor_replace(DOH *); /* Skip whitespace */ static void skip_whitespace(String *s, String *out) { @@ -699,6 +698,7 @@ static String *get_options(String *str) { static String *expand_macro(String *name, List *args) { String *ns; DOH *symbols, *macro, *margs, *mvalue, *temp, *tempa, *e; + DOH *Preprocessor_replace(DOH *); int i, l; int isvarargs = 0; @@ -935,6 +935,7 @@ static String *expand_macro(String *name, List *args) { List *evaluate_args(List *x) { Iterator i; + String *Preprocessor_replace(String *); List *nl = NewList(); for (i = First(x); i.item; i = Next(i)) { @@ -1794,7 +1795,7 @@ String *Preprocessor_parse(String *s) { for (i = 0; i < 6;) { c = Getc(s); Putc(c, value); - statement[i++] = (char)c; + statement[i++] = c; if (strncmp(statement, ed, i) && strncmp(statement, df, i)) break; } diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 18920ecc2..2fc444290 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -513,8 +513,7 @@ String *Swig_cppconstructor_base_call(String_or_char *name, ParmList *parms, int pname = Swig_cparm_name(p, i); i++; } else { - pname = Getattr(p, "value"); - if (pname) + if ((pname = Getattr(p, "value"))) pname = Copy(pname); else pname = Copy(Getattr(p, "name")); diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 3f47be15b..25ea0683f 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -352,8 +352,7 @@ char *Swig_file_filename(const String_or_char *filename) { char *c; strcpy(tmp, Char(filename)); - c = strrchr(tmp, *delim); - if (c) + if ((c = strrchr(tmp, *delim))) return c + 1; else return tmp; diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index d29250517..04691b595 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -614,8 +614,7 @@ void Swig_scopename_split(String *s, String **rprefix, String **rlast) { *rlast = Copy(s); } - co = strstr(cc, "operator "); - if (co) { + if ((co = strstr(cc, "operator "))) { if (co == cc) { *rprefix = 0; *rlast = Copy(s); @@ -665,9 +664,7 @@ String *Swig_scopename_prefix(String *s) { char *co = 0; if (!strstr(c, "::")) return 0; - co = strstr(cc, "operator "); - - if (co) { + if ((co = strstr(cc, "operator "))) { if (co == cc) { return 0; } else { @@ -718,8 +715,7 @@ String *Swig_scopename_last(String *s) { if (!strstr(c, "::")) return NewString(s); - co = strstr(cc, "operator "); - if (co) { + if ((co = strstr(cc, "operator "))) { return NewString(co); } @@ -760,9 +756,7 @@ String *Swig_scopename_first(String *s) { char *co = 0; if (!strstr(c, "::")) return 0; - - co = strstr(c, "operator "); - if (co) { + if ((co = strstr(c, "operator "))) { if (co == c) { return 0; } @@ -810,9 +804,7 @@ String *Swig_scopename_suffix(String *s) { char *co = 0; if (!strstr(c, "::")) return 0; - - co = strstr(c, "operator "); - if (co) { + if ((co = strstr(c, "operator "))) { if (co == c) return 0; } @@ -850,9 +842,8 @@ String *Swig_scopename_suffix(String *s) { int Swig_scopename_check(String *s) { char *c = Char(s); - char *co = strstr(c, "operator "); - - if (co) { + char *co = 0; + if ((co = strstr(c, "operator "))) { if (co == c) return 0; } diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index f34a24612..519e5b59e 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -482,8 +482,7 @@ DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType Delete(t_name); } /* A template-based class lookup */ - /* - if (!rn && SwigType_istemplate(prefix)) { + if (0 && !rn && SwigType_istemplate(prefix)) { String *t_prefix = SwigType_templateprefix(prefix); if (Strcmp(t_prefix, prefix) != 0) { String *t_name = SwigType_templateprefix(name); @@ -492,7 +491,6 @@ DOH *Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType } Delete(t_prefix); } - */ } /* A wildcard-based class lookup */ if (!rn) { @@ -1479,7 +1477,7 @@ String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType } - if (rename_hash || rename_list || namewarn_hash || namewarn_list) { + if (rename_hash || rename_list) { Hash *rn = Swig_name_object_get(Swig_name_rename_hash(), prefix, name, decl); if (!rn || !Swig_name_match_nameobj(rn, n)) { rn = Swig_name_nameobj_lget(Swig_name_rename_list(), n, prefix, name, decl); diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 06e78db37..e8b1b5f46 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -200,7 +200,7 @@ static char nextchar(Scanner * s) { if ((nc == '\n') && (!s->freeze_line)) s->line++; Putc(nc,s->text); - return (char)nc; + return nc; } /* ----------------------------------------------------------------------------- @@ -349,7 +349,7 @@ static void get_escape(Scanner *s) { } else { char tmp[3]; tmp[0] = '\\'; - tmp[1] = (char)c; + tmp[1] = c; tmp[2] = 0; Delitem(s->text, DOH_END); Append(s->text, tmp); diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 18d1b2304..f234839fe 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -937,8 +937,7 @@ String *SwigType_templateargs(const SwigType *t) { int SwigType_istemplate(const SwigType *t) { char *ct = Char(t); - ct = strstr(ct, "<("); - if (ct && (strstr(ct + 2, ")>"))) + if ((ct = strstr(ct, "<(")) && (strstr(ct + 2, ")>"))) return 1; return 0; } diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index ae6ab3dc8..fdf37ece1 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -108,8 +108,6 @@ static Hash *typedef_resolve_cache = 0; static Hash *typedef_all_cache = 0; static Hash *typedef_qualified_cache = 0; -static Typetab *SwigType_find_scope(Typetab *s, String *nameprefix); - /* common attribute keys, to avoid calling find_key all the times */ /* @@ -164,6 +162,7 @@ void SwigType_typesystem_init() { * ----------------------------------------------------------------------------- */ int SwigType_typedef(SwigType *type, String_or_char *name) { + Typetab *SwigType_find_scope(Typetab *, String *s); if (Getattr(current_typetab, name)) return -1; /* Already defined */ if (Strcmp(type, name) == 0) { /* Can't typedef a name to itself */ @@ -410,7 +409,7 @@ void SwigType_print_scope(Typetab *t) { } } -static Typetab *SwigType_find_scope(Typetab *s, String *nameprefix) { +Typetab *SwigType_find_scope(Typetab *s, String *nameprefix) { Typetab *ss; String *nnameprefix = 0; static int check_parent = 1; @@ -1312,8 +1311,7 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) { SwigType *ftd = SwigType_typedef_resolve_all(t); td = SwigType_strip_qualifiers(ftd); Delete(ftd); - n = Swig_symbol_clookup(td, 0); - if (n) { + if ((n = Swig_symbol_clookup(td, 0))) { if (GetFlag(n, "feature:valuewrapper")) { use_wrapper = 1; } else { @@ -1336,8 +1334,7 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) { Delete(ftd); if (SwigType_type(td) == T_USER) { use_wrapper = 1; - n = Swig_symbol_clookup(td, 0); - if (n) { + if ((n = Swig_symbol_clookup(td, 0))) { if ((Checkattr(n, "nodeType", "class") && !Getattr(n, "allocate:noassign") && (Getattr(n, "allocate:default_constructor"))) @@ -1798,15 +1795,13 @@ void SwigType_inherit_equiv(File *out) { String *lprefix = SwigType_lstr(prefix, 0); Hash *subhash = Getattr(sub, bk.key); String *convcode = Getattr(subhash, "convcode"); + Printf(out, "static void *%s(void *x, int *newmemory) {", convname); if (convcode) { - char *newmemoryused = Strstr(convcode, "newmemory"); /* see if newmemory parameter is used in order to avoid unused parameter warnings */ String *fn = Copy(convcode); Replaceall(fn, "$from", "x"); - Printf(out, "static void *%s(void *x, int *%s) {", convname, newmemoryused ? "newmemory" : "SWIGUNUSEDPARM(newmemory)"); Printf(out, "%s", fn); } else { String *cast = Getattr(subhash, "cast"); - Printf(out, "static void *%s(void *x, int *SWIGUNUSEDPARM(newmemory)) {", convname); Printf(out, "\n return (void *)((%s) ", lkey); if (cast) Printf(out, "%s", cast); diff --git a/TODO b/TODO index 103185d23..d764d1d20 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ SWIG TO-DO -Release: SWIG-1.3.36 +Release: SWIG-1.3.35 ----------------------------------------------------------------------------- diff --git a/Tools/WAD/Python/type.c b/Tools/WAD/Python/type.c index 7d8248e0b..5236c1c64 100644 --- a/Tools/WAD/Python/type.c +++ b/Tools/WAD/Python/type.c @@ -62,7 +62,7 @@ new_wadobject(WadFrame *f, int count) { /* release a wad object */ static void wadobject_dealloc(wadobject *self) { - PyObject_Del(self); + PyMem_DEL(self); } static char message[65536]; diff --git a/Tools/mkrelease.py b/Tools/mkrelease.py index d7927f8e6..574720dab 100755 --- a/Tools/mkrelease.py +++ b/Tools/mkrelease.py @@ -21,8 +21,8 @@ except: print "where version should be 1.3.x and username is your SF username" sys.exit(1) -print "Looking for rsync" -os.system("which rsync") and failed("rsync not installed/found. Please install.") +print "Looking for wput" +os.system("which wput") and failed("wput not installed/found. Please install.") print "Making source tarball" os.system("python ./mkdist.py " + version) and failed("") @@ -31,8 +31,8 @@ print "Build Windows package" os.system("./mkwindows.sh " + version) and failed("") print "Uploading to Sourceforge" -os.system("rsync --archive --verbose -P --times -e ssh swig-" + version + ".tar.gz " + username + "@frs.sourceforge.net:uploads/") and failed("") -os.system("rsync --archive --verbose -P --times -e ssh swigwin-" + version + ".zip " + username + "@frs.sourceforge.net:uploads/") and failed("") +os.system("wput --verbose --binary swig-" + version + ".tar.gz ftp://anonymous:" + username + "@users.sourceforge.net@upload.sourceforge.net/incoming/") and failed("") +os.system("wput --verbose --binary swigwin-" + version + ".zip ftp://anonymous:" + username + "@users.sourceforge.net@upload.sourceforge.net/incoming/") and failed("") os.system("svn copy -m \"rel-" + version + "\" https://swig.svn.sourceforge.net/svnroot/swig/trunk https://swig.svn.sourceforge.net/svnroot/swig/tags/rel-" + version + "/") diff --git a/configure.in b/configure.in index a8b8be5f3..32bab8adc 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[1.3.37],[http://www.swig.org]) +AC_INIT([swig],[1.3.36],[http://www.swig.org]) AC_PREREQ(2.58) AC_CONFIG_SRCDIR([Source/Swig/swig.h]) AC_CONFIG_AUX_DIR([Tools/config]) @@ -254,6 +254,18 @@ case $host in *) MZSCHEME_SO=.so;; esac +AC_SUBST(TCL_LDSHARED) +case $host in + *-*-darwin*) TCL_LDSHARED="gcc -dynamiclib -flat_namespace -undefined suppress";; + *) TCL_LDSHARED=$LDSHARED;; +esac + +AC_SUBST(TCL_CXXSHARED) +case $host in + *-*-darwin*) TCL_CXXSHARED="g++ -dynamiclib -flat_namespace -undefined suppress";; + *) TCL_CXXSHARED=$TRYLINKINGWITHCXX;; +esac + AC_SUBST(LUA_SO) case $host in *-*-darwin*) LUA_SO=.so;; @@ -533,7 +545,6 @@ fi # Cygwin (Windows) needs the library for dynamic linking case $host in *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; -*-*-darwin*) TCLDYNAMICLINKING="-dynamiclib -flat_namespace -undefined suppress";; *)TCLDYNAMICLINKING="";; esac fi From 994cf6f0c742c05a1ddf3a87b2ed58210b4ce5eb Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:01:20 +0000 Subject: [PATCH 059/508] Remove GIFPlot C Examples From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13037 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/GIFPlot/C/Makefile | 17 ----------------- Examples/GIFPlot/C/gifplot.i | 15 --------------- 2 files changed, 32 deletions(-) delete mode 100644 Examples/GIFPlot/C/Makefile delete mode 100644 Examples/GIFPlot/C/gifplot.i diff --git a/Examples/GIFPlot/C/Makefile b/Examples/GIFPlot/C/Makefile deleted file mode 100644 index f45d360cf..000000000 --- a/Examples/GIFPlot/C/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -SWIGOPT = -I../Include -SRCS = -TARGET = gifplot -INTERFACE = gifplot.i -LIBS = -L.. -lgifplot -INCLUDES = -I../Include - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' LIBS='$(LIBS)' \ - SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c - -clean: - rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme - -check: all diff --git a/Examples/GIFPlot/C/gifplot.i b/Examples/GIFPlot/C/gifplot.i deleted file mode 100644 index 356edd7f1..000000000 --- a/Examples/GIFPlot/C/gifplot.i +++ /dev/null @@ -1,15 +0,0 @@ -/* Oh what the heck, let's just grab the whole darn header file - and see what happens. */ - -%module gifplot -%{ - -/* Note: You still need this part because the %include directive - merely causes SWIG to interpret the contents of a file. It doesn't - include the right include headers for the resulting C code */ - -#include "../Include/gifplot.h" - -%} - -%include gifplot.h From cebb2aaa93ba3a28f4b4dbb3d7dd1c984f84fbc9 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:01:40 +0000 Subject: [PATCH 060/508] Re-apply c.cxx changes from r11187 From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13038 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 9d22a0de4..64331b8cf 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -12,6 +12,20 @@ char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $"; #include #include "swigmod.h" +int SwigType_isbuiltin(SwigType *t) { + const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; + int i = 0; + char *c = Char(t); + if (!t) + return 0; + while (builtins[i]) { + if (strcmp(c, builtins[i]) == 0) + return 1; + i++; + } + return 0; +} + class C:public Language { static const char *usage; @@ -150,7 +164,7 @@ public: String *outfile = Getattr(n, "outfile"); // initialize I/O - f_runtime = NewFile(outfile, "w"); + f_runtime = NewFile(outfile, "w", SWIG_output_files()); if (!f_runtime) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); @@ -170,13 +184,13 @@ public: // create proxy files with appropriate name String *proxy_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module)); - if ((f_proxy_c = NewFile(proxy_code_filename, "w")) == 0) { + if ((f_proxy_c = NewFile(proxy_code_filename, "w", SWIG_output_files())) == 0) { FileErrorDisplay(proxy_code_filename); SWIG_exit(EXIT_FAILURE); } String *proxy_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module)); - if ((f_proxy_h = NewFile(proxy_header_filename, "w")) == 0) { + if ((f_proxy_h = NewFile(proxy_header_filename, "w", SWIG_output_files())) == 0) { FileErrorDisplay(proxy_header_filename); SWIG_exit(EXIT_FAILURE); } From ffe2a112943aa33d11dd2b2c8b4ed40f31f334c8 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:02:00 +0000 Subject: [PATCH 061/508] Compile time fixes for C module since merge from trunk From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13039 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 64331b8cf..3d94645a2 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1100,7 +1100,7 @@ ready: Setattr(n, "c:stype", stype); // modify the constructor name - constr_name = Swig_name_construct(newclassname); + constr_name = Swig_name_construct(NSPACE_TODO, newclassname); Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); @@ -1157,7 +1157,7 @@ ready: Setattr(n, "c:stype", stype); // modify the constructor name - constr_name = Swig_name_copyconstructor(newclassname); + constr_name = Swig_name_copyconstructor(NSPACE_TODO, newclassname); Setattr(n, "name", constr_name); Setattr(n, "sym:name", constr_name); @@ -1205,7 +1205,7 @@ ready: Printf(sobj_name, "SwigObj"); ctype = Copy(sobj_name); SwigType_add_pointer(ctype); - p = NewParm(ctype, "self"); + p = NewParm(ctype, "self", n); Setattr(p, "lname", "arg1"); stype = Copy(newclassname); SwigType_add_pointer(stype); @@ -1215,7 +1215,7 @@ ready: Setattr(n, "type", "void"); // modify the destructor name - destr_name = Swig_name_destroy(newclassname); + destr_name = Swig_name_destroy(NSPACE_TODO, newclassname); Setattr(n, "sym:name", destr_name); // create action code From ee2979b362529eb1fe75e93c852b124b9111e889 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:02:21 +0000 Subject: [PATCH 062/508] Add some changes that are needed in all modules for the runtime banner From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13040 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 3d94645a2..e79a92447 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -164,8 +164,8 @@ public: String *outfile = Getattr(n, "outfile"); // initialize I/O - f_runtime = NewFile(outfile, "w", SWIG_output_files()); - if (!f_runtime) { + f_begin = NewFile(outfile, "w", SWIG_output_files()); + if (!f_begin) { FileErrorDisplay(outfile); SWIG_exit(EXIT_FAILURE); } From dcc37563418402efaa0cf68860232bbe74d439b7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:02:51 +0000 Subject: [PATCH 063/508] Make C example makefiles more standard. Note that valgrind can be used via the RUNTOOL env variable, see the docs on running the test-suite. From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13041 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/c/class/Makefile | 10 +--------- Examples/c/exception/Makefile | 10 +--------- Examples/c/simple/Makefile | 10 +--------- Examples/c/std_vector/Makefile | 10 +--------- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile index fb2879087..65ed8bcfb 100644 --- a/Examples/c/class/Makefile +++ b/Examples/c/class/Makefile @@ -1,11 +1,10 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i RUNME = runme.c PROXY = example_proxy.c -MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ @@ -16,13 +15,6 @@ all:: run: env LD_LIBRARY_PATH=. ./runme -memchk: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXXFLAGS='-g' c_cpp - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' CFLAGS='-g' c_compile - env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme - clean: rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile index 5de8ad83b..ce460b949 100644 --- a/Examples/c/exception/Makefile +++ b/Examples/c/exception/Makefile @@ -1,11 +1,10 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i RUNME = runme.c PROXY = example_proxy.c -MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ @@ -16,13 +15,6 @@ all:: run: env LD_LIBRARY_PATH=. ./runme -memchk: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXXFLAGS='-g' c_cpp - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' CFLAGS='-g' c_compile - env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme - clean: rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile index eb07f6914..14e8f69b4 100644 --- a/Examples/c/simple/Makefile +++ b/Examples/c/simple/Makefile @@ -1,11 +1,10 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i RUNME = runme.c PROXY = example_proxy.c -MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ @@ -16,13 +15,6 @@ all:: run: env LD_LIBRARY_PATH=. ./runme -memchk: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CFLAGS='-g' c - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' CFLAGS='-g' c_compile - env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme - clean: rm -f *.o *.so *.out *.a *.exe *.dll *.dylib *_wrap* *_proxy* *~ runme diff --git a/Examples/c/std_vector/Makefile b/Examples/c/std_vector/Makefile index a029dd0b5..ebcc4ee6b 100644 --- a/Examples/c/std_vector/Makefile +++ b/Examples/c/std_vector/Makefile @@ -1,12 +1,11 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig -debug-module 4 > tree.txt +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i RUNME = runme.c PROXY = example_proxy.c INCLUDES = -MEMTOOL = valgrind --leak-check=full all:: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ @@ -17,13 +16,6 @@ all:: run: env LD_LIBRARY_PATH=. ./runme -memchk: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXXFLAGS='-g' INCLUDES='$(INCLUDES)' c_cpp - $(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \ - TARGET='$(TARGET)' CFLAGS='-g' c_compile - env LD_LIBRARY_PATH=. $(MEMTOOL) ./runme - clean: rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme From 6b4880c81f3069bec446013abe6523b5fc4ab1e0 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:03:09 +0000 Subject: [PATCH 064/508] Fix C examples for linking the output into a shared object From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13042 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 3924f0614..393cdb66b 100644 --- a/configure.in +++ b/configure.in @@ -2064,9 +2064,9 @@ case $host in C_SO=".dylib" ;; *) - C_LDSHARED=$(LDSHARED) - CXX_LDSHARED="$(CXXSHARED)" - C_SO=$(SO) + C_LDSHARED='$(LDSHARED)' + CXX_LDSHARED='$(CXXSHARED)' + C_SO='$(SO)' ;; esac From 8600d258d4317dad820d39e46ed1f605556f8995 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 7 May 2012 17:03:28 +0000 Subject: [PATCH 065/508] Add necessary test-suite changes made in trunk for running SWIG From: William S Fulton git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13043 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index fcd28a1d2..47ea0e4a1 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1178,12 +1178,12 @@ CXX_LDSHARED = @CXX_LDSHARED@ C_SO = @C_SO@ c: $(SRCS) - $(SWIG) -c $(SWIGOPT) $(INTERFACE) + $(SWIG) -c $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_cpp: $(SRCS) - $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) From ce2e1f9765bcec3cd3c30b30b4196ce2c29a7984 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 9 May 2012 16:45:07 +0000 Subject: [PATCH 066/508] add me to copyright file/test commit git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13055 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- COPYRIGHT | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2fe0099b8..0f1f0ca21 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ SWIG Copyright and Authors -------------------------- -Copyright (c) 1995-2011 The SWIG Developers +Copyright (c) 1995-2012 The SWIG Developers Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona). Copyright (c) 1998-2005 University of Chicago. Copyright (c) 1995-1998 The University of Utah and the Regents of the University of California @@ -16,6 +16,7 @@ Active SWIG Developers: Joseph Wang (joequant@gmail.com) (R) Xavier Delacour (xavier.delacour@gmail.com) (Octave) David Nadlinger (code@klickverbot.at) (D) + Leif Middelschulte (leif.middelschulte@gmail.com) (C) Past SWIG developers and major contributors include: Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) From 162ed6931aeee655e995c55db05e1405712c8ecc Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 22 May 2012 17:14:59 +0000 Subject: [PATCH 067/508] Fix attribute definition. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13103 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e79a92447..1e5deaed6 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -291,9 +291,6 @@ public: virtual int globalfunctionHandler(Node *n) { SwigType *type = Getattr(n, "type"); - String *vis_hint = NewString(""); - String *return_type_str = SwigType_str(Getattr(n, "type"), 0); - String *name = Getattr(n, "sym:name"); ParmList *parms = Getattr(n, "parms"); String *arg_list = NewString(""); String *call = empty_string; @@ -309,14 +306,9 @@ public: functionWrapper(n); - // add visibility hint for the compiler (do not override this symbol) - Printv(vis_hint, "SWIGPROTECT(", return_type_str, " ", name, "(", ParmList_str(parms), ");)\n\n", NIL); - Printv(f_header, vis_hint, NIL); - Delete(cres); Delete(call); Delete(arg_list); - Delete(vis_hint); return SWIG_OK; } @@ -416,6 +408,7 @@ ready: virtual int functionWrapper(Node *n) { String *name = Copy(Getattr(n, "sym:name")); String *storage = Getattr(n, "storage"); + String *vis_hint = NewString(""); SwigType *type = Getattr(n, "type"); SwigType *otype = Copy(type); SwigType *return_type = NewString(""); @@ -780,12 +773,16 @@ ready: Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); // add function declaration to the proxy header file - Printv(f_proxy_header, return_type, " ", name, "(", proto, ");\n"); + // add visibility hint for the compiler (do not override this symbol) + Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL); + Printv(f_proxy_header, vis_hint, NIL); + } Wrapper_print(wrapper, f_wrappers); // cleanup + Delete(vis_hint); Delete(over_suffix); Delete(proto); Delete(arg_names); From e08563189f7d7b47a2f332de7eef69325b94d929 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 22 May 2012 17:15:22 +0000 Subject: [PATCH 068/508] Fix missing braces in assignment-as-condition git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13104 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/cexcept.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index 0f953e184..e4a3ce265 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -215,7 +215,7 @@ SWIGINTERN void SWIG_runtime_init() { if (!SWIG_rt_init) { SWIG_rt_init = 1; SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK); - if (SWIG_exc.code = setjmp(SWIG_rt_env)) { + if ((SWIG_exc.code = setjmp(SWIG_rt_env))) { // deallocate C++ exception if (setjmp(SWIG_rt_env) == 0) { SWIG_rt_stack_push(); From 1dddb18b4cc45106486c96b282f10658b17e3fd0 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 28 May 2012 22:56:37 +0000 Subject: [PATCH 069/508] Fix return type assignment git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13134 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 726fd76c6..89fa3d6ac 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -330,10 +330,10 @@ else _temp[i] = (SwigObj*) 0; } - $result = _temp; + $result = ($1_ltype) _temp; } else - $result = (SwigObj**) 0; + $result = ($1_ltype) 0; } // typemaps for 'cppresult' From a351c3441c669e457d724d940302803746cc5c90 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 12 Jun 2012 00:31:09 +0000 Subject: [PATCH 070/508] Refactor the c module; initial split of wrapper/proxy git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13164 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 957 ++++++++++++++++++++++++++----------------- 1 file changed, 577 insertions(+), 380 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 1e5deaed6..138d22514 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -12,6 +12,22 @@ char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $"; #include #include "swigmod.h" +#ifdef IS_SET_TO_ONE +#undef IS_SET_TO_ONE +#endif +#define IS_SET_TO_ONE(n, var) \ + (Cmp(Getattr(n, var), "1") == 0) +#ifdef IS_SET +#undef IS_SET +#endif +#define IS_SET(n, var) \ + (Getattr(n, var)) +#ifdef IS_EQUAL +#undef IS_EQUAL +#endif +#define IS_EQUAL(val1, val2) \ + (Cmp(val1, val2) == 0) + int SwigType_isbuiltin(SwigType *t) { const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; int i = 0; @@ -401,396 +417,577 @@ ready: return result; } + virtual void printProxy(Node *n, SwigType *return_type, String *wname, String *name, String *proto, String *arg_names) + { + String *vis_hint = NewString(""); + // use proxy-type for return type if supplied + SwigType *proxy_type = Getattr(n, "c:stype"); + + if (proxy_type) { + return_type = SwigType_str(proxy_type, 0); + } + + // emit proxy functions prototypes + Printv(f_proxy_code_init, return_type, " ", wname, "(", proto, ");\n", NIL); + Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); + + // call to the wrapper function + Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); + + // add function declaration to the proxy header file + // add visibility hint for the compiler (do not override this symbol) + Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL); + Printv(f_proxy_header, vis_hint, NIL); + + Delete(vis_hint); + } + + virtual void functionWrapperCSpecific(Node *n) + { + // this is C function, we don't apply typemaps to it + String *name = Copy(Getattr(n, "sym:name")); + SwigType *type = Getattr(n, "type"); + SwigType *return_type = NULL; + String *wname = Swig_name_wrapper(name); + String *arg_names = NULL; + ParmList *parms = Getattr(n, "parms"); + Parm *p; + String *proto = NewString(""); + int gencomma = 0; + bool is_void_return = (SwigType_type(type) == T_VOID); + + // create new function wrapper object + Wrapper *wrapper = NewWrapper(); + + // create new wrapper name + Setattr(n, "wrap:name", wname); + + // create function call + arg_names = Swig_cfunction_call(empty_string, parms); + if (arg_names) { + Delitem(arg_names, 0); + Delitem(arg_names, DOH_END); + } + return_type = SwigType_str(type, 0); + + // emit wrapper prototype and code + for (p = parms, gencomma = 0; p; p = nextSibling(p)) { + Printv(proto, gencomma ? ", " : "", SwigType_str(Getattr(p, "type"), 0), " ", Getattr(p, "lname"), NIL); + gencomma = 1; + } + Printv(wrapper->def, return_type, " ", wname, "(", proto, ") {\n", NIL); + + // attach 'check' typemaps + Swig_typemap_attach_parms("check", parms, wrapper); + + // insert constraint checking + for (p = parms; p; ) { + String *tm; + if ((tm = Getattr(p, "tmap:check"))) { + Replaceall(tm, "$target", Getattr(p, "lname")); + Replaceall(tm, "$name", name); + Printv(wrapper->code, tm, "\n", NIL); + p = Getattr(p, "tmap:check:next"); + } + else { + p = nextSibling(p); + } + } + + Append(wrapper->code, prepend_feature(n)); + if (!is_void_return) { + Printv(wrapper->code, return_type, " result;\n", NIL); + Printf(wrapper->code, "result = "); + } + Printv(wrapper->code, name, "(", arg_names, ");\n", NIL); + Append(wrapper->code, append_feature(n)); + if (!is_void_return) + Printf(wrapper->code, "return result;\n"); + Printf(wrapper->code, "}"); + + if (proxy_flag) // take care of proxy function + printProxy(n, return_type, wname, name, proto, arg_names); + + Wrapper_print(wrapper, f_wrappers); + + // cleanup + Delete(proto); + Delete(arg_names); + Delete(wname); + Delete(return_type); + Delete(name); + DelWrapper(wrapper); + } + + static void functionWrapperPrepareArgs(const ParmList *parms) + { + Parm *p; + int index = 1; + String *lname = 0; + + for (p = (Parm*)parms, index = 1; p; (p = nextSibling(p)), index++) { + if(!(lname = Getattr(p, "lname"))) { + lname = NewStringf("arg%d", index); + Setattr(p, "lname", lname); + } + } + } + + virtual void functionWrapperAppendOverloaded(String *name, const ParmList *parms) + { + String *over_suffix = NewString(""); + Parm *p; + String *mangled; + + for (p = (Parm*)parms; p; p = nextSibling(p)) { + if (IS_SET(p, "c:objstruct")) + continue; + mangled = get_mangled_type(Getattr(p, "type")); + Printv(over_suffix, "_", mangled, NIL); + } + Append(name, over_suffix); + Delete(over_suffix); + } + + static void functionWrapperAddCPPResult(Wrapper *wrapper, const SwigType *type, const String *tm) + { + SwigType *cpptype; + SwigType *tdtype = SwigType_typedef_resolve_all(tm); + if (tdtype) + cpptype = tdtype; + else + cpptype = (SwigType*)tm; + if (SwigType_ismemberpointer(type)) + Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult")); + else + Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult")); + } + + virtual void functionWrapperCPPSpecificProxy(Node *n, String *name) + { + // C++ function wrapper proxy code + SwigType *return_type = Getattr(n, "return_type"); + String *pname = Swig_name_wrapper(name); + String *arg_names = NewString(""); + ParmList *parms = Getattr(n, "parms"); + Parm *p; + String *proto = NewString(""); + int gencomma = 0; + + // attach the standard typemaps + Swig_typemap_attach_parms("in", parms, 0); + + // attach 'ctype' typemaps + Swig_typemap_attach_parms("ctype", parms, 0); + + // prepare function definition + for (p = parms, gencomma = 0; p; ) { + String *tm; + + while (p && checkAttribute(p, "tmap:in:numinputs", "0")) { + p = Getattr(p, "tmap:in:next"); + } + if (!p) break; + + SwigType *type = Getattr(p, "type"); + if (SwigType_type(type) == T_VOID) { + p = nextSibling(p); + continue; + } + String *lname = Getattr(p, "lname"); + String *c_parm_type = NewString(""); + String *proxy_parm_type = NewString(""); + String *arg_name = NewString(""); + + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) + type = tdtype; + + Printf(arg_name, "c%s", lname); + + // set the appropriate type for parameter + if ((tm = Getattr(p, "tmap:ctype"))) { + Printv(c_parm_type, tm, NIL); + // template handling + Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + } + + // use proxy-type for parameter if supplied + String* stype = Getattr(p, "c:stype"); + if (stype) { + Printv(proxy_parm_type, SwigType_str(stype, 0), NIL); + } + else { + Printv(proxy_parm_type, c_parm_type, NIL); + } + + Printv(arg_names, gencomma ? ", " : "", arg_name, NIL); + Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); + gencomma = 1; + + // apply typemaps for input parameter + if (IS_EQUAL(nodeType(n), "destructor")) { + p = Getattr(p, "tmap:in:next"); + } + else if ((tm = Getattr(p, "tmap:in"))) { + Replaceall(tm, "$input", arg_name); + p = Getattr(p, "tmap:in:next"); + } + else { + Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); + p = nextSibling(p); + } + + Delete(arg_name); + Delete(proxy_parm_type); + Delete(c_parm_type); + } + + printProxy(n, return_type, pname, name, proto, arg_names); + + // cleanup + Delete(proto); + Delete(arg_names); + Delete(pname); + } + + virtual void functionWrapperCPPSpecificWrapper(Node *n, String *name) + { + // C++ function wrapper + String *storage = Getattr(n, "storage"); + SwigType *type = Getattr(n, "type"); + SwigType *otype = Copy(type); + SwigType *return_type = Getattr(n, "return_type"); + String *wname = Swig_name_wrapper(name); + String *arg_names = NewString(""); + ParmList *parms = Getattr(n, "parms"); + Parm *p; + int gencomma = 0; + bool is_void_return = (SwigType_type(type) == T_VOID); + bool return_object = false; + // create new function wrapper object + Wrapper *wrapper = NewWrapper(); + + // create new wrapper name + Setattr(n, "wrap:name", wname); + + // add variable for holding result of original function 'cppresult' + // WARNING: testing typemap approach + if (!is_void_return && !IS_SET_TO_ONE(n, "c:objstruct")) { + String *tm; + if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) { + functionWrapperAddCPPResult(wrapper, type, tm); + return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1"); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cppouttype typemap defined for %s\n", SwigType_str(type, 0)); + } + } + + // create wrapper function prototype + Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); + + // attach the standard typemaps + emit_attach_parmmaps(parms, wrapper); + Setattr(n, "wrap:parms", parms); + + // attach 'ctype' typemaps + Swig_typemap_attach_parms("ctype", parms, wrapper); + + // prepare function definition + for (p = parms, gencomma = 0; p; ) { + String *tm; + + while (p && checkAttribute(p, "tmap:in:numinputs", "0")) { + p = Getattr(p, "tmap:in:next"); + } + if (!p) break; + + SwigType *type = Getattr(p, "type"); + if (SwigType_type(type) == T_VOID) { + p = nextSibling(p); + continue; + } + String *lname = Getattr(p, "lname"); + String *c_parm_type = NewString(""); + String *proxy_parm_type = NewString(""); + String *arg_name = NewString(""); + + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) + type = tdtype; + + Printf(arg_name, "c%s", lname); + + // set the appropriate type for parameter + if ((tm = Getattr(p, "tmap:ctype"))) { + Printv(c_parm_type, tm, NIL); + // template handling + Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + } + + // use proxy-type for parameter if supplied + String* stype = Getattr(p, "c:stype"); + if (stype) { + Printv(proxy_parm_type, SwigType_str(stype, 0), NIL); + } + else { + Printv(proxy_parm_type, c_parm_type, NIL); + } + + Printv(arg_names, gencomma ? ", " : "", arg_name, NIL); + Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); + gencomma = 1; + + // apply typemaps for input parameter + if (IS_EQUAL(nodeType(n), "destructor")) { + p = Getattr(p, "tmap:in:next"); + } + else if ((tm = Getattr(p, "tmap:in"))) { + Replaceall(tm, "$input", arg_name); + Setattr(p, "emit:input", arg_name); + Printf(wrapper->code, "%s\n", tm); + p = Getattr(p, "tmap:in:next"); + } + else { + Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); + p = nextSibling(p); + } + + Delete(arg_name); + Delete(proxy_parm_type); + Delete(c_parm_type); + } + + Printf(wrapper->def, ") {"); + + if (!IS_EQUAL(nodeType(n), "destructor")) { + // emit variables for holding parameters + emit_parameter_variables(parms, wrapper); + + // emit variable for holding function return value + emit_return_variable(n, return_type, wrapper); + } + + // insert constraint checking + for (p = parms; p; ) { + String *tm; + if ((tm = Getattr(p, "tmap:check"))) { + Replaceall(tm, "$target", Getattr(p, "lname")); + Replaceall(tm, "$name", name); + Printv(wrapper->code, tm, "\n", NIL); + p = Getattr(p, "tmap:check:next"); + } + else { + p = nextSibling(p); + } + } + + // create action code + String *action = Getattr(n, "wrap:action"); + if (!action) + action = NewString(""); + + String *cbase_name = Getattr(n, "c:base_name"); + if (cbase_name) { + Replaceall(action, "arg1)->", NewStringf("(%s*)arg1)->", Getattr(n, "c:inherited_from"))); + Replaceall(action, Getattr(n, "name"), cbase_name); + } + + // handle special cases of cpp return result + if (!IS_EQUAL(nodeType(n), "constructor")) { + if (SwigType_isenum(SwigType_base(type))){ + if (return_object) + Replaceall(action, "result =", "cppresult = (int)"); + else Replaceall(action, "result =", "cppresult = (int*)"); + } + else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type) + && !IS_EQUAL(storage, "static")) { + // returning object by value + String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref"); + String *lstr = SwigType_lstr(type, 0); + if (IS_EQUAL(Getattr(n, "kind"), "variable")) { + Delete(action); + action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0)); + } + else { + String *call_str = NewStringf("{const %s = %s", str, + SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : ""); + Replaceall(action, "result =", call_str); + Delete(call_str); + } + if (Getattr(n, "nested")) + Replaceall(action, "=", NewStringf("= *(%s)(void*) &", SwigType_str(otype, 0))); + Printf(action, "cppresult = (%s*) &_result_ref;}", lstr); + Delete(str); + Delete(lstr); + } + else + Replaceall(action, "result =", "cppresult = "); + } + + // prepare action code to use, e.g. insert try-catch blocks + action = emit_action(n); + + // emit output typemap if needed + if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { + String *tm; + if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { + Replaceall(tm, "$result", "result"); + Printf(wrapper->code, "%s", tm); + if (Len(tm)) + Printf(wrapper->code, "\n"); + } + else { + Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name")); + } + } + else { + Append(wrapper->code, action); + } + + String *except = Getattr(n, "feature:except"); + if (Getattr(n, "throws") || except) { + if (!except || (Cmp(except, "0") != 0)) + Printf(wrapper->code, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); + } + + // insert cleanup code + for (p = parms; p; ) { + String *tm; + if ((tm = Getattr(p, "tmap:freearg"))) { + if (tm && (Len(tm) != 0)) { + String *input = NewStringf("c%s", Getattr(p, "lname")); + Replaceall(tm, "$source", Getattr(p, "lname")); + Replaceall(tm, "$input", input); + Delete(input); + Printv(wrapper->code, tm, "\n", NIL); + } + p = Getattr(p, "tmap:freearg:next"); + } + else { + p = nextSibling(p); + } + } + + if (!is_void_return) + Append(wrapper->code, "return result;\n"); + + Append(wrapper->code, "}\n"); + + Wrapper_print(wrapper, f_wrappers); + + // cleanup + Delete(arg_names); + Delete(wname); + Delete(return_type); + Delete(otype); + DelWrapper(wrapper); + } + + virtual void functionWrapperCPPSpecificMarkFirstParam(Node *n) + { + bool is_global = IS_SET_TO_ONE(n, "c:globalfun"); // possibly no longer neede + String *storage = Getattr(n, "storage"); + ParmList *parms = Getattr(n, "parms"); + + // mark the first parameter as object-struct + if (!is_global && storage && !IS_EQUAL(storage, "static")) { + if (IS_SET_TO_ONE(n, "ismember") && + !IS_EQUAL(nodeType(n), "constructor")) { + Setattr(parms, "c:objstruct", "1"); + if (!IS_SET(parms, "lname")) + Setattr(parms, "lname", "arg1"); + SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); + SwigType_add_pointer(stype); + Setattr(parms, "c:stype", stype); + } + } + } + + virtual void functionWrapperCPPSpecificSetReturnType(Node *n) + { + SwigType *type = Getattr(n, "type"); + SwigType *return_type = NewString(""); + String *tm; + + // set the return type + if (IS_SET_TO_ONE(n, "c:objstruct")) { + Printv(return_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { + String *ctypeout = Getattr(n, "tmap:couttype:out"); + if (ctypeout) + tm = ctypeout; + Printf(return_type, "%s", tm); + // template handling + Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); + } + Setattr(n, "return_type", return_type); + } + + /* + virtual void functionWrapperCPPSpecific(Node *n) + { + } + */ + + virtual void functionWrapperCPPSpecific(Node *n) + { + ParmList *parms = Getattr(n, "parms"); + String *name = Copy(Getattr(n, "sym:name")); + SwigType *type = Getattr(n, "type"); + SwigType *tdtype = NULL; + + functionWrapperCPPSpecificMarkFirstParam(n); + + // mangle name if function is overloaded + if (IS_SET(n, "sym:overloaded")) { + if (!IS_SET(n, "copy_constructor")) { + functionWrapperAppendOverloaded(name, parms); + } + } + + // resolve correct type + if((tdtype = SwigType_typedef_resolve_all(type))) + Setattr(n, "type", tdtype); + + functionWrapperCPPSpecificSetReturnType(n); + + // make sure lnames are set + functionWrapperPrepareArgs(parms); + + // C++ function wrapper + functionWrapperCPPSpecificWrapper(n, name); + + if (proxy_flag) // take care of proxy function + functionWrapperCPPSpecificProxy(n, name); + + Delete(name); + } + /* ---------------------------------------------------------------------- * functionWrapper() * ---------------------------------------------------------------------- */ virtual int functionWrapper(Node *n) { - String *name = Copy(Getattr(n, "sym:name")); - String *storage = Getattr(n, "storage"); - String *vis_hint = NewString(""); - SwigType *type = Getattr(n, "type"); - SwigType *otype = Copy(type); - SwigType *return_type = NewString(""); - String *wname; - String *arg_names = NewString(""); - ParmList *parms = Getattr(n, "parms"); - Parm *p; - String *tm; - String *proto = NewString(""); - String *over_suffix = NewString(""); - int gencomma; - bool is_global = Cmp(Getattr(n, "c:globalfun"), "1") == 0; // possibly no longer neede - bool is_void_return = (SwigType_type(type) == T_VOID); - bool return_object = false; - - // create new function wrapper object - Wrapper *wrapper = NewWrapper(); - if (!CPlusPlus) { - // this is C function, we don't apply typemaps to it - - // create new wrapper name - wname = Swig_name_wrapper(name); - Setattr(n, "wrap:name", wname); - - // create function call - arg_names = Swig_cfunction_call(empty_string, parms); - if (arg_names) { - Delitem(arg_names, 0); - Delitem(arg_names, DOH_END); - } - return_type = SwigType_str(type, 0); - - // emit wrapper prototype and code - gencomma = 0; - for (p = parms; p; p = nextSibling(p)) { - Printv(proto, gencomma ? ", " : "", SwigType_str(Getattr(p, "type"), 0), " ", Getattr(p, "lname"), NIL); - gencomma = 1; - } - Printv(wrapper->def, return_type, " ", wname, "(", proto, ") {\n", NIL); - - // attach 'check' typemaps - Swig_typemap_attach_parms("check", parms, wrapper); - - // insert constraint checking - for (p = parms; p; ) { - if ((tm = Getattr(p, "tmap:check"))) { - Replaceall(tm, "$target", Getattr(p, "lname")); - Replaceall(tm, "$name", name); - Printv(wrapper->code, tm, "\n", NIL); - p = Getattr(p, "tmap:check:next"); - } - else { - p = nextSibling(p); - } - } - - Append(wrapper->code, prepend_feature(n)); - if (!is_void_return) { - Printv(wrapper->code, return_type, " result;\n", NIL); - Printf(wrapper->code, "result = "); - } - Printv(wrapper->code, name, "(", arg_names, ");\n", NIL); - Append(wrapper->code, append_feature(n)); - if (!is_void_return) - Printf(wrapper->code, "return result;\n"); - Printf(wrapper->code, "}"); + if (CPlusPlus) { + functionWrapperCPPSpecific(n); } else { - // C++ function wrapper - - // mark the first parameter as object-struct - if (!is_global && storage && Cmp(storage, "static") != 0) { - if ((Cmp(Getattr(n, "ismember"), "1") == 0) && - (Cmp(nodeType(n), "constructor") != 0)) { - Setattr(parms, "c:objstruct", "1"); - if (!Getattr(parms, "lname")) - Setattr(parms, "lname", "arg1"); - SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); - SwigType_add_pointer(stype); - Setattr(parms, "c:stype", stype); - } - } - - // mangle name if function is overloaded - if (Getattr(n, "sym:overloaded")) { - if (!Getattr(n, "copy_constructor")) { - for (p = parms; p; p = nextSibling(p)) { - if (Getattr(p, "c:objstruct")) - continue; - String *mangled = get_mangled_type(Getattr(p, "type")); - Printv(over_suffix, "_", mangled, NIL); - } - Append(name, over_suffix); - } - } - - SwigType *tdtype = SwigType_typedef_resolve_all(type); - if (tdtype) - type = tdtype; - - Setattr(n, "type", type); - - // create new wrapper name - wname = Swig_name_wrapper(name); - Setattr(n, "wrap:name", wname); - - // set the return type - if (Cmp(Getattr(n, "c:objstruct"), "1") == 0) { - Printv(return_type, SwigType_str(type, 0), NIL); - } - else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { - String *ctypeout = Getattr(n, "tmap:couttype:out"); - if (ctypeout) - tm = ctypeout; - Printf(return_type, "%s", tm); - // template handling - Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); - } - else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); - } - - // add variable for holding result of original function 'cppresult' - // WARNING: testing typemap approach - SwigType *cpptype; - if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) { - SwigType *tdtype = SwigType_typedef_resolve_all(tm); - if (tdtype) - cpptype = tdtype; - else - cpptype = tm; - if (SwigType_ismemberpointer(type)) - Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult")); - Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult")); - return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1"); - } - else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cppouttype typemap defined for %s\n", SwigType_str(type, 0)); - } - } - - // make sure lnames are set - int index = 1; - for (p = parms; p; p = nextSibling(p)) { - String *lname = Getattr(p, "lname"); - if (!lname) { - lname = NewStringf("arg%d", index); - Setattr(p, "lname", lname); - } - index++; - } - - // create wrapper function prototype - Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); - - // attach the standard typemaps - emit_attach_parmmaps(parms, wrapper); - Setattr(n, "wrap:parms", parms); - - // attach 'ctype' typemaps - Swig_typemap_attach_parms("ctype", parms, wrapper); - - // prepare function definition - gencomma = 0; - for (p = parms; p; ) { - - while (p && checkAttribute(p, "tmap:in:numinputs", "0")) { - p = Getattr(p, "tmap:in:next"); - } - if (!p) break; - - SwigType *type = Getattr(p, "type"); - if (SwigType_type(type) == T_VOID) { - p = nextSibling(p); - continue; - } - String *lname = Getattr(p, "lname"); - String *c_parm_type = NewString(""); - String *proxy_parm_type = NewString(""); - String *arg_name = NewString(""); - - SwigType *tdtype = SwigType_typedef_resolve_all(type); - if (tdtype) - type = tdtype; - - Printf(arg_name, "c%s", lname); - - // set the appropriate type for parameter - if ((tm = Getattr(p, "tmap:ctype"))) { - Printv(c_parm_type, tm, NIL); - // template handling - Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); - } - else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); - } - - // use proxy-type for parameter if supplied - String* stype = Getattr(p, "c:stype"); - if (stype) { - Printv(proxy_parm_type, SwigType_str(stype, 0), NIL); - } - else { - Printv(proxy_parm_type, c_parm_type, NIL); - } - - Printv(arg_names, gencomma ? ", " : "", arg_name, NIL); - Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL); - Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); - gencomma = 1; - - // apply typemaps for input parameter - if (Cmp(nodeType(n), "destructor") == 0) { - p = Getattr(p, "tmap:in:next"); - } - else if ((tm = Getattr(p, "tmap:in"))) { - Replaceall(tm, "$input", arg_name); - Setattr(p, "emit:input", arg_name); - Printf(wrapper->code, "%s\n", tm); - p = Getattr(p, "tmap:in:next"); - } - else { - Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); - p = nextSibling(p); - } - - Delete(arg_name); - Delete(proxy_parm_type); - Delete(c_parm_type); - } - - Printf(wrapper->def, ") {"); - - if (Cmp(nodeType(n), "destructor") != 0) { - // emit variables for holding parameters - emit_parameter_variables(parms, wrapper); - - // emit variable for holding function return value - emit_return_variable(n, return_type, wrapper); - } - - // insert constraint checking - for (p = parms; p; ) { - if ((tm = Getattr(p, "tmap:check"))) { - Replaceall(tm, "$target", Getattr(p, "lname")); - Replaceall(tm, "$name", name); - Printv(wrapper->code, tm, "\n", NIL); - p = Getattr(p, "tmap:check:next"); - } - else { - p = nextSibling(p); - } - } - - // create action code - String *action = Getattr(n, "wrap:action"); - if (!action) - action = NewString(""); - - String *cbase_name = Getattr(n, "c:base_name"); - if (cbase_name) { - Replaceall(action, "arg1)->", NewStringf("(%s*)arg1)->", Getattr(n, "c:inherited_from"))); - Replaceall(action, Getattr(n, "name"), cbase_name); - } - - // handle special cases of cpp return result - if (Cmp(nodeType(n), "constructor") != 0) { - if (SwigType_isenum(SwigType_base(type))){ - if (return_object) - Replaceall(action, "result =", "cppresult = (int)"); - else Replaceall(action, "result =", "cppresult = (int*)"); - } - else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type) - && Cmp(Getattr(n, "storage"), "static") != 0) { - // returning object by value - String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref"); - String *lstr = SwigType_lstr(type, 0); - if (Cmp(Getattr(n, "kind"), "variable") == 0) { - Delete(action); - action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0)); - } - else { - String *call_str = NewStringf("{const %s = %s", str, - SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : ""); - Replaceall(action, "result =", call_str); - Delete(call_str); - } - if (Getattr(n, "nested")) - Replaceall(action, "=", NewStringf("= *(%s)(void*) &", SwigType_str(otype, 0))); - Printf(action, "cppresult = (%s*) &_result_ref;}", lstr); - Delete(str); - Delete(lstr); - } - else - Replaceall(action, "result =", "cppresult = "); - } - - // prepare action code to use, e.g. insert try-catch blocks - action = emit_action(n); - - Setattr(n, "type", type); - // emit output typemap if needed - if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) { - if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) { - Replaceall(tm, "$result", "result"); - Printf(wrapper->code, "%s", tm); - if (Len(tm)) - Printf(wrapper->code, "\n"); - } - else { - Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name")); - } - } - else { - Append(wrapper->code, action); - } - - String *except = Getattr(n, "feature:except"); - if (Getattr(n, "throws") || except) { - if (!except || (Cmp(except, "0") != 0)) - Printf(wrapper->code, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n"); - } - - // insert cleanup code - for (p = parms; p; ) { - if ((tm = Getattr(p, "tmap:freearg"))) { - if (tm && (Len(tm) != 0)) { - String *input = NewStringf("c%s", Getattr(p, "lname")); - Replaceall(tm, "$source", Getattr(p, "lname")); - Replaceall(tm, "$input", input); - Delete(input); - Printv(wrapper->code, tm, "\n", NIL); - } - p = Getattr(p, "tmap:freearg:next"); - } - else { - p = nextSibling(p); - } - } - - if (!is_void_return) - Append(wrapper->code, "return result;\n"); - - Append(wrapper->code, "}\n"); + functionWrapperCSpecific(n); } - // take care of proxy function - if (proxy_flag) { - // use proxy-type for return type if supplied - SwigType *proxy_type = Getattr(n, "c:stype"); - if (proxy_type) { - return_type = SwigType_str(proxy_type, 0); - } - - // emit proxy functions prototypes - Printv(f_proxy_code_init, return_type, " ", wname, "(", proto, ");\n", NIL); - Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); - - // call to the wrapper function - Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); - - // add function declaration to the proxy header file - // add visibility hint for the compiler (do not override this symbol) - Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL); - Printv(f_proxy_header, vis_hint, NIL); - - } - - Wrapper_print(wrapper, f_wrappers); - - // cleanup - Delete(vis_hint); - Delete(over_suffix); - Delete(proto); - Delete(arg_names); - Delete(wname); - Delete(return_type); - Delete(otype); - Delete(name); - DelWrapper(wrapper); return SWIG_OK; } From f1ec1a26a76d2433eea0a5e584e4f67992d4e09e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sat, 16 Jun 2012 18:57:27 +0000 Subject: [PATCH 071/508] Use seperate typemaps for wrapper and proxy.Refactor bits. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13167 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 183 +++++++++++++++++++++++ Source/Modules/c.cxx | 340 +++++++++++++++++++++++++++++++++---------- 2 files changed, 443 insertions(+), 80 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 89fa3d6ac..7de1444ca 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -27,6 +27,44 @@ %fragment("fptr_decl_proxy", "proxy_header") {typedef void(*SWIG_CPP_FP)();} %fragment("stdbool_inc", "proxy_header") {#include } +// typemaps for proxy function parameters +%typemap(proxy) void, short, int, long, long long, char, float, double "$1_ltype" +%typemap(proxy) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" +%typemap(proxy) void *, short *, int *, long *, long long *, char *, float *, double * "$1_ltype" +%typemap(proxy) void **, short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" +%typemap(proxy) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1_ltype" +%typemap(proxy) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" +%typemap(proxy) short &, int &, long &, long long &, char &, float &, double & "$1_ltype" +%typemap(proxy) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1_ltype" +%typemap(proxy) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" +%typemap(proxy) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" +%typemap(proxy) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" +%typemap(proxy) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1_ltype" +%typemap(proxy) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" +%typemap(proxy) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" +%typemap(proxy) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" +%typemap(proxy) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" +%typemap(proxy) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" + +// special cases of array passing - does not intended to be used for objects +%typemap(proxy) SWIGTYPE [] "$1_ltype" +%typemap(proxy) SWIGTYPE ((&)[ANY]) "$1_basetype **" + +%typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" +%typemap(proxy) SWIGTYPE "$1_ltype *" +%typemap(proxy) SWIGTYPE * "$1_ltype *" +%typemap(proxy) SWIGTYPE & "$1_ltype *" +%typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $1_ltype ***" +%typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" +%typemap(proxy) SWIGTYPE *& "/* *& */ $1_ltype **" +%typemap(proxy) enum SWIGTYPE "int" +%typemap(proxy) enum SWIGTYPE & "int *" +%typemap(proxy, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" + +%typemap(proxy, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" +%typemap(proxy, fragment="stdbool_inc") bool & "$1_ltype" +%typemap(proxy, fragment="stdbool_inc") const bool & "$1_ltype const" + // typemaps for function parameters %typemap(ctype) void, short, int, long, long long, char, float, double "$1_ltype" %typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" @@ -65,6 +103,44 @@ %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype" %typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const" +// typemaps for function parameters +%typemap(wrap_call) void, short, int, long, long long, char, float, double "" +%typemap(wrap_call) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "" +%typemap(wrap_call) void *, short *, int *, long *, long long *, char *, float *, double * "" +%typemap(wrap_call) void **, short **, int **, long **, long long **, char **, float **, double ** "" +%typemap(wrap_call) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "" +%typemap(wrap_call) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" +%typemap(wrap_call) short &, int &, long &, long long &, char &, float &, double & "" +%typemap(wrap_call) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "" +%typemap(wrap_call) const short, const int, const long, const long long, const char, const float, const double "" +%typemap(wrap_call) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "" +%typemap(wrap_call) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" +%typemap(wrap_call) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "" +%typemap(wrap_call) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" +%typemap(wrap_call) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "" +%typemap(wrap_call) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& " **" +%typemap(wrap_call) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ " +%typemap(wrap_call) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ " + +// special cases of array passing - does not intended to be used for objects +%typemap(wrap_call) SWIGTYPE [] "" +%typemap(wrap_call) SWIGTYPE ((&)[ANY]) " **" + +%typemap(wrap_call) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "" +%typemap(wrap_call) SWIGTYPE "(SwigObj *)" +%typemap(wrap_call) SWIGTYPE * "(SwigObj *)" +%typemap(wrap_call) SWIGTYPE & "(SwigObj *)" +%typemap(wrap_call) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ (SwigObj ***)" +%typemap(wrap_call) SWIGTYPE *[ANY] "/*ooooh*/ (SwigObj **)" +%typemap(wrap_call) SWIGTYPE *& "/* *& */ (SwigObj **)" +%typemap(wrap_call) enum SWIGTYPE "" +%typemap(wrap_call) enum SWIGTYPE & "" +%typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" + +%typemap(wrap_call, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" +%typemap(wrap_call, fragment="stdbool_inc") bool & "" +%typemap(wrap_call, fragment="stdbool_inc") const bool & " const" + %typemap(in) short, int, long, long long, char, float, double "$1 = ($1_ltype) $input;" %typemap(in) void *, short *, int *, long *, long long *, char *, float *, double * "$1 = ($1_ltype) $input;" %typemap(in) void **, short **, int **, long **, long long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" @@ -269,6 +345,113 @@ %typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*" %typemap(couttype, fragment="stdbool_inc") const bool & "$1_basetype const *" +// typemaps for return values + +// void +%typemap(proxycouttype) void "void" +%typemap(proxycouttype) void*, const void* "void *" + +// short +%typemap(proxycouttype) short, const short "short" +%typemap(proxycouttype) short*, short&, short[ANY], short[] "short *" +%typemap(proxycouttype) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(proxycouttype) unsigned short "unsigned short" +%typemap(proxycouttype) const unsigned short "const unsigned short" +%typemap(proxycouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(proxycouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(proxycouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(proxycouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(proxycouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(proxycouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" + +// int +%typemap(proxycouttype) int, const int "int" +%typemap(proxycouttype) int*, int&, int[ANY], int[] "int *" +%typemap(proxycouttype) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(proxycouttype) unsigned int "unsigned int" +%typemap(proxycouttype) const unsigned int "unsigned int" +%typemap(proxycouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(proxycouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(proxycouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(proxycouttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(proxycouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(proxycouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" + +// long +%typemap(proxycouttype) long, const long "long" +%typemap(proxycouttype) long*, long&, long[ANY], long[] "long *" +%typemap(proxycouttype) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(proxycouttype) unsigned long "unsigned long" +%typemap(proxycouttype) const unsigned long "const unsigned long" +%typemap(proxycouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(proxycouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(proxycouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(proxycouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(proxycouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(proxycouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" + +// long long +%typemap(proxycouttype) long long, const long long "long long" +%typemap(proxycouttype) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(proxycouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(proxycouttype) unsigned long long "unsigned long long" +%typemap(proxycouttype) const unsigned long long "const unsigned long long" +%typemap(proxycouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(proxycouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(proxycouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(proxycouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(proxycouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(proxycouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" + +// char: signed/unsigned +%typemap(proxycouttype) char, const char "char" +%typemap(proxycouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxycouttype) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(proxycouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(proxycouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(proxycouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(proxycouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(proxycouttype) signed char "signed char" +%typemap(proxycouttype) const signed char "const signed char" +%typemap(proxycouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(proxycouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(proxycouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(proxycouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(proxycouttype) unsigned char "unsigned char" +%typemap(proxycouttype) const unsigned char "const unsigned char" +%typemap(proxycouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(proxycouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" + +// float +%typemap(proxycouttype) float, const float "float" +%typemap(proxycouttype) float*, float&, float[ANY], float[] "float *" +%typemap(proxycouttype) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(proxycouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(proxycouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" + +// double +%typemap(proxycouttype) double, const double "double" +%typemap(proxycouttype) double*, double&, double[ANY], double[] "double *" +%typemap(proxycouttype) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" + +// objects +%typemap(proxycouttype) SWIGTYPE "$1_ltype *" +%typemap(proxycouttype) SWIGTYPE * "/*aaaaaa*/$1_ltype" +%typemap(proxycouttype) SWIGTYPE & "$1_ltype *" +%typemap(proxycouttype) SWIGTYPE *& "$1_ltype **" +%typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" +%typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" +%typemap(proxycouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **" +%typemap(proxycouttype) enum SWIGTYPE "int" +%typemap(proxycouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *" +%typemap(proxycouttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" + +%typemap(proxycouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" +%typemap(proxycouttype, fragment="stdbool_inc") bool & "$1_basetype*" +%typemap(proxycouttype, fragment="stdbool_inc") const bool & "$1_basetype const *" + %typemap(out) short, int, long, long long, char, float, double "$result = $1;" %typemap(out) void*, short*, int*, long*, long long *, char*, float*, double* "$result = $1;" %typemap(out) const short, const int, const long, const long long, const char, const float, const double "$result = ($1_ltype) $1;" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 138d22514..84d54b141 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -417,38 +417,13 @@ ready: return result; } - virtual void printProxy(Node *n, SwigType *return_type, String *wname, String *name, String *proto, String *arg_names) - { - String *vis_hint = NewString(""); - // use proxy-type for return type if supplied - SwigType *proxy_type = Getattr(n, "c:stype"); - - if (proxy_type) { - return_type = SwigType_str(proxy_type, 0); - } - - // emit proxy functions prototypes - Printv(f_proxy_code_init, return_type, " ", wname, "(", proto, ");\n", NIL); - Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); - - // call to the wrapper function - Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); - - // add function declaration to the proxy header file - // add visibility hint for the compiler (do not override this symbol) - Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL); - Printv(f_proxy_header, vis_hint, NIL); - - Delete(vis_hint); - } - virtual void functionWrapperCSpecific(Node *n) { // this is C function, we don't apply typemaps to it - String *name = Copy(Getattr(n, "sym:name")); + String *name = Getattr(n, "sym:name"); + String *wname = Swig_name_wrapper(name); SwigType *type = Getattr(n, "type"); SwigType *return_type = NULL; - String *wname = Swig_name_wrapper(name); String *arg_names = NULL; ParmList *parms = Getattr(n, "parms"); Parm *p; @@ -460,7 +435,7 @@ ready: Wrapper *wrapper = NewWrapper(); // create new wrapper name - Setattr(n, "wrap:name", wname); + Setattr(n, "wrap:name", wname); //Necessary to set this attribute? Apparently, it's never read! // create function call arg_names = Swig_cfunction_call(empty_string, parms); @@ -506,7 +481,32 @@ ready: Printf(wrapper->code, "}"); if (proxy_flag) // take care of proxy function - printProxy(n, return_type, wname, name, proto, arg_names); + { + String *vis_hint = NewString(""); + SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied + + if (proxy_type) { + return_type = SwigType_str(proxy_type, 0); + } + + // emit proxy functions prototypes + // print wrapper prototype into proxy body for later use within proxy + // body + Printv(f_proxy_code_init, return_type, " ", wname, "(", proto, ");\n", NIL); + + // print actual proxy code into proxy .c file + Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL); + + // print the call of the wrapper function + Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); + + // add function declaration to the proxy header file + // add visibility hint for the compiler (do not override this symbol) + Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL); + Printv(f_proxy_header, vis_hint, NIL); + + Delete(vis_hint); + } Wrapper_print(wrapper, f_wrappers); @@ -563,13 +563,62 @@ ready: Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult")); } - virtual void functionWrapperCPPSpecificProxy(Node *n, String *name) + virtual SwigType *functionWrapperCPPSpecificWrapperReturnTypeGet(Node *n) + { + SwigType *type = Getattr(n, "type"); + SwigType *return_type = NewString(""); + String *tm; + + // set the return type + if (IS_SET_TO_ONE(n, "c:objstruct")) { + Printv(return_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { + String *ctypeout = Getattr(n, "tmap:proxycouttype:out"); + if (ctypeout) + { + tm = ctypeout; + Printf(stdout, "Obscure couttype:out found! O.o\n"); + } + Printf(return_type, "%s", tm); + // template handling + Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); + } + return return_type; + } + + virtual SwigType *functionWrapperCPPSpecificProxyReturnTypeGet(Node *n) + { + SwigType *type = Getattr(n, "type"); + SwigType *return_type = NewString(""); + String *tm; + + // set the return type + if (IS_SET_TO_ONE(n, "c:objstruct")) { + Printv(return_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Swig_typemap_lookup("proxycouttype", n, "", 0))) { + String *ctypeout = Getattr(n, "tmap:proxycouttype:out"); + if (ctypeout) + { + tm = ctypeout; + Printf(stdout, "Obscure proxycouttype:out found! O.o\n"); + } + Printf(return_type, "%s", tm); + // template handling + Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); + } + return return_type; + } + + virtual String *functionWrapperCPPSpecificProxyPrototypeGet(Node *n, ParmList *parms) { - // C++ function wrapper proxy code - SwigType *return_type = Getattr(n, "return_type"); - String *pname = Swig_name_wrapper(name); - String *arg_names = NewString(""); - ParmList *parms = Getattr(n, "parms"); Parm *p; String *proto = NewString(""); int gencomma = 0; @@ -578,18 +627,20 @@ ready: Swig_typemap_attach_parms("in", parms, 0); // attach 'ctype' typemaps - Swig_typemap_attach_parms("ctype", parms, 0); + Swig_typemap_attach_parms("proxy", parms, 0); + // prepare function definition for (p = parms, gencomma = 0; p; ) { String *tm; + SwigType *type = NULL; while (p && checkAttribute(p, "tmap:in:numinputs", "0")) { p = Getattr(p, "tmap:in:next"); } if (!p) break; - SwigType *type = Getattr(p, "type"); + type = Getattr(p, "type"); if (SwigType_type(type) == T_VOID) { p = nextSibling(p); continue; @@ -606,13 +657,13 @@ ready: Printf(arg_name, "c%s", lname); // set the appropriate type for parameter - if ((tm = Getattr(p, "tmap:ctype"))) { + if ((tm = Getattr(p, "tmap:proxy"))) { Printv(c_parm_type, tm, NIL); // template handling Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); } else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No proxy typemap defined for %s\n", SwigType_str(type, 0)); } // use proxy-type for parameter if supplied @@ -624,7 +675,6 @@ ready: Printv(proxy_parm_type, c_parm_type, NIL); } - Printv(arg_names, gencomma ? ", " : "", arg_name, NIL); Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); gencomma = 1; @@ -645,22 +695,177 @@ ready: Delete(proxy_parm_type); Delete(c_parm_type); } + return proto; + } - printProxy(n, return_type, pname, name, proto, arg_names); + virtual String *functionWrapperCPPSpecificProxyWrapperCallGet(Node *n, const String *wname, ParmList *parms) + { + Parm *p; + String *call = NewString(wname); + String *args = NewString(""); + int gencomma = 0; + + Printv(call, "(", NIL); + // attach the standard typemaps + //Swig_typemap_attach_parms("in", parms, 0); + + // attach typemaps to cast wrapper call with proxy types + Swig_typemap_attach_parms("wrap_call", parms, 0); + + // prepare function definition + for (p = parms, gencomma = 0; p; ) { + String *tm; + SwigType *type = NULL; + + while (p && checkAttribute(p, "tmap:in:numinputs", "0")) { + p = Getattr(p, "tmap:in:next"); + } + if (!p) break; + + type = Getattr(p, "type"); + if (SwigType_type(type) == T_VOID) { + p = nextSibling(p); + continue; + } + String *lname = Getattr(p, "lname"); + String *c_parm_type = NewString(""); + //String *proxy_parm_type = NewString(""); + String *arg_name = NewString(""); + + SwigType *tdtype = SwigType_typedef_resolve_all(type); + if (tdtype) + type = tdtype; + + Printf(arg_name, "c%s", lname); + + // set the appropriate type for parameter + if ((tm = Getattr(p, "tmap:wrap_call"))) { + Printv(c_parm_type, tm, NIL); + // template handling + Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No wrap_call typemap defined for %s\n", SwigType_str(type, 0)); + } + + /* + // use proxy-type for parameter if supplied + String* stype = Getattr(p, "c:stype"); + if (stype) { + Printv(proxy_parm_type, SwigType_str(stype, 0), NIL); + } + else { + Printv(proxy_parm_type, c_parm_type, NIL); + } + */ + + Printv(args, gencomma ? ", " : "", c_parm_type, arg_name, NIL); + gencomma = 1; + + // apply typemaps for input parameter + if (IS_EQUAL(nodeType(n), "destructor")) { + p = Getattr(p, "tmap:in:next"); + } + else if ((tm = Getattr(p, "tmap:in"))) { + Replaceall(tm, "$input", arg_name); + p = Getattr(p, "tmap:in:next"); + } + else { + Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); + p = nextSibling(p); + } + + Delete(arg_name); + //Delete(proxy_parm_type); + Delete(c_parm_type); + } + Printv(call, args, ")", NIL); + + return call; + } + + virtual void functionWrapperCPPSpecificProxy(Node *n, String *name) + { + // C++ function wrapper proxy code + ParmList *parms = Getattr(n, "parms"); + String *wname = Swig_name_wrapper(name); + String *vis_hint = NewString(""); + SwigType *preturn_type = functionWrapperCPPSpecificProxyReturnTypeGet(n); + String *wproto = Getattr(n, "wrap:proto"); + String *pproto = functionWrapperCPPSpecificProxyPrototypeGet(n, parms); + String *wrapper_call = NewString(""); + SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied + + if (proxy_type) { + preturn_type = SwigType_str(proxy_type, 0); + } + + // emit proxy functions prototypes + // print wrapper prototype into proxy body for later use within proxy + // body + Printv(f_proxy_code_init, wproto, "\n", NIL); + + // print actual proxy code into proxy .c file + Printv(f_proxy_code_body, preturn_type, " ", name, "(", pproto, ") {\n", NIL); + + // print the call of the wrapper function + //Printv(f_proxy_code_body, " return ", wname, "(", proxy_wrap_args, ");\n}\n", NIL); + + // Add cast if necessary + if (SwigType_type(preturn_type) != T_VOID) { + Printf(wrapper_call, "(%s)", preturn_type); + } + Printv(wrapper_call, functionWrapperCPPSpecificProxyWrapperCallGet(n, wname, parms), NIL); + Printv(f_proxy_code_body, " return ", wrapper_call, ";\n}\n", NIL); + + // add function declaration to the proxy header file + // add visibility hint for the compiler (do not override this symbol) + Printv(vis_hint, "SWIGPROTECT(", preturn_type, " ", name, "(", pproto, ");)\n\n", NIL); + Printv(f_proxy_header, vis_hint, NIL); // cleanup - Delete(proto); - Delete(arg_names); - Delete(pname); + Delete(vis_hint); + Delete(pproto); + Delete(wrapper_call); + Delete(preturn_type); + Delete(name); } + virtual SwigType *functionWrapperCPPSpecificWrapperSetReturnType(Node *n) + { + SwigType *type = Getattr(n, "type"); + SwigType *return_type = NewString(""); + String *tm; + + // set the return type + if (IS_SET_TO_ONE(n, "c:objstruct")) { + Printv(return_type, SwigType_str(type, 0), NIL); + } + else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { + String *ctypeout = Getattr(n, "tmap:couttype:out"); + if (ctypeout) + { + tm = ctypeout; + Printf(stdout, "Obscure proxycouttype:out found! O.o\n"); + } + Printf(return_type, "%s", tm); + // template handling + Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); + } + else { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); + } + return return_type; + } + + virtual void functionWrapperCPPSpecificWrapper(Node *n, String *name) { // C++ function wrapper String *storage = Getattr(n, "storage"); SwigType *type = Getattr(n, "type"); SwigType *otype = Copy(type); - SwigType *return_type = Getattr(n, "return_type"); + SwigType *return_type = functionWrapperCPPSpecificWrapperReturnTypeGet(n); String *wname = Swig_name_wrapper(name); String *arg_names = NewString(""); ParmList *parms = Getattr(n, "parms"); @@ -692,7 +897,7 @@ ready: // attach the standard typemaps emit_attach_parmmaps(parms, wrapper); - Setattr(n, "wrap:parms", parms); + Setattr(n, "wrap:parms", parms); //never read again?! // attach 'ctype' typemaps Swig_typemap_attach_parms("ctype", parms, wrapper); @@ -765,7 +970,14 @@ ready: Delete(c_parm_type); } - Printf(wrapper->def, ") {"); + Printv(wrapper->def, ")", NIL); + //Create prototype for proxy file + String *wrap_proto = Copy(wrapper->def); + //Declare function as extern so only the linker has to find it + Replaceall(wrap_proto, "SWIGEXPORTC", "extern"); + Printv(wrap_proto, ";", NIL); + Setattr(n, "wrap:proto", wrap_proto); + Printv(wrapper->def, " {", NIL); if (!IS_EQUAL(nodeType(n), "destructor")) { // emit variables for holding parameters @@ -911,36 +1123,6 @@ ready: } } - virtual void functionWrapperCPPSpecificSetReturnType(Node *n) - { - SwigType *type = Getattr(n, "type"); - SwigType *return_type = NewString(""); - String *tm; - - // set the return type - if (IS_SET_TO_ONE(n, "c:objstruct")) { - Printv(return_type, SwigType_str(type, 0), NIL); - } - else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { - String *ctypeout = Getattr(n, "tmap:couttype:out"); - if (ctypeout) - tm = ctypeout; - Printf(return_type, "%s", tm); - // template handling - Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); - } - else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); - } - Setattr(n, "return_type", return_type); - } - - /* - virtual void functionWrapperCPPSpecific(Node *n) - { - } - */ - virtual void functionWrapperCPPSpecific(Node *n) { ParmList *parms = Getattr(n, "parms"); @@ -961,8 +1143,6 @@ ready: if((tdtype = SwigType_typedef_resolve_all(type))) Setattr(n, "type", tdtype); - functionWrapperCPPSpecificSetReturnType(n); - // make sure lnames are set functionWrapperPrepareArgs(parms); @@ -972,7 +1152,7 @@ ready: if (proxy_flag) // take care of proxy function functionWrapperCPPSpecificProxy(n, name); - Delete(name); + //Delete(name); } /* ---------------------------------------------------------------------- From ef85d0d43f8a14b8b59556c0f688f357f7efbdf2 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sat, 16 Jun 2012 18:57:41 +0000 Subject: [PATCH 072/508] Remove SWIGPROTECT from generated code for now. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13168 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 84d54b141..c9910fb02 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -482,7 +482,6 @@ ready: if (proxy_flag) // take care of proxy function { - String *vis_hint = NewString(""); SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied if (proxy_type) { @@ -500,12 +499,16 @@ ready: // print the call of the wrapper function Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); - // add function declaration to the proxy header file + /* // add visibility hint for the compiler (do not override this symbol) + String *vis_hint = NewString(""); Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL); Printv(f_proxy_header, vis_hint, NIL); - Delete(vis_hint); + */ + // add function declaration to the proxy header file + Printv(f_proxy_header, return_type, " ", name, "(", proto, ");\n\n", NIL); + } Wrapper_print(wrapper, f_wrappers); @@ -789,7 +792,6 @@ ready: // C++ function wrapper proxy code ParmList *parms = Getattr(n, "parms"); String *wname = Swig_name_wrapper(name); - String *vis_hint = NewString(""); SwigType *preturn_type = functionWrapperCPPSpecificProxyReturnTypeGet(n); String *wproto = Getattr(n, "wrap:proto"); String *pproto = functionWrapperCPPSpecificProxyPrototypeGet(n, parms); @@ -819,12 +821,17 @@ ready: Printv(f_proxy_code_body, " return ", wrapper_call, ";\n}\n", NIL); // add function declaration to the proxy header file + /* // add visibility hint for the compiler (do not override this symbol) + String *vis_hint = NewString(""); Printv(vis_hint, "SWIGPROTECT(", preturn_type, " ", name, "(", pproto, ");)\n\n", NIL); Printv(f_proxy_header, vis_hint, NIL); + Delete(vis_hint); + */ + + Printv(f_proxy_header, preturn_type, " ", name, "(", pproto, ");\n\n", NIL); // cleanup - Delete(vis_hint); Delete(pproto); Delete(wrapper_call); Delete(preturn_type); From ed7e3143ce53fffa8f8ba13b1551b58bfab8e05e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sat, 16 Jun 2012 18:57:55 +0000 Subject: [PATCH 073/508] Use different types to generate typesafe API. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13169 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index c9910fb02..3f534cd48 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1288,7 +1288,7 @@ ready: // declare type for specific class in the proxy header if (proxy_flag) - Printv(f_proxy_header, "\ntypedef SwigObj ", name, ";\n\n", NIL); + Printv(f_proxy_header, "\ntypedef SwigObj_", name, " ", name, ";\n\n", NIL); Delete(sobj); Delete(name); From ae5413ff74ef7514645bbe96dfba17ebd4f21514 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sat, 16 Jun 2012 18:58:10 +0000 Subject: [PATCH 074/508] Remove macros "IS_EQUAL" and "IS_SET";Stay in line git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13170 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 3f534cd48..1f81927bc 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -17,16 +17,6 @@ char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $"; #endif #define IS_SET_TO_ONE(n, var) \ (Cmp(Getattr(n, var), "1") == 0) -#ifdef IS_SET -#undef IS_SET -#endif -#define IS_SET(n, var) \ - (Getattr(n, var)) -#ifdef IS_EQUAL -#undef IS_EQUAL -#endif -#define IS_EQUAL(val1, val2) \ - (Cmp(val1, val2) == 0) int SwigType_isbuiltin(SwigType *t) { const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; @@ -543,7 +533,7 @@ ready: String *mangled; for (p = (Parm*)parms; p; p = nextSibling(p)) { - if (IS_SET(p, "c:objstruct")) + if (Getattr(p, "c:objstruct")) continue; mangled = get_mangled_type(Getattr(p, "type")); Printv(over_suffix, "_", mangled, NIL); @@ -682,7 +672,7 @@ ready: gencomma = 1; // apply typemaps for input parameter - if (IS_EQUAL(nodeType(n), "destructor")) { + if (Cmp(nodeType(n), "destructor") == 0) { p = Getattr(p, "tmap:in:next"); } else if ((tm = Getattr(p, "tmap:in"))) { @@ -766,7 +756,7 @@ ready: gencomma = 1; // apply typemaps for input parameter - if (IS_EQUAL(nodeType(n), "destructor")) { + if (Cmp(nodeType(n), "destructor") == 0) { p = Getattr(p, "tmap:in:next"); } else if ((tm = Getattr(p, "tmap:in"))) { @@ -958,7 +948,7 @@ ready: gencomma = 1; // apply typemaps for input parameter - if (IS_EQUAL(nodeType(n), "destructor")) { + if (Cmp(nodeType(n), "destructor") == 0) { p = Getattr(p, "tmap:in:next"); } else if ((tm = Getattr(p, "tmap:in"))) { @@ -986,7 +976,7 @@ ready: Setattr(n, "wrap:proto", wrap_proto); Printv(wrapper->def, " {", NIL); - if (!IS_EQUAL(nodeType(n), "destructor")) { + if (Cmp(nodeType(n), "destructor") != 0) { // emit variables for holding parameters emit_parameter_variables(parms, wrapper); @@ -1020,18 +1010,18 @@ ready: } // handle special cases of cpp return result - if (!IS_EQUAL(nodeType(n), "constructor")) { + if (Cmp(nodeType(n), "constructor") != 0) { if (SwigType_isenum(SwigType_base(type))){ if (return_object) Replaceall(action, "result =", "cppresult = (int)"); else Replaceall(action, "result =", "cppresult = (int*)"); } else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type) - && !IS_EQUAL(storage, "static")) { + && (Cmp(storage, "static") != 0)) { // returning object by value String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref"); String *lstr = SwigType_lstr(type, 0); - if (IS_EQUAL(Getattr(n, "kind"), "variable")) { + if (Cmp(Getattr(n, "kind"), "variable") == 0) { Delete(action); action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0)); } @@ -1117,11 +1107,11 @@ ready: ParmList *parms = Getattr(n, "parms"); // mark the first parameter as object-struct - if (!is_global && storage && !IS_EQUAL(storage, "static")) { + if (!is_global && storage && (Cmp(storage, "static") != 0)) { if (IS_SET_TO_ONE(n, "ismember") && - !IS_EQUAL(nodeType(n), "constructor")) { + (Cmp(nodeType(n), "constructor") != 0)) { Setattr(parms, "c:objstruct", "1"); - if (!IS_SET(parms, "lname")) + if (!Getattr(parms, "lname")) Setattr(parms, "lname", "arg1"); SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); SwigType_add_pointer(stype); @@ -1140,8 +1130,8 @@ ready: functionWrapperCPPSpecificMarkFirstParam(n); // mangle name if function is overloaded - if (IS_SET(n, "sym:overloaded")) { - if (!IS_SET(n, "copy_constructor")) { + if (Getattr(n, "sym:overloaded")) { + if (!Getattr(n, "copy_constructor")) { functionWrapperAppendOverloaded(name, parms); } } From 122931dc59bec239a432ce8abcbf5aa391fe50a9 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 19 Jun 2012 17:18:39 +0000 Subject: [PATCH 075/508] Add 'struct' to typedef of SwibObj_Class declaration. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13186 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 1f81927bc..d349a3312 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1278,7 +1278,7 @@ ready: // declare type for specific class in the proxy header if (proxy_flag) - Printv(f_proxy_header, "\ntypedef SwigObj_", name, " ", name, ";\n\n", NIL); + Printv(f_proxy_header, "\ntypedef struct SwigObj_", name, " ", name, ";\n\n", NIL); Delete(sobj); Delete(name); From 95ddf1174dc9a665772fe759a297fe2d19d7f7e2 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 19 Jun 2012 17:18:52 +0000 Subject: [PATCH 076/508] Repair typemap for proxy function params. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13187 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 7de1444ca..344f8cc3a 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -52,7 +52,7 @@ %typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" %typemap(proxy) SWIGTYPE "$1_ltype *" -%typemap(proxy) SWIGTYPE * "$1_ltype *" +%typemap(proxy) SWIGTYPE * "$1_ltype " %typemap(proxy) SWIGTYPE & "$1_ltype *" %typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $1_ltype ***" %typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" From 3ac7a8fc78af7a0f07fde31aaefc792430130cd4 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 26 Jun 2012 15:15:56 +0000 Subject: [PATCH 077/508] Document typemaps; Correct compile instructions git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13193 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 127 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 123 insertions(+), 4 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 85ea10aea..54e6338e6 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -145,7 +145,8 @@ The next step is to build a dynamically loadable module, which we can link to ou 
       $ swig -c example.i
-$ gcc -c example_wrap.c  
+$ gcc -c example_wrap.c
+$ gcc -c example_proxy.c
 $ gcc -shared example_wrap.o -o libexample.so
      @@ -155,8 +156,9 @@ Or, for C++ input: 
       $ swig -c++ -c example.i
-$ g++ -c example_wrap.c  
-$ g++ -shared example_wrap.o -o libexample.so
+$ g++ -c example_wrap.cxx
+$ gcc -c example_proxy.c
+$ g++ -shared example_proxy.o example_wrap.o -o libexample.so

      @@ -171,7 +173,7 @@ The simplest way to use the generated shared module is to link it to the applica 

      -$ gcc runme.c example_proxy.c -L. -lexample -o runme
+$ gcc runme.c -L. -lexample -o runme

      @@ -304,6 +306,34 @@ ms.d = 123.123; The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.

      +

      +By default, SWIG attempts to build a natural C interface to your C/C++ code. +

      • + + + + + + + + + + + + + + + + +
      C++ TypeSWIG C Translation
      Class ExampleEmpty structure Example
      Public, mutable member variable Foo Example::foo + Example_foo_get(Example *e);
      + Example_foo_set(Example *e, Foo *f); +
      Public, immutable member variable Foo Example::bar + Example_foo_get(Example *e);
      +
      +This section briefly covers the essential aspects of this wrapping. +

      +

      36.4.1 Classes

      @@ -382,6 +412,95 @@ radius: 1.500000 area: 7.068583 +

      Backend Developer Documentation

      + +

      Typemaps

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      TypemapUsed for
      proxyInput parameters of proxy function
      ctypeWrapper function declaration
      wrap_call + Casts functions' parameters of wrapper function calls
      +
      + + extern void _wrap_MyClass_delete(SwigObj *o);
      +
      + void MyClass_delete(MyClass *c) {
      + _wrap_MyClass_delete((Swig_Obj *)c);
      + } +       +
      inGenerated for input parameters of a function
      couttypeCasts return values of wrapper functions
      +
      + + SwigObj* _wrap_MyClass_new(void) {
      + void *obj = ...
      + return (SwigObj*)obj;
      + } +       +
      proxyAdds typecasts to class objects of wrapper functions calls in proxy functions
      + + void MyClass_delete(MyClass *myClass) {
      + _wrap_MyClass_delete((SwigObj*)myClass);
      + } +       +
      couttypeAdds typecasts to wrap function return values in proxy functions
      + + MyClass_new(void) {
      + return (MyClass *)_wrap_MyClass_new();
      + } +       +
      proxycouttypeAdds typecasts to wrap function return values in proxy functions
      + + MyClass_new(void) {
      + return (MyClass *)_wrap_MyClass_new();
      + } +       +
      outAdds code to wrapper functions for the return value variables
      cppouttypespecial case where a special cppresult variable is added to a wrapper + function (TODO:the reason for its existence needs investigation). +
      +

      36.5 Exception handling

      From d9c2e44b25b71b91237cdf60ac5653fb950e0680 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 26 Jun 2012 16:37:34 +0000 Subject: [PATCH 078/508] Fix compile instructions. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13194 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 54e6338e6..8d622a799 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -147,7 +147,7 @@ The next step is to build a dynamically loadable module, which we can link to ou $ swig -c example.i $ gcc -c example_wrap.c $ gcc -c example_proxy.c -$ gcc -shared example_wrap.o -o libexample.so +$ gcc -shared example_wrap.o example_proxy.o -o libexample.so

      From 5db9c979631f9b990ce752f4f531a4907072be8a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 26 Jun 2012 16:37:50 +0000 Subject: [PATCH 079/508] Compile _proxy.c even if _runme.c does not exist. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13195 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 5 ++++- Examples/test-suite/c/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 47ea0e4a1..7298124ee 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -53,9 +53,10 @@ XLIB = @XLIBSW@ XINCLUDE = @XINCLUDES@ IWRAP = $(INTERFACE:.i=_wrap.i) +IPROXYSRCS = $(INTERFACE:.i=_proxy.c) ISRCS = $(IWRAP:.i=.c) ICXXSRCS = $(IWRAP:.i=.cxx) -IOBJS = $(IWRAP:.i=.@OBJEXT@) +IOBJS = $(IWRAP:.i=.o) $(IPROXYSRCS:.c:.o) ################################################################## # Dynamic loading for C++ @@ -1180,11 +1181,13 @@ C_SO = @C_SO@ c: $(SRCS) $(SWIG) -c $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) + $(CC) -c $(CCSHARED) $(CFLAGS) $(IPROXYSRCS) $(INCLUDES) $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_cpp: $(SRCS) $(SWIG) -c++ -c $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) + $(CC) -c $(CCSHARED) $(CFLAGS) $(IPROXYSRCS) $(INCLUDES) $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_compile: $(RUNME) $(PROXY) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index a7941551c..cc7735e57 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -65,7 +65,7 @@ setup = \ # a file is found which has _runme.c appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\ - cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c $*_proxy.c -L. -l$* -o $*_runme && \ + cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c -L. -l$* -o $*_runme && \ env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \ fi; From c4ae9c169c2152dc6f1bf00e65802cf036bfb284 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 28 Jun 2012 23:29:56 +0000 Subject: [PATCH 080/508] Fix linking of examples. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13208 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 7298124ee..f9f866d27 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -56,7 +56,7 @@ IWRAP = $(INTERFACE:.i=_wrap.i) IPROXYSRCS = $(INTERFACE:.i=_proxy.c) ISRCS = $(IWRAP:.i=.c) ICXXSRCS = $(IWRAP:.i=.cxx) -IOBJS = $(IWRAP:.i=.o) $(IPROXYSRCS:.c:.o) +IOBJS = $(IWRAP:.i=.o) $(IPROXYSRCS:.c=.o) ################################################################## # Dynamic loading for C++ From f18a62f57d4fdbf2fbddb4a9c82ad531ed6f1657 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sat, 30 Jun 2012 16:03:57 +0000 Subject: [PATCH 081/508] Implement some test cases for the C backend git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13211 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/abstract_access_runme.c | 12 +++++++ Examples/test-suite/c/abstract_change_runme.c | 34 +++++++++++++++++++ .../test-suite/c/abstract_typedef_runme.c | 18 ++++++++++ .../test-suite/c/abstract_virtual_runme.c | 18 ++++++++++ Examples/test-suite/c/add_link_runme.c | 14 ++++++++ .../test-suite/c/anonymous_bitfield_runme.c | 29 ++++++++++++++++ 6 files changed, 125 insertions(+) create mode 100644 Examples/test-suite/c/abstract_access_runme.c create mode 100644 Examples/test-suite/c/abstract_change_runme.c create mode 100644 Examples/test-suite/c/abstract_typedef_runme.c create mode 100644 Examples/test-suite/c/abstract_virtual_runme.c create mode 100644 Examples/test-suite/c/add_link_runme.c create mode 100644 Examples/test-suite/c/anonymous_bitfield_runme.c diff --git a/Examples/test-suite/c/abstract_access_runme.c b/Examples/test-suite/c/abstract_access_runme.c new file mode 100644 index 000000000..b2fe97b4e --- /dev/null +++ b/Examples/test-suite/c/abstract_access_runme.c @@ -0,0 +1,12 @@ +#include "abstract_access/abstract_access_proxy.h" +#include + +int main(int argc, const char *argv[]) { + D *d = new_D(); + + assert(D_do_x(d) == 1); + + delete_D(d); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c/abstract_change_runme.c b/Examples/test-suite/c/abstract_change_runme.c new file mode 100644 index 000000000..005dc0623 --- /dev/null +++ b/Examples/test-suite/c/abstract_change_runme.c @@ -0,0 +1,34 @@ +#include "abstract_typedef2/abstract_change_proxy.h" +#include + +int main(int argc, const char *argv[]) { + Base *ba = new_Base(); + Derived *d = new_Derived(); + Bottom *bo = new_Bottom(); + + assert(Base_PublicProtectedPublic1(ba) == 0); + assert(Base_PublicProtectedPublic2(ba) == 0); + assert(Base_PublicProtectedPublic3(ba) == 0); + assert(Base_PublicProtectedPublic4(ba) == 0); + + assert(Derived_WasProtected1(ba) == 0); + assert(Derived_WasProtected2(ba) == 0); + assert(Derived_WasProtected3(ba) == 0); + assert(Derived_WasProtected4(ba) == 0); + + assert(Bottom_PublicProtectedPublic1(ba) == 0); + assert(Bottom_PublicProtectedPublic2(ba) == 0); + assert(Bottom_PublicProtectedPublic3(ba) == 0); + assert(Bottom_PublicProtectedPublic4(ba) == 0); + + assert(Bottom_WasProtected1(ba) == 0); + assert(Bottom_WasProtected2(ba) == 0); + assert(Bottom_WasProtected3(ba) == 0); + assert(Bottom_WasProtected4(ba) == 0); + + delete_Base(ba); + delete_Derived(d); + delete_Bottom(bo); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c/abstract_typedef_runme.c b/Examples/test-suite/c/abstract_typedef_runme.c new file mode 100644 index 000000000..b30bde634 --- /dev/null +++ b/Examples/test-suite/c/abstract_typedef_runme.c @@ -0,0 +1,18 @@ +#include "abstract_typedef/abstract_typedef_proxy.h" +#include +#include + +int main(int argc, const char *argv[]) { + Engine *e = new_Engine(); + PerseEngine *pe = new_PersEngine(); + A *a = new_A(); + + assert(A_write(e) == true); + assert(A_write(pe) == true); + + delete_A(a); + delete_PerseEngine(pe); + delete_Engine(e); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c/abstract_virtual_runme.c b/Examples/test-suite/c/abstract_virtual_runme.c new file mode 100644 index 000000000..04ef30ad6 --- /dev/null +++ b/Examples/test-suite/c/abstract_virtual_runme.c @@ -0,0 +1,18 @@ +#include "abstract_virtual/abstract_virtual_proxy.h" +#include + +int main(int argc, const char *argv[]) { + B *b = new_B(); + D *d = new_D(); + E *e = new_E(); + + assert(B_foo(b) == 0); + assert(D_foo(d) == 0); + assert(E_foo(e) == 0); + + delete_B(b); + delete_D(b); + delete_E(b); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c/add_link_runme.c b/Examples/test-suite/c/add_link_runme.c new file mode 100644 index 000000000..edcbf8b37 --- /dev/null +++ b/Examples/test-suite/c/add_link_runme.c @@ -0,0 +1,14 @@ +#include "abstract_typedef2/abstract_change_proxy.h" +#include + +int main(int argc, const char *argv[]) { + Foo *f = new_Foo(); + Foo *f2 = Foo_blah(f); + + assert(f2 != 0); + + delete_Foo(f); + delete_Foo(f2); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c/anonymous_bitfield_runme.c b/Examples/test-suite/c/anonymous_bitfield_runme.c new file mode 100644 index 000000000..d7eb2447d --- /dev/null +++ b/Examples/test-suite/c/anonymous_bitfield_runme.c @@ -0,0 +1,29 @@ +#include "abstract_typedef2/abstract_change_proxy.h" +#include + +int main(int argc, const char *argv[]) { + Foo *f = new_Foo(); + + assert(f != 0); + + Foo_x_set(f, 1); + assert(Foo_x_get(f) == 1); + assert(Foo_y_get(f) == 1); + + Foo_y_set(f, 0); + assert(Foo_x_get(f) == 0); + assert(Foo_y_get(f) == 0); + + Foo_f_set(f, 1); + assert(Foo_f_get(f) == 1); + + Foo_z_set(f, 1); + assert(Foo_z_get(f) == 1); + + Foo_seq_set(f, 1); + assert(Foo_seq_get(f) == 1); + + delete_Foo(f); + + return 0; +} \ No newline at end of file From ae50f84237da8826288736eafec8882a55cb7599 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 5 Jul 2012 00:22:44 +0000 Subject: [PATCH 082/508] Repair object references in proxy functions git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13257 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 344f8cc3a..ab2f458dd 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -53,7 +53,7 @@ %typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" %typemap(proxy) SWIGTYPE "$1_ltype *" %typemap(proxy) SWIGTYPE * "$1_ltype " -%typemap(proxy) SWIGTYPE & "$1_ltype *" +%typemap(proxy) SWIGTYPE & "$1_ltype" %typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $1_ltype ***" %typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" %typemap(proxy) SWIGTYPE *& "/* *& */ $1_ltype **" @@ -439,7 +439,7 @@ // objects %typemap(proxycouttype) SWIGTYPE "$1_ltype *" %typemap(proxycouttype) SWIGTYPE * "/*aaaaaa*/$1_ltype" -%typemap(proxycouttype) SWIGTYPE & "$1_ltype *" +%typemap(proxycouttype) SWIGTYPE & "$1_ltype" %typemap(proxycouttype) SWIGTYPE *& "$1_ltype **" %typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" From 884286678a4359efb6d30f1b85747b9178c8f8db Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 5 Jul 2012 00:22:59 +0000 Subject: [PATCH 083/508] Fix fptr cast of wrapper parameter within proxy function git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13258 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index ab2f458dd..837ecdce4 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -135,7 +135,7 @@ %typemap(wrap_call) SWIGTYPE *& "/* *& */ (SwigObj **)" %typemap(wrap_call) enum SWIGTYPE "" %typemap(wrap_call) enum SWIGTYPE & "" -%typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" +%typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "(SWIG_CPP_FP)" %typemap(wrap_call, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" %typemap(wrap_call, fragment="stdbool_inc") bool & "" From 8e66df1b5a6333202bc7becbdc959b0a19c0895c Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 5 Jul 2012 00:23:17 +0000 Subject: [PATCH 084/508] Implement test case for C++ features listed below - pointers - references - values - static variables - default parameters - function pointers (reason the test fails) - global (static) variables (code commented out so far) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13259 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/cpp_basic_runme.c | 107 ++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 Examples/test-suite/c/cpp_basic_runme.c diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c new file mode 100644 index 000000000..32079f3d2 --- /dev/null +++ b/Examples/test-suite/c/cpp_basic_runme.c @@ -0,0 +1,107 @@ +#include "cpp_basic/cpp_basic_proxy.h" +#include +#include + +int main(int argc, const char *argv[]) { + Foo *f = new_Foo(5); + + // test global static variables + // TODO: Implement or document as not available + /* + assert(init_ref != 0); + + global_fptr_set(f); + assert(Foo_num_get(global_fptr_get()) == 5); + + assert(Foo_num_get(global_fref_get()) == -4); + Foo_num_set(f, 6); + global_fref_set(f); + assert(Foo_num_get(global_fref_get()) == 6); + + Foo_num_set(f, 7); + global_fval_set(f); + assert(Foo_num_get(global_fval_get()) == 7); + */ + + Foo_num_set(f, 5); + assert(Foo_num_get(f) == 5); + assert(Foo_func1(f, 2) == 20); + assert(Foo_func2(f, 2) == -10); + + // function pointer set/get tests are missing + // because of unclear implementation details + //foo_func_ptr_set(f, &Foo_func1); + + // test of global static variable is missing + // because of unclear implementation details + //assert(c_init_ref != 0); + + Bar *b = new_Bar(); + + // check default value set by constructor + assert(Bar_cint_get(b) == 3); + + // check default value set by Bar initializer + assert(Foo_num_get(Bar_fval_get(b)) == 15); + // change, recheck + Foo_num_set(Bar_fval_get(b), 2); + assert(Foo_num_get(Bar_fval_get(b)) == 2); + + // check references + assert(Bar_fref_get(b) != 0); + + // check global static value and references + assert(Foo_num_get(Bar_fref_get(b)) == -4); + Foo_num_set(Bar_fref_get(b), 1); + assert(Foo_num_get(Bar_fref_get(b)) == 1); + // create new Bar instance and check static member value + Bar *b2 = new_Bar(); + assert(Foo_num_get(Bar_fref_get(b2)) == 1); + delete_Bar(b2); + b2 = 0; + + // Try to set a pointer + Bar_fptr_set(b, f); + + assert(Bar_test(b, 2, f) == 9); + assert(Bar_test(b, 2, 0) == 4); + + Foo *f2 = Bar_testFoo(b, 2, f); + assert(Foo_num_get(f2) == 11); + delete_Foo(f2); + f2 = 0; + + // test static variables + Bar_global_fptr_set(f); + assert(Foo_num_get(Bar_global_fptr_get()) == 5); + + Foo_num_set(f, 6); + Bar_global_fref_set(f); + assert(Foo_num_get(Bar_global_fref_get()) == 6); + + Foo_num_set(f, 7); + Bar_global_fval_set(f); + assert(Foo_num_get(Bar_global_fval_get()) == 7); + + // test getting, setting and calling function pointers + SWIG_CPP_FP func1 = get_func1_ptr(); + Foo_func_ptr_set(f, func1); + assert(test_func_ptr(f, 2) == 28); + SWIG_CPP_FP func2 = get_func2_ptr(); + Foo_func_ptr_set(f, func2); + assert(test_func_ptr(f, 2) == -14); + + delete_Bar(b); + delete_Foo(f); + + Fl_Window *w = new_Fl_Window(); + // Test whether macro worked for code extension + // and test optional function parameters + Fl_Window_show_pFl_Window(w); + Fl_Window_show_pFl_Window_pv(w, 0); + Fl_Window_show_pFl_Window_pv_pv(w, 0, 0); + delete_Fl_Window(w); + w = 0; + + return 0; +} \ No newline at end of file From f4ebc3068da68d1a8f838d9bb6e146080fe7533a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 9 Jul 2012 22:35:19 +0000 Subject: [PATCH 085/508] Add runtime C++ test for enums. What does not (entirely) work: - 'extern "C"' enum declaration - 'typedef enum {...} play_state' - C++ class enums value definition in proxy git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13310 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/cpp_enum_runme.c | 72 ++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 Examples/test-suite/c/cpp_enum_runme.c diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c new file mode 100644 index 000000000..64ef2b5d7 --- /dev/null +++ b/Examples/test-suite/c/cpp_enum_runme.c @@ -0,0 +1,72 @@ +#include "cpp_basic/cpp_basic_proxy.h" +#include +#include + +int main(int argc, const char *argv[]) { + + // We don't have "enum SOME_ENUM" + int e = ENUM_ONE, *p; + + // check the constructor's default value + StructWithEnums *s = new_StructWithEnums(); + assert(StructWithEnums_some_enum_get(s) == ENUM_ONE); + + // check setter + StructWithEnums_some_enum_set(s, ENUM_TWO); + assert(StructWithEnums_some_enum_get(s) == ENUM_TWO); + + // check function call + StructWithEnums_some_enum_test1(s, &e, &e, &e); + + // check function call + StructWithEnums_some_enum_test2(s, &e, &e, &e); + + // check function call + assert(StructWithEnums_enum_test3(s) == ENUM_ONE); + + // check function call + assert(StructWithEnums_enum_test4(s) == ENUM_TWO); + + // check function call + p = StructWithEnums_enum_test5(s); + assert(*p == ENUM_TWO); + + // check function call + p = StructWithEnums_enum_test6(s); + assert(*p == ENUM_TWO); + + // check function call + p = StructWithEnums_enum_test7(s); + assert(*p == ENUM_TWO); + + // check function call + p = StructWithEnums_enum_test8(s); + assert(*p == ENUM_TWO); + + delete_StructWithEnums(s); + + Foo *f = new_Foo(); + + // check the constructor's default value + assert(Foo_hola_get(f) == Foo_Hello); + + Foo_hola_set(f, Foo_Hi); + assert(Foo_hola_get(f) == Foo_Hi); + + delete_Foo(f); + + //check C enum + hi = Hi; + hi = Hello; + + // check typedef enum + play_state t; + + t = PLAY; + assert(t == true); + + t = STOP; + assert(t == false); + + return 0; +} \ No newline at end of file From 70800398b16bff6b91302dc55474ca79897037af Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 9 Jul 2012 23:29:11 +0000 Subject: [PATCH 086/508] Fix enum pointer typemaps git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13311 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 837ecdce4..e5a323a4d 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -58,7 +58,7 @@ %typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" %typemap(proxy) SWIGTYPE *& "/* *& */ $1_ltype **" %typemap(proxy) enum SWIGTYPE "int" -%typemap(proxy) enum SWIGTYPE & "int *" +%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(proxy, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" %typemap(proxy, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -96,7 +96,7 @@ %typemap(ctype) SWIGTYPE *[ANY] "/*ooooh*/ SwigObj **" %typemap(ctype) SWIGTYPE *& "/* *& */ SwigObj **" %typemap(ctype) enum SWIGTYPE "int" -%typemap(ctype) enum SWIGTYPE & "int *" +%typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(ctype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -134,7 +134,7 @@ %typemap(wrap_call) SWIGTYPE *[ANY] "/*ooooh*/ (SwigObj **)" %typemap(wrap_call) SWIGTYPE *& "/* *& */ (SwigObj **)" %typemap(wrap_call) enum SWIGTYPE "" -%typemap(wrap_call) enum SWIGTYPE & "" +%typemap(wrap_call) enum SWIGTYPE &, enum SWIGTYPE * "" %typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "(SWIG_CPP_FP)" %typemap(wrap_call, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -164,7 +164,7 @@ %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" %typemap(in) enum SWIGTYPE "$1 = ($1_ltype) $input;" -%typemap(in) enum SWIGTYPE & "$1 = ($1_ltype) $input;" +%typemap(in) enum SWIGTYPE &,enum SWIGTYPE * "$1 = ($1_ltype) $input;" %typemap(in) SWIGTYPE [] "$1 = ($1_ltype) $input;" %typemap(in) SWIGTYPE ((&)[ANY]) "$1 = ($1_ltype) $input;" @@ -548,8 +548,7 @@ %typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype" %typemap(cppouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_basetype **" %typemap(cppouttype, retobj="1") enum SWIGTYPE "int" -%typemap(cppouttype) enum SWIGTYPE * "int *" -%typemap(cppouttype) enum SWIGTYPE & "int *" +%typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(cppouttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "$1_ltype" %typemap(cppouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" From 95cd7ea30093895d25729a0f65b12c1e468fd850 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 9 Jul 2012 23:29:24 +0000 Subject: [PATCH 087/508] Fix cpp_enum runtime test to include the right header git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13312 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/cpp_enum_runme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c index 64ef2b5d7..8c3d3b759 100644 --- a/Examples/test-suite/c/cpp_enum_runme.c +++ b/Examples/test-suite/c/cpp_enum_runme.c @@ -1,4 +1,4 @@ -#include "cpp_basic/cpp_basic_proxy.h" +#include "cpp_enum/cpp_enum_proxy.h" #include #include From cfabfd92d2b768588d1ff6aa73f6f943185e4650 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sun, 15 Jul 2012 23:25:29 +0000 Subject: [PATCH 088/508] Add initial namespace support for C backend. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13323 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 146 ++++++++++++++++++++++++++++++++++++++----- Source/Swig/naming.c | 25 ++++++++ Source/Swig/swig.h | 1 + 3 files changed, 156 insertions(+), 16 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d349a3312..e7340c357 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -51,6 +51,7 @@ class C:public Language { String *int_string; String *create_object; String *destroy_object; + String *tl_namespace; // optional top level namespace bool proxy_flag; bool except_flag; @@ -66,10 +67,108 @@ public: int_string(NewString("int")), create_object(0), destroy_object(0), + tl_namespace(NULL), proxy_flag(true), except_flag(true) { } + /* ----------------------------------------------------------------------------- + * getProxyName() + * + * Test to see if a type corresponds to something wrapped with a proxy class. + * Return NULL if not otherwise the proxy class name, fully qualified with + * top level namespace name if the nspace feature is used. + * ----------------------------------------------------------------------------- */ + + String *getProxyName(SwigType *n) { + String *proxyname = NULL; + String *symname = Getattr(n, "sym:name"); + String *nspace = Getattr(n, "sym:nspace"); + + /* original java code + if (proxy_flag) { + Node *n = classLookup(t); + if (n) { + proxyname = Getattr(n, "proxyname"); + if (!proxyname) { + String *nspace = Getattr(n, "sym:nspace"); + String *symname = Getattr(n, "sym:name"); + if (nspace) { + if (package) + proxyname = NewStringf("%s.%s.%s", package, nspace, symname); + else + proxyname = NewStringf("%s.%s", nspace, symname); + } else { + proxyname = Copy(symname); + } + Setattr(n, "proxyname", proxyname); + Delete(proxyname); + } + } + }*/ + + if (!proxy_flag || !n || (proxyname = Getattr(n, "proxyname"))) + goto _get_proxyname_return; + + if (nspace) { + proxyname = Swig_name_proxy(nspace, symname); + if (tl_namespace) + proxyname = Swig_name_proxy(tl_namespace, proxyname); + } else { + proxyname = Copy(symname); + } + Setattr(n, "proxyname", proxyname); + Delete(proxyname); + + _get_proxyname_return: + return proxyname; + } + + /* ----------------------------------------------------------------------------- + * getEnumName() + * + * ----------------------------------------------------------------------------- */ + + String *getEnumName(SwigType *t, bool jnidescriptor) { + Node *enumname = NULL; + Node *n = enumLookup(t); + if (n) { + enumname = Getattr(n, "enumname"); + if (!enumname || jnidescriptor) { + String *symname = Getattr(n, "sym:name"); + if (symname) { + // Add in class scope when referencing enum if not a global enum + String *scopename_prefix = Swig_scopename_prefix(Getattr(n, "name")); + String *proxyname = 0; + if (scopename_prefix) { + proxyname = getProxyName(scopename_prefix); + } + if (proxyname) { + enumname = NewStringf("%s_%s", proxyname, symname); + } else { + // global enum or enum in a namespace + String *nspace = Getattr(n, "sym:nspace"); + if (nspace) { + if (tl_namespace) + enumname = NewStringf("%s_%s_%s", tl_namespace, nspace, symname); + else + enumname = NewStringf("%s_%s", nspace, symname); + } else { + enumname = Copy(symname); + } + } + if (!jnidescriptor) { // not cached + Setattr(n, "enumname", enumname); + Delete(enumname); + } + Delete(scopename_prefix); + } + } + } + + return enumname; + } + /* ------------------------------------------------------------ * main() * ------------------------------------------------------------ */ @@ -217,6 +316,8 @@ public: Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); + Swig_name_register("proxyname", "%n_%v"); + Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "extern \"C\" {\n"); Printf(f_wrappers, "#endif\n\n"); @@ -587,6 +688,7 @@ ready: { SwigType *type = Getattr(n, "type"); SwigType *return_type = NewString(""); + //SwigType *ns = Getattr(n, "name"); String *tm; // set the return type @@ -666,6 +768,8 @@ ready: } else { Printv(proxy_parm_type, c_parm_type, NIL); + //FIXME: implement "convert_to_c_namespace"? + Replaceall(proxy_parm_type, "::", "_"); } Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); @@ -825,7 +929,6 @@ ready: Delete(pproto); Delete(wrapper_call); Delete(preturn_type); - Delete(name); } virtual SwigType *functionWrapperCPPSpecificWrapperSetReturnType(Node *n) @@ -1113,7 +1216,8 @@ ready: Setattr(parms, "c:objstruct", "1"); if (!Getattr(parms, "lname")) Setattr(parms, "lname", "arg1"); - SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); + //SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); + SwigType *stype = Copy(getProxyName(parms)); SwigType_add_pointer(stype); Setattr(parms, "c:stype", stype); } @@ -1149,7 +1253,7 @@ ready: if (proxy_flag) // take care of proxy function functionWrapperCPPSpecificProxy(n, name); - //Delete(name); + Delete(name); } /* ---------------------------------------------------------------------- @@ -1227,7 +1331,8 @@ ready: * --------------------------------------------------------------------- */ virtual int classHandler(Node *n) { - String *name = Getattr(n, "sym:name"); + //String *name = Copy(Getattr(n, "sym:name")); + String *name = Copy(getProxyName(n)); String *sobj = NewString(""); List *baselist = Getattr(n, "bases"); @@ -1456,6 +1561,7 @@ ready: String *constr_name = NewString(""); String *arg_lnames = NewString(""); ParmList *parms = Getattr(n, "parms"); + String *nspace = Getattr(klass, "sym:nspace"); // prepare argument names Append(arg_lnames, Swig_cfunction_call(empty_string, parms)); @@ -1466,13 +1572,14 @@ ready: SwigType_add_pointer(ctype); Setattr(n, "type", ctype); Setattr(n, "c:objstruct", "1"); - stype = Copy(newclassname); + stype = Swig_name_proxy(nspace, newclassname); SwigType_add_pointer(stype); Setattr(n, "c:stype", stype); - // modify the constructor name - constr_name = Swig_name_construct(NSPACE_TODO, newclassname); - Setattr(n, "name", constr_name); + // Modify the constructor name if necessary + constr_name = Swig_name_construct(nspace, newclassname); + + Setattr(n, "name", newclassname); Setattr(n, "sym:name", constr_name); // generate action code @@ -1514,6 +1621,7 @@ ready: String *code = NewString(""); String *constr_name = NewString(""); ParmList *parms = Getattr(n, "parms"); + String *nspace = Getattr(klass, "sym:nspace"); Setattr(parms, "lname", "arg1"); @@ -1523,13 +1631,16 @@ ready: SwigType_add_pointer(ctype); Setattr(n, "type", ctype); Setattr(n, "c:objstruct", "1"); - stype = Copy(newclassname); + stype = Swig_name_proxy(nspace, newclassname); SwigType_add_pointer(stype); Setattr(n, "c:stype", stype); - // modify the constructor name - constr_name = Swig_name_copyconstructor(NSPACE_TODO, newclassname); - Setattr(n, "name", constr_name); + // modify the constructor if necessary + constr_name = Swig_name_copyconstructor(nspace, newclassname); + + //Setattr(n, "name", constr_name); + Setattr(n, "name", newclassname); + //Setattr(n, "sym:name", constr_name); Setattr(n, "sym:name", constr_name); // generate action code @@ -1562,7 +1673,7 @@ ready: virtual int destructorHandler(Node *n) { Node *klass = Swig_methodclass(n); - String *classname = Getattr(klass, "name"); + String *classname = Getattr(klass, "name");// Remove class namespace from constructor String *classtype = Getattr(klass, "classtype"); String *newclassname = Getattr(klass, "sym:name"); String *sobj_name = NewString(""); @@ -1570,6 +1681,7 @@ ready: String *stype; String *code = NewString(""); String *destr_name = NewString(""); + String *nspace = Getattr(klass, "sym:nspace"); Parm *p; // create first argument @@ -1578,15 +1690,17 @@ ready: SwigType_add_pointer(ctype); p = NewParm(ctype, "self", n); Setattr(p, "lname", "arg1"); - stype = Copy(newclassname); + stype = Swig_name_proxy(nspace, newclassname); SwigType_add_pointer(stype); Setattr(p, "c:stype", stype); Setattr(p, "c:objstruct", "1"); Setattr(n, "parms", p); Setattr(n, "type", "void"); - // modify the destructor name - destr_name = Swig_name_destroy(NSPACE_TODO, newclassname); + // modify the destructor name if necessary + destr_name = Swig_name_destroy(nspace, newclassname); + + Setattr(n, "name", NULL); Setattr(n, "sym:name", destr_name); // create action code diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 1be1405a3..ca2b29bfd 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -226,6 +226,31 @@ String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_p return r; } +/* ----------------------------------------------------------------------------- + * Swig_name_proxy() + * + * Returns the name of a proxy function. + * ----------------------------------------------------------------------------- */ + +String *Swig_name_proxy(const_String_or_char_ptr nspace, const_String_or_char_ptr fname) { + String *r; + String *f; + + r = NewStringEmpty(); + if (!naming_hash) + naming_hash = NewHash(); + f = Getattr(naming_hash, "proxyname"); + if (!f) { + Append(r, "%n_%v"); + } else { + Append(r, f); + } + Replace(r, (nspace ? "%n" : "%n_"), nspace, DOH_REPLACE_ANY); + Replace(r, "%v", fname, DOH_REPLACE_ANY); + name_mangle(r); + return r; +} + /* ----------------------------------------------------------------------------- * Swig_name_get() * diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 97b730508..ba9109ad7 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -265,6 +265,7 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern String *Swig_name_mangle(const_String_or_char_ptr s); extern String *Swig_name_wrapper(const_String_or_char_ptr fname); extern String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_ptr classname, const_String_or_char_ptr membername); + extern String *Swig_name_proxy(const_String_or_char_ptr nspace, const_String_or_char_ptr fname); extern String *Swig_name_get(const_String_or_char_ptr nspace, const_String_or_char_ptr vname); extern String *Swig_name_set(const_String_or_char_ptr nspace, const_String_or_char_ptr vname); extern String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_char_ptr classname); From 433a1743ab9d3bf4f6b59081e7bc60bcb262116c Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 18 Jul 2012 23:35:22 +0000 Subject: [PATCH 089/508] Namespace functions as well; Remove :: from tl elements git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13332 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e7340c357..0fe69e250 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -111,6 +111,7 @@ public: goto _get_proxyname_return; if (nspace) { + Replaceall(nspace, ".", "_"); // Classes' namespaces get dotted -> replace; FIXME in core! proxyname = Swig_name_proxy(nspace, symname); if (tl_namespace) proxyname = Swig_name_proxy(tl_namespace, proxyname); @@ -402,7 +403,10 @@ public: String *arg_list = NewString(""); String *call = empty_string; String *cres = empty_string; - + String *nspaced_symname = Swig_name_mangle(Getattr(n, "name")); + + Setattr(n, "sym:name", nspaced_symname); + call = Swig_cfunction_call(Getattr(n, "name"), parms); cres = Swig_cresult(type, "result", call); Setattr(n, "wrap:action", cres); @@ -768,8 +772,10 @@ ready: } else { Printv(proxy_parm_type, c_parm_type, NIL); - //FIXME: implement "convert_to_c_namespace"? - Replaceall(proxy_parm_type, "::", "_"); + // Add namespace + Replaceall(proxy_parm_type, "::", "_"); // FIXME: implement "convert_to_c_namespace"? + if (strncmp(Char(proxy_parm_type), "_", 1) == 0) // Remove top level namespacing if necessary + Replace(proxy_parm_type, "_", "", DOH_REPLACE_FIRST); } Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); From 1c4c1b13d8fc30dd19d546621de2a32ae274c4fc Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 23 Jul 2012 10:35:15 +0000 Subject: [PATCH 090/508] Fix proxy return type namespacing git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13341 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 0fe69e250..46117c9ca 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -713,6 +713,9 @@ ready: else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); } + + Replaceall(return_type, "::", "_"); + return return_type; } From e16672f90ff9ad608d7e18fc220513f9dc6f3b18 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 25 Jul 2012 14:30:34 +0000 Subject: [PATCH 091/508] Fix shadowing variable declaration git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13401 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 46117c9ca..d8f1e58b2 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1020,7 +1020,7 @@ ready: } if (!p) break; - SwigType *type = Getattr(p, "type"); + type = Getattr(p, "type"); if (SwigType_type(type) == T_VOID) { p = nextSibling(p); continue; From 4bc1223c1aa955ecd2e37345eb37723c3c5bafc2 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 25 Jul 2012 14:30:46 +0000 Subject: [PATCH 092/508] Fix segfault of swig due to virtual methods git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13402 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d8f1e58b2..79fdfcdab 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1226,7 +1226,7 @@ ready: if (!Getattr(parms, "lname")) Setattr(parms, "lname", "arg1"); //SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); - SwigType *stype = Copy(getProxyName(parms)); + SwigType *stype = Copy(getProxyName(Swig_methodclass(n))); SwigType_add_pointer(stype); Setattr(parms, "c:stype", stype); } From 3afdd50c78647a30fea244d8823aca24444be91e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:19:36 +0000 Subject: [PATCH 093/508] Fix tests' LD_LYBRARY_PATH and alternatives git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13404 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index cc7735e57..6ca8d454e 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -66,7 +66,7 @@ setup = \ run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\ cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c -L. -l$* -o $*_runme && \ - env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \ + env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" PATH=".:$$PATH" SHLIB_PATH=".:$$SHLIB_PATH" DYLD_LIBRARY_PATH=".:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \ fi; # Clean: remove testcase directories From 3324d68f2a4fb41d06fc5ec493466096ccfef09a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:19:48 +0000 Subject: [PATCH 094/508] Add atomic test for C++ namespaces git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13405 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_namespaced_class.i | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_namespaced_class.i diff --git a/Examples/test-suite/cpp_atomic_namespaced_class.i b/Examples/test-suite/cpp_atomic_namespaced_class.i new file mode 100644 index 000000000..a60d666c7 --- /dev/null +++ b/Examples/test-suite/cpp_atomic_namespaced_class.i @@ -0,0 +1,9 @@ +%module cpp_atomic_namespaced_class +%feature (nspace, "1"); + +%inline{ + namespace myNamespace { + class MyClass { + }; + } +} From fca2262e28f99e96574ef29353c735d09e55cc80 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:20:02 +0000 Subject: [PATCH 095/508] Add C implementation of test cpp_atomic_namespaced_class git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13406 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 3 +++ .../test-suite/c/cpp_atomic_namespaced_class_runme.c | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 6ca8d454e..c68091657 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -12,6 +12,9 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk +CPP_TEST_CASES += \ + cpp_atomic_namespaced_class + # # BROKEN TEST CASES: # default_constructor - last case fail: using %extend generates 2 ctors wrappers, diff --git a/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c b/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c new file mode 100644 index 000000000..8fe021df2 --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c @@ -0,0 +1,11 @@ +#include "cpp_atomic_namespaced_class/cpp_atomic_namespaced_class_proxy.h" + +int main(int argc, const char *argv[]) +{ + myNamespace_MyClass *mc; + mc = new_myNamespace_MyClass(); + + delete_myNamespace_MyClass(mc); + + return 0; +} From a756a4f850287297c73f97ec68070f4e3fbda1c1 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:20:14 +0000 Subject: [PATCH 096/508] Add atomic test for C++ global class instance variables git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13407 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_global_var_class.i | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_global_var_class.i diff --git a/Examples/test-suite/cpp_atomic_global_var_class.i b/Examples/test-suite/cpp_atomic_global_var_class.i new file mode 100644 index 000000000..8e138c60a --- /dev/null +++ b/Examples/test-suite/cpp_atomic_global_var_class.i @@ -0,0 +1,6 @@ +%module cpp_atomic_global_var_class + +%inline { + class MyClass {}; + MyClass myGlobalClassInstance; +} From 48fe82841fac1f1e6248682e0f233c87d774b7a4 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:20:29 +0000 Subject: [PATCH 097/508] Add C implementation of test cpp_atomic_global_var_class git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13408 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../test-suite/c/cpp_atomic_global_var_class_runme.c | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_global_var_class_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index c68091657..431ab806a 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_global_var_class \ cpp_atomic_namespaced_class # diff --git a/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c b/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c new file mode 100644 index 000000000..3841e4d0d --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c @@ -0,0 +1,9 @@ +#include +#include "cpp_atomic_global_var_class/cpp_atomic_global_var_class_proxy.h" + +int main(int argc, const char *argv[]) +{ + assert(myGlobalClassInstance); + + return 0; +} From a2f104e3ca19377cc4fc42f15aa2aee4753c0ffd Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:20:44 +0000 Subject: [PATCH 098/508] Add atomic test for C++ global atomic/native types variables git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13409 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_global_var_atom.i | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_global_var_atom.i diff --git a/Examples/test-suite/cpp_atomic_global_var_atom.i b/Examples/test-suite/cpp_atomic_global_var_atom.i new file mode 100644 index 000000000..5aa81aa7d --- /dev/null +++ b/Examples/test-suite/cpp_atomic_global_var_atom.i @@ -0,0 +1,5 @@ +%module cpp_atomic_global_var_atom + +%inline { + int myGlobalInt = 42; +} From 7d3677a5c8ee5a23c86762167382f88ef328a73a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:21:03 +0000 Subject: [PATCH 099/508] Add C implementation of test cpp_atomic_global_var_atom git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13410 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../test-suite/c/cpp_atomic_global_var_atom_runme.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 431ab806a..5b4977216 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_global_var_atom \ cpp_atomic_global_var_class \ cpp_atomic_namespaced_class diff --git a/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c b/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c new file mode 100644 index 000000000..f21939cff --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c @@ -0,0 +1,13 @@ +#include +#include "cpp_atomic_global_var_atom/cpp_atomic_global_var_atom_proxy.h" + +int main(int argc, const char *argv[]) +{ + assert(myGlobalInt == 42); + + myGlobalInt = 4711; + + assert(myGlobalInt == 4711); + + return 0; +} From 244e3370dd0b84b66c2f184b227e94382a0c3a4e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:21:20 +0000 Subject: [PATCH 100/508] Add atomic test for C++ global enums git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13411 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_global_enum.i | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_global_enum.i diff --git a/Examples/test-suite/cpp_atomic_global_enum.i b/Examples/test-suite/cpp_atomic_global_enum.i new file mode 100644 index 000000000..34367f378 --- /dev/null +++ b/Examples/test-suite/cpp_atomic_global_enum.i @@ -0,0 +1,9 @@ +%module cpp_atomic_global_enum + +%inline { + enum SomeEnum + { + FIRST_VALUE, + SECOND_VALUE + }; +} From cfc1a71b719eabb29d15aea0bee1cddfaf18bfd8 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:21:35 +0000 Subject: [PATCH 101/508] Add C implementation of test cpp_atomic_global_enum git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13412 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + Examples/test-suite/c/cpp_atomic_global_enum_runme.c | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_global_enum_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 5b4977216..1ff61ffd9 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_global_enum \ cpp_atomic_global_var_atom \ cpp_atomic_global_var_class \ cpp_atomic_namespaced_class diff --git a/Examples/test-suite/c/cpp_atomic_global_enum_runme.c b/Examples/test-suite/c/cpp_atomic_global_enum_runme.c new file mode 100644 index 000000000..a4bdf55be --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_global_enum_runme.c @@ -0,0 +1,11 @@ +#include +#include "cpp_atomic_global_enum/cpp_atomic_global_enum_proxy.h" + +int main(int argc, const char *argv[]) +{ + enum SomeEnum myEnum = FIRST_VALUE; + + assert(myEnum != SECOND_VALUE); + + return 0; +} From d276aec0d011ef6d6ab74cdf73e2d28e7d64b1b0 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:21:53 +0000 Subject: [PATCH 102/508] Add atomic test for C++ class with another class as attribute git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13413 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- .../test-suite/cpp_atomic_class_var_pub_member_class.i | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_class_var_pub_member_class.i diff --git a/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i b/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i new file mode 100644 index 000000000..00c060fe8 --- /dev/null +++ b/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i @@ -0,0 +1,10 @@ +%module cpp_atomic_class_var_pub_member_class + +%inline{ + class MyClass { + }; + class MySecondClass { + public: + MyClass myPubClassInstance; + }; +} From dbd8d3aabdcb0d3833969c8da5f9fca73cecfdc7 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:22:08 +0000 Subject: [PATCH 103/508] Add C implementation of test cpp_atomic_class_var_pub_member_class git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13414 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + ..._atomic_class_var_pub_member_class_runme.c | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 1ff61ffd9..f4d0a32ef 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_class_var_pub_member_class \ cpp_atomic_global_enum \ cpp_atomic_global_var_atom \ cpp_atomic_global_var_class \ diff --git a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c b/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c new file mode 100644 index 000000000..516396371 --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c @@ -0,0 +1,20 @@ +#include +#include "cpp_atomic_class_var_pub_member_class/cpp_atomic_class_var_pub_member_class_proxy.h" + +int main(int argc, const char *argv[]) +{ + MyClass *mc; + MySecondClass *mc2; + + mc2 = new_MySecondClass(); + mc = new_MyClass(); + + assert(MySecondClass_myPubClassInstance_get(mc2)); + MySecondClass_myPubClassInstance_set(mc2, mc); + assert(MySecondClass_myPubClassInstance_get(mc2)); + + delete_MyClass(mc); + delete_MySecondClass(mc2); + + return 0; +} From cafa7e5995e34576d7a3521a65ecf043083f8145 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:22:21 +0000 Subject: [PATCH 104/508] Add atomic test for C++ class with a primitive/native type attribute git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13415 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- .../test-suite/cpp_atomic_class_var_pub_member_atom.i | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i diff --git a/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i b/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i new file mode 100644 index 000000000..8fbfbb2b0 --- /dev/null +++ b/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i @@ -0,0 +1,9 @@ +%module cpp_atomic_class_var_pub_member_atom + +%inline{ + class MyClass { + public: + int myPubInt; + MyClass() : myPubInt(42){} + }; +} From f24ce340ff02b581c65f6e702176cb0eb249d8d9 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:22:37 +0000 Subject: [PATCH 105/508] Add C implementation of test cpp_atomic_class_var_pub_member_atom git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13416 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../cpp_atomic_class_var_pub_member_atom_runme.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index f4d0a32ef..38803610e 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_class_var_pub_member_atom \ cpp_atomic_class_var_pub_member_class \ cpp_atomic_global_enum \ cpp_atomic_global_var_atom \ diff --git a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c b/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c new file mode 100644 index 000000000..0396a4476 --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c @@ -0,0 +1,15 @@ +#include +#include "cpp_atomic_class_var_pub_member_atom/cpp_atomic_class_var_pub_member_atom_proxy.h" + +int main(int argc, const char *argv[]) +{ + MyClass *mc = new_MyClass(); + + assert(MyClass_myPubInt_get(mc) == 42); + MyClass_myPubInt_set(mc, 4711); + assert(MyClass_myPubInt_get(mc) == 4711); + + delete_MyClass(mc); + + return 0; +} From f6bd496b76f76724baf9fe8028ea8704ae072f96 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:22:49 +0000 Subject: [PATCH 106/508] Add atomic test for C++ class with a method git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13417 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_class_method.i | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_class_method.i diff --git a/Examples/test-suite/cpp_atomic_class_method.i b/Examples/test-suite/cpp_atomic_class_method.i new file mode 100644 index 000000000..ec2f9c5cd --- /dev/null +++ b/Examples/test-suite/cpp_atomic_class_method.i @@ -0,0 +1,10 @@ +%module cpp_atomic_class_method + +%inline{ + class MyClass { + public: + int someMethod(void) { + return 42; + } + }; +} From 20800381707375e60e23a28eb3018283213f2ae8 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:23:02 +0000 Subject: [PATCH 107/508] Add C implementation of test cpp_atomic_class_method git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13418 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../test-suite/c/cpp_atomic_class_method_runme.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_class_method_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 38803610e..eae5b44d0 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_class_method \ cpp_atomic_class_var_pub_member_atom \ cpp_atomic_class_var_pub_member_class \ cpp_atomic_global_enum \ diff --git a/Examples/test-suite/c/cpp_atomic_class_method_runme.c b/Examples/test-suite/c/cpp_atomic_class_method_runme.c new file mode 100644 index 000000000..31adbebe3 --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_class_method_runme.c @@ -0,0 +1,13 @@ +#include +#include "cpp_atomic_class_method/cpp_atomic_class_method_proxy.h" + +int main(int argc, const char *argv[]) +{ + MyClass *mc = new_MyClass(); + + assert(MyClass_someMethod(mc) == 42); + + delete_MyClass(mc); + + return 0; +} From cff735b5707fc79be4f9517950b864594623b818 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:23:14 +0000 Subject: [PATCH 108/508] Add atomic test for C++ class embedded enum git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13419 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_class_enum.i | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_class_enum.i diff --git a/Examples/test-suite/cpp_atomic_class_enum.i b/Examples/test-suite/cpp_atomic_class_enum.i new file mode 100644 index 000000000..afbd77bff --- /dev/null +++ b/Examples/test-suite/cpp_atomic_class_enum.i @@ -0,0 +1,12 @@ +%module cpp_atomic_class_enum + +%inline { + class MyClass { + public: + enum SomeEnum + { + FIRST_VALUE, + SECOND_VALUE + }; + }; +} From 15e8b647a2c7f70cc2db213947570f8d12c4add8 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:23:27 +0000 Subject: [PATCH 109/508] Add C implementation of test cpp_atomic_class_enum git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13420 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + Examples/test-suite/c/cpp_atomic_class_enum_runme.c | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_class_enum_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index eae5b44d0..ac439b2b4 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_class_enum \ cpp_atomic_class_method \ cpp_atomic_class_var_pub_member_atom \ cpp_atomic_class_var_pub_member_class \ diff --git a/Examples/test-suite/c/cpp_atomic_class_enum_runme.c b/Examples/test-suite/c/cpp_atomic_class_enum_runme.c new file mode 100644 index 000000000..02b9d0d3c --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_class_enum_runme.c @@ -0,0 +1,11 @@ +#include +#include "cpp_atomic_class_enum/cpp_atomic_class_enum_proxy.h" + +int main(int argc, const char *argv[]) +{ + enum MyClass_SomeEnum myEnum = MyClass_FIRST_VALUE; + + assert(myEnum != MyClass_SECOND_VALUE); + + return 0; +} From e9eaa05671eabc8207457f245ca336b249bdff0d Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:23:39 +0000 Subject: [PATCH 110/508] Add atomic test for C++ class git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13421 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_atomic_class.i | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Examples/test-suite/cpp_atomic_class.i diff --git a/Examples/test-suite/cpp_atomic_class.i b/Examples/test-suite/cpp_atomic_class.i new file mode 100644 index 000000000..a9555b4da --- /dev/null +++ b/Examples/test-suite/cpp_atomic_class.i @@ -0,0 +1,6 @@ +%module cpp_atomic_class + +%inline{ + class MyClass { + }; +} From f7b521173968ef4ed0eb14f450e7fba00dfe009a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 26 Jul 2012 20:23:53 +0000 Subject: [PATCH 111/508] Add C implementation of test cpp_atomic_class git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13422 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + Examples/test-suite/c/cpp_atomic_class_runme.c | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 Examples/test-suite/c/cpp_atomic_class_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index ac439b2b4..6590e8e58 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,6 +13,7 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ + cpp_atomic_class \ cpp_atomic_class_enum \ cpp_atomic_class_method \ cpp_atomic_class_var_pub_member_atom \ diff --git a/Examples/test-suite/c/cpp_atomic_class_runme.c b/Examples/test-suite/c/cpp_atomic_class_runme.c new file mode 100644 index 000000000..45e0e0dd7 --- /dev/null +++ b/Examples/test-suite/c/cpp_atomic_class_runme.c @@ -0,0 +1,11 @@ +#include "cpp_atomic_class/cpp_atomic_class_proxy.h" + +int main(int argc, const char *argv[]) +{ + MyClass *mc; + mc = new_MyClass(); + + delete_MyClass(mc); + + return 0; +} From ea240fdde3144c35ca08375d4f88fcf16088127b Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 27 Jul 2012 14:05:14 +0000 Subject: [PATCH 112/508] Rename cpp_atomic_* tests to cpp_basic_* git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13423 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 18 +++++++++--------- ...um_runme.c => cpp_basic_class_enum_runme.c} | 2 +- ..._runme.c => cpp_basic_class_method_runme.c} | 2 +- ...c_class_runme.c => cpp_basic_class_runme.c} | 2 +- ...pp_basic_class_var_pub_member_atom_runme.c} | 2 +- ...p_basic_class_var_pub_member_class_runme.c} | 2 +- ...m_runme.c => cpp_basic_global_enum_runme.c} | 2 +- ...nme.c => cpp_basic_global_var_atom_runme.c} | 2 +- ...me.c => cpp_basic_global_var_class_runme.c} | 2 +- ...me.c => cpp_basic_namespaced_class_runme.c} | 2 +- .../{cpp_atomic_class.i => cpp_basic_class.i} | 2 +- ...mic_class_enum.i => cpp_basic_class_enum.i} | 2 +- ...class_method.i => cpp_basic_class_method.i} | 2 +- ...i => cpp_basic_class_var_pub_member_atom.i} | 2 +- ... => cpp_basic_class_var_pub_member_class.i} | 2 +- ...c_global_enum.i => cpp_basic_global_enum.i} | 2 +- ..._var_atom.i => cpp_basic_global_var_atom.i} | 2 +- ...ar_class.i => cpp_basic_global_var_class.i} | 2 +- ...ed_class.i => cpp_basic_namespaced_class.i} | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) rename Examples/test-suite/c/{cpp_atomic_class_enum_runme.c => cpp_basic_class_enum_runme.c} (74%) rename Examples/test-suite/c/{cpp_atomic_class_method_runme.c => cpp_basic_class_method_runme.c} (72%) rename Examples/test-suite/c/{cpp_atomic_class_runme.c => cpp_basic_class_runme.c} (70%) rename Examples/test-suite/c/{cpp_atomic_class_var_pub_member_atom_runme.c => cpp_basic_class_var_pub_member_atom_runme.c} (73%) rename Examples/test-suite/c/{cpp_atomic_class_var_pub_member_class_runme.c => cpp_basic_class_var_pub_member_class_runme.c} (80%) rename Examples/test-suite/c/{cpp_atomic_global_enum_runme.c => cpp_basic_global_enum_runme.c} (70%) rename Examples/test-suite/c/{cpp_atomic_global_var_atom_runme.c => cpp_basic_global_var_atom_runme.c} (69%) rename Examples/test-suite/c/{cpp_atomic_global_var_class_runme.c => cpp_basic_global_var_class_runme.c} (60%) rename Examples/test-suite/c/{cpp_atomic_namespaced_class_runme.c => cpp_basic_namespaced_class_runme.c} (68%) rename Examples/test-suite/{cpp_atomic_class.i => cpp_basic_class.i} (60%) rename Examples/test-suite/{cpp_atomic_class_enum.i => cpp_basic_class_enum.i} (84%) rename Examples/test-suite/{cpp_atomic_class_method.i => cpp_basic_class_method.i} (80%) rename Examples/test-suite/{cpp_atomic_class_var_pub_member_atom.i => cpp_basic_class_var_pub_member_atom.i} (72%) rename Examples/test-suite/{cpp_atomic_class_var_pub_member_class.i => cpp_basic_class_var_pub_member_class.i} (73%) rename Examples/test-suite/{cpp_atomic_global_enum.i => cpp_basic_global_enum.i} (73%) rename Examples/test-suite/{cpp_atomic_global_var_atom.i => cpp_basic_global_var_atom.i} (52%) rename Examples/test-suite/{cpp_atomic_global_var_class.i => cpp_basic_global_var_class.i} (66%) rename Examples/test-suite/{cpp_atomic_namespaced_class.i => cpp_basic_namespaced_class.i} (74%) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 6590e8e58..b6066449b 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -13,15 +13,15 @@ top_builddir = @top_builddir@/.. include $(srcdir)/../common.mk CPP_TEST_CASES += \ - cpp_atomic_class \ - cpp_atomic_class_enum \ - cpp_atomic_class_method \ - cpp_atomic_class_var_pub_member_atom \ - cpp_atomic_class_var_pub_member_class \ - cpp_atomic_global_enum \ - cpp_atomic_global_var_atom \ - cpp_atomic_global_var_class \ - cpp_atomic_namespaced_class + cpp_basic_class \ + cpp_basic_class_enum \ + cpp_basic_class_method \ + cpp_basic_class_var_pub_member_atom \ + cpp_basic_class_var_pub_member_class \ + cpp_basic_global_enum \ + cpp_basic_global_var_atom \ + cpp_basic_global_var_class \ + cpp_basic_namespaced_class # # BROKEN TEST CASES: diff --git a/Examples/test-suite/c/cpp_atomic_class_enum_runme.c b/Examples/test-suite/c/cpp_basic_class_enum_runme.c similarity index 74% rename from Examples/test-suite/c/cpp_atomic_class_enum_runme.c rename to Examples/test-suite/c/cpp_basic_class_enum_runme.c index 02b9d0d3c..1b84d5943 100644 --- a/Examples/test-suite/c/cpp_atomic_class_enum_runme.c +++ b/Examples/test-suite/c/cpp_basic_class_enum_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_class_enum/cpp_atomic_class_enum_proxy.h" +#include "cpp_basic_class_enum/cpp_basic_class_enum_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_class_method_runme.c b/Examples/test-suite/c/cpp_basic_class_method_runme.c similarity index 72% rename from Examples/test-suite/c/cpp_atomic_class_method_runme.c rename to Examples/test-suite/c/cpp_basic_class_method_runme.c index 31adbebe3..d85e36278 100644 --- a/Examples/test-suite/c/cpp_atomic_class_method_runme.c +++ b/Examples/test-suite/c/cpp_basic_class_method_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_class_method/cpp_atomic_class_method_proxy.h" +#include "cpp_basic_class_method/cpp_basic_class_method_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_class_runme.c b/Examples/test-suite/c/cpp_basic_class_runme.c similarity index 70% rename from Examples/test-suite/c/cpp_atomic_class_runme.c rename to Examples/test-suite/c/cpp_basic_class_runme.c index 45e0e0dd7..aa4d481b5 100644 --- a/Examples/test-suite/c/cpp_atomic_class_runme.c +++ b/Examples/test-suite/c/cpp_basic_class_runme.c @@ -1,4 +1,4 @@ -#include "cpp_atomic_class/cpp_atomic_class_proxy.h" +#include "cpp_basic_class/cpp_basic_class_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c similarity index 73% rename from Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c rename to Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c index 0396a4476..3cfb658ba 100644 --- a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c +++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_class_var_pub_member_atom/cpp_atomic_class_var_pub_member_atom_proxy.h" +#include "cpp_basic_class_var_pub_member_atom/cpp_basic_class_var_pub_member_atom_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c similarity index 80% rename from Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c rename to Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c index 516396371..4be7d2a54 100644 --- a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c +++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_class_var_pub_member_class/cpp_atomic_class_var_pub_member_class_proxy.h" +#include "cpp_basic_class_var_pub_member_class/cpp_basic_class_var_pub_member_class_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_global_enum_runme.c b/Examples/test-suite/c/cpp_basic_global_enum_runme.c similarity index 70% rename from Examples/test-suite/c/cpp_atomic_global_enum_runme.c rename to Examples/test-suite/c/cpp_basic_global_enum_runme.c index a4bdf55be..9620619e7 100644 --- a/Examples/test-suite/c/cpp_atomic_global_enum_runme.c +++ b/Examples/test-suite/c/cpp_basic_global_enum_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_global_enum/cpp_atomic_global_enum_proxy.h" +#include "cpp_basic_global_enum/cpp_basic_global_enum_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c b/Examples/test-suite/c/cpp_basic_global_var_atom_runme.c similarity index 69% rename from Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c rename to Examples/test-suite/c/cpp_basic_global_var_atom_runme.c index f21939cff..80540bda1 100644 --- a/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c +++ b/Examples/test-suite/c/cpp_basic_global_var_atom_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_global_var_atom/cpp_atomic_global_var_atom_proxy.h" +#include "cpp_basic_global_var_atom/cpp_basic_global_var_atom_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c similarity index 60% rename from Examples/test-suite/c/cpp_atomic_global_var_class_runme.c rename to Examples/test-suite/c/cpp_basic_global_var_class_runme.c index 3841e4d0d..a620e58b3 100644 --- a/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c +++ b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c @@ -1,5 +1,5 @@ #include -#include "cpp_atomic_global_var_class/cpp_atomic_global_var_class_proxy.h" +#include "cpp_basic_global_var_class/cpp_basic_global_var_class_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c similarity index 68% rename from Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c rename to Examples/test-suite/c/cpp_basic_namespaced_class_runme.c index 8fe021df2..e06f8b128 100644 --- a/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c +++ b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c @@ -1,4 +1,4 @@ -#include "cpp_atomic_namespaced_class/cpp_atomic_namespaced_class_proxy.h" +#include "cpp_basic_namespaced_class/cpp_basic_namespaced_class_proxy.h" int main(int argc, const char *argv[]) { diff --git a/Examples/test-suite/cpp_atomic_class.i b/Examples/test-suite/cpp_basic_class.i similarity index 60% rename from Examples/test-suite/cpp_atomic_class.i rename to Examples/test-suite/cpp_basic_class.i index a9555b4da..bd46a4274 100644 --- a/Examples/test-suite/cpp_atomic_class.i +++ b/Examples/test-suite/cpp_basic_class.i @@ -1,4 +1,4 @@ -%module cpp_atomic_class +%module cpp_basic_class %inline{ class MyClass { diff --git a/Examples/test-suite/cpp_atomic_class_enum.i b/Examples/test-suite/cpp_basic_class_enum.i similarity index 84% rename from Examples/test-suite/cpp_atomic_class_enum.i rename to Examples/test-suite/cpp_basic_class_enum.i index afbd77bff..8e7788b53 100644 --- a/Examples/test-suite/cpp_atomic_class_enum.i +++ b/Examples/test-suite/cpp_basic_class_enum.i @@ -1,4 +1,4 @@ -%module cpp_atomic_class_enum +%module cpp_basic_class_enum %inline { class MyClass { diff --git a/Examples/test-suite/cpp_atomic_class_method.i b/Examples/test-suite/cpp_basic_class_method.i similarity index 80% rename from Examples/test-suite/cpp_atomic_class_method.i rename to Examples/test-suite/cpp_basic_class_method.i index ec2f9c5cd..b67cc2a0b 100644 --- a/Examples/test-suite/cpp_atomic_class_method.i +++ b/Examples/test-suite/cpp_basic_class_method.i @@ -1,4 +1,4 @@ -%module cpp_atomic_class_method +%module cpp_basic_class_method %inline{ class MyClass { diff --git a/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i b/Examples/test-suite/cpp_basic_class_var_pub_member_atom.i similarity index 72% rename from Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i rename to Examples/test-suite/cpp_basic_class_var_pub_member_atom.i index 8fbfbb2b0..65bf1b301 100644 --- a/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i +++ b/Examples/test-suite/cpp_basic_class_var_pub_member_atom.i @@ -1,4 +1,4 @@ -%module cpp_atomic_class_var_pub_member_atom +%module cpp_basic_class_var_pub_member_atom %inline{ class MyClass { diff --git a/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i b/Examples/test-suite/cpp_basic_class_var_pub_member_class.i similarity index 73% rename from Examples/test-suite/cpp_atomic_class_var_pub_member_class.i rename to Examples/test-suite/cpp_basic_class_var_pub_member_class.i index 00c060fe8..4cbee00c6 100644 --- a/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i +++ b/Examples/test-suite/cpp_basic_class_var_pub_member_class.i @@ -1,4 +1,4 @@ -%module cpp_atomic_class_var_pub_member_class +%module cpp_basic_class_var_pub_member_class %inline{ class MyClass { diff --git a/Examples/test-suite/cpp_atomic_global_enum.i b/Examples/test-suite/cpp_basic_global_enum.i similarity index 73% rename from Examples/test-suite/cpp_atomic_global_enum.i rename to Examples/test-suite/cpp_basic_global_enum.i index 34367f378..b1bfa612f 100644 --- a/Examples/test-suite/cpp_atomic_global_enum.i +++ b/Examples/test-suite/cpp_basic_global_enum.i @@ -1,4 +1,4 @@ -%module cpp_atomic_global_enum +%module cpp_basic_global_enum %inline { enum SomeEnum diff --git a/Examples/test-suite/cpp_atomic_global_var_atom.i b/Examples/test-suite/cpp_basic_global_var_atom.i similarity index 52% rename from Examples/test-suite/cpp_atomic_global_var_atom.i rename to Examples/test-suite/cpp_basic_global_var_atom.i index 5aa81aa7d..c0cc1ba91 100644 --- a/Examples/test-suite/cpp_atomic_global_var_atom.i +++ b/Examples/test-suite/cpp_basic_global_var_atom.i @@ -1,4 +1,4 @@ -%module cpp_atomic_global_var_atom +%module cpp_basic_global_var_atom %inline { int myGlobalInt = 42; diff --git a/Examples/test-suite/cpp_atomic_global_var_class.i b/Examples/test-suite/cpp_basic_global_var_class.i similarity index 66% rename from Examples/test-suite/cpp_atomic_global_var_class.i rename to Examples/test-suite/cpp_basic_global_var_class.i index 8e138c60a..b99585a72 100644 --- a/Examples/test-suite/cpp_atomic_global_var_class.i +++ b/Examples/test-suite/cpp_basic_global_var_class.i @@ -1,4 +1,4 @@ -%module cpp_atomic_global_var_class +%module cpp_basic_global_var_class %inline { class MyClass {}; diff --git a/Examples/test-suite/cpp_atomic_namespaced_class.i b/Examples/test-suite/cpp_basic_namespaced_class.i similarity index 74% rename from Examples/test-suite/cpp_atomic_namespaced_class.i rename to Examples/test-suite/cpp_basic_namespaced_class.i index a60d666c7..31b49b292 100644 --- a/Examples/test-suite/cpp_atomic_namespaced_class.i +++ b/Examples/test-suite/cpp_basic_namespaced_class.i @@ -1,4 +1,4 @@ -%module cpp_atomic_namespaced_class +%module cpp_basic_namespaced_class %feature (nspace, "1"); %inline{ From 42681bd01d3d4955eefec3ca3acd19c300528afc Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 30 Jul 2012 10:47:37 +0000 Subject: [PATCH 113/508] Fix unnecessary/wrong casts within proxy->wrapper call git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13431 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index e5a323a4d..dc9d42cab 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -109,14 +109,14 @@ %typemap(wrap_call) void *, short *, int *, long *, long long *, char *, float *, double * "" %typemap(wrap_call) void **, short **, int **, long **, long long **, char **, float **, double ** "" %typemap(wrap_call) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "" -%typemap(wrap_call) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" +%typemap(wrap_call) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "" %typemap(wrap_call) short &, int &, long &, long long &, char &, float &, double & "" %typemap(wrap_call) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "" %typemap(wrap_call) const short, const int, const long, const long long, const char, const float, const double "" %typemap(wrap_call) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "" -%typemap(wrap_call) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" +%typemap(wrap_call) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "" %typemap(wrap_call) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "" -%typemap(wrap_call) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" +%typemap(wrap_call) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "" %typemap(wrap_call) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "" %typemap(wrap_call) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& " **" %typemap(wrap_call) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ " From 4dc9b5501c1e81c5713768f0e080bdf4a581564d Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 31 Jul 2012 21:05:16 +0000 Subject: [PATCH 114/508] Add basic C++ test for virtual methods. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13477 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- .../cpp_basic_class_virtual_method.i | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Examples/test-suite/cpp_basic_class_virtual_method.i diff --git a/Examples/test-suite/cpp_basic_class_virtual_method.i b/Examples/test-suite/cpp_basic_class_virtual_method.i new file mode 100644 index 000000000..34cd82d20 --- /dev/null +++ b/Examples/test-suite/cpp_basic_class_virtual_method.i @@ -0,0 +1,20 @@ +%module cpp_basic_class_virtual_method + +%inline %{ + class BaseClass { + public: + virtual int myInt(void) { + return 0xba53; + } + }; + + class NonMethodOverwritingClass : public BaseClass{ + }; + + class MethodOverwritingClass : public BaseClass{ + public: + virtual int myInt(void) { + return 0xa173123d; + } + }; +%} \ No newline at end of file From ffb2b6b73ba968d8eba330c764e8402ca2e207fe Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 31 Jul 2012 21:08:39 +0000 Subject: [PATCH 115/508] Implement basic C++ virtual method test case for C git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13478 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../c/cpp_basic_class_virtual_method_runme.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index b6066449b..e5070588e 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -16,6 +16,7 @@ CPP_TEST_CASES += \ cpp_basic_class \ cpp_basic_class_enum \ cpp_basic_class_method \ + cpp_basic_class_virtual_method \ cpp_basic_class_var_pub_member_atom \ cpp_basic_class_var_pub_member_class \ cpp_basic_global_enum \ diff --git a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c new file mode 100644 index 000000000..e382f685b --- /dev/null +++ b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c @@ -0,0 +1,19 @@ +#include +#include "cpp_basic_class_virtual_method/cpp_basic_class_virtual_method_proxy.h" + +int main() +{ + BaseClass *bc = new_BaseClass(); + NonMethodOverwritingClass *noc = new_NonMethodOverwritingClass(); + MethodOverwritingClass *oc = new_MethodOverwritingClass(); + + assert(BaseClass_myInt(bc) == 0xba53); + assert(NonMethodOverwritingClass_myInt(noc) == 0xba53); + assert(MethodOverwritingClass_myInt(oc) == 0xa173123d); + + delete_BaseClass(bc); + delete_NonMethodOverwritingClass(noc); + delete_MethodOverwritingClass(oc); + + return 0; +} \ No newline at end of file From 130ae2cb2651f726c311eb99dccd6dcb2796e090 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 31 Jul 2012 21:15:33 +0000 Subject: [PATCH 116/508] Implement basic C++ exception test for C backend. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13479 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 3 ++- .../c/c_backend_cpp_exception_runme.c | 13 ++++++++++ Examples/test-suite/c_backend_cpp_exception.i | 25 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Examples/test-suite/c/c_backend_cpp_exception_runme.c create mode 100644 Examples/test-suite/c_backend_cpp_exception.i diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index e5070588e..8963f4623 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -22,7 +22,8 @@ CPP_TEST_CASES += \ cpp_basic_global_enum \ cpp_basic_global_var_atom \ cpp_basic_global_var_class \ - cpp_basic_namespaced_class + cpp_basic_namespaced_class \ + c_backend_cpp_exception # # BROKEN TEST CASES: diff --git a/Examples/test-suite/c/c_backend_cpp_exception_runme.c b/Examples/test-suite/c/c_backend_cpp_exception_runme.c new file mode 100644 index 000000000..92a4624bc --- /dev/null +++ b/Examples/test-suite/c/c_backend_cpp_exception_runme.c @@ -0,0 +1,13 @@ +#include +#include "c_backend_cpp_exception/c_backend_cpp_exception_proxy.h" + +int main() +{ + assert(checkVal == 0); + throwSomeKnownException(); + assert(checkVal == 1); + throwSomeUnknownException(); + assert(checkVal == 2); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c_backend_cpp_exception.i b/Examples/test-suite/c_backend_cpp_exception.i new file mode 100644 index 000000000..3b56d91d7 --- /dev/null +++ b/Examples/test-suite/c_backend_cpp_exception.i @@ -0,0 +1,25 @@ +%module c_backend_cpp_exception + +%exception { + try { + $action + } catch(SomeKnownException) { + checkVal = 1; + } catch(...) { + checkVal = 2; + } +} + +%inline %{ + class SomeKnownException{}; + class SomeUnkownException{}; + int checkVal = 0; + + void throwSomeKnownException(void) { + throw SomeKnownException(); + } + + void throwSomeUnknownException(void) { + throw SomeUnkownException(); + } +%} \ No newline at end of file From 44f4dd4dc02ed39c146bdea1af7a29f424f65e7a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 1 Aug 2012 00:51:50 +0000 Subject: [PATCH 117/508] Extend test to check dynamic binding of virtual methods git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13480 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- .../test-suite/c/cpp_basic_class_virtual_method_runme.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c index e382f685b..1a6f332a3 100644 --- a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c +++ b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c @@ -6,14 +6,19 @@ int main() BaseClass *bc = new_BaseClass(); NonMethodOverwritingClass *noc = new_NonMethodOverwritingClass(); MethodOverwritingClass *oc = new_MethodOverwritingClass(); + BaseClass *inherited_bc = (BaseClass*)new_MethodOverwritingClass(); assert(BaseClass_myInt(bc) == 0xba53); assert(NonMethodOverwritingClass_myInt(noc) == 0xba53); assert(MethodOverwritingClass_myInt(oc) == 0xa173123d); + assert(BaseClass_myInt((BaseClass*)noc) == 0xba53); + assert(BaseClass_myInt((BaseClass*)oc) == 0xa173123d); + assert(BaseClass_myInt(inherited_bc) == 0xa173123d); delete_BaseClass(bc); delete_NonMethodOverwritingClass(noc); delete_MethodOverwritingClass(oc); + delete_BaseClass(inherited_bc); return 0; -} \ No newline at end of file +} From 0e75ebbc341f5d9067540d0953822a99ca5cfe31 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 1 Aug 2012 12:52:17 +0000 Subject: [PATCH 118/508] Update to reflect changes (additional typemaps) in the C backend. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13481 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/std_string.i | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index 8be2455fb..f3c6d8a3a 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -13,11 +13,22 @@ class string; %typemap(ctype) string * "char *" %typemap(ctype) string & "char *" %typemap(ctype) const string & "char *" +%typemap(proxy) string "char *" +%typemap(proxy) string * "char *" +%typemap(proxy) string & "char *" +%typemap(proxy) const string & "char *" %typemap(couttype) string "char *" -%typemap(couttype) const string & "char *" %typemap(couttype) string * "char *" +%typemap(couttype) string & "char *" +%typemap(couttype) const string & "char *" +%typemap(proxycouttype) string "char *" +%typemap(proxycouttype) string * "char *" +%typemap(proxycouttype) string & "char *" +%typemap(proxycouttype) const string & "char *" %typemap(cppouttype, retobj="1") string "std::string*" -%typemap(cppouttype) const string &, string * "std::string*" +%typemap(cppouttype) const string &, string *, string & "std::string*" +%typemap(wrap_call) string "" +%typemap(wrap_call) const string &, string*, string& "" %typemap(in) string { if ($input) { @@ -38,12 +49,12 @@ class string; } } -%typemap(freearg) const string &, string * { +%typemap(freearg) const string &, string *, string & { if ($1) delete $1; } -%typemap(out) string, const string &, string * { +%typemap(out) string, const string &, string *, string & { const char *str = cppresult->c_str(); size_t len = strlen(str); $result = (char *) malloc(len + 1); From b0318dae692375f02f30cc0d8bf84e508dea9b2e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 1 Aug 2012 12:53:17 +0000 Subject: [PATCH 119/508] Add test for 'natural' C++ std::string handling in C (char*). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13482 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../c/c_backend_cpp_natural_std_string_runme.c | 16 ++++++++++++++++ .../c_backend_cpp_natural_std_string.i | 13 +++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c create mode 100644 Examples/test-suite/c_backend_cpp_natural_std_string.i diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 8963f4623..ceb761453 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -23,6 +23,7 @@ CPP_TEST_CASES += \ cpp_basic_global_var_atom \ cpp_basic_global_var_class \ cpp_basic_namespaced_class \ + c_backend_cpp_natural_std_string \ c_backend_cpp_exception # diff --git a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c new file mode 100644 index 000000000..2cd9e7d65 --- /dev/null +++ b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c @@ -0,0 +1,16 @@ +#include +#include +#include +#include "c_backend_cpp_natural_std_string/c_backend_cpp_natural_std_string_proxy.h" + +int main() +{ + char *myComposedString = myStringAppend("World, ", "Hello!"); + + assert(myComposedString); + assert(strcmp(myComposedString, "World, Hello!") == 0); + + free(myComposedString); + + return 0; +} \ No newline at end of file diff --git a/Examples/test-suite/c_backend_cpp_natural_std_string.i b/Examples/test-suite/c_backend_cpp_natural_std_string.i new file mode 100644 index 000000000..6bf8e6bd2 --- /dev/null +++ b/Examples/test-suite/c_backend_cpp_natural_std_string.i @@ -0,0 +1,13 @@ +%module c_backend_cpp_natural_std_string + +%feature ("nspace", "1"); + +%include std_string.i + +%inline %{ + static std::string& myStringAppend(std::string &someString, const std::string &appendedString) + { + someString += appendedString; + return someString; + } +%} \ No newline at end of file From d6641336f8b43c58e5b270f4a6277193a1ccb28c Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 7 Aug 2012 20:18:21 +0000 Subject: [PATCH 120/508] Initial work for templates. Mostly adopted from C#. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13552 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 20 ++--- Source/Modules/c.cxx | 195 ++++++++++++++++++++++++++++++++----------- 2 files changed, 155 insertions(+), 60 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index dc9d42cab..7e1dc90d1 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -51,12 +51,12 @@ %typemap(proxy) SWIGTYPE ((&)[ANY]) "$1_basetype **" %typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" -%typemap(proxy) SWIGTYPE "$1_ltype *" -%typemap(proxy) SWIGTYPE * "$1_ltype " -%typemap(proxy) SWIGTYPE & "$1_ltype" -%typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $1_ltype ***" -%typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" -%typemap(proxy) SWIGTYPE *& "/* *& */ $1_ltype **" +%typemap(proxy) SWIGTYPE "$resolved_type*" +%typemap(proxy) SWIGTYPE * "$resolved_type*" +%typemap(proxy) SWIGTYPE & "$resolved_type*" +%typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $resolved_type ***" +%typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $resolved_type **" +%typemap(proxy) SWIGTYPE *& "/* *& */ $resolved_type **" %typemap(proxy) enum SWIGTYPE "int" %typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(proxy, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" @@ -437,10 +437,10 @@ %typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" // objects -%typemap(proxycouttype) SWIGTYPE "$1_ltype *" -%typemap(proxycouttype) SWIGTYPE * "/*aaaaaa*/$1_ltype" -%typemap(proxycouttype) SWIGTYPE & "$1_ltype" -%typemap(proxycouttype) SWIGTYPE *& "$1_ltype **" +%typemap(proxycouttype) SWIGTYPE "$&resolved_type*" +%typemap(proxycouttype) SWIGTYPE * "$resolved_type*" +%typemap(proxycouttype) SWIGTYPE & "$resolved_type*" +%typemap(proxycouttype) SWIGTYPE *& "$resolved_type**" %typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" %typemap(proxycouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 79fdfcdab..8aa75bb3b 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -72,6 +72,37 @@ public: except_flag(true) { } + + String *getNamespacedName(Node *n) + { + if (!n) + return 0; + + String *proxyname = NULL; + if ((proxyname = Getattr(n, "proxyname"))) + { + //Printf(stdout, "Returning proxytype: %s\n", proxyname); + return Copy(proxyname); + } + + String *symname = Getattr(n, "sym:name"); + String *nspace = Getattr(n, "sym:nspace"); + + if (nspace) { + Replaceall(nspace, ".", "_"); // Classes' namespaces get dotted -> replace; FIXME in core! + proxyname = Swig_name_proxy(nspace, symname); + if (tl_namespace) + proxyname = Swig_name_proxy(tl_namespace, proxyname); + } else { + proxyname = symname; + } + Setattr(n, "proxyname", proxyname); + Delete(proxyname); + //Printf(stdout, "Returning proxytype: %s\n", proxyname); + + return Copy(proxyname); + } + /* ----------------------------------------------------------------------------- * getProxyName() * @@ -80,10 +111,8 @@ public: * top level namespace name if the nspace feature is used. * ----------------------------------------------------------------------------- */ - String *getProxyName(SwigType *n) { - String *proxyname = NULL; - String *symname = Getattr(n, "sym:name"); - String *nspace = Getattr(n, "sym:nspace"); + String *getProxyName(SwigType *t) { + Node *n = NULL; /* original java code if (proxy_flag) { @@ -106,23 +135,13 @@ public: } } }*/ + t = SwigType_typedef_resolve_all(t); + //Printf(stdout, "Proxytype for type %s was asked.\n", t); + if (!proxy_flag || !t || !(n = classLookup(t))) + return NULL; - if (!proxy_flag || !n || (proxyname = Getattr(n, "proxyname"))) - goto _get_proxyname_return; + return getNamespacedName(n); - if (nspace) { - Replaceall(nspace, ".", "_"); // Classes' namespaces get dotted -> replace; FIXME in core! - proxyname = Swig_name_proxy(nspace, symname); - if (tl_namespace) - proxyname = Swig_name_proxy(tl_namespace, proxyname); - } else { - proxyname = Copy(symname); - } - Setattr(n, "proxyname", proxyname); - Delete(proxyname); - - _get_proxyname_return: - return proxyname; } /* ----------------------------------------------------------------------------- @@ -130,12 +149,12 @@ public: * * ----------------------------------------------------------------------------- */ - String *getEnumName(SwigType *t, bool jnidescriptor) { + String *getEnumName(SwigType *t) { Node *enumname = NULL; Node *n = enumLookup(t); if (n) { enumname = Getattr(n, "enumname"); - if (!enumname || jnidescriptor) { + if (!enumname) { String *symname = Getattr(n, "sym:name"); if (symname) { // Add in class scope when referencing enum if not a global enum @@ -158,10 +177,8 @@ public: enumname = Copy(symname); } } - if (!jnidescriptor) { // not cached - Setattr(n, "enumname", enumname); - Delete(enumname); - } + Setattr(n, "enumname", enumname); + Delete(enumname); Delete(scopename_prefix); } } @@ -170,6 +187,89 @@ public: return enumname; } + + /* ----------------------------------------------------------------------------- + * substituteResolvedTypeSpecialVariable() + * ----------------------------------------------------------------------------- */ + + void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) { + + Printf(stdout, "Getting proxy type for %s, replacing each %s in %s\n", classnametype, tm, classnamespecialvariable); + if (SwigType_isenum(classnametype)) { + String *enumname = getEnumName(classnametype); + if (enumname) + Replaceall(tm, classnamespecialvariable, enumname); + else + Replaceall(tm, classnamespecialvariable, NewStringf("int")); + } else { + String *classname = getProxyName(classnametype); + if (classname) { + Replaceall(tm, classnamespecialvariable, classname); // getProxyName() works for pointers to classes too + } else {/* // use $descriptor if SWIG does not know anything about this type. Note that any typedefs are resolved. + String *descriptor = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype)); + Replaceall(tm, classnamespecialvariable, descriptor); + + // Add to hash table so that the type wrapper classes can be created later + Setattr(swig_types_hash, descriptor, classnametype); + Delete(descriptor); + */ + } + } + } + + /* ----------------------------------------------------------------------------- + * substituteResolvedType() + * + * Substitute the special variable $csclassname with the proxy class name for classes/structs/unions + * that SWIG knows about. Also substitutes enums with enum name. + * Otherwise use the $descriptor name for the C# class name. Note that the $&csclassname substitution + * is the same as a $&descriptor substitution, ie one pointer added to descriptor name. + * Inputs: + * pt - parameter type + * tm - typemap contents that might contain the special variable to be replaced + * Outputs: + * tm - typemap contents complete with the special variable substitution + * Return: + * substitution_performed - flag indicating if a substitution was performed + * ----------------------------------------------------------------------------- */ + + bool substituteResolvedType(SwigType *pt, String *tm) { + bool substitution_performed = false; + SwigType *type = Copy(SwigType_typedef_resolve_all(pt)); + SwigType *strippedtype = SwigType_strip_qualifiers(type); + + Printf(stdout, "pt was \"%s\"\n", pt); + Printf(stdout, "tm was \"%s\"\n", tm); + + if (Strstr(tm, "$resolved_type")) { + SwigType *classnametype = Copy(strippedtype); + substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type"); + substitution_performed = true; + Delete(classnametype); + } + if (Strstr(tm, "$*resolved_type")) { + SwigType *classnametype = Copy(strippedtype); + Delete(SwigType_pop(classnametype)); + if (Len(classnametype) > 0) { + substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type"); + substitution_performed = true; + } + Delete(classnametype); + } + if (Strstr(tm, "$&resolved_type")) { + SwigType *classnametype = Copy(strippedtype); + SwigType_add_pointer(classnametype); + substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type"); + substitution_performed = true; + Delete(classnametype); + } + + Delete(strippedtype); + Delete(type); + + return substitution_performed; + } + /* ------------------------------------------------------------ * main() * ------------------------------------------------------------ */ @@ -694,21 +794,26 @@ ready: SwigType *return_type = NewString(""); //SwigType *ns = Getattr(n, "name"); String *tm; + SwigType *proxy_type = NULL; // set the return type if (IS_SET_TO_ONE(n, "c:objstruct")) { Printv(return_type, SwigType_str(type, 0), NIL); } else if ((tm = Swig_typemap_lookup("proxycouttype", n, "", 0))) { + // handle simple typemap cases String *ctypeout = Getattr(n, "tmap:proxycouttype:out"); if (ctypeout) { - tm = ctypeout; + //tm = ctypeout; + return_type = ctypeout; Printf(stdout, "Obscure proxycouttype:out found! O.o\n"); } - Printf(return_type, "%s", tm); - // template handling - Replaceall(return_type, "$tt", SwigType_lstr(type, 0)); + else + { + substituteResolvedType(type, tm); + return_type = tm; + } } else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0)); @@ -748,9 +853,9 @@ ready: continue; } String *lname = Getattr(p, "lname"); - String *c_parm_type = NewString(""); - String *proxy_parm_type = NewString(""); + String *proxy_parm_type = 0; String *arg_name = NewString(""); + String* stype = 0; SwigType *tdtype = SwigType_typedef_resolve_all(type); if (tdtype) @@ -758,27 +863,18 @@ ready: Printf(arg_name, "c%s", lname); - // set the appropriate type for parameter - if ((tm = Getattr(p, "tmap:proxy"))) { - Printv(c_parm_type, tm, NIL); - // template handling - Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); + if ((tm = Getattr(p, "tmap:proxy"))) { // set the appropriate type for parameter + tm = Copy(tm); } else { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No proxy typemap defined for %s\n", SwigType_str(type, 0)); } - // use proxy-type for parameter if supplied - String* stype = Getattr(p, "c:stype"); - if (stype) { - Printv(proxy_parm_type, SwigType_str(stype, 0), NIL); - } - else { - Printv(proxy_parm_type, c_parm_type, NIL); - // Add namespace - Replaceall(proxy_parm_type, "::", "_"); // FIXME: implement "convert_to_c_namespace"? - if (strncmp(Char(proxy_parm_type), "_", 1) == 0) // Remove top level namespacing if necessary - Replace(proxy_parm_type, "_", "", DOH_REPLACE_FIRST); + if ((stype = Getattr(p, "c:stype"))) { + proxy_parm_type = SwigType_lstr(stype, 0); + } else { + substituteResolvedType(type, tm); + proxy_parm_type = tm; } Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL); @@ -799,7 +895,6 @@ ready: Delete(arg_name); Delete(proxy_parm_type); - Delete(c_parm_type); } return proto; } @@ -1226,7 +1321,7 @@ ready: if (!Getattr(parms, "lname")) Setattr(parms, "lname", "arg1"); //SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); - SwigType *stype = Copy(getProxyName(Swig_methodclass(n))); + SwigType *stype = getProxyName(Getattr(n, "type")); SwigType_add_pointer(stype); Setattr(parms, "c:stype", stype); } @@ -1341,7 +1436,7 @@ ready: virtual int classHandler(Node *n) { //String *name = Copy(Getattr(n, "sym:name")); - String *name = Copy(getProxyName(n)); + String *name = getNamespacedName(n); String *sobj = NewString(""); List *baselist = Getattr(n, "bases"); From 725c7f395acf77b5ae62f955ee5367210bdd99a2 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 7 Aug 2012 20:30:00 +0000 Subject: [PATCH 121/508] remove debug printfs git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13553 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8aa75bb3b..bde37d915 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -194,7 +194,6 @@ public: void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) { - Printf(stdout, "Getting proxy type for %s, replacing each %s in %s\n", classnametype, tm, classnamespecialvariable); if (SwigType_isenum(classnametype)) { String *enumname = getEnumName(classnametype); if (enumname) @@ -238,9 +237,6 @@ public: SwigType *type = Copy(SwigType_typedef_resolve_all(pt)); SwigType *strippedtype = SwigType_strip_qualifiers(type); - Printf(stdout, "pt was \"%s\"\n", pt); - Printf(stdout, "tm was \"%s\"\n", tm); - if (Strstr(tm, "$resolved_type")) { SwigType *classnametype = Copy(strippedtype); substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type"); From 63b68eaafc8c53b5feff164e292bc26adad36f0a Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 8 Aug 2012 10:32:59 +0000 Subject: [PATCH 122/508] Fix partialcheck of C backend. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13561 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index c486815fa..3381395cb 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -573,7 +573,7 @@ check: $(NOT_BROKEN_TEST_CASES) # partialcheck target runs SWIG only, ie no compilation or running of tests (for a subset of languages) partialcheck: - $(MAKE) check CC=true CXX=true LDSHARED=true CXXSHARED=true RUNTOOL=true COMPILETOOL=true + $(MAKE) check CC=true CXX=true LDSHARED=true CXXSHARED=true RUNTOOL=true COMPILETOOL=true C_LDSHARED=true CXX_LDSHARED=true broken: $(BROKEN_TEST_CASES) From b6d00028bb4add8836380fe3b392716f12b677c9 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 8 Aug 2012 16:06:09 +0000 Subject: [PATCH 123/508] Remove name_mangle approach. Broke template function names. Should work like classes, etc. based on "nspace" attribute of node, which is for some reason missing for this kind. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13565 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index bde37d915..7b4ab8a9f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -499,9 +499,6 @@ public: String *arg_list = NewString(""); String *call = empty_string; String *cres = empty_string; - String *nspaced_symname = Swig_name_mangle(Getattr(n, "name")); - - Setattr(n, "sym:name", nspaced_symname); call = Swig_cfunction_call(Getattr(n, "name"), parms); cres = Swig_cresult(type, "result", call); From a95e257fe8d089c1538923baec1e6d01baa5baef Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 8 Aug 2012 16:06:23 +0000 Subject: [PATCH 124/508] unused variable-- git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13566 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 7b4ab8a9f..e37d745e1 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -787,7 +787,6 @@ ready: SwigType *return_type = NewString(""); //SwigType *ns = Getattr(n, "name"); String *tm; - SwigType *proxy_type = NULL; // set the return type if (IS_SET_TO_ONE(n, "c:objstruct")) { From 0a646835d260bf64adab1850440d81f4e2046445 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 8 Aug 2012 16:06:37 +0000 Subject: [PATCH 125/508] Add basic C++ test for template functions. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13567 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_basic_template_function.i | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Examples/test-suite/cpp_basic_template_function.i diff --git a/Examples/test-suite/cpp_basic_template_function.i b/Examples/test-suite/cpp_basic_template_function.i new file mode 100644 index 000000000..4f289e5cb --- /dev/null +++ b/Examples/test-suite/cpp_basic_template_function.i @@ -0,0 +1,13 @@ +%module cpp_basic_template_function + +%inline +{ + template + T GetMax (T a, T b) { + T result; + result = (a>b)? a : b; + return (result); + } +} + +%template(GetMaxInt) GetMax; \ No newline at end of file From 698d1851c3baa3c1eec6d575eaf59759ad8e841b Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 8 Aug 2012 16:06:56 +0000 Subject: [PATCH 126/508] Add C runtime test for basic C++ template functions git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13568 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + Examples/test-suite/c/cpp_basic_template_function_runme.c | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 Examples/test-suite/c/cpp_basic_template_function_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index ceb761453..b0e6861b0 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -23,6 +23,7 @@ CPP_TEST_CASES += \ cpp_basic_global_var_atom \ cpp_basic_global_var_class \ cpp_basic_namespaced_class \ + cpp_basic_template_function \ c_backend_cpp_natural_std_string \ c_backend_cpp_exception diff --git a/Examples/test-suite/c/cpp_basic_template_function_runme.c b/Examples/test-suite/c/cpp_basic_template_function_runme.c new file mode 100644 index 000000000..24dee571a --- /dev/null +++ b/Examples/test-suite/c/cpp_basic_template_function_runme.c @@ -0,0 +1,8 @@ +#include +#include "cpp_basic_template_function/cpp_basic_template_function_proxy.h" + +int main() { + assert(GetMaxInt(3, 5) == 5); + + return 0; +} \ No newline at end of file From 2dac4914341e1bcef26a1fbfc16ca8592a8db95d Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 9 Aug 2012 13:06:03 +0000 Subject: [PATCH 127/508] Basic C++ test of very simple template class instantiation git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13572 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_basic_template_class.i | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Examples/test-suite/cpp_basic_template_class.i diff --git a/Examples/test-suite/cpp_basic_template_class.i b/Examples/test-suite/cpp_basic_template_class.i new file mode 100644 index 000000000..93db46efb --- /dev/null +++ b/Examples/test-suite/cpp_basic_template_class.i @@ -0,0 +1,12 @@ +%module cpp_basic_template_class + +%inline +{ + +template struct MyTemplateClass { + T someMemberVariable; +}; + +} + +%template(MyTemplateClass_Int) MyTemplateClass; \ No newline at end of file From d272709899d61b71567f896e8b98734ffe428c5e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 9 Aug 2012 13:06:22 +0000 Subject: [PATCH 128/508] Add C runtime test for corresponding C++ basic template test git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13573 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../test-suite/c/cpp_basic_template_class_runme.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Examples/test-suite/c/cpp_basic_template_class_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index b0e6861b0..e64b4a0f1 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -24,6 +24,7 @@ CPP_TEST_CASES += \ cpp_basic_global_var_class \ cpp_basic_namespaced_class \ cpp_basic_template_function \ + cpp_basic_template_class \ c_backend_cpp_natural_std_string \ c_backend_cpp_exception diff --git a/Examples/test-suite/c/cpp_basic_template_class_runme.c b/Examples/test-suite/c/cpp_basic_template_class_runme.c new file mode 100644 index 000000000..0f3bc8d1e --- /dev/null +++ b/Examples/test-suite/c/cpp_basic_template_class_runme.c @@ -0,0 +1,13 @@ +#include +#include "cpp_basic_template_class/cpp_basic_template_class_proxy.h" + +int main() { + MyTemplateClass_Int *ci = new_MyTemplateClass_Int(); + + MyTemplateClass_Int_someMemberVariable_set(ci, 42); + assert(MyTemplateClass_Int_someMemberVariable_get(ci) == 42); + + delete_MyTemplateClass_Int(ci); + + return 0; +} From 333a8422770e595bda7cf828733d7f9c2829b118 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 9 Aug 2012 20:02:47 +0000 Subject: [PATCH 129/508] Type lookup of $1_ltype fails for templates, so use types directly. Add size_t as type. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13578 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 191 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 158 insertions(+), 33 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 7e1dc90d1..e460b9287 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -28,42 +28,118 @@ %fragment("stdbool_inc", "proxy_header") {#include } // typemaps for proxy function parameters -%typemap(proxy) void, short, int, long, long long, char, float, double "$1_ltype" -%typemap(proxy) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" -%typemap(proxy) void *, short *, int *, long *, long long *, char *, float *, double * "$1_ltype" -%typemap(proxy) void **, short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" -%typemap(proxy) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1_ltype" -%typemap(proxy) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" -%typemap(proxy) short &, int &, long &, long long &, char &, float &, double & "$1_ltype" -%typemap(proxy) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1_ltype" -%typemap(proxy) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" -%typemap(proxy) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" -%typemap(proxy) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" -%typemap(proxy) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1_ltype" -%typemap(proxy) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" -%typemap(proxy) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" -%typemap(proxy) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(proxy) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" -%typemap(proxy) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" -// special cases of array passing - does not intended to be used for objects -%typemap(proxy) SWIGTYPE [] "$1_ltype" -%typemap(proxy) SWIGTYPE ((&)[ANY]) "$1_basetype **" +// void +%typemap(proxy) void "void" +%typemap(proxy) void*, const void* "void *" -%typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" -%typemap(proxy) SWIGTYPE "$resolved_type*" -%typemap(proxy) SWIGTYPE * "$resolved_type*" -%typemap(proxy) SWIGTYPE & "$resolved_type*" -%typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $resolved_type ***" -%typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $resolved_type **" -%typemap(proxy) SWIGTYPE *& "/* *& */ $resolved_type **" -%typemap(proxy) enum SWIGTYPE "int" -%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" -%typemap(proxy, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" +// short +%typemap(proxy) short, const short "short" +%typemap(proxy) short*, short&, short[ANY], short[] "short *" +%typemap(proxy) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(proxy) unsigned short "unsigned short" +%typemap(proxy) const unsigned short "const unsigned short" +%typemap(proxy) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(proxy) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(proxy) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(proxy) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(proxy) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(proxy) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" -%typemap(proxy, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" -%typemap(proxy, fragment="stdbool_inc") bool & "$1_ltype" -%typemap(proxy, fragment="stdbool_inc") const bool & "$1_ltype const" +// int +%typemap(proxy) int, const int "int" +%typemap(proxy) int*, int&, int[ANY], int[] "int *" +%typemap(proxy) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(proxy) unsigned int "unsigned int" +%typemap(proxy) const unsigned int "unsigned int" +%typemap(proxy) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(proxy) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(proxy) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(proxy) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(proxy) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(proxy) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" + +// long +%typemap(proxy) long, const long "long" +%typemap(proxy) long*, long&, long[ANY], long[] "long *" +%typemap(proxy) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(proxy) unsigned long "unsigned long" +%typemap(proxy) const unsigned long "const unsigned long" +%typemap(proxy) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(proxy) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(proxy) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(proxy) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(proxy) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(proxy) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" + +// long long +%typemap(proxy) long long, const long long "long long" +%typemap(proxy) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(proxy) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(proxy) unsigned long long "unsigned long long" +%typemap(proxy) const unsigned long long "const unsigned long long" +%typemap(proxy) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(proxy) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(proxy) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(proxy) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(proxy) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(proxy) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" + +// char: signed/unsigned +%typemap(proxy) char, const char "char" +%typemap(proxy) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxy) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(proxy) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(proxy) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(proxy) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(proxy) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(proxy) signed char "signed char" +%typemap(proxy) const signed char "const signed char" +%typemap(proxy) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(proxy) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(proxy) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(proxy) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(proxy) unsigned char "unsigned char" +%typemap(proxy) const unsigned char "const unsigned char" +%typemap(proxy) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(proxy) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" + +// float +%typemap(proxy) float, const float "float" +%typemap(proxy) float*, float&, float[ANY], float[] "float *" +%typemap(proxy) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(proxy) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(proxy) const float**, const float*[ANY], const float[ANY][ANY] "const float **" + +// double +%typemap(proxy) double, const double "double" +%typemap(proxy) double*, double&, double[ANY], double[] "double *" +%typemap(proxy) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(proxy) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(proxy) const double**, const double*[ANY], const double[ANY][ANY] "const double **" + +// size_t +%typemap(proxy) size_t, const size_t "size_t" +%typemap(proxy) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(proxy) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(proxy) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(proxy) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + +// objects +%typemap(proxy) SWIGTYPE "$&resolved_type*" +%typemap(proxy) SWIGTYPE * "$resolved_type*" +%typemap(proxy) SWIGTYPE & "$resolved_type*" +%typemap(proxy) SWIGTYPE *& "$resolved_type**" +%typemap(proxy) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" +%typemap(proxy) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" +%typemap(proxy) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **" +%typemap(proxy) enum SWIGTYPE "int" +%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" +%typemap(proxy, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" + +%typemap(proxy, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" +%typemap(proxy, fragment="stdbool_inc") bool & "$1_basetype*" +%typemap(proxy, fragment="stdbool_inc") const bool & "$1_basetype const *" // typemaps for function parameters %typemap(ctype) void, short, int, long, long long, char, float, double "$1_ltype" @@ -84,6 +160,13 @@ %typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" %typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" +// size_t +%typemap(ctype) size_t, const size_t "size_t" +%typemap(ctype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(ctype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(ctype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(ctype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + // special cases of array passing - does not intended to be used for objects %typemap(ctype) SWIGTYPE [] "$1_ltype" %typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **" @@ -122,6 +205,13 @@ %typemap(wrap_call) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ " %typemap(wrap_call) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ " +// size_t +%typemap(wrap_call) size_t, const size_t "" +%typemap(wrap_call) size_t*, size_t&, size_t[ANY], size_t[] "" +%typemap(wrap_call) const size_t&, const size_t*, const size_t[ANY], const size_t[] "" +%typemap(wrap_call) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "" +%typemap(wrap_call) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "" + // special cases of array passing - does not intended to be used for objects %typemap(wrap_call) SWIGTYPE [] "" %typemap(wrap_call) SWIGTYPE ((&)[ANY]) " **" @@ -159,6 +249,13 @@ %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" +// size_t +%typemap(in) size_t, const size_t "$1 = (size_t) $input;" +%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$input = (size_t *) $input;" +%typemap(in) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$1 = (const size_t *) &$input;" +%typemap(in) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$1 = (size_t **) $input;" +%typemap(in) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$1 = (const size_t **) $input;" + %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;" %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" @@ -329,6 +426,13 @@ %typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// size_t +%typemap(couttype) size_t, const size_t "size_t" +%typemap(couttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(couttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(couttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(couttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + // objects %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "/*aaaaaa*/SwigObj *" @@ -436,6 +540,13 @@ %typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// size_t +%typemap(proxycouttype) size_t, const size_t "size_t" +%typemap(proxycouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(proxycouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(proxycouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(proxycouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" %typemap(proxycouttype) SWIGTYPE * "$resolved_type*" @@ -469,6 +580,13 @@ %typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;" %typemap(out) void "" +// size_t +%typemap(out) size_t, const size_t "$result = (size_t) $1;" +%typemap(out) size_t*, size_t&, size_t[ANY], size_t[] "$result = (size_t *) $1;" +%typemap(out) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$result = (const size_t *) &$1;" +%typemap(out) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$result = (size_t **) $1;" +%typemap(out) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$result = (const size_t **) $1;" + %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" @@ -533,6 +651,13 @@ %typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" %typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" +// size_t +%typemap(cppouttype) size_t, const size_t "size_t" +%typemap(cppouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(cppouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + %typemap(cppouttype) const char* "const char *" %typemap(cppouttype) const unsigned char* "const unsigned char *" %typemap(cppouttype) const signed char* "const signed char *" From 9619d7c6181812291c9b50d25b6a61d18260a052 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 9 Aug 2012 20:03:06 +0000 Subject: [PATCH 130/508] Remove wrong typemap. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13579 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index e460b9287..acd61025f 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -690,11 +690,6 @@ %typemap(cppouttype) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "$1_ltype" */ -//%define size_t unsigned long %enddef - -%apply unsigned long { size_t }; -%apply const unsigned long & { const size_t & }; - #ifdef SWIG_CPPMODE #ifdef SWIG_C_EXCEPT From c3236edf800c4e0b05304fc6edaff462bf40d969 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 9 Aug 2012 20:03:22 +0000 Subject: [PATCH 131/508] Add basic C++ test for std::vector instantiated with a native type. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13580 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/cpp_basic_std_vector_built_in.i | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Examples/test-suite/cpp_basic_std_vector_built_in.i diff --git a/Examples/test-suite/cpp_basic_std_vector_built_in.i b/Examples/test-suite/cpp_basic_std_vector_built_in.i new file mode 100644 index 000000000..ae42e792c --- /dev/null +++ b/Examples/test-suite/cpp_basic_std_vector_built_in.i @@ -0,0 +1,5 @@ +%module cpp_basic_std_vector_built_in + +%include + +%template(Int_Vector) std::vector; \ No newline at end of file From 56db1d6e4ec88d73779429e4c89b137153a278f8 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 9 Aug 2012 20:03:42 +0000 Subject: [PATCH 132/508] Add C backend runtime implementation for basic C++ std::vector test git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13581 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 + .../c/cpp_basic_std_vector_built_in_runme.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index e64b4a0f1..165b80875 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -25,6 +25,7 @@ CPP_TEST_CASES += \ cpp_basic_namespaced_class \ cpp_basic_template_function \ cpp_basic_template_class \ + cpp_basic_std_vector_built_in \ c_backend_cpp_natural_std_string \ c_backend_cpp_exception diff --git a/Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c b/Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c new file mode 100644 index 000000000..08835bfd0 --- /dev/null +++ b/Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c @@ -0,0 +1,19 @@ +#include +#include "cpp_basic_std_vector_built_in/cpp_basic_std_vector_built_in_proxy.h" +#include + +int main() { + Int_Vector *myIntVector = new_Int_Vector_size_t(42); + + assert(Int_Vector_capacity(myIntVector) == 42); + Int_Vector_push_back(myIntVector, 4711); + assert(Int_Vector_size(myIntVector) == 43); + assert(Int_Vector_at(myIntVector, 42) == 4711); + Int_Vector_clear(myIntVector); + assert(Int_Vector_empty(myIntVector)); + assert(Int_Vector_size(myIntVector) == 0); + Int_Vector_push_back(myIntVector, 23); + assert(Int_Vector_size(myIntVector) == 1); + + delete_Int_Vector(myIntVector); +} \ No newline at end of file From a84787c2736b957799378ae5b7cb7a3aa8c0a047 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 10 Aug 2012 14:49:37 +0000 Subject: [PATCH 133/508] Rename reference to C++ native types from 'atomic' to 'built_in' git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13583 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 4 ++-- ...unme.c => cpp_basic_class_var_pub_member_built_in_runme.c} | 0 ...var_atom_runme.c => cpp_basic_global_var_built_in_runme.c} | 0 ...ember_atom.i => cpp_basic_class_var_pub_member_built_in.i} | 0 ...asic_global_var_atom.i => cpp_basic_global_var_built_in.i} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename Examples/test-suite/c/{cpp_basic_class_var_pub_member_atom_runme.c => cpp_basic_class_var_pub_member_built_in_runme.c} (100%) rename Examples/test-suite/c/{cpp_basic_global_var_atom_runme.c => cpp_basic_global_var_built_in_runme.c} (100%) rename Examples/test-suite/{cpp_basic_class_var_pub_member_atom.i => cpp_basic_class_var_pub_member_built_in.i} (100%) rename Examples/test-suite/{cpp_basic_global_var_atom.i => cpp_basic_global_var_built_in.i} (100%) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 165b80875..316658adb 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -17,10 +17,10 @@ CPP_TEST_CASES += \ cpp_basic_class_enum \ cpp_basic_class_method \ cpp_basic_class_virtual_method \ - cpp_basic_class_var_pub_member_atom \ + cpp_basic_class_var_pub_member_built_in \ cpp_basic_class_var_pub_member_class \ cpp_basic_global_enum \ - cpp_basic_global_var_atom \ + cpp_basic_global_var_built_in \ cpp_basic_global_var_class \ cpp_basic_namespaced_class \ cpp_basic_template_function \ diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c similarity index 100% rename from Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c rename to Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c diff --git a/Examples/test-suite/c/cpp_basic_global_var_atom_runme.c b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c similarity index 100% rename from Examples/test-suite/c/cpp_basic_global_var_atom_runme.c rename to Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c diff --git a/Examples/test-suite/cpp_basic_class_var_pub_member_atom.i b/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i similarity index 100% rename from Examples/test-suite/cpp_basic_class_var_pub_member_atom.i rename to Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i diff --git a/Examples/test-suite/cpp_basic_global_var_atom.i b/Examples/test-suite/cpp_basic_global_var_built_in.i similarity index 100% rename from Examples/test-suite/cpp_basic_global_var_atom.i rename to Examples/test-suite/cpp_basic_global_var_built_in.i From 8538e6c1db56659685721147cacf02c67d151f98 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 10 Aug 2012 14:49:49 +0000 Subject: [PATCH 134/508] Fix wrong type. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13584 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e37d745e1..7486d721c 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1312,8 +1312,7 @@ ready: Setattr(parms, "c:objstruct", "1"); if (!Getattr(parms, "lname")) Setattr(parms, "lname", "arg1"); - //SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); - SwigType *stype = getProxyName(Getattr(n, "type")); + SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name")); SwigType_add_pointer(stype); Setattr(parms, "c:stype", stype); } From c81a3bd5ec741bea5d33c149eda2ba7ed1a961b9 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 10 Aug 2012 14:50:04 +0000 Subject: [PATCH 135/508] Add typecast to silence compiler warnings caused by inheritance. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13585 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/abstract_virtual_runme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/test-suite/c/abstract_virtual_runme.c b/Examples/test-suite/c/abstract_virtual_runme.c index 04ef30ad6..b44a653ab 100644 --- a/Examples/test-suite/c/abstract_virtual_runme.c +++ b/Examples/test-suite/c/abstract_virtual_runme.c @@ -11,8 +11,8 @@ int main(int argc, const char *argv[]) { assert(E_foo(e) == 0); delete_B(b); - delete_D(b); - delete_E(b); + delete_D((D*)b); + delete_E((E*)b); return 0; -} \ No newline at end of file +} From 78ccc8f228c596a9021d23c9574b8e6acdbd1b17 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 10 Aug 2012 14:50:18 +0000 Subject: [PATCH 136/508] Fix wrong headers inclusion git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13586 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/add_link_runme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/c/add_link_runme.c b/Examples/test-suite/c/add_link_runme.c index edcbf8b37..1faec097d 100644 --- a/Examples/test-suite/c/add_link_runme.c +++ b/Examples/test-suite/c/add_link_runme.c @@ -1,4 +1,4 @@ -#include "abstract_typedef2/abstract_change_proxy.h" +#include "add_link/add_link_proxy.h" #include int main(int argc, const char *argv[]) { @@ -11,4 +11,4 @@ int main(int argc, const char *argv[]) { delete_Foo(f2); return 0; -} \ No newline at end of file +} From ed402ceb37c4de7ca57c42e29849271eba011f1d Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 10 Aug 2012 15:43:11 +0000 Subject: [PATCH 137/508] Don't delete variables twice. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13587 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/abstract_virtual_runme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/c/abstract_virtual_runme.c b/Examples/test-suite/c/abstract_virtual_runme.c index b44a653ab..fedf8c643 100644 --- a/Examples/test-suite/c/abstract_virtual_runme.c +++ b/Examples/test-suite/c/abstract_virtual_runme.c @@ -11,8 +11,8 @@ int main(int argc, const char *argv[]) { assert(E_foo(e) == 0); delete_B(b); - delete_D((D*)b); - delete_E((E*)b); + delete_D(d); + delete_E(e); return 0; } From 0dbfbb79aca71f017d5b2a98d875e36d21a8b170 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 13 Aug 2012 16:21:36 +0000 Subject: [PATCH 138/508] use correct typemap for wrapper function. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13603 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 7486d721c..7a3bee04b 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -765,7 +765,7 @@ ready: Printv(return_type, SwigType_str(type, 0), NIL); } else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) { - String *ctypeout = Getattr(n, "tmap:proxycouttype:out"); + String *ctypeout = Getattr(n, "tmap:couttype:out"); if (ctypeout) { tm = ctypeout; From f50b903d6481c7e5a9e36207a913d01e4e14739b Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 13 Aug 2012 16:22:02 +0000 Subject: [PATCH 139/508] Add wrapper typemap for "int *const &" Fix proxy type of complex type (SWIGTYPE) references. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13604 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index acd61025f..7d8bfed0f 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -128,7 +128,7 @@ // objects %typemap(proxy) SWIGTYPE "$&resolved_type*" %typemap(proxy) SWIGTYPE * "$resolved_type*" -%typemap(proxy) SWIGTYPE & "$resolved_type*" +%typemap(proxy) SWIGTYPE & "$*resolved_type*" %typemap(proxy) SWIGTYPE *& "$resolved_type**" %typemap(proxy) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxy) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" @@ -363,7 +363,7 @@ %typemap(couttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" %typemap(couttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" %typemap(couttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(couttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(couttype) const int**, const int*&, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" @@ -550,7 +550,7 @@ // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" %typemap(proxycouttype) SWIGTYPE * "$resolved_type*" -%typemap(proxycouttype) SWIGTYPE & "$resolved_type*" +%typemap(proxycouttype) SWIGTYPE & "$*resolved_type*" %typemap(proxycouttype) SWIGTYPE *& "$resolved_type**" %typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" From 88ffd102f36de8b96f1b7cf58d5d8685be1a9e9e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 13 Aug 2012 16:22:30 +0000 Subject: [PATCH 140/508] Remove template specific typemaps. Leftover from the change to C# like template handling. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13605 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/std_vector.i | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Lib/c/std_vector.i b/Lib/c/std_vector.i index e6011f285..509758120 100644 --- a/Lib/c/std_vector.i +++ b/Lib/c/std_vector.i @@ -12,12 +12,6 @@ #include %} -// C module specific: $tt expands to the type the template is instantiated -%typemap(ctype) std::vector "$tt" -%typemap(in) std::vector "$1 = ($1_ltype) $input;" -%typemap(out) std::vector "$result = ($1_ltype) $1;" -%typemap(cppouttype) std::vector "$1_ltype" - namespace std { template class vector { From dddc13377a054bdf7d303ef75a547f5fbaeb0e22 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:55:06 +0000 Subject: [PATCH 141/508] Move to appropriate segment git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13609 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 7d8bfed0f..849d3ce00 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -650,6 +650,7 @@ %typemap(cppouttype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" %typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" %typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" +%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" // size_t %typemap(cppouttype) size_t, const size_t "size_t" @@ -663,7 +664,6 @@ %typemap(cppouttype) const signed char* "const signed char *" %typemap(cppouttype) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" -%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" %typemap(cppouttype) const SWIGTYPE * "const $1_ltype" From a540f7199f90a296561c17df37e4604add5491c7 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:55:22 +0000 Subject: [PATCH 142/508] Refactor 'cppouttype' to be split by type git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13610 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 104 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 17 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 849d3ce00..643815fff 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -638,19 +638,94 @@ } // typemaps for 'cppresult' -// this needs refactoring -- see 'couttype' typemaps +// void +%typemap(cppouttype) void "void" +%typemap(cppouttype) void*, const void* "void *" -%typemap(cppouttype) void, short, int, long, long long, char, float, double "$1_ltype" -%typemap(cppouttype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char, signed char "$1_ltype" -%typemap(cppouttype) void *, short *, int *, long *, long long *, char *, float *, double*, unsigned char *, unsigned int *, unsigned long *, unsigned char *, signed char * "$1_ltype" -%typemap(cppouttype) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" -%typemap(cppouttype) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_ltype" -%typemap(cppouttype) short &, int &, long &, long long &, char &, float &, double &, unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &, signed char & "$1_ltype" -%typemap(cppouttype) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" -%typemap(cppouttype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" -%typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" -%typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" -%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" +// short +%typemap(cppouttype) short, const short "short" +%typemap(cppouttype) short*, short&, short[ANY], short[] "short *" +%typemap(cppouttype) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(cppouttype) unsigned short "unsigned short" +%typemap(cppouttype) const unsigned short "const unsigned short" +%typemap(cppouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(cppouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(cppouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(cppouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(cppouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(cppouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" + +// int +%typemap(cppouttype) int, const int "int" +%typemap(cppouttype) int*, int&, int[ANY], int[] "int *" +%typemap(cppouttype) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(cppouttype) unsigned int "unsigned int" +%typemap(cppouttype) const unsigned int "unsigned int" +%typemap(cppouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(cppouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(cppouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(cppouttype) const int**, const int*&, int const **, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(cppouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(cppouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" + +// long +%typemap(cppouttype) long, const long "long" +%typemap(cppouttype) long*, long&, long[ANY], long[] "long *" +%typemap(cppouttype) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(cppouttype) unsigned long "unsigned long" +%typemap(cppouttype) const unsigned long "const unsigned long" +%typemap(cppouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(cppouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(cppouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(cppouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(cppouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(cppouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" + +// long long +%typemap(cppouttype) long long, const long long "long long" +%typemap(cppouttype) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(cppouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(cppouttype) unsigned long long "unsigned long long" +%typemap(cppouttype) const unsigned long long "const unsigned long long" +%typemap(cppouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(cppouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(cppouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(cppouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(cppouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(cppouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" + +// char: signed/unsigned +%typemap(cppouttype) char, const char "char" +%typemap(cppouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(cppouttype) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(cppouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(cppouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(cppouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(cppouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(cppouttype) signed char "signed char" +%typemap(cppouttype) const signed char "const signed char" +%typemap(cppouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(cppouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(cppouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(cppouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(cppouttype) unsigned char "unsigned char" +%typemap(cppouttype) const unsigned char "const unsigned char" +%typemap(cppouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(cppouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" + +// float +%typemap(cppouttype) float, const float "float" +%typemap(cppouttype) float*, float&, float[ANY], float[] "float *" +%typemap(cppouttype) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(cppouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(cppouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" + +// double +%typemap(cppouttype) double, const double "double" +%typemap(cppouttype) double*, double&, double[ANY], double[] "double *" +%typemap(cppouttype) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(cppouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(cppouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" // size_t %typemap(cppouttype) size_t, const size_t "size_t" @@ -659,11 +734,6 @@ %typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -%typemap(cppouttype) const char* "const char *" -%typemap(cppouttype) const unsigned char* "const unsigned char *" -%typemap(cppouttype) const signed char* "const signed char *" -%typemap(cppouttype) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" - %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" %typemap(cppouttype) const SWIGTYPE * "const $1_ltype" From 1440b436903e332a687a18c1f6e69d4e5d221d36 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:55:36 +0000 Subject: [PATCH 143/508] Add constant pointers to 'proxy' typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13611 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 643815fff..8cca0e91a 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -31,7 +31,13 @@ // void %typemap(proxy) void "void" -%typemap(proxy) void*, const void* "void *" +%typemap(proxy) void*, void&, void[ANY], void[] "void *" +%typemap(proxy) const void&, const void*, const void[ANY], const void[] "const void *" +%typemap(proxy) void**, void*&, void*[ANY], void[ANY][ANY] "void **" +%typemap(proxy) const void**, const void*&, const void*[ANY], const void[ANY][ANY] "const void **" +// constant pointers +%typemap(proxy) void* * const "void* * const" +%typemap(proxy) const void* * const "const void* * const" // short %typemap(proxy) short, const short "short" @@ -45,6 +51,13 @@ %typemap(proxy) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(proxy) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(proxy) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(proxy) short * const "short * const" +%typemap(proxy) short* * const "short* * const" +%typemap(proxy) const short* * const "const short* * const" +%typemap(proxy) unsigned short * const "unsigned short * const" +%typemap(proxy) unsigned short* * const "unsigned short* * const" +%typemap(proxy) const unsigned short* * const "const unsigned short* * const" // int %typemap(proxy) int, const int "int" @@ -58,6 +71,13 @@ %typemap(proxy) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(proxy) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(proxy) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(proxy) int * const "int * const" +%typemap(proxy) int* * const "int* * const" +%typemap(proxy) const int* * const "const int* * const" +%typemap(proxy) unsigned int * const "unsigned int * const" +%typemap(proxy) unsigned int* * const "unsigned int* * const" +%typemap(proxy) const unsigned int* * const "const unsigned int* * const" // long %typemap(proxy) long, const long "long" @@ -71,6 +91,13 @@ %typemap(proxy) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(proxy) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(proxy) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(proxy) long * const "long * const" +%typemap(proxy) long* * const "long* * const" +%typemap(proxy) const long* * const "const long* * const" +%typemap(proxy) unsigned long * const "unsigned long * const" +%typemap(proxy) unsigned long* * const "unsigned long* * const" +%typemap(proxy) const unsigned long* * const "const unsigned long* * const" // long long %typemap(proxy) long long, const long long "long long" @@ -84,6 +111,13 @@ %typemap(proxy) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(proxy) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(proxy) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(proxy) long long * const "long long * const" +%typemap(proxy) long long* * const "long long* * const" +%typemap(proxy) const long long* * const "const long long* * const" +%typemap(proxy) unsigned long long * const "unsigned long long * const" +%typemap(proxy) unsigned long long* * const "unsigned long long* * const" +%typemap(proxy) const unsigned long long* * const "const unsigned long long* * const" // char: signed/unsigned %typemap(proxy) char, const char "char" @@ -103,6 +137,13 @@ %typemap(proxy) const unsigned char "const unsigned char" %typemap(proxy) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(proxy) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(proxy) char * const "char * const" +%typemap(proxy) char* * const "char* * const" +%typemap(proxy) const char* * const "const char* * const" +%typemap(proxy) unsigned char * const "unsigned char * const" +%typemap(proxy) unsigned char* * const "unsigned char* * const" +%typemap(proxy) const unsigned char* * const "const unsigned char* * const" // float %typemap(proxy) float, const float "float" @@ -110,6 +151,13 @@ %typemap(proxy) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(proxy) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(proxy) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(proxy) float * const "float * const" +%typemap(proxy) float* * const "float* * const" +%typemap(proxy) const float* * const "const float* * const" +%typemap(proxy) unsigned float * const "unsigned float * const" +%typemap(proxy) unsigned float* * const "unsigned float* * const" +%typemap(proxy) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxy) double, const double "double" @@ -117,6 +165,13 @@ %typemap(proxy) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(proxy) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(proxy) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(proxy) double * const "double * const" +%typemap(proxy) double* * const "double* * const" +%typemap(proxy) const double* * const "const double* * const" +%typemap(proxy) unsigned double * const "unsigned double * const" +%typemap(proxy) unsigned double* * const "unsigned double* * const" +%typemap(proxy) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxy) size_t, const size_t "size_t" @@ -124,6 +179,10 @@ %typemap(proxy) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(proxy) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(proxy) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(proxy) size_t * const "size_t * const" +%typemap(proxy) size_t* * const "size_t* * const" +%typemap(proxy) const size_t* * const "const size_t* * const" // objects %typemap(proxy) SWIGTYPE "$&resolved_type*" From 41b3fcc1b65b9cf7230411915cd56eb295bfe32b Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:55:49 +0000 Subject: [PATCH 144/508] Add constant pointers to 'ctype' typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13612 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 8cca0e91a..785e817b0 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -218,6 +218,9 @@ %typemap(ctype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" %typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" %typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" +// constant pointers +%typemap(ctype) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1_ltype" +%typemap(ctype) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1_ltype" // size_t %typemap(ctype) size_t, const size_t "size_t" @@ -225,6 +228,10 @@ %typemap(ctype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(ctype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(ctype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(ctype) size_t * const "size_t * const" +%typemap(ctype) size_t* * const "size_t* * const" +%typemap(ctype) const size_t* * const "const size_t* * const" // special cases of array passing - does not intended to be used for objects %typemap(ctype) SWIGTYPE [] "$1_ltype" From b70b752883eaee30984af29decd00191eca5ea9c Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:56:03 +0000 Subject: [PATCH 145/508] Add constant pointers to 'in' typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13613 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 785e817b0..d35c0ca8c 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -315,12 +315,20 @@ %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" +// constant pointers +%typemap(in) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1 = ($1_ltype) $input;" +%typemap(in) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1 = ($1_ltype) $input;" + // size_t %typemap(in) size_t, const size_t "$1 = (size_t) $input;" -%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$input = (size_t *) $input;" +%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$1 = (size_t *) $input;" %typemap(in) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$1 = (const size_t *) &$input;" %typemap(in) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$1 = (size_t **) $input;" %typemap(in) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$1 = (const size_t **) $input;" +// constant pointers +%typemap(in) size_t * const "$1 = (size_t) $input;" +%typemap(in) size_t* * const "$1 = (size_t *) $input;" +%typemap(in) const size_t* * const "$1 = (const size_t **) $input;" %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;" %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" From 971e5015468b8408c9422420fe7b4547350c4ea4 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:56:19 +0000 Subject: [PATCH 146/508] add const pointers to 'couttype' typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13614 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index d35c0ca8c..26b49252b 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -414,6 +414,10 @@ // void %typemap(couttype) void "void" %typemap(couttype) void*, const void* "void *" +// constant pointers +%typemap(couttype) void * const "void * const" +%typemap(couttype) void* * const * const "void* *" +%typemap(couttype) const void* * const "const void* *" // short %typemap(couttype) short, const short "short" @@ -427,6 +431,13 @@ %typemap(couttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(couttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(couttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(couttype) short * const "short *" +%typemap(couttype) short* * const "short* *" +%typemap(couttype) const short* * const "const short* *" +%typemap(couttype) unsigned short * const "unsigned short *" +%typemap(couttype) unsigned short* * const "unsigned short* *" +%typemap(couttype) const unsigned short* * const "const unsigned short* *" // int %typemap(couttype) int, const int "int" @@ -440,6 +451,13 @@ %typemap(couttype) const int**, const int*&, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(couttype) int * const "int *" +%typemap(couttype) int* * const "int* *" +%typemap(couttype) const int* * const "const int* *" +%typemap(couttype) unsigned int * const "unsigned int *" +%typemap(couttype) unsigned int* * const "unsigned int* *" +%typemap(couttype) const unsigned int* * const "const unsigned int* *" // long %typemap(couttype) long, const long "long" @@ -453,6 +471,13 @@ %typemap(couttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(couttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(couttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(couttype) long * const "long *" +%typemap(couttype) long* * const "long* *" +%typemap(couttype) const long* * const "const long* *" +%typemap(couttype) unsigned long * const "unsigned long *" +%typemap(couttype) unsigned long* * const "unsigned long* *" +%typemap(couttype) const unsigned long* * const "const unsigned long* *" // long long %typemap(couttype) long long, const long long "long long" @@ -466,6 +491,13 @@ %typemap(couttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(couttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(couttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(couttype) long long * const "long long *" +%typemap(couttype) long long* * const "long long* *" +%typemap(couttype) const long long* * const "const long long* *" +%typemap(couttype) unsigned long long * const "unsigned long long *" +%typemap(couttype) unsigned long long* * const "unsigned long long* *" +%typemap(couttype) const unsigned long long* * const "const unsigned long long* *" // char: signed/unsigned %typemap(couttype) char, const char "char" @@ -485,6 +517,13 @@ %typemap(couttype) const unsigned char "const unsigned char" %typemap(couttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(couttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(couttype) char * const "char *" +%typemap(couttype) char* * const "char* *" +%typemap(couttype) const char* * const "const char* *" +%typemap(couttype) unsigned char * const "unsigned char *" +%typemap(couttype) unsigned char* * const "unsigned char* *" +%typemap(couttype) const unsigned char* * const "const unsigned char* *" // float %typemap(couttype) float, const float "float" @@ -492,6 +531,13 @@ %typemap(couttype) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(couttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(couttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(couttype) float * const "float *" +%typemap(couttype) float* * const "float* *" +%typemap(couttype) const float* * const "const float* *" +%typemap(couttype) unsigned float * const "unsigned float *" +%typemap(couttype) unsigned float* * const "unsigned float* *" +%typemap(couttype) const unsigned float* * const "const unsigned float* *" // double %typemap(couttype) double, const double "double" @@ -499,6 +545,13 @@ %typemap(couttype) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(couttype) double * const "double *" +%typemap(couttype) double* * const "double* *" +%typemap(couttype) const double* * const "const double* *" +%typemap(couttype) unsigned double * const "unsigned double *" +%typemap(couttype) unsigned double* * const "unsigned double* *" +%typemap(couttype) const unsigned double* * const "const unsigned double* *" // size_t %typemap(couttype) size_t, const size_t "size_t" @@ -506,6 +559,10 @@ %typemap(couttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(couttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(couttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(couttype) size_t * const "size_t *" +%typemap(couttype) size_t* * const "size_t* *" +%typemap(couttype) const size_t* * const "const size_t* *" // objects %typemap(couttype) SWIGTYPE "SwigObj *" From 2d18d31bccdda86a9aa15e8585d7fa3ac02cdcf5 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:56:33 +0000 Subject: [PATCH 147/508] Add constant pointers to 'cppouttype' typemaps git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13615 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 26b49252b..9ef4bd659 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -772,6 +772,10 @@ // void %typemap(cppouttype) void "void" %typemap(cppouttype) void*, const void* "void *" +// constant pointers +%typemap(cppouttype) void * const "void * const" +%typemap(cppouttype) void* * const * const "void* *" +%typemap(cppouttype) const void* * const "const void* *" // short %typemap(cppouttype) short, const short "short" @@ -785,6 +789,13 @@ %typemap(cppouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(cppouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(cppouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(cppouttype) short * const "short *" +%typemap(cppouttype) short* * const "short* *" +%typemap(cppouttype) const short* * const "const short* *" +%typemap(cppouttype) unsigned short * const "unsigned short *" +%typemap(cppouttype) unsigned short* * const "unsigned short* *" +%typemap(cppouttype) const unsigned short* * const "const unsigned short* *" // int %typemap(cppouttype) int, const int "int" @@ -798,6 +809,13 @@ %typemap(cppouttype) const int**, const int*&, int const **, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(cppouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(cppouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(cppouttype) int * const "int *" +%typemap(cppouttype) int* * const "int* *" +%typemap(cppouttype) const int* * const "const int* *" +%typemap(cppouttype) unsigned int * const "unsigned int *" +%typemap(cppouttype) unsigned int* * const "unsigned int* *" +%typemap(cppouttype) const unsigned int* * const "const unsigned int* *" // long %typemap(cppouttype) long, const long "long" @@ -811,6 +829,13 @@ %typemap(cppouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(cppouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(cppouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(cppouttype) long * const "long *" +%typemap(cppouttype) long* * const "long* *" +%typemap(cppouttype) const long* * const "const long* *" +%typemap(cppouttype) unsigned long * const "unsigned long *" +%typemap(cppouttype) unsigned long* * const "unsigned long* *" +%typemap(cppouttype) const unsigned long* * const "const unsigned long* *" // long long %typemap(cppouttype) long long, const long long "long long" @@ -824,6 +849,13 @@ %typemap(cppouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(cppouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(cppouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(cppouttype) long long * const "long long *" +%typemap(cppouttype) long long* * const "long long* *" +%typemap(cppouttype) const long long* * const "const long long* *" +%typemap(cppouttype) unsigned long long * const "unsigned long long *" +%typemap(cppouttype) unsigned long long* * const "unsigned long long* *" +%typemap(cppouttype) const unsigned long long* * const "const unsigned long long* *" // char: signed/unsigned %typemap(cppouttype) char, const char "char" @@ -843,6 +875,13 @@ %typemap(cppouttype) const unsigned char "const unsigned char" %typemap(cppouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(cppouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(cppouttype) char * const "char *" +%typemap(cppouttype) char* * const "char* *" +%typemap(cppouttype) const char* * const "const char* *" +%typemap(cppouttype) unsigned char * const "unsigned char *" +%typemap(cppouttype) unsigned char* * const "unsigned char* *" +%typemap(cppouttype) const unsigned char* * const "const unsigned char* *" // float %typemap(cppouttype) float, const float "float" @@ -850,6 +889,13 @@ %typemap(cppouttype) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(cppouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(cppouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(cppouttype) float * const "float *" +%typemap(cppouttype) float* * const "float* *" +%typemap(cppouttype) const float* * const "const float* *" +%typemap(cppouttype) unsigned float * const "unsigned float *" +%typemap(cppouttype) unsigned float* * const "unsigned float* *" +%typemap(cppouttype) const unsigned float* * const "const unsigned float* *" // double %typemap(cppouttype) double, const double "double" @@ -857,6 +903,13 @@ %typemap(cppouttype) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(cppouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(cppouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(cppouttype) double * const "double *" +%typemap(cppouttype) double* * const "double* *" +%typemap(cppouttype) const double* * const "const double* *" +%typemap(cppouttype) unsigned double * const "unsigned double *" +%typemap(cppouttype) unsigned double* * const "unsigned double* *" +%typemap(cppouttype) const unsigned double* * const "const unsigned double* *" // size_t %typemap(cppouttype) size_t, const size_t "size_t" @@ -864,6 +917,10 @@ %typemap(cppouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(cppouttype) size_t * const "size_t *" +%typemap(cppouttype) size_t* * const "size_t* *" +%typemap(cppouttype) const size_t* * const "const size_t* *" %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" From 7e673e733437b6acb483ed6a832bf7ffedb2231e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:56:53 +0000 Subject: [PATCH 148/508] Add constant pointers to 'proxycouttype' typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13616 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 9ef4bd659..64bbafb76 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -585,6 +585,9 @@ // void %typemap(proxycouttype) void "void" %typemap(proxycouttype) void*, const void* "void *" +// constant pointers +%typemap(proxycouttype) void* * const "void* * const" +%typemap(proxycouttype) const void* * const "const void* * const" // short %typemap(proxycouttype) short, const short "short" @@ -598,6 +601,13 @@ %typemap(proxycouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(proxycouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(proxycouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(proxycouttype) short * const "short * const" +%typemap(proxycouttype) short* * const "short* * const" +%typemap(proxycouttype) const short* * const "const short* * const" +%typemap(proxycouttype) unsigned short * const "unsigned short * const" +%typemap(proxycouttype) unsigned short* * const "unsigned short* * const" +%typemap(proxycouttype) const unsigned short* * const "const unsigned short* * const" // int %typemap(proxycouttype) int, const int "int" @@ -611,6 +621,13 @@ %typemap(proxycouttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(proxycouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(proxycouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(proxycouttype) int * const "int * const" +%typemap(proxycouttype) int* * const "int* * const" +%typemap(proxycouttype) const int* * const "const int* * const" +%typemap(proxycouttype) unsigned int * const "unsigned int * const" +%typemap(proxycouttype) unsigned int* * const "unsigned int* * const" +%typemap(proxycouttype) const unsigned int* * const "const unsigned int* * const" // long %typemap(proxycouttype) long, const long "long" @@ -624,6 +641,13 @@ %typemap(proxycouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(proxycouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(proxycouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(proxycouttype) long * const "long * const" +%typemap(proxycouttype) long* * const "long* * const" +%typemap(proxycouttype) const long* * const "const long* * const" +%typemap(proxycouttype) unsigned long * const "unsigned long * const" +%typemap(proxycouttype) unsigned long* * const "unsigned long* * const" +%typemap(proxycouttype) const unsigned long* * const "const unsigned long* * const" // long long %typemap(proxycouttype) long long, const long long "long long" @@ -637,6 +661,13 @@ %typemap(proxycouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(proxycouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(proxycouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(proxycouttype) long long * const "long long * const" +%typemap(proxycouttype) long long* * const "long long* * const" +%typemap(proxycouttype) const long long* * const "const long long* * const" +%typemap(proxycouttype) unsigned long long * const "unsigned long long * const" +%typemap(proxycouttype) unsigned long long* * const "unsigned long long* * const" +%typemap(proxycouttype) const unsigned long long* * const "const unsigned long long* * const" // char: signed/unsigned %typemap(proxycouttype) char, const char "char" @@ -656,6 +687,13 @@ %typemap(proxycouttype) const unsigned char "const unsigned char" %typemap(proxycouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(proxycouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(proxycouttype) char * const "char * const" +%typemap(proxycouttype) char* * const "char* * const" +%typemap(proxycouttype) const char* * const "const char* * const" +%typemap(proxycouttype) unsigned char * const "unsigned char * const" +%typemap(proxycouttype) unsigned char* * const "unsigned char* * const" +%typemap(proxycouttype) const unsigned char* * const "const unsigned char* * const" // float %typemap(proxycouttype) float, const float "float" @@ -663,6 +701,13 @@ %typemap(proxycouttype) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(proxycouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(proxycouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(proxycouttype) float * const "float * const" +%typemap(proxycouttype) float* * const "float* * const" +%typemap(proxycouttype) const float* * const "const float* * const" +%typemap(proxycouttype) unsigned float * const "unsigned float * const" +%typemap(proxycouttype) unsigned float* * const "unsigned float* * const" +%typemap(proxycouttype) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxycouttype) double, const double "double" @@ -670,6 +715,13 @@ %typemap(proxycouttype) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(proxycouttype) double * const "double * const" +%typemap(proxycouttype) double* * const "double* * const" +%typemap(proxycouttype) const double* * const "const double* * const" +%typemap(proxycouttype) unsigned double * const "unsigned double * const" +%typemap(proxycouttype) unsigned double* * const "unsigned double* * const" +%typemap(proxycouttype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxycouttype) size_t, const size_t "size_t" @@ -677,6 +729,10 @@ %typemap(proxycouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(proxycouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(proxycouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(proxycouttype) size_t * const "size_t * const" +%typemap(proxycouttype) size_t* * const "size_t* * const" +%typemap(proxycouttype) const size_t* * const "const size_t* * const" // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" From 0d472a6cb770f9967e7be7e791d7b481d70f1b76 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Wed, 15 Aug 2012 19:57:11 +0000 Subject: [PATCH 149/508] Add constant pointers to 'out' typemap. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13617 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 64bbafb76..d149c52b5 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -767,12 +767,20 @@ %typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;" %typemap(out) void "" +// constant pointers +%typemap(out) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$result = ($1_ltype) $1;" +%typemap(out) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$result = ($1_ltype) $1;" + // size_t %typemap(out) size_t, const size_t "$result = (size_t) $1;" %typemap(out) size_t*, size_t&, size_t[ANY], size_t[] "$result = (size_t *) $1;" %typemap(out) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$result = (const size_t *) &$1;" %typemap(out) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$result = (size_t **) $1;" %typemap(out) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$result = (const size_t **) $1;" +// constant pointers +%typemap(out) size_t * const "$result = (size_t) $1;" +%typemap(out) size_t* * const "$result = (size_t *) $1;" +%typemap(out) const size_t* * const "$result = (const size_t **) $1;" %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" From 9cd39cca508082c955997b0e7cbdc0740baef8d0 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 16 Aug 2012 12:47:27 +0000 Subject: [PATCH 150/508] Fix typemaps of char* and equivalents to be explicit about the resolved type. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13623 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index d149c52b5..1e8fa0d50 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -121,7 +121,7 @@ // char: signed/unsigned %typemap(proxy) char, const char "char" -%typemap(proxy) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxy) char*, char&, char[ANY], char[] "char *" %typemap(proxy) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(proxy) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(proxy) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" @@ -501,7 +501,7 @@ // char: signed/unsigned %typemap(couttype) char, const char "char" -%typemap(couttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(couttype) char*, char&, char[ANY], char[] "char *" %typemap(couttype) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(couttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(couttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" @@ -671,7 +671,7 @@ // char: signed/unsigned %typemap(proxycouttype) char, const char "char" -%typemap(proxycouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxycouttype) char*, char&, char[ANY], char[] "char *" %typemap(proxycouttype) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(proxycouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(proxycouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" @@ -923,7 +923,7 @@ // char: signed/unsigned %typemap(cppouttype) char, const char "char" -%typemap(cppouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(cppouttype) char*, char&, char[ANY], char[] "char *" %typemap(cppouttype) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(cppouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(cppouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" From f013b9d044f50b60da24574ce23d639c10bfd9e5 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 16 Aug 2012 12:47:39 +0000 Subject: [PATCH 151/508] Add explicit types for 'ctype' typemap because swig does not resolve e.g. std::vector::value_type to 'int' with the $1_ltype approach. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13624 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 161 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 142 insertions(+), 19 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 1e8fa0d50..79ebd8b6f 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -201,26 +201,149 @@ %typemap(proxy, fragment="stdbool_inc") const bool & "$1_basetype const *" // typemaps for function parameters -%typemap(ctype) void, short, int, long, long long, char, float, double "$1_ltype" -%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" -%typemap(ctype) void *, short *, int *, long *, long long *, char *, float *, double * "$1_ltype" -%typemap(ctype) void **, short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" -%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1_ltype" -%typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, long long &, char &, float &, double & "$1_ltype" -%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1_ltype" -%typemap(ctype) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" -%typemap(ctype) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" -%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" -%typemap(ctype) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1_ltype" -%typemap(ctype) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" -%typemap(ctype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" -%typemap(ctype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" +// void +%typemap(ctype) void "void" +%typemap(ctype) void*, void&, void[ANY], void[] "void *" +%typemap(ctype) const void&, const void*, const void[ANY], const void[] "const void *" +%typemap(ctype) void**, void*&, void*[ANY], void[ANY][ANY] "void **" +%typemap(ctype) const void**, const void*&, const void*[ANY], const void[ANY][ANY] "const void **" // constant pointers -%typemap(ctype) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1_ltype" -%typemap(ctype) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1_ltype" +%typemap(ctype) void* * const "void* * const" +%typemap(ctype) const void* * const "const void* * const" + +// short +%typemap(ctype) short, const short "short" +%typemap(ctype) short*, short&, short[ANY], short[] "short *" +%typemap(ctype) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(ctype) unsigned short "unsigned short" +%typemap(ctype) const unsigned short "const unsigned short" +%typemap(ctype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(ctype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(ctype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(ctype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(ctype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(ctype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(ctype) short * const "short * const" +%typemap(ctype) short* * const "short* * const" +%typemap(ctype) const short* * const "const short* * const" +%typemap(ctype) unsigned short * const "unsigned short * const" +%typemap(ctype) unsigned short* * const "unsigned short* * const" +%typemap(ctype) const unsigned short* * const "const unsigned short* * const" + +// int +%typemap(ctype) int, const int "int" +%typemap(ctype) int*, int&, int[ANY], int[] "int *" +%typemap(ctype) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(ctype) unsigned int "unsigned int" +%typemap(ctype) const unsigned int "unsigned int" +%typemap(ctype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(ctype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(ctype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(ctype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(ctype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(ctype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(ctype) int * const "int * const" +%typemap(ctype) int* * const "int* * const" +%typemap(ctype) const int* * const "const int* * const" +%typemap(ctype) unsigned int * const "unsigned int * const" +%typemap(ctype) unsigned int* * const "unsigned int* * const" +%typemap(ctype) const unsigned int* * const "const unsigned int* * const" + +// long +%typemap(ctype) long, const long "long" +%typemap(ctype) long*, long&, long[ANY], long[] "long *" +%typemap(ctype) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(ctype) unsigned long "unsigned long" +%typemap(ctype) const unsigned long "const unsigned long" +%typemap(ctype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(ctype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(ctype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(ctype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(ctype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(ctype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(ctype) long * const "long * const" +%typemap(ctype) long* * const "long* * const" +%typemap(ctype) const long* * const "const long* * const" +%typemap(ctype) unsigned long * const "unsigned long * const" +%typemap(ctype) unsigned long* * const "unsigned long* * const" +%typemap(ctype) const unsigned long* * const "const unsigned long* * const" + +// long long +%typemap(ctype) long long, const long long "long long" +%typemap(ctype) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(ctype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(ctype) unsigned long long "unsigned long long" +%typemap(ctype) const unsigned long long "const unsigned long long" +%typemap(ctype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(ctype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(ctype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(ctype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(ctype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(ctype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(ctype) long long * const "long long * const" +%typemap(ctype) long long* * const "long long* * const" +%typemap(ctype) const long long* * const "const long long* * const" +%typemap(ctype) unsigned long long * const "unsigned long long * const" +%typemap(ctype) unsigned long long* * const "unsigned long long* * const" +%typemap(ctype) const unsigned long long* * const "const unsigned long long* * const" + +// char: signed/unsigned +%typemap(ctype) char, const char "char" +%typemap(ctype) char*, char&, char[ANY], char[] "char *" +%typemap(ctype) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(ctype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(ctype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(ctype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(ctype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(ctype) signed char "signed char" +%typemap(ctype) const signed char "const signed char" +%typemap(ctype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(ctype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(ctype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(ctype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(ctype) unsigned char "unsigned char" +%typemap(ctype) const unsigned char "const unsigned char" +%typemap(ctype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(ctype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(ctype) char * const "char * const" +%typemap(ctype) char* * const "char* * const" +%typemap(ctype) const char* * const "const char* * const" +%typemap(ctype) unsigned char * const "unsigned char * const" +%typemap(ctype) unsigned char* * const "unsigned char* * const" +%typemap(ctype) const unsigned char* * const "const unsigned char* * const" + +// float +%typemap(ctype) float, const float "float" +%typemap(ctype) float*, float&, float[ANY], float[] "float *" +%typemap(ctype) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(ctype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(ctype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(ctype) float * const "float * const" +%typemap(ctype) float* * const "float* * const" +%typemap(ctype) const float* * const "const float* * const" +%typemap(ctype) unsigned float * const "unsigned float * const" +%typemap(ctype) unsigned float* * const "unsigned float* * const" +%typemap(ctype) const unsigned float* * const "const unsigned float* * const" + +// double +%typemap(ctype) double, const double "double" +%typemap(ctype) double*, double&, double[ANY], double[] "double *" +%typemap(ctype) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(ctype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(ctype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(ctype) double * const "double * const" +%typemap(ctype) double* * const "double* * const" +%typemap(ctype) const double* * const "const double* * const" +%typemap(ctype) unsigned double * const "unsigned double * const" +%typemap(ctype) unsigned double* * const "unsigned double* * const" +%typemap(ctype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(ctype) size_t, const size_t "size_t" From 554a3f9e0186d853b1628acfd3532379e0645c99 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 16 Aug 2012 12:47:49 +0000 Subject: [PATCH 152/508] Remove copy and pasta (unsigned float and unsigned double typemaps). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13625 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 79ebd8b6f..01050550a 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -155,9 +155,6 @@ %typemap(proxy) float * const "float * const" %typemap(proxy) float* * const "float* * const" %typemap(proxy) const float* * const "const float* * const" -%typemap(proxy) unsigned float * const "unsigned float * const" -%typemap(proxy) unsigned float* * const "unsigned float* * const" -%typemap(proxy) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxy) double, const double "double" @@ -169,9 +166,6 @@ %typemap(proxy) double * const "double * const" %typemap(proxy) double* * const "double* * const" %typemap(proxy) const double* * const "const double* * const" -%typemap(proxy) unsigned double * const "unsigned double * const" -%typemap(proxy) unsigned double* * const "unsigned double* * const" -%typemap(proxy) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxy) size_t, const size_t "size_t" @@ -327,9 +321,6 @@ %typemap(ctype) float * const "float * const" %typemap(ctype) float* * const "float* * const" %typemap(ctype) const float* * const "const float* * const" -%typemap(ctype) unsigned float * const "unsigned float * const" -%typemap(ctype) unsigned float* * const "unsigned float* * const" -%typemap(ctype) const unsigned float* * const "const unsigned float* * const" // double %typemap(ctype) double, const double "double" @@ -341,9 +332,6 @@ %typemap(ctype) double * const "double * const" %typemap(ctype) double* * const "double* * const" %typemap(ctype) const double* * const "const double* * const" -%typemap(ctype) unsigned double * const "unsigned double * const" -%typemap(ctype) unsigned double* * const "unsigned double* * const" -%typemap(ctype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(ctype) size_t, const size_t "size_t" @@ -657,10 +645,7 @@ // constant pointers %typemap(couttype) float * const "float *" %typemap(couttype) float* * const "float* *" -%typemap(couttype) const float* * const "const float* *" -%typemap(couttype) unsigned float * const "unsigned float *" -%typemap(couttype) unsigned float* * const "unsigned float* *" -%typemap(couttype) const unsigned float* * const "const unsigned float* *" +%typemap(couttype) const float* * const "float* *" // double %typemap(couttype) double, const double "double" @@ -671,10 +656,7 @@ // constant pointers %typemap(couttype) double * const "double *" %typemap(couttype) double* * const "double* *" -%typemap(couttype) const double* * const "const double* *" -%typemap(couttype) unsigned double * const "unsigned double *" -%typemap(couttype) unsigned double* * const "unsigned double* *" -%typemap(couttype) const unsigned double* * const "const unsigned double* *" +%typemap(couttype) const double* * const "double* *" // size_t %typemap(couttype) size_t, const size_t "size_t" @@ -828,9 +810,6 @@ %typemap(proxycouttype) float * const "float * const" %typemap(proxycouttype) float* * const "float* * const" %typemap(proxycouttype) const float* * const "const float* * const" -%typemap(proxycouttype) unsigned float * const "unsigned float * const" -%typemap(proxycouttype) unsigned float* * const "unsigned float* * const" -%typemap(proxycouttype) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxycouttype) double, const double "double" @@ -842,9 +821,6 @@ %typemap(proxycouttype) double * const "double * const" %typemap(proxycouttype) double* * const "double* * const" %typemap(proxycouttype) const double* * const "const double* * const" -%typemap(proxycouttype) unsigned double * const "unsigned double * const" -%typemap(proxycouttype) unsigned double* * const "unsigned double* * const" -%typemap(proxycouttype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxycouttype) size_t, const size_t "size_t" @@ -1079,10 +1055,7 @@ // constant pointers %typemap(cppouttype) float * const "float *" %typemap(cppouttype) float* * const "float* *" -%typemap(cppouttype) const float* * const "const float* *" -%typemap(cppouttype) unsigned float * const "unsigned float *" -%typemap(cppouttype) unsigned float* * const "unsigned float* *" -%typemap(cppouttype) const unsigned float* * const "const unsigned float* *" +%typemap(cppouttype) const float* * const "float* *" // double %typemap(cppouttype) double, const double "double" @@ -1093,10 +1066,7 @@ // constant pointers %typemap(cppouttype) double * const "double *" %typemap(cppouttype) double* * const "double* *" -%typemap(cppouttype) const double* * const "const double* *" -%typemap(cppouttype) unsigned double * const "unsigned double *" -%typemap(cppouttype) unsigned double* * const "unsigned double* *" -%typemap(cppouttype) const unsigned double* * const "const unsigned double* *" +%typemap(cppouttype) const double* * const "double* *" // size_t %typemap(cppouttype) size_t, const size_t "size_t" From 3b6e37bdf8ba839090b98872601382e155a7a110 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 16 Aug 2012 12:48:00 +0000 Subject: [PATCH 153/508] Workaround issue with swig casting to wrong (not const) type in wrapper's C++ function call, by setting variables to non const. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13626 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 01050550a..c47310a21 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -528,7 +528,7 @@ // constant pointers %typemap(couttype) void * const "void * const" %typemap(couttype) void* * const * const "void* *" -%typemap(couttype) const void* * const "const void* *" +%typemap(couttype) const void* * const "void* *" // short %typemap(couttype) short, const short "short" @@ -545,10 +545,10 @@ // constant pointers %typemap(couttype) short * const "short *" %typemap(couttype) short* * const "short* *" -%typemap(couttype) const short* * const "const short* *" +%typemap(couttype) const short* * const "short* *" %typemap(couttype) unsigned short * const "unsigned short *" %typemap(couttype) unsigned short* * const "unsigned short* *" -%typemap(couttype) const unsigned short* * const "const unsigned short* *" +%typemap(couttype) const unsigned short* * const "unsigned short* *" // int %typemap(couttype) int, const int "int" @@ -565,10 +565,10 @@ // constant pointers %typemap(couttype) int * const "int *" %typemap(couttype) int* * const "int* *" -%typemap(couttype) const int* * const "const int* *" +%typemap(couttype) const int* * const "int* *" %typemap(couttype) unsigned int * const "unsigned int *" %typemap(couttype) unsigned int* * const "unsigned int* *" -%typemap(couttype) const unsigned int* * const "const unsigned int* *" +%typemap(couttype) const unsigned int* * const "unsigned int* *" // long %typemap(couttype) long, const long "long" @@ -585,10 +585,10 @@ // constant pointers %typemap(couttype) long * const "long *" %typemap(couttype) long* * const "long* *" -%typemap(couttype) const long* * const "const long* *" +%typemap(couttype) const long* * const "long* *" %typemap(couttype) unsigned long * const "unsigned long *" %typemap(couttype) unsigned long* * const "unsigned long* *" -%typemap(couttype) const unsigned long* * const "const unsigned long* *" +%typemap(couttype) const unsigned long* * const "unsigned long* *" // long long %typemap(couttype) long long, const long long "long long" @@ -605,10 +605,10 @@ // constant pointers %typemap(couttype) long long * const "long long *" %typemap(couttype) long long* * const "long long* *" -%typemap(couttype) const long long* * const "const long long* *" +%typemap(couttype) const long long* * const "long long* *" %typemap(couttype) unsigned long long * const "unsigned long long *" %typemap(couttype) unsigned long long* * const "unsigned long long* *" -%typemap(couttype) const unsigned long long* * const "const unsigned long long* *" +%typemap(couttype) const unsigned long long* * const "unsigned long long* *" // char: signed/unsigned %typemap(couttype) char, const char "char" @@ -631,10 +631,10 @@ // constant pointers %typemap(couttype) char * const "char *" %typemap(couttype) char* * const "char* *" -%typemap(couttype) const char* * const "const char* *" +%typemap(couttype) const char* * const "char* *" %typemap(couttype) unsigned char * const "unsigned char *" %typemap(couttype) unsigned char* * const "unsigned char* *" -%typemap(couttype) const unsigned char* * const "const unsigned char* *" +%typemap(couttype) const unsigned char* * const "unsigned char* *" // float %typemap(couttype) float, const float "float" @@ -667,7 +667,7 @@ // constant pointers %typemap(couttype) size_t * const "size_t *" %typemap(couttype) size_t* * const "size_t* *" -%typemap(couttype) const size_t* * const "const size_t* *" +%typemap(couttype) const size_t* * const "size_t* *" // objects %typemap(couttype) SWIGTYPE "SwigObj *" @@ -975,10 +975,10 @@ // constant pointers %typemap(cppouttype) int * const "int *" %typemap(cppouttype) int* * const "int* *" -%typemap(cppouttype) const int* * const "const int* *" +%typemap(cppouttype) const int* * const "int* *" %typemap(cppouttype) unsigned int * const "unsigned int *" %typemap(cppouttype) unsigned int* * const "unsigned int* *" -%typemap(cppouttype) const unsigned int* * const "const unsigned int* *" +%typemap(cppouttype) const unsigned int* * const "unsigned int* *" // long %typemap(cppouttype) long, const long "long" @@ -995,10 +995,10 @@ // constant pointers %typemap(cppouttype) long * const "long *" %typemap(cppouttype) long* * const "long* *" -%typemap(cppouttype) const long* * const "const long* *" +%typemap(cppouttype) const long* * const "long* *" %typemap(cppouttype) unsigned long * const "unsigned long *" %typemap(cppouttype) unsigned long* * const "unsigned long* *" -%typemap(cppouttype) const unsigned long* * const "const unsigned long* *" +%typemap(cppouttype) const unsigned long* * const "unsigned long* *" // long long %typemap(cppouttype) long long, const long long "long long" @@ -1015,10 +1015,10 @@ // constant pointers %typemap(cppouttype) long long * const "long long *" %typemap(cppouttype) long long* * const "long long* *" -%typemap(cppouttype) const long long* * const "const long long* *" +%typemap(cppouttype) const long long* * const "long long* *" %typemap(cppouttype) unsigned long long * const "unsigned long long *" %typemap(cppouttype) unsigned long long* * const "unsigned long long* *" -%typemap(cppouttype) const unsigned long long* * const "const unsigned long long* *" +%typemap(cppouttype) const unsigned long long* * const "unsigned long long* *" // char: signed/unsigned %typemap(cppouttype) char, const char "char" @@ -1041,10 +1041,10 @@ // constant pointers %typemap(cppouttype) char * const "char *" %typemap(cppouttype) char* * const "char* *" -%typemap(cppouttype) const char* * const "const char* *" +%typemap(cppouttype) const char* * const "char* *" %typemap(cppouttype) unsigned char * const "unsigned char *" %typemap(cppouttype) unsigned char* * const "unsigned char* *" -%typemap(cppouttype) const unsigned char* * const "const unsigned char* *" +%typemap(cppouttype) const unsigned char* * const "unsigned char* *" // float %typemap(cppouttype) float, const float "float" @@ -1077,7 +1077,7 @@ // constant pointers %typemap(cppouttype) size_t * const "size_t *" %typemap(cppouttype) size_t* * const "size_t* *" -%typemap(cppouttype) const size_t* * const "const size_t* *" +%typemap(cppouttype) const size_t* * const "size_t* *" %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" From 4da42db22e36e236a28512ca50ab8bf2a96e76bf Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 16 Aug 2012 12:52:29 +0000 Subject: [PATCH 154/508] Remove the std_vector test I've added while trying for testing purposes git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13627 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/c/Makefile.in | 1 - .../c/cpp_basic_std_vector_built_in_runme.c | 19 ------------------- .../cpp_basic_std_vector_built_in.i | 5 ----- 3 files changed, 25 deletions(-) delete mode 100644 Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c delete mode 100644 Examples/test-suite/cpp_basic_std_vector_built_in.i diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 316658adb..0c24247a9 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -25,7 +25,6 @@ CPP_TEST_CASES += \ cpp_basic_namespaced_class \ cpp_basic_template_function \ cpp_basic_template_class \ - cpp_basic_std_vector_built_in \ c_backend_cpp_natural_std_string \ c_backend_cpp_exception diff --git a/Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c b/Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c deleted file mode 100644 index 08835bfd0..000000000 --- a/Examples/test-suite/c/cpp_basic_std_vector_built_in_runme.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "cpp_basic_std_vector_built_in/cpp_basic_std_vector_built_in_proxy.h" -#include - -int main() { - Int_Vector *myIntVector = new_Int_Vector_size_t(42); - - assert(Int_Vector_capacity(myIntVector) == 42); - Int_Vector_push_back(myIntVector, 4711); - assert(Int_Vector_size(myIntVector) == 43); - assert(Int_Vector_at(myIntVector, 42) == 4711); - Int_Vector_clear(myIntVector); - assert(Int_Vector_empty(myIntVector)); - assert(Int_Vector_size(myIntVector) == 0); - Int_Vector_push_back(myIntVector, 23); - assert(Int_Vector_size(myIntVector) == 1); - - delete_Int_Vector(myIntVector); -} \ No newline at end of file diff --git a/Examples/test-suite/cpp_basic_std_vector_built_in.i b/Examples/test-suite/cpp_basic_std_vector_built_in.i deleted file mode 100644 index ae42e792c..000000000 --- a/Examples/test-suite/cpp_basic_std_vector_built_in.i +++ /dev/null @@ -1,5 +0,0 @@ -%module cpp_basic_std_vector_built_in - -%include - -%template(Int_Vector) std::vector; \ No newline at end of file From 1c38df4ceb9a90b17955a85b9984fef90f299dd7 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 17 Aug 2012 12:15:08 +0000 Subject: [PATCH 155/508] Correct some descriptions of the typemaps. Remove duplicates git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13638 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 55 +++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 8d622a799..627278f33 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -423,11 +423,11 @@ area: 7.068583 proxy - Input parameters of proxy function + Parameter types of proxy functions ctype - Wrapper function declaration + Parameter types of wrapper functions wrap_call @@ -445,58 +445,47 @@ area: 7.068583 in - Generated for input parameters of a function + Mapping of wrapper functions' parameters to local C++ variables
      +
      + + SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
      + SomeCPPClass *arg1 = 0;
      + if (carg1)
      + arg1 = (SomeCPPClass*)carg1->obj
      + else
      + arg1 = 0;
      + } +       couttype - Casts return values of wrapper functions
      + Return value type of wrapper functions

      SwigObj* _wrap_MyClass_new(void) {
      - void *obj = ...
      - return (SwigObj*)obj;
      + SwigObj *result;
      + return result;
      }       - - proxy - Adds typecasts to class objects of wrapper functions calls in proxy functions
      - - void MyClass_delete(MyClass *myClass) {
      - _wrap_MyClass_delete((SwigObj*)myClass);
      - } -       - - - - couttype - Adds typecasts to wrap function return values in proxy functions
      - - MyClass_new(void) {
      - return (MyClass *)_wrap_MyClass_new();
      - } -       - - proxycouttype - Adds typecasts to wrap function return values in proxy functions
      + Typecasts wrapper functions' return values in proxy functions
      - MyClass_new(void) {
      - return (MyClass *)_wrap_MyClass_new();
      - } + MyClass *MyClass_new(void) {
      + return (MyClass *)_wrap_MyClass_new();
      + }       out - Adds code to wrapper functions for the return value variables + Assigns wrapped function's return value to return variable, packaging it into SwigObj if necessary cppouttype - special case where a special cppresult variable is added to a wrapper - function (TODO:the reason for its existence needs investigation). + Type of the result variable used for the return value if the wrapped function is a C++ function From a826cdda4e7d1b7c18b3d577751c3d1b82ffb195 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 17 Aug 2012 17:21:51 +0000 Subject: [PATCH 156/508] Add beginning of 'which typemap is for what' for C backend documentation. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13639 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 153 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 627278f33..2b30c4389 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -490,6 +490,159 @@ area: 7.068583 +

      C Typemaps, a Code Generation Walkthrough

      + +To get a better idea of which typemap is used for which generated code, have a look at the following 'walk through'.
      +Let's assume we have the following C++ interface file, we'd like to generate code for: + +

      The Interface

      +
      +%module example
+
+%inline
+%{
+  class SomeClass{};
+  template <typename T> class SomeTemplateClass{};
+  SomeClass someFunction(SomeTemplateClass<int> &someParameter, int simpleInt);
+%}
+
+%template (SomeIntTemplateClass) SomeTemplateClass<int>;
+
      + + +What we would like to generate as a C interface of this function would be something like this: + +
      +//proxy header file
+SomeClass *new_SomeClass(void);
+void delete_SomeClass(SomeClass* carg);
+
+SomeIntTemplateClass * new_SomeIntTemplateClass();
+void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
+
+SomeClass *someFunction(SomeIntTemplateClass *someParameter, int simpleInt);
+
      + +When we generate the bindings, we generate code for two translation units: +
        +
      • The proxy
        • +
      • The wrapper
        • +
      +We need 2 translation units to be able to have C types with the same names as the original C++ types. + +

      The Wrapper

      +Since the proxy embeds a call to the wrapper function, we'll examine the generation of the wrapper function first. + +
      +SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
+  SomeClass * cppresult;
+  SomeTemplateClass< int > *arg1 = 0 ;
+  int arg2 ;
+  SwigObj * result;
+  
+  {
+    if (carg1)
+    arg1 = (SomeTemplateClass< int > *) carg1->obj;
+    else
+    arg1 = (SomeTemplateClass< int > *) 0;
+  }
+  arg2 = (int) carg2;
+  {
+    const int &_result_ref =  someFunction(*arg1,arg2);cppresult = (int*) &_result_ref;
+  }
+  {
+    result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass));
+    result->obj = (void*) &cppresult;
+  }
+  return result;
+}
+
      + +It might be helpful to think of the way function calls are generated as a composition of building blocks.
      +A typical wrapper will be composited with these [optional] blocks: + +
        +
      1. Prototype
        2. +
      2. C return value variable
        3. +
      3. Local variables equal to the called C++ function's parameters
        4. +
      4. [C++ return value variable]
        5. +
      5. Assignment (extraction) of wrapper parameters to local parameter copies
        6. +
      6. [Contract (e.g. constraints) checking]
        7. +
      7. C++ function call
        8. +
      8. [Exception handling]
        9. +
      9. [Assignment to C++ return value]
        10. +
      10. Assignment to C return value
        11. +
      + +Let's go through it step by step and start with the wrapper prototype + +
      +couttype                     ctype            ctype
+---------                    ---------        ---
+SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
+
      + +As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body + +
      +couttype
+---------
+SwigObj * result;
+
      + +Now for each of the C++ function's arguments, a local variable with the very same type is emitted to the wrapper's body. + +
      +SomeTemplateClass< int > *arg1 = 0 ;
+int arg2 ;
+
      + +If it's a C++ function that is wrapped (in this case it is), another variable is emitted for the 'original' return value of the C++ function.
      +At this point, we simply 'inject' behavior if it's a C++ function that is wrapped (in this cas it obviously is). + +
      +cppouttype
+-----------
+SomeClass * cppresult;
+
      + +Next, the values of the input parameters are assigned to the local variables using the 'in' typemap. + +
      +{
+  if (carg1)
+  arg1 = (SomeTemplateClass< int > *) carg1->obj;
+  else
+  arg1 = (SomeTemplateClass< int > *) 0;
+}
+arg2 = (int) carg2;
+
      + +A reasonable question would be: "Why aren't the parameters assigned in the declaration of their local counterparts?"
      +As seen above, for complex types pointers have to be verified before extracting and
      +casting the actual data pointer from the provided SwigObj pointer.
      +This could easily become messy if it was done in the same line with the local variable declaration.
      +

      +At this point we are ready to call the C++ function with our parameters.
      +

      +
      +{
+  const int &_result_ref =  someFunction(*arg1,arg2);cppresult = (int*) &_result_ref;
+}
+
      +Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap +
      +{
+  result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass));
+  result->obj = (void*) &cppresult;
+}
+
      + +Finally, the return value variable is returned. +
      +return result;
+
      +

      36.5 Exception handling

      From b25f28938bd610e602a20f65adf1503df941c11d Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 17 Aug 2012 17:22:06 +0000 Subject: [PATCH 157/508] Reuse 'ctype' typemap to cast wrapper calls. Reduces number of typemaps for the cost of unnecessary casts (e.g. 'int' to 'int'). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13640 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/c/c.swg | 45 -------------------------------------------- Source/Modules/c.cxx | 8 ++++---- 2 files changed, 4 insertions(+), 49 deletions(-) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index c47310a21..82490e0e1 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -363,51 +363,6 @@ %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype" %typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const" -// typemaps for function parameters -%typemap(wrap_call) void, short, int, long, long long, char, float, double "" -%typemap(wrap_call) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "" -%typemap(wrap_call) void *, short *, int *, long *, long long *, char *, float *, double * "" -%typemap(wrap_call) void **, short **, int **, long **, long long **, char **, float **, double ** "" -%typemap(wrap_call) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "" -%typemap(wrap_call) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "" -%typemap(wrap_call) short &, int &, long &, long long &, char &, float &, double & "" -%typemap(wrap_call) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "" -%typemap(wrap_call) const short, const int, const long, const long long, const char, const float, const double "" -%typemap(wrap_call) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "" -%typemap(wrap_call) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "" -%typemap(wrap_call) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "" -%typemap(wrap_call) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "" -%typemap(wrap_call) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "" -%typemap(wrap_call) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& " **" -%typemap(wrap_call) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ " -%typemap(wrap_call) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ " - -// size_t -%typemap(wrap_call) size_t, const size_t "" -%typemap(wrap_call) size_t*, size_t&, size_t[ANY], size_t[] "" -%typemap(wrap_call) const size_t&, const size_t*, const size_t[ANY], const size_t[] "" -%typemap(wrap_call) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "" -%typemap(wrap_call) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "" - -// special cases of array passing - does not intended to be used for objects -%typemap(wrap_call) SWIGTYPE [] "" -%typemap(wrap_call) SWIGTYPE ((&)[ANY]) " **" - -%typemap(wrap_call) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "" -%typemap(wrap_call) SWIGTYPE "(SwigObj *)" -%typemap(wrap_call) SWIGTYPE * "(SwigObj *)" -%typemap(wrap_call) SWIGTYPE & "(SwigObj *)" -%typemap(wrap_call) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ (SwigObj ***)" -%typemap(wrap_call) SWIGTYPE *[ANY] "/*ooooh*/ (SwigObj **)" -%typemap(wrap_call) SWIGTYPE *& "/* *& */ (SwigObj **)" -%typemap(wrap_call) enum SWIGTYPE "" -%typemap(wrap_call) enum SWIGTYPE &, enum SWIGTYPE * "" -%typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "(SWIG_CPP_FP)" - -%typemap(wrap_call, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" -%typemap(wrap_call, fragment="stdbool_inc") bool & "" -%typemap(wrap_call, fragment="stdbool_inc") const bool & " const" - %typemap(in) short, int, long, long long, char, float, double "$1 = ($1_ltype) $input;" %typemap(in) void *, short *, int *, long *, long long *, char *, float *, double * "$1 = ($1_ltype) $input;" %typemap(in) void **, short **, int **, long **, long long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 7a3bee04b..006542b35 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -903,7 +903,7 @@ ready: //Swig_typemap_attach_parms("in", parms, 0); // attach typemaps to cast wrapper call with proxy types - Swig_typemap_attach_parms("wrap_call", parms, 0); + Swig_typemap_attach_parms("ctype", parms, 0); // prepare function definition for (p = parms, gencomma = 0; p; ) { @@ -932,13 +932,13 @@ ready: Printf(arg_name, "c%s", lname); // set the appropriate type for parameter - if ((tm = Getattr(p, "tmap:wrap_call"))) { - Printv(c_parm_type, tm, NIL); + if ((tm = Getattr(p, "tmap:ctype"))) { + Printv(c_parm_type, NewString("("), tm, NewString(")"), NIL); // template handling Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0)); } else { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No wrap_call typemap defined for %s\n", SwigType_str(type, 0)); + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0)); } /* From 370a7926d86efe25babb55c81ea23108c125439d Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Fri, 17 Aug 2012 17:22:17 +0000 Subject: [PATCH 158/508] Use "targetlang" style for C code in docs. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13641 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/C.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 2b30c4389..28067281c 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -512,7 +512,7 @@ Let's assume we have the following C++ interface file, we'd like to generate cod What we would like to generate as a C interface of this function would be something like this: -
      +
       //proxy header file
 SomeClass *new_SomeClass(void);
 void delete_SomeClass(SomeClass* carg);
@@ -533,7 +533,7 @@ We need 2 translation units to be able to have C types with the same names as th
 
      The Wrapper
      
 Since the proxy embeds a call to the wrapper function, we'll examine the generation of the wrapper function first.
 
-
      +
       SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
   SomeClass * cppresult;
   SomeTemplateClass< int > *arg1 = 0 ;
@@ -576,7 +576,7 @@ A typical wrapper will be composited with these [optional] blocks:
 
 Let's go through it step by step and start with the wrapper prototype
 
-
      +
       couttype                     ctype            ctype
 ---------                    ---------        ---
 SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
@@ -584,7 +584,7 @@ SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
 
 As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
 
-
      +
       couttype
 ---------
 SwigObj * result;
@@ -592,7 +592,7 @@ SwigObj * result;
 
 Now for each of the C++ function's arguments, a local variable with the very same type is emitted to the wrapper's body.
 
-
      +
       SomeTemplateClass< int > *arg1 = 0 ;
 int arg2 ;
 
      
@@ -600,7 +600,7 @@ int arg2 ;
 If it's a C++ function that is wrapped (in this case it is), another variable is emitted for the 'original' return value of the C++ function.
      
 At this point, we simply 'inject' behavior if it's a C++ function that is wrapped (in this cas it obviously is).
 
-
      +
       cppouttype
 -----------
 SomeClass * cppresult;
@@ -608,7 +608,7 @@ SomeClass * cppresult;
 
 Next, the values of the input parameters are assigned to the local variables using the 'in' typemap.
 
-
      +
       {
   if (carg1)
   arg1 = (SomeTemplateClass< int > *) carg1->obj;
@@ -625,13 +625,13 @@ This could easily become messy if it was done in the same line with the local va
 
      
 At this point we are ready to call the C++ function with our parameters.
      
 
      
-
      +
       {
   const int &_result_ref =  someFunction(*arg1,arg2);cppresult = (int*) &_result_ref;
 }
 
      
 Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap
-
      +
       {
   result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass));
   result->obj = (void*) &cppresult;
@@ -639,7 +639,7 @@ Subsequently, the return value is assigned to the dedicated return value variabl
 
      
 
 Finally, the return value variable is returned.
-
      +
       return result;
 
      
 

From beb9851f042f462d859f5fb79521dfb7997823a8 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Fri, 17 Aug 2012 17:22:28 +0000
Subject: [PATCH 159/508] Add docs about typemaps used by the C backend for
 proxy code generation.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13642 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 28067281c..34284fb60 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -643,6 +643,51 @@ Finally, the return value variable is returned.
 return result;
 
      
 
+
      The Proxy
      
+Compared to the wrapper code generation, the proxy code is very simple.
      
+Basically it just casts types for the wrapper call. Let's have a look at the corresponding proxy header file code of the interface above.
+
+
      +//proxy header file
+typedef struct SwigObj_SomeClass SomeClass;
+
+SomeClass * new_SomeClass();
+
+void delete_SomeClass(SomeClass * carg1);
+
+SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
+
+
+typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
+
+SomeIntTemplateClass * new_SomeIntTemplateClass();
+
+void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
+
      
+
+For shortness sake, we'll only examine one function that uses all proxy typemaps, as the other functions are analogous.
+
+
      +SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2) {
+  return (SomeClass*)_wrap_someFunction((SwigObj *)carg1, (int)carg2);
+}
+
      
+
+Again, let's first examine the protype:
+
      +proxycouttype           proxy                        proxy
+----------              ---------------------        ---
+SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
+
      
+
+In the body of this function, we'll reuse the 'proxycouttype' and 'ctype' to cast the return value and arguments of the wrapper function.
+
+
      +        proxycouttype                  ctype
+        ----------                     ---------
+return (SomeClass*)_wrap_someFunction((SwigObj *)carg1, (int)carg2);
+
      
+
 
      36.5 Exception handling
      
 
 

From 0db6a8c2012fba6a105744acc06da1ef1425c351 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Fri, 17 Aug 2012 17:22:38 +0000
Subject: [PATCH 160/508] Change style of C code to "targetlang"

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13643 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 34284fb60..6d8dd4e3e 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -198,7 +198,7 @@ For each C function declared in the interface file a wrapper function is created
 For example, for function declaration:
 
      
 
-
      +
       int gcd(int x, int y);
 
      
 
@@ -206,7 +206,7 @@ int gcd(int x, int y);
 The output is simply:
 
      
 
-
      +
       int _wrap_gcd(int arg1, int arg2) {
   int result;
   result = gcd(arg1,arg2);
@@ -218,7 +218,7 @@ int _wrap_gcd(int arg1, int arg2) {
 Then again, this wrapper function is usually called from C using helper function declared in proxy file, preserving the original name:
 
      
 
-
      +
       int gcd(int arg1, int arg2) {
   return _wrap_gcd(arg1,arg2);
 }
@@ -241,7 +241,7 @@ int gcd(int POSITIVE, int POSITIVE);
 And now the generated result looks like:
 
      
 
-
      +
       int _wrap_gcd(int arg1, int arg2) {
   {
     if (arg1 <= 0)
@@ -272,7 +272,7 @@ Wrapping variables comes also without any special issues. All global variables a
 You can still apply some of the SWIG features when handling structs, e.g. %extend directive. Suppose, you have a C struct declaration:
 
      
 
-
      +
       typedef struct {
   int x;
   char *str;
@@ -341,7 +341,7 @@ This section briefly covers the essential aspects of this wrapping.
 Consider the following example. We have a C++ class, and want to use it from C code.
 
      
 
-
      +
       class Circle {
 public:
   double radius;
@@ -367,7 +367,7 @@ Circle *circle;
 The generated functions make calls to class' constructors and destructors, respectively. They also do all the necessary things required by the SWIG object management system in C.
 
      
 
-
      +
       Circle * new_Circle(double r);
 void delete_Circle(Circle * self);
 
      
@@ -376,7 +376,7 @@ void delete_Circle(Circle * self);
 The class Circle has a public variable called radius. SWIG generates a pair of setters and getters for each such variable:
 
      
 
-
      +
       void Circle_radius_set(Circle * self, double radius);
 double Circle_radius_get(Circle * self);
 
      
@@ -385,7 +385,7 @@ double Circle_radius_get(Circle * self);
 For each public method, an appropriate function is generated:
 
      
 
-
      +
       double Circle_area(Circle * self);
 
      
 

From dc9f0e5076d574bd08c565ca155e88de13e9d19f Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Fri, 17 Aug 2012 17:22:48 +0000
Subject: [PATCH 161/508] Change style of command line snippets to "shell"

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13644 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 6d8dd4e3e..1b3709c27 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -84,7 +84,7 @@ int fact(int n);
 
      
 To build a C module (C as the target language), run SWIG using the -c option :
      
 
-
      +
       %swig -c example.i
 
      
 
@@ -92,7 +92,7 @@ To build a C module (C as the target language), run SWIG using the -c o
 The above assumes C as the input language. If the input language is C++ add the -c++ option:
 
      
 
-
      +
       $ swig -c++ -c example.i
 
      
 
@@ -115,7 +115,7 @@ The wrap file contains the wrapper functions, which perform the main fu
 The following table list the additional commandline options available for the C module. They can also be seen by using: 
 
      
 
-
      +
       swig -c -help 
 
      
 
@@ -143,7 +143,7 @@ swig -c -help
 The next step is to build a dynamically loadable module, which we can link to our application. This can be done easily, for example using the gcc compiler (Linux, MinGW, etc.):
 
      
 
-
      +
       $ swig -c example.i
 $ gcc -c example_wrap.c
 $ gcc -c example_proxy.c
@@ -154,7 +154,7 @@ $ gcc -shared example_wrap.o example_proxy.o -o libexample.so
 Or, for C++ input:
 
      
 
-
      +
       $ swig -c++ -c example.i
 $ g++ -c example_wrap.cxx
 $ gcc -c example_proxy.c
@@ -172,7 +172,7 @@ Now the shared library module is ready to use. Note that the name of the generat
 The simplest way to use the generated shared module is to link it to the application code during the compilation stage. We have to compile the proxy file as well. The process is usually similar to this:
 
      
 
-
      +
       $ gcc runme.c -L. -lexample -o runme
 
      
 

From abe23f2ca009a819db6b8bfe9780e48a37a45f80 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Fri, 17 Aug 2012 17:22:59 +0000
Subject: [PATCH 162/508] Unify beginning of command line code

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13645 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 1b3709c27..45d16e466 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -85,7 +85,7 @@ int fact(int n);
 To build a C module (C as the target language), run SWIG using the -c option :
      
 
 
      -%swig -c example.i
+$ swig -c example.i
 
      
 
 
      
@@ -116,7 +116,7 @@ The following table list the additional commandline options available for the C
 
      
 
 
      -swig -c -help 
+$ swig -c -help
 
      
 
 

From 7330e2bbf78692748e34a03865a7e44d6bf567b9 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Fri, 17 Aug 2012 17:23:10 +0000
Subject: [PATCH 163/508] Use actual generated code for 'would like' prologue.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13646 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 45d16e466..6c35cf42e 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -514,13 +514,20 @@ What we would like to generate as a C interface of this function would be someth
 
 
       //proxy header file
-SomeClass *new_SomeClass(void);
-void delete_SomeClass(SomeClass* carg);
+typedef struct SwigObj_SomeClass SomeClass;
 
+SomeClass * new_SomeClass();
+
+void delete_SomeClass(SomeClass * carg1);
+        
+SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
+        
+        
+typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
+        
 SomeIntTemplateClass * new_SomeIntTemplateClass();
+        
 void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
-
-SomeClass *someFunction(SomeIntTemplateClass *someParameter, int simpleInt);
 
      
 
 When we generate the bindings, we generate code for two translation units:

From 200a678f611fc26cbcc80141c65daf93b33bd340 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 13:42:28 +0000
Subject: [PATCH 164/508] Remove docs about 'wrap_call' typemap.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13648 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 6c35cf42e..39ef93405 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -427,12 +427,8 @@ area: 7.068583
   
         
-    
-  
-  
-    
-    
+       

From 2e0a4c7f8515ba62047aa6d1236fe317856a284e Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:29:53 +0000
Subject: [PATCH 166/508] Macrofy 'proxy' typemap.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13653 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 164 +++++++++-------------------------------------------
 1 file changed, 26 insertions(+), 138 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 82490e0e1..6f72c6f3c 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -29,6 +29,18 @@
 
 // typemaps for proxy function parameters
 
+%define explicit_same_type(TM, T)
+%typemap(TM) T, const T "T"
+%typemap(TM) T*, T&, T[ANY], T[] "T *"
+%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
+%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
+%typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] "const T **"
+// constant pointers
+%typemap(TM) T * const "T * const"
+%typemap(TM) T* * const "T* * const"
+%typemap(TM) const T* * const "const T* * const"
+%enddef
+
 // void
 %typemap(proxy) void "void"
 %typemap(proxy) void*, void&, void[ANY], void[] "void *"
@@ -39,144 +51,20 @@
 %typemap(proxy) void* * const "void* * const"
 %typemap(proxy) const void* * const "const void* * const"
 
-// short
-%typemap(proxy) short, const short "short"
-%typemap(proxy) short*, short&, short[ANY], short[] "short *"
-%typemap(proxy) const short&, const short*, const short[ANY], const short[] "const short *"
-%typemap(proxy) unsigned short "unsigned short"
-%typemap(proxy) const unsigned short "const unsigned short"
-%typemap(proxy) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *"
-%typemap(proxy) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *"
-%typemap(proxy) short**, short*&, short*[ANY], short[ANY][ANY] "short **"
-%typemap(proxy) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **"
-%typemap(proxy) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **"
-%typemap(proxy) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **"
-// constant pointers
-%typemap(proxy) short * const "short * const"
-%typemap(proxy) short* * const "short* * const"
-%typemap(proxy) const short* * const "const short* * const"
-%typemap(proxy) unsigned short * const "unsigned short * const"
-%typemap(proxy) unsigned short* * const "unsigned short* * const"
-%typemap(proxy) const unsigned short* * const "const unsigned short* * const"
-
-// int
-%typemap(proxy) int, const int "int"
-%typemap(proxy) int*, int&, int[ANY], int[] "int *"
-%typemap(proxy) const int&, const int*, const int[ANY], const int[] "const int *"
-%typemap(proxy) unsigned int "unsigned int"
-%typemap(proxy) const unsigned int "unsigned int"
-%typemap(proxy) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *"
-%typemap(proxy) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *"
-%typemap(proxy) int**, int*&, int*[ANY], int[ANY][ANY] "int **"
-%typemap(proxy) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **"
-%typemap(proxy) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **"
-%typemap(proxy) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **"
-// constant pointers
-%typemap(proxy) int * const "int * const"
-%typemap(proxy) int* * const "int* * const"
-%typemap(proxy) const int* * const "const int* * const"
-%typemap(proxy) unsigned int * const "unsigned int * const"
-%typemap(proxy) unsigned int* * const "unsigned int* * const"
-%typemap(proxy) const unsigned int* * const "const unsigned int* * const"
-
-// long
-%typemap(proxy) long, const long "long"
-%typemap(proxy) long*, long&, long[ANY], long[] "long *"
-%typemap(proxy) const long&, const long*, const long[ANY], const long[] "const long *"
-%typemap(proxy) unsigned long "unsigned long"
-%typemap(proxy) const unsigned long "const unsigned long"
-%typemap(proxy) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *"
-%typemap(proxy) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *"
-%typemap(proxy) long**, long*&, long*[ANY], long[ANY][ANY] "long **"
-%typemap(proxy) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **"
-%typemap(proxy) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **"
-%typemap(proxy) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **"
-// constant pointers
-%typemap(proxy) long * const "long * const"
-%typemap(proxy) long* * const "long* * const"
-%typemap(proxy) const long* * const "const long* * const"
-%typemap(proxy) unsigned long * const "unsigned long * const"
-%typemap(proxy) unsigned long* * const "unsigned long* * const"
-%typemap(proxy) const unsigned long* * const "const unsigned long* * const"
-
-// long long
-%typemap(proxy) long long, const long long "long long"
-%typemap(proxy) long long*, long long&, long long[ANY], long long[] "long long *"
-%typemap(proxy) const long long&, const long long*, const long long[ANY], const long long[] "const long long *"
-%typemap(proxy) unsigned long long "unsigned long long"
-%typemap(proxy) const unsigned long long "const unsigned long long"
-%typemap(proxy) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *"
-%typemap(proxy) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *"
-%typemap(proxy) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **"
-%typemap(proxy) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **"
-%typemap(proxy) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **"
-%typemap(proxy) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **"
-// constant pointers
-%typemap(proxy) long long * const "long long * const"
-%typemap(proxy) long long* * const "long long* * const"
-%typemap(proxy) const long long* * const "const long long* * const"
-%typemap(proxy) unsigned long long * const "unsigned long long * const"
-%typemap(proxy) unsigned long long* * const "unsigned long long* * const"
-%typemap(proxy) const unsigned long long* * const "const unsigned long long* * const"
-
-// char: signed/unsigned
-%typemap(proxy) char, const char "char"
-%typemap(proxy) char*, char&, char[ANY], char[] "char *"
-%typemap(proxy) const char&, const char*, const char[ANY], const char[] "const char *"
-%typemap(proxy) char**, char*&, char*[ANY], char[ANY][ANY] "char **"
-%typemap(proxy) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **"
-%typemap(proxy) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **"
-%typemap(proxy) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **"
-%typemap(proxy) signed char "signed char"
-%typemap(proxy) const signed char "const signed char"
-%typemap(proxy) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *"
-%typemap(proxy) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype"
-%typemap(proxy) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **"
-%typemap(proxy) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **"
-%typemap(proxy) unsigned char "unsigned char"
-%typemap(proxy) const unsigned char "const unsigned char"
-%typemap(proxy) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *"
-%typemap(proxy) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *"
-// constant pointers
-%typemap(proxy) char * const "char * const"
-%typemap(proxy) char* * const "char* * const"
-%typemap(proxy) const char* * const "const char* * const"
-%typemap(proxy) unsigned char * const "unsigned char * const"
-%typemap(proxy) unsigned char* * const "unsigned char* * const"
-%typemap(proxy) const unsigned char* * const "const unsigned char* * const"
-
-// float
-%typemap(proxy) float, const float "float"
-%typemap(proxy) float*, float&, float[ANY], float[] "float *"
-%typemap(proxy) const float&, const float*, const float[ANY], const float[] "const float *"
-%typemap(proxy) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **"
-%typemap(proxy) const float**, const float*[ANY], const float[ANY][ANY] "const float **"
-// constant pointers
-%typemap(proxy) float * const "float * const"
-%typemap(proxy) float* * const "float* * const"
-%typemap(proxy) const float* * const "const float* * const"
-
-// double
-%typemap(proxy) double, const double "double"
-%typemap(proxy) double*, double&, double[ANY], double[] "double *"
-%typemap(proxy) const double&, const double*, const double[ANY], const double[] "const double *"
-%typemap(proxy) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **"
-%typemap(proxy) const double**, const double*[ANY], const double[ANY][ANY] "const double **"
-// constant pointers
-%typemap(proxy) double * const "double * const"
-%typemap(proxy) double* * const "double* * const"
-%typemap(proxy) const double* * const "const double* * const"
-
-// size_t
-%typemap(proxy) size_t, const size_t "size_t"
-%typemap(proxy) size_t*, size_t&, size_t[ANY], size_t[] "size_t *"
-%typemap(proxy) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *"
-%typemap(proxy) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **"
-%typemap(proxy) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **"
-// constant pointers
-%typemap(proxy) size_t * const "size_t * const"
-%typemap(proxy) size_t* * const "size_t* * const"
-%typemap(proxy) const size_t* * const "const size_t* * const"
+explicit_same_type(proxy, short);
+explicit_same_type(proxy, unsigned short);
+explicit_same_type(proxy, int);
+explicit_same_type(proxy, unsigned int);
+explicit_same_type(proxy, long);
+explicit_same_type(proxy, unsigned long);
+explicit_same_type(proxy, long long);
+explicit_same_type(proxy, unsigned long long);
+explicit_same_type(proxy, char);
+explicit_same_type(proxy, signed char);
+explicit_same_type(proxy, unsigned char);
+explicit_same_type(proxy, float);
+explicit_same_type(proxy, double);
+explicit_same_type(proxy, size_t);
 
 // objects
 %typemap(proxy) SWIGTYPE      "$&resolved_type*"

From 3ca35323f67b62aba7d67cf6aebc82d916027243 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:30:09 +0000
Subject: [PATCH 167/508] Macrofy 'ctype' typemap

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13654 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 151 +++++-----------------------------------------------
 1 file changed, 14 insertions(+), 137 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 6f72c6f3c..0034e3365 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -93,144 +93,21 @@ explicit_same_type(proxy, size_t);
 %typemap(ctype) void* * const "void* * const"
 %typemap(ctype) const void* * const "const void* * const"
 
-// short
-%typemap(ctype) short, const short "short"
-%typemap(ctype) short*, short&, short[ANY], short[] "short *"
-%typemap(ctype) const short&, const short*, const short[ANY], const short[] "const short *"
-%typemap(ctype) unsigned short "unsigned short"
-%typemap(ctype) const unsigned short "const unsigned short"
-%typemap(ctype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *"
-%typemap(ctype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *"
-%typemap(ctype) short**, short*&, short*[ANY], short[ANY][ANY] "short **"
-%typemap(ctype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **"
-%typemap(ctype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **"
-%typemap(ctype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **"
-// constant pointers
-%typemap(ctype) short * const "short * const"
-%typemap(ctype) short* * const "short* * const"
-%typemap(ctype) const short* * const "const short* * const"
-%typemap(ctype) unsigned short * const "unsigned short * const"
-%typemap(ctype) unsigned short* * const "unsigned short* * const"
-%typemap(ctype) const unsigned short* * const "const unsigned short* * const"
 
-// int
-%typemap(ctype) int, const int "int"
-%typemap(ctype) int*, int&, int[ANY], int[] "int *"
-%typemap(ctype) const int&, const int*, const int[ANY], const int[] "const int *"
-%typemap(ctype) unsigned int "unsigned int"
-%typemap(ctype) const unsigned int "unsigned int"
-%typemap(ctype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *"
-%typemap(ctype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *"
-%typemap(ctype) int**, int*&, int*[ANY], int[ANY][ANY] "int **"
-%typemap(ctype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **"
-%typemap(ctype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **"
-%typemap(ctype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **"
-// constant pointers
-%typemap(ctype) int * const "int * const"
-%typemap(ctype) int* * const "int* * const"
-%typemap(ctype) const int* * const "const int* * const"
-%typemap(ctype) unsigned int * const "unsigned int * const"
-%typemap(ctype) unsigned int* * const "unsigned int* * const"
-%typemap(ctype) const unsigned int* * const "const unsigned int* * const"
-
-// long
-%typemap(ctype) long, const long "long"
-%typemap(ctype) long*, long&, long[ANY], long[] "long *"
-%typemap(ctype) const long&, const long*, const long[ANY], const long[] "const long *"
-%typemap(ctype) unsigned long "unsigned long"
-%typemap(ctype) const unsigned long "const unsigned long"
-%typemap(ctype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *"
-%typemap(ctype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *"
-%typemap(ctype) long**, long*&, long*[ANY], long[ANY][ANY] "long **"
-%typemap(ctype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **"
-%typemap(ctype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **"
-%typemap(ctype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **"
-// constant pointers
-%typemap(ctype) long * const "long * const"
-%typemap(ctype) long* * const "long* * const"
-%typemap(ctype) const long* * const "const long* * const"
-%typemap(ctype) unsigned long * const "unsigned long * const"
-%typemap(ctype) unsigned long* * const "unsigned long* * const"
-%typemap(ctype) const unsigned long* * const "const unsigned long* * const"
-
-// long long
-%typemap(ctype) long long, const long long "long long"
-%typemap(ctype) long long*, long long&, long long[ANY], long long[] "long long *"
-%typemap(ctype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *"
-%typemap(ctype) unsigned long long "unsigned long long"
-%typemap(ctype) const unsigned long long "const unsigned long long"
-%typemap(ctype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *"
-%typemap(ctype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *"
-%typemap(ctype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **"
-%typemap(ctype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **"
-%typemap(ctype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **"
-%typemap(ctype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **"
-// constant pointers
-%typemap(ctype) long long * const "long long * const"
-%typemap(ctype) long long* * const "long long* * const"
-%typemap(ctype) const long long* * const "const long long* * const"
-%typemap(ctype) unsigned long long * const "unsigned long long * const"
-%typemap(ctype) unsigned long long* * const "unsigned long long* * const"
-%typemap(ctype) const unsigned long long* * const "const unsigned long long* * const"
-
-// char: signed/unsigned
-%typemap(ctype) char, const char "char"
-%typemap(ctype) char*, char&, char[ANY], char[] "char *"
-%typemap(ctype) const char&, const char*, const char[ANY], const char[] "const char *"
-%typemap(ctype) char**, char*&, char*[ANY], char[ANY][ANY] "char **"
-%typemap(ctype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **"
-%typemap(ctype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **"
-%typemap(ctype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **"
-%typemap(ctype) signed char "signed char"
-%typemap(ctype) const signed char "const signed char"
-%typemap(ctype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *"
-%typemap(ctype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype"
-%typemap(ctype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **"
-%typemap(ctype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **"
-%typemap(ctype) unsigned char "unsigned char"
-%typemap(ctype) const unsigned char "const unsigned char"
-%typemap(ctype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *"
-%typemap(ctype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *"
-// constant pointers
-%typemap(ctype) char * const "char * const"
-%typemap(ctype) char* * const "char* * const"
-%typemap(ctype) const char* * const "const char* * const"
-%typemap(ctype) unsigned char * const "unsigned char * const"
-%typemap(ctype) unsigned char* * const "unsigned char* * const"
-%typemap(ctype) const unsigned char* * const "const unsigned char* * const"
-
-// float
-%typemap(ctype) float, const float "float"
-%typemap(ctype) float*, float&, float[ANY], float[] "float *"
-%typemap(ctype) const float&, const float*, const float[ANY], const float[] "const float *"
-%typemap(ctype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **"
-%typemap(ctype) const float**, const float*[ANY], const float[ANY][ANY] "const float **"
-// constant pointers
-%typemap(ctype) float * const "float * const"
-%typemap(ctype) float* * const "float* * const"
-%typemap(ctype) const float* * const "const float* * const"
-
-// double
-%typemap(ctype) double, const double "double"
-%typemap(ctype) double*, double&, double[ANY], double[] "double *"
-%typemap(ctype) const double&, const double*, const double[ANY], const double[] "const double *"
-%typemap(ctype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **"
-%typemap(ctype) const double**, const double*[ANY], const double[ANY][ANY] "const double **"
-// constant pointers
-%typemap(ctype) double * const "double * const"
-%typemap(ctype) double* * const "double* * const"
-%typemap(ctype) const double* * const "const double* * const"
-
-// size_t
-%typemap(ctype) size_t, const size_t "size_t"
-%typemap(ctype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *"
-%typemap(ctype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *"
-%typemap(ctype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **"
-%typemap(ctype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **"
-// constant pointers
-%typemap(ctype) size_t * const "size_t * const"
-%typemap(ctype) size_t* * const "size_t* * const"
-%typemap(ctype) const size_t* * const "const size_t* * const"
+explicit_same_type(ctype, short);
+explicit_same_type(ctype, unsigned short);
+explicit_same_type(ctype, int);
+explicit_same_type(ctype, unsigned int);
+explicit_same_type(ctype, long);
+explicit_same_type(ctype, unsigned long);
+explicit_same_type(ctype, long long);
+explicit_same_type(ctype, unsigned long long);
+explicit_same_type(ctype, char);
+explicit_same_type(ctype, signed char);
+explicit_same_type(ctype, unsigned char);
+explicit_same_type(ctype, float);
+explicit_same_type(ctype, double);
+explicit_same_type(ctype, size_t);
 
 // special cases of array passing - does not intended to be used for objects
 %typemap(ctype) SWIGTYPE [] "$1_ltype"

From e3f351bf4b2a1678409c1f28cde93fd623d48761 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:30:19 +0000
Subject: [PATCH 168/508] Macrofy more typemaps. Does not work yet, because
 SWIG's preprocessor seems to have problems with empty args of macros.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13655 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 567 ++++++++++++----------------------------------------
 1 file changed, 128 insertions(+), 439 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 0034e3365..bcea3b6a3 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -128,18 +128,43 @@ explicit_same_type(ctype, size_t);
 %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
 %typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const"
 
-%typemap(in) short, int, long, long long, char, float, double "$1 = ($1_ltype) $input;"
-%typemap(in) void *, short *, int *, long *, long long *, char *, float *, double * "$1 = ($1_ltype) $input;"
-%typemap(in) void **, short **, int **, long **, long long **, char **, float **, double ** "$1 = ($1_basetype **) $input;"
-%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1 = ($1_ltype) $input;"
-%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1 = ($1_ltype) $input;"
-%typemap(in) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1 = ($1_ltype) $input;"
-%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned long long *, const unsigned char * "$1 = ($1_ltype) $input;"
-%typemap(in) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1 = ($1_ltype) $input;"
-%typemap(in) short &, int &, long &, long long &, char &, float &, double &, bool & "$1 = ($1_ltype) $input;"
-%typemap(in) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1 = ($1_ltype) $input;"
-%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &  "$1 = ($1_ltype) $input;"
-%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1 = ($1_ltype) $input;"
+
+%define in_assignment_cast(PRE, POST)
+PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST, PRE float POST, PRE double POST "$1 = ($1_ltype) $input;"
+%enddef
+
+//this macro is necessary, because 'unsigned double' is not allowed.
+%define in_assignment_cast_unsigned_only(PRE, POST)
+PRE float POST, PRE double POST "$1 = ($1_ltype) $input;"
+%enddef
+
+%define in_assignment_group(PRE)
+in_assignment_cast(,);
+in_assignment_cast(,*);
+in_assignment_cast(,&);
+in_assignment_cast(,[ANY]);
+in_assignment_cast(,*&);
+in_assignment_cast(,**);
+%enddef
+
+in_assignment_group();
+in_assignment_group(const);
+in_assignment_group(signed);
+in_assignment_group(signed const);
+in_assignment_group(unsigned);
+in_assignment_group(unsigned const);
+
+in_assignment_cast_unsigned_only(,);
+in_assignment_cast_unsigned_only(,*);
+in_assignment_cast_unsigned_only(,&);
+in_assignment_cast_unsigned_only(,[ANY]);
+in_assignment_cast_unsigned_only(,**);
+in_assignment_cast_unsigned_only(,*&);
+in_assignment_cast_unsigned_only(const,);
+in_assignment_cast_unsigned_only(const,*);
+in_assignment_cast_unsigned_only(const,&);
+in_assignment_cast_unsigned_only(const,[ANY]);
+in_assignment_cast_unsigned_only(const,*&);
 
 %typemap(in) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;"
 %typemap(in) const short *&, const int *&, const long *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;"
@@ -250,144 +275,33 @@ explicit_same_type(ctype, size_t);
 %typemap(couttype) void* * const * const "void* *"
 %typemap(couttype) const void* * const "void* *"
 
-// short
-%typemap(couttype) short, const short "short"
-%typemap(couttype) short*, short&, short[ANY], short[] "short *"
-%typemap(couttype) const short&, const short*, const short[ANY], const short[] "const short *"
-%typemap(couttype) unsigned short "unsigned short"
-%typemap(couttype) const unsigned short "const unsigned short"
-%typemap(couttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *"
-%typemap(couttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *"
-%typemap(couttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **"
-%typemap(couttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **"
-%typemap(couttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **"
-%typemap(couttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **"
+//unconsted types are necessary, because some the methods using this declare variables of the resolved type first and assign their values later
+%define explicit_same_type_unconsted(TM, T)
+%typemap(TM) T, const T "T"
+%typemap(TM) T*, T&, T[ANY], T[] "T *"
+%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
+%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
+%typemap(TM) const T**, const T*&, T *const &, const T*[ANY], const T[ANY][ANY] "const T **"
 // constant pointers
-%typemap(couttype) short * const "short *"
-%typemap(couttype) short* * const "short* *"
-%typemap(couttype) const short* * const "short* *"
-%typemap(couttype) unsigned short * const "unsigned short *"
-%typemap(couttype) unsigned short* * const "unsigned short* *"
-%typemap(couttype) const unsigned short* * const "unsigned short* *"
+%typemap(TM) T * const "T *"
+%typemap(TM) T* * const "T* *"
+%typemap(TM) const T* * const "const T* *"
+%enddef
 
-// int
-%typemap(couttype) int, const int "int"
-%typemap(couttype) int*, int&, int[ANY], int[] "int *"
-%typemap(couttype) const int&, const int*, const int[ANY], const int[] "const int *"
-%typemap(couttype) unsigned int "unsigned int"
-%typemap(couttype) const unsigned int "unsigned int"
-%typemap(couttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *"
-%typemap(couttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *"
-%typemap(couttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **"
-%typemap(couttype) const int**, const int*&, int *const &, const int*[ANY], const int[ANY][ANY] "const int **"
-%typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **"
-%typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **"
-// constant pointers
-%typemap(couttype) int * const "int *"
-%typemap(couttype) int* * const "int* *"
-%typemap(couttype) const int* * const "int* *"
-%typemap(couttype) unsigned int * const "unsigned int *"
-%typemap(couttype) unsigned int* * const "unsigned int* *"
-%typemap(couttype) const unsigned int* * const "unsigned int* *"
-
-// long
-%typemap(couttype) long, const long "long"
-%typemap(couttype) long*, long&, long[ANY], long[] "long *"
-%typemap(couttype) const long&, const long*, const long[ANY], const long[] "const long *"
-%typemap(couttype) unsigned long "unsigned long"
-%typemap(couttype) const unsigned long "const unsigned long"
-%typemap(couttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *"
-%typemap(couttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *"
-%typemap(couttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **"
-%typemap(couttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **"
-%typemap(couttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **"
-%typemap(couttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **"
-// constant pointers
-%typemap(couttype) long * const "long *"
-%typemap(couttype) long* * const "long* *"
-%typemap(couttype) const long* * const "long* *"
-%typemap(couttype) unsigned long * const "unsigned long *"
-%typemap(couttype) unsigned long* * const "unsigned long* *"
-%typemap(couttype) const unsigned long* * const "unsigned long* *"
-
-// long long
-%typemap(couttype) long long, const long long "long long"
-%typemap(couttype) long long*, long long&, long long[ANY], long long[] "long long *"
-%typemap(couttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *"
-%typemap(couttype) unsigned long long "unsigned long long"
-%typemap(couttype) const unsigned long long "const unsigned long long"
-%typemap(couttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *"
-%typemap(couttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *"
-%typemap(couttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **"
-%typemap(couttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **"
-%typemap(couttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **"
-%typemap(couttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **"
-// constant pointers
-%typemap(couttype) long long * const "long long *"
-%typemap(couttype) long long* * const "long long* *"
-%typemap(couttype) const long long* * const "long long* *"
-%typemap(couttype) unsigned long long * const "unsigned long long *"
-%typemap(couttype) unsigned long long* * const "unsigned long long* *"
-%typemap(couttype) const unsigned long long* * const "unsigned long long* *"
-
-// char: signed/unsigned
-%typemap(couttype) char, const char "char"
-%typemap(couttype) char*, char&, char[ANY], char[] "char *"
-%typemap(couttype) const char&, const char*, const char[ANY], const char[] "const char *"
-%typemap(couttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **"
-%typemap(couttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **"
-%typemap(couttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **"
-%typemap(couttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **"
-%typemap(couttype) signed char "signed char"
-%typemap(couttype) const signed char "const signed char"
-%typemap(couttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *"
-%typemap(couttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype"
-%typemap(couttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **"
-%typemap(couttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **"
-%typemap(couttype) unsigned char "unsigned char"
-%typemap(couttype) const unsigned char "const unsigned char"
-%typemap(couttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *"
-%typemap(couttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *"
-// constant pointers
-%typemap(couttype) char * const "char *"
-%typemap(couttype) char* * const "char* *"
-%typemap(couttype) const char* * const "char* *"
-%typemap(couttype) unsigned char * const "unsigned char *"
-%typemap(couttype) unsigned char* * const "unsigned char* *"
-%typemap(couttype) const unsigned char* * const "unsigned char* *"
-
-// float
-%typemap(couttype) float, const float "float"
-%typemap(couttype) float*, float&, float[ANY], float[] "float *"
-%typemap(couttype) const float&, const float*, const float[ANY], const float[] "const float *"
-%typemap(couttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **"
-%typemap(couttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **"
-// constant pointers
-%typemap(couttype) float * const "float *"
-%typemap(couttype) float* * const "float* *"
-%typemap(couttype) const float* * const "float* *"
-
-// double
-%typemap(couttype) double, const double "double"
-%typemap(couttype) double*, double&, double[ANY], double[] "double *"
-%typemap(couttype) const double&, const double*, const double[ANY], const double[] "const double *"
-%typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **"
-%typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **"
-// constant pointers
-%typemap(couttype) double * const "double *"
-%typemap(couttype) double* * const "double* *"
-%typemap(couttype) const double* * const "double* *"
-
-// size_t
-%typemap(couttype) size_t, const size_t "size_t"
-%typemap(couttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *"
-%typemap(couttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *"
-%typemap(couttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **"
-%typemap(couttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **"
-// constant pointers
-%typemap(couttype) size_t * const "size_t *"
-%typemap(couttype) size_t* * const "size_t* *"
-%typemap(couttype) const size_t* * const "size_t* *"
+explicit_same_type_unconsted(couttype, short);
+explicit_same_type_unconsted(couttype, unsigned short);
+explicit_same_type_unconsted(couttype, int);
+explicit_same_type_unconsted(couttype, unsigned int);
+explicit_same_type_unconsted(couttype, long);
+explicit_same_type_unconsted(couttype, unsigned long);
+explicit_same_type_unconsted(couttype, long long);
+explicit_same_type_unconsted(couttype, unsigned long long);
+explicit_same_type_unconsted(couttype, char);
+explicit_same_type_unconsted(couttype, signed char);
+explicit_same_type_unconsted(couttype, unsigned char);
+explicit_same_type_unconsted(couttype, float);
+explicit_same_type_unconsted(couttype, double);
+explicit_same_type_unconsted(couttype, size_t);
 
 // objects
 %typemap(couttype) SWIGTYPE      "SwigObj *"
@@ -414,144 +328,20 @@ explicit_same_type(ctype, size_t);
 %typemap(proxycouttype) void* * const "void* * const"
 %typemap(proxycouttype) const void* * const "const void* * const"
 
-// short
-%typemap(proxycouttype) short, const short "short"
-%typemap(proxycouttype) short*, short&, short[ANY], short[] "short *"
-%typemap(proxycouttype) const short&, const short*, const short[ANY], const short[] "const short *"
-%typemap(proxycouttype) unsigned short "unsigned short"
-%typemap(proxycouttype) const unsigned short "const unsigned short"
-%typemap(proxycouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *"
-%typemap(proxycouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *"
-%typemap(proxycouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **"
-%typemap(proxycouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **"
-%typemap(proxycouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **"
-%typemap(proxycouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **"
-// constant pointers
-%typemap(proxycouttype) short * const "short * const"
-%typemap(proxycouttype) short* * const "short* * const"
-%typemap(proxycouttype) const short* * const "const short* * const"
-%typemap(proxycouttype) unsigned short * const "unsigned short * const"
-%typemap(proxycouttype) unsigned short* * const "unsigned short* * const"
-%typemap(proxycouttype) const unsigned short* * const "const unsigned short* * const"
-
-// int
-%typemap(proxycouttype) int, const int "int"
-%typemap(proxycouttype) int*, int&, int[ANY], int[] "int *"
-%typemap(proxycouttype) const int&, const int*, const int[ANY], const int[] "const int *"
-%typemap(proxycouttype) unsigned int "unsigned int"
-%typemap(proxycouttype) const unsigned int "unsigned int"
-%typemap(proxycouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *"
-%typemap(proxycouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *"
-%typemap(proxycouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **"
-%typemap(proxycouttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **"
-%typemap(proxycouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **"
-%typemap(proxycouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **"
-// constant pointers
-%typemap(proxycouttype) int * const "int * const"
-%typemap(proxycouttype) int* * const "int* * const"
-%typemap(proxycouttype) const int* * const "const int* * const"
-%typemap(proxycouttype) unsigned int * const "unsigned int * const"
-%typemap(proxycouttype) unsigned int* * const "unsigned int* * const"
-%typemap(proxycouttype) const unsigned int* * const "const unsigned int* * const"
-
-// long
-%typemap(proxycouttype) long, const long "long"
-%typemap(proxycouttype) long*, long&, long[ANY], long[] "long *"
-%typemap(proxycouttype) const long&, const long*, const long[ANY], const long[] "const long *"
-%typemap(proxycouttype) unsigned long "unsigned long"
-%typemap(proxycouttype) const unsigned long "const unsigned long"
-%typemap(proxycouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *"
-%typemap(proxycouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *"
-%typemap(proxycouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **"
-%typemap(proxycouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **"
-%typemap(proxycouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **"
-%typemap(proxycouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **"
-// constant pointers
-%typemap(proxycouttype) long * const "long * const"
-%typemap(proxycouttype) long* * const "long* * const"
-%typemap(proxycouttype) const long* * const "const long* * const"
-%typemap(proxycouttype) unsigned long * const "unsigned long * const"
-%typemap(proxycouttype) unsigned long* * const "unsigned long* * const"
-%typemap(proxycouttype) const unsigned long* * const "const unsigned long* * const"
-
-// long long
-%typemap(proxycouttype) long long, const long long "long long"
-%typemap(proxycouttype) long long*, long long&, long long[ANY], long long[] "long long *"
-%typemap(proxycouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *"
-%typemap(proxycouttype) unsigned long long "unsigned long long"
-%typemap(proxycouttype) const unsigned long long "const unsigned long long"
-%typemap(proxycouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *"
-%typemap(proxycouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *"
-%typemap(proxycouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **"
-%typemap(proxycouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **"
-%typemap(proxycouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **"
-%typemap(proxycouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **"
-// constant pointers
-%typemap(proxycouttype) long long * const "long long * const"
-%typemap(proxycouttype) long long* * const "long long* * const"
-%typemap(proxycouttype) const long long* * const "const long long* * const"
-%typemap(proxycouttype) unsigned long long * const "unsigned long long * const"
-%typemap(proxycouttype) unsigned long long* * const "unsigned long long* * const"
-%typemap(proxycouttype) const unsigned long long* * const "const unsigned long long* * const"
-
-// char: signed/unsigned
-%typemap(proxycouttype) char, const char "char"
-%typemap(proxycouttype) char*, char&, char[ANY], char[] "char *"
-%typemap(proxycouttype) const char&, const char*, const char[ANY], const char[] "const char *"
-%typemap(proxycouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **"
-%typemap(proxycouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **"
-%typemap(proxycouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **"
-%typemap(proxycouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **"
-%typemap(proxycouttype) signed char "signed char"
-%typemap(proxycouttype) const signed char "const signed char"
-%typemap(proxycouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *"
-%typemap(proxycouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype"
-%typemap(proxycouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **"
-%typemap(proxycouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **"
-%typemap(proxycouttype) unsigned char "unsigned char"
-%typemap(proxycouttype) const unsigned char "const unsigned char"
-%typemap(proxycouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *"
-%typemap(proxycouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *"
-// constant pointers
-%typemap(proxycouttype) char * const "char * const"
-%typemap(proxycouttype) char* * const "char* * const"
-%typemap(proxycouttype) const char* * const "const char* * const"
-%typemap(proxycouttype) unsigned char * const "unsigned char * const"
-%typemap(proxycouttype) unsigned char* * const "unsigned char* * const"
-%typemap(proxycouttype) const unsigned char* * const "const unsigned char* * const"
-
-// float
-%typemap(proxycouttype) float, const float "float"
-%typemap(proxycouttype) float*, float&, float[ANY], float[] "float *"
-%typemap(proxycouttype) const float&, const float*, const float[ANY], const float[] "const float *"
-%typemap(proxycouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **"
-%typemap(proxycouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **"
-// constant pointers
-%typemap(proxycouttype) float * const "float * const"
-%typemap(proxycouttype) float* * const "float* * const"
-%typemap(proxycouttype) const float* * const "const float* * const"
-
-// double
-%typemap(proxycouttype) double, const double "double"
-%typemap(proxycouttype) double*, double&, double[ANY], double[] "double *"
-%typemap(proxycouttype) const double&, const double*, const double[ANY], const double[] "const double *"
-%typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **"
-%typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **"
-// constant pointers
-%typemap(proxycouttype) double * const "double * const"
-%typemap(proxycouttype) double* * const "double* * const"
-%typemap(proxycouttype) const double* * const "const double* * const"
-
-// size_t
-%typemap(proxycouttype) size_t, const size_t "size_t"
-%typemap(proxycouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *"
-%typemap(proxycouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *"
-%typemap(proxycouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **"
-%typemap(proxycouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **"
-// constant pointers
-%typemap(proxycouttype) size_t * const "size_t * const"
-%typemap(proxycouttype) size_t* * const "size_t* * const"
-%typemap(proxycouttype) const size_t* * const "const size_t* * const"
+explicit_same_type(proxyccouttype, short);
+explicit_same_type(proxyccouttype, unsigned short);
+explicit_same_type(proxyccouttypeccouttype, int);
+explicit_same_type(proxyccouttype, unsigned int);
+explicit_same_type(proxyccouttype, long);
+explicit_same_type(proxyccouttype, unsigned long);
+explicit_same_type(proxyccouttype, long long);
+explicit_same_type(proxyccouttype, unsigned long long);
+explicit_same_type(proxyccouttype, char);
+explicit_same_type(proxyccouttype, signed char);
+explicit_same_type(proxyccouttype, unsigned char);
+explicit_same_type(proxyccouttype, float);
+explicit_same_type(proxyccouttype, double);
+explicit_same_type(proxyccouttype, size_t)
 
 // objects
 %typemap(proxycouttype) SWIGTYPE      "$&resolved_type*"
@@ -569,21 +359,44 @@ explicit_same_type(ctype, size_t);
 %typemap(proxycouttype, fragment="stdbool_inc") bool & "$1_basetype*"
 %typemap(proxycouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
-%typemap(out) short, int, long, long long, char, float, double "$result = $1;"
-%typemap(out) void*, short*, int*, long*, long long *, char*, float*, double* "$result = $1;"
-%typemap(out) const short, const int, const long, const long long, const char, const float, const double "$result = ($1_ltype) $1;"
-%typemap(out) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$result = ($1_ltype) $1;"
-%typemap(out) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char, signed char "$result = $1;"
-%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char *, signed char * "$result = $1;"
-%typemap(out) short &, int &, long &, long long &, char &, float &, double & "$result = $1;"
-%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &, signed char & "$result = $1;"
-%typemap(out) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$result = $1;"
-%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char &, const signed char & "$result = $1;"
-%typemap(out) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$result = $1;"
-%typemap(out) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$result = $1;"
-%typemap(out) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$result = $1;"
-%typemap(out) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$result = $1;"
-%typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;"
+
+%define out_assignment_no_cast(PRE, POST)
+PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST, PRE float POST, PRE double POST "$result = $1;"
+%enddef
+
+//this macro is necessary, because 'unsigned double' is not allowed.
+%define out_assignment_no_cast_unsigned_only(PRE, POST)
+PRE float POST, PRE double POST "$result = $1;"
+%enddef
+
+%define out_assignment_group(PRE)
+out_assignment_no_cast(,);
+out_assignment_no_cast(,*);
+out_assignment_no_cast(,&);
+out_assignment_no_cast(,[ANY]);
+out_assignment_no_cast(,*&);
+out_assignment_no_cast(,**);
+%enddef
+
+out_assignment_group();
+out_assignment_group(const);
+out_assignment_group(signed);
+out_assignment_group(signed const);
+out_assignment_group(unsigned);
+out_assignment_group(unsigned const);
+
+out_assignment_no_cast_unsigned_only(,);
+out_assignment_no_cast_unsigned_only(,*);
+out_assignment_no_cast_unsigned_only(,&);
+out_assignment_no_cast_unsigned_only(,[ANY]);
+out_assignment_no_cast_unsigned_only(,**);
+out_assignment_no_cast_unsigned_only(,*&);
+out_assignment_no_cast_unsigned_only(const,);
+out_assignment_no_cast_unsigned_only(const,*);
+out_assignment_no_cast_unsigned_only(const,&);
+out_assignment_no_cast_unsigned_only(const,[ANY]);
+out_assignment_no_cast_unsigned_only(const,*&);
+
 %typemap(out) void ""
 
 // constant pointers
@@ -660,144 +473,20 @@ explicit_same_type(ctype, size_t);
 %typemap(cppouttype) void* * const * const "void* *"
 %typemap(cppouttype) const void* * const "const void* *"
 
-// short
-%typemap(cppouttype) short, const short "short"
-%typemap(cppouttype) short*, short&, short[ANY], short[] "short *"
-%typemap(cppouttype) const short&, const short*, const short[ANY], const short[] "const short *"
-%typemap(cppouttype) unsigned short "unsigned short"
-%typemap(cppouttype) const unsigned short "const unsigned short"
-%typemap(cppouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *"
-%typemap(cppouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *"
-%typemap(cppouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **"
-%typemap(cppouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **"
-%typemap(cppouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **"
-%typemap(cppouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **"
-// constant pointers
-%typemap(cppouttype) short * const "short *"
-%typemap(cppouttype) short* * const "short* *"
-%typemap(cppouttype) const short* * const "const short* *"
-%typemap(cppouttype) unsigned short * const "unsigned short *"
-%typemap(cppouttype) unsigned short* * const "unsigned short* *"
-%typemap(cppouttype) const unsigned short* * const "const unsigned short* *"
-
-// int
-%typemap(cppouttype) int, const int "int"
-%typemap(cppouttype) int*, int&, int[ANY], int[] "int *"
-%typemap(cppouttype) const int&, const int*, const int[ANY], const int[] "const int *"
-%typemap(cppouttype) unsigned int "unsigned int"
-%typemap(cppouttype) const unsigned int "unsigned int"
-%typemap(cppouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *"
-%typemap(cppouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *"
-%typemap(cppouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **"
-%typemap(cppouttype) const int**, const int*&, int const **, int *const &, const int*[ANY], const int[ANY][ANY] "const int **"
-%typemap(cppouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **"
-%typemap(cppouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **"
-// constant pointers
-%typemap(cppouttype) int * const "int *"
-%typemap(cppouttype) int* * const "int* *"
-%typemap(cppouttype) const int* * const "int* *"
-%typemap(cppouttype) unsigned int * const "unsigned int *"
-%typemap(cppouttype) unsigned int* * const "unsigned int* *"
-%typemap(cppouttype) const unsigned int* * const "unsigned int* *"
-
-// long
-%typemap(cppouttype) long, const long "long"
-%typemap(cppouttype) long*, long&, long[ANY], long[] "long *"
-%typemap(cppouttype) const long&, const long*, const long[ANY], const long[] "const long *"
-%typemap(cppouttype) unsigned long "unsigned long"
-%typemap(cppouttype) const unsigned long "const unsigned long"
-%typemap(cppouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *"
-%typemap(cppouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *"
-%typemap(cppouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **"
-%typemap(cppouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **"
-%typemap(cppouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **"
-%typemap(cppouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **"
-// constant pointers
-%typemap(cppouttype) long * const "long *"
-%typemap(cppouttype) long* * const "long* *"
-%typemap(cppouttype) const long* * const "long* *"
-%typemap(cppouttype) unsigned long * const "unsigned long *"
-%typemap(cppouttype) unsigned long* * const "unsigned long* *"
-%typemap(cppouttype) const unsigned long* * const "unsigned long* *"
-
-// long long
-%typemap(cppouttype) long long, const long long "long long"
-%typemap(cppouttype) long long*, long long&, long long[ANY], long long[] "long long *"
-%typemap(cppouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *"
-%typemap(cppouttype) unsigned long long "unsigned long long"
-%typemap(cppouttype) const unsigned long long "const unsigned long long"
-%typemap(cppouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *"
-%typemap(cppouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *"
-%typemap(cppouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **"
-%typemap(cppouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **"
-%typemap(cppouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **"
-%typemap(cppouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **"
-// constant pointers
-%typemap(cppouttype) long long * const "long long *"
-%typemap(cppouttype) long long* * const "long long* *"
-%typemap(cppouttype) const long long* * const "long long* *"
-%typemap(cppouttype) unsigned long long * const "unsigned long long *"
-%typemap(cppouttype) unsigned long long* * const "unsigned long long* *"
-%typemap(cppouttype) const unsigned long long* * const "unsigned long long* *"
-
-// char: signed/unsigned
-%typemap(cppouttype) char, const char "char"
-%typemap(cppouttype) char*, char&, char[ANY], char[] "char *"
-%typemap(cppouttype) const char&, const char*, const char[ANY], const char[] "const char *"
-%typemap(cppouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **"
-%typemap(cppouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **"
-%typemap(cppouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **"
-%typemap(cppouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **"
-%typemap(cppouttype) signed char "signed char"
-%typemap(cppouttype) const signed char "const signed char"
-%typemap(cppouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *"
-%typemap(cppouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype"
-%typemap(cppouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **"
-%typemap(cppouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **"
-%typemap(cppouttype) unsigned char "unsigned char"
-%typemap(cppouttype) const unsigned char "const unsigned char"
-%typemap(cppouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *"
-%typemap(cppouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *"
-// constant pointers
-%typemap(cppouttype) char * const "char *"
-%typemap(cppouttype) char* * const "char* *"
-%typemap(cppouttype) const char* * const "char* *"
-%typemap(cppouttype) unsigned char * const "unsigned char *"
-%typemap(cppouttype) unsigned char* * const "unsigned char* *"
-%typemap(cppouttype) const unsigned char* * const "unsigned char* *"
-
-// float
-%typemap(cppouttype) float, const float "float"
-%typemap(cppouttype) float*, float&, float[ANY], float[] "float *"
-%typemap(cppouttype) const float&, const float*, const float[ANY], const float[] "const float *"
-%typemap(cppouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **"
-%typemap(cppouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **"
-// constant pointers
-%typemap(cppouttype) float * const "float *"
-%typemap(cppouttype) float* * const "float* *"
-%typemap(cppouttype) const float* * const "float* *"
-
-// double
-%typemap(cppouttype) double, const double "double"
-%typemap(cppouttype) double*, double&, double[ANY], double[] "double *"
-%typemap(cppouttype) const double&, const double*, const double[ANY], const double[] "const double *"
-%typemap(cppouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **"
-%typemap(cppouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **"
-// constant pointers
-%typemap(cppouttype) double * const "double *"
-%typemap(cppouttype) double* * const "double* *"
-%typemap(cppouttype) const double* * const "double* *"
-
-// size_t
-%typemap(cppouttype) size_t, const size_t "size_t"
-%typemap(cppouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *"
-%typemap(cppouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *"
-%typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **"
-%typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **"
-// constant pointers
-%typemap(cppouttype) size_t * const "size_t *"
-%typemap(cppouttype) size_t* * const "size_t* *"
-%typemap(cppouttype) const size_t* * const "size_t* *"
+explicit_same_type_unconsted(cppouttype, short);
+explicit_same_type_unconsted(cppouttype, unsigned short);
+explicit_same_type_unconsted(cppouttype, int);
+explicit_same_type_unconsted(cppouttype, unsigned int);
+explicit_same_type_unconsted(cppouttype, long);
+explicit_same_type_unconsted(cppouttype, unsigned long);
+explicit_same_type_unconsted(cppouttype, long long);
+explicit_same_type_unconsted(cppouttype, unsigned long long);
+explicit_same_type_unconsted(cppouttype, char);
+explicit_same_type_unconsted(cppouttype, signed char);
+explicit_same_type_unconsted(cppouttype, unsigned char);
+explicit_same_type_unconsted(cppouttype, float);
+explicit_same_type_unconsted(cppouttype, double);
+explicit_same_type_unconsted(cppouttype, size_t);
 
 %typemap(cppouttype, retobj="1") SWIGTYPE      "$1_ltype *"
 %typemap(cppouttype) SWIGTYPE *    "$1_ltype"

From 04efe5fe661078ef0109db08120fa1df19a5e82a Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:31:35 +0000
Subject: [PATCH 169/508] Remove old (and commented out) region about template
 typemaps.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13656 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index bcea3b6a3..7ac0e7bd8 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -504,16 +504,6 @@ explicit_same_type_unconsted(cppouttype, size_t);
 %typemap(cppouttype, fragment="stdbool_inc") bool & "$1_basetype*"
 %typemap(cppouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
-// templates typemaps - in progress...
-/*
-%typemap(ctype) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "SwigObj *"
-%typemap(in) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * { $1 = ($1_ltype) $input; }
-
-%typemap(out) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "$result = ($1_ltype) $1;"
-
-%typemap(cppouttype) SWIGTYPE, const SWIGTYPE &, const SWIGTYPE * "$1_ltype"
-*/
-
 #ifdef SWIG_CPPMODE
 
   #ifdef SWIG_C_EXCEPT

From 032c12b70eab531d27898fbb8d00a5c499c5cb47 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:58:22 +0000
Subject: [PATCH 170/508] move signed char to the group of types for which no
 unsigned exist

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13657 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 7ac0e7bd8..b1a35e830 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -135,7 +135,7 @@ PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST,
 
 //this macro is necessary, because 'unsigned double' is not allowed.
 %define in_assignment_cast_unsigned_only(PRE, POST)
-PRE float POST, PRE double POST "$1 = ($1_ltype) $input;"
+PRE float POST, PRE double POST, PRE signed char POST "$1 = ($1_ltype) $input;"
 %enddef
 
 %define in_assignment_group(PRE)
@@ -149,8 +149,6 @@ in_assignment_cast(,**);
 
 in_assignment_group();
 in_assignment_group(const);
-in_assignment_group(signed);
-in_assignment_group(signed const);
 in_assignment_group(unsigned);
 in_assignment_group(unsigned const);
 
@@ -366,7 +364,7 @@ PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST,
 
 //this macro is necessary, because 'unsigned double' is not allowed.
 %define out_assignment_no_cast_unsigned_only(PRE, POST)
-PRE float POST, PRE double POST "$result = $1;"
+PRE float POST, PRE double POST, PRE signed char POST "$result = $1;"
 %enddef
 
 %define out_assignment_group(PRE)
@@ -380,8 +378,6 @@ out_assignment_no_cast(,**);
 
 out_assignment_group();
 out_assignment_group(const);
-out_assignment_group(signed);
-out_assignment_group(signed const);
 out_assignment_group(unsigned);
 out_assignment_group(unsigned const);
 

From 6b0403c33cd4c5bfb5664a3c459edad4765998bc Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:58:33 +0000
Subject: [PATCH 171/508] Fix missing macro argument usage due to copy&pasta

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13658 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index b1a35e830..64a12b212 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -139,12 +139,12 @@ PRE float POST, PRE double POST, PRE signed char POST "$1 = ($1_ltype) $input;"
 %enddef
 
 %define in_assignment_group(PRE)
-in_assignment_cast(,);
-in_assignment_cast(,*);
-in_assignment_cast(,&);
-in_assignment_cast(,[ANY]);
-in_assignment_cast(,*&);
-in_assignment_cast(,**);
+in_assignment_cast(PRE,);
+in_assignment_cast(PRE,*);
+in_assignment_cast(PRE,&);
+in_assignment_cast(PRE,[ANY]);
+in_assignment_cast(PRE,*&);
+in_assignment_cast(PRE,**);
 %enddef
 
 in_assignment_group();
@@ -368,12 +368,12 @@ PRE float POST, PRE double POST, PRE signed char POST "$result = $1;"
 %enddef
 
 %define out_assignment_group(PRE)
-out_assignment_no_cast(,);
-out_assignment_no_cast(,*);
-out_assignment_no_cast(,&);
-out_assignment_no_cast(,[ANY]);
-out_assignment_no_cast(,*&);
-out_assignment_no_cast(,**);
+out_assignment_no_cast(PRE,);
+out_assignment_no_cast(PRE,*);
+out_assignment_no_cast(PRE,&);
+out_assignment_no_cast(PRE,[ANY]);
+out_assignment_no_cast(PRE,*&);
+out_assignment_no_cast(PRE,**);
 %enddef
 
 out_assignment_group();

From dc9b3c01ff2e49d5be615b73842979d96b09e266 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 23:58:44 +0000
Subject: [PATCH 172/508] Removed leftovers from macrofication.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13659 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 64a12b212..ca60e4781 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -164,8 +164,6 @@ in_assignment_cast_unsigned_only(const,&);
 in_assignment_cast_unsigned_only(const,[ANY]);
 in_assignment_cast_unsigned_only(const,*&);
 
-%typemap(in) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;"
-%typemap(in) const short *&, const int *&, const long *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;"
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
 

From adb9b16167a0a5d9f89c53647ccfd8125cb5a5cd Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 13:50:20 +0000
Subject: [PATCH 173/508] Fix typo

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13664 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index ca60e4781..29b676414 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -326,7 +326,7 @@ explicit_same_type_unconsted(couttype, size_t);
 
 explicit_same_type(proxyccouttype, short);
 explicit_same_type(proxyccouttype, unsigned short);
-explicit_same_type(proxyccouttypeccouttype, int);
+explicit_same_type(proxyccouttype, int);
 explicit_same_type(proxyccouttype, unsigned int);
 explicit_same_type(proxyccouttype, long);
 explicit_same_type(proxyccouttype, unsigned long);

From a94ef7b1bea24b7eff81f13814897bf6f0d1edca Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 13:50:32 +0000
Subject: [PATCH 174/508] Remove void arrays.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13665 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 29b676414..65fac7a5c 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -43,10 +43,10 @@
 
 // void
 %typemap(proxy) void "void"
-%typemap(proxy) void*, void&, void[ANY], void[] "void *"
-%typemap(proxy) const void&, const void*, const void[ANY], const void[] "const void *"
-%typemap(proxy) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
-%typemap(proxy) const void**, const void*&, const void*[ANY], const void[ANY][ANY] "const void **"
+%typemap(proxy) void*, void& "void *"
+%typemap(proxy) const void&, const void* "const void *"
+%typemap(proxy) void**, void*& "void **"
+%typemap(proxy) const void**, const void*& "const void **"
 // constant pointers
 %typemap(proxy) void* * const "void* * const"
 %typemap(proxy) const void* * const "const void* * const"
@@ -85,10 +85,10 @@ explicit_same_type(proxy, size_t);
 // typemaps for function parameters
 // void
 %typemap(ctype) void "void"
-%typemap(ctype) void*, void&, void[ANY], void[] "void *"
-%typemap(ctype) const void&, const void*, const void[ANY], const void[] "const void *"
+%typemap(ctype) void*, void& "void *"
+%typemap(ctype) const void&, const void* "const void *"
 %typemap(ctype) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
-%typemap(ctype) const void**, const void*&, const void*[ANY], const void[ANY][ANY] "const void **"
+%typemap(ctype) const void**, const void*& "const void **"
 // constant pointers
 %typemap(ctype) void* * const "void* * const"
 %typemap(ctype) const void* * const "const void* * const"
@@ -113,7 +113,7 @@ explicit_same_type(ctype, size_t);
 %typemap(ctype) SWIGTYPE [] "$1_ltype"
 %typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **"
 
-%typemap(ctype) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype"
+%typemap(ctype) short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype"
 %typemap(ctype) SWIGTYPE         "SwigObj *"
 %typemap(ctype) SWIGTYPE *       "SwigObj *"
 %typemap(ctype) SWIGTYPE &       "SwigObj *"
@@ -139,7 +139,7 @@ PRE float POST, PRE double POST, PRE signed char POST "$1 = ($1_ltype) $input;"
 %enddef
 
 %define in_assignment_group(PRE)
-in_assignment_cast(PRE,);
+in_assignment_cast(PRE,empty_macro_arg);
 in_assignment_cast(PRE,*);
 in_assignment_cast(PRE,&);
 in_assignment_cast(PRE,[ANY]);
@@ -147,7 +147,7 @@ in_assignment_cast(PRE,*&);
 in_assignment_cast(PRE,**);
 %enddef
 
-in_assignment_group();
+in_assignment_group(empty_macro_arg);
 in_assignment_group(const);
 in_assignment_group(unsigned);
 in_assignment_group(unsigned const);
@@ -165,7 +165,7 @@ in_assignment_cast_unsigned_only(const,[ANY]);
 in_assignment_cast_unsigned_only(const,*&);
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
-%typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
+%typemap(in) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
 
 // constant pointers
 %typemap(in) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1 = ($1_ltype) $input;"

From 4c1b189d726568136dc6bed8e1439b22ea484530 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 13:50:44 +0000
Subject: [PATCH 175/508] Remove void 'cppouttype' typemap. Doesn't make sense.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13666 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 65fac7a5c..ddb95724a 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -459,14 +459,6 @@ out_assignment_no_cast_unsigned_only(const,*&);
 }
 
 // typemaps for 'cppresult'
-// void
-%typemap(cppouttype) void "void"
-%typemap(cppouttype) void*, const void* "void *"
-// constant pointers
-%typemap(cppouttype) void * const "void * const"
-%typemap(cppouttype) void* * const * const "void* *"
-%typemap(cppouttype) const void* * const "const void* *"
-
 explicit_same_type_unconsted(cppouttype, short);
 explicit_same_type_unconsted(cppouttype, unsigned short);
 explicit_same_type_unconsted(cppouttype, int);

From 87644d282b61b347a7443d1f7c43dc8ca98184ab Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 20:00:14 +0000
Subject: [PATCH 176/508] Remove line that is already covered by macro.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13669 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index ddb95724a..c8c7e25c2 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -113,7 +113,6 @@ explicit_same_type(ctype, size_t);
 %typemap(ctype) SWIGTYPE [] "$1_ltype"
 %typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **"
 
-%typemap(ctype) short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype"
 %typemap(ctype) SWIGTYPE         "SwigObj *"
 %typemap(ctype) SWIGTYPE *       "SwigObj *"
 %typemap(ctype) SWIGTYPE &       "SwigObj *"

From 89725492f2e50c8706f80790ed3c740bf080c08a Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 20:00:28 +0000
Subject: [PATCH 177/508] Revert lines, which weren't meant to get in.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13670 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index c8c7e25c2..f73897042 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -138,7 +138,7 @@ PRE float POST, PRE double POST, PRE signed char POST "$1 = ($1_ltype) $input;"
 %enddef
 
 %define in_assignment_group(PRE)
-in_assignment_cast(PRE,empty_macro_arg);
+in_assignment_cast(PRE,);
 in_assignment_cast(PRE,*);
 in_assignment_cast(PRE,&);
 in_assignment_cast(PRE,[ANY]);
@@ -146,7 +146,7 @@ in_assignment_cast(PRE,*&);
 in_assignment_cast(PRE,**);
 %enddef
 
-in_assignment_group(empty_macro_arg);
+in_assignment_group();
 in_assignment_group(const);
 in_assignment_group(unsigned);
 in_assignment_group(unsigned const);

From f9c0e104e681b9144701242100f5ca59186ce09c Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 21:08:12 +0000
Subject: [PATCH 178/508] Move '[const] T const **' and 'size_t' of 'in'
 typemap into macros

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13671 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index f73897042..270dadfdf 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -134,7 +134,7 @@ PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST,
 
 //this macro is necessary, because 'unsigned double' is not allowed.
 %define in_assignment_cast_unsigned_only(PRE, POST)
-PRE float POST, PRE double POST, PRE signed char POST "$1 = ($1_ltype) $input;"
+PRE float POST, PRE double POST, PRE signed char POST, PRE size_t POST "$1 = ($1_ltype) $input;"
 %enddef
 
 %define in_assignment_group(PRE)
@@ -144,6 +144,7 @@ in_assignment_cast(PRE,&);
 in_assignment_cast(PRE,[ANY]);
 in_assignment_cast(PRE,*&);
 in_assignment_cast(PRE,**);
+in_assignment_cast(PRE,** const);
 %enddef
 
 in_assignment_group();
@@ -157,30 +158,18 @@ in_assignment_cast_unsigned_only(,&);
 in_assignment_cast_unsigned_only(,[ANY]);
 in_assignment_cast_unsigned_only(,**);
 in_assignment_cast_unsigned_only(,*&);
+in_assignment_cast_unsigned_only(,** const);
 in_assignment_cast_unsigned_only(const,);
 in_assignment_cast_unsigned_only(const,*);
 in_assignment_cast_unsigned_only(const,&);
 in_assignment_cast_unsigned_only(const,[ANY]);
 in_assignment_cast_unsigned_only(const,*&);
+in_assignment_cast_unsigned_only(const,**);
+in_assignment_cast_unsigned_only(const,** const);
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
 
-// constant pointers
-%typemap(in) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1 = ($1_ltype) $input;"
-%typemap(in) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1 = ($1_ltype) $input;"
-
-// size_t
-%typemap(in) size_t, const size_t "$1 = (size_t) $input;"
-%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$1 = (size_t *) $input;"
-%typemap(in) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$1 = (const size_t *) &$input;"
-%typemap(in) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$1 = (size_t **) $input;"
-%typemap(in) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$1 = (const size_t **) $input;"
-// constant pointers
-%typemap(in) size_t * const "$1 = (size_t) $input;"
-%typemap(in) size_t* * const "$1 = (size_t *) $input;"
-%typemap(in) const size_t* * const "$1 = (const size_t **) $input;"
-
 %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;"
 %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;"
 %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;"

From e01955d0ffac5daf72c8d7f41c2c62cac6b53680 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sun, 19 Aug 2012 21:08:23 +0000
Subject: [PATCH 179/508] Move '[const] T ** const' and size_t of 'out' typemap
 into macros

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13672 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 270dadfdf..dad393aea 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -350,7 +350,7 @@ PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST,
 
 //this macro is necessary, because 'unsigned double' is not allowed.
 %define out_assignment_no_cast_unsigned_only(PRE, POST)
-PRE float POST, PRE double POST, PRE signed char POST "$result = $1;"
+PRE float POST, PRE double POST, PRE signed char POST, PRE size_t POST "$result = $1;"
 %enddef
 
 %define out_assignment_group(PRE)
@@ -360,6 +360,7 @@ out_assignment_no_cast(PRE,&);
 out_assignment_no_cast(PRE,[ANY]);
 out_assignment_no_cast(PRE,*&);
 out_assignment_no_cast(PRE,**);
+out_assignment_no_cast(PRE,** const);
 %enddef
 
 out_assignment_group();
@@ -372,30 +373,17 @@ out_assignment_no_cast_unsigned_only(,*);
 out_assignment_no_cast_unsigned_only(,&);
 out_assignment_no_cast_unsigned_only(,[ANY]);
 out_assignment_no_cast_unsigned_only(,**);
+out_assignment_no_cast_unsigned_only(,** const);
 out_assignment_no_cast_unsigned_only(,*&);
 out_assignment_no_cast_unsigned_only(const,);
 out_assignment_no_cast_unsigned_only(const,*);
 out_assignment_no_cast_unsigned_only(const,&);
 out_assignment_no_cast_unsigned_only(const,[ANY]);
 out_assignment_no_cast_unsigned_only(const,*&);
+out_assignment_no_cast_unsigned_only(const,**);
 
 %typemap(out) void ""
 
-// constant pointers
-%typemap(out) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$result = ($1_ltype) $1;"
-%typemap(out) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$result = ($1_ltype) $1;"
-
-// size_t
-%typemap(out) size_t, const size_t "$result = (size_t) $1;"
-%typemap(out) size_t*, size_t&, size_t[ANY], size_t[] "$result = (size_t *) $1;"
-%typemap(out) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$result = (const size_t *) &$1;"
-%typemap(out) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$result = (size_t **) $1;"
-%typemap(out) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$result = (const size_t **) $1;"
-// constant pointers
-%typemap(out) size_t * const "$result = (size_t) $1;"
-%typemap(out) size_t* * const "$result = (size_t *) $1;"
-%typemap(out) const size_t* * const "$result = (const size_t **) $1;"
-
 %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;"
 %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;"
 

From 7fc64478b01966598cc419ea5975c27d74979192 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 00:04:57 +0000
Subject: [PATCH 180/508] Base macros on types rather than on qualifiers.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13673 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 100 +++++++++++++++++-----------------------------------
 1 file changed, 33 insertions(+), 67 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index dad393aea..f0495648c 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -27,6 +27,37 @@
 %fragment("fptr_decl_proxy", "proxy_header") {typedef void(*SWIG_CPP_FP)();}
 %fragment("stdbool_inc", "proxy_header") {#include }
 
+//used by 'in' and 'out' typemaps
+%define same_action(TM, T, ACTION)
+%typemap(TM) T, const T ACTION
+%typemap(TM) T*, T&, T[ANY], T[] ACTION
+%typemap(TM) const T&, const T*, const T[ANY], const T[] ACTION
+%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] ACTION
+%typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] ACTION
+// constant pointers
+%typemap(TM) T * const ACTION
+%typemap(TM) T* * const ACTION
+%typemap(TM) const T* * const ACTION
+%enddef
+
+%define same_action_all_primitive_types(TM, ACTION)
+same_action(TM, short, ACTION);
+same_action(TM, unsigned short, ACTION);
+same_action(TM, int, ACTION);
+same_action(TM, unsigned int, ACTION);
+same_action(TM, long, ACTION);
+same_action(TM, unsigned long, ACTION);
+same_action(TM, long long, ACTION);
+same_action(TM, unsigned long long, ACTION);
+same_action(TM, char, ACTION);
+same_action(TM, signed char, ACTION);
+same_action(TM, unsigned char, ACTION);
+//unsigned only
+same_action(TM, float, ACTION);
+same_action(TM, double, ACTION);
+same_action(TM, size_t, ACTION);
+%enddef
+
 // typemaps for proxy function parameters
 
 %define explicit_same_type(TM, T)
@@ -137,35 +168,7 @@ PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST,
 PRE float POST, PRE double POST, PRE signed char POST, PRE size_t POST "$1 = ($1_ltype) $input;"
 %enddef
 
-%define in_assignment_group(PRE)
-in_assignment_cast(PRE,);
-in_assignment_cast(PRE,*);
-in_assignment_cast(PRE,&);
-in_assignment_cast(PRE,[ANY]);
-in_assignment_cast(PRE,*&);
-in_assignment_cast(PRE,**);
-in_assignment_cast(PRE,** const);
-%enddef
-
-in_assignment_group();
-in_assignment_group(const);
-in_assignment_group(unsigned);
-in_assignment_group(unsigned const);
-
-in_assignment_cast_unsigned_only(,);
-in_assignment_cast_unsigned_only(,*);
-in_assignment_cast_unsigned_only(,&);
-in_assignment_cast_unsigned_only(,[ANY]);
-in_assignment_cast_unsigned_only(,**);
-in_assignment_cast_unsigned_only(,*&);
-in_assignment_cast_unsigned_only(,** const);
-in_assignment_cast_unsigned_only(const,);
-in_assignment_cast_unsigned_only(const,*);
-in_assignment_cast_unsigned_only(const,&);
-in_assignment_cast_unsigned_only(const,[ANY]);
-in_assignment_cast_unsigned_only(const,*&);
-in_assignment_cast_unsigned_only(const,**);
-in_assignment_cast_unsigned_only(const,** const);
+same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
@@ -343,44 +346,7 @@ explicit_same_type(proxyccouttype, size_t)
 %typemap(proxycouttype, fragment="stdbool_inc") bool & "$1_basetype*"
 %typemap(proxycouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
-
-%define out_assignment_no_cast(PRE, POST)
-PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST, PRE float POST, PRE double POST "$result = $1;"
-%enddef
-
-//this macro is necessary, because 'unsigned double' is not allowed.
-%define out_assignment_no_cast_unsigned_only(PRE, POST)
-PRE float POST, PRE double POST, PRE signed char POST, PRE size_t POST "$result = $1;"
-%enddef
-
-%define out_assignment_group(PRE)
-out_assignment_no_cast(PRE,);
-out_assignment_no_cast(PRE,*);
-out_assignment_no_cast(PRE,&);
-out_assignment_no_cast(PRE,[ANY]);
-out_assignment_no_cast(PRE,*&);
-out_assignment_no_cast(PRE,**);
-out_assignment_no_cast(PRE,** const);
-%enddef
-
-out_assignment_group();
-out_assignment_group(const);
-out_assignment_group(unsigned);
-out_assignment_group(unsigned const);
-
-out_assignment_no_cast_unsigned_only(,);
-out_assignment_no_cast_unsigned_only(,*);
-out_assignment_no_cast_unsigned_only(,&);
-out_assignment_no_cast_unsigned_only(,[ANY]);
-out_assignment_no_cast_unsigned_only(,**);
-out_assignment_no_cast_unsigned_only(,** const);
-out_assignment_no_cast_unsigned_only(,*&);
-out_assignment_no_cast_unsigned_only(const,);
-out_assignment_no_cast_unsigned_only(const,*);
-out_assignment_no_cast_unsigned_only(const,&);
-out_assignment_no_cast_unsigned_only(const,[ANY]);
-out_assignment_no_cast_unsigned_only(const,*&);
-out_assignment_no_cast_unsigned_only(const,**);
+same_action_all_primitive_types(out, "$result = $1;")
 
 %typemap(out) void ""
 

From a932e9eb8a03c92f2c4c849e88b01c083a681040 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 00:05:24 +0000
Subject: [PATCH 181/508] Rename internal macro.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13674 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index f0495648c..d649c6d3a 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -40,7 +40,7 @@
 %typemap(TM) const T* * const ACTION
 %enddef
 
-%define same_action_all_primitive_types(TM, ACTION)
+%define same_action_all_primitive_types_but_void(TM, ACTION)
 same_action(TM, short, ACTION);
 same_action(TM, unsigned short, ACTION);
 same_action(TM, int, ACTION);
@@ -168,7 +168,7 @@ PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST,
 PRE float POST, PRE double POST, PRE signed char POST, PRE size_t POST "$1 = ($1_ltype) $input;"
 %enddef
 
-same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
+same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
@@ -346,7 +346,7 @@ explicit_same_type(proxyccouttype, size_t)
 %typemap(proxycouttype, fragment="stdbool_inc") bool & "$1_basetype*"
 %typemap(proxycouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
-same_action_all_primitive_types(out, "$result = $1;")
+same_action_all_primitive_types_but_void(out, "$result = $1;")
 
 %typemap(out) void ""
 

From b7699ce14a17fc8970e29ee3dabbd8fe661464d3 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 00:05:43 +0000
Subject: [PATCH 182/508] Use macros even more.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13675 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 153 ++++++++++++++++++++--------------------------------
 1 file changed, 57 insertions(+), 96 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index d649c6d3a..d1daeba8b 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -27,6 +27,58 @@
 %fragment("fptr_decl_proxy", "proxy_header") {typedef void(*SWIG_CPP_FP)();}
 %fragment("stdbool_inc", "proxy_header") {#include }
 
+%define same_macro_all_primitive_types_but_void(macro_name, TM)
+macro_name(TM, short);
+macro_name(TM, unsigned short);
+macro_name(TM, int);
+macro_name(TM, unsigned int);
+macro_name(TM, long);
+macro_name(TM, unsigned long);
+macro_name(TM, long long);
+macro_name(TM, unsigned long long);
+macro_name(TM, char);
+macro_name(TM, signed char);
+macro_name(TM, unsigned char);
+macro_name(TM, float);
+macro_name(TM, double);
+macro_name(TM, size_t);
+%enddef
+
+//unconsted types are necessary, because some the methods using this declare variables of the resolved type first and assign their values later
+//used by 'couttype' and 'cppouttype' typemaps
+%define explicit_same_type_unconsted(TM, T)
+%typemap(TM) T, const T "T"
+%typemap(TM) T*, T&, T[ANY], T[] "T *"
+%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
+%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
+%typemap(TM) const T**, const T*&, T *const &, const T*[ANY], const T[ANY][ANY] "const T **"
+// constant pointers
+%typemap(TM) T * const "T *"
+%typemap(TM) T* * const "T* *"
+%typemap(TM) const T* * const "const T* *"
+%enddef
+
+%define explicit_same_type_unconsted_all_primitive_types_but_void(TM)
+same_macro_all_primitive_types_but_void(explicit_same_type_unconsted,TM);
+%enddef
+
+//used by 'proxy', 'proxycouttype'
+%define explicit_same_type(TM, T)
+%typemap(TM) T, const T "T"
+%typemap(TM) T*, T&, T[ANY], T[] "T *"
+%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
+%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
+%typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] "const T **"
+// constant pointers
+%typemap(TM) T * const "T * const"
+%typemap(TM) T* * const "T* * const"
+%typemap(TM) const T* * const "const T* * const"
+%enddef
+
+%define explicit_same_type_all_primitive_types_but_void(TM)
+same_macro_all_primitive_types_but_void(explicit_same_type,TM);
+%enddef
+
 //used by 'in' and 'out' typemaps
 %define same_action(TM, T, ACTION)
 %typemap(TM) T, const T ACTION
@@ -60,18 +112,6 @@ same_action(TM, size_t, ACTION);
 
 // typemaps for proxy function parameters
 
-%define explicit_same_type(TM, T)
-%typemap(TM) T, const T "T"
-%typemap(TM) T*, T&, T[ANY], T[] "T *"
-%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
-%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
-%typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] "const T **"
-// constant pointers
-%typemap(TM) T * const "T * const"
-%typemap(TM) T* * const "T* * const"
-%typemap(TM) const T* * const "const T* * const"
-%enddef
-
 // void
 %typemap(proxy) void "void"
 %typemap(proxy) void*, void& "void *"
@@ -82,20 +122,7 @@ same_action(TM, size_t, ACTION);
 %typemap(proxy) void* * const "void* * const"
 %typemap(proxy) const void* * const "const void* * const"
 
-explicit_same_type(proxy, short);
-explicit_same_type(proxy, unsigned short);
-explicit_same_type(proxy, int);
-explicit_same_type(proxy, unsigned int);
-explicit_same_type(proxy, long);
-explicit_same_type(proxy, unsigned long);
-explicit_same_type(proxy, long long);
-explicit_same_type(proxy, unsigned long long);
-explicit_same_type(proxy, char);
-explicit_same_type(proxy, signed char);
-explicit_same_type(proxy, unsigned char);
-explicit_same_type(proxy, float);
-explicit_same_type(proxy, double);
-explicit_same_type(proxy, size_t);
+explicit_same_type_all_primitive_types_but_void(proxy);
 
 // objects
 %typemap(proxy) SWIGTYPE      "$&resolved_type*"
@@ -124,21 +151,7 @@ explicit_same_type(proxy, size_t);
 %typemap(ctype) void* * const "void* * const"
 %typemap(ctype) const void* * const "const void* * const"
 
-
-explicit_same_type(ctype, short);
-explicit_same_type(ctype, unsigned short);
-explicit_same_type(ctype, int);
-explicit_same_type(ctype, unsigned int);
-explicit_same_type(ctype, long);
-explicit_same_type(ctype, unsigned long);
-explicit_same_type(ctype, long long);
-explicit_same_type(ctype, unsigned long long);
-explicit_same_type(ctype, char);
-explicit_same_type(ctype, signed char);
-explicit_same_type(ctype, unsigned char);
-explicit_same_type(ctype, float);
-explicit_same_type(ctype, double);
-explicit_same_type(ctype, size_t);
+explicit_same_type_all_primitive_types_but_void(ctype);
 
 // special cases of array passing - does not intended to be used for objects
 %typemap(ctype) SWIGTYPE [] "$1_ltype"
@@ -262,33 +275,7 @@ same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
 %typemap(couttype) void* * const * const "void* *"
 %typemap(couttype) const void* * const "void* *"
 
-//unconsted types are necessary, because some the methods using this declare variables of the resolved type first and assign their values later
-%define explicit_same_type_unconsted(TM, T)
-%typemap(TM) T, const T "T"
-%typemap(TM) T*, T&, T[ANY], T[] "T *"
-%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
-%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
-%typemap(TM) const T**, const T*&, T *const &, const T*[ANY], const T[ANY][ANY] "const T **"
-// constant pointers
-%typemap(TM) T * const "T *"
-%typemap(TM) T* * const "T* *"
-%typemap(TM) const T* * const "const T* *"
-%enddef
-
-explicit_same_type_unconsted(couttype, short);
-explicit_same_type_unconsted(couttype, unsigned short);
-explicit_same_type_unconsted(couttype, int);
-explicit_same_type_unconsted(couttype, unsigned int);
-explicit_same_type_unconsted(couttype, long);
-explicit_same_type_unconsted(couttype, unsigned long);
-explicit_same_type_unconsted(couttype, long long);
-explicit_same_type_unconsted(couttype, unsigned long long);
-explicit_same_type_unconsted(couttype, char);
-explicit_same_type_unconsted(couttype, signed char);
-explicit_same_type_unconsted(couttype, unsigned char);
-explicit_same_type_unconsted(couttype, float);
-explicit_same_type_unconsted(couttype, double);
-explicit_same_type_unconsted(couttype, size_t);
+explicit_same_type_unconsted_all_primitive_types_but_void(couttype);
 
 // objects
 %typemap(couttype) SWIGTYPE      "SwigObj *"
@@ -315,20 +302,7 @@ explicit_same_type_unconsted(couttype, size_t);
 %typemap(proxycouttype) void* * const "void* * const"
 %typemap(proxycouttype) const void* * const "const void* * const"
 
-explicit_same_type(proxyccouttype, short);
-explicit_same_type(proxyccouttype, unsigned short);
-explicit_same_type(proxyccouttype, int);
-explicit_same_type(proxyccouttype, unsigned int);
-explicit_same_type(proxyccouttype, long);
-explicit_same_type(proxyccouttype, unsigned long);
-explicit_same_type(proxyccouttype, long long);
-explicit_same_type(proxyccouttype, unsigned long long);
-explicit_same_type(proxyccouttype, char);
-explicit_same_type(proxyccouttype, signed char);
-explicit_same_type(proxyccouttype, unsigned char);
-explicit_same_type(proxyccouttype, float);
-explicit_same_type(proxyccouttype, double);
-explicit_same_type(proxyccouttype, size_t)
+explicit_same_type_all_primitive_types_but_void(proxycouttype);
 
 // objects
 %typemap(proxycouttype) SWIGTYPE      "$&resolved_type*"
@@ -401,20 +375,7 @@ same_action_all_primitive_types_but_void(out, "$result = $1;")
 }
 
 // typemaps for 'cppresult'
-explicit_same_type_unconsted(cppouttype, short);
-explicit_same_type_unconsted(cppouttype, unsigned short);
-explicit_same_type_unconsted(cppouttype, int);
-explicit_same_type_unconsted(cppouttype, unsigned int);
-explicit_same_type_unconsted(cppouttype, long);
-explicit_same_type_unconsted(cppouttype, unsigned long);
-explicit_same_type_unconsted(cppouttype, long long);
-explicit_same_type_unconsted(cppouttype, unsigned long long);
-explicit_same_type_unconsted(cppouttype, char);
-explicit_same_type_unconsted(cppouttype, signed char);
-explicit_same_type_unconsted(cppouttype, unsigned char);
-explicit_same_type_unconsted(cppouttype, float);
-explicit_same_type_unconsted(cppouttype, double);
-explicit_same_type_unconsted(cppouttype, size_t);
+explicit_same_type_unconsted_all_primitive_types_but_void(cppouttype);
 
 %typemap(cppouttype, retobj="1") SWIGTYPE      "$1_ltype *"
 %typemap(cppouttype) SWIGTYPE *    "$1_ltype"

From b75cba540a26f708d3052726ed99a183379d3ea7 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:22:07 +0000
Subject: [PATCH 183/508] Remove leftovers of replaced typemap macro

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13676 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index d1daeba8b..fb9306c83 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -171,16 +171,6 @@ explicit_same_type_all_primitive_types_but_void(ctype);
 %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
 %typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const"
 
-
-%define in_assignment_cast(PRE, POST)
-PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST, PRE float POST, PRE double POST "$1 = ($1_ltype) $input;"
-%enddef
-
-//this macro is necessary, because 'unsigned double' is not allowed.
-%define in_assignment_cast_unsigned_only(PRE, POST)
-PRE float POST, PRE double POST, PRE signed char POST, PRE size_t POST "$1 = ($1_ltype) $input;"
-%enddef
-
 same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"

From 7a0a1022f8c1034e099ae304dd66046e9dea66da Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:22:18 +0000
Subject: [PATCH 184/508] Remove leftovers of removed 'wrap_call' typemap.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13677 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/std_string.i | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index f3c6d8a3a..c5e47cb5c 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -27,8 +27,6 @@ class string;
 %typemap(proxycouttype) const string & "char *"
 %typemap(cppouttype, retobj="1") string "std::string*"
 %typemap(cppouttype) const string &, string *, string & "std::string*"
-%typemap(wrap_call) string ""
-%typemap(wrap_call) const string &, string*, string& ""
 
 %typemap(in) string {
   if ($input) {

From fcecbf17a2862291965192365c77835bf520a299 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:22:33 +0000
Subject: [PATCH 185/508] Rename 'ctype' typemap to 'cmodtype' since it's only
 used for internal (wrapper) stuff.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13678 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg          | 44 ++++++++++++++++++++++----------------------
 Lib/c/std_string.i   |  8 ++++----
 Source/Modules/c.cxx | 12 ++++++------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index fb9306c83..0da0ffa4e 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -142,34 +142,34 @@ explicit_same_type_all_primitive_types_but_void(proxy);
 
 // typemaps for function parameters
 // void
-%typemap(ctype) void "void"
-%typemap(ctype) void*, void& "void *"
-%typemap(ctype) const void&, const void* "const void *"
-%typemap(ctype) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
-%typemap(ctype) const void**, const void*& "const void **"
+%typemap(cmodtype) void "void"
+%typemap(cmodtype) void*, void& "void *"
+%typemap(cmodtype) const void&, const void* "const void *"
+%typemap(cmodtype) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
+%typemap(cmodtype) const void**, const void*& "const void **"
 // constant pointers
-%typemap(ctype) void* * const "void* * const"
-%typemap(ctype) const void* * const "const void* * const"
+%typemap(cmodtype) void* * const "void* * const"
+%typemap(cmodtype) const void* * const "const void* * const"
 
-explicit_same_type_all_primitive_types_but_void(ctype);
+explicit_same_type_all_primitive_types_but_void(cmodtype);
 
 // special cases of array passing - does not intended to be used for objects
-%typemap(ctype) SWIGTYPE [] "$1_ltype"
-%typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **"
+%typemap(cmodtype) SWIGTYPE [] "$1_ltype"
+%typemap(cmodtype) SWIGTYPE ((&)[ANY]) "$1_basetype **"
 
-%typemap(ctype) SWIGTYPE         "SwigObj *"
-%typemap(ctype) SWIGTYPE *       "SwigObj *"
-%typemap(ctype) SWIGTYPE &       "SwigObj *"
-%typemap(ctype) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ SwigObj ***"
-%typemap(ctype) SWIGTYPE *[ANY]  "/*ooooh*/ SwigObj **"
-%typemap(ctype) SWIGTYPE *&      "/* *& */ SwigObj **"
-%typemap(ctype) enum SWIGTYPE    "int"
-%typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE *  "int *"
-%typemap(ctype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
+%typemap(cmodtype) SWIGTYPE         "SwigObj *"
+%typemap(cmodtype) SWIGTYPE *       "SwigObj *"
+%typemap(cmodtype) SWIGTYPE &       "SwigObj *"
+%typemap(cmodtype) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ SwigObj ***"
+%typemap(cmodtype) SWIGTYPE *[ANY]  "/*ooooh*/ SwigObj **"
+%typemap(cmodtype) SWIGTYPE *&      "/* *& */ SwigObj **"
+%typemap(cmodtype) enum SWIGTYPE    "int"
+%typemap(cmodtype) enum SWIGTYPE &, enum SWIGTYPE *  "int *"
+%typemap(cmodtype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
 
-%typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type"
-%typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
-%typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const"
+%typemap(cmodtype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type"
+%typemap(cmodtype, fragment="stdbool_inc") bool & "$1_ltype"
+%typemap(cmodtype, fragment="stdbool_inc") const bool & "$1_ltype const"
 
 same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
 
diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index c5e47cb5c..d2289171d 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -9,10 +9,10 @@ namespace std {
 
 class string;
 
-%typemap(ctype) string "char *"
-%typemap(ctype) string * "char *"
-%typemap(ctype) string & "char *"
-%typemap(ctype) const string & "char *"
+%typemap(cmodtype) string "char *"
+%typemap(cmodtype) string * "char *"
+%typemap(cmodtype) string & "char *"
+%typemap(cmodtype) const string & "char *"
 %typemap(proxy) string "char *"
 %typemap(proxy) string * "char *"
 %typemap(proxy) string & "char *"
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 006542b35..8a25e1f6b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -903,7 +903,7 @@ ready:
        //Swig_typemap_attach_parms("in", parms, 0);
 
        // attach typemaps to cast wrapper call with proxy types
-       Swig_typemap_attach_parms("ctype", parms, 0);
+       Swig_typemap_attach_parms("cmodtype", parms, 0);
 
        // prepare function definition
        for (p = parms, gencomma = 0; p; ) {
@@ -932,13 +932,13 @@ ready:
             Printf(arg_name, "c%s", lname);
 
             // set the appropriate type for parameter
-            if ((tm = Getattr(p, "tmap:ctype"))) {
+            if ((tm = Getattr(p, "tmap:cmodtype"))) {
                  Printv(c_parm_type, NewString("("), tm, NewString(")"), NIL);
                  // template handling
                  Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
             }
             else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
+                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
             }
 
             /*
@@ -1096,7 +1096,7 @@ ready:
        Setattr(n, "wrap:parms", parms); //never read again?!
 
        // attach 'ctype' typemaps
-       Swig_typemap_attach_parms("ctype", parms, wrapper);
+       Swig_typemap_attach_parms("cmodtype", parms, wrapper);
 
        // prepare function definition
        for (p = parms, gencomma = 0; p; ) {
@@ -1124,13 +1124,13 @@ ready:
             Printf(arg_name, "c%s", lname);
 
             // set the appropriate type for parameter
-            if ((tm = Getattr(p, "tmap:ctype"))) {
+            if ((tm = Getattr(p, "tmap:cmodtype"))) {
                  Printv(c_parm_type, tm, NIL);
                  // template handling
                  Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
             }
             else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
+                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
             }
 
             // use proxy-type for parameter if supplied

From a894545c9a0f81948a2f002ad879493d51a71de3 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:22:48 +0000
Subject: [PATCH 186/508] Rename 'proxy' to 'ctype' as it's the typemap used
 for the C API.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13679 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg          | 44 ++++++++++++++++++++++----------------------
 Lib/c/std_string.i   |  8 ++++----
 Source/Modules/c.cxx |  6 +++---
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 0da0ffa4e..5fbe4c38b 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -62,7 +62,7 @@ macro_name(TM, size_t);
 same_macro_all_primitive_types_but_void(explicit_same_type_unconsted,TM);
 %enddef
 
-//used by 'proxy', 'proxycouttype'
+//used by 'ctype', 'proxycouttype'
 %define explicit_same_type(TM, T)
 %typemap(TM) T, const T "T"
 %typemap(TM) T*, T&, T[ANY], T[] "T *"
@@ -113,32 +113,32 @@ same_action(TM, size_t, ACTION);
 // typemaps for proxy function parameters
 
 // void
-%typemap(proxy) void "void"
-%typemap(proxy) void*, void& "void *"
-%typemap(proxy) const void&, const void* "const void *"
-%typemap(proxy) void**, void*& "void **"
-%typemap(proxy) const void**, const void*& "const void **"
+%typemap(ctype) void "void"
+%typemap(ctype) void*, void& "void *"
+%typemap(ctype) const void&, const void* "const void *"
+%typemap(ctype) void**, void*& "void **"
+%typemap(ctype) const void**, const void*& "const void **"
 // constant pointers
-%typemap(proxy) void* * const "void* * const"
-%typemap(proxy) const void* * const "const void* * const"
+%typemap(ctype) void* * const "void* * const"
+%typemap(ctype) const void* * const "const void* * const"
 
-explicit_same_type_all_primitive_types_but_void(proxy);
+explicit_same_type_all_primitive_types_but_void(ctype);
 
 // objects
-%typemap(proxy) SWIGTYPE      "$&resolved_type*"
-%typemap(proxy) SWIGTYPE *    "$resolved_type*"
-%typemap(proxy) SWIGTYPE &    "$*resolved_type*"
-%typemap(proxy) SWIGTYPE *&    "$resolved_type**"
-%typemap(proxy) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
-%typemap(proxy) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
-%typemap(proxy) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **"
-%typemap(proxy) enum SWIGTYPE "int"
-%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *"
-%typemap(proxy, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
+%typemap(ctype) SWIGTYPE      "$&resolved_type*"
+%typemap(ctype) SWIGTYPE *    "$resolved_type*"
+%typemap(ctype) SWIGTYPE &    "$*resolved_type*"
+%typemap(ctype) SWIGTYPE *&    "$resolved_type**"
+%typemap(ctype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
+%typemap(ctype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
+%typemap(ctype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **"
+%typemap(ctype) enum SWIGTYPE "int"
+%typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
+%typemap(ctype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
 
-%typemap(proxy, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
-%typemap(proxy, fragment="stdbool_inc") bool & "$1_basetype*"
-%typemap(proxy, fragment="stdbool_inc") const bool & "$1_basetype const *"
+%typemap(ctype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
+%typemap(ctype, fragment="stdbool_inc") bool & "$1_basetype*"
+%typemap(ctype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
 // typemaps for function parameters
 // void
diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index d2289171d..8172e4b58 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -13,10 +13,10 @@ class string;
 %typemap(cmodtype) string * "char *"
 %typemap(cmodtype) string & "char *"
 %typemap(cmodtype) const string & "char *"
-%typemap(proxy) string "char *"
-%typemap(proxy) string * "char *"
-%typemap(proxy) string & "char *"
-%typemap(proxy) const string & "char *"
+%typemap(ctype) string "char *"
+%typemap(ctype) string * "char *"
+%typemap(ctype) string & "char *"
+%typemap(ctype) const string & "char *"
 %typemap(couttype) string  "char *"
 %typemap(couttype) string * "char *"
 %typemap(couttype) string & "char *"
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 8a25e1f6b..d9a9fbfe3 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -826,7 +826,7 @@ ready:
        Swig_typemap_attach_parms("in", parms, 0);
 
        // attach 'ctype' typemaps
-       Swig_typemap_attach_parms("proxy", parms, 0);
+       Swig_typemap_attach_parms("ctype", parms, 0);
 
 
        // prepare function definition
@@ -855,11 +855,11 @@ ready:
 
             Printf(arg_name, "c%s", lname);
 
-            if ((tm = Getattr(p, "tmap:proxy"))) { // set the appropriate type for parameter
+            if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
                  tm = Copy(tm);
             }
             else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No proxy typemap defined for %s\n", SwigType_str(type, 0));
+                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
             }
             // use proxy-type for parameter if supplied
             if ((stype = Getattr(p, "c:stype"))) {

From 5aa23f9bdbd99954c07069f54b39e669e16aa591 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:23:03 +0000
Subject: [PATCH 187/508] Reuse 'ctype' typemap and remove 'proxycouttype'
 typemap.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13680 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg          | 27 ---------------------------
 Lib/c/std_string.i   |  4 ----
 Source/Modules/c.cxx |  8 ++++----
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 5fbe4c38b..b67128c76 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -283,33 +283,6 @@ explicit_same_type_unconsted_all_primitive_types_but_void(couttype);
 %typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*"
 %typemap(couttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
-// typemaps for return values
-
-// void
-%typemap(proxycouttype) void "void"
-%typemap(proxycouttype) void*, const void* "void *"
-// constant pointers
-%typemap(proxycouttype) void* * const "void* * const"
-%typemap(proxycouttype) const void* * const "const void* * const"
-
-explicit_same_type_all_primitive_types_but_void(proxycouttype);
-
-// objects
-%typemap(proxycouttype) SWIGTYPE      "$&resolved_type*"
-%typemap(proxycouttype) SWIGTYPE *    "$resolved_type*"
-%typemap(proxycouttype) SWIGTYPE &    "$*resolved_type*"
-%typemap(proxycouttype) SWIGTYPE *&    "$resolved_type**"
-%typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
-%typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
-%typemap(proxycouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **"
-%typemap(proxycouttype) enum SWIGTYPE "int"
-%typemap(proxycouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
-%typemap(proxycouttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
-
-%typemap(proxycouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
-%typemap(proxycouttype, fragment="stdbool_inc") bool & "$1_basetype*"
-%typemap(proxycouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
-
 same_action_all_primitive_types_but_void(out, "$result = $1;")
 
 %typemap(out) void ""
diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index 8172e4b58..c8e2dff9d 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -21,10 +21,6 @@ class string;
 %typemap(couttype) string * "char *"
 %typemap(couttype) string & "char *"
 %typemap(couttype) const string & "char *"
-%typemap(proxycouttype) string  "char *"
-%typemap(proxycouttype) string * "char *"
-%typemap(proxycouttype) string & "char *"
-%typemap(proxycouttype) const string & "char *"
 %typemap(cppouttype, retobj="1") string "std::string*"
 %typemap(cppouttype) const string &, string *, string & "std::string*"
 
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index d9a9fbfe3..0fac1cd3e 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -792,14 +792,14 @@ ready:
        if (IS_SET_TO_ONE(n, "c:objstruct")) {
             Printv(return_type, SwigType_str(type, 0), NIL);
        }
-       else if ((tm = Swig_typemap_lookup("proxycouttype", n, "", 0))) {
+       else if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
             // handle simple typemap cases
-            String *ctypeout = Getattr(n, "tmap:proxycouttype:out");
+            String *ctypeout = Getattr(n, "tmap:ctype:out");
             if (ctypeout)
               {
                  //tm = ctypeout;
                  return_type = ctypeout;
-                 Printf(stdout, "Obscure proxycouttype:out found! O.o\n");
+                 Printf(stdout, "Obscure ctype:out found! O.o\n");
               }
             else
               {
@@ -1042,7 +1042,7 @@ ready:
             if (ctypeout)
               {
                  tm = ctypeout;
-                 Printf(stdout, "Obscure proxycouttype:out found! O.o\n");
+                 Printf(stdout, "Obscure ctype:out found! O.o\n");
               }
             Printf(return_type, "%s", tm);
             // template handling

From d906d3c73e29f586f26cc5329293889ab23da974 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:23:18 +0000
Subject: [PATCH 188/508] Reuse 'cmodtype' typemap and remove 'couttype'
 typemap completely.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13681 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg          | 36 ++++--------------------------------
 Lib/c/std_string.i   |  4 ----
 Source/Modules/c.cxx | 16 ++++++++--------
 3 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index b67128c76..9a2525852 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -147,11 +147,11 @@ explicit_same_type_all_primitive_types_but_void(ctype);
 %typemap(cmodtype) const void&, const void* "const void *"
 %typemap(cmodtype) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
 %typemap(cmodtype) const void**, const void*& "const void **"
-// constant pointers
-%typemap(cmodtype) void* * const "void* * const"
-%typemap(cmodtype) const void* * const "const void* * const"
+// unconst constant pointers
+%typemap(cmodtype) void* * const "void* *"
+%typemap(cmodtype) const void* * const "const void* *"
 
-explicit_same_type_all_primitive_types_but_void(cmodtype);
+explicit_same_type_unconsted_all_primitive_types_but_void(cmodtype);
 
 // special cases of array passing - does not intended to be used for objects
 %typemap(cmodtype) SWIGTYPE [] "$1_ltype"
@@ -255,34 +255,6 @@ same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
     $1 = ($1_ltype) 0;
 }
 
-// typemaps for return values
-
-// void
-%typemap(couttype) void "void"
-%typemap(couttype) void*, const void* "void *"
-// constant pointers
-%typemap(couttype) void * const "void * const"
-%typemap(couttype) void* * const * const "void* *"
-%typemap(couttype) const void* * const "void* *"
-
-explicit_same_type_unconsted_all_primitive_types_but_void(couttype);
-
-// objects
-%typemap(couttype) SWIGTYPE      "SwigObj *"
-%typemap(couttype) SWIGTYPE *    "/*aaaaaa*/SwigObj *"
-%typemap(couttype) SWIGTYPE &   "SwigObj *"
-%typemap(couttype) SWIGTYPE *&    "SwigObj **"
-%typemap(couttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ SwigObj **"
-%typemap(couttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ SwigObj **"
-%typemap(couttype) SWIGTYPE ** "/*SWIGTYPE ** */ SwigObj **"
-%typemap(couttype) enum SWIGTYPE "int"
-%typemap(couttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
-%typemap(couttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
-
-%typemap(couttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
-%typemap(couttype, fragment="stdbool_inc") bool & "$1_basetype*"
-%typemap(couttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
-
 same_action_all_primitive_types_but_void(out, "$result = $1;")
 
 %typemap(out) void ""
diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index c8e2dff9d..9b70a460b 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -17,10 +17,6 @@ class string;
 %typemap(ctype) string * "char *"
 %typemap(ctype) string & "char *"
 %typemap(ctype) const string & "char *"
-%typemap(couttype) string  "char *"
-%typemap(couttype) string * "char *"
-%typemap(couttype) string & "char *"
-%typemap(couttype) const string & "char *"
 %typemap(cppouttype, retobj="1") string "std::string*"
 %typemap(cppouttype) const string &, string *, string & "std::string*"
 
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0fac1cd3e..2acdcf661 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -764,19 +764,19 @@ ready:
        if (IS_SET_TO_ONE(n, "c:objstruct")) {
             Printv(return_type, SwigType_str(type, 0), NIL);
        }
-       else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) {
-            String *ctypeout = Getattr(n, "tmap:couttype:out");
+       else if ((tm = Swig_typemap_lookup("cmodtype", n, "", 0))) {
+            String *ctypeout = Getattr(n, "tmap:cmodtype:out");
             if (ctypeout)
               {
                  tm = ctypeout;
-                 Printf(stdout, "Obscure couttype:out found! O.o\n");
+                 Printf(stdout, "Obscure cmodtype:out found! O.o\n");
               }
             Printf(return_type, "%s", tm);
             // template handling
             Replaceall(return_type, "$tt", SwigType_lstr(type, 0));
        }
        else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0));
+            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
        }
        return return_type;
     }
@@ -808,7 +808,7 @@ ready:
               }
        }
        else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0));
+            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
        }
 
        Replaceall(return_type, "::", "_");
@@ -1037,8 +1037,8 @@ ready:
        if (IS_SET_TO_ONE(n, "c:objstruct")) {
             Printv(return_type, SwigType_str(type, 0), NIL);
        }
-       else if ((tm = Swig_typemap_lookup("couttype", n, "", 0))) {
-            String *ctypeout = Getattr(n, "tmap:couttype:out");
+       else if ((tm = Swig_typemap_lookup("cmodtype", n, "", 0))) {
+            String *ctypeout = Getattr(n, "tmap:cmodtype:out");
             if (ctypeout)
               {
                  tm = ctypeout;
@@ -1049,7 +1049,7 @@ ready:
             Replaceall(return_type, "$tt", SwigType_lstr(type, 0));
        }
        else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No couttype typemap defined for %s\n", SwigType_str(type, 0));
+            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
        }
        return return_type;
     }

From 49735451ee5c686b2faa441fe0f2e214c8583bf7 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 13:23:29 +0000
Subject: [PATCH 189/508] Update comments in typemaps file.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13682 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/c/c.swg | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 9a2525852..294698d40 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -45,7 +45,7 @@ macro_name(TM, size_t);
 %enddef
 
 //unconsted types are necessary, because some the methods using this declare variables of the resolved type first and assign their values later
-//used by 'couttype' and 'cppouttype' typemaps
+//used by 'cmodtype' and 'cppouttype' typemaps
 %define explicit_same_type_unconsted(TM, T)
 %typemap(TM) T, const T "T"
 %typemap(TM) T*, T&, T[ANY], T[] "T *"
@@ -62,7 +62,7 @@ macro_name(TM, size_t);
 same_macro_all_primitive_types_but_void(explicit_same_type_unconsted,TM);
 %enddef
 
-//used by 'ctype', 'proxycouttype'
+//Used by 'ctype' typemap
 %define explicit_same_type(TM, T)
 %typemap(TM) T, const T "T"
 %typemap(TM) T*, T&, T[ANY], T[] "T *"
@@ -79,7 +79,7 @@ same_macro_all_primitive_types_but_void(explicit_same_type_unconsted,TM);
 same_macro_all_primitive_types_but_void(explicit_same_type,TM);
 %enddef
 
-//used by 'in' and 'out' typemaps
+//Used by 'in' and 'out' typemaps
 %define same_action(TM, T, ACTION)
 %typemap(TM) T, const T ACTION
 %typemap(TM) T*, T&, T[ANY], T[] ACTION
@@ -110,8 +110,7 @@ same_action(TM, double, ACTION);
 same_action(TM, size_t, ACTION);
 %enddef
 
-// typemaps for proxy function parameters
-
+// Typemaps for proxy function parameters
 // void
 %typemap(ctype) void "void"
 %typemap(ctype) void*, void& "void *"
@@ -140,7 +139,7 @@ explicit_same_type_all_primitive_types_but_void(ctype);
 %typemap(ctype, fragment="stdbool_inc") bool & "$1_basetype*"
 %typemap(ctype, fragment="stdbool_inc") const bool & "$1_basetype const *"
 
-// typemaps for function parameters
+// Typemaps for wrapper function parameters and its local variables
 // void
 %typemap(cmodtype) void "void"
 %typemap(cmodtype) void*, void& "void *"
@@ -171,6 +170,8 @@ explicit_same_type_unconsted_all_primitive_types_but_void(cmodtype);
 %typemap(cmodtype, fragment="stdbool_inc") bool & "$1_ltype"
 %typemap(cmodtype, fragment="stdbool_inc") const bool & "$1_ltype const"
 
+
+// Typemaps for assigning wrapper parameters to local variables
 same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
@@ -255,6 +256,8 @@ same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
     $1 = ($1_ltype) 0;
 }
 
+
+// Typemaps for assigning result values to a special return variable
 same_action_all_primitive_types_but_void(out, "$result = $1;")
 
 %typemap(out) void ""

From b5d2f4765f8e997a4f8937ee6bd85fa35bbc563a Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 18:55:34 +0000
Subject: [PATCH 190/508] Update docs to reflect typemap changes.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13708 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 57 +++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 84a626c1d..07ae63de5 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -422,13 +422,20 @@ area: 7.068583
     
-    
-    
+      
+      
-    
-    
+    
-    
-  
-    
-    
-  
-  
-    
-    
-  
-    
+    
@@ -551,7 +536,7 @@ SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
   }
   arg2 = (int) carg2;
   {
-    const int &_result_ref =  someFunction(*arg1,arg2);cppresult = (int*) &_result_ref;
+    const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
   }
   {
     result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass));
@@ -580,7 +565,7 @@ A typical wrapper will be composited with these [optional] blocks:
 Let's go through it step by step and start with the wrapper prototype
 
 
      -couttype                     ctype            ctype
+cmodtype                     cmodtype         cmodtype
 ---------                    ---------        ---
 SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
 
      
@@ -588,7 +573,7 @@ SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
 As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
 
 
      -couttype
+cmodtype
 ---------
 SwigObj * result;
 
      
@@ -630,7 +615,7 @@ At this point we are ready to call the C++ function with our parameters.
       {
-  const int &_result_ref =  someFunction(*arg1,arg2);cppresult = (int*) &_result_ref;
+  const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
 }
 
      
 Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap
@@ -678,7 +663,7 @@ SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2) {
 
 Again, let's first examine the protype:
 
      -proxycouttype           proxy                        proxy
+ctype                   ctype                        ctype
 ----------              ---------------------        ---
 SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
 
      
@@ -686,8 +671,8 @@ SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
 In the body of this function, we'll reuse the 'proxycouttype' and 'ctype' to cast the return value and arguments of the wrapper function.
 
 
      -        proxycouttype                  ctype
-        ----------                     ---------
+        ctype                          cmodtype          cmodtype
+        ----------                     ---------         ___
 return (SomeClass*)_wrap_someFunction((SwigObj *)carg1, (int)carg2);
 
      
 

From 4ca26c150efd268d5d71e66589170e76718fcaaa Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 18:55:51 +0000
Subject: [PATCH 191/508] Revert "Fix shadowing variable declaration", because
 it breaks c++ return value type casting in wrapper functions.

This reverts commit 818a9939ecf10ee6cde3e4e389eaf748ec3999d6.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13709 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 2acdcf661..84bcdde8b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1107,7 +1107,7 @@ ready:
             }
             if (!p) break;
 
-            type = Getattr(p, "type");
+            SwigType *type = Getattr(p, "type");
             if (SwigType_type(type) == T_VOID) {
                  p = nextSibling(p);
                  continue;

From e4c486ae6f5eee68e8ba39b00be105c5c197acdd Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Mon, 20 Aug 2012 19:08:54 +0000
Subject: [PATCH 192/508] Add docs about known shortcomings of C++ wrapping.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13710 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 07ae63de5..c381cb3e1 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -60,6 +60,13 @@ With wrapper interfaces generated by SWIG, it is easy to use the functionality o
 Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.
 
      
 
+
      Known C++ Shortcomings in Generated C API:
      
+
        
+    
      • Namespaced global functions are not namespaced
        • 
+    
      • Enums with a context like class or namespace are broken
        • 
+    
      • Global variables are not supported
        • 
+    
      • Qualifiers are stripped
        • 
+
      
 
      36.2 Preliminaries
      
 
 

From 19ed0b531d889bffb780ff7fc0dbf236237c57de Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 9 Apr 2016 00:56:44 +0200
Subject: [PATCH 193/508] Fix and simplify C examples makefiles

Make "make check-c-examples" perform the correct build commands, e.g. not link
the proxy code into the shared library as this can't work because it defines
the same functions that are already present in it.

Also fix the c_xxx targets to work when SWIG is built in a separate build
directory.

Finally, simplify them by removing the unnecessary variables.

Notice that std_vector example still doesn't build, but at least now it is due
to a real problem in the C module and not makefile bugs.
---
 Examples/Makefile.in           | 43 ++++++++++++++++++++++++----------
 Examples/c/class/Makefile      | 23 ++++++++----------
 Examples/c/exception/Makefile  | 23 ++++++++----------
 Examples/c/simple/Makefile     | 23 ++++++++----------
 Examples/c/std_vector/Makefile | 24 ++++++++-----------
 5 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index d169686a4..d1b6cdb91 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -82,10 +82,9 @@ RUNPIPE=
 RUNME = runme
 
 IWRAP      = $(INTERFACE:.i=_wrap.i)
-IPROXYSRCS = $(INTERFACE:.i=_proxy.c)
 ISRCS      = $(IWRAP:.i=.c)
 ICXXSRCS   = $(IWRAP:.i=.cxx)
-IOBJS      = $(IWRAP:.i=.o) $(IPROXYSRCS:.c=.o)
+IOBJS      = $(IWRAP:.i=.@OBJEXT@)
 
 ##################################################################
 # Some options for silent output
@@ -1735,20 +1734,40 @@ C_LDSHARED = @C_LDSHARED@
 CXX_LDSHARED = @CXX_LDSHARED@
 C_SO = @C_SO@
 
-c: $(SRCS)
-	$(SWIG) -c $(SWIGOPT) $(INTERFACEPATH)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(IPROXYSRCS) $(INCLUDES)
+PROXYSRC := $(INTERFACE:.i=_proxy.c)
+PROXYOBJ := $(PROXYSRC:.c=.@OBJEXT@)
+
+c: $(SRCDIR_SRCS)
+	$(SWIG) -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
+	$(CC) -c $(CCSHARED) -I$(SRCDIR) $(CFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(INCLUDES)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(PROXYSRC) $(INCLUDES)
 	$(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 	
-c_cpp: $(SRCS)
-	$(SWIG) -c++ -c $(SWIGOPT) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(IPROXYSRCS) $(INCLUDES)
+c_cpp: $(SRCDIR_SRCS)
+	$(SWIG) -c++ -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
+	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ISRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(PROXYSRC) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 
-c_compile: $(RUNME) $(PROXY)
-	$(CC) $(RUNME) $(PROXY) -L. -l$(TARGET) -o $(RUNME:.c=)
+c_compile: $(SRCDIR)$(RUNME).c $(PROXYOBJ)
+	$(COMPILETOOL) $(CC) -o $(RUNME) -I. $^ -L. -l$(TARGET)
+
+# -----------------------------------------------------------------
+# Run C example
+# -----------------------------------------------------------------
+
+c_run: c_compile
+	$(RUNTOOL) ./$(RUNME) $(RUNPIPE)
+
+# -----------------------------------------------------------------
+# Cleaning the C examples
+# -----------------------------------------------------------------
+
+c_clean:
+	rm -f *_wrap.c *_proxy.[ch]
+	rm -f core @EXTRA_CLEAN@
+	rm -f *.@OBJEXT@ *@SO@
+	rm -f $(RUNME)
 
 ##################################################################
 #####                 SCILAB                                ######
diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile
index 65ed8bcfb..e66aaabda 100644
--- a/Examples/c/class/Makefile
+++ b/Examples/c/class/Makefile
@@ -1,21 +1,18 @@
 TOP        = ../..
-SWIG       = $(TOP)/../preinst-swig
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
 CXXSRCS    = example.cxx
 TARGET     = example
 INTERFACE  = example.i
-RUNME      = runme.c
-PROXY      = example_proxy.c
 
-all::
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp
-	$(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \
-	TARGET='$(TARGET)' c_compile
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
 
-run:
-	env LD_LIBRARY_PATH=. ./runme
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp
 
 clean:
-	rm -f *.o *.out *.so *.a *.dll  *.dylib *.exe *_wrap* *_proxy* *~ runme
-
-check: all
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' c_clean
diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile
index ce460b949..e66aaabda 100644
--- a/Examples/c/exception/Makefile
+++ b/Examples/c/exception/Makefile
@@ -1,21 +1,18 @@
 TOP        = ../..
-SWIG       = $(TOP)/../preinst-swig
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
 CXXSRCS    = example.cxx
 TARGET     = example
 INTERFACE  = example.i
-RUNME      = runme.c
-PROXY      = example_proxy.c
 
-all::
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp
-	$(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \
-	TARGET='$(TARGET)' c_compile
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
 
-run:
-	env LD_LIBRARY_PATH=. ./runme
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp
 
 clean:
-	rm -f *.o *.out *.so *.a *.dll *.dylib *.exe *_wrap* *_proxy* *~ runme
-
-check: all
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' c_clean
diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile
index 14e8f69b4..b6b6066d7 100644
--- a/Examples/c/simple/Makefile
+++ b/Examples/c/simple/Makefile
@@ -1,21 +1,18 @@
 TOP        = ../..
-SWIG       = $(TOP)/../preinst-swig
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
 SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
-RUNME      = runme.c
-PROXY      = example_proxy.c
 
-all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c
-	$(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \
-	TARGET='$(TARGET)' c_compile
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
 
-run:
-	env LD_LIBRARY_PATH=. ./runme
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c
 
 clean:
-	rm -f *.o *.so *.out *.a *.exe *.dll  *.dylib *_wrap* *_proxy* *~ runme
-
-check: all
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' c_clean
diff --git a/Examples/c/std_vector/Makefile b/Examples/c/std_vector/Makefile
index ebcc4ee6b..e66aaabda 100644
--- a/Examples/c/std_vector/Makefile
+++ b/Examples/c/std_vector/Makefile
@@ -1,22 +1,18 @@
 TOP        = ../..
-SWIG       = $(TOP)/../preinst-swig
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
 CXXSRCS    = example.cxx
 TARGET     = example
 INTERFACE  = example.i
-RUNME      = runme.c
-PROXY      = example_proxy.c
-INCLUDES   = 
 
-all::
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INCLUDES='$(INCLUDES)' c_cpp
-	$(MAKE) -f $(TOP)/Makefile RUNME='$(RUNME)' PROXY='$(PROXY)' \
-	TARGET='$(TARGET)' c_compile
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
 
-run:
-	env LD_LIBRARY_PATH=. ./runme
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_cpp
 
 clean:
-	rm -f *.o *.out *.so *.a *.dll  *.dylib *.exe *_wrap* *_proxy* *~ runme
-
-check: all
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' c_clean

From 3b087fcb2b287c6fd787fc226ebe9dc0026b01a4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 17:01:11 +0200
Subject: [PATCH 194/508] Fix running C test suite when using a separate build
 directory

Correct top_srcdir path and use ../$(srcdir) instead of just "../" which may
not be the same when building in another directory.
---
 Examples/test-suite/c/Makefile.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 0c24247a9..f8676b5a0 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -7,11 +7,13 @@ C            = gcc
 CXX          = g++
 SCRIPTSUFFIX = _runme.c
 srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@/..
+top_srcdir   = ../@top_srcdir@
+top_builddir = ../@top_builddir@
 
 include $(srcdir)/../common.mk
 
+SRCDIR       = ../$(srcdir)/
+
 CPP_TEST_CASES += \
 				 cpp_basic_class \
 				 cpp_basic_class_enum \
@@ -81,7 +83,7 @@ setup = \
 # a file is found which has _runme.c appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\
-		cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c -L. -l$* -o $*_runme && \
+		cd $* && $(COMPILETOOL) $(CC) ../$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -I.. -L. -l$* -o $*_runme && \
 	  env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" PATH=".:$$PATH" SHLIB_PATH=".:$$SHLIB_PATH" DYLD_LIBRARY_PATH=".:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \
 	fi;
 

From 1af8e25d4d40bfbb4c3f499d50ee3be503d61b0e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 18:05:30 +0200
Subject: [PATCH 195/508] Add a possibility to disable failing test cases

Allow defining FAILING_{C,CPP,MULTI_CPP}_TESTS variables to exclude some tests
from the unit tests suite. This is useful to disable tests failing for some
language only.
---
 Examples/test-suite/common.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 7f506dc5b..6c272e826 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -671,6 +671,11 @@ MULTI_CPP_TEST_CASES += \
 wallkw.cpptest: SWIGOPT += -Wallkw
 preproc_include.ctest: SWIGOPT += -includeall
 
+# Allow modules to define temporarily failing tests.
+C_TEST_CASES := $(filter-out $(FAILING_C_TESTS),$(C_TEST_CASES))
+CPP_TEST_CASES := $(filter-out $(FAILING_CPP_TESTS),$(CPP_TEST_CASES))
+MULTI_CPP_TEST_CASES := $(filter-out $(FAILING_MULTI_CPP_TESTS),$(MULTI_CPP_TEST_CASES))
+
 
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \
 			$(C_TEST_CASES:=.ctest) \

From 82ce7e47259cecc48986e91ce37018e23c351a69 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 18:06:38 +0200
Subject: [PATCH 196/508] Force the unit test suite to pass for C

Disable all currently failing tests.
---
 Examples/test-suite/c/Makefile.in | 107 +++++++++++++++++++++++++-----
 1 file changed, 89 insertions(+), 18 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index f8676b5a0..f67f5c2ff 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -10,11 +10,7 @@ srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
 top_builddir = ../@top_builddir@
 
-include $(srcdir)/../common.mk
-
-SRCDIR       = ../$(srcdir)/
-
-CPP_TEST_CASES += \
+CPP_TEST_CASES := \
 				 cpp_basic_class \
 				 cpp_basic_class_enum \
 				 cpp_basic_class_method \
@@ -30,27 +26,102 @@ CPP_TEST_CASES += \
 				 c_backend_cpp_natural_std_string \
 				 c_backend_cpp_exception
 
-#
-# BROKEN TEST CASES:
-# default_constructor - last case fail: using %extend generates 2 ctors wrappers,
-#                       both using new, while the class constructor is private
-# extend*             - directive %extend is not fully supported yet
-# li*                 - not supported at all yet
-# long_long_apply     - no INPUT, OUTPUT, INOUT typemaps defined
-# template*           - not fully supported yet
-#
+# The following tests are currently broken and need to be fixed.
+FAILING_C_TESTS := \
+    arrays \
+    enums \
+    funcptr \
+    function_typedef \
+    lextype \
+    li_cdata \
+    li_constraints \
 
-C_CPP_TEST_BROKEN = \
+FAILING_CPP_TESTS := \
+    abstract_typedef \
+    anonymous_bitfield \
+    apply_signed_char \
+    argout \
+    array_member \
+    arrays_dimensionless \
+    bools \
+    char_strings \
+    constant_pointers \
+    cpp_basic \
+    cpp_basic_class_enum \
+    cpp_basic_class_var_pub_member_built_in \
+    cpp_basic_global_enum \
+    cpp_basic_global_var_built_in \
+    cpp_basic_global_var_class \
+    cpp_basic_template_class \
+    cpp_basic_template_function \
+    cpp_enum \
+    c_backend_cpp_natural_std_string \
+    c_backend_cpp_exception \
+    default_args \
     default_constructor \
+    director_basic \
+    director_binary_string \
+    director_frob \
+    director_property \
+    director_string \
+    exception_order \
     extend \
+    extend_constructor_destructor \
     extend_default \
     extend_placement \
+    features \
+    funcptr_cpp \
+    langobj \
     li_attribute \
+    li_attribute_template \
     li_boost_shared_ptr \
-    li_carrays \
-    li_cdata \
+    li_carrays_cpp \
+    li_cdata_cpp \
+    li_std_combinations \
+    li_std_deque \
+    li_std_map \
+    li_std_pair \
+    li_std_pair_using \
+    li_std_vector \
     li_windows \
-    long_long_apply
+    mixed_types \
+    nested_class \
+    operator_overload \
+    overload_arrays \
+    overload_simple \
+    primitive_ref \
+    smart_pointer_not \
+    smart_pointer_template_defaults_overload \
+    special_variables \
+    template_arg_typename \
+    template_basic \
+    template_explicit \
+    template_ns4 \
+    template_tbase_template \
+    template_typedef \
+    template_typedef_class_template \
+    template_typedef_cplx \
+    template_typedef_cplx2 \
+    template_typedef_cplx3 \
+    template_typedef_cplx4 \
+    template_typedef_funcptr \
+    template_typemaps_typedef \
+    template_typemaps_typedef2 \
+    typedef_array_member \
+    typedef_struct_cpp \
+    typemap_namespace \
+    using_extend \
+    varargs \
+    varargs_overload \
+    virtual_poly \
+    voidtest
+
+FAILING_MULTI_CPP_TESTS := \
+    template_typedef_import \
+
+include $(srcdir)/../common.mk
+
+SRCDIR       = ../$(srcdir)/
 
 # Rules for the different types of tests
 %.cpptest: 

From 23d89c2cb4b002631e12fcd1a7421a9e95d2931a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 9 Apr 2016 01:02:58 +0200
Subject: [PATCH 197/508] Make "make check-c-version" work too

This is not very useful, but still add this target for consistency and to make
Travis CI script work with C too.
---
 Examples/Makefile.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index d1b6cdb91..40a79722d 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1759,6 +1759,13 @@ c_compile: $(SRCDIR)$(RUNME).c $(PROXYOBJ)
 c_run: c_compile
 	$(RUNTOOL) ./$(RUNME) $(RUNPIPE)
 
+# -----------------------------------------------------------------
+# Version display
+# -----------------------------------------------------------------
+
+c_version:
+	$(CC) --version | head -n 1
+
 # -----------------------------------------------------------------
 # Cleaning the C examples
 # -----------------------------------------------------------------

From 34431d72e6d15552c670b1f376b05aca8f331b1a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 9 Apr 2016 16:00:37 +0200
Subject: [PATCH 198/508] Create output file with C++ extension for C++ C
 examples

This file contains C++ code when using "swig -c++", so create it with .cxx
extension.
---
 Examples/Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 40a79722d..542b237d8 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1744,8 +1744,8 @@ c: $(SRCDIR_SRCS)
 	$(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 	
 c_cpp: $(SRCDIR_SRCS)
-	$(SWIG) -c++ -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ISRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
+	$(SWIG) -c++ -c $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
+	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
 	$(CC) -c $(CCSHARED) $(CFLAGS) $(PROXYSRC) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 
@@ -1771,7 +1771,7 @@ c_version:
 # -----------------------------------------------------------------
 
 c_clean:
-	rm -f *_wrap.c *_proxy.[ch]
+	rm -f *_wrap.c *_wrap.cxx *_proxy.[ch]
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
 	rm -f $(RUNME)

From 6bbe375a371240db18a4354c17ec404e33b7be1e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 9 Apr 2016 18:08:38 +0200
Subject: [PATCH 199/508] Remove unused SWIGPROTECT

It doesn't make any sense to use protected visibility for the symbols in the
proxy code, the only use for it would be if it could be applied to the
original functions being wrapped, to prevent them from being shadowed by the
proxy versions, but this cannot be done, in general.

Apparently this was already understood as the code using SWIGPROTECT was
commented out, but ef85d0d43f8a14b8b59556c0f688f357f7efbdf2 didn't give any
reason for doing this, nor for leaving this code.

Assume there was none and just remove it completely now to avoid confusion.
---
 Lib/c/clabels.swg    | 13 -------------
 Source/Modules/c.cxx | 15 ---------------
 2 files changed, 28 deletions(-)

diff --git a/Lib/c/clabels.swg b/Lib/c/clabels.swg
index ab6a7360a..ce4bcd02d 100644
--- a/Lib/c/clabels.swg
+++ b/Lib/c/clabels.swg
@@ -17,16 +17,3 @@
 #   endif
 # endif
 #endif
-
-#ifndef SWIGPROTECT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__APPLE__)
-#   define SWIGPROTECT(x)
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGPROTECT(x) __attribute__ ((visibility("protected"))) x
-#   else
-#     define SWIGPROTECT(x)
-#   endif
-# endif
-#endif
-
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0108b2b58..24f294ef1 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -686,13 +686,6 @@ ready:
             // print the call of the wrapper function
             Printv(f_proxy_code_body, "  return ", wname, "(", arg_names, ");\n}\n", NIL);
 
-            /*
-            // add visibility hint for the compiler (do not override this symbol)
-            String *vis_hint = NewString("");
-            Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL);
-            Printv(f_proxy_header, vis_hint, NIL);
-            Delete(vis_hint);
-            */
             // add function declaration to the proxy header file
             Printv(f_proxy_header, return_type, " ", name, "(", proto, ");\n\n", NIL);
 
@@ -1010,14 +1003,6 @@ ready:
        Printv(f_proxy_code_body, "  return ", wrapper_call, ";\n}\n", NIL);
 
        // add function declaration to the proxy header file
-       /*
-       // add visibility hint for the compiler (do not override this symbol)
-       String *vis_hint = NewString("");
-       Printv(vis_hint, "SWIGPROTECT(", preturn_type, " ", name, "(", pproto, ");)\n\n", NIL);
-       Printv(f_proxy_header, vis_hint, NIL);
-       Delete(vis_hint);
-       */
-
        Printv(f_proxy_header, preturn_type, " ", name, "(", pproto, ");\n\n", NIL);
 
        // cleanup

From 5cfb66c1fbed81ff43b6fbee50d5803de6125941 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 10 Apr 2016 21:56:08 +0200
Subject: [PATCH 200/508] Remove unused
 functionWrapperCPPSpecificWrapperSetReturnType()

This function was never used anywhere since its addition back in
f1ec1a26a76d2433eea0a5e584e4f67992d4e09e.
---
 Source/Modules/c.cxx | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 24f294ef1..4f84eace0 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1011,33 +1011,6 @@ ready:
        Delete(preturn_type);
     }
 
-  virtual SwigType *functionWrapperCPPSpecificWrapperSetReturnType(Node *n)
-    {
-       SwigType *type = Getattr(n, "type");
-       SwigType *return_type = NewString("");
-       String *tm;
-
-       // set the return type
-       if (IS_SET_TO_ONE(n, "c:objstruct")) {
-            Printv(return_type, SwigType_str(type, 0), NIL);
-       }
-       else if ((tm = Swig_typemap_lookup("cmodtype", n, "", 0))) {
-            String *ctypeout = Getattr(n, "tmap:cmodtype:out");
-            if (ctypeout)
-              {
-                 tm = ctypeout;
-                 Printf(stdout, "Obscure ctype:out found! O.o\n");
-              }
-            Printf(return_type, "%s", tm);
-            // template handling
-            Replaceall(return_type, "$tt", SwigType_lstr(type, 0));
-       }
-       else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
-       }
-       return return_type;
-    }
-
 
   virtual void functionWrapperCPPSpecificWrapper(Node *n, String *name)
     {

From a1fedd5202fd57865b5c5b1c17a54cddcd9a66fc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 12 Apr 2016 23:43:05 +0200
Subject: [PATCH 201/508] Minor cleanup: remove commented out code

No real changes, just remove commented out code and comments that didn't make
sense.
---
 Source/Modules/c.cxx | 55 --------------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 4f84eace0..0b7b21502 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -80,10 +80,7 @@ public:
 
      String *proxyname = NULL;
      if ((proxyname = Getattr(n, "proxyname")))
-     {
-      //Printf(stdout, "Returning proxytype: %s\n", proxyname); 
       return Copy(proxyname);
-     }
 
      String *symname = Getattr(n, "sym:name");
      String *nspace = Getattr(n, "sym:nspace");
@@ -98,7 +95,6 @@ public:
      }
      Setattr(n, "proxyname", proxyname);
      Delete(proxyname);
-     //Printf(stdout, "Returning proxytype: %s\n", proxyname);
 
      return Copy(proxyname);
   }
@@ -114,29 +110,7 @@ public:
    String *getProxyName(SwigType *t) {
      Node *n = NULL;
 
-     /* original java code
-     if (proxy_flag) {
-       Node *n = classLookup(t);
-       if (n) {
-         proxyname = Getattr(n, "proxyname");
-         if (!proxyname) {
-           String *nspace = Getattr(n, "sym:nspace");
-           String *symname = Getattr(n, "sym:name");
-           if (nspace) {
-             if (package)
-               proxyname = NewStringf("%s.%s.%s", package, nspace, symname);
-             else
-               proxyname = NewStringf("%s.%s", nspace, symname);
-           } else {
-             proxyname = Copy(symname);
-           }
-           Setattr(n, "proxyname", proxyname);
-           Delete(proxyname);
-         }
-       }
-     }*/
      t = SwigType_typedef_resolve_all(t);
-     //Printf(stdout, "Proxytype for type %s was asked.\n", t);
      if (!proxy_flag || !t || !(n = classLookup(t)))
       return NULL;
 
@@ -204,14 +178,6 @@ public:
       String *classname = getProxyName(classnametype);
       if (classname) {
   Replaceall(tm, classnamespecialvariable, classname);  // getProxyName() works for pointers to classes too
-      } else {/*      // use $descriptor if SWIG does not know anything about this type. Note that any typedefs are resolved.
-  String *descriptor = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
-  Replaceall(tm, classnamespecialvariable, descriptor);
-
-  // Add to hash table so that the type wrapper classes can be created later
-  Setattr(swig_types_hash, descriptor, classnametype);
-  Delete(descriptor);
-  */
       }
     }
   }
@@ -777,7 +743,6 @@ ready:
     {
        SwigType *type = Getattr(n, "type");
        SwigType *return_type = NewString("");
-       //SwigType *ns = Getattr(n, "name");
        String *tm;
 
        // set the return type
@@ -789,7 +754,6 @@ ready:
             String *ctypeout = Getattr(n, "tmap:ctype:out");
             if (ctypeout)
               {
-                 //tm = ctypeout;
                  return_type = ctypeout;
                  Printf(stdout, "Obscure ctype:out found! O.o\n");
               }
@@ -891,8 +855,6 @@ ready:
        int gencomma = 0;
 
        Printv(call, "(", NIL);
-       // attach the standard typemaps
-       //Swig_typemap_attach_parms("in", parms, 0);
 
        // attach typemaps to cast wrapper call with proxy types
        Swig_typemap_attach_parms("cmodtype", parms, 0);
@@ -914,7 +876,6 @@ ready:
             }
             String *lname = Getattr(p, "lname");
             String *c_parm_type = NewString("");
-            //String *proxy_parm_type = NewString("");
             String *arg_name = NewString("");
 
             SwigType *tdtype = SwigType_typedef_resolve_all(type);
@@ -933,17 +894,6 @@ ready:
                  Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
             }
 
-            /*
-            // use proxy-type for parameter if supplied
-            String* stype = Getattr(p, "c:stype");
-            if (stype) {
-                 Printv(proxy_parm_type, SwigType_str(stype, 0), NIL);
-            }
-            else {
-                 Printv(proxy_parm_type, c_parm_type, NIL);
-            }
-            */
-
             Printv(args, gencomma ? ", " : "", c_parm_type, arg_name, NIL);
             gencomma = 1;
 
@@ -961,7 +911,6 @@ ready:
             }
 
             Delete(arg_name);
-            //Delete(proxy_parm_type);
             Delete(c_parm_type);
        }
        Printv(call, args, ")", NIL);
@@ -1033,7 +982,6 @@ ready:
        Setattr(n, "wrap:name", wname);
 
        // add variable for holding result of original function 'cppresult'
-       // WARNING: testing typemap approach
        if (!is_void_return && !IS_SET_TO_ONE(n, "c:objstruct")) {
             String *tm;
             if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) {
@@ -1383,7 +1331,6 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int classHandler(Node *n) {
-    //String *name = Copy(Getattr(n, "sym:name"));
     String *name = getNamespacedName(n);
     String *sobj = NewString("");
     List *baselist = Getattr(n, "bases");
@@ -1690,9 +1637,7 @@ ready:
     // modify the constructor if necessary
     constr_name = Swig_name_copyconstructor(nspace, newclassname);
 
-    //Setattr(n, "name", constr_name);
     Setattr(n, "name", newclassname);
-    //Setattr(n, "sym:name", constr_name);
     Setattr(n, "sym:name", constr_name);
 
     // generate action code

From e8ec13f56b32cd49fe56b8b3fdf98484332c2949 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 00:11:31 +0200
Subject: [PATCH 202/508] Remove SWIG_MAKE_DELETE() macro from C runtime

This doesn't seem to be necessary nor even useful at all, just get rid of it
completely and expand it manually in the only place where it was used.
---
 Examples/test-suite/c/operator_overload_runme.c |  6 +++---
 Lib/c/c.swg                                     | 15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index fc27fd5b5..2409d8df3 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -4,8 +4,6 @@
 
 #define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); SWIG_exit(0); }
 
-SWIG_MAKE_DELETE(delete_Ops, Op);
-
 int main() {
   Op_sanity_check();
   
@@ -20,6 +18,8 @@ int main() {
   assert(3 == *Op_IndexInto(op3, Op_IndexIntoConst(op2, Op_Functor_pOp(op1))), "[] or () failed");
   assert(5 == Op_Functor_pOp_i(op3, 2), "f(x) failed");
   
-  delete_Ops(op1, op2, op3, 0);
+  delete_Op(op1);
+  delete_Op(op2);
+  delete_Op(op3);
   SWIG_exit(0);
 }
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 294698d40..41f609b80 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -379,21 +379,6 @@ typedef struct {
   SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj));
 %}
 
-%insert("proxy_header") %{
-#include 
-
-#define SWIG_MAKE_DELETE(Name,Obj) void Name(Obj *op1, ...) {\
-  Obj *obj;\
-  va_list vl;\
-  va_start(vl, op1);\
-  do {\
-    obj = va_arg(vl, Obj *);\
-    delete_##Obj(obj);\
-  } while (obj);\
-  va_end(vl);\
-}
-%}
-
 #else
 
 %insert("runtime") %{

From 3d6880aad18dea66f778033634381f02373f4e7b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 12 Apr 2016 23:25:42 +0200
Subject: [PATCH 203/508] Start removing proxy layer, just use the wrapped
 functions directly

The proxy layer, and all the extra complexity associated with it, seemed to be
only necessary in order to try to allow using the same name for the wrapped
global functions as were used for them in the original C or C++ code being
wrapped. However this could simply never work in all cases, notably it didn't
work at all when using ELF shared libraries under Unix as the functions with
the same name defined in the main program were interposed and replaced the
functions defined in the shared library, meaning that the proxy function foo()
called wrapper function _wrap_foo() which called back into proxy function
foo() itself again, resulting in guaranteed stack overflow. The only possible
way to fix this would be to use "protected" ELF visibility for the original
functions, but this is not always possible (e.g. if the sources of the
original library are not available) and not simple even when it is and,
besides, protected visibility has its own problems -- notably by making it
impossible to hook the library functions when you actually want to do it.
Besides, proxy-based approach simply couldn't work at all when using static
linking as it resulted in two copies of the function with the same name

Most importantly, however, the main task of this module is to wrap C++
classes, not C functions, and renaming them in the wrapper is not necessary at
all in this case as there is no conflict with the original names in this case.
So simply drop the idea of generating a separate proxy header and generate a
header declaring the functions declared in the wrapper instead and, also, do
not give them "_wrap_" prefix whenever possible, i.e. only do it for the
global functions.

This simplifies SWIG code itself and makes it simpler to use its output as
it's not necessary to link both with the wrapper (dynamically) and with the
proxy (statically) and it's not enough to link with the wrapper only and it
can be done in any way (i.e. either statically or dynamically).

As a side effect of this change, Swig_name_proxy() is not necessary any more
and was removed, eliminating the only difference with the master branch in any
source file other than c.cxx itself.
---
 Doc/Manual/C.html                             |  78 +----
 Examples/Makefile.in                          |  11 +-
 Examples/c/class/runme.c                      |   2 +-
 Examples/c/exception/runme.c                  |   2 +-
 Examples/c/simple/runme.c                     |   4 +-
 Examples/c/std_vector/runme.c                 |   4 +-
 Examples/test-suite/c/Makefile.in             |   2 +-
 Examples/test-suite/c/abstract_access_runme.c |   2 +-
 Examples/test-suite/c/abstract_change_runme.c |   2 +-
 .../test-suite/c/abstract_typedef_runme.c     |   2 +-
 .../test-suite/c/abstract_virtual_runme.c     |   2 +-
 Examples/test-suite/c/add_link_runme.c        |   2 +-
 .../test-suite/c/anonymous_bitfield_runme.c   |   2 +-
 .../c/c_backend_cpp_exception_runme.c         |   2 +-
 .../c_backend_cpp_natural_std_string_runme.c  |   2 +-
 Examples/test-suite/c/cast_operator_runme.c   |   2 +-
 Examples/test-suite/c/char_strings_runme.c    |   2 +-
 .../test-suite/c/cpp_basic_class_enum_runme.c |   2 +-
 .../c/cpp_basic_class_method_runme.c          |   2 +-
 Examples/test-suite/c/cpp_basic_class_runme.c |   2 +-
 ...asic_class_var_pub_member_built_in_runme.c |   2 +-
 ...p_basic_class_var_pub_member_class_runme.c |   2 +-
 .../c/cpp_basic_class_virtual_method_runme.c  |   2 +-
 .../c/cpp_basic_global_enum_runme.c           |   2 +-
 .../c/cpp_basic_global_var_built_in_runme.c   |   2 +-
 .../c/cpp_basic_global_var_class_runme.c      |   2 +-
 .../c/cpp_basic_namespaced_class_runme.c      |   2 +-
 Examples/test-suite/c/cpp_basic_runme.c       |   2 +-
 .../c/cpp_basic_template_class_runme.c        |   2 +-
 .../c/cpp_basic_template_function_runme.c     |   2 +-
 Examples/test-suite/c/cpp_enum_runme.c        |   2 +-
 Examples/test-suite/c/enums_runme.c           |   2 +-
 Examples/test-suite/c/exception_order_runme.c |   2 +-
 .../test-suite/c/operator_overload_runme.c    |   2 +-
 Source/Modules/c.cxx                          | 297 +++++++++---------
 Source/Swig/naming.c                          |  25 --
 Source/Swig/stype.c                           |  14 -
 Source/Swig/swig.h                            |   1 -
 38 files changed, 195 insertions(+), 299 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index c381cb3e1..7a4b646b1 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -108,18 +108,18 @@ Note that -c is the option specifying the target language and 
 
 
      
-This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_proxy.h and example_proxy.c files. The name of the file is derived from the name of the input file. To change this, you can use the -o option common to all language modules. 
+This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_wrap.h (the same extension is used in both C and C++ cases for the last one). The names of the files are derived from the name of the input file by default, but can be changed using the -o and -oh options common to all language modules. 
 
      
 
 
      
-The wrap file contains the wrapper functions, which perform the main functionality of SWIG: it translates the input arguments from C to C++, makes calls to the original functions and marshalls C++ output back to C data. The proxy header file contains the interface we can use in C application code. The additional .c file contains calls to the wrapper functions, allowing us to preserve names of the original functions.
+The xxx_wrap.c file contains the wrapper functions, which perform the main functionality of SWIG: each of the wrappers translates the input arguments from C to C++, makes calls to the original functions and marshals C++ output back to C data. The xxx_wrap.h header file contains the declarations of these functions as well as global variables.
 
      
 
 
      36.2.2 Command line options
      
 
 
 
      
-The following table list the additional commandline options available for the C module. They can also be seen by using: 
+The following table list the additional command line options available for the C module. They can also be seen by using: 
 
      
 
 
      @@ -131,11 +131,6 @@ $ swig -c -help
 
      
 
-
-
-
-
-
 
@@ -153,8 +148,7 @@ The next step is to build a dynamically loadable module, which we can link to ou
 
       $ swig -c example.i
 $ gcc -c example_wrap.c
-$ gcc -c example_proxy.c
-$ gcc -shared example_wrap.o example_proxy.o -o libexample.so
+$ gcc -shared example_wrap.o -o libexample.so
 
      
@@ -164,8 +158,7 @@ Or, for C++ input:
 
       $ swig -c++ -c example.i
 $ g++ -c example_wrap.cxx
-$ gcc -c example_proxy.c
-$ g++ -shared example_proxy.o example_wrap.o -o libexample.so
+$ g++ -shared example_wrap.o -o libexample.so
 
      
@@ -176,7 +169,7 @@ Now the shared library module is ready to use. Note that the name of the generat
 
 
 
      
-The simplest way to use the generated shared module is to link it to the application code during the compilation stage. We have to compile the proxy file as well. The process is usually similar to this:
+The simplest way to use the generated shared module is to link it to the application code during the compilation stage. The process is usually similar to this:
 
      @@ -184,14 +177,14 @@ $ gcc runme.c -L. -lexample -o runme
 
      
-This will compile the application code (runme.c), along with the proxy code and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.
+This will compile the application code (runme.c) and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.
 
      36.3 Basic C wrapping
      
-Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enchance the code with some additional elements, for instance using check typemap or %extend directive.
+Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enhance the code with some additional elements, for instance using check typemap or %extend directive.
 
      36.3.1 Functions
      
@@ -221,16 +214,6 @@ int _wrap_gcd(int arg1, int arg2) {
 }
 
 
-
      
-Then again, this wrapper function is usually called from C using helper function declared in proxy file, preserving the original name:
-
      
-
-
      -int gcd(int arg1, int arg2) {
-  return _wrap_gcd(arg1,arg2);
-}
-
      
-
 
      
 Now one might think, what's the use of creating such functions in C? The answer is, you can apply special rules to the generated code. Take for example constraint checking. You can write a "check" typemap in your interface file:
 
      
@@ -501,7 +484,7 @@ Let's assume we have the following C++ interface file, we'd like to generate cod
 What we would like to generate as a C interface of this function would be something like this:
 
 
      -//proxy header file
+// wrapper header file
 typedef struct SwigObj_SomeClass SomeClass;
 
 SomeClass * new_SomeClass();
@@ -518,15 +501,8 @@ SomeIntTemplateClass * new_SomeIntTemplateClass();
 void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
 
      
 
-When we generate the bindings, we generate code for two translation units:
-
        
-
      • The proxy
        • 
-
      • The wrapper
        • 
-
      
-We need 2 translation units to be able to have C types with the same names as the original C++ types.
-
 
      The Wrapper
      
-Since the proxy embeds a call to the wrapper function, we'll examine the generation of the wrapper function first.
+We'll examine the generation of the wrapper function first.
 
 
       SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
@@ -593,7 +569,7 @@ int arg2 ;
 
      
 
 If it's a C++ function that is wrapped (in this case it is), another variable is emitted for the 'original' return value of the C++ function.
      
-At this point, we simply 'inject' behavior if it's a C++ function that is wrapped (in this cas it obviously is).
+At this point, we simply 'inject' behavior if it's a C++ function that is wrapped (in this case it obviously is).
 
 
       cppouttype
@@ -639,11 +615,12 @@ return result;
 
      The Proxy
      
-Compared to the wrapper code generation, the proxy code is very simple.
      
-Basically it just casts types for the wrapper call. Let's have a look at the corresponding proxy header file code of the interface above.
+Compared to the wrapper code generation, the header code is very simple.
      
+Basically it contains just the declarations corresponding to the definitions
+above.
 
 
      -//proxy header file
+// wrapper header file
 typedef struct SwigObj_SomeClass SomeClass;
 
 SomeClass * new_SomeClass();
@@ -660,33 +637,8 @@ SomeIntTemplateClass * new_SomeIntTemplateClass();
 void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
 
      
 
-For shortness sake, we'll only examine one function that uses all proxy typemaps, as the other functions are analogous.
-
-
      -SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2) {
-  return (SomeClass*)_wrap_someFunction((SwigObj *)carg1, (int)carg2);
-}
-
      
-
-Again, let's first examine the protype:
-
      -ctype                   ctype                        ctype
-----------              ---------------------        ---
-SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
-
      
-
-In the body of this function, we'll reuse the 'proxycouttype' and 'ctype' to cast the return value and arguments of the wrapper function.
-
-
      -        ctype                          cmodtype          cmodtype
-        ----------                     ---------         ___
-return (SomeClass*)_wrap_someFunction((SwigObj *)carg1, (int)carg2);
-
      
-
 
      36.5 Exception handling
      
-
-
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 542b237d8..a091b7343 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1734,23 +1734,18 @@ C_LDSHARED = @C_LDSHARED@
 CXX_LDSHARED = @CXX_LDSHARED@
 C_SO = @C_SO@
 
-PROXYSRC := $(INTERFACE:.i=_proxy.c)
-PROXYOBJ := $(PROXYSRC:.c=.@OBJEXT@)
-
 c: $(SRCDIR_SRCS)
 	$(SWIG) -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) -I$(SRCDIR) $(CFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(INCLUDES)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(PROXYSRC) $(INCLUDES)
 	$(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 	
 c_cpp: $(SRCDIR_SRCS)
 	$(SWIG) -c++ -c $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(PROXYSRC) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 
-c_compile: $(SRCDIR)$(RUNME).c $(PROXYOBJ)
-	$(COMPILETOOL) $(CC) -o $(RUNME) -I. $^ -L. -l$(TARGET)
+c_compile: $(SRCDIR)$(RUNME).c
+	$(COMPILETOOL) $(CC) -o $(RUNME) -I. $< -L. -l$(TARGET)
 
 # -----------------------------------------------------------------
 # Run C example
@@ -1771,7 +1766,7 @@ c_version:
 # -----------------------------------------------------------------
 
 c_clean:
-	rm -f *_wrap.c *_wrap.cxx *_proxy.[ch]
+	rm -f *_wrap.c *_wrap.cxx
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
 	rm -f $(RUNME)
diff --git a/Examples/c/class/runme.c b/Examples/c/class/runme.c
index ddb1cd725..4c1f33ca0 100644
--- a/Examples/c/class/runme.c
+++ b/Examples/c/class/runme.c
@@ -1,6 +1,6 @@
 #include 
 
-#include "example_proxy.h"
+#include "example_wrap.h"
 
 int main(int argc, char **argv) {
   printf("Creating some objects:\n");
diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index 853f64246..6480f3d50 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -4,7 +4,7 @@
 
 #include 
 
-#include "example_proxy.h"
+#include "example_wrap.h"
 
 int main() {
   Test *t = new_Test();
diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c
index 1c9891713..fff159dfc 100644
--- a/Examples/c/simple/runme.c
+++ b/Examples/c/simple/runme.c
@@ -1,11 +1,11 @@
 #include 
 
-#include "example_proxy.h"
+#include "example_wrap.h"
 
 int main(int argc, char **argv) {
   int a = 42;
   int b = 105;
-  int g = gcd(a, b);
+  int g = _wrap_gcd(a, b);
   printf("The gcd of %d and %d is %d\n", a, b, g);
   printf("Foo = %f\n", Foo);
   Foo = 3.1415926;
diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index 0dc91969b..ec43f7505 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -1,4 +1,4 @@
-#include "example_proxy.h"
+#include "example_wrap.h"
 
 int main() {
   Klass *klass = new_Klass();
@@ -34,4 +34,4 @@ int main() {
   }
   
   SWIG_exit(0);
-}
\ No newline at end of file
+}
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index f67f5c2ff..ffb0e78ed 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -165,4 +165,4 @@ run_testcase = \
 	fi;
 
 clean:
-	@rm -f *_wrap.* *_proxy.* *~ *.exe *.dll *.so *.out *runme
+	@rm -f *_wrap.* *~ *.exe *.dll *.so *.out *runme
diff --git a/Examples/test-suite/c/abstract_access_runme.c b/Examples/test-suite/c/abstract_access_runme.c
index b2fe97b4e..e27c9b363 100644
--- a/Examples/test-suite/c/abstract_access_runme.c
+++ b/Examples/test-suite/c/abstract_access_runme.c
@@ -1,4 +1,4 @@
-#include "abstract_access/abstract_access_proxy.h"
+#include "abstract_access/abstract_access_wrap.h"
 #include 
 
 int main(int argc, const char *argv[]) {
diff --git a/Examples/test-suite/c/abstract_change_runme.c b/Examples/test-suite/c/abstract_change_runme.c
index 005dc0623..125fad7e9 100644
--- a/Examples/test-suite/c/abstract_change_runme.c
+++ b/Examples/test-suite/c/abstract_change_runme.c
@@ -1,4 +1,4 @@
-#include "abstract_typedef2/abstract_change_proxy.h"
+#include "abstract_typedef2/abstract_change_wrap.h"
 #include 
 
 int main(int argc, const char *argv[]) {
diff --git a/Examples/test-suite/c/abstract_typedef_runme.c b/Examples/test-suite/c/abstract_typedef_runme.c
index b30bde634..c9c699ba8 100644
--- a/Examples/test-suite/c/abstract_typedef_runme.c
+++ b/Examples/test-suite/c/abstract_typedef_runme.c
@@ -1,4 +1,4 @@
-#include "abstract_typedef/abstract_typedef_proxy.h"
+#include "abstract_typedef/abstract_typedef_wrap.h"
 #include 
 #include 
 
diff --git a/Examples/test-suite/c/abstract_virtual_runme.c b/Examples/test-suite/c/abstract_virtual_runme.c
index fedf8c643..77dca7f88 100644
--- a/Examples/test-suite/c/abstract_virtual_runme.c
+++ b/Examples/test-suite/c/abstract_virtual_runme.c
@@ -1,4 +1,4 @@
-#include "abstract_virtual/abstract_virtual_proxy.h"
+#include "abstract_virtual/abstract_virtual_wrap.h"
 #include 
 
 int main(int argc, const char *argv[]) {
diff --git a/Examples/test-suite/c/add_link_runme.c b/Examples/test-suite/c/add_link_runme.c
index 1faec097d..c9080dbf9 100644
--- a/Examples/test-suite/c/add_link_runme.c
+++ b/Examples/test-suite/c/add_link_runme.c
@@ -1,4 +1,4 @@
-#include "add_link/add_link_proxy.h"
+#include "add_link/add_link_wrap.h"
 #include 
 
 int main(int argc, const char *argv[]) {
diff --git a/Examples/test-suite/c/anonymous_bitfield_runme.c b/Examples/test-suite/c/anonymous_bitfield_runme.c
index d7eb2447d..a9e0e731d 100644
--- a/Examples/test-suite/c/anonymous_bitfield_runme.c
+++ b/Examples/test-suite/c/anonymous_bitfield_runme.c
@@ -1,4 +1,4 @@
-#include "abstract_typedef2/abstract_change_proxy.h"
+#include "abstract_typedef2/abstract_change_wrap.h"
 #include 
 
 int main(int argc, const char *argv[]) {
diff --git a/Examples/test-suite/c/c_backend_cpp_exception_runme.c b/Examples/test-suite/c/c_backend_cpp_exception_runme.c
index 92a4624bc..314a9ece7 100644
--- a/Examples/test-suite/c/c_backend_cpp_exception_runme.c
+++ b/Examples/test-suite/c/c_backend_cpp_exception_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "c_backend_cpp_exception/c_backend_cpp_exception_proxy.h"
+#include "c_backend_cpp_exception/c_backend_cpp_exception_wrap.h"
 
 int main()
 {
diff --git a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
index 2cd9e7d65..f4ddc4836 100644
--- a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
+++ b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
@@ -1,7 +1,7 @@
 #include 
 #include 
 #include 
-#include "c_backend_cpp_natural_std_string/c_backend_cpp_natural_std_string_proxy.h"
+#include "c_backend_cpp_natural_std_string/c_backend_cpp_natural_std_string_wrap.h"
 
 int main()
 {
diff --git a/Examples/test-suite/c/cast_operator_runme.c b/Examples/test-suite/c/cast_operator_runme.c
index b9a14aea9..66ccf984a 100644
--- a/Examples/test-suite/c/cast_operator_runme.c
+++ b/Examples/test-suite/c/cast_operator_runme.c
@@ -1,6 +1,6 @@
 #include 
 
-#include "cast_operator/cast_operator_proxy.h"
+#include "cast_operator/cast_operator_wrap.h"
 
 int main() {
   A *a = new_A();
diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index 4ddc217d0..bb10749c1 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -1,7 +1,7 @@
 #include 
 #include 
 
-#include "char_strings/char_strings_proxy.h"
+#include "char_strings/char_strings_wrap.h"
 
 int main() {
   char *CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
diff --git a/Examples/test-suite/c/cpp_basic_class_enum_runme.c b/Examples/test-suite/c/cpp_basic_class_enum_runme.c
index 1b84d5943..08634c7ba 100644
--- a/Examples/test-suite/c/cpp_basic_class_enum_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_enum_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_class_enum/cpp_basic_class_enum_proxy.h"
+#include "cpp_basic_class_enum/cpp_basic_class_enum_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_class_method_runme.c b/Examples/test-suite/c/cpp_basic_class_method_runme.c
index d85e36278..93fb4e190 100644
--- a/Examples/test-suite/c/cpp_basic_class_method_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_method_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_class_method/cpp_basic_class_method_proxy.h"
+#include "cpp_basic_class_method/cpp_basic_class_method_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_class_runme.c b/Examples/test-suite/c/cpp_basic_class_runme.c
index aa4d481b5..0b835ee21 100644
--- a/Examples/test-suite/c/cpp_basic_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_runme.c
@@ -1,4 +1,4 @@
-#include "cpp_basic_class/cpp_basic_class_proxy.h"
+#include "cpp_basic_class/cpp_basic_class_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
index 3cfb658ba..747e2c864 100644
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_class_var_pub_member_atom/cpp_basic_class_var_pub_member_atom_proxy.h"
+#include "cpp_basic_class_var_pub_member_atom/cpp_basic_class_var_pub_member_atom_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
index 4be7d2a54..cc4127d9e 100644
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_class_var_pub_member_class/cpp_basic_class_var_pub_member_class_proxy.h"
+#include "cpp_basic_class_var_pub_member_class/cpp_basic_class_var_pub_member_class_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
index 1a6f332a3..a5cabe8a7 100644
--- a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_class_virtual_method/cpp_basic_class_virtual_method_proxy.h"
+#include "cpp_basic_class_virtual_method/cpp_basic_class_virtual_method_wrap.h"
 
 int main()
 {
diff --git a/Examples/test-suite/c/cpp_basic_global_enum_runme.c b/Examples/test-suite/c/cpp_basic_global_enum_runme.c
index 9620619e7..43805679f 100644
--- a/Examples/test-suite/c/cpp_basic_global_enum_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_enum_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_global_enum/cpp_basic_global_enum_proxy.h"
+#include "cpp_basic_global_enum/cpp_basic_global_enum_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
index 80540bda1..4ef992da0 100644
--- a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_global_var_atom/cpp_basic_global_var_atom_proxy.h"
+#include "cpp_basic_global_var_atom/cpp_basic_global_var_atom_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_global_var_class_runme.c b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
index a620e58b3..12a586485 100644
--- a/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_global_var_class/cpp_basic_global_var_class_proxy.h"
+#include "cpp_basic_global_var_class/cpp_basic_global_var_class_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
index e06f8b128..95a1ce5c3 100644
--- a/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
@@ -1,4 +1,4 @@
-#include "cpp_basic_namespaced_class/cpp_basic_namespaced_class_proxy.h"
+#include "cpp_basic_namespaced_class/cpp_basic_namespaced_class_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index 32079f3d2..ec73ff704 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -1,4 +1,4 @@
-#include "cpp_basic/cpp_basic_proxy.h"
+#include "cpp_basic/cpp_basic_wrap.h"
 #include 
 #include 
 
diff --git a/Examples/test-suite/c/cpp_basic_template_class_runme.c b/Examples/test-suite/c/cpp_basic_template_class_runme.c
index 0f3bc8d1e..f2aac8cd5 100644
--- a/Examples/test-suite/c/cpp_basic_template_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_template_class_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_template_class/cpp_basic_template_class_proxy.h"
+#include "cpp_basic_template_class/cpp_basic_template_class_wrap.h"
 
 int main() {
 	MyTemplateClass_Int *ci = new_MyTemplateClass_Int();
diff --git a/Examples/test-suite/c/cpp_basic_template_function_runme.c b/Examples/test-suite/c/cpp_basic_template_function_runme.c
index 24dee571a..10943d5e7 100644
--- a/Examples/test-suite/c/cpp_basic_template_function_runme.c
+++ b/Examples/test-suite/c/cpp_basic_template_function_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_template_function/cpp_basic_template_function_proxy.h"
+#include "cpp_basic_template_function/cpp_basic_template_function_wrap.h"
 
 int main() {
     assert(GetMaxInt(3, 5) == 5);
diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c
index 8c3d3b759..fa88134cb 100644
--- a/Examples/test-suite/c/cpp_enum_runme.c
+++ b/Examples/test-suite/c/cpp_enum_runme.c
@@ -1,4 +1,4 @@
-#include "cpp_enum/cpp_enum_proxy.h"
+#include "cpp_enum/cpp_enum_wrap.h"
 #include 
 #include 
 
diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c
index 374e55b06..a98815dc5 100644
--- a/Examples/test-suite/c/enums_runme.c
+++ b/Examples/test-suite/c/enums_runme.c
@@ -1,6 +1,6 @@
 #include 
 
-#include "enums/enums_proxy.h"
+#include "enums/enums_wrap.h"
 
 int main() {
   bar2(1);
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index a409db13e..2aadbfeb1 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -1,6 +1,6 @@
 #include 
 
-#include "exception_order/exception_order_proxy.h"
+#include "exception_order/exception_order_wrap.h"
 
 int main() {
   A* a = new_A();
diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index 2409d8df3..0a5a3c9b8 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -1,6 +1,6 @@
 #include 
 
-#include "operator_overload/operator_overload_proxy.h"
+#include "operator_overload/operator_overload_wrap.h"
 
 #define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); SWIG_exit(0); }
 
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0b7b21502..6b97f45bc 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -32,6 +32,68 @@ int SwigType_isbuiltin(SwigType *t) {
   return 0;
 }
 
+
+// Private helpers, could be made public and reused from other language modules in the future.
+namespace
+{
+
+// Helper class to output "begin" fragment in the ctor and "end" in the dtor.
+class begin_end_output_guard
+{
+public:
+  begin_end_output_guard(File* f, const_String_or_char_ptr begin, const_String_or_char_ptr end)
+    : f_(f),
+      end_(NewString(end))
+  {
+    String* const s = NewString(begin);
+    Dump(s, f_);
+    Delete(s);
+  }
+
+  ~begin_end_output_guard()
+  {
+    Dump(end_, f_);
+    Delete(end_);
+  }
+
+private:
+  // Non copyable.
+  begin_end_output_guard(const begin_end_output_guard&);
+  begin_end_output_guard& operator=(const begin_end_output_guard&);
+
+  File* const f_;
+  String* const end_;
+};
+
+// Subclass to output extern "C" guards when compiling as C++.
+class cplusplus_output_guard : private begin_end_output_guard
+{
+public:
+  explicit cplusplus_output_guard(File* f)
+    : begin_end_output_guard(
+        f,
+        "#ifdef __cplusplus\n"
+        "extern \"C\" {\n"
+        "#endif\n\n",
+        "#ifdef __cplusplus\n"
+        "}\n"
+        "#endif\n"
+      )
+  {
+  }
+};
+
+// Return the public name to use for the given class.
+//
+// It basically just prepends the namespace, if any, to the class name, and mangles the result.
+String *make_public_class_name(String* nspace, String* classname) {
+  String *s = nspace ? NewStringf("%s_", nspace) : NewString("");
+  Append(s, classname);
+  return s;
+}
+
+} // anonymous namespace
+
 class C:public Language {
   static const char *usage;
 
@@ -39,13 +101,8 @@ class C:public Language {
   File *f_runtime;
   File *f_header;
   File *f_wrappers;
+  File *f_wrappers_decl;
   File *f_init;
-  File *f_proxy_c;
-  File *f_proxy_h;
-
-  String *f_proxy_code_init;
-  String *f_proxy_code_body;
-  String *f_proxy_header;
 
   String *empty_string;
   String *int_string;
@@ -53,7 +110,6 @@ class C:public Language {
   String *destroy_object;
   String *tl_namespace; // optional top level namespace
 
-  bool proxy_flag;
   bool except_flag;
 
 public:
@@ -68,7 +124,6 @@ public:
     create_object(0),
     destroy_object(0),
     tl_namespace(NULL),
-    proxy_flag(true),
     except_flag(true) {
   }
 
@@ -86,10 +141,8 @@ public:
      String *nspace = Getattr(n, "sym:nspace");
 
      if (nspace) {
-          Replaceall(nspace, ".", "_"); // Classes' namespaces get dotted -> replace; FIXME in core!
-          proxyname = Swig_name_proxy(nspace, symname);
-          if (tl_namespace)
-            proxyname = Swig_name_proxy(tl_namespace, proxyname);
+          // FIXME: using namespace as class name is a hack.
+          proxyname = Swig_name_member(tl_namespace, nspace, symname);
      } else {
           proxyname = symname;
      }
@@ -111,7 +164,7 @@ public:
      Node *n = NULL;
 
      t = SwigType_typedef_resolve_all(t);
-     if (!proxy_flag || !t || !(n = classLookup(t)))
+     if (!t || !(n = classLookup(t)))
       return NULL;
 
     return getNamespacedName(n);
@@ -243,12 +296,6 @@ public:
       if (argv[i]) {
         if (strcmp(argv[i], "-help") == 0) {
           Printf(stdout, "%s\n", usage);
-        } else if ((strcmp(argv[i], "-proxy") == 0) || (strcmp(argv[i], "-proxy") == 0)) {
-          proxy_flag = true;
-          Swig_mark_arg(i);
-        } else if (strcmp(argv[i], "-noproxy") == 0) {
-          proxy_flag = false;
-          Swig_mark_arg(i);
         } else if (strcmp(argv[i], "-noexcept") == 0) {
           except_flag = false;
           Swig_mark_arg(i);
@@ -344,75 +391,65 @@ public:
 
     Swig_banner(f_begin);
 
-    // generate proxy files if enabled
-    if (proxy_flag) {
-      f_proxy_code_init = NewString("");
-      f_proxy_code_body = NewString("");
-      f_proxy_header = NewString("");
-
-      // create proxy files with appropriate name
-      String *proxy_code_filename = NewStringf("%s%s_proxy.c", SWIG_output_directory(), Char(module));
-      if ((f_proxy_c = NewFile(proxy_code_filename, "w", SWIG_output_files())) == 0) {
-        FileErrorDisplay(proxy_code_filename);
+    // Open the file where all wrapper declarations will be written to in the end.
+    String* const outfile_h = Getattr(n, "outfile_h");
+    File* const f_wrappers_h = NewFile(outfile_h, "w", SWIG_output_files());
+    if (!f_wrappers_h) {
+      FileErrorDisplay(outfile_h);
         SWIG_exit(EXIT_FAILURE);
       }
 
-      String *proxy_header_filename = NewStringf("%s%s_proxy.h", SWIG_output_directory(), Char(module));
-      if ((f_proxy_h = NewFile(proxy_header_filename, "w", SWIG_output_files())) == 0) {
-        FileErrorDisplay(proxy_header_filename);
-        SWIG_exit(EXIT_FAILURE);
-      }
-
-      Swig_register_filebyname("proxy_code_init", f_proxy_code_init);
-      Swig_register_filebyname("proxy_code_body", f_proxy_code_body);
-      Swig_register_filebyname("proxy_header", f_proxy_header);
-
-      Swig_banner(f_proxy_code_init);
-      Swig_banner(f_proxy_header);
-      Printf(f_proxy_code_init, "#include \"%s\"\n\n", proxy_header_filename);
-      Printf(f_proxy_header, "#ifndef _%s_proxy_H_\n#define _%s_proxy_H_\n\n", Char(module), Char(module));
-    }
+    Swig_banner(f_wrappers_h);
 
     Swig_register_filebyname("begin", f_begin);
     Swig_register_filebyname("header", f_header);
     Swig_register_filebyname("wrapper", f_wrappers);
     Swig_register_filebyname("runtime", f_runtime);
     Swig_register_filebyname("init", f_init);
+    Swig_register_filebyname("proxy_header", f_wrappers_h);
 
-    Swig_name_register("proxyname", "%n_%v");
+    {
+      // Create a string to which the wrapper declarations will be appended one by one.
+      f_wrappers_decl = NewString("");
 
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "extern \"C\" {\n");
-    Printf(f_wrappers, "#endif\n\n");
+      String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", Char(module));
+      String* const include_guard_begin = NewStringf(
+          "#ifndef %s\n"
+          "#define %s\n\n",
+          include_guard_name,
+          include_guard_name
+        );
+      String* const include_guard_end = NewStringf(
+          "\n"
+          "#endif /* %s */\n",
+          include_guard_name
+        );
 
-    
-    if (except_flag) {
-      start_create_object();
-      start_destroy_object();
-    }
-    
-    // emit code for children
-    Language::top(n);
+      begin_end_output_guard
+        include_guard_wrappers_h(f_wrappers_h, include_guard_begin, include_guard_end);
 
-    if (except_flag) {
-      Append(f_header, finish_create_object());
-      Append(f_header, finish_destroy_object());
-    }
+      {
+        cplusplus_output_guard
+          cplusplus_guard_wrappers(f_wrappers),
+          cplusplus_guard_wrappers_h(f_wrappers_decl);
 
-    Printf(f_wrappers, "#ifdef __cplusplus\n");
-    Printf(f_wrappers, "}\n");
-    Printf(f_wrappers, "#endif\n");
+        if (except_flag) {
+          start_create_object();
+          start_destroy_object();
+        }
 
-    // finalize generating proxy file
-    if (proxy_flag) {
-      Printv(f_proxy_c, f_proxy_code_init, "\n", NIL);
-      Printv(f_proxy_c, f_proxy_code_body, "\n", NIL);
-      Printv(f_proxy_h, f_proxy_header, "\n#endif /* _", Char(module), "_proxy_H_ */\n", NIL);
-      Delete(f_proxy_c);
-      Delete(f_proxy_h);
-      Delete(f_proxy_code_init);
-      Delete(f_proxy_header);
-    }
+        // emit code for children
+        Language::top(n);
+
+        if (except_flag) {
+          Append(f_header, finish_create_object());
+          Append(f_header, finish_destroy_object());
+        }
+      } // close extern "C" guards
+
+      Dump(f_wrappers_decl, f_wrappers_h);
+      Delete(f_wrappers_decl);
+    } // close wrapper header guard
 
     // write all to the file
     Dump(f_header, f_runtime);
@@ -424,6 +461,7 @@ public:
     Delete(f_begin);
     Delete(f_header);
     Delete(f_wrappers);
+    Delete(f_wrappers_h);
     Delete(f_init);
     Delete(f_runtime);
 
@@ -435,8 +473,6 @@ public:
    * ------------------------------------------------------------------------ */  
 
   virtual int globalvariableHandler(Node *n) {
-    if (!proxy_flag)
-      return SWIG_OK;
     String *name = Getattr(n, "name");
     SwigType *type = Getattr(n, "type");
     String *type_str = Copy(SwigType_str(type, 0));
@@ -445,11 +481,11 @@ public:
       char *c = Char(type_str);
       c[Len(type_str) - Len(dims) - 1] = '\0';
       String *bare_type = NewStringf("%s", c);
-      Printv(f_proxy_header, "SWIGIMPORT ", bare_type, " ", name, "[];\n\n", NIL);
+      Printv(f_wrappers_decl, "SWIGIMPORT ", bare_type, " ", name, "[];\n\n", NIL);
       Delete(bare_type);
     }
     else
-      Printv(f_proxy_header, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL);
+      Printv(f_wrappers_decl, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL);
     Delete(type_str);
     return SWIG_OK;
   }
@@ -633,29 +669,14 @@ ready:
          Printf(wrapper->code, "return result;\n");
        Printf(wrapper->code, "}");
 
-       if (proxy_flag) // take care of proxy function
-         {
-            SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
+       SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
 
-            if (proxy_type) {
-                 return_type = SwigType_str(proxy_type, 0);
-            }
+       if (proxy_type) {
+	 return_type = SwigType_str(proxy_type, 0);
+       }
 
-            // emit proxy functions prototypes
-            // print wrapper prototype into proxy body for later use within proxy
-            // body
-            Printv(f_proxy_code_init, return_type, " ", wname, "(", proto, ");\n", NIL);
-
-            // print actual proxy code into proxy .c file
-            Printv(f_proxy_code_body, return_type, " ", name, "(", proto, ") {\n", NIL);
-
-            // print the call of the wrapper function
-            Printv(f_proxy_code_body, "  return ", wname, "(", arg_names, ");\n}\n", NIL);
-
-            // add function declaration to the proxy header file
-            Printv(f_proxy_header, return_type, " ", name, "(", proto, ");\n\n", NIL);
-
-         }
+       // add function declaration to the header file
+       Printv(f_wrappers_decl, return_type, " ", wname, "(", proto, ");\n\n", NIL);
 
        Wrapper_print(wrapper, f_wrappers);
 
@@ -922,9 +943,8 @@ ready:
     {
        // C++ function wrapper proxy code
        ParmList *parms = Getattr(n, "parms");
-       String *wname = Swig_name_wrapper(name);
+       String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        SwigType *preturn_type = functionWrapperCPPSpecificProxyReturnTypeGet(n);
-       String *wproto = Getattr(n, "wrap:proto");
        String *pproto = functionWrapperCPPSpecificProxyPrototypeGet(n, parms);
        String *wrapper_call = NewString("");
        SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
@@ -933,28 +953,11 @@ ready:
             preturn_type = SwigType_str(proxy_type, 0);
        }
 
-       // emit proxy functions prototypes
-       // print wrapper prototype into proxy body for later use within proxy
-       // body
-       Printv(f_proxy_code_init, wproto, "\n", NIL);
-
-       // print actual proxy code into proxy .c file
-       Printv(f_proxy_code_body, preturn_type, " ", name, "(", pproto, ") {\n", NIL);
-
-       // print the call of the wrapper function
-       //Printv(f_proxy_code_body, "  return ", wname, "(", proxy_wrap_args, ");\n}\n", NIL);
-
-       // Add cast if necessary
-       if (SwigType_type(preturn_type) != T_VOID) {
-            Printf(wrapper_call, "(%s)", preturn_type);
-       }
-       Printv(wrapper_call, functionWrapperCPPSpecificProxyWrapperCallGet(n, wname, parms), NIL);
-       Printv(f_proxy_code_body, "  return ", wrapper_call, ";\n}\n", NIL);
-
        // add function declaration to the proxy header file
-       Printv(f_proxy_header, preturn_type, " ", name, "(", pproto, ");\n\n", NIL);
+       Printv(f_wrappers_decl, preturn_type, " ", wname, "(", pproto, ");\n\n", NIL);
 
        // cleanup
+       Delete(wname);
        Delete(pproto);
        Delete(wrapper_call);
        Delete(preturn_type);
@@ -968,7 +971,7 @@ ready:
        SwigType *type = Getattr(n, "type");
        SwigType *otype = Copy(type);
        SwigType *return_type = functionWrapperCPPSpecificWrapperReturnTypeGet(n);
-       String *wname = Swig_name_wrapper(name);
+       String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        String *arg_names = NewString("");
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
@@ -1072,12 +1075,6 @@ ready:
        }
 
        Printv(wrapper->def, ")", NIL);
-       //Create prototype for proxy file
-       String *wrap_proto = Copy(wrapper->def);
-       //Declare function as extern so only the linker has to find it
-       Replaceall(wrap_proto, "SWIGEXPORTC", "extern");
-       Printv(wrap_proto, ";", NIL);
-       Setattr(n, "wrap:proto", wrap_proto);
        Printv(wrapper->def, " {", NIL);
 
        if (Cmp(nodeType(n), "destructor") != 0) {
@@ -1249,9 +1246,7 @@ ready:
 
        // C++ function wrapper
        functionWrapperCPPSpecificWrapper(n, name);
-
-       if (proxy_flag) // take care of proxy function
-         functionWrapperCPPSpecificProxy(n, name);
+       functionWrapperCPPSpecificProxy(n, name);
 
        Delete(name);
     }
@@ -1317,7 +1312,7 @@ ready:
       if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) {
         String* type = NewString("");
         Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL);
-        Printv(f_proxy_header, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
+        Printv(f_wrappers_decl, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
         Delete(type);
       }
       // WARNING: proxy delaration can be different than original code
@@ -1381,8 +1376,7 @@ ready:
       }
 
       // declare type for specific class in the proxy header
-      if (proxy_flag)
-        Printv(f_proxy_header, "\ntypedef struct SwigObj_", name, " ", name, ";\n\n", NIL);
+      Printv(f_wrappers_decl, "\ntypedef struct SwigObj_", name, " ", name, ";\n\n", NIL);
 
       Delete(sobj);
       Delete(name);
@@ -1390,20 +1384,18 @@ ready:
     }
     else if (Cmp(Getattr(n, "kind"), "struct") == 0) {
       // this is C struct, just declare it in the proxy
-      if (proxy_flag) {
-        String *storage = Getattr(n, "storage");
-        int usetd = storage && Cmp(storage, "typedef") == 0;
-        if (usetd)
-          Append(f_proxy_header, "typedef struct {\n");
-        else 
-          Printv(f_proxy_header, "struct ", name, " {\n", NIL);
-        Node *node = firstChild(n);
-        emit_c_struct_def(node);
-        if (usetd)
-          Printv(f_proxy_header, "} ", name, ";\n\n", NIL);
-        else
-          Append(f_proxy_header, "};\n\n");
-      }
+      String *storage = Getattr(n, "storage");
+      int usetd = storage && Cmp(storage, "typedef") == 0;
+      if (usetd)
+        Append(f_wrappers_decl, "typedef struct {\n");
+      else 
+        Printv(f_wrappers_decl, "struct ", name, " {\n", NIL);
+      Node *node = firstChild(n);
+      emit_c_struct_def(node);
+      if (usetd)
+        Printv(f_wrappers_decl, "} ", name, ";\n\n", NIL);
+      else
+        Append(f_wrappers_decl, "};\n\n");
 
       Delete(sobj);
       Delete(name);
@@ -1571,7 +1563,7 @@ ready:
     SwigType_add_pointer(ctype);
     Setattr(n, "type", ctype);
     Setattr(n, "c:objstruct", "1");
-    stype = Swig_name_proxy(nspace, newclassname);
+    stype = make_public_class_name(nspace, newclassname);
     SwigType_add_pointer(stype);
     Setattr(n, "c:stype", stype);
 
@@ -1630,7 +1622,7 @@ ready:
     SwigType_add_pointer(ctype);
     Setattr(n, "type", ctype);
     Setattr(n, "c:objstruct", "1");
-    stype = Swig_name_proxy(nspace, newclassname);
+    stype = make_public_class_name(nspace, newclassname);
     SwigType_add_pointer(stype);
     Setattr(n, "c:stype", stype);
 
@@ -1687,7 +1679,7 @@ ready:
     SwigType_add_pointer(ctype);
     p = NewParm(ctype, "self", n);
     Setattr(p, "lname", "arg1");
-    stype = Swig_name_proxy(nspace, newclassname);
+    stype = make_public_class_name(nspace, newclassname);
     SwigType_add_pointer(stype);
     Setattr(p, "c:stype", stype);
     Setattr(p, "c:objstruct", "1");
@@ -1742,7 +1734,7 @@ ready:
     String *name = Getattr(n, "value");
     String *value = Getattr(n, "enumvalueex");
     value = value ? value : Getattr(n, "enumvalue");
-    Printv(f_proxy_header, "#define ", Swig_name_mangle(name), " ", value, "\n", NIL);
+    Printv(f_wrappers_decl, "#define ", Swig_name_mangle(name), " ", value, "\n", NIL);
     Swig_restore(n);
     return SWIG_OK;
   }
@@ -1752,11 +1744,9 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int constantWrapper(Node *n) {
-    if (!proxy_flag)
-      return SWIG_OK;
     String *name = Getattr(n, "sym:name");
     String *value = Getattr(n, "value");
-    Printv(f_proxy_header, "#define ", name, " ", value, "\n", NIL);
+    Printv(f_wrappers_decl, "#define ", name, " ", value, "\n", NIL);
     return SWIG_OK;
   }
   
@@ -1811,7 +1801,6 @@ extern "C" Language *swig_c(void) {
 
 const char *C::usage = (char *) "\
 C Options (available with -c)\n\
-     -noproxy      - do not generate proxy interface\n\
      -noexcept     - do not generate exception handling code\n\
 \n";
 
diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c
index 29d530d67..2430ab407 100644
--- a/Source/Swig/naming.c
+++ b/Source/Swig/naming.c
@@ -224,31 +224,6 @@ String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_p
   return r;
 }
 
-/* -----------------------------------------------------------------------------
- * Swig_name_proxy()
- *
- * Returns the name of a proxy function.
- * ----------------------------------------------------------------------------- */
-
-String *Swig_name_proxy(const_String_or_char_ptr nspace, const_String_or_char_ptr fname) {
-  String *r;
-  String *f;
-
-  r = NewStringEmpty();
-  if (!naming_hash)
-    naming_hash = NewHash();
-  f = Getattr(naming_hash, "proxyname");
-  if (!f) {
-    Append(r, "%n_%v");
-  } else {
-    Append(r, f);
-  }
-  Replace(r, (nspace ? "%n" : "%n_"), nspace, DOH_REPLACE_ANY);
-  Replace(r, "%v", fname, DOH_REPLACE_ANY);
-  name_mangle(r);
-  return r;
-}
-
 /* -----------------------------------------------------------------------------
  * Swig_name_get()
  *
diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c
index 415b27146..a57222745 100644
--- a/Source/Swig/stype.c
+++ b/Source/Swig/stype.c
@@ -286,20 +286,6 @@ int SwigType_issimple(const SwigType *t) {
   return 1;
 }
 
-int SwigType_isbuiltin(SwigType *t) {
-  const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 };
-  int i = 0;
-  char *c = Char(t);
-  if (!t)
-    return 0;
-  while (builtins[i]) {
-    if (strcmp(c, builtins[i]) == 0)
-      return 1;
-    i++;
-  }
-  return 0;
-}
-
 /* -----------------------------------------------------------------------------
  * SwigType_default_create()
  *
diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h
index 417c02fda..35a67640f 100644
--- a/Source/Swig/swig.h
+++ b/Source/Swig/swig.h
@@ -274,7 +274,6 @@ extern int        ParmList_is_compactdefargs(ParmList *p);
   extern String *Swig_name_mangle(const_String_or_char_ptr s);
   extern String *Swig_name_wrapper(const_String_or_char_ptr fname);
   extern String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_ptr classname, const_String_or_char_ptr membername);
-  extern String *Swig_name_proxy(const_String_or_char_ptr nspace, const_String_or_char_ptr fname);
   extern String *Swig_name_get(const_String_or_char_ptr nspace, const_String_or_char_ptr vname);
   extern String *Swig_name_set(const_String_or_char_ptr nspace, const_String_or_char_ptr vname);
   extern String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_char_ptr classname);

From 795e3adb0d70ee47a61f4e82316d2062a98f0c35 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 18:08:55 +0200
Subject: [PATCH 204/508] Use CFLAGS when compiling test code for C module
 tests

This is useful to pass e.g. CFLAGS=-g on make command line.
---
 Examples/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index a091b7343..3919427f5 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1745,7 +1745,7 @@ c_cpp: $(SRCDIR_SRCS)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 
 c_compile: $(SRCDIR)$(RUNME).c
-	$(COMPILETOOL) $(CC) -o $(RUNME) -I. $< -L. -l$(TARGET)
+	$(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. $< -L. -l$(TARGET)
 
 # -----------------------------------------------------------------
 # Run C example

From 62230758e4009bb1bafb9ebae56ed7a94f7f18d1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 15:37:32 +0200
Subject: [PATCH 205/508] Output declarations of all types before the functions
 declarations

This fixes compilation of the generated code when a function uses a forward
declared type as was the case in e.g. std_vector example.
---
 Source/Modules/c.cxx | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6b97f45bc..9af2d0a73 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -101,6 +101,7 @@ class C:public Language {
   File *f_runtime;
   File *f_header;
   File *f_wrappers;
+  File *f_wrappers_types;
   File *f_wrappers_decl;
   File *f_init;
 
@@ -409,9 +410,6 @@ public:
     Swig_register_filebyname("proxy_header", f_wrappers_h);
 
     {
-      // Create a string to which the wrapper declarations will be appended one by one.
-      f_wrappers_decl = NewString("");
-
       String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", Char(module));
       String* const include_guard_begin = NewStringf(
           "#ifndef %s\n"
@@ -428,10 +426,17 @@ public:
       begin_end_output_guard
         include_guard_wrappers_h(f_wrappers_h, include_guard_begin, include_guard_end);
 
+      // All the struct types used by the functions go to f_wrappers_types so that they're certain to be defined before they're used by any functions. All the
+      // functions declarations go directly to f_wrappers_decl and f_wrappers_h_body combines both of them.
+      String* const f_wrappers_h_body = NewString("");
+      f_wrappers_types = NewString("");
+      f_wrappers_decl = NewString("");
+
       {
+
         cplusplus_output_guard
           cplusplus_guard_wrappers(f_wrappers),
-          cplusplus_guard_wrappers_h(f_wrappers_decl);
+          cplusplus_guard_wrappers_h(f_wrappers_h_body);
 
         if (except_flag) {
           start_create_object();
@@ -445,10 +450,16 @@ public:
           Append(f_header, finish_create_object());
           Append(f_header, finish_destroy_object());
         }
+
+        Dump(f_wrappers_types, f_wrappers_h_body);
+        Delete(f_wrappers_types);
+
+        Dump(f_wrappers_decl, f_wrappers_h_body);
+        Delete(f_wrappers_decl);
       } // close extern "C" guards
 
-      Dump(f_wrappers_decl, f_wrappers_h);
-      Delete(f_wrappers_decl);
+      Dump(f_wrappers_h_body, f_wrappers_h);
+      Delete(f_wrappers_h_body);
     } // close wrapper header guard
 
     // write all to the file
@@ -1312,7 +1323,7 @@ ready:
       if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) {
         String* type = NewString("");
         Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL);
-        Printv(f_wrappers_decl, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
+        Printv(f_wrappers_types, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
         Delete(type);
       }
       // WARNING: proxy delaration can be different than original code
@@ -1376,7 +1387,7 @@ ready:
       }
 
       // declare type for specific class in the proxy header
-      Printv(f_wrappers_decl, "\ntypedef struct SwigObj_", name, " ", name, ";\n\n", NIL);
+      Printv(f_wrappers_types, "typedef struct SwigObj_", name, " ", name, ";\n\n", NIL);
 
       Delete(sobj);
       Delete(name);
@@ -1387,15 +1398,15 @@ ready:
       String *storage = Getattr(n, "storage");
       int usetd = storage && Cmp(storage, "typedef") == 0;
       if (usetd)
-        Append(f_wrappers_decl, "typedef struct {\n");
+        Append(f_wrappers_types, "typedef struct {\n");
       else 
-        Printv(f_wrappers_decl, "struct ", name, " {\n", NIL);
+        Printv(f_wrappers_types, "struct ", name, " {\n", NIL);
       Node *node = firstChild(n);
       emit_c_struct_def(node);
       if (usetd)
-        Printv(f_wrappers_decl, "} ", name, ";\n\n", NIL);
+        Printv(f_wrappers_types, "} ", name, ";\n\n", NIL);
       else
-        Append(f_wrappers_decl, "};\n\n");
+        Append(f_wrappers_types, "};\n\n");
 
       Delete(sobj);
       Delete(name);

From 2a37e53b62ca71567f9af7553a275bbce003374f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 17:09:20 +0200
Subject: [PATCH 206/508] Remove abstract_access from broken tests

It passes now with C backend.
---
 Examples/test-suite/common.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 6c272e826..6f8a4cffa 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -82,7 +82,6 @@ Makefile: $(srcdir)/Makefile.in ../../../config.status
 
 # Broken C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_BROKEN += \
-    abstract_access \
 	constants \
 	cpp_broken \
 	director_nested_class \

From 42c3d420b273563d6a7b86b9be18fb06c29091d7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 13 Apr 2016 18:24:51 +0200
Subject: [PATCH 207/508] Remove SWIG_temporary from the generated code

This doesn't seem to be used anywhere.
---
 Lib/c/c.swg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 41f609b80..b7d78661e 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -374,11 +374,6 @@ typedef struct {
 %}
   
   #endif
-  
-%insert(runtime) %{    
-  SwigObj *SWIG_temporary = (SwigObj *) malloc(sizeof(SwigObj));
-%}
-
 #else
 
 %insert("runtime") %{

From 4962871cd947fbd17ecf32a8099e74e607b2337f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Apr 2016 00:42:24 +0200
Subject: [PATCH 208/508] No real changes, just remove an unused variable

"sobj" in C::classHandler() was not used at all.
---
 Source/Modules/c.cxx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9af2d0a73..47d7e407e 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1338,7 +1338,6 @@ ready:
 
   virtual int classHandler(Node *n) {
     String *name = getNamespacedName(n);
-    String *sobj = NewString("");
     List *baselist = Getattr(n, "bases");
 
     if (CPlusPlus) {
@@ -1389,7 +1388,6 @@ ready:
       // declare type for specific class in the proxy header
       Printv(f_wrappers_types, "typedef struct SwigObj_", name, " ", name, ";\n\n", NIL);
 
-      Delete(sobj);
       Delete(name);
       return Language::classHandler(n);
     }
@@ -1408,7 +1406,6 @@ ready:
       else
         Append(f_wrappers_types, "};\n\n");
 
-      Delete(sobj);
       Delete(name);
     }
     return SWIG_OK;

From 8ff7941503f917f1ddf2e07a65ebcf5861eb3be8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Apr 2016 22:55:09 +0200
Subject: [PATCH 209/508] Don't generate delete functions if dtor is not
 accessible

This fixes failures in virtual_dtor and using_protected unit tests.
---
 Source/Modules/c.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 47d7e407e..5074d0f0c 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1669,6 +1669,9 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int destructorHandler(Node *n) {
+    if (Cmp(Getattr(n, "access"), "public") != 0)
+      return SWIG_NOWRAP;
+
     Node *klass = Swig_methodclass(n);
     String *classname = Getattr(klass, "name");// Remove class namespace from constructor
     String *classtype = Getattr(klass, "classtype");

From 818b399c9ec5f4930684b4397ac976b6730768aa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Apr 2016 01:41:08 +0200
Subject: [PATCH 210/508] Drastically simplify and optimize object creation and
 destruction

Don't populate the typenames array for each and every created object and don't
search it when deleting every object, this is O(N) in number of classes and is
completely impractical for any big library where N can easily be several
thousands. Use destructor function which will correctly destroy the object
instead.

Also don't store each created objects in the global registry, there doesn't
seem to be any point in it.

And, in fact, don't bother with the typenames at all, just use another
pseudo-virtual function for checking whether a class inherits from a class
with the given name.

There is unfortunately one problem with the new approach: it doesn't work when
the same C++ type is wrapped under different names as this results in multiple
specializations of SWIG_derives_from<> for this type. But this is a relatively
rare situation (but which does arise in template_default2 unit test, which had
to be disabled) and could be fixed in the future by completely resolving the
type, including the default template parameters values, and checking if
SWIG_derives_from had been already specialized for it. In the meanwhile, this
regression is not a big deal compared to the advantages of the new approach.
---
 Doc/Manual/C.html                 |  15 +-
 Examples/test-suite/c/Makefile.in |   1 +
 Lib/c/c.swg                       |  61 +++----
 Lib/c/cexcept.swg                 | 110 +++----------
 Lib/exception.i                   |   3 +-
 Source/Modules/c.cxx              | 258 ++++++++++--------------------
 6 files changed, 150 insertions(+), 298 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 7a4b646b1..c19b46826 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -21,6 +21,7 @@
 
 
    • Basic C++ wrapping
 
        
@@ -324,6 +325,14 @@ By default, SWIG attempts to build a natural C interface to your C/C++ code.
 This section briefly covers the essential aspects of this wrapping.
 
        
 
+
        36.3.3 Enums
        
+
+
        
+C enums are simply copied to the generated code and keep the same name as in
+the original code.
+
        
+
+
 
        36.4.1 Classes
        
 
 
@@ -522,8 +531,7 @@ SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
     const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
   }
   {
-    result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass));
-    result->obj = (void*) &cppresult;
+    result = SWIG_create_object(cppresult, SWIG_STR(SomeClass));
   }
   return result;
 }
@@ -604,8 +612,7 @@ At this point we are ready to call the C++ function with our parameters.
        
 Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap
 
         {
-  result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass));
-  result->obj = (void*) &cppresult;
+  result = SWIG_create_object(cppresult, SWIG_STR(SomeClass));
 }
 
        
 
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index ffb0e78ed..d3b4e9243 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -95,6 +95,7 @@ FAILING_CPP_TESTS := \
     special_variables \
     template_arg_typename \
     template_basic \
+    template_default2 \
     template_explicit \
     template_ns4 \
     template_tbase_template \
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index b7d78661e..94deb3eb7 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -273,19 +273,16 @@ same_action_all_primitive_types_but_void(out, "$result = $1;")
 }
 
 %typemap(out) SWIGTYPE *&, SWIGTYPE ** {
-  static SwigObj* _ptr = (SwigObj*) SWIG_create_object(SWIG_STR($1_basetype));
+  static SwigObj* _ptr = (SwigObj*) SWIG_create_object($1, SWIG_STR($1_basetype));
   $result = &_ptr;
-  (*result)->obj = (void*) $1;
 }
 
 %typemap(out) SWIGTYPE {
-  $result = (SwigObj*) SWIG_create_object(SWIG_STR($1_basetype));
-  $result->obj = (void*) &$1;
+  $result = (SwigObj*) SWIG_create_object(&$1, SWIG_STR($1_basetype));
 }
 
 %typemap(out) SWIGTYPE *, SWIGTYPE & {
-  $result = (SwigObj*) SWIG_create_object(SWIG_STR($1_basetype));
-  $result->obj = (void*) $1;
+  $result = (SwigObj*) SWIG_create_object($1, SWIG_STR($1_basetype));
 }
 
 %typemap(out) SWIGTYPE * [ANY], SWIGTYPE [ANY][ANY] {
@@ -294,14 +291,13 @@ same_action_all_primitive_types_but_void(out, "$result = $1;")
     size_t i = 0;
     if (_temp) {
         for ( ; i < $1_dim0; ++i)
-          SWIG_destroy_object(_temp[i]);
+          SWIG_destroy_object< $1_ltype >(_temp[i]);
         free(_temp);
     }
     _temp = (SwigObj**) malloc($1_dim0 * sizeof(SwigObj*));
     for (i = 0 ; i < $1_dim0; ++i) {
       if ($1[i]) {
-        _temp[i] = SWIG_create_object(SWIG_STR($1_ltype));
-        _temp[i]->obj = (void*) $1[i];
+        _temp[i] = SWIG_create_object($1[i], SWIG_STR($1_ltype));
       }
       else
         _temp[i] = (SwigObj*) 0;
@@ -333,31 +329,48 @@ explicit_same_type_unconsted_all_primitive_types_but_void(cppouttype);
 
 #ifdef SWIG_CPPMODE
 
-  #ifdef SWIG_C_EXCEPT
-  
 %insert("runtime") %{
 typedef struct {
   void *obj;
-  const char **typenames;
+  const char* symname;
+  bool (*derives_from)(const char* type);
 } SwigObj;
+
+template  SWIGINTERN void SWIG_destroy_object(SwigObj* object) {
+  if (!object)
+    return;
+
+  delete static_cast(object->obj);
+
+  free(object);
+}
+
+template  struct SWIG_derives_from {
+  static bool check(const char* type) { return false; }
+};
+
+template  SWIGINTERN SwigObj* SWIG_create_object(T* obj, const char* symname) {
+  SwigObj* const result = (SwigObj*)malloc(sizeof(SwigObj));
+  if (result) {
+    result->obj = const_cast(static_cast(obj));
+    result->symname = symname;
+    result->derives_from = SWIG_derives_from::check;
+  }
+
+  return result;
+}
 %}
 
 %insert("proxy_header") %{
-typedef struct {
-  void *obj;
-  const char **typenames;
-} SwigObj;
+    typedef struct SwigObjStruct SwigObj;
 %}
 
+  #ifdef SWIG_C_EXCEPT
+  
 %include "cexcept.swg"
     
   #else
     
-%insert("runtime") %{
-typedef struct {
-  void *obj;
-} SwigObj;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -367,12 +380,6 @@ SWIGEXPORTC int SWIG_exit(int code) { exit(code); }
 #endif
 %}
 
-%insert("proxy_header") %{
-typedef struct {
-  void *obj;
-} SwigObj;
-%}
-  
   #endif
 #else
 
diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg
index e4a3ce265..fae4c9dbe 100644
--- a/Lib/c/cexcept.swg
+++ b/Lib/c/cexcept.swg
@@ -19,30 +19,24 @@
 // this should match only SwigObj objects
 %typemap(throws) SWIGTYPE {
   SwigObj *c_ex;
-  c_ex = SWIG_create_object(SWIG_STR($1_basetype));
-  c_ex->obj = (void*) &$1;
+  c_ex = SWIG_create_object(&$1, SWIG_STR($1_basetype));
   SWIG_CThrowException(c_ex, "C++ $1_type exception thrown");
 }
 
 %typemap(throws) SWIGTYPE * {
   SwigObj *c_ex;
-  c_ex = SWIG_create_object(SWIG_STR($1_basetype));
-  c_ex->obj = (void*) $1;
+  c_ex = SWIG_create_object($1, SWIG_STR($1_basetype));
   SWIG_CThrowException(c_ex, "C++ $1_type exception thrown");
 }
 
 %insert("runtime") %{
+#include 
+
+SWIGINTERN void SWIG_terminate();
+
 #define SWIG_MAX_RT_STACK 256
 #define SWIG_REGISTRY_INIT 256
 
-SWIGINTERN SwigObj **SWIG_registry_base = 0;
-SWIGINTERN SwigObj **SWIG_registry = 0;
-SWIGINTERN int SWIG_registry_size = SWIG_REGISTRY_INIT;
-
-SWIGINTERN SwigObj *SWIG_create_object(const char *classname);
-SWIGINTERN void SWIG_destroy_object(SwigObj *object);
-SWIGINTERN void SWIG_free_SwigObj(SwigObj *object);
-
 SWIGEXPORTC struct SWIG_exc_struct {
   int code;
   char *msg;
@@ -51,12 +45,24 @@ SWIGEXPORTC struct SWIG_exc_struct {
 } SWIG_exc = { 0, 0, 0, 0 };
 
 SWIGEXPORTC jmp_buf SWIG_rt_env;
-SWIGEXPORTC int SWIG_rt_init = 0;
 SWIGINTERN jmp_buf SWIG_cpp_back_env;
 SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0;
 SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0;
 
 SWIGINTERN void SWIG_rt_stack_push() {
+  if (!SWIG_rt_stack_base) {
+    SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK);
+    if ((SWIG_exc.code = setjmp(SWIG_rt_env))) {
+      // deallocate C++ exception
+      if (setjmp(SWIG_rt_env) == 0) {
+        SWIG_rt_stack_push();
+        SWIG_exc.handled = 1;
+        longjmp(SWIG_cpp_back_env, 1);
+      }
+      SWIG_terminate();
+    }
+  }
+
   // TODO: check for stack overflow
   memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env));
   SWIG_rt_stack_ptr++;
@@ -69,65 +75,14 @@ SWIGINTERN void SWIG_rt_stack_pop() {
   memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env));
 }
 
-SWIGINTERN void SWIG_add_registry_entry(SwigObj *entry) {
-  if (SWIG_registry_base == 0) {
-    SWIG_registry_base = SWIG_registry = (SwigObj **) malloc(SWIG_registry_size * sizeof(SwigObj *));
-    memset(SWIG_registry_base, 0, SWIG_registry_size * sizeof(SwigObj *));
-  }
-  *SWIG_registry = entry;
-  SWIG_registry++;
-  if ((SWIG_registry - SWIG_registry_base) == SWIG_registry_size) {
-    SWIG_registry = SWIG_registry_base;
-    SWIG_registry_size += SWIG_REGISTRY_INIT;
-    int new_size = SWIG_registry_size * sizeof(SwigObj *);
-    SWIG_registry_base = (SwigObj **) malloc(new_size);
-    memset(SWIG_registry_base, 0, new_size);
-    memcpy(SWIG_registry_base, SWIG_registry, (SWIG_registry_size - SWIG_REGISTRY_INIT) * sizeof(SwigObj *));
-    free(SWIG_registry);
-    SWIG_registry = SWIG_registry_base + (SWIG_registry_size - SWIG_REGISTRY_INIT);
-  }
-}
-
-SWIGINTERN void SWIG_remove_registry_entry(SwigObj *entry) {
-  int i;
-  for (i = 0; i < SWIG_registry_size; ++i) {
-    if (*(SWIG_registry_base + i) == entry) {
-      *(SWIG_registry_base + i) = 0;
-      break;
-    }
-  }
-}
-
-SWIGINTERN void SWIG_free_SwigObj(SwigObj *object) {
-  if (object) {
-    if (object->typenames)
-      free(object->typenames);
-    free(object);
-    object = (SwigObj *) 0;
-  }
-}
-
 SWIGINTERN void SWIG_cleanup() {
   if (SWIG_rt_stack_base)
     free(SWIG_rt_stack_base);
   if (SWIG_exc.msg)
    free(SWIG_exc.msg);
   if (SWIG_exc.klass) {
-    if (SWIG_exc.klass->typenames)
-      free(SWIG_exc.klass->typenames);
     free(SWIG_exc.klass);
   }
-  int i;
-  if (SWIG_registry_base) {
-    for (i = 0; i < SWIG_registry_size; ++i) {
-      if (*(SWIG_registry_base + i)) {
-        SWIG_free_SwigObj(*(SWIG_registry_base + i));
-        *(SWIG_registry_base + i)  = 0;
-      }
-    }
-  }
-  free(SWIG_registry_base);
-  SWIG_registry_base = 0;
 }
 
 #ifdef __cplusplus
@@ -144,13 +99,7 @@ SWIGEXPORTC int SWIG_rt_catch(const char *type) {
     result = 1;
   }
   else if (SWIG_exc.klass) {
-    int i = 0;
-    while (SWIG_exc.klass->typenames[i]) {
-      if (strcmp(SWIG_exc.klass->typenames[i++], type) == 0) {
-        result = 1;
-        break;
-      }
-    }
+    result = strcmp(SWIG_exc.klass->symname, type) == 0 || SWIG_exc.klass->derives_from(type);
   }
   if (result) {
     SWIG_rt_stack_pop();
@@ -205,28 +154,11 @@ SWIGEXPORTC int SWIG_exit(int code) {
 
 SWIGINTERN void SWIG_terminate() {
   fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", 
-    SWIG_exc.klass->typenames[0],
+    typeid(*SWIG_exc.klass).name(),
     SWIG_exc.msg ? SWIG_exc.msg : "");
   SWIG_exit(SWIG_exc.code);
 }
 
-SWIGINTERN void SWIG_runtime_init() {
-  int i, code;
-  if (!SWIG_rt_init) {
-    SWIG_rt_init = 1;
-    SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK);
-    if ((SWIG_exc.code = setjmp(SWIG_rt_env))) {
-      // deallocate C++ exception
-      if (setjmp(SWIG_rt_env) == 0) {
-        SWIG_rt_stack_push();
-        SWIG_exc.handled = 1;
-        longjmp(SWIG_cpp_back_env, 1);
-      }
-      SWIG_terminate();
-    }
-  }
-}
-
 #define SWIG_CThrowException(klass, msg) \
   if (setjmp(SWIG_cpp_back_env) == 0) \
     SWIG_rt_throw((SwigObj *) klass, msg);
diff --git a/Lib/exception.i b/Lib/exception.i
index 0e08e8531..5f891bb23 100644
--- a/Lib/exception.i
+++ b/Lib/exception.i
@@ -216,8 +216,7 @@ struct SWIG_CException {
 %}
 
 #define SWIG_exception(code, msg)\
-  SwigObj *_ex = SWIG_create_object("SWIG_CException"); \
-  _ex->obj = (void *) new SWIG_CException(code); \
+  SwigObj *_ex = SWIG_create_object(new SWIG_CException(code), "SWIG_CException"); \
   SWIG_CThrowException(_ex, msg);
 
 #endif // SWIGC
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 5074d0f0c..146729d05 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -101,14 +101,13 @@ class C:public Language {
   File *f_runtime;
   File *f_header;
   File *f_wrappers;
+  File *f_wrappers_cxx;
   File *f_wrappers_types;
   File *f_wrappers_decl;
   File *f_init;
 
   String *empty_string;
   String *int_string;
-  String *create_object;
-  String *destroy_object;
   String *tl_namespace; // optional top level namespace
 
   bool except_flag;
@@ -122,8 +121,6 @@ public:
   C() : 
     empty_string(NewString("")),
     int_string(NewString("int")),
-    create_object(0),
-    destroy_object(0),
     tl_namespace(NULL),
     except_flag(true) {
   }
@@ -323,54 +320,6 @@ public:
     allow_overloading();
   }
 
-  /* ---------------------------------------------------------------------
-   * start_create_object()
-   * --------------------------------------------------------------------- */
-
-  void start_create_object() {
-    String *s = create_object = NewString("");
-    Printv(s, "\nSWIGINTERN SwigObj *SWIG_create_object(", except_flag ? "const char *classname" : "", ") {\n", NIL);
-    if (except_flag)
-      Printf(s, "SWIG_runtime_init();\n");
-    Printf(s, "SwigObj *result;\n");
-    Printf(s, "result = (SwigObj *) malloc(sizeof(SwigObj));\n");
-    Printf(s, "result->obj = 0;\n");
-  }
-
-  /* ---------------------------------------------------------------------
-   * finish_create_object()
-   * --------------------------------------------------------------------- */
-
-  String *finish_create_object() {
-    String *s = create_object;
-    Printf(s, "SWIG_add_registry_entry(result);\n");
-    Printf(s, "return result;\n");
-    Printf(s, "}\n\n");
-    return create_object;
-  }
-
-  /* ---------------------------------------------------------------------
-   * start_destroy_object()
-   * --------------------------------------------------------------------- */
-
-  void start_destroy_object() {
-    String *s = destroy_object = NewString("");
-    Printf(s, "\nSWIGINTERN void SWIG_destroy_object(SwigObj *object) {\n");
-    Printf(s, "if (object) {\n");
-    if (except_flag)
-      Printf(s, "if (object->typenames) {\n");
-  }
-
-  /* ---------------------------------------------------------------------
-   * finish_destroy_object()
-   * --------------------------------------------------------------------- */
-  
-  String *finish_destroy_object() {
-    String *s = destroy_object;
-    Printf(s, "SWIG_free_SwigObj(object);\n}\n}\n}\n");
-    return destroy_object;
-  }
-
   /* ---------------------------------------------------------------------
    * top()
    * --------------------------------------------------------------------- */
@@ -389,6 +338,7 @@ public:
     f_init = NewString("");
     f_header = NewString("");
     f_wrappers = NewString("");
+    f_wrappers_cxx = NewString("");
 
     Swig_banner(f_begin);
 
@@ -438,19 +388,9 @@ public:
           cplusplus_guard_wrappers(f_wrappers),
           cplusplus_guard_wrappers_h(f_wrappers_h_body);
 
-        if (except_flag) {
-          start_create_object();
-          start_destroy_object();
-        }
-
         // emit code for children
         Language::top(n);
 
-        if (except_flag) {
-          Append(f_header, finish_create_object());
-          Append(f_header, finish_destroy_object());
-        }
-
         Dump(f_wrappers_types, f_wrappers_h_body);
         Delete(f_wrappers_types);
 
@@ -464,6 +404,7 @@ public:
 
     // write all to the file
     Dump(f_header, f_runtime);
+    Dump(f_wrappers_cxx, f_runtime);
     Wrapper_pretty_print(f_wrappers, f_runtime);
     Dump(f_init, f_runtime);
     Dump(f_runtime, f_begin);
@@ -472,6 +413,7 @@ public:
     Delete(f_begin);
     Delete(f_header);
     Delete(f_wrappers);
+    Delete(f_wrappers_cxx);
     Delete(f_wrappers_h);
     Delete(f_init);
     Delete(f_runtime);
@@ -1343,46 +1285,73 @@ ready:
     if (CPlusPlus) {
       // inheritance support: attach all members from base classes to this class
       if (baselist) {
-        Iterator i;
-        for (i = First(baselist); i.item; i = Next(i)) {
-          // look for member variables and functions
-          Node *node;
-          for (node = firstChild(i.item); node; node = nextSibling(node)) {
-            if ((Cmp(Getattr(node, "kind"), "variable") == 0) 
-                || (Cmp(Getattr(node, "kind"), "function") == 0)) {
-              if ((Cmp(Getattr(node, "access"), "public") == 0)
-                  && (Cmp(Getattr(node, "storage"), "static") != 0)) {
-                    Node *new_node = copy_node(node);
-                    String *parent_name = Getattr(parentNode(node), "name");
-                    Hash *dupl_name_node = is_in(Getattr(node, "name"), n);
-                    // if there's a duplicate inherited name, due to the C++ multiple
-                    // inheritance, change both names to avoid ambiguity
-                    if (dupl_name_node) {
-                      String *cif = Getattr(dupl_name_node, "c:inherited_from");
-                      String *old_name = Getattr(dupl_name_node, "name");
-                      if (cif && parent_name && (Cmp(cif, parent_name) != 0)) {
-                        Setattr(dupl_name_node, "name", NewStringf("%s%s", cif ? cif : "", old_name));                      
-                        Setattr(dupl_name_node, "c:base_name", old_name);
-                        Setattr(new_node, "name", NewStringf("%s%s", parent_name, old_name));
-                        Setattr(new_node, "c:base_name", old_name);
-                        Setattr(new_node, "c:inherited_from", parent_name);
-                        Setattr(new_node, "sym:name", Getattr(new_node, "name"));
-                        Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
-                        set_nodeType(new_node, "cdecl");
-                        appendChild(n, new_node);
-                      }
-                    }
-                    else {
-                      Setattr(new_node, "c:inherited_from", parent_name);
-                      Setattr(new_node, "sym:name", Getattr(new_node, "name"));
-                      Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
-                      set_nodeType(new_node, "cdecl");
-                      appendChild(n, new_node);
-                    } 
-              }
-            }
-          }
-        }
+	// We may need to specialize SWIG_derives_from<> for this class: its unique check() method will return true iff it's given the name of any subclasses of
+	// this class. Notice that it may happen that all our base classes are ignored, in which case we don't do anything.
+	bool started_derives_from_spec = false;
+
+	Iterator i;
+	for (i = First(baselist); i.item; i = Next(i)) {
+	  // look for member variables and functions
+	  Node *node;
+	  for (node = firstChild(i.item); node; node = nextSibling(node)) {
+	    if ((Cmp(Getattr(node, "kind"), "variable") == 0)
+		|| (Cmp(Getattr(node, "kind"), "function") == 0)) {
+	      if ((Cmp(Getattr(node, "access"), "public") == 0)
+		  && (Cmp(Getattr(node, "storage"), "static") != 0)) {
+		    Node *new_node = copy_node(node);
+		    String *parent_name = Getattr(parentNode(node), "name");
+		    Hash *dupl_name_node = is_in(Getattr(node, "name"), n);
+		    // if there's a duplicate inherited name, due to the C++ multiple
+		    // inheritance, change both names to avoid ambiguity
+		    if (dupl_name_node) {
+		      String *cif = Getattr(dupl_name_node, "c:inherited_from");
+		      String *old_name = Getattr(dupl_name_node, "name");
+		      if (cif && parent_name && (Cmp(cif, parent_name) != 0)) {
+			Setattr(dupl_name_node, "name", NewStringf("%s%s", cif ? cif : "", old_name));
+			Setattr(dupl_name_node, "c:base_name", old_name);
+			Setattr(new_node, "name", NewStringf("%s%s", parent_name, old_name));
+			Setattr(new_node, "c:base_name", old_name);
+			Setattr(new_node, "c:inherited_from", parent_name);
+			Setattr(new_node, "sym:name", Getattr(new_node, "name"));
+			Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
+			set_nodeType(new_node, "cdecl");
+			appendChild(n, new_node);
+		      }
+		    }
+		    else {
+		      Setattr(new_node, "c:inherited_from", parent_name);
+		      Setattr(new_node, "sym:name", Getattr(new_node, "name"));
+		      Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
+		      set_nodeType(new_node, "cdecl");
+		      appendChild(n, new_node);
+		    }
+	      }
+	    }
+	  }
+
+	  // Account for this base class in the RTTI checks.
+	  String* const name = Getattr(i.item, "sym:name");
+	  if (name) {
+	    if (!started_derives_from_spec) {
+	      started_derives_from_spec = true;
+
+	      Printv(f_wrappers_cxx,
+		  "template<> struct SWIG_derives_from< ", Getattr(n, "classtype"), " > {\n",
+		  "  static bool check(const char* type) {\n",
+		  "    return ",
+		  NIL);
+	    } else {
+	      Printv(f_wrappers_cxx, " ||\n    ", NIL);
+	    }
+
+	    Printv(f_wrappers_cxx, "strcmp(type, \"", name, "\") == 0", NIL);
+	  }
+	}
+
+	if (started_derives_from_spec) {
+	  // End SWIG_derives_from specialization.
+	  Printv(f_wrappers_cxx, ";\n  }\n};\n\n", NIL);
+	}
       }
 
       // declare type for specific class in the proxy header
@@ -1499,46 +1468,6 @@ ready:
     return Language::membervariableHandler(n);
   }
 
-  /* ---------------------------------------------------------------------
-   * add_to_create_object()
-   * --------------------------------------------------------------------- */
-
-  void add_to_create_object(Node *n, String *classname, String *newclassname) {
-    String *s = create_object;
-
-    Printv(s, "if (strcmp(classname, \"", classname, "\") == 0) {\n", NIL);
-
-    // store the name of each class in the hierarchy
-    List *baselist = Getattr(Swig_methodclass(n), "bases");
-    Printf(s, "result->typenames = (const char **) malloc(%d*sizeof(const char*));\n", Len(baselist) + 2);
-    Printv(s, "result->typenames[0] = Swig_typename_", newclassname, ";\n", NIL);
-    int i = 1;
-    if (baselist) {
-      Iterator it;
-      for (it = First(baselist); it.item; it = Next(it)) {
-        String *kname = Getattr(it.item, "sym:name");
-        if (kname)
-          Printf(s, "result->typenames[%d] = Swig_typename_%s;\n", i++, kname);
-      }
-    }
-    Printf(s, "result->typenames[%d] = 0;\n", i);
-    Printf(s, "}\n");
-  }
-  
-  /* ---------------------------------------------------------------------
-   * add_to_destroy_object()
-   * --------------------------------------------------------------------- */
-
-  void add_to_destroy_object(Node *n, String *classname, String *classtype) {
-    String *s = destroy_object;
-    String *access = Getattr(n, "access");
-    if (access && Cmp(access, "private") != 0) {
-      Printv(s, "if (strcmp(object->typenames[0], \"", classname, "\") == 0) {\n", NIL);
-      Printv(s, "if (object->obj)\ndelete (", classtype, " *) (object->obj);\n", NIL);
-      Printf(s, "}\n");
-    }
-  }
-
   /* ---------------------------------------------------------------------
    * constructorHandler()
    * --------------------------------------------------------------------- */
@@ -1551,7 +1480,6 @@ ready:
       return copyconstructorHandler(n);
 
     Node *klass = Swig_methodclass(n);
-    String *classname = Getattr(klass, "name");
     String *newclassname = Getattr(klass, "sym:name");
     String *sobj_name = NewString("");
     String *ctype;
@@ -1582,17 +1510,12 @@ ready:
     Setattr(n, "sym:name", constr_name);
 
     // generate action code
-    if (except_flag) {
-      if (!Getattr(klass, "c:create")) {
-        add_to_create_object(n, classname, newclassname);
-        Setattr(klass, "c:create", "1");
-      }
-      Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL);
+    if (!Getattr(klass, "c:create")) {
+      Setattr(klass, "c:create", "1");
     }
-    else {
-      Printf(code, "result = SWIG_create_object();\n");
-    }
-    Printv(code, "result->obj = (void*) new ", Getattr(klass, "classtype"), arg_lnames, ";\n", NIL);
+    Printv(code, "result = SWIG_create_object(new ", Getattr(klass, "classtype"), arg_lnames,
+	", \"", newclassname, "\");\n",
+	NIL);
 
     Setattr(n, "wrap:action", code);
     functionWrapper(n);
@@ -1641,17 +1564,12 @@ ready:
     Setattr(n, "sym:name", constr_name);
 
     // generate action code
-    if (except_flag) {
-      if (!Getattr(klass, "c:create")) {
-        add_to_create_object(n, classname, newclassname);
-        Setattr(klass, "c:create", "1");
-      }
-      Printv(code, "result = SWIG_create_object(\"", classname, "\");\n", NIL);
+    if (!Getattr(klass, "c:create")) {
+      Setattr(klass, "c:create", "1");
     }
-    else {
-      Printf(code, "result = SWIG_create_object();\n");
-    }
-    Printv(code, "result->obj = (void*) new ", classname, "((", classname, " const &)*arg1);\n", NIL);    
+    Printv(code, "result = SWIG_create_object(new ", classname, "((", classname, " const &)*arg1)",
+	", \"", newclassname, "\");\n",
+	NIL);
 
     Setattr(n, "wrap:action", code);    
     functionWrapper(n);
@@ -1673,8 +1591,6 @@ ready:
       return SWIG_NOWRAP;
 
     Node *klass = Swig_methodclass(n);
-    String *classname = Getattr(klass, "name");// Remove class namespace from constructor
-    String *classtype = Getattr(klass, "classtype");
     String *newclassname = Getattr(klass, "sym:name");
     String *sobj_name = NewString("");
     String *ctype;
@@ -1704,15 +1620,7 @@ ready:
     Setattr(n, "sym:name", destr_name);
 
     // create action code
-    if (except_flag) {
-      add_to_destroy_object(n, classname, classtype);
-      Printf(code, "SWIG_remove_registry_entry(carg1);\n");
-      Printf(code, "SWIG_destroy_object(carg1);");
-    }
-    else {
-      Printv(code, "if (carg1->obj)\ndelete (", classtype, " *) (carg1->obj);\n", NIL);
-    }
-    
+    Printv(code, "SWIG_destroy_object< ", Getattr(klass, "classtype"), " >(carg1);", NIL);
     Setattr(n, "wrap:action", code);
     
     functionWrapper(n);
@@ -1776,8 +1684,6 @@ ready:
     }
     Append(name, Swig_name_mangle(Getattr(n, "sym:name")));
     Setattr(n, "sym:name", name);
-    if (except_flag)
-      Printv(f_header, "const char* Swig_typename_", name, " = \"", Getattr(n, "name"), "\";\n\n", NIL);
     return Language::classDeclaration(n);
   }
   

From c05f03d4853547b2690c05828be797bae2f173dc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 16 Apr 2016 00:06:35 +0200
Subject: [PATCH 211/508] Fix esoteric regression in the previous commit

Implement the check for duplicate SWIG_derives_from<> specializations which
could happen if a template type with default parameters was exported both with
implicit default values used for these parameters and the same values
specified explicitly.

This makes the code more complicated and is very rarely needed (in addition to
the above, the template class must also have a base class to trigger the bug),
but it does happen and used to work, so restore this after breaking it in the
last commit and reenable the template_default2 unit test.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Source/Modules/c.cxx              | 48 ++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index d3b4e9243..ffb0e78ed 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -95,7 +95,6 @@ FAILING_CPP_TESTS := \
     special_variables \
     template_arg_typename \
     template_basic \
-    template_default2 \
     template_explicit \
     template_ns4 \
     template_tbase_template \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 146729d05..21c72f6ef 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -110,6 +110,9 @@ class C:public Language {
   String *int_string;
   String *tl_namespace; // optional top level namespace
 
+  // Contains fully expanded names of the classes for which we have already specialized SWIG_derives_from<>.
+  Hash *already_specialized_derives_from;
+
   bool except_flag;
 
 public:
@@ -122,6 +125,7 @@ public:
     empty_string(NewString("")),
     int_string(NewString("int")),
     tl_namespace(NULL),
+    already_specialized_derives_from(NULL),
     except_flag(true) {
   }
 
@@ -1287,7 +1291,7 @@ ready:
       if (baselist) {
 	// We may need to specialize SWIG_derives_from<> for this class: its unique check() method will return true iff it's given the name of any subclasses of
 	// this class. Notice that it may happen that all our base classes are ignored, in which case we don't do anything.
-	bool started_derives_from_spec = false;
+	int specialize_derives_from = -1;
 
 	Iterator i;
 	for (i = First(baselist); i.item; i = Next(i)) {
@@ -1332,23 +1336,45 @@ ready:
 	  // Account for this base class in the RTTI checks.
 	  String* const name = Getattr(i.item, "sym:name");
 	  if (name) {
-	    if (!started_derives_from_spec) {
-	      started_derives_from_spec = true;
+	    if (specialize_derives_from == -1) {
+	      // Check if we hadn't specialized it already. Somewhat surprisingly, this can happen for an instantiation of a template with default parameter(s)
+	      // if it appears both without them and with the default values explicitly given as it happens in e.g. template_default2 unit test.
+	      SwigType* const fulltype = Swig_symbol_template_deftype(Getattr(n, "name"), NULL);
+	      String* const fulltype_str = SwigType_str(fulltype, NULL);
+	      Delete(fulltype);
 
-	      Printv(f_wrappers_cxx,
-		  "template<> struct SWIG_derives_from< ", Getattr(n, "classtype"), " > {\n",
-		  "  static bool check(const char* type) {\n",
-		  "    return ",
-		  NIL);
-	    } else {
+	      if (!already_specialized_derives_from || !Getattr(already_specialized_derives_from, fulltype_str)) {
+		if (!already_specialized_derives_from) {
+		  already_specialized_derives_from = NewHash();
+		}
+
+		Setattr(already_specialized_derives_from, fulltype_str, "1");
+
+		Printv(f_wrappers_cxx,
+		    "template<> struct SWIG_derives_from< ", fulltype_str, " > {\n",
+		    "  static bool check(const char* type) {\n",
+		    "    return ",
+		    NIL);
+
+		specialize_derives_from = true;
+	      } else {
+		specialize_derives_from = false;
+	      }
+
+	      Delete(fulltype_str);
+	    }
+	    else if (specialize_derives_from) {
+	      // Continue the already started specialization.
 	      Printv(f_wrappers_cxx, " ||\n    ", NIL);
 	    }
 
-	    Printv(f_wrappers_cxx, "strcmp(type, \"", name, "\") == 0", NIL);
+	    if (specialize_derives_from) {
+	      Printv(f_wrappers_cxx, "strcmp(type, \"", name, "\") == 0", NIL);
+	    }
 	  }
 	}
 
-	if (started_derives_from_spec) {
+	if (specialize_derives_from == true) {
 	  // End SWIG_derives_from specialization.
 	  Printv(f_wrappers_cxx, ";\n  }\n};\n\n", NIL);
 	}

From 27abb84113eac4979c8b049ba25810cf9d6934f9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Apr 2016 01:48:37 +0200
Subject: [PATCH 212/508] Fix runtime code when not using exceptions

Add the missing "%insert" line which had been somehow lost.
---
 Lib/c/c.swg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 94deb3eb7..03cdb19ef 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -371,6 +371,7 @@ template  SWIGINTERN SwigObj* SWIG_create_object(T* obj, const char* sy
     
   #else
     
+%insert("runtime") %{
 #ifdef __cplusplus
 extern "C" {
 #endif

From f9a2d81f2922ffe2e2b74f7be9cd43c41123e2c7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Apr 2016 02:35:14 +0200
Subject: [PATCH 213/508] Use a constant for the indentation in the generated C
 code

Instead of hard coding two spaces, use "cindent" constant to make it more
clear what is the intended indentation of the generated code and also to make
it possible to change it later easily if desired.
---
 Source/Modules/c.cxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 21c72f6ef..e499ab18e 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -92,6 +92,9 @@ String *make_public_class_name(String* nspace, String* classname) {
   return s;
 }
 
+// String containing one indentation level for the generated code.
+const char* const cindent = "  ";
+
 } // anonymous namespace
 
 class C:public Language {
@@ -1269,7 +1272,7 @@ ready:
       if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) {
         String* type = NewString("");
         Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL);
-        Printv(f_wrappers_types, "  ", SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
+        Printv(f_wrappers_types, cindent, SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
         Delete(type);
       }
       // WARNING: proxy delaration can be different than original code
@@ -1352,8 +1355,8 @@ ready:
 
 		Printv(f_wrappers_cxx,
 		    "template<> struct SWIG_derives_from< ", fulltype_str, " > {\n",
-		    "  static bool check(const char* type) {\n",
-		    "    return ",
+		    cindent, "static bool check(const char* type) {\n",
+		    cindent, cindent, "return ",
 		    NIL);
 
 		specialize_derives_from = true;
@@ -1365,7 +1368,7 @@ ready:
 	    }
 	    else if (specialize_derives_from) {
 	      // Continue the already started specialization.
-	      Printv(f_wrappers_cxx, " ||\n    ", NIL);
+	      Printv(f_wrappers_cxx, " ||\n", cindent, cindent, NIL);
 	    }
 
 	    if (specialize_derives_from) {

From e1a4b02f69658c80a62610443a8d903c62992dc7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Apr 2016 02:46:26 +0200
Subject: [PATCH 214/508] No real changes, just convert files to Unix EOLs

Some tests and examples files as well as the C manual chapter used DOS EOLs,
get rid of them for consistency with all the other text files.
---
 Doc/Manual/C.html                             | 1302 ++++++++---------
 Examples/c/exception/example.h                |  104 +-
 Examples/test-suite/c/char_strings_runme.c    |  398 ++---
 Examples/test-suite/c/enums_runme.c           |   22 +-
 Examples/test-suite/c/exception_order_runme.c |  130 +-
 5 files changed, 978 insertions(+), 978 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index c19b46826..dee6f73f4 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -1,651 +1,651 @@
-
-
-
-SWIG and C as the target language
-
-
-
-
        36 SWIG and C as the target language
        
-
-
        
-
-
        
-
-
-
-
-
        
-This chapter describes SWIG's support for creating ANSI C wrappers. This module has a special purpose and thus is different from most other modules.
-
        
-
-
        
-NOTE: this module is still under development.
-
        
-
-
-
        36.1 Overview
        
-
-
-
        
-SWIG is normally used to provide access to C or C++ libraries from target languages such as scripting languages or languages running on a virtual machine. 
-SWIG performs analysis of the input C/C++ library header files from which it generates further code. For most target languages this code consists of two layers; namely an intermediary C code layer and a set of language specific proxy classes and functions on top of the C code layer. 
-We could also think of C as just another target language supported by SWIG.
-The aim then is to generate a pure ANSI C interface to the input C or C++ library and hence the C target language module.
-
        
-
-
        
-With wrapper interfaces generated by SWIG, it is easy to use the functionality of C++ libraries inside application code written in C. This module may also be useful to generate custom APIs for a library, to suit particular needs, e.g. to supply function calls with error checking or to implement a "design by contract".
-
        
-
-
        
-Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.
-
        
-
-
        Known C++ Shortcomings in Generated C API:
        
-
          
-    
        • Namespaced global functions are not namespaced
          • 
-    
        • Enums with a context like class or namespace are broken
          • 
-    
        • Global variables are not supported
          • 
-    
        • Qualifiers are stripped
          • 
-
        
-
        36.2 Preliminaries
        
-
-
-
        36.2.1 Running SWIG
        
-
-
-
        
-Consider the following simple example. Suppose we have an interface file like:
-
        
-
-
        
-
        -/* File: example.i */
-%module test
-%{
-#include "stuff.h"
-%}
-int fact(int n);
-
        
-
        
-
-
        
-To build a C module (C as the target language), run SWIG using the -c option :
        
-
-
        -$ swig -c example.i
-
        
-
-
        
-The above assumes C as the input language. If the input language is C++ add the -c++ option:
-
        
-
-
        -$ swig -c++ -c example.i
-
        
-
-
        
-Note that -c is the option specifying the target language and -c++ controls what the input language is.
-
        
-
-
        
-This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_wrap.h (the same extension is used in both C and C++ cases for the last one). The names of the files are derived from the name of the input file by default, but can be changed using the -o and -oh options common to all language modules. 
-
        
-
-
        
-The xxx_wrap.c file contains the wrapper functions, which perform the main functionality of SWIG: each of the wrappers translates the input arguments from C to C++, makes calls to the original functions and marshals C++ output back to C data. The xxx_wrap.h header file contains the declarations of these functions as well as global variables.
-
        
-
-
        36.2.2 Command line options
        
-
-
-
        
-The following table list the additional command line options available for the C module. They can also be seen by using: 
-
        
-
-
        -$ swig -c -help
-
        
-
-
      • 
     ctypeParameter types of wrapper functions
      wrap_call
-       Casts functions' parameters of wrapper function calls
      
+          		Parameter types of wrapper functions and
      
+       Casts of functions' parameters of wrapper function calls
      
        
      
        
          extern void _wrap_MyClass_delete(SwigObj *o);
      

From d6e095462002331087e5b48e50fbdceb89cfd266 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte 
Date: Sat, 18 Aug 2012 13:42:39 +0000
Subject: [PATCH 165/508] Minor formatting tweaks.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13649 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/C.html | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 39ef93405..84a626c1d 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -430,49 +430,49 @@ area: 7.068583
           		Parameter types of wrapper functions and
      
        Casts of functions' parameters of wrapper function calls
      
        
      
-       
+       
          extern void _wrap_MyClass_delete(SwigObj *o);
      
          
      
          void MyClass_delete(MyClass *c) {
      
-            _wrap_MyClass_delete((Swig_Obj *)c);
      
+             _wrap_MyClass_delete((Swig_Obj *)c);
      
          }
-             
+       
           		
   
      
   
      
     in
     Mapping of wrapper functions' parameters to local C++ variables
      
        
      
-       
+       
           SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
      
-            SomeCPPClass *arg1 = 0;
      
-            if (carg1)
      
-              arg1 = (SomeCPPClass*)carg1->obj
      
-            else
      
-              arg1 = 0;
      
+             SomeCPPClass *arg1 = 0;
      
+             if (carg1)
      
+                arg1 = (SomeCPPClass*)carg1->obj
      
+             else
      
+                arg1 = 0;
      
           }
-             		
   
      
   
      
     couttype
     Return value type of wrapper functions
      
        
      
-       
+       
           SwigObj* _wrap_MyClass_new(void) {
      
-            SwigObj *result;
      
-            return result;
      
+             SwigObj *result;
      
+             return result;
      
           }
-             
+       
           		
   
      
   
      
     proxycouttype
     Typecasts wrapper functions' return values in proxy functions
      
-      
+      
           MyClass *MyClass_new(void) {
      
-            return (MyClass *)_wrap_MyClass_new();
      
+             return (MyClass *)_wrap_MyClass_new();
      
           }
-            
+      
           		
   
      
   
      Used for
   
      
   
      proxyParameter types of proxy functionsctypeProvides types used for the C API and
      
+          Typecasts wrapper functions return values in proxy functions
      
+          
+              MyClass *MyClass_new(void) {
      
+               return (MyClass *)_wrap_MyClass_new();
      
+              }
+                
+            		
   
      
   
      ctypeParameter types of wrapper functions and
      
-       Casts of functions' parameters of wrapper function calls
      
+          		cmodtypeProvides types used by wrapper functions and
      
+       Casts of function parameters of wrapper function calls
      
        
      
        
          extern void _wrap_MyClass_delete(SwigObj *o);
      
@@ -441,7 +448,7 @@ area: 7.068583
   
      
   
      
     inMapping of wrapper functions' parameters to local C++ variables
      
+          		Mapping of wrapper functions parameters to local C++ variables
      
        
      
        
           SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
      
@@ -453,31 +460,9 @@ area: 7.068583
           }
              		
   
      couttypeReturn value type of wrapper functions
      
-       
      
-       
-          SwigObj* _wrap_MyClass_new(void) {
      
-             SwigObj *result;
      
-             return result;
      
-          }
-             
-    
      proxycouttypeTypecasts wrapper functions' return values in proxy functions
      
-      
-          MyClass *MyClass_new(void) {
      
-             return (MyClass *)_wrap_MyClass_new();
      
-          }
-            
-    
      
   
      
     outAssigns wrapped function's return value to return variable, packaging it into SwigObj if necessaryAssigns wrapped function's return value to a dedicated return variable, packaging it into SwigObj if necessary
   
      
   
      
     cppouttype
 
 C specific options
 
      -noproxydo not generate proxy files (i.e. filename_proxy.h and filename_proxy.c)
      
 -noexcept
 generate wrappers with no support of exception handling; see Exceptions chapter for more details 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
      
-
-
-
-
-
-
-
-
-
-
      C specific options
      -noexceptgenerate wrappers with no support of exception handling; see Exceptions chapter for more details 
      
-
-
      36.2.3 Compiling a dynamic module
      
-
-
-
      
-The next step is to build a dynamically loadable module, which we can link to our application. This can be done easily, for example using the gcc compiler (Linux, MinGW, etc.):
-
      
-
-
      -$ swig -c example.i
-$ gcc -c example_wrap.c
-$ gcc -shared example_wrap.o -o libexample.so
-
      
-
-
      
-Or, for C++ input:
-
      
-
-
      -$ swig -c++ -c example.i
-$ g++ -c example_wrap.cxx
-$ g++ -shared example_wrap.o -o libexample.so
-
      
-
-
      
-Now the shared library module is ready to use. Note that the name of the generated module is important: is should be prefixed with lib on Unix, and have the specific extension, like .dll for Windows or .so for Unix systems.
-
      
-
-
      36.2.4 Using the generated module
      
-
-
-
      
-The simplest way to use the generated shared module is to link it to the application code during the compilation stage. The process is usually similar to this:
-
      
-
-
      -$ gcc runme.c -L. -lexample -o runme
-
      
-
-
      
-This will compile the application code (runme.c) and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.
-
      
-
-
      36.3 Basic C wrapping
      
-
-
-
      
-Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enhance the code with some additional elements, for instance using check typemap or %extend directive.
-
      
-
-
      36.3.1 Functions
      
-
-
-
      
-For each C function declared in the interface file a wrapper function is created. Basically, the wrapper function performs a call to the original function, and returns its result.
-
      
-
-
      
-For example, for function declaration:
-
      
-
-
      -int gcd(int x, int y);
-
      
-
-
      
-The output is simply:
-
      
-
-
      -int _wrap_gcd(int arg1, int arg2) {
-  int result;
-  result = gcd(arg1,arg2);
-  return result;
-}
-
      
-
-
      
-Now one might think, what's the use of creating such functions in C? The answer is, you can apply special rules to the generated code. Take for example constraint checking. You can write a "check" typemap in your interface file:
-
      
-
-
      -%typemap(check) int POSITIVE {
-  if ($1 <= 0)
-    fprintf(stderr, "Expected positive value in $name.\n");
-}
-
-int gcd(int POSITIVE, int POSITIVE);
-
      
-
-
      
-And now the generated result looks like:
-
      
-
-
      -int _wrap_gcd(int arg1, int arg2) {
-  {
-    if (arg1 <= 0)
-      fprintf(stderr, "Expected positive value in gcd.\n");
-  }
-  {
-    if (arg1 <= 0)
-      fprintf(stderr, "Expected positive value in gcd.\n");
-  }
-  int result;
-  result = gcd(arg1,arg2);
-  return result;
-}
-
      
-
-
      
-This time calling gcd with negative value argument will trigger an error message. This can save you time writing all the constraint checking code by hand.
-
      
-
-
      36.3.2 Variables
      
-
-
-
      
-Wrapping variables comes also without any special issues. All global variables are directly accessible from application code. There is a difference in the semantics of struct definition in C and C++. When handling C struct, SWIG simply rewrites its declaration. In C++ struct is handled as class declaration. 
-
      
-
-
      
-You can still apply some of the SWIG features when handling structs, e.g. %extend directive. Suppose, you have a C struct declaration:
-
      
-
-
      -typedef struct {
-  int x;
-  char *str;
-} my_struct;
-
      
-
-
      
-You can redefine it to have an additional fields, like:
-
      
-
-
      -%extend my_struct {
-  double d;
-};
-
      
-
-
      
-In application code:
-
      
-
-
      -struct my_struct ms;
-ms.x = 123;
-ms.d = 123.123;
-
      
-
-
      36.4 Basic C++ wrapping
      
-
-
-
      
-The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.
-
      
-
-
      
-By default, SWIG attempts to build a natural C interface to your C/C++ code.
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
      C++ TypeSWIG C Translation
      Class ExampleEmpty structure Example
      Public, mutable member variable Foo Example::foo
-      Example_foo_get(Example *e);
      
-      Example_foo_set(Example *e, Foo *f);
-    
      Public, immutable member variable Foo Example::bar
-      Example_foo_get(Example *e);
      
-    
      
-This section briefly covers the essential aspects of this wrapping.
-
      
-
-
      36.3.3 Enums
      
-
-
      
-C enums are simply copied to the generated code and keep the same name as in
-the original code.
-
      
-
-
-
      36.4.1 Classes
      
-
-
-
      
-Consider the following example. We have a C++ class, and want to use it from C code.
-
      
-
-
      -class Circle {
-public:
-  double radius;
-
-  Circle(double r) : radius(r) { };
-  double area(void);
-};
-
      
-
-
      
-What we need to do is to create an object of the class, manipulate it, and finally, destroy it. SWIG generates C functions for this purpose each time a class declaration is encountered in the interface file.
-
      
-
-
      
-The first two generated functions are used to create and destroy instances of class Circle. Such instances are represented on the C side as pointers to special structs, called SwigObj. They are all "renamed" (via typedef) to the original class names, so that you can use the object instances on the C side using pointers like:
-
      
-
-
      -Circle *circle;
-
      
-
-
      
-The generated functions make calls to class' constructors and destructors, respectively. They also do all the necessary things required by the SWIG object management system in C.
-
      
-
-
      -Circle * new_Circle(double r);
-void delete_Circle(Circle * self);
-
      
-
-
      
-The class Circle has a public variable called radius. SWIG generates a pair of setters and getters for each such variable:
-
      
-
-
      -void Circle_radius_set(Circle * self, double radius);
-double Circle_radius_get(Circle * self);
-
      
-
-
      
-For each public method, an appropriate function is generated:
-
      
-
-
      -double Circle_area(Circle * self);
-
      
-
-
      
-You can see that in order to use the generated object we need to provide a pointer to the object instance (struct Circle in this case) as the first function argument. In fact, this struct is basically wrapping pointer to the "real" C++ object.
-
      
-
-
      
-Our application code could look like this:
-
      
-
-
      -  Circle *c = new_Circle(1.5);
-  printf("radius: %f\narea: %f\n", Circle_radius_get(c), Circle_area(c));
-  delete_Circle(c);
-
      
-
-
      
-After running this we'll get:
-
      
-
-
      -radius: 1.500000
-area: 7.068583
-
      
-
-
      Backend Developer Documentation
      
-
-
      Typemaps
      
-
-
-  
-    
-    
-  
-  
-      
-      
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
      TypemapUsed for
      ctypeProvides types used for the C API and
      
-          Typecasts wrapper functions return values in proxy functions
      
-          
-              MyClass *MyClass_new(void) {
      
-               return (MyClass *)_wrap_MyClass_new();
      
-              }
-                
-      
      cmodtypeProvides types used by wrapper functions and
      
-       Casts of function parameters of wrapper function calls
      
-       
      
-       
-         extern void _wrap_MyClass_delete(SwigObj *o);
      
-         
      
-         void MyClass_delete(MyClass *c) {
      
-             _wrap_MyClass_delete((Swig_Obj *)c);
      
-         }
-             
-    
      inMapping of wrapper functions parameters to local C++ variables
      
-       
      
-       
-          SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
      
-             SomeCPPClass *arg1 = 0;
      
-             if (carg1)
      
-                arg1 = (SomeCPPClass*)carg1->obj
      
-             else
      
-                arg1 = 0;
      
-          }
-       
      outAssigns wrapped function's return value to a dedicated return variable, packaging it into SwigObj if necessary
      cppouttypeType of the result variable used for the return value if the wrapped function is a C++ function
-    
      
-
-
      C Typemaps, a Code Generation Walkthrough
      
-
-To get a better idea of which typemap is used for which generated code, have a look at the following 'walk through'.
      
-Let's assume we have the following C++ interface file, we'd like to generate code for:
-
-
      The Interface
      
-
      -%module example
-
-%inline
-%{
-  class SomeClass{};
-  template <typename T> class SomeTemplateClass{};
-  SomeClass someFunction(SomeTemplateClass<int> &someParameter, int simpleInt);
-%}
-
-%template (SomeIntTemplateClass) SomeTemplateClass<int>;
-
      
-
-
-What we would like to generate as a C interface of this function would be something like this:
-
-
      -// wrapper header file
-typedef struct SwigObj_SomeClass SomeClass;
-
-SomeClass * new_SomeClass();
-
-void delete_SomeClass(SomeClass * carg1);
-        
-SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
-        
-        
-typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
-        
-SomeIntTemplateClass * new_SomeIntTemplateClass();
-        
-void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
-
      
-
-
      The Wrapper
      
-We'll examine the generation of the wrapper function first.
-
-
      -SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
-  SomeClass * cppresult;
-  SomeTemplateClass< int > *arg1 = 0 ;
-  int arg2 ;
-  SwigObj * result;
-  
-  {
-    if (carg1)
-    arg1 = (SomeTemplateClass< int > *) carg1->obj;
-    else
-    arg1 = (SomeTemplateClass< int > *) 0;
-  }
-  arg2 = (int) carg2;
-  {
-    const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
-  }
-  {
-    result = SWIG_create_object(cppresult, SWIG_STR(SomeClass));
-  }
-  return result;
-}
-
      
-
-It might be helpful to think of the way function calls are generated as a composition of building blocks.
      
-A typical wrapper will be composited with these [optional] blocks:
-
-
        
-
      1. Prototype
        2. 
-
      2. C return value variable
        3. 
-
      3. Local variables equal to the called C++ function's parameters
        4. 
-
      4. [C++ return value variable]
        5. 
-
      5. Assignment (extraction) of wrapper parameters to local parameter copies
        6. 
-
      6. [Contract (e.g. constraints) checking]
        7. 
-
      7.  C++ function call
        8. 
-
      8. [Exception handling]
        9. 
-
      9. [Assignment to C++ return value]
        10. 
-
      10. Assignment to C return value
        11. 
-
      
-
-Let's go through it step by step and start with the wrapper prototype
-
-
      -cmodtype                     cmodtype         cmodtype
----------                    ---------        ---
-SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
-
      
-
-As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
-
-
      -cmodtype
----------
-SwigObj * result;
-
      
-
-Now for each of the C++ function's arguments, a local variable with the very same type is emitted to the wrapper's body.
-
-
      -SomeTemplateClass< int > *arg1 = 0 ;
-int arg2 ;
-
      
-
-If it's a C++ function that is wrapped (in this case it is), another variable is emitted for the 'original' return value of the C++ function.
      
-At this point, we simply 'inject' behavior if it's a C++ function that is wrapped (in this case it obviously is).
-
-
      -cppouttype
------------
-SomeClass * cppresult;
-
      
-
-Next, the values of the input parameters are assigned to the local variables using the 'in' typemap.
-
-
      -{
-  if (carg1)
-  arg1 = (SomeTemplateClass< int > *) carg1->obj;
-  else
-  arg1 = (SomeTemplateClass< int > *) 0;
-}
-arg2 = (int) carg2;
-
      
-
-A reasonable question would be: "Why aren't the parameters assigned in the declaration of their local counterparts?"
      
-As seen above, for complex types pointers have to be verified before extracting and 
      
-casting the actual data pointer from the provided SwigObj pointer.
      
-This could easily become messy if it was done in the same line with the local variable declaration.
      
-
      
-At this point we are ready to call the C++ function with our parameters.
      
-
      
-
      -{
-  const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
-}
-
      
-Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap
-
      -{
-  result = SWIG_create_object(cppresult, SWIG_STR(SomeClass));
-}
-
      
-
-Finally, the return value variable is returned.
-
      -return result;
-
      
-
-
      The Proxy
      
-Compared to the wrapper code generation, the header code is very simple.
      
-Basically it contains just the declarations corresponding to the definitions
-above.
-
-
      -// wrapper header file
-typedef struct SwigObj_SomeClass SomeClass;
-
-SomeClass * new_SomeClass();
-
-void delete_SomeClass(SomeClass * carg1);
-
-SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
-
-
-typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
-
-SomeIntTemplateClass * new_SomeIntTemplateClass();
-
-void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
-
      
-
-
      36.5 Exception handling
      
-
-
-
-
+
+
+
+SWIG and C as the target language
+
+
+
+
      36 SWIG and C as the target language
      
+
+
      
+
+
      
+
+
+
+
+
      
+This chapter describes SWIG's support for creating ANSI C wrappers. This module has a special purpose and thus is different from most other modules.
+
      
+
+
      
+NOTE: this module is still under development.
+
      
+
+
+
      36.1 Overview
      
+
+
+
      
+SWIG is normally used to provide access to C or C++ libraries from target languages such as scripting languages or languages running on a virtual machine. 
+SWIG performs analysis of the input C/C++ library header files from which it generates further code. For most target languages this code consists of two layers; namely an intermediary C code layer and a set of language specific proxy classes and functions on top of the C code layer. 
+We could also think of C as just another target language supported by SWIG.
+The aim then is to generate a pure ANSI C interface to the input C or C++ library and hence the C target language module.
+
      
+
+
      
+With wrapper interfaces generated by SWIG, it is easy to use the functionality of C++ libraries inside application code written in C. This module may also be useful to generate custom APIs for a library, to suit particular needs, e.g. to supply function calls with error checking or to implement a "design by contract".
+
      
+
+
      
+Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it.
+
      
+
+
      Known C++ Shortcomings in Generated C API:
      
+
        
+    
      • Namespaced global functions are not namespaced
        • 
+    
      • Enums with a context like class or namespace are broken
        • 
+    
      • Global variables are not supported
        • 
+    
      • Qualifiers are stripped
        • 
+
      
+
      36.2 Preliminaries
      
+
+
+
      36.2.1 Running SWIG
      
+
+
+
      
+Consider the following simple example. Suppose we have an interface file like:
+
      
+
+
      
+
      +/* File: example.i */
+%module test
+%{
+#include "stuff.h"
+%}
+int fact(int n);
+
      
+
      
+
+
      
+To build a C module (C as the target language), run SWIG using the -c option :
      
+
+
      +$ swig -c example.i
+
      
+
+
      
+The above assumes C as the input language. If the input language is C++ add the -c++ option:
+
      
+
+
      +$ swig -c++ -c example.i
+
      
+
+
      
+Note that -c is the option specifying the target language and -c++ controls what the input language is.
+
      
+
+
      
+This will generate an example_wrap.c file or, in the latter case, example_wrap.cxx file, along with example_wrap.h (the same extension is used in both C and C++ cases for the last one). The names of the files are derived from the name of the input file by default, but can be changed using the -o and -oh options common to all language modules. 
+
      
+
+
      
+The xxx_wrap.c file contains the wrapper functions, which perform the main functionality of SWIG: each of the wrappers translates the input arguments from C to C++, makes calls to the original functions and marshals C++ output back to C data. The xxx_wrap.h header file contains the declarations of these functions as well as global variables.
+
      
+
+
      36.2.2 Command line options
      
+
+
+
      
+The following table list the additional command line options available for the C module. They can also be seen by using: 
+
      
+
+
      +$ swig -c -help
+
      
+
+
+
+
+
+
+
+
+
+
+
+
      C specific options
      -noexceptgenerate wrappers with no support of exception handling; see Exceptions chapter for more details 
      
+
+
      36.2.3 Compiling a dynamic module
      
+
+
+
      
+The next step is to build a dynamically loadable module, which we can link to our application. This can be done easily, for example using the gcc compiler (Linux, MinGW, etc.):
+
      
+
+
      +$ swig -c example.i
+$ gcc -c example_wrap.c
+$ gcc -shared example_wrap.o -o libexample.so
+
      
+
+
      
+Or, for C++ input:
+
      
+
+
      +$ swig -c++ -c example.i
+$ g++ -c example_wrap.cxx
+$ g++ -shared example_wrap.o -o libexample.so
+
      
+
+
      
+Now the shared library module is ready to use. Note that the name of the generated module is important: is should be prefixed with lib on Unix, and have the specific extension, like .dll for Windows or .so for Unix systems.
+
      
+
+
      36.2.4 Using the generated module
      
+
+
+
      
+The simplest way to use the generated shared module is to link it to the application code during the compilation stage. The process is usually similar to this:
+
      
+
+
      +$ gcc runme.c -L. -lexample -o runme
+
      
+
+
      
+This will compile the application code (runme.c) and link it against the generated shared module. Following the -L option is the path to the directory containing the shared module. The output executable is ready to use. The last thing to do is to supply to the operating system the information of location of our module. This is system dependant, for instance Unix systems look for shared modules in certain directories, like /usr/lib, and additionally we can set the environment variable LD_LIBRARY_PATH (Unix) or PATH (Windows) for other directories.
+
      
+
+
      36.3 Basic C wrapping
      
+
+
+
      
+Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enhance the code with some additional elements, for instance using check typemap or %extend directive.
+
      
+
+
      36.3.1 Functions
      
+
+
+
      
+For each C function declared in the interface file a wrapper function is created. Basically, the wrapper function performs a call to the original function, and returns its result.
+
      
+
+
      
+For example, for function declaration:
+
      
+
+
      +int gcd(int x, int y);
+
      
+
+
      
+The output is simply:
+
      
+
+
      +int _wrap_gcd(int arg1, int arg2) {
+  int result;
+  result = gcd(arg1,arg2);
+  return result;
+}
+
      
+
+
      
+Now one might think, what's the use of creating such functions in C? The answer is, you can apply special rules to the generated code. Take for example constraint checking. You can write a "check" typemap in your interface file:
+
      
+
+
      +%typemap(check) int POSITIVE {
+  if ($1 <= 0)
+    fprintf(stderr, "Expected positive value in $name.\n");
+}
+
+int gcd(int POSITIVE, int POSITIVE);
+
      
+
+
      
+And now the generated result looks like:
+
      
+
+
      +int _wrap_gcd(int arg1, int arg2) {
+  {
+    if (arg1 <= 0)
+      fprintf(stderr, "Expected positive value in gcd.\n");
+  }
+  {
+    if (arg1 <= 0)
+      fprintf(stderr, "Expected positive value in gcd.\n");
+  }
+  int result;
+  result = gcd(arg1,arg2);
+  return result;
+}
+
      
+
+
      
+This time calling gcd with negative value argument will trigger an error message. This can save you time writing all the constraint checking code by hand.
+
      
+
+
      36.3.2 Variables
      
+
+
+
      
+Wrapping variables comes also without any special issues. All global variables are directly accessible from application code. There is a difference in the semantics of struct definition in C and C++. When handling C struct, SWIG simply rewrites its declaration. In C++ struct is handled as class declaration. 
+
      
+
+
      
+You can still apply some of the SWIG features when handling structs, e.g. %extend directive. Suppose, you have a C struct declaration:
+
      
+
+
      +typedef struct {
+  int x;
+  char *str;
+} my_struct;
+
      
+
+
      
+You can redefine it to have an additional fields, like:
+
      
+
+
      +%extend my_struct {
+  double d;
+};
+
      
+
+
      
+In application code:
+
      
+
+
      +struct my_struct ms;
+ms.x = 123;
+ms.d = 123.123;
+
      
+
+
      36.4 Basic C++ wrapping
      
+
+
+
      
+The main reason of having the C module in SWIG is to be able to access C++ from C. In this chapter we will take a look at the rules of wrapping elements of the C++ language.
+
      
+
+
      
+By default, SWIG attempts to build a natural C interface to your C/C++ code.
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
      C++ TypeSWIG C Translation
      Class ExampleEmpty structure Example
      Public, mutable member variable Foo Example::foo
+      Example_foo_get(Example *e);
      
+      Example_foo_set(Example *e, Foo *f);
+    
      Public, immutable member variable Foo Example::bar
+      Example_foo_get(Example *e);
      
+    
      
+This section briefly covers the essential aspects of this wrapping.
+
      
+
+
      36.3.3 Enums
      
+
+
      
+C enums are simply copied to the generated code and keep the same name as in
+the original code.
+
      
+
+
+
      36.4.1 Classes
      
+
+
+
      
+Consider the following example. We have a C++ class, and want to use it from C code.
+
      
+
+
      +class Circle {
+public:
+  double radius;
+
+  Circle(double r) : radius(r) { };
+  double area(void);
+};
+
      
+
+
      
+What we need to do is to create an object of the class, manipulate it, and finally, destroy it. SWIG generates C functions for this purpose each time a class declaration is encountered in the interface file.
+
      
+
+
      
+The first two generated functions are used to create and destroy instances of class Circle. Such instances are represented on the C side as pointers to special structs, called SwigObj. They are all "renamed" (via typedef) to the original class names, so that you can use the object instances on the C side using pointers like:
+
      
+
+
      +Circle *circle;
+
      
+
+
      
+The generated functions make calls to class' constructors and destructors, respectively. They also do all the necessary things required by the SWIG object management system in C.
+
      
+
+
      +Circle * new_Circle(double r);
+void delete_Circle(Circle * self);
+
      
+
+
      
+The class Circle has a public variable called radius. SWIG generates a pair of setters and getters for each such variable:
+
      
+
+
      +void Circle_radius_set(Circle * self, double radius);
+double Circle_radius_get(Circle * self);
+
      
+
+
      
+For each public method, an appropriate function is generated:
+
      
+
+
      +double Circle_area(Circle * self);
+
      
+
+
      
+You can see that in order to use the generated object we need to provide a pointer to the object instance (struct Circle in this case) as the first function argument. In fact, this struct is basically wrapping pointer to the "real" C++ object.
+
      
+
+
      
+Our application code could look like this:
+
      
+
+
      +  Circle *c = new_Circle(1.5);
+  printf("radius: %f\narea: %f\n", Circle_radius_get(c), Circle_area(c));
+  delete_Circle(c);
+
      
+
+
      
+After running this we'll get:
+
      
+
+
      +radius: 1.500000
+area: 7.068583
+
      
+
+
      Backend Developer Documentation
      
+
+
      Typemaps
      
+
+
+  
+    
+    
+  
+  
+      
+      
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
      TypemapUsed for
      ctypeProvides types used for the C API and
      
+          Typecasts wrapper functions return values in proxy functions
      
+          
+              MyClass *MyClass_new(void) {
      
+               return (MyClass *)_wrap_MyClass_new();
      
+              }
+                
+      
      cmodtypeProvides types used by wrapper functions and
      
+       Casts of function parameters of wrapper function calls
      
+       
      
+       
+         extern void _wrap_MyClass_delete(SwigObj *o);
      
+         
      
+         void MyClass_delete(MyClass *c) {
      
+             _wrap_MyClass_delete((Swig_Obj *)c);
      
+         }
+             
+    
      inMapping of wrapper functions parameters to local C++ variables
      
+       
      
+       
+          SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
      
+             SomeCPPClass *arg1 = 0;
      
+             if (carg1)
      
+                arg1 = (SomeCPPClass*)carg1->obj
      
+             else
      
+                arg1 = 0;
      
+          }
+       
      outAssigns wrapped function's return value to a dedicated return variable, packaging it into SwigObj if necessary
      cppouttypeType of the result variable used for the return value if the wrapped function is a C++ function
+    
      
+
+
      C Typemaps, a Code Generation Walkthrough
      
+
+To get a better idea of which typemap is used for which generated code, have a look at the following 'walk through'.
      
+Let's assume we have the following C++ interface file, we'd like to generate code for:
+
+
      The Interface
      
+
      +%module example
+
+%inline
+%{
+  class SomeClass{};
+  template <typename T> class SomeTemplateClass{};
+  SomeClass someFunction(SomeTemplateClass<int> &someParameter, int simpleInt);
+%}
+
+%template (SomeIntTemplateClass) SomeTemplateClass<int>;
+
      
+
+
+What we would like to generate as a C interface of this function would be something like this:
+
+
      +// wrapper header file
+typedef struct SwigObj_SomeClass SomeClass;
+
+SomeClass * new_SomeClass();
+
+void delete_SomeClass(SomeClass * carg1);
+        
+SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
+        
+        
+typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
+        
+SomeIntTemplateClass * new_SomeIntTemplateClass();
+        
+void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
+
      
+
+
      The Wrapper
      
+We'll examine the generation of the wrapper function first.
+
+
      +SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
+  SomeClass * cppresult;
+  SomeTemplateClass< int > *arg1 = 0 ;
+  int arg2 ;
+  SwigObj * result;
+  
+  {
+    if (carg1)
+    arg1 = (SomeTemplateClass< int > *) carg1->obj;
+    else
+    arg1 = (SomeTemplateClass< int > *) 0;
+  }
+  arg2 = (int) carg2;
+  {
+    const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
+  }
+  {
+    result = SWIG_create_object(cppresult, SWIG_STR(SomeClass));
+  }
+  return result;
+}
+
      
+
+It might be helpful to think of the way function calls are generated as a composition of building blocks.
      
+A typical wrapper will be composited with these [optional] blocks:
+
+
        
+
      1. Prototype
        2. 
+
      2. C return value variable
        3. 
+
      3. Local variables equal to the called C++ function's parameters
        4. 
+
      4. [C++ return value variable]
        5. 
+
      5. Assignment (extraction) of wrapper parameters to local parameter copies
        6. 
+
      6. [Contract (e.g. constraints) checking]
        7. 
+
      7.  C++ function call
        8. 
+
      8. [Exception handling]
        9. 
+
      9. [Assignment to C++ return value]
        10. 
+
      10. Assignment to C return value
        11. 
+
      
+
+Let's go through it step by step and start with the wrapper prototype
+
+
      +cmodtype                     cmodtype         cmodtype
+---------                    ---------        ---
+SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
+
      
+
+As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
+
+
      +cmodtype
+---------
+SwigObj * result;
+
      
+
+Now for each of the C++ function's arguments, a local variable with the very same type is emitted to the wrapper's body.
+
+
      +SomeTemplateClass< int > *arg1 = 0 ;
+int arg2 ;
+
      
+
+If it's a C++ function that is wrapped (in this case it is), another variable is emitted for the 'original' return value of the C++ function.
      
+At this point, we simply 'inject' behavior if it's a C++ function that is wrapped (in this case it obviously is).
+
+
      +cppouttype
+-----------
+SomeClass * cppresult;
+
      
+
+Next, the values of the input parameters are assigned to the local variables using the 'in' typemap.
+
+
      +{
+  if (carg1)
+  arg1 = (SomeTemplateClass< int > *) carg1->obj;
+  else
+  arg1 = (SomeTemplateClass< int > *) 0;
+}
+arg2 = (int) carg2;
+
      
+
+A reasonable question would be: "Why aren't the parameters assigned in the declaration of their local counterparts?"
      
+As seen above, for complex types pointers have to be verified before extracting and 
      
+casting the actual data pointer from the provided SwigObj pointer.
      
+This could easily become messy if it was done in the same line with the local variable declaration.
      
+
      
+At this point we are ready to call the C++ function with our parameters.
      
+
      
+
      +{
+  const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
+}
+
      
+Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap
+
      +{
+  result = SWIG_create_object(cppresult, SWIG_STR(SomeClass));
+}
+
      
+
+Finally, the return value variable is returned.
+
      +return result;
+
      
+
+
      The Proxy
      
+Compared to the wrapper code generation, the header code is very simple.
      
+Basically it contains just the declarations corresponding to the definitions
+above.
+
+
      +// wrapper header file
+typedef struct SwigObj_SomeClass SomeClass;
+
+SomeClass * new_SomeClass();
+
+void delete_SomeClass(SomeClass * carg1);
+
+SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
+
+
+typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
+
+SomeIntTemplateClass * new_SomeIntTemplateClass();
+
+void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
+
      
+
+
      36.5 Exception handling
      
+
+
+
+
diff --git a/Examples/c/exception/example.h b/Examples/c/exception/example.h
index e5ebdc2a5..2b84bd5f5 100644
--- a/Examples/c/exception/example.h
+++ b/Examples/c/exception/example.h
@@ -1,52 +1,52 @@
-/* File : example.h */
-
-#ifndef SWIG
-struct A {
-};
-#endif
-
-class Exc {
-public:
-  Exc(int c, const char *m) {
-    code = c;
-    strncpy(msg,m,256);
-  }
-  int code;
-  char msg[256];
-};
-
-#if defined(_MSC_VER)
-  #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-
-class Test {
-public:
-  int simple() throw(int&) {
-      throw(37);
-      return 1;
-  }
-  int message() throw(const char *) {
-      throw("I died.");
-      return 1;
-  }
-  int hosed() throw(Exc) {
-      throw(Exc(42,"Hosed"));
-      return 1;
-  } 
-  int unknown() throw(A*) {
-      static A a;
-      throw &a;
-      return 1;
-  }
-  int multi(int x) throw(int, const char *, Exc) {
-     if (x == 1) throw(37);
-     if (x == 2) throw("Bleah!");
-     if (x == 3) throw(Exc(42,"No-go-diggy-die"));
-     return 1;
-  }
-};
-
-#if defined(_MSC_VER)
-  #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-
+/* File : example.h */
+
+#ifndef SWIG
+struct A {
+};
+#endif
+
+class Exc {
+public:
+  Exc(int c, const char *m) {
+    code = c;
+    strncpy(msg,m,256);
+  }
+  int code;
+  char msg[256];
+};
+
+#if defined(_MSC_VER)
+  #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+
+class Test {
+public:
+  int simple() throw(int&) {
+      throw(37);
+      return 1;
+  }
+  int message() throw(const char *) {
+      throw("I died.");
+      return 1;
+  }
+  int hosed() throw(Exc) {
+      throw(Exc(42,"Hosed"));
+      return 1;
+  } 
+  int unknown() throw(A*) {
+      static A a;
+      throw &a;
+      return 1;
+  }
+  int multi(int x) throw(int, const char *, Exc) {
+     if (x == 1) throw(37);
+     if (x == 2) throw("Bleah!");
+     if (x == 3) throw(Exc(42,"No-go-diggy-die"));
+     return 1;
+  }
+};
+
+#if defined(_MSC_VER)
+  #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+
diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index bb10749c1..c2de7ddca 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -1,199 +1,199 @@
-#include 
-#include 
-
-#include "char_strings/char_strings_wrap.h"
-
-int main() {
-  char *CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
-  char *OTHERLAND_MSG = "Little message from the safe world.";
-
-  long count = 10000;
-  long i = 0;
-
-  // get functions
-  for (i=0; i
+#include 
+
+#include "char_strings/char_strings_wrap.h"
+
+int main() {
+  char *CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
+  char *OTHERLAND_MSG = "Little message from the safe world.";
+
+  long count = 10000;
+  long i = 0;
+
+  // get functions
+  for (i=0; i
-
-#include "enums/enums_wrap.h"
-
-int main() {
-  bar2(1);
-  bar3(1);
-  bar1(1);
-  SWIG_exit(0);
-}
-
+#include 
+
+#include "enums/enums_wrap.h"
+
+int main() {
+  bar2(1);
+  bar3(1);
+  bar1(1);
+  SWIG_exit(0);
+}
+
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index 2aadbfeb1..1d9e58e49 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -1,65 +1,65 @@
-#include 
-
-#include "exception_order/exception_order_wrap.h"
-
-int main() {
-  A* a = new_A();
-
-  SWIG_try {
-    A_foo(a);
-  }
-  SWIG_catch(E1) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
-    fprintf(stderr, "foo: bad exception order\n");
-  }
-  SWIG_endtry;
-
-  SWIG_try {
-    A_bar(a);
-  }
-  SWIG_catch(E2) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
-    fprintf(stderr, "bar: bad exception order\n");
-  }
-  SWIG_endtry;
-
-  SWIG_try {
-    A_foobar(a);
-  }
-  SWIG_catch(SWIG_AnyException) {
-    if (strcmp(SWIG_exc.msg, "postcatch unknown") != 0) {
-      fprintf(stderr, "bad exception order\n");
-      SWIG_throw_msg(SWIG_exc.klass, SWIG_exc.msg);
-    }
-  }
-  SWIG_endtry;
-
-  SWIG_try {
-    A_barfoo(a, 1);
-  }
-  SWIG_catch(E1) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
-    fprintf(stderr, "barfoo(1): bad exception order\n");
-  }
-  SWIG_endtry;
-
-  SWIG_try {
-    A_barfoo(a, 2);
-  }
-  SWIG_catch(E2) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
-    fprintf(stderr, "barfoo(2): bad exception order\n");
-  }
-  SWIG_endtry;
-
-  SWIG_exit(0);
-}
-
+#include 
+
+#include "exception_order/exception_order_wrap.h"
+
+int main() {
+  A* a = new_A();
+
+  SWIG_try {
+    A_foo(a);
+  }
+  SWIG_catch(E1) {
+
+  }
+  SWIG_catch(SWIG_AnyException) {
+    fprintf(stderr, "foo: bad exception order\n");
+  }
+  SWIG_endtry;
+
+  SWIG_try {
+    A_bar(a);
+  }
+  SWIG_catch(E2) {
+
+  }
+  SWIG_catch(SWIG_AnyException) {
+    fprintf(stderr, "bar: bad exception order\n");
+  }
+  SWIG_endtry;
+
+  SWIG_try {
+    A_foobar(a);
+  }
+  SWIG_catch(SWIG_AnyException) {
+    if (strcmp(SWIG_exc.msg, "postcatch unknown") != 0) {
+      fprintf(stderr, "bad exception order\n");
+      SWIG_throw_msg(SWIG_exc.klass, SWIG_exc.msg);
+    }
+  }
+  SWIG_endtry;
+
+  SWIG_try {
+    A_barfoo(a, 1);
+  }
+  SWIG_catch(E1) {
+
+  }
+  SWIG_catch(SWIG_AnyException) {
+    fprintf(stderr, "barfoo(1): bad exception order\n");
+  }
+  SWIG_endtry;
+
+  SWIG_try {
+    A_barfoo(a, 2);
+  }
+  SWIG_catch(E2) {
+
+  }
+  SWIG_catch(SWIG_AnyException) {
+    fprintf(stderr, "barfoo(2): bad exception order\n");
+  }
+  SWIG_endtry;
+
+  SWIG_exit(0);
+}
+

From 4995e960094d8b38d530a307caa36c7e0d210162 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Apr 2016 02:28:53 +0200
Subject: [PATCH 215/508] Fix double delete in C mode resulting in crashes
 later on

This was broken by f1ec1a26 which removed a call to Copy() but not the
matching call to Delete().
---
 Source/Modules/c.cxx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index e499ab18e..9eec7b8b1 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -645,7 +645,6 @@ ready:
        Delete(arg_names);
        Delete(wname);
        Delete(return_type);
-       Delete(name);
        DelWrapper(wrapper);
     }
 

From dbb9cc250cedcabd28ab5b09f1de6176cf55b99e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Apr 2016 02:30:23 +0200
Subject: [PATCH 216/508] No real changes, just narrow scope for a variable

Initialize "baselist" just where it is needed.
---
 Source/Modules/c.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9eec7b8b1..d55a3383e 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1286,11 +1286,10 @@ ready:
 
   virtual int classHandler(Node *n) {
     String *name = getNamespacedName(n);
-    List *baselist = Getattr(n, "bases");
 
     if (CPlusPlus) {
       // inheritance support: attach all members from base classes to this class
-      if (baselist) {
+      if (List *baselist = Getattr(n, "bases")) {
 	// We may need to specialize SWIG_derives_from<> for this class: its unique check() method will return true iff it's given the name of any subclasses of
 	// this class. Notice that it may happen that all our base classes are ignored, in which case we don't do anything.
 	int specialize_derives_from = -1;

From fb4d700279970b7b8eecd2d0ec1f8a671aa91f51 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Apr 2016 02:36:00 +0200
Subject: [PATCH 217/508] Represent enums as themselves in generated code

Define enum type and enum values as the elements of this enum instead of using
preprocessor #defines for them.

This fixes a couple of enum-related unit tests.
---
 Examples/test-suite/c/Makefile.in |  2 -
 Source/Modules/c.cxx              | 83 +++++++++++++++++++++++--------
 2 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index ffb0e78ed..478db4884 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -47,9 +47,7 @@ FAILING_CPP_TESTS := \
     char_strings \
     constant_pointers \
     cpp_basic \
-    cpp_basic_class_enum \
     cpp_basic_class_var_pub_member_built_in \
-    cpp_basic_global_enum \
     cpp_basic_global_var_built_in \
     cpp_basic_global_var_class \
     cpp_basic_template_class \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index d55a3383e..f5dba49af 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -179,22 +179,26 @@ public:
   /* -----------------------------------------------------------------------------
    * getEnumName()
    *
+   * Return the name to use for the enum in the generated code.
+   * Also caches it in the node for subsequent access.
+   * Returns NULL if the node doesn't correspond to an enum.
    * ----------------------------------------------------------------------------- */
 
-  String *getEnumName(SwigType *t) {
-    Node *enumname = NULL;
-    Node *n = enumLookup(t);
+  String *getEnumName(Node *n) {
+    String *enumname = NULL;
     if (n) {
       enumname = Getattr(n, "enumname");
       if (!enumname) {
         String *symname = Getattr(n, "sym:name");
         if (symname) {
           // Add in class scope when referencing enum if not a global enum
-          String *scopename_prefix = Swig_scopename_prefix(Getattr(n, "name"));
           String *proxyname = 0;
-          if (scopename_prefix) {
-            proxyname = getProxyName(scopename_prefix);
-          }
+          if (String *name = Getattr(n, "name")) {
+	    if (String *scopename_prefix = Swig_scopename_prefix(name)) {
+	      proxyname = getProxyName(scopename_prefix);
+	      Delete(scopename_prefix);
+	    }
+	  }
           if (proxyname) {
             enumname = NewStringf("%s_%s", proxyname, symname);
           } else {
@@ -211,7 +215,6 @@ public:
           }
           Setattr(n, "enumname", enumname);
           Delete(enumname);
-          Delete(scopename_prefix);
         }
       }
     }
@@ -227,7 +230,7 @@ public:
   void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
 
     if (SwigType_isenum(classnametype)) {
-      String *enumname = getEnumName(classnametype);
+      String *enumname = getEnumName(enumLookup(classnametype));
       if (enumname)
   Replaceall(tm, classnamespecialvariable, enumname);
       else
@@ -1386,19 +1389,17 @@ ready:
 
       Delete(name);
       return Language::classHandler(n);
-    }
-    else if (Cmp(Getattr(n, "kind"), "struct") == 0) {
+    } else {
       // this is C struct, just declare it in the proxy
-      String *storage = Getattr(n, "storage");
-      int usetd = storage && Cmp(storage, "typedef") == 0;
-      if (usetd)
+      String* const tdname = Getattr(n, "tdname");
+      if (tdname)
         Append(f_wrappers_types, "typedef struct {\n");
       else 
         Printv(f_wrappers_types, "struct ", name, " {\n", NIL);
       Node *node = firstChild(n);
       emit_c_struct_def(node);
-      if (usetd)
-        Printv(f_wrappers_types, "} ", name, ";\n\n", NIL);
+      if (tdname)
+        Printv(f_wrappers_types, "} ", tdname, ";\n\n", NIL);
       else
         Append(f_wrappers_types, "};\n\n");
 
@@ -1666,7 +1667,38 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int enumDeclaration(Node *n) {
-    return Language::enumDeclaration(n);
+    if (ImportMode)
+      return SWIG_OK;
+
+    if (getCurrentClass() && (cplus_mode != PUBLIC))
+      return SWIG_NOWRAP;
+
+    // Preserve the typedef if we have it in the input.
+    String* const tdname = Getattr(n, "tdname");
+    if (tdname) {
+      Printv(f_wrappers_types, "typedef ", NIL);
+    }
+    Printv(f_wrappers_types, "enum", NIL);
+
+    if (String* const name = Getattr(n, "name")) {
+      String* const enumname = Swig_name_mangle(name);
+      Printv(f_wrappers_types, " ", enumname, NIL);
+      Delete(enumname);
+    }
+    Printv(f_wrappers_types, " {\n", NIL);
+
+    // Emit each enum item.
+    Language::enumDeclaration(n);
+
+    Printv(f_wrappers_types, "\n}", NIL);
+    if (tdname) {
+      String* const enumname = Swig_name_mangle(tdname);
+      Printv(f_wrappers_types, " ", enumname, NIL);
+      Delete(enumname);
+    }
+    Printv(f_wrappers_types, ";\n\n", NIL);
+
+    return SWIG_OK;
   }
 
   /* ---------------------------------------------------------------------
@@ -1677,10 +1709,19 @@ ready:
     if (Cmp(Getattr(n, "ismember"), "1") == 0 && Cmp(Getattr(n, "access"), "public") != 0)
       return SWIG_NOWRAP;
     Swig_require("enumvalueDeclaration", n, "*value", "?enumvalueex", "?enumvalue", NIL);
-    String *name = Getattr(n, "value");
-    String *value = Getattr(n, "enumvalueex");
-    value = value ? value : Getattr(n, "enumvalue");
-    Printv(f_wrappers_decl, "#define ", Swig_name_mangle(name), " ", value, "\n", NIL);
+
+    if (!GetFlag(n, "firstenumitem"))
+      Printv(f_wrappers_types, ",\n", NIL);
+
+    Printv(f_wrappers_types, cindent, Swig_name_mangle(Getattr(n, "value")), NIL);
+
+    // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum
+    // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace).
+    String *value = Getattr(n, "enumvalue");
+    if (value) {
+      Printv(f_wrappers_types, " = ", value, NIL);
+    }
+
     Swig_restore(n);
     return SWIG_OK;
   }

From 168e16ec670c75074a0e3f49b3794c5d21890281 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Apr 2016 01:39:52 +0200
Subject: [PATCH 218/508] Hack to support variables of anonymous enum types

Declare the variable as int as this is how variables of enum types are stored
(although this would have to be revised when support for C++11 base enum type
is added) and, although ugly, this at least allows the generated code to
compile.

This fixes some (but not all yet) errors in the "enums" and "cpp_enum" unit
tests.
---
 Examples/test-suite/c/enums_runme.c |  3 +-
 Source/Modules/c.cxx                | 85 +++++++++++++++++++++--------
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c
index 89f64e303..c7609dd11 100644
--- a/Examples/test-suite/c/enums_runme.c
+++ b/Examples/test-suite/c/enums_runme.c
@@ -1,8 +1,9 @@
-#include 
+#include 
 
 #include "enums/enums_wrap.h"
 
 int main() {
+  assert(GlobalInstance == globalinstance1);
   bar2(1);
   bar3(1);
   bar1(1);
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index f5dba49af..9e4323dca 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -436,20 +436,9 @@ public:
    * ------------------------------------------------------------------------ */  
 
   virtual int globalvariableHandler(Node *n) {
-    String *name = Getattr(n, "name");
-    SwigType *type = Getattr(n, "type");
-    String *type_str = Copy(SwigType_str(type, 0));
-    if (SwigType_isarray(type)) {
-      String *dims = Strchr(type_str, '[');
-      char *c = Char(type_str);
-      c[Len(type_str) - Len(dims) - 1] = '\0';
-      String *bare_type = NewStringf("%s", c);
-      Printv(f_wrappers_decl, "SWIGIMPORT ", bare_type, " ", name, "[];\n\n", NIL);
-      Delete(bare_type);
-    }
-    else
-      Printv(f_wrappers_decl, "SWIGIMPORT ", type_str, " ", name, ";\n\n", NIL);
-    Delete(type_str);
+    String* const var_decl = make_var_decl(n);
+    Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL);
+    Delete(var_decl);
     return SWIG_OK;
   }
 
@@ -1264,22 +1253,72 @@ ready:
     return 0;
   }
 
+  /* ---------------------------------------------------------------------
+   * make_var_decl()
+   *
+   * Return the declaration for the given node of "variable" kind.
+   * This function accounts for two special cases:
+   *  1. If the type is an anonymous enum, "int" is used instead.
+   *  2. If the type is an array, its bounds are stripped.
+   * --------------------------------------------------------------------- */
+  String *make_var_decl(Node *n) {
+    String *name = Getattr(n, "name");
+    SwigType *type = Getattr(n, "type");
+    String *type_str = SwigType_str(type, 0);
+
+    if (Getattr(n, "unnamedinstance")) {
+      // If this is an anonymous enum, we can declare the variable as int even though we can't reference this type.
+      if (Strncmp(type_str, "enum $", 6) != 0) {
+	// Otherwise we're out of luck, with the current approach of exposing the variables directly we simply can't do it, we would need to use accessor
+	// functions instead to support this.
+	Swig_error(Getfile(n), Getline(n), "Variables of anonymous non-enum types are not supported.\n");
+	return SWIG_ERROR;
+      }
+
+      const char * const unnamed_end = strchr(Char(type_str) + 6, '$');
+      if (!unnamed_end) {
+	Swig_error(Getfile(n), Getline(n), "Unsupported anonymous enum type \"%s\".\n", type_str);
+	return SWIG_ERROR;
+      }
+
+      String* const int_type_str = NewStringf("int%s", unnamed_end + 1);
+      Delete(type_str);
+      type_str = int_type_str;
+    }
+
+    String* const var_decl = NewStringEmpty();
+    if (SwigType_isarray(type)) {
+      String *dims = Strchr(type_str, '[');
+      char *c = Char(type_str);
+      c[Len(type_str) - Len(dims) - 1] = '\0';
+      Printv(var_decl, c, " ", name, "[]", NIL);
+    } else {
+      Printv(var_decl, type_str, " ", name, NIL);
+    }
+
+    Delete(type_str);
+
+    return var_decl;
+  }
+
   /* ---------------------------------------------------------------------
    * emit_c_struct_def()
    * --------------------------------------------------------------------- */
 
   void emit_c_struct_def(Node *node) {
     for ( ; node; node = nextSibling(node)) {
-      String* kind = Getattr(node, "kind");
-      if ((Cmp(kind, "variable") == 0) || (Cmp(kind, "function") == 0)) {
-        String* type = NewString("");
-        Printv(type, Getattr(node, "decl"), Getattr(node, "type"), NIL);
-        Printv(f_wrappers_types, cindent, SwigType_str(type, 0), " ", Getattr(node, "name"), ";\n", NIL);
-        Delete(type);
+      String* const ntype = nodeType(node);
+      if (Cmp(ntype, "cdecl") == 0) {
+	String* const var_decl = make_var_decl(node);
+	Printv(f_wrappers_types, cindent, Getattr(node, "decl"), var_decl, ";\n", NIL);
+	Delete(var_decl);
+      } else if (Cmp(ntype, "enum") == 0) {
+	emit_one(node);
+      } else {
+	// WARNING: proxy declaration can be different than original code
+	if (Cmp(nodeType(node), "extend") == 0)
+	  emit_c_struct_def(firstChild(node));
       }
-      // WARNING: proxy delaration can be different than original code
-      if (Cmp(nodeType(node), "extend") == 0)
-        emit_c_struct_def(firstChild(node));
     }
   }
 

From 3d21bb2c96ea29d0864518ae0c16c3f64a3ac258 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 16 Apr 2016 00:25:50 +0200
Subject: [PATCH 219/508] Hack around parser bug with char enum element values

Enum element somehow lose the single quotes around them, compensate for it in
C module code (other modules use module-specific constvalue feature to work
around it, but it seems better to do it in SWIG itself rather than leaving the
user code to deal with it).

This finally makes the "enums" unit test pass.
---
 Examples/test-suite/c/Makefile.in   |  1 -
 Examples/test-suite/c/enums_runme.c |  1 +
 Source/Modules/c.cxx                | 22 ++++++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 478db4884..fe04c869d 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -29,7 +29,6 @@ CPP_TEST_CASES := \
 # The following tests are currently broken and need to be fixed.
 FAILING_C_TESTS := \
     arrays \
-    enums \
     funcptr \
     function_typedef \
     lextype \
diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c
index c7609dd11..9c899e383 100644
--- a/Examples/test-suite/c/enums_runme.c
+++ b/Examples/test-suite/c/enums_runme.c
@@ -4,6 +4,7 @@
 
 int main() {
   assert(GlobalInstance == globalinstance1);
+  assert(Char == 'a');
   bar2(1);
   bar3(1);
   bar1(1);
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9e4323dca..451175676 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1752,13 +1752,31 @@ ready:
     if (!GetFlag(n, "firstenumitem"))
       Printv(f_wrappers_types, ",\n", NIL);
 
-    Printv(f_wrappers_types, cindent, Swig_name_mangle(Getattr(n, "value")), NIL);
+    String* const enumitemname = Getattr(n, "value");
+    Printv(f_wrappers_types, cindent, Swig_name_mangle(enumitemname), NIL);
 
     // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum
     // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace).
     String *value = Getattr(n, "enumvalue");
     if (value) {
-      Printv(f_wrappers_types, " = ", value, NIL);
+      String* const cvalue = Copy(value);
+
+      // Due to what seems to be a bug in SWIG parser, char values for enum elements lose their quotes, i.e.
+      //
+      //  enum { x = 'a', y = '\x62' };
+      //
+      // in input results in value being just "a" or "\x62". Try to repair this brokenness.
+      if (*Char(value) == '\\') {
+	Push(cvalue, "'");
+	Append(cvalue, "'");
+      } else if (Len(value) == 1 && !Swig_symbol_clookup(enumitemname, NULL)) {
+	Push(cvalue, "'");
+	Append(cvalue, "'");
+      }
+
+      Printv(f_wrappers_types, " = ", cvalue, NIL);
+
+      Delete(cvalue);
     }
 
     Swig_restore(n);

From 0be93325a9fe272a259ca4df6ae804376c3c0eec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 16 Apr 2016 00:44:41 +0200
Subject: [PATCH 220/508] Fix "out" typemap for enum pointers/references

Taking the address of C++ result doesn't make sense here, the C++ result is
already a pointer and so should be just returned as is.
---
 Lib/c/c.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 03cdb19ef..5e23341c2 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -266,7 +266,7 @@ same_action_all_primitive_types_but_void(out, "$result = $1;")
 %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;"
 
 %typemap(out) enum SWIGTYPE "$result = (int) $1;"
-%typemap(out) enum SWIGTYPE &, enum SWIGTYPE * "$result = (int *) &$1;"
+%typemap(out) enum SWIGTYPE &, enum SWIGTYPE * "$result = $1;"
 
 %typemap(out) SWIGTYPE (CLASS::*) {
   *($&1_ltype) &$result = $1; 

From 2a4bc0e7e5dc5562143a12d98934aca1d4ee04ed Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 16 Apr 2016 00:45:41 +0200
Subject: [PATCH 221/508] Fix function names in the cpp_enum C test

This was just an error in the test.
---
 Examples/test-suite/c/cpp_enum_runme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c
index fa88134cb..fedbbfc58 100644
--- a/Examples/test-suite/c/cpp_enum_runme.c
+++ b/Examples/test-suite/c/cpp_enum_runme.c
@@ -16,10 +16,10 @@ int main(int argc, const char *argv[]) {
 	assert(StructWithEnums_some_enum_get(s) == ENUM_TWO);
 
 	// check function call
-	StructWithEnums_some_enum_test1(s, &e, &e, &e);
+	StructWithEnums_enum_test1(s, e, &e, &e);
 
 	// check function call
-	StructWithEnums_some_enum_test2(s, &e, &e, &e);
+	StructWithEnums_enum_test2(s, e, &e, &e);
 
 	// check function call
 	assert(StructWithEnums_enum_test3(s) == ENUM_ONE);

From 44d68197d65cd68c2f4179b0cd5e42c43b1ac39f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 16 Apr 2016 00:45:58 +0200
Subject: [PATCH 222/508] Hack for "true" and "false" used as enum element
 values

This is not a full solution by far, but should address the most common case.

This also allows "cpp_enum" unit test to pass.
---
 Examples/test-suite/c/Makefile.in      |  1 -
 Examples/test-suite/c/cpp_enum_runme.c |  6 +++---
 Source/Modules/c.cxx                   | 11 +++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index fe04c869d..0e024853f 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -51,7 +51,6 @@ FAILING_CPP_TESTS := \
     cpp_basic_global_var_class \
     cpp_basic_template_class \
     cpp_basic_template_function \
-    cpp_enum \
     c_backend_cpp_natural_std_string \
     c_backend_cpp_exception \
     default_args \
diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c
index fedbbfc58..e72a2fdee 100644
--- a/Examples/test-suite/c/cpp_enum_runme.c
+++ b/Examples/test-suite/c/cpp_enum_runme.c
@@ -63,10 +63,10 @@ int main(int argc, const char *argv[]) {
 	play_state t;
 
 	t = PLAY;
-	assert(t == true);
+	assert(t == 1);
 
 	t = STOP;
-	assert(t == false);
+	assert(t == 0);
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 451175676..6b61b3df7 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1774,6 +1774,17 @@ ready:
 	Append(cvalue, "'");
       }
 
+      // Boolean constants can't appear in C code neither, so replace them with their values in the simplest possible case. This is not exhaustive, of course,
+      // but better than nothing and doing the right thing is not simple at all as we'd need to really parse the expression, just textual substitution wouldn't
+      // be enough (consider e.g. an enum element called "very_true" and another one using it as its value).
+      if (Cmp(value, "true") == 0) {
+	Clear(cvalue);
+	Append(cvalue, "1");
+      } else if (Cmp(value, "false") == 0) {
+	Clear(cvalue);
+	Append(cvalue, "0");
+      }
+
       Printv(f_wrappers_types, " = ", cvalue, NIL);
 
       Delete(cvalue);

From d98ef6ca070a1e0329761ff4657c71105218a492 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 16 Apr 2016 00:48:17 +0200
Subject: [PATCH 223/508] Remove C-specific enum unit tests

These tests are just a small subset of the full language-independent tests and
it doesn't make much sense to keep them now that the full tests pass.
---
 Examples/test-suite/c/Makefile.in                   |  2 --
 Examples/test-suite/c/cpp_basic_class_enum_runme.c  | 11 -----------
 Examples/test-suite/c/cpp_basic_global_enum_runme.c | 11 -----------
 Examples/test-suite/cpp_basic_class_enum.i          | 12 ------------
 Examples/test-suite/cpp_basic_global_enum.i         |  9 ---------
 5 files changed, 45 deletions(-)
 delete mode 100644 Examples/test-suite/c/cpp_basic_class_enum_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_global_enum_runme.c
 delete mode 100644 Examples/test-suite/cpp_basic_class_enum.i
 delete mode 100644 Examples/test-suite/cpp_basic_global_enum.i

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 0e024853f..54f5745e4 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -12,12 +12,10 @@ top_builddir = ../@top_builddir@
 
 CPP_TEST_CASES := \
 				 cpp_basic_class \
-				 cpp_basic_class_enum \
 				 cpp_basic_class_method \
 				 cpp_basic_class_virtual_method \
 				 cpp_basic_class_var_pub_member_built_in \
 				 cpp_basic_class_var_pub_member_class \
-				 cpp_basic_global_enum \
 				 cpp_basic_global_var_built_in \
 				 cpp_basic_global_var_class \
 				 cpp_basic_namespaced_class \
diff --git a/Examples/test-suite/c/cpp_basic_class_enum_runme.c b/Examples/test-suite/c/cpp_basic_class_enum_runme.c
deleted file mode 100644
index 08634c7ba..000000000
--- a/Examples/test-suite/c/cpp_basic_class_enum_runme.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include 
-#include "cpp_basic_class_enum/cpp_basic_class_enum_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    enum MyClass_SomeEnum myEnum = MyClass_FIRST_VALUE;
-
-    assert(myEnum != MyClass_SECOND_VALUE);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_global_enum_runme.c b/Examples/test-suite/c/cpp_basic_global_enum_runme.c
deleted file mode 100644
index 43805679f..000000000
--- a/Examples/test-suite/c/cpp_basic_global_enum_runme.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include 
-#include "cpp_basic_global_enum/cpp_basic_global_enum_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    enum SomeEnum myEnum = FIRST_VALUE;
-
-    assert(myEnum != SECOND_VALUE);
-
-    return 0;
-}
diff --git a/Examples/test-suite/cpp_basic_class_enum.i b/Examples/test-suite/cpp_basic_class_enum.i
deleted file mode 100644
index 8e7788b53..000000000
--- a/Examples/test-suite/cpp_basic_class_enum.i
+++ /dev/null
@@ -1,12 +0,0 @@
-%module cpp_basic_class_enum
-
-%inline {
-    class MyClass {
-        public:
-            enum SomeEnum
-            {
-                FIRST_VALUE,
-                SECOND_VALUE
-            };
-    };
-}
diff --git a/Examples/test-suite/cpp_basic_global_enum.i b/Examples/test-suite/cpp_basic_global_enum.i
deleted file mode 100644
index b1bfa612f..000000000
--- a/Examples/test-suite/cpp_basic_global_enum.i
+++ /dev/null
@@ -1,9 +0,0 @@
-%module cpp_basic_global_enum
-
-%inline {
-    enum SomeEnum
-    {
-        FIRST_VALUE,
-        SECOND_VALUE
-    };
-}

From c4036fdc58260007a6d193b280c888dc2169abe7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 17 Apr 2016 19:38:33 +0200
Subject: [PATCH 224/508] Fix handling of forward-declared enums

Don't output the enum body if it just forward-declared, empty enums are
invalid in C.
---
 Source/Modules/c.cxx | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6b61b3df7..d5d3cbaae 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -116,6 +116,9 @@ class C:public Language {
   // Contains fully expanded names of the classes for which we have already specialized SWIG_derives_from<>.
   Hash *already_specialized_derives_from;
 
+  // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
+  bool enum_is_empty;
+
   bool except_flag;
 
 public:
@@ -1724,12 +1727,18 @@ ready:
       Printv(f_wrappers_types, " ", enumname, NIL);
       Delete(enumname);
     }
-    Printv(f_wrappers_types, " {\n", NIL);
+
+    // We don't know here if we're going to have any non-ignored enum elements, so let enumvalueDeclaration() itself reset this flag if it does get called, this
+    // is simpler than trying to determine it here, even if it's a bit ugly because we generate the opening brace there, but the closing one here.
+    enum_is_empty = true;
 
     // Emit each enum item.
     Language::enumDeclaration(n);
 
-    Printv(f_wrappers_types, "\n}", NIL);
+    if (!enum_is_empty) {
+      Printv(f_wrappers_types, "\n}", NIL);
+    }
+
     if (tdname) {
       String* const enumname = Swig_name_mangle(tdname);
       Printv(f_wrappers_types, " ", enumname, NIL);
@@ -1749,7 +1758,11 @@ ready:
       return SWIG_NOWRAP;
     Swig_require("enumvalueDeclaration", n, "*value", "?enumvalueex", "?enumvalue", NIL);
 
-    if (!GetFlag(n, "firstenumitem"))
+    enum_is_empty = false;
+
+    if (GetFlag(n, "firstenumitem"))
+      Printv(f_wrappers_types, " {\n", NIL);
+    else
       Printv(f_wrappers_types, ",\n", NIL);
 
     String* const enumitemname = Getattr(n, "value");

From 1f6ce1ed6445a4a98ea541b871c95dc081768127 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 18 Apr 2016 01:53:38 +0200
Subject: [PATCH 225/508] Reuse existing wrapper declarations code for C
 functions too

We just copied the function prototype without any changes from the original C
function to the wrappers header when in C mode, but this wasn't correct, e.g.
the original function could use typedefs not available in the wrapper.

Fix this by applying the typemaps in C mode too, but without the C++-specific
parts.

This also makes C and C++ code paths slightly less different from each other,
the long-term goal is to make them identical.
---
 Source/Modules/c.cxx | 51 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index d5d3cbaae..d18fe4c08 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -231,6 +231,14 @@ public:
    * ----------------------------------------------------------------------------- */
 
   void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
+    if (!CPlusPlus) {
+      // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
+      Clear(tm);
+      String* const s = SwigType_str(classnametype, 0);
+      Append(tm, s);
+      Delete(s);
+      return;
+    }
 
     if (SwigType_isenum(classnametype)) {
       String *enumname = getEnumName(enumLookup(classnametype));
@@ -624,17 +632,10 @@ ready:
          Printf(wrapper->code, "return result;\n");
        Printf(wrapper->code, "}");
 
-       SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
-
-       if (proxy_type) {
-	 return_type = SwigType_str(proxy_type, 0);
-       }
-
-       // add function declaration to the header file
-       Printv(f_wrappers_decl, return_type, " ", wname, "(", proto, ");\n\n", NIL);
-
        Wrapper_print(wrapper, f_wrappers);
 
+       emit_wrapper_func_decl(n, name);
+
        // cleanup
        Delete(proto);
        Delete(arg_names);
@@ -714,10 +715,14 @@ ready:
        return return_type;
     }
 
-  virtual SwigType *functionWrapperCPPSpecificProxyReturnTypeGet(Node *n)
+  String *get_wrapper_func_return_type(Node *n)
     {
+       SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
+       if (proxy_type)
+	 return SwigType_str(proxy_type, 0);
+
        SwigType *type = Getattr(n, "type");
-       SwigType *return_type = NewString("");
+       String *return_type = NewString("");
        String *tm;
 
        // set the return type
@@ -747,8 +752,10 @@ ready:
        return return_type;
     }
 
-  virtual String *functionWrapperCPPSpecificProxyPrototypeGet(Node *n, ParmList *parms)
+  String *get_wrapper_func_proto(Node *n)
     {
+       ParmList *parms = Getattr(n, "parms");
+
        Parm *p;
        String *proto = NewString("");
        int gencomma = 0;
@@ -893,19 +900,19 @@ ready:
        return call;
     }
 
-  virtual void functionWrapperCPPSpecificProxy(Node *n, String *name)
+  /* ----------------------------------------------------------------------
+   * emit_wrapper_func_decl()
+   *
+   * Declares the wrapper function, using the C types used for it, in the header.
+   * The node here is a function declaration.
+   * ---------------------------------------------------------------------- */
+  void emit_wrapper_func_decl(Node *n, String *name)
     {
        // C++ function wrapper proxy code
-       ParmList *parms = Getattr(n, "parms");
        String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
-       SwigType *preturn_type = functionWrapperCPPSpecificProxyReturnTypeGet(n);
-       String *pproto = functionWrapperCPPSpecificProxyPrototypeGet(n, parms);
+       String *preturn_type = get_wrapper_func_return_type(n);
+       String *pproto = get_wrapper_func_proto(n);
        String *wrapper_call = NewString("");
-       SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
-
-       if (proxy_type) {
-            preturn_type = SwigType_str(proxy_type, 0);
-       }
 
        // add function declaration to the proxy header file
        Printv(f_wrappers_decl, preturn_type, " ", wname, "(", pproto, ");\n\n", NIL);
@@ -1200,7 +1207,7 @@ ready:
 
        // C++ function wrapper
        functionWrapperCPPSpecificWrapper(n, name);
-       functionWrapperCPPSpecificProxy(n, name);
+       emit_wrapper_func_decl(n, name);
 
        Delete(name);
     }

From 200ea0e37d3336552e182cbd217b4be80af4af9f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 18 Apr 2016 20:29:35 +0200
Subject: [PATCH 226/508] Don't output "decl" attribute into the wrapper
 declarations

This doesn't make any sense as "decl" is a SWIG type string and not a C
declaration.
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index d18fe4c08..fd6f7628d 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1320,7 +1320,7 @@ ready:
       String* const ntype = nodeType(node);
       if (Cmp(ntype, "cdecl") == 0) {
 	String* const var_decl = make_var_decl(node);
-	Printv(f_wrappers_types, cindent, Getattr(node, "decl"), var_decl, ";\n", NIL);
+	Printv(f_wrappers_types, cindent, var_decl, ";\n", NIL);
 	Delete(var_decl);
       } else if (Cmp(ntype, "enum") == 0) {
 	emit_one(node);

From 668f2b4a857356c41ce739bade9217e9c3e52138 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 18 Apr 2016 19:51:14 +0200
Subject: [PATCH 227/508] Syntax check headers by C module when running the
 unit tests suite

Catch errors in the generated headers even when we don't have a run test.

Unfortunately this uncovered that almost no unit tests actually pass, so many,
many more of them had to be disabled.
---
 Examples/Makefile.in              |  6 ++-
 Examples/test-suite/c/Makefile.in | 85 +++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 3919427f5..e10e443ec 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1734,15 +1734,19 @@ C_LDSHARED = @C_LDSHARED@
 CXX_LDSHARED = @CXX_LDSHARED@
 C_SO = @C_SO@
 
+SYNTAX_CHECK := $(CC) -fsyntax-only -x c
+
 c: $(SRCDIR_SRCS)
 	$(SWIG) -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) -I$(SRCDIR) $(CFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(INCLUDES)
 	$(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
-	
+	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(IWRAP:.i=.h)
+
 c_cpp: $(SRCDIR_SRCS)
 	$(SWIG) -c++ -c $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
+	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(IWRAP:.i=.h)
 
 c_compile: $(SRCDIR)$(RUNME).c
 	$(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. $< -L. -l$(TARGET)
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 54f5745e4..7bafe050e 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -27,21 +27,42 @@ CPP_TEST_CASES := \
 # The following tests are currently broken and need to be fixed.
 FAILING_C_TESTS := \
     arrays \
+    enum_missing \
     funcptr \
     function_typedef \
     lextype \
+    li_carrays \
     li_cdata \
     li_constraints \
+    li_cpointer \
+    memberin_extend_c \
+    nested \
+    nested_extend_c \
+    nested_structs \
+    overload_extend2 \
+    overload_extend_c \
+    typedef_struct \
+    union_parameter \
+    unions \
 
 FAILING_CPP_TESTS := \
     abstract_typedef \
+    abstract_typedef2 \
     anonymous_bitfield \
     apply_signed_char \
+    apply_strings \
     argout \
     array_member \
+    array_typedef_memberin \
+    arrayref \
     arrays_dimensionless \
+    arrays_global \
+    arrays_global_twodim \
     bools \
+    char_binary \
     char_strings \
+    class_ignore \
+    class_scope_weird \
     constant_pointers \
     cpp_basic \
     cpp_basic_class_var_pub_member_built_in \
@@ -49,26 +70,42 @@ FAILING_CPP_TESTS := \
     cpp_basic_global_var_class \
     cpp_basic_template_class \
     cpp_basic_template_function \
+    cpp_namespace \
+    cpp_typedef \
     c_backend_cpp_natural_std_string \
     c_backend_cpp_exception \
+    default_arg_values \
     default_args \
     default_constructor \
+    derived_nested \
     director_basic \
     director_binary_string \
+    director_enum \
     director_frob \
     director_property \
     director_string \
+    enum_thorough \
+    enum_var \
     exception_order \
     extend \
     extend_constructor_destructor \
     extend_default \
     extend_placement \
+    extern_c \
     features \
+    friends_template \
     funcptr_cpp \
+    global_scope_types \
+    global_vars \
+    grouping \
+    import_nomodule \
+    inherit_missing \
+    kind \
     langobj \
     li_attribute \
     li_attribute_template \
     li_boost_shared_ptr \
+    li_boost_shared_ptr_bits \
     li_carrays_cpp \
     li_cdata_cpp \
     li_std_combinations \
@@ -76,21 +113,54 @@ FAILING_CPP_TESTS := \
     li_std_map \
     li_std_pair \
     li_std_pair_using \
+    li_std_string \
     li_std_vector \
+    li_swigtype_inout \
     li_windows \
+    long_long_apply \
+    member_funcptr_galore \
+    member_pointer \
     mixed_types \
+    multiple_inheritance_shared_ptr \
+    namespace_class \
+    namespace_typemap \
+    namespace_virtual_method \
+    naturalvar \
+    naturalvar_more \
     nested_class \
+    nested_scope \
+    nested_template_base \
     operator_overload \
     overload_arrays \
+    overload_polymorphic \
     overload_simple \
     primitive_ref \
+    refcount \
+    reference_global_vars \
+    register_par \
+    smart_pointer_extend \
     smart_pointer_not \
     smart_pointer_template_defaults_overload \
     special_variables \
+    struct_initialization_cpp \
+    template_arg_scope \
     template_arg_typename \
     template_basic \
+    template_default \
+    template_default_arg \
+    template_default_class_parms_typedef \
+    template_default_vw \
+    template_enum \
     template_explicit \
+    template_extend_overload \
+    template_forward \
+    template_nested \
+    template_ns2 \
     template_ns4 \
+    template_ns_enum \
+    template_ns_enum2 \
+    template_opaque \
+    template_retvalue \
     template_tbase_template \
     template_typedef \
     template_typedef_class_template \
@@ -98,19 +168,34 @@ FAILING_CPP_TESTS := \
     template_typedef_cplx2 \
     template_typedef_cplx3 \
     template_typedef_cplx4 \
+    template_typedef_cplx5 \
+    template_typedef_fnc \
     template_typedef_funcptr \
+    template_typemaps \
     template_typemaps_typedef \
     template_typemaps_typedef2 \
+    template_using_directive_and_declaration_forward \
+    template_whitespace \
     typedef_array_member \
+    typedef_funcptr \
     typedef_struct_cpp \
+    typemap_array_qualifiers \
     typemap_namespace \
+    typemap_template_parm_typedef \
+    typemap_variables \
+    typemap_various \
     using_extend \
+    valuewrapper_opaque \
     varargs \
     varargs_overload \
     virtual_poly \
     voidtest
 
 FAILING_MULTI_CPP_TESTS := \
+    clientdata_prop \
+    imports \
+    import_stl \
+    mod \
     template_typedef_import \
 
 include $(srcdir)/../common.mk

From c73acc44a7484db6c56789e1393ff3f13cc61c21 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 18 Apr 2016 20:48:17 +0200
Subject: [PATCH 228/508] Show the number of passed tests in "make check"

This is especially useful when some tests are disabled by using
FAILING_XXX_TESTS variables.
---
 Examples/test-suite/common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 6f8a4cffa..b2bdcc72c 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -705,6 +705,7 @@ all: $(NOT_BROKEN_TEST_CASES) $(BROKEN_TEST_CASES)
 broken: $(BROKEN_TEST_CASES)
 
 check: $(NOT_BROKEN_TEST_CASES)
+	@echo $(words $^) $(LANGUAGE) tests passed
 
 check-c: $(C_TEST_CASES:=.ctest)
 

From 8104c24f71da44dde10f8c48b3373df94b810f6a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 18 Apr 2016 23:24:25 +0200
Subject: [PATCH 229/508] Fix typemaps for templates with more than one
 parameter

Ensure that any commas inside SWIG_STR() used in "out" typemaps for class
types are not interpreted as macro argument separators by using an extra pair
of parenthesis around the type.
---
 Lib/c/c.swg | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 5e23341c2..9831dc678 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -19,7 +19,8 @@
 #include 
 #include 
 
-#define SWIG_STR(x) #x
+#define SWIG_STR2(x) #x
+#define SWIG_STR(x) SWIG_STR2(x)
 #define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else
 %}
 
@@ -273,16 +274,16 @@ same_action_all_primitive_types_but_void(out, "$result = $1;")
 }
 
 %typemap(out) SWIGTYPE *&, SWIGTYPE ** {
-  static SwigObj* _ptr = (SwigObj*) SWIG_create_object($1, SWIG_STR($1_basetype));
+  static SwigObj* _ptr = (SwigObj*) SWIG_create_object($1, SWIG_STR(($1_basetype)));
   $result = &_ptr;
 }
 
 %typemap(out) SWIGTYPE {
-  $result = (SwigObj*) SWIG_create_object(&$1, SWIG_STR($1_basetype));
+  $result = (SwigObj*) SWIG_create_object(&$1, SWIG_STR(($1_basetype)));
 }
 
 %typemap(out) SWIGTYPE *, SWIGTYPE & {
-  $result = (SwigObj*) SWIG_create_object($1, SWIG_STR($1_basetype));
+  $result = (SwigObj*) SWIG_create_object($1, SWIG_STR(($1_basetype)));
 }
 
 %typemap(out) SWIGTYPE * [ANY], SWIGTYPE [ANY][ANY] {
@@ -297,7 +298,7 @@ same_action_all_primitive_types_but_void(out, "$result = $1;")
     _temp = (SwigObj**) malloc($1_dim0 * sizeof(SwigObj*));
     for (i = 0 ; i < $1_dim0; ++i) {
       if ($1[i]) {
-        _temp[i] = SWIG_create_object($1[i], SWIG_STR($1_ltype));
+        _temp[i] = SWIG_create_object($1[i], SWIG_STR(($1_ltype)));
       }
       else
         _temp[i] = (SwigObj*) 0;

From c8e4abd16e02396bb03e7af3c957b71b63259b62 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 19 Apr 2016 00:31:12 +0200
Subject: [PATCH 230/508] Use wrapper functions for global variables of non-C
 types

Don't try to export the variables whose type can't be represented in C
directly, this can't work.

Instead, just let use the default implementation to generate wrapper functions
for them.

Update "cpp_basic_global_var_class" unit test accordingly and remove it from
the list of the failing tests.
---
 Examples/test-suite/c/Makefile.in             |  1 -
 .../c/cpp_basic_global_var_class_runme.c      |  2 +-
 Source/Modules/c.cxx                          | 36 ++++++++++++++-----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 7bafe050e..4cc95bdc2 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -67,7 +67,6 @@ FAILING_CPP_TESTS := \
     cpp_basic \
     cpp_basic_class_var_pub_member_built_in \
     cpp_basic_global_var_built_in \
-    cpp_basic_global_var_class \
     cpp_basic_template_class \
     cpp_basic_template_function \
     cpp_namespace \
diff --git a/Examples/test-suite/c/cpp_basic_global_var_class_runme.c b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
index 12a586485..261c23210 100644
--- a/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
@@ -3,7 +3,7 @@
 
 int main(int argc, const char *argv[])
 {
-    assert(myGlobalClassInstance);
+    assert(myGlobalClassInstance_get());
 
     return 0;
 }
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index fd6f7628d..0f59ee798 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -447,10 +447,15 @@ public:
    * ------------------------------------------------------------------------ */  
 
   virtual int globalvariableHandler(Node *n) {
-    String* const var_decl = make_var_decl(n);
-    Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL);
-    Delete(var_decl);
-    return SWIG_OK;
+    // If we can export the variable directly, do it, this will be more convenient to use from C code than accessor functions.
+    if (String* const var_decl = make_c_var_decl(n)) {
+      Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL);
+      Delete(var_decl);
+      return SWIG_OK;
+    }
+
+    // Otherwise, e.g. if it's of a C++-only type, or a reference, generate accessor functions for it.
+    return Language::globalvariableHandler(n);
   }
 
   /* -----------------------------------------------------------------------
@@ -1264,14 +1269,17 @@ ready:
   }
 
   /* ---------------------------------------------------------------------
-   * make_var_decl()
+   * make_c_var_decl()
+   *
+   * Return the C declaration for the given node of "variable" kind.
+   *
+   * If the variable has a type not representable in C, returns NULL, the caller must check for this!
    *
-   * Return the declaration for the given node of "variable" kind.
    * This function accounts for two special cases:
    *  1. If the type is an anonymous enum, "int" is used instead.
    *  2. If the type is an array, its bounds are stripped.
    * --------------------------------------------------------------------- */
-  String *make_var_decl(Node *n) {
+  String *make_c_var_decl(Node *n) {
     String *name = Getattr(n, "name");
     SwigType *type = Getattr(n, "type");
     String *type_str = SwigType_str(type, 0);
@@ -1294,6 +1302,18 @@ ready:
       String* const int_type_str = NewStringf("int%s", unnamed_end + 1);
       Delete(type_str);
       type_str = int_type_str;
+    } else {
+      // Don't bother with checking if type is representable in C if we're wrapping C and not C++ anyhow: of course it is.
+      if (CPlusPlus) {
+	if (SwigType_isreference(type))
+	  return NIL;
+
+	SwigType *btype = SwigType_base(type);
+	const bool can_be_repr_in_c = SwigType_isbuiltin(btype) || SwigType_isenum(btype);
+	Delete(btype);
+	if (!can_be_repr_in_c)
+	  return NIL;
+      }
     }
 
     String* const var_decl = NewStringEmpty();
@@ -1319,7 +1339,7 @@ ready:
     for ( ; node; node = nextSibling(node)) {
       String* const ntype = nodeType(node);
       if (Cmp(ntype, "cdecl") == 0) {
-	String* const var_decl = make_var_decl(node);
+	String* const var_decl = make_c_var_decl(node);
 	Printv(f_wrappers_types, cindent, var_decl, ";\n", NIL);
 	Delete(var_decl);
       } else if (Cmp(ntype, "enum") == 0) {

From 18cb9464057df74c44aec198e0c8a6a3e87c5c25 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 18 Apr 2016 23:31:18 +0200
Subject: [PATCH 231/508] Fix cmodtype typemap for "const bool &"

We need bool to be "const", not the pointer.

This fixes a few of the errors in the "bools" unit test.
---
 Lib/c/c.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 9831dc678..7bc3730e1 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -169,7 +169,7 @@ explicit_same_type_unconsted_all_primitive_types_but_void(cmodtype);
 
 %typemap(cmodtype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type"
 %typemap(cmodtype, fragment="stdbool_inc") bool & "$1_ltype"
-%typemap(cmodtype, fragment="stdbool_inc") const bool & "$1_ltype const"
+%typemap(cmodtype, fragment="stdbool_inc") const bool & "const $1_ltype"
 
 
 // Typemaps for assigning wrapper parameters to local variables

From 85c9b87f9b898b71226017433d41fa23336b8971 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 19 Apr 2016 00:32:27 +0200
Subject: [PATCH 232/508] Fix ctype typemap for bool& too

Don't add an extra pointer, this is already done at the code level currently.

This makes the "bools" unit test pass.
---
 Examples/test-suite/c/Makefile.in | 1 -
 Lib/c/c.swg                       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 4cc95bdc2..235b5c1a0 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -58,7 +58,6 @@ FAILING_CPP_TESTS := \
     arrays_dimensionless \
     arrays_global \
     arrays_global_twodim \
-    bools \
     char_binary \
     char_strings \
     class_ignore \
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 7bc3730e1..03e958f38 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -137,8 +137,8 @@ explicit_same_type_all_primitive_types_but_void(ctype);
 %typemap(ctype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
 
 %typemap(ctype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
-%typemap(ctype, fragment="stdbool_inc") bool & "$1_basetype*"
-%typemap(ctype, fragment="stdbool_inc") const bool & "$1_basetype const *"
+%typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
+%typemap(ctype, fragment="stdbool_inc") const bool & "const $1_ltype"
 
 // Typemaps for wrapper function parameters and its local variables
 // void

From 7a392fd21f4aef28324a3e416f412c5d639c4085 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 16:28:24 +0200
Subject: [PATCH 233/508] Fix typemaps for "void*"

Pass void pointers directly to C, don't handle them objects which was done by
default previously because we didn't define any specific typemaps for them.

This allows to reenable another test.
---
 Examples/test-suite/c/Makefile.in | 1 -
 Lib/c/c.swg                       | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 235b5c1a0..3067ad568 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -131,7 +131,6 @@ FAILING_CPP_TESTS := \
     operator_overload \
     overload_arrays \
     overload_polymorphic \
-    overload_simple \
     primitive_ref \
     refcount \
     reference_global_vars \
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 03e958f38..30e042d5e 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -93,7 +93,7 @@ same_macro_all_primitive_types_but_void(explicit_same_type,TM);
 %typemap(TM) const T* * const ACTION
 %enddef
 
-%define same_action_all_primitive_types_but_void(TM, ACTION)
+%define same_action_all_primitive_types(TM, ACTION)
 same_action(TM, short, ACTION);
 same_action(TM, unsigned short, ACTION);
 same_action(TM, int, ACTION);
@@ -109,6 +109,7 @@ same_action(TM, unsigned char, ACTION);
 same_action(TM, float, ACTION);
 same_action(TM, double, ACTION);
 same_action(TM, size_t, ACTION);
+%typemap(TM) void*, void const* ACTION
 %enddef
 
 // Typemaps for proxy function parameters
@@ -173,7 +174,7 @@ explicit_same_type_unconsted_all_primitive_types_but_void(cmodtype);
 
 
 // Typemaps for assigning wrapper parameters to local variables
-same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
+same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
@@ -259,7 +260,7 @@ same_action_all_primitive_types_but_void(in, "$1 = ($1_ltype) $input;")
 
 
 // Typemaps for assigning result values to a special return variable
-same_action_all_primitive_types_but_void(out, "$result = $1;")
+same_action_all_primitive_types(out, "$result = $1;")
 
 %typemap(out) void ""
 

From 6813c7eacf119bc985edefdaad865b890fcaba62 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 16:31:16 +0200
Subject: [PATCH 234/508] No changes, just write emit_c_struct_def() in a more
 natural way

Don't force the caller to pass firstChild() of the struct node to this
function, just pass it the struct node itself and iterate over all of its
children inside it.
---
 Source/Modules/c.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0f59ee798..b88036571 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1335,8 +1335,8 @@ ready:
    * emit_c_struct_def()
    * --------------------------------------------------------------------- */
 
-  void emit_c_struct_def(Node *node) {
-    for ( ; node; node = nextSibling(node)) {
+  void emit_c_struct_def(Node *n) {
+    for ( Node* node = firstChild(n); node; node = nextSibling(node)) {
       String* const ntype = nodeType(node);
       if (Cmp(ntype, "cdecl") == 0) {
 	String* const var_decl = make_c_var_decl(node);
@@ -1347,7 +1347,7 @@ ready:
       } else {
 	// WARNING: proxy declaration can be different than original code
 	if (Cmp(nodeType(node), "extend") == 0)
-	  emit_c_struct_def(firstChild(node));
+	  emit_c_struct_def(node);
       }
     }
   }
@@ -1465,8 +1465,7 @@ ready:
         Append(f_wrappers_types, "typedef struct {\n");
       else 
         Printv(f_wrappers_types, "struct ", name, " {\n", NIL);
-      Node *node = firstChild(n);
-      emit_c_struct_def(node);
+      emit_c_struct_def(n);
       if (tdname)
         Printv(f_wrappers_types, "} ", tdname, ";\n\n", NIL);
       else

From 208980f4de5c6e5ae3dda4c36c18751ad7048990 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 16:43:54 +0200
Subject: [PATCH 235/508] Avoid gcc warnings for nested anonymous enums in the
 generated code

Output anonymous enums defined inside C structs in the global scope, this
doesn't change the semantics as the constants defined inside a struct still
have global scope in C, but avoids gcc warnings given when compiling the
generated code.
---
 Source/Modules/c.cxx | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index b88036571..c69ed4a24 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1333,21 +1333,26 @@ ready:
 
   /* ---------------------------------------------------------------------
    * emit_c_struct_def()
+   *
+   * Append the declarations of C struct members to the given string.
+   * Notice that this function has a side effect of outputting all enum declarations inside the struct into f_wrappers_types directly.
+   * This is done to avoid gcc warnings "declaration does not declare anything" given for the anonymous enums inside the structs.
    * --------------------------------------------------------------------- */
 
-  void emit_c_struct_def(Node *n) {
+  void emit_c_struct_def(String* out, Node *n) {
     for ( Node* node = firstChild(n); node; node = nextSibling(node)) {
       String* const ntype = nodeType(node);
       if (Cmp(ntype, "cdecl") == 0) {
 	String* const var_decl = make_c_var_decl(node);
-	Printv(f_wrappers_types, cindent, var_decl, ";\n", NIL);
+	Printv(out, cindent, var_decl, ";\n", NIL);
 	Delete(var_decl);
       } else if (Cmp(ntype, "enum") == 0) {
+	// This goes directly into f_wrappers_types, before this struct declaration.
 	emit_one(node);
       } else {
 	// WARNING: proxy declaration can be different than original code
 	if (Cmp(nodeType(node), "extend") == 0)
-	  emit_c_struct_def(node);
+	  emit_c_struct_def(out, node);
       }
     }
   }
@@ -1460,16 +1465,20 @@ ready:
       return Language::classHandler(n);
     } else {
       // this is C struct, just declare it in the proxy
+      String* struct_def = NewStringEmpty();
       String* const tdname = Getattr(n, "tdname");
       if (tdname)
-        Append(f_wrappers_types, "typedef struct {\n");
+        Append(struct_def, "typedef struct {\n");
       else 
-        Printv(f_wrappers_types, "struct ", name, " {\n", NIL);
-      emit_c_struct_def(n);
+        Printv(struct_def, "struct ", name, " {\n", NIL);
+      emit_c_struct_def(struct_def, n);
       if (tdname)
-        Printv(f_wrappers_types, "} ", tdname, ";\n\n", NIL);
+        Printv(struct_def, "} ", tdname, ";\n\n", NIL);
       else
-        Append(f_wrappers_types, "};\n\n");
+        Append(struct_def, "};\n\n");
+
+      Printv(f_wrappers_types, struct_def, NIL);
+      Delete(struct_def);
 
       Delete(name);
     }

From 87d4a0da71eb2a9addbcbe23994f51a2b2de44b8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 17:09:52 +0200
Subject: [PATCH 236/508] Reuse c_compile rule in C unit test suite makefile

No real changes, just reuse the commands defined in the C section of the top
level Examples/Makefile instead of (imperfectly, i.e. CFLAGS was forgotten
here) duplicating them in Examples/test-suite/c/Makefile.
---
 Examples/Makefile.in              |  2 +-
 Examples/test-suite/c/Makefile.in | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index e10e443ec..176690ca4 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1749,7 +1749,7 @@ c_cpp: $(SRCDIR_SRCS)
 	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(IWRAP:.i=.h)
 
 c_compile: $(SRCDIR)$(RUNME).c
-	$(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. $< -L. -l$(TARGET)
+	$(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. -I.. $< -L. -l$(TARGET)
 
 # -----------------------------------------------------------------
 # Run C example
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 3067ad568..ce23d30db 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -229,10 +229,13 @@ setup = \
 # Compiles C files then runs the testcase. A testcase is only run if
 # a file is found which has _runme.c appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\
-		cd $* && $(COMPILETOOL) $(CC) ../$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -I.. -L. -l$* -o $*_runme && \
-	  env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" PATH=".:$$PATH" SHLIB_PATH=".:$$SHLIB_PATH" DYLD_LIBRARY_PATH=".:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \
-	fi;
+	+if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  cd $* && $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
+	    SRCDIR='$(SRCDIR)' \
+	    RUNME=$*_runme \
+	    TARGET='$*' \
+	    c_run; \
+	fi
 
 # Clean: remove testcase directories
 %.clean:

From 4d774887cc8286d2b99c7202a1c3cec4d14748d5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 17:56:10 +0200
Subject: [PATCH 237/508] Only syntax check generated header when not using run
 test

There is no need to syntax check the header if it's going to be really used,
so this is a small optimization.

It also separates building of the wrappers from testing them better.
---
 Examples/Makefile.in              |  8 +++++--
 Examples/test-suite/c/Makefile.in | 36 ++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 176690ca4..c489e0946 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1740,17 +1740,21 @@ c: $(SRCDIR_SRCS)
 	$(SWIG) -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) -I$(SRCDIR) $(CFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(INCLUDES)
 	$(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
-	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(IWRAP:.i=.h)
 
 c_cpp: $(SRCDIR_SRCS)
 	$(SWIG) -c++ -c $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
-	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(IWRAP:.i=.h)
 
 c_compile: $(SRCDIR)$(RUNME).c
 	$(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. -I.. $< -L. -l$(TARGET)
 
+# This target is used for the unit tests: if we don't have any test code to
+# run, we at least can check that the generated header can be included without
+# giving any syntax errors.
+c_syntax_check:
+	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(C_HEADER)
+
 # -----------------------------------------------------------------
 # Run C example
 # -----------------------------------------------------------------
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index ce23d30db..78be312b3 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -213,7 +213,13 @@ SRCDIR       = ../$(srcdir)/
 %.multicpptest: 
 	$(setup)
 	+(cd $* && $(swig_and_compile_multi_cpp))
-	$(run_testcase)
+	+if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  $(do_run_testcase); \
+	else \
+	  cd $* && for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list`; do \
+	    $(call syntax_check_testcase,$${f}) || exit 1; \
+	  done; \
+	fi
 
 # Makes a directory for the testcase if it does not exist
 setup = \
@@ -226,15 +232,29 @@ setup = \
 		mkdir $*;						  \
 	fi;
 
-# Compiles C files then runs the testcase. A testcase is only run if
-# a file is found which has _runme.c appended after the testcase name.
+# Checks the header syntax if there is no runnable testcase for it.
+syntax_check_testcase = \
+	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
+	  SRCDIR='$(SRCDIR)' \
+	  INTERFACEDIR='$(INTERFACEDIR)' \
+	  C_HEADER=$1_wrap.h \
+	  c_syntax_check
+
+# Compiles C files then runs the testcase unconditionally.
+do_run_testcase = \
+	cd $* && $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
+	  SRCDIR='$(SRCDIR)' \
+	  RUNME=$*_runme \
+	  TARGET='$*' \
+	  c_run
+
+# Only compile and run testcase if a file with _rume.c appended to the testcase
+# name is found, otherwise only check the syntax of the generated files.
 run_testcase = \
 	+if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
-	  cd $* && $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
-	    SRCDIR='$(SRCDIR)' \
-	    RUNME=$*_runme \
-	    TARGET='$*' \
-	    c_run; \
+	  $(do_run_testcase); \
+	else \
+	  cd $* && $(call syntax_check_testcase,$*); \
 	fi
 
 # Clean: remove testcase directories

From e28bd6bf3af5bbc50bd2d5be90058375a2367bca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:37:16 +0200
Subject: [PATCH 238/508] Fix cpp_basic_class_var_pub_member_built_in test
 compilation

Use the correct header name in the test.
---
 Examples/test-suite/c/Makefile.in                               | 1 -
 .../c/cpp_basic_class_var_pub_member_built_in_runme.c           | 2 +-
 Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 78be312b3..cd91c67a1 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -64,7 +64,6 @@ FAILING_CPP_TESTS := \
     class_scope_weird \
     constant_pointers \
     cpp_basic \
-    cpp_basic_class_var_pub_member_built_in \
     cpp_basic_global_var_built_in \
     cpp_basic_template_class \
     cpp_basic_template_function \
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
index 747e2c864..d3dbf9fdf 100644
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_class_var_pub_member_atom/cpp_basic_class_var_pub_member_atom_wrap.h"
+#include "cpp_basic_class_var_pub_member_built_in/cpp_basic_class_var_pub_member_built_in_wrap.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i b/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
index 65bf1b301..114747204 100644
--- a/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
+++ b/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
@@ -1,4 +1,4 @@
-%module cpp_basic_class_var_pub_member_atom
+%module cpp_basic_class_var_pub_member_built_in
 
 %inline{
     class MyClass {

From 11fbdba9dea1a5cc4e237679332ef5f21b2e16d4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:41:07 +0200
Subject: [PATCH 239/508] Remove cpp_basic_template_class from the list of
 failing tests

It passes now.
---
 Examples/test-suite/c/Makefile.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index cd91c67a1..b4ca3544f 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -65,7 +65,6 @@ FAILING_CPP_TESTS := \
     constant_pointers \
     cpp_basic \
     cpp_basic_global_var_built_in \
-    cpp_basic_template_class \
     cpp_basic_template_function \
     cpp_namespace \
     cpp_typedef \

From e8c6bfbc8f92cdfb5b98b8917bd393aa023b948c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:38:34 +0200
Subject: [PATCH 240/508] Remove completely broken handling of member function
 pointers

Member function pointers can't possibly be represented as function pointers,
they have a strictly bigger size and attempting to do it resulted in code
which, with a lot of bad casts, compiled, but crashed during run-time.

The proper solution is to represent C++ method pointers with an appropriate
opaque type, but for now this remains broken -- just make it explicitly broken
instead of pretending that it works when it actually has no chance to.

Let "namespace_spaces" unit test pass, as it's not really related to the
function pointers, by adding an explicit SWIGC test to it.
---
 Examples/test-suite/namespace_spaces.i |  2 ++
 Lib/c/c.swg                            | 11 +----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Examples/test-suite/namespace_spaces.i b/Examples/test-suite/namespace_spaces.i
index 86b21e221..a880d7ce7 100644
--- a/Examples/test-suite/namespace_spaces.i
+++ b/Examples/test-suite/namespace_spaces.i
@@ -16,7 +16,9 @@ public:
     int blah(int x); 
     int spam(int x); 
     Integer bar(Integer x); 
+#ifndef SWIGC
     void (Foo:: *func_ptr) (int);
+#endif
 }; 
  
 inline Foo :: Foo () {}
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 30e042d5e..4013cfefd 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -5,11 +5,6 @@
  * c.swg
  * ----------------------------------------------------------------------------- */ 
 
-// WARNING: passing function pointers from C as parameters of type (or as
-// return values) SWIGTYPE (CLASS::*) causes cast of C function to type
-// void(*)() and it is user's responsibility to properly handle this 
-// function's arguments and return value. See 'cpp_basic' test for details.
-
 %insert("runtime") "clabels.swg"
 %insert("proxy_header") "cproxy.swg"
 
@@ -24,8 +19,6 @@
 #define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else
 %}
 
-%fragment("fptr_decl", "runtime") {typedef void(*SWIG_CPP_FP)();}
-%fragment("fptr_decl_proxy", "proxy_header") {typedef void(*SWIG_CPP_FP)();}
 %fragment("stdbool_inc", "proxy_header") {#include }
 
 %define same_macro_all_primitive_types_but_void(macro_name, TM)
@@ -135,7 +128,6 @@ explicit_same_type_all_primitive_types_but_void(ctype);
 %typemap(ctype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **"
 %typemap(ctype) enum SWIGTYPE "int"
 %typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
-%typemap(ctype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
 
 %typemap(ctype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
 %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
@@ -166,7 +158,6 @@ explicit_same_type_unconsted_all_primitive_types_but_void(cmodtype);
 %typemap(cmodtype) SWIGTYPE *&      "/* *& */ SwigObj **"
 %typemap(cmodtype) enum SWIGTYPE    "int"
 %typemap(cmodtype) enum SWIGTYPE &, enum SWIGTYPE *  "int *"
-%typemap(cmodtype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP"
 
 %typemap(cmodtype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type"
 %typemap(cmodtype, fragment="stdbool_inc") bool & "$1_ltype"
@@ -323,7 +314,7 @@ explicit_same_type_unconsted_all_primitive_types_but_void(cppouttype);
 %typemap(cppouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_basetype **"
 %typemap(cppouttype, retobj="1") enum SWIGTYPE "int"
 %typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
-%typemap(cppouttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "$1_ltype"
+%typemap(cppouttype) SWIGTYPE (CLASS::*) "$1_ltype"
 
 %typemap(cppouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
 %typemap(cppouttype, fragment="stdbool_inc") bool & "$1_basetype*"

From 7bb7fe135ac69e807aa0f760896ae25ca98de5b4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:41:21 +0200
Subject: [PATCH 241/508] Let cpp_basic unit test pass without method pointers
 support

This was the only part of the test that didn't work, test at least the rest of
it.
---
 Examples/test-suite/c/Makefile.in       |  1 -
 Examples/test-suite/c/cpp_basic_runme.c | 14 ++++++++------
 Examples/test-suite/cpp_basic.i         |  4 ++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index b4ca3544f..2a48127c6 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -63,7 +63,6 @@ FAILING_CPP_TESTS := \
     class_ignore \
     class_scope_weird \
     constant_pointers \
-    cpp_basic \
     cpp_basic_global_var_built_in \
     cpp_basic_template_function \
     cpp_namespace \
diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index ec73ff704..20aec75ab 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -83,13 +83,15 @@ int main(int argc, const char *argv[]) {
 	Bar_global_fval_set(f);
 	assert(Foo_num_get(Bar_global_fval_get()) == 7);
 
-	// test getting, setting and calling function pointers
-	SWIG_CPP_FP func1 = get_func1_ptr();
+	// getting, setting and calling function pointers isn't supported yet
+#if 0
+	SomeTypeForMemFnPtr func1 = _wrap_get_func1_ptr();
 	Foo_func_ptr_set(f, func1);
-	assert(test_func_ptr(f, 2) == 28);
-	SWIG_CPP_FP func2 = get_func2_ptr();
+	assert(_wrap_test_func_ptr(f, 2) == 28);
+	SomeTypeForMemFnPtr func2 = _wrap_get_func2_ptr();
 	Foo_func_ptr_set(f, func2);
-	assert(test_func_ptr(f, 2) == -14);
+	assert(_wrap_test_func_ptr(f, 2) == -14);
+#endif
 
 	delete_Bar(b);
 	delete_Foo(f);
@@ -104,4 +106,4 @@ int main(int argc, const char *argv[]) {
 	w = 0;
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Examples/test-suite/cpp_basic.i b/Examples/test-suite/cpp_basic.i
index a228af289..d093e3a5f 100644
--- a/Examples/test-suite/cpp_basic.i
+++ b/Examples/test-suite/cpp_basic.i
@@ -29,7 +29,9 @@ class Foo {
       return -a*num;
     }
     
+#ifndef SWIGC
     int (Foo::*func_ptr)(int);
+#endif // SWIGC
 
     const char* __str__() const { return "Foo"; }
 };
@@ -87,6 +89,7 @@ Foo Bar::global_fval = Foo(3);
 %}
 
 /* member function tests */
+#ifndef SWIGC
 %inline %{
 int (Foo::*get_func1_ptr())(int) {
   return &Foo::func1;
@@ -101,6 +104,7 @@ int test_func_ptr(Foo *f, int a) {
 }
 
 %}
+#endif // SWIGC
 
 
 #ifdef __cplusplus

From 2edbbfd87f01a4ee719e41cc1f609b6b055a5c5d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:48:00 +0200
Subject: [PATCH 242/508] Fix cpp_basic_global_var_built_in unit test

Use the correct header name in it and remove it from the list of the failing
tests.
---
 Examples/test-suite/c/Makefile.in                           | 1 -
 Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 2a48127c6..e5c500f8e 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -63,7 +63,6 @@ FAILING_CPP_TESTS := \
     class_ignore \
     class_scope_weird \
     constant_pointers \
-    cpp_basic_global_var_built_in \
     cpp_basic_template_function \
     cpp_namespace \
     cpp_typedef \
diff --git a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
index 4ef992da0..3ed025fc5 100644
--- a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
@@ -1,5 +1,5 @@
 #include 
-#include "cpp_basic_global_var_atom/cpp_basic_global_var_atom_wrap.h"
+#include "cpp_basic_global_var_built_in/cpp_basic_global_var_built_in_wrap.h"
 
 int main(int argc, const char *argv[])
 {

From af9dd72bb67811cf7eb93fbbc34e8f4c3a41310c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:49:43 +0200
Subject: [PATCH 243/508] Fix function name in cpp_basic_template_function test

Use "_wrap_" prefix to make the test compile and pass.
---
 Examples/test-suite/c/Makefile.in                         | 1 -
 Examples/test-suite/c/cpp_basic_template_function_runme.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index e5c500f8e..671cf93e0 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -63,7 +63,6 @@ FAILING_CPP_TESTS := \
     class_ignore \
     class_scope_weird \
     constant_pointers \
-    cpp_basic_template_function \
     cpp_namespace \
     cpp_typedef \
     c_backend_cpp_natural_std_string \
diff --git a/Examples/test-suite/c/cpp_basic_template_function_runme.c b/Examples/test-suite/c/cpp_basic_template_function_runme.c
index 10943d5e7..920d35a7e 100644
--- a/Examples/test-suite/c/cpp_basic_template_function_runme.c
+++ b/Examples/test-suite/c/cpp_basic_template_function_runme.c
@@ -2,7 +2,7 @@
 #include "cpp_basic_template_function/cpp_basic_template_function_wrap.h"
 
 int main() {
-    assert(GetMaxInt(3, 5) == 5);
+    assert(_wrap_GetMaxInt(3, 5) == 5);
     
     return 0;
-}
\ No newline at end of file
+}

From 3764ee1764eceda1b55ca2333f2441cf1779b15d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 18:51:46 +0200
Subject: [PATCH 244/508] Make anonymous_bitfield test compile

It still doesn't pass, but at least include the correct header from it.
---
 Examples/test-suite/c/anonymous_bitfield_runme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/c/anonymous_bitfield_runme.c b/Examples/test-suite/c/anonymous_bitfield_runme.c
index a9e0e731d..a53e61406 100644
--- a/Examples/test-suite/c/anonymous_bitfield_runme.c
+++ b/Examples/test-suite/c/anonymous_bitfield_runme.c
@@ -1,4 +1,4 @@
-#include "abstract_typedef2/abstract_change_wrap.h"
+#include "anonymous_bitfield/anonymous_bitfield_wrap.h"
 #include 
 
 int main(int argc, const char *argv[]) {
@@ -26,4 +26,4 @@ int main(int argc, const char *argv[]) {
 	delete_Foo(f);
 
 	return 0;
-}
\ No newline at end of file
+}

From 19268d0865328b41b70a749d7b9ff66f189420d8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 19:54:00 +0200
Subject: [PATCH 245/508] Add check-failing target to check that failing tests
 still do fail

This is useful to remove the tests which pass after the latest fixes from the
list of the failing tests.
---
 Examples/test-suite/common.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index b2bdcc72c..f87bdf311 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -713,6 +713,13 @@ check-cpp: $(CPP_TEST_CASES:=.cpptest)
 
 check-cpp11: $(CPP11_TEST_CASES:=.cpptest)
 
+check-failing-test = \
+	$(MAKE) -s $1.$2 >/dev/null 2>/dev/null && echo "Failing test $t passed."
+
+check-failing:
+	+-$(foreach t,$(FAILING_C_TESTS),$(call check-failing-test,$t,ctest);)
+	+-$(foreach t,$(FAILING_CPP_TESTS),$(call check-failing-test,$t,cpptest);)
+	+-$(foreach t,$(FAILING_MULTI_CPP_TESTS),$(call check-failing-test,$t,multicpptest);)
 endif
 
 # partialcheck target runs SWIG only, ie no compilation or running of tests (for a subset of languages)

From b7bd0165e884986549755042eeda481825e63189 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 19:54:30 +0200
Subject: [PATCH 246/508] Remove more tests which pass now

All tests detected as passing by "make check-failing".
---
 Examples/test-suite/c/Makefile.in | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 671cf93e0..b4312fd46 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -35,7 +35,6 @@ FAILING_C_TESTS := \
     li_cdata \
     li_constraints \
     li_cpointer \
-    memberin_extend_c \
     nested \
     nested_extend_c \
     nested_structs \
@@ -51,7 +50,6 @@ FAILING_CPP_TESTS := \
     anonymous_bitfield \
     apply_signed_char \
     apply_strings \
-    argout \
     array_member \
     array_typedef_memberin \
     arrayref \
@@ -72,14 +70,10 @@ FAILING_CPP_TESTS := \
     default_constructor \
     derived_nested \
     director_basic \
-    director_binary_string \
     director_enum \
-    director_frob \
     director_property \
     director_string \
     enum_thorough \
-    enum_var \
-    exception_order \
     extend \
     extend_constructor_destructor \
     extend_default \
@@ -89,14 +83,11 @@ FAILING_CPP_TESTS := \
     friends_template \
     funcptr_cpp \
     global_scope_types \
-    global_vars \
     grouping \
     import_nomodule \
     inherit_missing \
     kind \
-    langobj \
     li_attribute \
-    li_attribute_template \
     li_boost_shared_ptr \
     li_boost_shared_ptr_bits \
     li_carrays_cpp \
@@ -106,7 +97,6 @@ FAILING_CPP_TESTS := \
     li_std_map \
     li_std_pair \
     li_std_pair_using \
-    li_std_string \
     li_std_vector \
     li_swigtype_inout \
     li_windows \
@@ -118,7 +108,6 @@ FAILING_CPP_TESTS := \
     namespace_class \
     namespace_typemap \
     namespace_virtual_method \
-    naturalvar \
     naturalvar_more \
     nested_class \
     nested_scope \
@@ -126,9 +115,7 @@ FAILING_CPP_TESTS := \
     operator_overload \
     overload_arrays \
     overload_polymorphic \
-    primitive_ref \
     refcount \
-    reference_global_vars \
     register_par \
     smart_pointer_extend \
     smart_pointer_not \
@@ -148,21 +135,13 @@ FAILING_CPP_TESTS := \
     template_forward \
     template_nested \
     template_ns2 \
-    template_ns4 \
     template_ns_enum \
     template_ns_enum2 \
     template_opaque \
     template_retvalue \
-    template_tbase_template \
-    template_typedef \
     template_typedef_class_template \
-    template_typedef_cplx \
-    template_typedef_cplx2 \
-    template_typedef_cplx3 \
-    template_typedef_cplx4 \
     template_typedef_cplx5 \
     template_typedef_fnc \
-    template_typedef_funcptr \
     template_typemaps \
     template_typemaps_typedef \
     template_typemaps_typedef2 \
@@ -181,7 +160,6 @@ FAILING_CPP_TESTS := \
     varargs \
     varargs_overload \
     virtual_poly \
-    voidtest
 
 FAILING_MULTI_CPP_TESTS := \
     clientdata_prop \

From e934c51425141cc4dbb05bf514714b70f0c0d659 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 22:46:53 +0200
Subject: [PATCH 247/508] Include stddef.h instead of stdio.h in the generated
 header

The sole reason for including this header seems to be to get size_t
declaration, so include the smallest header sufficient for this.

It would be even better to use a fragment for all size_t typemaps to only
include it if necessary, but it doesn't seem to be worth doing this right now.
---
 Lib/c/cproxy.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/c/cproxy.swg b/Lib/c/cproxy.swg
index 90626db98..3b4b7ae11 100644
--- a/Lib/c/cproxy.swg
+++ b/Lib/c/cproxy.swg
@@ -17,4 +17,4 @@
 # endif
 #endif
 
-#include 
\ No newline at end of file
+#include 

From b062a63cd1a7f2688943c8d2248374c7a9fdb076 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 23:06:32 +0200
Subject: [PATCH 248/508] Fix abstract_typedef C test code

Don't refer to the typedef name (especially with a typo in it...), it is not
supposed to be exported.

Also fix the write() method call: use the right class for it and pass it the
correct arguments.
---
 Examples/test-suite/c/Makefile.in              | 1 -
 Examples/test-suite/c/abstract_typedef_runme.c | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index b4312fd46..a9ea01160 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -45,7 +45,6 @@ FAILING_C_TESTS := \
     unions \
 
 FAILING_CPP_TESTS := \
-    abstract_typedef \
     abstract_typedef2 \
     anonymous_bitfield \
     apply_signed_char \
diff --git a/Examples/test-suite/c/abstract_typedef_runme.c b/Examples/test-suite/c/abstract_typedef_runme.c
index c9c699ba8..0019b1cc9 100644
--- a/Examples/test-suite/c/abstract_typedef_runme.c
+++ b/Examples/test-suite/c/abstract_typedef_runme.c
@@ -4,15 +4,12 @@
 
 int main(int argc, const char *argv[]) {
 	Engine *e = new_Engine();
-	PerseEngine *pe = new_PersEngine();
 	A *a = new_A();
 
-	assert(A_write(e) == true);
-	assert(A_write(pe) == true);
+	assert(AbstractBaseClass_write(a, e) == true);
 
 	delete_A(a);
-	delete_PerseEngine(pe);
 	delete_Engine(e);
 
 	return 0;
-}
\ No newline at end of file
+}

From 59c131ea08063dae7b600039f02b2606979d7f4c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 23:14:52 +0200
Subject: [PATCH 249/508] Fix broken anonymous_bitfield C checking code

For some reason the test expected another bit field be changed when setting
the given one, which was just plain wrong and prevented the test from passing.
---
 Examples/test-suite/c/Makefile.in                | 1 -
 Examples/test-suite/c/anonymous_bitfield_runme.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index a9ea01160..d15e2d1a4 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -46,7 +46,6 @@ FAILING_C_TESTS := \
 
 FAILING_CPP_TESTS := \
     abstract_typedef2 \
-    anonymous_bitfield \
     apply_signed_char \
     apply_strings \
     array_member \
diff --git a/Examples/test-suite/c/anonymous_bitfield_runme.c b/Examples/test-suite/c/anonymous_bitfield_runme.c
index a53e61406..3370341ec 100644
--- a/Examples/test-suite/c/anonymous_bitfield_runme.c
+++ b/Examples/test-suite/c/anonymous_bitfield_runme.c
@@ -8,10 +8,10 @@ int main(int argc, const char *argv[]) {
 
 	Foo_x_set(f, 1);
 	assert(Foo_x_get(f) == 1);
-	assert(Foo_y_get(f) == 1);
+	assert(Foo_y_get(f) == 0);
 
 	Foo_y_set(f, 0);
-	assert(Foo_x_get(f) == 0);
+	assert(Foo_x_get(f) == 1);
 	assert(Foo_y_get(f) == 0);
 
 	Foo_f_set(f, 1);

From 4c654d936955acab00948b2b48f2b2367677b7a7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 23:16:48 +0200
Subject: [PATCH 250/508] Give an error if unsupported type is encountered

This is better than silently generating completely wrong code with
$resolved_type in it and makes it easier to understand what exactly went wrong
and where.
---
 Source/Modules/c.cxx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index c69ed4a24..c6f575424 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -230,7 +230,7 @@ public:
    * substituteResolvedTypeSpecialVariable()
    * ----------------------------------------------------------------------------- */
 
-  void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
+  void substituteResolvedTypeSpecialVariable(Node* n, SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
     if (!CPlusPlus) {
       // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
       Clear(tm);
@@ -250,6 +250,10 @@ public:
       String *classname = getProxyName(classnametype);
       if (classname) {
   Replaceall(tm, classnamespecialvariable, classname);  // getProxyName() works for pointers to classes too
+      } else {
+	String* const s = SwigType_str(classnametype, 0);
+	Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", s);
+	Delete(s);
       }
     }
   }
@@ -270,14 +274,14 @@ public:
    *   substitution_performed - flag indicating if a substitution was performed
    * ----------------------------------------------------------------------------- */
 
-  bool substituteResolvedType(SwigType *pt, String *tm) {
+  bool substituteResolvedType(Node* n, SwigType *pt, String *tm) {
     bool substitution_performed = false;
     SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
-      substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type");
+      substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -285,7 +289,7 @@ public:
       SwigType *classnametype = Copy(strippedtype);
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
-  substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
+  substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$*resolved_type");
   substitution_performed = true;
       }
       Delete(classnametype);
@@ -293,7 +297,7 @@ public:
     if (Strstr(tm, "$&resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       SwigType_add_pointer(classnametype);
-      substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type");
+      substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$&resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -744,7 +748,7 @@ ready:
               }
             else
               {
-                 substituteResolvedType(type, tm);
+                 substituteResolvedType(n, type, tm);
                  return_type = tm;
               }
        }
@@ -808,7 +812,7 @@ ready:
             if ((stype = Getattr(p, "c:stype"))) {
                 proxy_parm_type = SwigType_lstr(stype, 0);
             } else {
-                substituteResolvedType(type, tm);
+                substituteResolvedType(n, type, tm);
                 proxy_parm_type = tm;              
             }
 

From e39265ba135c9fb8daee692210a319ec5fe00ba1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 23:41:32 +0200
Subject: [PATCH 251/508] Handle primitive types when expanding "resolved_type"
 in typemaps

Although the default typemaps only use "resolved_type" for non-simple types,
the generic SWIGTYPE typemap can also be applied explicitly to other types as
"apply_strings" and "char_binary" unit tests do.

In this case just use the original type unchanged if we can, this is enough to
make these tests pass.
---
 Examples/test-suite/c/Makefile.in |  2 --
 Source/Modules/c.cxx              | 13 ++++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index d15e2d1a4..e7b23fc91 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -47,14 +47,12 @@ FAILING_C_TESTS := \
 FAILING_CPP_TESTS := \
     abstract_typedef2 \
     apply_signed_char \
-    apply_strings \
     array_member \
     array_typedef_memberin \
     arrayref \
     arrays_dimensionless \
     arrays_global \
     arrays_global_twodim \
-    char_binary \
     char_strings \
     class_ignore \
     class_scope_weird \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index c6f575424..6ab6349cb 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -251,9 +251,16 @@ public:
       if (classname) {
   Replaceall(tm, classnamespecialvariable, classname);  // getProxyName() works for pointers to classes too
       } else {
-	String* const s = SwigType_str(classnametype, 0);
-	Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", s);
-	Delete(s);
+	String* const typestr = SwigType_str(classnametype, 0);
+	SwigType *btype = SwigType_base(classnametype);
+	if (SwigType_isbuiltin(btype)) {
+	  // This should work just as well in C without any changes.
+	  Replaceall(tm, classnamespecialvariable, typestr);
+	} else {
+	  Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", typestr);
+	}
+	Delete(btype);
+	Delete(typestr);
       }
     }
   }

From 2ec9d9da6e6716953a50df7d2c80037a3f4dd215 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 23:52:32 +0200
Subject: [PATCH 252/508] Don't try to export variables in namespace scope
 directly

The generated code, which used C++ scope operator "::" in a C header, didn't
compile and couldn't work anyhow.

Just use the accessor functions for not really global variables.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Source/Modules/c.cxx              | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index e7b23fc91..8520af293 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -57,7 +57,6 @@ FAILING_CPP_TESTS := \
     class_ignore \
     class_scope_weird \
     constant_pointers \
-    cpp_namespace \
     cpp_typedef \
     c_backend_cpp_natural_std_string \
     c_backend_cpp_exception \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6ab6349cb..a64bc8c99 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -458,11 +458,17 @@ public:
    * ------------------------------------------------------------------------ */  
 
   virtual int globalvariableHandler(Node *n) {
-    // If we can export the variable directly, do it, this will be more convenient to use from C code than accessor functions.
-    if (String* const var_decl = make_c_var_decl(n)) {
-      Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL);
-      Delete(var_decl);
-      return SWIG_OK;
+    // We can't export variables defined inside namespaces to C directly, whatever their type.
+    String* const scope = Swig_scopename_prefix(Getattr(n, "name"));
+    if (!scope) {
+      // If we can export the variable directly, do it, this will be more convenient to use from C code than accessor functions.
+      if (String* const var_decl = make_c_var_decl(n)) {
+	Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL);
+	Delete(var_decl);
+	return SWIG_OK;
+      }
+    } else {
+      Delete(scope);
     }
 
     // Otherwise, e.g. if it's of a C++-only type, or a reference, generate accessor functions for it.

From d9feedc37af96f47bf7692b21419fc9aaef51924 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Apr 2016 23:59:23 +0200
Subject: [PATCH 253/508] Remove unnecessary SwigType_typedef_resolve_all()
 call

No real changes, just don't bother calling SwigType_typedef_resolve_all()
before calling classLookup() because the latter already does it anyhow.
---
 Source/Modules/c.cxx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index a64bc8c99..cd5cb5d9d 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -169,13 +169,9 @@ public:
    * ----------------------------------------------------------------------------- */
   
    String *getProxyName(SwigType *t) {
-     Node *n = NULL;
+     Node *n = classLookup(t);
 
-     t = SwigType_typedef_resolve_all(t);
-     if (!t || !(n = classLookup(t)))
-      return NULL;
-
-    return getNamespacedName(n);
+    return n ? getNamespacedName(n) : NULL;
 
    }
 

From 36fdd4e78f12657068375ea80960a7f43779d62d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 00:11:30 +0200
Subject: [PATCH 254/508] Wrap unknown type as opaque pointers

Don't give errors for the unknown types, instead wrap them using the mangled
name of the type.

This is the expected (even if not particularly useful) SWIG behaviour and
allows many more tests to pass.
---
 Examples/test-suite/c/Makefile.in | 44 -------------------------------
 Source/Modules/c.cxx              | 26 +++++++++++-------
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 8520af293..85eeb420a 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -45,7 +45,6 @@ FAILING_C_TESTS := \
     unions \
 
 FAILING_CPP_TESTS := \
-    abstract_typedef2 \
     apply_signed_char \
     array_member \
     array_typedef_memberin \
@@ -54,19 +53,13 @@ FAILING_CPP_TESTS := \
     arrays_global \
     arrays_global_twodim \
     char_strings \
-    class_ignore \
-    class_scope_weird \
     constant_pointers \
-    cpp_typedef \
     c_backend_cpp_natural_std_string \
     c_backend_cpp_exception \
     default_arg_values \
     default_args \
     default_constructor \
-    derived_nested \
-    director_basic \
     director_enum \
-    director_property \
     director_string \
     enum_thorough \
     extend \
@@ -75,83 +68,47 @@ FAILING_CPP_TESTS := \
     extend_placement \
     extern_c \
     features \
-    friends_template \
     funcptr_cpp \
     global_scope_types \
     grouping \
     import_nomodule \
-    inherit_missing \
-    kind \
     li_attribute \
     li_boost_shared_ptr \
-    li_boost_shared_ptr_bits \
     li_carrays_cpp \
-    li_cdata_cpp \
     li_std_combinations \
     li_std_deque \
     li_std_map \
     li_std_pair \
     li_std_pair_using \
     li_std_vector \
-    li_swigtype_inout \
     li_windows \
-    long_long_apply \
     member_funcptr_galore \
     member_pointer \
     mixed_types \
-    multiple_inheritance_shared_ptr \
     namespace_class \
-    namespace_typemap \
-    namespace_virtual_method \
-    naturalvar_more \
     nested_class \
     nested_scope \
     nested_template_base \
     operator_overload \
     overload_arrays \
-    overload_polymorphic \
-    refcount \
-    register_par \
     smart_pointer_extend \
     smart_pointer_not \
     smart_pointer_template_defaults_overload \
     special_variables \
     struct_initialization_cpp \
-    template_arg_scope \
     template_arg_typename \
     template_basic \
     template_default \
-    template_default_arg \
     template_default_class_parms_typedef \
-    template_default_vw \
     template_enum \
     template_explicit \
-    template_extend_overload \
-    template_forward \
-    template_nested \
-    template_ns2 \
-    template_ns_enum \
-    template_ns_enum2 \
-    template_opaque \
-    template_retvalue \
-    template_typedef_class_template \
-    template_typedef_cplx5 \
     template_typedef_fnc \
-    template_typemaps \
-    template_typemaps_typedef \
-    template_typemaps_typedef2 \
-    template_using_directive_and_declaration_forward \
-    template_whitespace \
     typedef_array_member \
     typedef_funcptr \
     typedef_struct_cpp \
     typemap_array_qualifiers \
     typemap_namespace \
-    typemap_template_parm_typedef \
-    typemap_variables \
-    typemap_various \
     using_extend \
-    valuewrapper_opaque \
     varargs \
     varargs_overload \
     virtual_poly \
@@ -160,7 +117,6 @@ FAILING_MULTI_CPP_TESTS := \
     clientdata_prop \
     imports \
     import_stl \
-    mod \
     template_typedef_import \
 
 include $(srcdir)/../common.mk
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index cd5cb5d9d..4e879f39d 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -226,7 +226,7 @@ public:
    * substituteResolvedTypeSpecialVariable()
    * ----------------------------------------------------------------------------- */
 
-  void substituteResolvedTypeSpecialVariable(Node* n, SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
+  void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
     if (!CPlusPlus) {
       // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
       Clear(tm);
@@ -247,15 +247,21 @@ public:
       if (classname) {
   Replaceall(tm, classnamespecialvariable, classname);  // getProxyName() works for pointers to classes too
       } else {
-	String* const typestr = SwigType_str(classnametype, 0);
+	String* typestr = NIL;
 	SwigType *btype = SwigType_base(classnametype);
 	if (SwigType_isbuiltin(btype)) {
 	  // This should work just as well in C without any changes.
-	  Replaceall(tm, classnamespecialvariable, typestr);
+	  typestr = SwigType_str(classnametype, 0);
 	} else {
-	  Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", typestr);
+	  // Swig doesn't know anything about this type, use descriptor for it.
+	  typestr = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
+
+	  // And make sure it is declared before it is used.
+	  Printf(f_wrappers_types, "typedef struct %s %s;\n\n", typestr, typestr);
 	}
 	Delete(btype);
+
+	Replaceall(tm, classnamespecialvariable, typestr);
 	Delete(typestr);
       }
     }
@@ -277,14 +283,14 @@ public:
    *   substitution_performed - flag indicating if a substitution was performed
    * ----------------------------------------------------------------------------- */
 
-  bool substituteResolvedType(Node* n, SwigType *pt, String *tm) {
+  bool substituteResolvedType(SwigType *pt, String *tm) {
     bool substitution_performed = false;
     SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
-      substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$resolved_type");
+      substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -292,7 +298,7 @@ public:
       SwigType *classnametype = Copy(strippedtype);
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
-  substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$*resolved_type");
+  substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
   substitution_performed = true;
       }
       Delete(classnametype);
@@ -300,7 +306,7 @@ public:
     if (Strstr(tm, "$&resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       SwigType_add_pointer(classnametype);
-      substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$&resolved_type");
+      substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -757,7 +763,7 @@ ready:
               }
             else
               {
-                 substituteResolvedType(n, type, tm);
+                 substituteResolvedType(type, tm);
                  return_type = tm;
               }
        }
@@ -821,7 +827,7 @@ ready:
             if ((stype = Getattr(p, "c:stype"))) {
                 proxy_parm_type = SwigType_lstr(stype, 0);
             } else {
-                substituteResolvedType(n, type, tm);
+                substituteResolvedType(type, tm);
                 proxy_parm_type = tm;              
             }
 

From 4b5e5d0cc823f44aba7f12c5c215b06903ee3d99 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 00:35:00 +0200
Subject: [PATCH 255/508] Allow to use the original name of the global
 functions

It is impossible to have two functions with the same name inside the same
program, but it is possible to provide a #define to allow the user code to use
the original function name for the wrapper function, so do it for convenience.

Remove the old changes adding explicit "_wrap_" prefix to the examples and the
tests and remove the few more now passing tests from the list of failing tests.
---
 Doc/Manual/C.html                             |  2 +-
 Examples/c/simple/runme.c                     |  2 +-
 Examples/test-suite/c/Makefile.in             |  3 ---
 Examples/test-suite/c/cpp_basic_runme.c       |  8 +++---
 .../c/cpp_basic_template_function_runme.c     |  2 +-
 Source/Modules/c.cxx                          | 27 ++++++++++++++++++-
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index dee6f73f4..c8859f208 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -192,7 +192,7 @@ Wrapping C functions and variables is obviously performed in a straightforward w
 
 
 
      
-For each C function declared in the interface file a wrapper function is created. Basically, the wrapper function performs a call to the original function, and returns its result.
+For each C function declared in the interface file a wrapper function with the prefix _wrap_ is created. Basically, the wrapper function performs a call to the original function, and returns its result. For convenience, a #define func _wrap_func is also provided in the generated header file to make it possible to call the function under its original name. If this is undesirable, SWIG_NO_WRAPPER_ALIASES can be predefined before including the wrapper header to disable these defines.
 
      
 
 
      
diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c
index fff159dfc..dd01a209c 100644
--- a/Examples/c/simple/runme.c
+++ b/Examples/c/simple/runme.c
@@ -5,7 +5,7 @@
 int main(int argc, char **argv) {
   int a = 42;
   int b = 105;
-  int g = _wrap_gcd(a, b);
+  int g = gcd(a, b);
   printf("The gcd of %d and %d is %d\n", a, b, g);
   printf("Foo = %f\n", Foo);
   Foo = 3.1415926;
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 85eeb420a..5e4a30365 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -54,8 +54,6 @@ FAILING_CPP_TESTS := \
     arrays_global_twodim \
     char_strings \
     constant_pointers \
-    c_backend_cpp_natural_std_string \
-    c_backend_cpp_exception \
     default_arg_values \
     default_args \
     default_constructor \
@@ -89,7 +87,6 @@ FAILING_CPP_TESTS := \
     nested_class \
     nested_scope \
     nested_template_base \
-    operator_overload \
     overload_arrays \
     smart_pointer_extend \
     smart_pointer_not \
diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index 20aec75ab..ff16981b1 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -85,12 +85,12 @@ int main(int argc, const char *argv[]) {
 
 	// getting, setting and calling function pointers isn't supported yet
 #if 0
-	SomeTypeForMemFnPtr func1 = _wrap_get_func1_ptr();
+	SomeTypeForMemFnPtr func1 = get_func1_ptr();
 	Foo_func_ptr_set(f, func1);
-	assert(_wrap_test_func_ptr(f, 2) == 28);
-	SomeTypeForMemFnPtr func2 = _wrap_get_func2_ptr();
+	assert(test_func_ptr(f, 2) == 28);
+	SomeTypeForMemFnPtr func2 = get_func2_ptr();
 	Foo_func_ptr_set(f, func2);
-	assert(_wrap_test_func_ptr(f, 2) == -14);
+	assert(test_func_ptr(f, 2) == -14);
 #endif
 
 	delete_Bar(b);
diff --git a/Examples/test-suite/c/cpp_basic_template_function_runme.c b/Examples/test-suite/c/cpp_basic_template_function_runme.c
index 920d35a7e..51ccdb0cf 100644
--- a/Examples/test-suite/c/cpp_basic_template_function_runme.c
+++ b/Examples/test-suite/c/cpp_basic_template_function_runme.c
@@ -2,7 +2,7 @@
 #include "cpp_basic_template_function/cpp_basic_template_function_wrap.h"
 
 int main() {
-    assert(_wrap_GetMaxInt(3, 5) == 5);
+    assert(GetMaxInt(3, 5) == 5);
     
     return 0;
 }
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 4e879f39d..7231afe39 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -107,6 +107,7 @@ class C:public Language {
   File *f_wrappers_cxx;
   File *f_wrappers_types;
   File *f_wrappers_decl;
+  File *f_wrappers_aliases;
   File *f_init;
 
   String *empty_string;
@@ -416,6 +417,11 @@ public:
       f_wrappers_types = NewString("");
       f_wrappers_decl = NewString("");
 
+      // We also define aliases for the global wrapper functions to allow calling them using their original names, but as this can result in problems (as usual
+      // when using the preprocessor), we provide a way to disable this by defining SWIG_NO_WRAPPER_ALIASES when compiling the generated code and so we use a
+      // separate section for this too.
+      f_wrappers_aliases = NIL;
+
       {
 
         cplusplus_output_guard
@@ -434,6 +440,13 @@ public:
 
       Dump(f_wrappers_h_body, f_wrappers_h);
       Delete(f_wrappers_h_body);
+
+      if (f_wrappers_aliases) {
+	Dump(f_wrappers_aliases, f_wrappers_h);
+	Delete(f_wrappers_aliases);
+
+	Printv(f_wrappers_h, "#endif /* SWIG_NO_WRAPPER_ALIASES */\n", NIL);
+      }
     } // close wrapper header guard
 
     // write all to the file
@@ -928,12 +941,14 @@ ready:
    * emit_wrapper_func_decl()
    *
    * Declares the wrapper function, using the C types used for it, in the header.
+   * Also emits a define allowing to use the function without the "_wrap_" prefix.
    * The node here is a function declaration.
    * ---------------------------------------------------------------------- */
   void emit_wrapper_func_decl(Node *n, String *name)
     {
        // C++ function wrapper proxy code
-       String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
+       bool const is_global = IS_SET_TO_ONE(n, "c:globalfun");
+       String *wname = is_global ? Swig_name_wrapper(name) : Copy(name);
        String *preturn_type = get_wrapper_func_return_type(n);
        String *pproto = get_wrapper_func_proto(n);
        String *wrapper_call = NewString("");
@@ -941,6 +956,16 @@ ready:
        // add function declaration to the proxy header file
        Printv(f_wrappers_decl, preturn_type, " ", wname, "(", pproto, ");\n\n", NIL);
 
+       if (is_global) {
+	 if (!f_wrappers_aliases) {
+	   // Allocate it on demand.
+	   f_wrappers_aliases = NewStringEmpty();
+	   Printv(f_wrappers_aliases, "#ifndef SWIG_NO_WRAPPER_ALIASES\n", NIL);
+	 }
+
+	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname);
+       }
+
        // cleanup
        Delete(wname);
        Delete(pproto);

From 113ce5ae7dfd3ecfa9fe2e8c1a069887db020638 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 00:37:17 +0200
Subject: [PATCH 256/508] Add a blank line to the generated code

This is purely cosmetic: add an extra blank line after the __cplusplus ifdef
end.
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 7231afe39..0640d8ebb 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -77,7 +77,7 @@ public:
         "#endif\n\n",
         "#ifdef __cplusplus\n"
         "}\n"
-        "#endif\n"
+        "#endif\n\n"
       )
   {
   }

From 41d46460b867ec8a355e76fc513289a453931c8f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 01:30:31 +0200
Subject: [PATCH 257/508] Add helper scoped_dohptr class

This is useful for avoiding having to explicitly write Delete() calls for DOH
objects.
---
 Source/Modules/c.cxx | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0640d8ebb..134b4289f 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -37,6 +37,22 @@ int SwigType_isbuiltin(SwigType *t) {
 namespace
 {
 
+// Delete a DOH object on scope exit.
+class scoped_dohptr
+{
+public:
+  explicit scoped_dohptr(DOH* obj) : obj_(obj) {}
+  ~scoped_dohptr() { Delete(obj_); }
+
+  operator DOH*() const { return obj_; }
+
+private:
+  scoped_dohptr(scoped_dohptr const&);
+  scoped_dohptr& operator=(scoped_dohptr const&);
+
+  DOH* const obj_;
+};
+
 // Helper class to output "begin" fragment in the ctor and "end" in the dtor.
 class begin_end_output_guard
 {
@@ -1352,10 +1368,8 @@ ready:
 	if (SwigType_isreference(type))
 	  return NIL;
 
-	SwigType *btype = SwigType_base(type);
-	const bool can_be_repr_in_c = SwigType_isbuiltin(btype) || SwigType_isenum(btype);
-	Delete(btype);
-	if (!can_be_repr_in_c)
+	scoped_dohptr btype(SwigType_base(type));
+	if (!SwigType_isbuiltin(btype) && !SwigType_isenum(btype))
 	  return NIL;
       }
     }

From e2bb89ccb394d1739c249bfc763a5d47fac3d0bd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 01:32:49 +0200
Subject: [PATCH 258/508] Replace unknown enums with int in the wrappers

An enum can be declared outside of the code wrapped by SWIG, just use int
instead of it then.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Source/Modules/c.cxx              | 21 ++++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 5e4a30365..261832ec9 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -27,7 +27,6 @@ CPP_TEST_CASES := \
 # The following tests are currently broken and need to be fixed.
 FAILING_C_TESTS := \
     arrays \
-    enum_missing \
     funcptr \
     function_typedef \
     lextype \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 134b4289f..0d38fe085 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1363,14 +1363,21 @@ ready:
       Delete(type_str);
       type_str = int_type_str;
     } else {
-      // Don't bother with checking if type is representable in C if we're wrapping C and not C++ anyhow: of course it is.
-      if (CPlusPlus) {
-	if (SwigType_isreference(type))
-	  return NIL;
+      scoped_dohptr btype(SwigType_base(type));
+      if (SwigType_isenum(btype)) {
+	// Enums are special as they can be unknown, i.e. not wrapped by SWIG. In this case we just use int instead.
+	if (!enumLookup(btype)) {
+	  Replaceall(type_str, btype, "int");
+	}
+      } else {
+	// Don't bother with checking if type is representable in C if we're wrapping C and not C++ anyhow: of course it is.
+	if (CPlusPlus) {
+	  if (SwigType_isreference(type))
+	    return NIL;
 
-	scoped_dohptr btype(SwigType_base(type));
-	if (!SwigType_isbuiltin(btype) && !SwigType_isenum(btype))
-	  return NIL;
+	  if (!SwigType_isbuiltin(btype))
+	    return NIL;
+	}
       }
     }
 

From 806f79de147b128240bda4b34c9f11c4d42a6fb0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 15:18:22 +0200
Subject: [PATCH 259/508] No real changes, just rename "proxy_header" to
 "cheader"

Continue getting rid of "proxy" terminology, there is no proxy when using C
module, so it's confusing to use this term.
---
 Lib/c/c.swg                       | 6 +++---
 Lib/c/cexcept.swg                 | 2 +-
 Lib/c/{cproxy.swg => cheader.swg} | 4 +---
 Source/Modules/c.cxx              | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename Lib/c/{cproxy.swg => cheader.swg} (85%)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 4013cfefd..9825e3686 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------- */ 
 
 %insert("runtime") "clabels.swg"
-%insert("proxy_header") "cproxy.swg"
+%insert("cheader") "cheader.swg"
 
 %insert("runtime") %{
 #include 
@@ -19,7 +19,7 @@
 #define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else
 %}
 
-%fragment("stdbool_inc", "proxy_header") {#include }
+%fragment("stdbool_inc", "cheader") {#include }
 
 %define same_macro_all_primitive_types_but_void(macro_name, TM)
 macro_name(TM, short);
@@ -354,7 +354,7 @@ template  SWIGINTERN SwigObj* SWIG_create_object(T* obj, const char* sy
 }
 %}
 
-%insert("proxy_header") %{
+%insert("cheader") %{
     typedef struct SwigObjStruct SwigObj;
 %}
 
diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg
index fae4c9dbe..dd3e6f15a 100644
--- a/Lib/c/cexcept.swg
+++ b/Lib/c/cexcept.swg
@@ -164,7 +164,7 @@ SWIGINTERN void SWIG_terminate() {
     SWIG_rt_throw((SwigObj *) klass, msg);
 %}
 
-%insert("proxy_header") %{
+%insert("cheader") %{
 // special value indicating any type of exception like 'catch(...)'
 #define SWIG_AnyException "SWIG_AnyException"
 
diff --git a/Lib/c/cproxy.swg b/Lib/c/cheader.swg
similarity index 85%
rename from Lib/c/cproxy.swg
rename to Lib/c/cheader.swg
index 3b4b7ae11..f33cee1fa 100644
--- a/Lib/c/cproxy.swg
+++ b/Lib/c/cheader.swg
@@ -1,7 +1,5 @@
 /* -----------------------------------------------------------------------------
- * cproxy.swg
- *
- * Definitions of C specific preprocessor symbols for proxies.
+ * cheader.swg
  * ----------------------------------------------------------------------------- */
 
 #ifndef SWIGIMPORT
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0d38fe085..430cc8378 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -408,7 +408,7 @@ public:
     Swig_register_filebyname("wrapper", f_wrappers);
     Swig_register_filebyname("runtime", f_runtime);
     Swig_register_filebyname("init", f_init);
-    Swig_register_filebyname("proxy_header", f_wrappers_h);
+    Swig_register_filebyname("cheader", f_wrappers_h);
 
     {
       String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", Char(module));

From 160074a025e6dd91a5500c3fed86e03c4fbb4427 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 15:23:27 +0200
Subject: [PATCH 260/508] Suppress warnings about no typemaps being defined in
 C test suite

In many (although perhaps not all, so don't suppress this warning
unconditionally) cases, there is no need for special typemaps in C, the
parameters can be just used directly, so this warning is harmless but it was
given many times during the test suite execution, distracting from more
important messages.
---
 Examples/test-suite/c/Makefile.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 261832ec9..f41f49fc8 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -115,6 +115,10 @@ FAILING_MULTI_CPP_TESTS := \
     import_stl \
     template_typedef_import \
 
+# Ignore warnings about failing to apply typemaps because none are defined:
+# usually there is no need for special typemaps in C.
+char_binary.cpptest director_binary_string.cpptest li_typemaps.cpptest li_typemaps_apply.cpptest long_long_apply.cpptest: SWIGOPT += -w453
+
 include $(srcdir)/../common.mk
 
 SRCDIR       = ../$(srcdir)/

From 5de29df38e7500ad252b530bcc1e12d6ce788775 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 17:55:47 +0200
Subject: [PATCH 261/508] Simplify typemaps by merging both const and "unconst"
 versions

We can always just use the "unconst" one because it works when the type is
used for a return value and is the same as the other one when it's used for a
parameter anyhow because top-level const is ignored in function signatures, so
don't bother defining two sets of macros when one will do.
---
 Lib/c/c.swg | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 9825e3686..5f42a1e62 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -38,9 +38,11 @@ macro_name(TM, double);
 macro_name(TM, size_t);
 %enddef
 
-//unconsted types are necessary, because some the methods using this declare variables of the resolved type first and assign their values later
-//used by 'cmodtype' and 'cppouttype' typemaps
-%define explicit_same_type_unconsted(TM, T)
+// This is used to handle all primitive types as just themselves.
+// Notice that const pointers are mapped to non-const ones as we need to
+// declare variables of this type when it's used as a return type, and top
+// level const doesn't matter anyhow in the function declarations.
+%define same_type(TM, T)
 %typemap(TM) T, const T "T"
 %typemap(TM) T*, T&, T[ANY], T[] "T *"
 %typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
@@ -52,25 +54,8 @@ macro_name(TM, size_t);
 %typemap(TM) const T* * const "const T* *"
 %enddef
 
-%define explicit_same_type_unconsted_all_primitive_types_but_void(TM)
-same_macro_all_primitive_types_but_void(explicit_same_type_unconsted,TM);
-%enddef
-
-//Used by 'ctype' typemap
-%define explicit_same_type(TM, T)
-%typemap(TM) T, const T "T"
-%typemap(TM) T*, T&, T[ANY], T[] "T *"
-%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
-%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
-%typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] "const T **"
-// constant pointers
-%typemap(TM) T * const "T * const"
-%typemap(TM) T* * const "T* * const"
-%typemap(TM) const T* * const "const T* * const"
-%enddef
-
-%define explicit_same_type_all_primitive_types_but_void(TM)
-same_macro_all_primitive_types_but_void(explicit_same_type,TM);
+%define same_type_all_primitive_types_but_void(TM)
+same_macro_all_primitive_types_but_void(same_type,TM);
 %enddef
 
 //Used by 'in' and 'out' typemaps
@@ -116,7 +101,7 @@ same_action(TM, size_t, ACTION);
 %typemap(ctype) void* * const "void* * const"
 %typemap(ctype) const void* * const "const void* * const"
 
-explicit_same_type_all_primitive_types_but_void(ctype);
+same_type_all_primitive_types_but_void(ctype);
 
 // objects
 %typemap(ctype) SWIGTYPE      "$&resolved_type*"
@@ -140,11 +125,10 @@ explicit_same_type_all_primitive_types_but_void(ctype);
 %typemap(cmodtype) const void&, const void* "const void *"
 %typemap(cmodtype) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
 %typemap(cmodtype) const void**, const void*& "const void **"
-// unconst constant pointers
 %typemap(cmodtype) void* * const "void* *"
 %typemap(cmodtype) const void* * const "const void* *"
 
-explicit_same_type_unconsted_all_primitive_types_but_void(cmodtype);
+same_type_all_primitive_types_but_void(cmodtype);
 
 // special cases of array passing - does not intended to be used for objects
 %typemap(cmodtype) SWIGTYPE [] "$1_ltype"
@@ -302,7 +286,7 @@ same_action_all_primitive_types(out, "$result = $1;")
 }
 
 // typemaps for 'cppresult'
-explicit_same_type_unconsted_all_primitive_types_but_void(cppouttype);
+same_type_all_primitive_types_but_void(cppouttype);
 
 %typemap(cppouttype, retobj="1") SWIGTYPE      "$1_ltype *"
 %typemap(cppouttype) SWIGTYPE *    "$1_ltype"

From 8cae88dd39981e39ecda8f5f5a037388b01becfc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:06:14 +0200
Subject: [PATCH 262/508] Get rid of separate cmodtype typemap

Use the same ctype for wrapper declarations and definitions and just expand
$resolved_type differently in the two cases.

This simplifies the typemaps and ensures that the declarations and definitions
use the same types, at least for all non-object parameters.
---
 Doc/Manual/C.html    |  18 +------
 Lib/c/c.swg          |  32 +------------
 Lib/c/std_string.i   |   4 --
 Source/Modules/c.cxx | 109 +++++++++++++++++++------------------------
 4 files changed, 51 insertions(+), 112 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index c8859f208..6ad664664 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -431,20 +431,6 @@ area: 7.068583
           
       
   
-  
-    cmodtype
-    Provides types used by wrapper functions and
      
-       Casts of function parameters of wrapper function calls
      
-       
      
-       
-         extern void _wrap_MyClass_delete(SwigObj *o);
      
-         
      
-         void MyClass_delete(MyClass *c) {
      
-             _wrap_MyClass_delete((Swig_Obj *)c);
      
-         }
-             
-    
-  
   
     in
     Mapping of wrapper functions parameters to local C++ variables
      
@@ -556,7 +542,7 @@ A typical wrapper will be composited with these [optional] blocks:
 Let's go through it step by step and start with the wrapper prototype
 
 
      -cmodtype                     cmodtype         cmodtype
+ctype                        ctype            ctype
 ---------                    ---------        ---
 SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
 
      
@@ -564,7 +550,7 @@ SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
 As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
 
 
      -cmodtype
+ctype
 ---------
 SwigObj * result;
 
      
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 5f42a1e62..b4572d9b5 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -90,7 +90,7 @@ same_action(TM, size_t, ACTION);
 %typemap(TM) void*, void const* ACTION
 %enddef
 
-// Typemaps for proxy function parameters
+// "ctype" is the type used with C wrapper functions.
 // void
 %typemap(ctype) void "void"
 %typemap(ctype) void*, void& "void *"
@@ -118,36 +118,6 @@ same_type_all_primitive_types_but_void(ctype);
 %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
 %typemap(ctype, fragment="stdbool_inc") const bool & "const $1_ltype"
 
-// Typemaps for wrapper function parameters and its local variables
-// void
-%typemap(cmodtype) void "void"
-%typemap(cmodtype) void*, void& "void *"
-%typemap(cmodtype) const void&, const void* "const void *"
-%typemap(cmodtype) void**, void*&, void*[ANY], void[ANY][ANY] "void **"
-%typemap(cmodtype) const void**, const void*& "const void **"
-%typemap(cmodtype) void* * const "void* *"
-%typemap(cmodtype) const void* * const "const void* *"
-
-same_type_all_primitive_types_but_void(cmodtype);
-
-// special cases of array passing - does not intended to be used for objects
-%typemap(cmodtype) SWIGTYPE [] "$1_ltype"
-%typemap(cmodtype) SWIGTYPE ((&)[ANY]) "$1_basetype **"
-
-%typemap(cmodtype) SWIGTYPE         "SwigObj *"
-%typemap(cmodtype) SWIGTYPE *       "SwigObj *"
-%typemap(cmodtype) SWIGTYPE &       "SwigObj *"
-%typemap(cmodtype) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ SwigObj ***"
-%typemap(cmodtype) SWIGTYPE *[ANY]  "/*ooooh*/ SwigObj **"
-%typemap(cmodtype) SWIGTYPE *&      "/* *& */ SwigObj **"
-%typemap(cmodtype) enum SWIGTYPE    "int"
-%typemap(cmodtype) enum SWIGTYPE &, enum SWIGTYPE *  "int *"
-
-%typemap(cmodtype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type"
-%typemap(cmodtype, fragment="stdbool_inc") bool & "$1_ltype"
-%typemap(cmodtype, fragment="stdbool_inc") const bool & "const $1_ltype"
-
-
 // Typemaps for assigning wrapper parameters to local variables
 same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
 
diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index 9b70a460b..d7ea01e39 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -9,10 +9,6 @@ namespace std {
 
 class string;
 
-%typemap(cmodtype) string "char *"
-%typemap(cmodtype) string * "char *"
-%typemap(cmodtype) string & "char *"
-%typemap(cmodtype) const string & "char *"
 %typemap(ctype) string "char *"
 %typemap(ctype) string * "char *"
 %typemap(ctype) string & "char *"
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 430cc8378..590819122 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -138,6 +138,12 @@ class C:public Language {
 
   bool except_flag;
 
+  // Selects between the wrappers (public) declarations and (private) definitions.
+  enum output_target {
+    output_wrapper_decl,
+    output_wrapper_def
+  };
+
 public:
 
   /* -----------------------------------------------------------------------------
@@ -243,7 +249,7 @@ public:
    * substituteResolvedTypeSpecialVariable()
    * ----------------------------------------------------------------------------- */
 
-  void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
+  void substituteResolvedTypeSpecialVariable(output_target target, SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
     if (!CPlusPlus) {
       // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
       Clear(tm);
@@ -260,27 +266,29 @@ public:
       else
   Replaceall(tm, classnamespecialvariable, NewStringf("int"));
     } else {
-      String *classname = getProxyName(classnametype);
-      if (classname) {
-  Replaceall(tm, classnamespecialvariable, classname);  // getProxyName() works for pointers to classes too
+      scoped_dohptr btype(SwigType_base(classnametype));
+      String* typestr = NIL;
+      if (target == output_wrapper_def || Cmp(btype, "SwigObj") == 0) {
+	// Special case, just leave it unchanged.
+	typestr = NewString("SwigObj");
       } else {
-	String* typestr = NIL;
-	SwigType *btype = SwigType_base(classnametype);
-	if (SwigType_isbuiltin(btype)) {
-	  // This should work just as well in C without any changes.
-	  typestr = SwigType_str(classnametype, 0);
-	} else {
-	  // Swig doesn't know anything about this type, use descriptor for it.
-	  typestr = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
+	typestr = getProxyName(classnametype);
+	if (!typestr) {
+	  if (SwigType_isbuiltin(btype)) {
+	    // This should work just as well in C without any changes.
+	    typestr = SwigType_str(classnametype, 0);
+	  } else {
+	    // Swig doesn't know anything about this type, use descriptor for it.
+	    typestr = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
 
-	  // And make sure it is declared before it is used.
-	  Printf(f_wrappers_types, "typedef struct %s %s;\n\n", typestr, typestr);
+	    // And make sure it is declared before it is used.
+	    Printf(f_wrappers_types, "typedef struct %s %s;\n\n", typestr, typestr);
+	  }
 	}
-	Delete(btype);
-
-	Replaceall(tm, classnamespecialvariable, typestr);
-	Delete(typestr);
       }
+
+      Replaceall(tm, classnamespecialvariable, typestr);
+      Delete(typestr);
     }
   }
 
@@ -300,14 +308,14 @@ public:
    *   substitution_performed - flag indicating if a substitution was performed
    * ----------------------------------------------------------------------------- */
 
-  bool substituteResolvedType(SwigType *pt, String *tm) {
+  bool substituteResolvedType(output_target target, SwigType *pt, String *tm) {
     bool substitution_performed = false;
     SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
-      substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type");
+      substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -315,7 +323,7 @@ public:
       SwigType *classnametype = Copy(strippedtype);
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
-  substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
+  substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$*resolved_type");
   substitution_performed = true;
       }
       Delete(classnametype);
@@ -323,7 +331,7 @@ public:
     if (Strstr(tm, "$&resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       SwigType_add_pointer(classnametype);
-      substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type");
+      substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$&resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -741,38 +749,13 @@ ready:
          Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult"));
     }
 
-  virtual SwigType *functionWrapperCPPSpecificWrapperReturnTypeGet(Node *n)
-    {
-       SwigType *type = Getattr(n, "type");
-       SwigType *return_type = NewString("");
-       String *tm;
-
-       // set the return type
-       if (IS_SET_TO_ONE(n, "c:objstruct")) {
-            Printv(return_type, SwigType_str(type, 0), NIL);
-       }
-       else if ((tm = Swig_typemap_lookup("cmodtype", n, "", 0))) {
-            String *ctypeout = Getattr(n, "tmap:cmodtype:out");
-            if (ctypeout)
-              {
-                 tm = ctypeout;
-                 Printf(stdout, "Obscure cmodtype:out found! O.o\n");
-              }
-            Printf(return_type, "%s", tm);
-            // template handling
-            Replaceall(return_type, "$tt", SwigType_lstr(type, 0));
-       }
-       else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
-       }
-       return return_type;
-    }
-
-  String *get_wrapper_func_return_type(Node *n)
+  String *get_wrapper_func_return_type(output_target target, Node *n)
     {
+      if (target == output_wrapper_decl) {
        SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
        if (proxy_type)
 	 return SwigType_str(proxy_type, 0);
+      }
 
        SwigType *type = Getattr(n, "type");
        String *return_type = NewString("");
@@ -792,12 +775,12 @@ ready:
               }
             else
               {
-                 substituteResolvedType(type, tm);
+                 substituteResolvedType(target, type, tm);
                  return_type = tm;
               }
        }
        else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
+            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
        }
 
        Replaceall(return_type, "::", "_");
@@ -856,7 +839,7 @@ ready:
             if ((stype = Getattr(p, "c:stype"))) {
                 proxy_parm_type = SwigType_lstr(stype, 0);
             } else {
-                substituteResolvedType(type, tm);
+                substituteResolvedType(output_wrapper_decl, type, tm);
                 proxy_parm_type = tm;              
             }
 
@@ -892,7 +875,7 @@ ready:
        Printv(call, "(", NIL);
 
        // attach typemaps to cast wrapper call with proxy types
-       Swig_typemap_attach_parms("cmodtype", parms, 0);
+       Swig_typemap_attach_parms("ctype", parms, 0);
 
        // prepare function definition
        for (p = parms, gencomma = 0; p; ) {
@@ -920,13 +903,15 @@ ready:
             Printf(arg_name, "c%s", lname);
 
             // set the appropriate type for parameter
-            if ((tm = Getattr(p, "tmap:cmodtype"))) {
+            if ((tm = Getattr(p, "tmap:ctype"))) {
+		 substituteResolvedType(output_wrapper_def, type, tm);
+
                  Printv(c_parm_type, NewString("("), tm, NewString(")"), NIL);
                  // template handling
                  Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
             }
             else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
+                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
             }
 
             Printv(args, gencomma ? ", " : "", c_parm_type, arg_name, NIL);
@@ -965,7 +950,7 @@ ready:
        // C++ function wrapper proxy code
        bool const is_global = IS_SET_TO_ONE(n, "c:globalfun");
        String *wname = is_global ? Swig_name_wrapper(name) : Copy(name);
-       String *preturn_type = get_wrapper_func_return_type(n);
+       String *preturn_type = get_wrapper_func_return_type(output_wrapper_decl, n);
        String *pproto = get_wrapper_func_proto(n);
        String *wrapper_call = NewString("");
 
@@ -996,7 +981,7 @@ ready:
        String *storage = Getattr(n, "storage");
        SwigType *type = Getattr(n, "type");
        SwigType *otype = Copy(type);
-       SwigType *return_type = functionWrapperCPPSpecificWrapperReturnTypeGet(n);
+       SwigType *return_type = get_wrapper_func_return_type(output_wrapper_def, n);
        String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        String *arg_names = NewString("");
        ParmList *parms = Getattr(n, "parms");
@@ -1030,7 +1015,7 @@ ready:
        Setattr(n, "wrap:parms", parms); //never read again?!
 
        // attach 'ctype' typemaps
-       Swig_typemap_attach_parms("cmodtype", parms, wrapper);
+       Swig_typemap_attach_parms("ctype", parms, wrapper);
 
        // prepare function definition
        for (p = parms, gencomma = 0; p; ) {
@@ -1058,13 +1043,15 @@ ready:
             Printf(arg_name, "c%s", lname);
 
             // set the appropriate type for parameter
-            if ((tm = Getattr(p, "tmap:cmodtype"))) {
+            if ((tm = Getattr(p, "tmap:ctype"))) {
+		 substituteResolvedType(output_wrapper_def, type, tm);
+
                  Printv(c_parm_type, tm, NIL);
                  // template handling
                  Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
             }
             else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cmodtype typemap defined for %s\n", SwigType_str(type, 0));
+                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
             }
 
             // use proxy-type for parameter if supplied

From 00ef2c4c7d00ee8529ee5491b1aef5f7dd4f34a6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:08:53 +0200
Subject: [PATCH 263/508] Remove unused
 functionWrapperCPPSpecificProxyWrapperCallGet()

This is identical to the main part of functionWrapperCPPSpecificWrapper() now
and it is not used anywhere.
---
 Source/Modules/c.cxx | 73 --------------------------------------------
 1 file changed, 73 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 590819122..15d82a275 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -865,79 +865,6 @@ ready:
        return proto;
     }
 
-  virtual String *functionWrapperCPPSpecificProxyWrapperCallGet(Node *n, const String *wname, ParmList *parms)
-    {
-       Parm *p;
-       String *call = NewString(wname);
-       String *args = NewString("");
-       int gencomma = 0;
-
-       Printv(call, "(", NIL);
-
-       // attach typemaps to cast wrapper call with proxy types
-       Swig_typemap_attach_parms("ctype", parms, 0);
-
-       // prepare function definition
-       for (p = parms, gencomma = 0; p; ) {
-            String *tm;
-            SwigType *type = NULL;
-
-            while (p && checkAttribute(p, "tmap:in:numinputs", "0")) {
-                 p = Getattr(p, "tmap:in:next");
-            }
-            if (!p) break;
-
-            type = Getattr(p, "type");
-            if (SwigType_type(type) == T_VOID) {
-                 p = nextSibling(p);
-                 continue;
-            }
-            String *lname = Getattr(p, "lname");
-            String *c_parm_type = NewString("");
-            String *arg_name = NewString("");
-
-            SwigType *tdtype = SwigType_typedef_resolve_all(type);
-            if (tdtype)
-              type = tdtype;
-
-            Printf(arg_name, "c%s", lname);
-
-            // set the appropriate type for parameter
-            if ((tm = Getattr(p, "tmap:ctype"))) {
-		 substituteResolvedType(output_wrapper_def, type, tm);
-
-                 Printv(c_parm_type, NewString("("), tm, NewString(")"), NIL);
-                 // template handling
-                 Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
-            }
-            else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
-            }
-
-            Printv(args, gencomma ? ", " : "", c_parm_type, arg_name, NIL);
-            gencomma = 1;
-
-            // apply typemaps for input parameter
-            if (Cmp(nodeType(n), "destructor") == 0) {
-                 p = Getattr(p, "tmap:in:next");
-            }
-            else if ((tm = Getattr(p, "tmap:in"))) {
-                 Replaceall(tm, "$input", arg_name);
-                 p = Getattr(p, "tmap:in:next");
-            }
-            else {
-                 Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0));
-                 p = nextSibling(p);
-            }
-
-            Delete(arg_name);
-            Delete(c_parm_type);
-       }
-       Printv(call, args, ")", NIL);
-
-       return call;
-    }
-
   /* ----------------------------------------------------------------------
    * emit_wrapper_func_decl()
    *

From c971919e2fd74b95662b3648172be2f1a718236b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:34:39 +0200
Subject: [PATCH 264/508] Merge almost identical code generating wrapper
 function arguments

Reuse get_wrapper_func_proto() for the wrapper function definitions too, this
cuts down on the amount of duplicated code and also ensures that declarations
and definitions match.
---
 Source/Modules/c.cxx | 140 +++++++++++++------------------------------
 1 file changed, 42 insertions(+), 98 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 15d82a275..0a4492843 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -788,7 +788,14 @@ ready:
        return return_type;
     }
 
-  String *get_wrapper_func_proto(Node *n)
+  /* ----------------------------------------------------------------------
+   * get_wrapper_func_proto()
+   *
+   * Return the function signature, i.e. the comma-separated list of argument types and names.
+   * If a non-null wrapper is specified, it is used to emit typemap-defined code in it and it also determines whether we're generating the prototype for the
+   * declarations or the definitions, which changes the type used for the C++ objects.
+   * ---------------------------------------------------------------------- */
+  String *get_wrapper_func_proto(Node *n, Wrapper* wrapper = NULL)
     {
        ParmList *parms = Getattr(n, "parms");
 
@@ -797,7 +804,14 @@ ready:
        int gencomma = 0;
 
        // attach the standard typemaps
-       Swig_typemap_attach_parms("in", parms, 0);
+       if (wrapper) {
+	 emit_attach_parmmaps(parms, wrapper);
+       } else {
+	 // We can't call emit_attach_parmmaps() without a wrapper, it would just crash.
+	 // Attach "in" manually, we need it for tmap:in:numinputs below.
+	 Swig_typemap_attach_parms("in", parms, 0);
+       }
+       Setattr(n, "wrap:parms", parms); //never read again?!
 
        // attach 'ctype' typemaps
        Swig_typemap_attach_parms("ctype", parms, 0);
@@ -819,9 +833,8 @@ ready:
                  continue;
             }
             String *lname = Getattr(p, "lname");
-            String *proxy_parm_type = 0;
+            String *c_parm_type = 0;
             String *arg_name = NewString("");
-            String* stype = 0;
 
             SwigType *tdtype = SwigType_typedef_resolve_all(type);
             if (tdtype)
@@ -829,21 +842,27 @@ ready:
 
             Printf(arg_name, "c%s", lname);
 
-            if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
-                 tm = Copy(tm);
-            }
-            else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
-            }
             // use proxy-type for parameter if supplied
-            if ((stype = Getattr(p, "c:stype"))) {
-                proxy_parm_type = SwigType_lstr(stype, 0);
-            } else {
-                substituteResolvedType(output_wrapper_decl, type, tm);
-                proxy_parm_type = tm;              
-            }
+	    if (!wrapper) {
+	      if (String* stype = Getattr(p, "c:stype")) {
+		  c_parm_type = SwigType_lstr(stype, 0);
+	      }
+	    }
 
-            Printv(proto, gencomma ? ", " : "", proxy_parm_type, " ", arg_name, NIL);
+	    if (!c_parm_type) {
+	      if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
+		   c_parm_type = Copy(tm);
+		   substituteResolvedType(wrapper ? output_wrapper_def : output_wrapper_decl, type, c_parm_type);
+
+		   // template handling
+		   Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
+	      }
+	      else {
+		   Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
+	      }
+	    }
+
+            Printv(proto, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL);
             gencomma = 1;
 
             // apply typemaps for input parameter
@@ -852,6 +871,10 @@ ready:
             }
             else if ((tm = Getattr(p, "tmap:in"))) {
                  Replaceall(tm, "$input", arg_name);
+		 if (wrapper) {
+		   Setattr(p, "emit:input", arg_name);
+		   Printf(wrapper->code, "%s\n", tm);
+		 }
                  p = Getattr(p, "tmap:in:next");
             }
             else {
@@ -860,7 +883,7 @@ ready:
             }
 
             Delete(arg_name);
-            Delete(proxy_parm_type);
+            Delete(c_parm_type);
        }
        return proto;
     }
@@ -910,10 +933,8 @@ ready:
        SwigType *otype = Copy(type);
        SwigType *return_type = get_wrapper_func_return_type(output_wrapper_def, n);
        String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
-       String *arg_names = NewString("");
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
-       int gencomma = 0;
        bool is_void_return = (SwigType_type(type) == T_VOID);
        bool return_object = false;
        // create new function wrapper object
@@ -937,83 +958,7 @@ ready:
        // create wrapper function prototype
        Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL);
 
-       // attach the standard typemaps
-       emit_attach_parmmaps(parms, wrapper);
-       Setattr(n, "wrap:parms", parms); //never read again?!
-
-       // attach 'ctype' typemaps
-       Swig_typemap_attach_parms("ctype", parms, wrapper);
-
-       // prepare function definition
-       for (p = parms, gencomma = 0; p; ) {
-            String *tm;
-
-            while (p && checkAttribute(p, "tmap:in:numinputs", "0")) {
-                 p = Getattr(p, "tmap:in:next");
-            }
-            if (!p) break;
-
-            SwigType *type = Getattr(p, "type");
-            if (SwigType_type(type) == T_VOID) {
-                 p = nextSibling(p);
-                 continue;
-            }
-            String *lname = Getattr(p, "lname");
-            String *c_parm_type = NewString("");
-            String *proxy_parm_type = NewString("");
-            String *arg_name = NewString("");
-
-            SwigType *tdtype = SwigType_typedef_resolve_all(type);
-            if (tdtype)
-              type = tdtype;
-
-            Printf(arg_name, "c%s", lname);
-
-            // set the appropriate type for parameter
-            if ((tm = Getattr(p, "tmap:ctype"))) {
-		 substituteResolvedType(output_wrapper_def, type, tm);
-
-                 Printv(c_parm_type, tm, NIL);
-                 // template handling
-                 Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
-            }
-            else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
-            }
-
-            // use proxy-type for parameter if supplied
-            String* stype = Getattr(p, "c:stype");
-            if (stype) {
-                 Printv(proxy_parm_type, SwigType_str(stype, 0), NIL);
-            }
-            else {
-                 Printv(proxy_parm_type, c_parm_type, NIL);
-            }
-
-            Printv(arg_names, gencomma ? ", " : "", arg_name, NIL);
-            Printv(wrapper->def, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL);
-            gencomma = 1;
-
-            // apply typemaps for input parameter
-            if (Cmp(nodeType(n), "destructor") == 0) {
-                 p = Getattr(p, "tmap:in:next");
-            }
-            else if ((tm = Getattr(p, "tmap:in"))) {
-                 Replaceall(tm, "$input", arg_name);
-                 Setattr(p, "emit:input", arg_name);
-                 Printf(wrapper->code, "%s\n", tm);
-                 p = Getattr(p, "tmap:in:next");
-            }
-            else {
-                 Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0));
-                 p = nextSibling(p);
-            }
-
-            Delete(arg_name);
-            Delete(proxy_parm_type);
-            Delete(c_parm_type);
-       }
-
+       Printv(wrapper->def, (DOH*)scoped_dohptr(get_wrapper_func_proto(n, wrapper)), NIL);
        Printv(wrapper->def, ")", NIL);
        Printv(wrapper->def, " {", NIL);
 
@@ -1134,7 +1079,6 @@ ready:
        Wrapper_print(wrapper, f_wrappers);
 
        // cleanup
-       Delete(arg_names);
        Delete(wname);
        Delete(return_type);
        Delete(otype);

From e2738ad524b1242746802fd12e13fbcd430c82f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:37:08 +0200
Subject: [PATCH 265/508] Refactor: add parentheses in get_wrapper_func_proto()
 itself

Return the prototype strings already surrounded by parentheses instead of
having to add them in the caller.

No real changes.
---
 Source/Modules/c.cxx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0a4492843..64f21ecd0 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -791,7 +791,7 @@ ready:
   /* ----------------------------------------------------------------------
    * get_wrapper_func_proto()
    *
-   * Return the function signature, i.e. the comma-separated list of argument types and names.
+   * Return the function signature, i.e. the comma-separated list of argument types and names surrounded by parentheses.
    * If a non-null wrapper is specified, it is used to emit typemap-defined code in it and it also determines whether we're generating the prototype for the
    * declarations or the definitions, which changes the type used for the C++ objects.
    * ---------------------------------------------------------------------- */
@@ -800,7 +800,7 @@ ready:
        ParmList *parms = Getattr(n, "parms");
 
        Parm *p;
-       String *proto = NewString("");
+       String *proto = NewString("(");
        int gencomma = 0;
 
        // attach the standard typemaps
@@ -885,6 +885,8 @@ ready:
             Delete(arg_name);
             Delete(c_parm_type);
        }
+
+       Printv(proto, ")", NIL);
        return proto;
     }
 
@@ -905,7 +907,7 @@ ready:
        String *wrapper_call = NewString("");
 
        // add function declaration to the proxy header file
-       Printv(f_wrappers_decl, preturn_type, " ", wname, "(", pproto, ");\n\n", NIL);
+       Printv(f_wrappers_decl, preturn_type, " ", wname, pproto, ";\n\n", NIL);
 
        if (is_global) {
 	 if (!f_wrappers_aliases) {
@@ -956,10 +958,9 @@ ready:
        }
 
        // create wrapper function prototype
-       Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL);
+       Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, NIL);
 
        Printv(wrapper->def, (DOH*)scoped_dohptr(get_wrapper_func_proto(n, wrapper)), NIL);
-       Printv(wrapper->def, ")", NIL);
        Printv(wrapper->def, " {", NIL);
 
        if (Cmp(nodeType(n), "destructor") != 0) {

From 02c52331cd555de5115af57b7b3bd9c2154dcb57 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:42:56 +0200
Subject: [PATCH 266/508] Return scoped_dohptr from get_wrapper_func_proto()

This ensures that the pointer is not leaked.

Unfortunately it requires adding a dangerous, std::auto_ptr<>-like destructive
copy ctor to scoped_dohptr<>, but there is no better solution without C++11.
---
 Source/Modules/c.cxx | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 64f21ecd0..252d9e478 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -44,10 +44,20 @@ public:
   explicit scoped_dohptr(DOH* obj) : obj_(obj) {}
   ~scoped_dohptr() { Delete(obj_); }
 
+  // This is an std::auto_ptr<>-like "destructive" copy ctor which allows to return objects of this type from functions.
+  scoped_dohptr(scoped_dohptr const& tmp) : obj_(tmp.release()) {}
+
+  DOH* get() const { return obj_; }
+
+  DOH* release() const /* not really */ {
+    DOH* obj = obj_;
+    const_cast(const_cast(this)->obj_) = NULL;
+    return obj;
+  }
+
   operator DOH*() const { return obj_; }
 
 private:
-  scoped_dohptr(scoped_dohptr const&);
   scoped_dohptr& operator=(scoped_dohptr const&);
 
   DOH* const obj_;
@@ -795,7 +805,7 @@ ready:
    * If a non-null wrapper is specified, it is used to emit typemap-defined code in it and it also determines whether we're generating the prototype for the
    * declarations or the definitions, which changes the type used for the C++ objects.
    * ---------------------------------------------------------------------- */
-  String *get_wrapper_func_proto(Node *n, Wrapper* wrapper = NULL)
+  scoped_dohptr get_wrapper_func_proto(Node *n, Wrapper* wrapper = NULL)
     {
        ParmList *parms = Getattr(n, "parms");
 
@@ -887,7 +897,7 @@ ready:
        }
 
        Printv(proto, ")", NIL);
-       return proto;
+       return scoped_dohptr(proto);
     }
 
   /* ----------------------------------------------------------------------
@@ -903,11 +913,10 @@ ready:
        bool const is_global = IS_SET_TO_ONE(n, "c:globalfun");
        String *wname = is_global ? Swig_name_wrapper(name) : Copy(name);
        String *preturn_type = get_wrapper_func_return_type(output_wrapper_decl, n);
-       String *pproto = get_wrapper_func_proto(n);
        String *wrapper_call = NewString("");
 
        // add function declaration to the proxy header file
-       Printv(f_wrappers_decl, preturn_type, " ", wname, pproto, ";\n\n", NIL);
+       Printv(f_wrappers_decl, preturn_type, " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
 
        if (is_global) {
 	 if (!f_wrappers_aliases) {
@@ -921,7 +930,6 @@ ready:
 
        // cleanup
        Delete(wname);
-       Delete(pproto);
        Delete(wrapper_call);
        Delete(preturn_type);
     }
@@ -960,7 +968,7 @@ ready:
        // create wrapper function prototype
        Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, NIL);
 
-       Printv(wrapper->def, (DOH*)scoped_dohptr(get_wrapper_func_proto(n, wrapper)), NIL);
+       Printv(wrapper->def, get_wrapper_func_proto(n, wrapper).get(), NIL);
        Printv(wrapper->def, " {", NIL);
 
        if (Cmp(nodeType(n), "destructor") != 0) {

From 2c65b4db5b11170b0fe10d359b0b4b5a0f3396e0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:47:09 +0200
Subject: [PATCH 267/508] Remove obsolete RCS ID line

No real changes.
---
 Source/Modules/c.cxx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 252d9e478..9675a04b5 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -7,8 +7,6 @@
  * C language module for SWIG.
  * ----------------------------------------------------------------------------- */
 
-char cvsroot_c_cxx[] = "$Id: c.cxx 11186 2009-04-11 10:46:13Z maciekd $";
-
 #include 
 #include "swigmod.h"
 

From 2e3b427b7ee2c37f7559d1c895a2289e22af5104 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 18:56:03 +0200
Subject: [PATCH 268/508] Get rid of unnecessary and confusing c:stype
 attribute

We can just use "type" directly, there is no need for any C-specific stype.
---
 Source/Modules/c.cxx | 68 +++++++++-----------------------------------
 1 file changed, 14 insertions(+), 54 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9675a04b5..b6f9c8060 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -759,21 +759,11 @@ ready:
 
   String *get_wrapper_func_return_type(output_target target, Node *n)
     {
-      if (target == output_wrapper_decl) {
-       SwigType *proxy_type = Getattr(n, "c:stype"); // use proxy-type for return type if supplied
-       if (proxy_type)
-	 return SwigType_str(proxy_type, 0);
-      }
-
        SwigType *type = Getattr(n, "type");
        String *return_type = NewString("");
        String *tm;
 
-       // set the return type
-       if (IS_SET_TO_ONE(n, "c:objstruct")) {
-            Printv(return_type, SwigType_str(type, 0), NIL);
-       }
-       else if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
+       if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
             // handle simple typemap cases
             String *ctypeout = Getattr(n, "tmap:ctype:out");
             if (ctypeout)
@@ -850,24 +840,15 @@ ready:
 
             Printf(arg_name, "c%s", lname);
 
-            // use proxy-type for parameter if supplied
-	    if (!wrapper) {
-	      if (String* stype = Getattr(p, "c:stype")) {
-		  c_parm_type = SwigType_lstr(stype, 0);
-	      }
+	    if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
+		 c_parm_type = Copy(tm);
+		 substituteResolvedType(wrapper ? output_wrapper_def : output_wrapper_decl, type, c_parm_type);
+
+		 // template handling
+		 Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
 	    }
-
-	    if (!c_parm_type) {
-	      if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
-		   c_parm_type = Copy(tm);
-		   substituteResolvedType(wrapper ? output_wrapper_def : output_wrapper_decl, type, c_parm_type);
-
-		   // template handling
-		   Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
-	      }
-	      else {
-		   Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
-	      }
+	    else {
+		 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
 	    }
 
             Printv(proto, gencomma ? ", " : "", c_parm_type, " ", arg_name, NIL);
@@ -1105,9 +1086,6 @@ ready:
                  Setattr(parms, "c:objstruct", "1");
                  if (!Getattr(parms, "lname"))
                    Setattr(parms, "lname", "arg1");
-                 SwigType *stype = Copy(Getattr(Swig_methodclass(n), "sym:name"));
-                 SwigType_add_pointer(stype);
-                 Setattr(parms, "c:stype", stype);
             }
        }
     }
@@ -1518,7 +1496,6 @@ ready:
     String *newclassname = Getattr(klass, "sym:name");
     String *sobj_name = NewString("");
     String *ctype;
-    String *stype;
     String *code = NewString("");
     String *constr_name = NewString("");
     String *arg_lnames = NewString("");
@@ -1529,14 +1506,10 @@ ready:
     Append(arg_lnames, Swig_cfunction_call(empty_string, parms));
 
     // set the function return type to the pointer to struct
-    Printf(sobj_name, "SwigObj");
-    ctype = Copy(sobj_name);
+    Setattr(n, "c:objstruct", "1");
+    ctype = make_public_class_name(nspace, newclassname);
     SwigType_add_pointer(ctype);
     Setattr(n, "type", ctype);
-    Setattr(n, "c:objstruct", "1");
-    stype = make_public_class_name(nspace, newclassname);
-    SwigType_add_pointer(stype);
-    Setattr(n, "c:stype", stype);
 
     // Modify the constructor name if necessary
     constr_name = Swig_name_construct(nspace, newclassname);
@@ -1558,7 +1531,6 @@ ready:
     Delete(arg_lnames);
     Delete(constr_name);
     Delete(code);
-    Delete(stype);
     Delete(ctype);
     Delete(sobj_name);
     return SWIG_OK;
@@ -1574,7 +1546,6 @@ ready:
     String *newclassname = Getattr(klass, "sym:name");
     String *sobj_name = NewString("");
     String *ctype;
-    String *stype;
     String *code = NewString("");
     String *constr_name = NewString("");
     ParmList *parms = Getattr(n, "parms");
@@ -1583,14 +1554,10 @@ ready:
     Setattr(parms, "lname", "arg1");
 
     // set the function return type to the pointer to struct
-    Printf(sobj_name, "SwigObj");
-    ctype = Copy(sobj_name);
+    Setattr(n, "c:objstruct", "1");
+    ctype = make_public_class_name(nspace, newclassname);
     SwigType_add_pointer(ctype);
     Setattr(n, "type", ctype);
-    Setattr(n, "c:objstruct", "1");
-    stype = make_public_class_name(nspace, newclassname);
-    SwigType_add_pointer(stype);
-    Setattr(n, "c:stype", stype);
 
     // modify the constructor if necessary
     constr_name = Swig_name_copyconstructor(nspace, newclassname);
@@ -1611,7 +1578,6 @@ ready:
 
     Delete(constr_name);
     Delete(code);
-    Delete(stype);
     Delete(ctype);
     Delete(sobj_name);
     return SWIG_OK;
@@ -1629,21 +1595,16 @@ ready:
     String *newclassname = Getattr(klass, "sym:name");
     String *sobj_name = NewString("");
     String *ctype;
-    String *stype;
     String *code = NewString("");
     String *destr_name = NewString("");
     String *nspace = Getattr(klass, "sym:nspace");
     Parm *p;
 
     // create first argument
-    Printf(sobj_name, "SwigObj");
-    ctype = Copy(sobj_name);
+    ctype = make_public_class_name(nspace, newclassname);
     SwigType_add_pointer(ctype);
     p = NewParm(ctype, "self", n);
     Setattr(p, "lname", "arg1");
-    stype = make_public_class_name(nspace, newclassname);
-    SwigType_add_pointer(stype);
-    Setattr(p, "c:stype", stype);
     Setattr(p, "c:objstruct", "1");
     Setattr(n, "parms", p);
     Setattr(n, "type", "void");
@@ -1663,7 +1624,6 @@ ready:
     Delete(p);
     Delete(destr_name);
     Delete(code);
-    Delete(stype);
     Delete(ctype);
     Delete(sobj_name);
     return SWIG_OK;

From e068aa8cc9016e1610ff6ac69a277ddab57d43b2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 23:29:38 +0200
Subject: [PATCH 269/508] Simplify ctors/dtor handling by reusing base class
 code

Just use our custom object creation/destruction code, but let the base class
do everything else.

This uncovered complete lack of support for ctors/dtors defined using %extend,
but this is not new and will have to remain broken for now.
---
 Examples/test-suite/c/Makefile.in |   1 -
 Source/Modules/c.cxx              | 185 ++++++++----------------------
 2 files changed, 50 insertions(+), 136 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index f41f49fc8..3c0dc0ddb 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -90,7 +90,6 @@ FAILING_CPP_TESTS := \
     smart_pointer_extend \
     smart_pointer_not \
     smart_pointer_template_defaults_overload \
-    special_variables \
     struct_initialization_cpp \
     template_arg_typename \
     template_basic \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index b6f9c8060..32b801a1b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -107,15 +107,6 @@ public:
   }
 };
 
-// Return the public name to use for the given class.
-//
-// It basically just prepends the namespace, if any, to the class name, and mangles the result.
-String *make_public_class_name(String* nspace, String* classname) {
-  String *s = nspace ? NewStringf("%s_", nspace) : NewString("");
-  Append(s, classname);
-  return s;
-}
-
 // String containing one indentation level for the generated code.
 const char* const cindent = "  ";
 
@@ -141,6 +132,9 @@ class C:public Language {
   // Contains fully expanded names of the classes for which we have already specialized SWIG_derives_from<>.
   Hash *already_specialized_derives_from;
 
+  // If non-null, contains wrap:action code to be used in the next functionWrapper() call.
+  String *special_wrap_action;
+
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
 
@@ -163,6 +157,7 @@ public:
     int_string(NewString("int")),
     tl_namespace(NULL),
     already_specialized_derives_from(NULL),
+    special_wrap_action(NULL),
     except_flag(true) {
   }
 
@@ -950,7 +945,8 @@ ready:
        Printv(wrapper->def, get_wrapper_func_proto(n, wrapper).get(), NIL);
        Printv(wrapper->def, " {", NIL);
 
-       if (Cmp(nodeType(n), "destructor") != 0) {
+       bool const is_dtor = Cmp(nodeType(n), "destructor") == 0;
+       if (!is_dtor) {
             // emit variables for holding parameters
             emit_parameter_variables(parms, wrapper);
 
@@ -984,7 +980,8 @@ ready:
        }
 
        // handle special cases of cpp return result
-       if (Cmp(nodeType(n), "constructor") != 0) {
+       bool const is_ctor = Cmp(nodeType(n), "constructor") == 0;
+       if (!is_ctor) {
             if (SwigType_isenum(SwigType_base(type))){
                  if (return_object)
                    Replaceall(action, "result =", "cppresult = (int)");
@@ -1016,6 +1013,17 @@ ready:
        }
 
        // prepare action code to use, e.g. insert try-catch blocks
+
+       // We don't take extension ctors and dtors into account currently (objects are always created using hardcoded new in constructorHandler() and destroyed
+       // using SWIG_destroy_object()) and generating them is at best useless and can be harmful when it results in a clash of names between an extension ctor
+       // new_Foo() and the ctor wrapper which has exactly the same name. So for now just drop them completely, which is certainly not right, but not worse than
+       // before.
+       //
+       // TODO-C: Implement proper extension ctors/dtor support.
+       if (is_ctor || is_dtor) {
+	 Delattr(n, "wrap:code");
+       }
+
        action = emit_action(n);
 
        // emit output typemap if needed
@@ -1092,6 +1100,13 @@ ready:
 
   virtual void functionWrapperCPPSpecific(Node *n)
     {
+      // Use special actions for special methods if set up.
+      if (special_wrap_action) {
+	Setattr(n, "wrap:action", special_wrap_action);
+	Delete(special_wrap_action);
+	special_wrap_action = NULL;
+      }
+
        ParmList *parms = Getattr(n, "parms");
        String *name = Copy(Getattr(n, "sym:name"));
        SwigType *type = Getattr(n, "type");
@@ -1486,101 +1501,32 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int constructorHandler(Node *n) {
-    String *access = Getattr(n, "access");
-    if (Cmp(access, "private") == 0)
-      return SWIG_NOWRAP;
-    if (Getattr(n, "copy_constructor"))
-      return copyconstructorHandler(n);
-
-    Node *klass = Swig_methodclass(n);
-    String *newclassname = Getattr(klass, "sym:name");
-    String *sobj_name = NewString("");
-    String *ctype;
-    String *code = NewString("");
-    String *constr_name = NewString("");
-    String *arg_lnames = NewString("");
-    ParmList *parms = Getattr(n, "parms");
-    String *nspace = Getattr(klass, "sym:nspace");
-
-    // prepare argument names
-    Append(arg_lnames, Swig_cfunction_call(empty_string, parms));
-
-    // set the function return type to the pointer to struct
-    Setattr(n, "c:objstruct", "1");
-    ctype = make_public_class_name(nspace, newclassname);
-    SwigType_add_pointer(ctype);
-    Setattr(n, "type", ctype);
-
-    // Modify the constructor name if necessary
-    constr_name = Swig_name_construct(nspace, newclassname);
-
-    Setattr(n, "name", newclassname);
-    Setattr(n, "sym:name", constr_name);
-
-    // generate action code
-    if (!Getattr(klass, "c:create")) {
-      Setattr(klass, "c:create", "1");
-    }
-    Printv(code, "result = SWIG_create_object(new ", Getattr(klass, "classtype"), arg_lnames,
-	", \"", newclassname, "\");\n",
-	NIL);
-
-    Setattr(n, "wrap:action", code);
-    functionWrapper(n);
-
-    Delete(arg_lnames);
-    Delete(constr_name);
-    Delete(code);
-    Delete(ctype);
-    Delete(sobj_name);
-    return SWIG_OK;
-  }
-
-  /* ---------------------------------------------------------------------
-   * copyconstructorHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int copyconstructorHandler(Node *n) {
     Node *klass = Swig_methodclass(n);
     String *classname = Getattr(klass, "classtype");
     String *newclassname = Getattr(klass, "sym:name");
-    String *sobj_name = NewString("");
-    String *ctype;
-    String *code = NewString("");
-    String *constr_name = NewString("");
-    ParmList *parms = Getattr(n, "parms");
-    String *nspace = Getattr(klass, "sym:nspace");
 
-    Setattr(parms, "lname", "arg1");
-
-    // set the function return type to the pointer to struct
-    Setattr(n, "c:objstruct", "1");
-    ctype = make_public_class_name(nspace, newclassname);
-    SwigType_add_pointer(ctype);
-    Setattr(n, "type", ctype);
-
-    // modify the constructor if necessary
-    constr_name = Swig_name_copyconstructor(nspace, newclassname);
-
-    Setattr(n, "name", newclassname);
-    Setattr(n, "sym:name", constr_name);
-
-    // generate action code
-    if (!Getattr(klass, "c:create")) {
-      Setattr(klass, "c:create", "1");
+    bool const is_copy_ctor = Getattr(n, "copy_constructor");
+    String *arg_lnames;
+    if (is_copy_ctor) {
+      arg_lnames = NewStringf("((%s const &)*arg1)", classname);
+    } else {
+      ParmList *parms = Getattr(n, "parms");
+      arg_lnames = Swig_cfunction_call(empty_string, parms);
     }
-    Printv(code, "result = SWIG_create_object(new ", classname, "((", classname, " const &)*arg1)",
-	", \"", newclassname, "\");\n",
-	NIL);
 
-    Setattr(n, "wrap:action", code);    
-    functionWrapper(n);
+    // TODO-C: We need to call the extension ctor here instead of hard-coding "new classname".
+    special_wrap_action = NewStringf(
+	"result = SWIG_create_object(new %s%s, \"%s\");",
+	classname,
+	arg_lnames,
+	newclassname
+      );
 
-    Delete(constr_name);
-    Delete(code);
-    Delete(ctype);
-    Delete(sobj_name);
-    return SWIG_OK;
+    Delete(arg_lnames);
+
+    Setattr(n, "c:objstruct", "1");
+
+    return is_copy_ctor ? Language::copyconstructorHandler(n) : Language::constructorHandler(n);
   }
 
   /* ---------------------------------------------------------------------
@@ -1588,45 +1534,14 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int destructorHandler(Node *n) {
-    if (Cmp(Getattr(n, "access"), "public") != 0)
-      return SWIG_NOWRAP;
-
     Node *klass = Swig_methodclass(n);
-    String *newclassname = Getattr(klass, "sym:name");
-    String *sobj_name = NewString("");
-    String *ctype;
-    String *code = NewString("");
-    String *destr_name = NewString("");
-    String *nspace = Getattr(klass, "sym:nspace");
-    Parm *p;
 
-    // create first argument
-    ctype = make_public_class_name(nspace, newclassname);
-    SwigType_add_pointer(ctype);
-    p = NewParm(ctype, "self", n);
-    Setattr(p, "lname", "arg1");
-    Setattr(p, "c:objstruct", "1");
-    Setattr(n, "parms", p);
-    Setattr(n, "type", "void");
+    // TODO-C: We need to use the extension dtor here if one is defined.
+    special_wrap_action = NewStringf(
+	"SWIG_destroy_object< %s >(carg1);", Getattr(klass, "classtype")
+      );
 
-    // modify the destructor name if necessary
-    destr_name = Swig_name_destroy(nspace, newclassname);
-
-    Setattr(n, "name", NULL);
-    Setattr(n, "sym:name", destr_name);
-
-    // create action code
-    Printv(code, "SWIG_destroy_object< ", Getattr(klass, "classtype"), " >(carg1);", NIL);
-    Setattr(n, "wrap:action", code);
-    
-    functionWrapper(n);
-      
-    Delete(p);
-    Delete(destr_name);
-    Delete(code);
-    Delete(ctype);
-    Delete(sobj_name);
-    return SWIG_OK;
+    return Language::destructorHandler(n);
   }
 
   /* ---------------------------------------------------------------------

From 1dfbd492b97496ca0b7168e41a9f2bcf682d9644 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 23:36:12 +0200
Subject: [PATCH 270/508] Add more warning-suppressing casts to
 special_variables test

Avoid harmless but annoying warning about assigning a literal string to
a non-const char pointer.
---
 Examples/test-suite/special_variables.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/special_variables.i b/Examples/test-suite/special_variables.i
index 035df1e24..a95e288d8 100644
--- a/Examples/test-suite/special_variables.i
+++ b/Examples/test-suite/special_variables.i
@@ -35,7 +35,7 @@ std::string ExceptionVars(double i, double j) {
   result = (char*)$symname(1.0,2.0).c_str(); // Should expand to ExceptionVars
   result = (char*)$name(3.0,4.0).c_str(); // Should expand to Space::exceptionvars
   // above will not compile if the variables are not expanded properly
-  result = "$action  $name  $symname  $overname $wrapname";
+  result = (char*)"$action  $name  $symname  $overname $wrapname";
 %}
 
 #else
@@ -67,7 +67,7 @@ std::string exceptionvars(double i, double j) {
   result = (char*)$name().c_str();
   result = (char*)$name(2.0).c_str();
   // above will not compile if the variables are not expanded properly
-  result = "$action  $name  $symname  $overname $wrapname";
+  result = (char*)"$action  $name  $symname  $overname $wrapname";
   // $decl
 %}
 

From 8e30abf7abb96e4f314928e03e13a9fb96826a9c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 24 Apr 2016 19:48:33 +0200
Subject: [PATCH 271/508] Don't use "this" method parameter for disambiguating
 overloads

When building the unique suffix for each member of the overloaded functions
set, don't use the first "this" parameter of the object methods in it as it's
the same for all of them and so is completely useless for disambiguation
purposes and just results in unnecessarily long and ugly names.

Use "_const" suffix for the methods differing by their const-ness only, this
is necessary now that we don't use "_pFoo" or "_pcFoo" in their names.

This makes it superfluous to check for c:objstruct in
functionWrapperAppendOverloaded() (and checking for it there was not enough
neither, as the changes in the test suite show, sometimes the "this" parameter
type still found its way into the generated wrappers).
---
 Examples/test-suite/c/cpp_basic_runme.c       |  6 +--
 .../test-suite/c/operator_overload_runme.c    |  4 +-
 Source/Modules/c.cxx                          | 37 ++++++++++++++++---
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index ff16981b1..4de994340 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -99,9 +99,9 @@ int main(int argc, const char *argv[]) {
 	Fl_Window *w = new_Fl_Window();
 	// Test whether macro worked for code extension
 	// and test optional function parameters
-	Fl_Window_show_pFl_Window(w);
-	Fl_Window_show_pFl_Window_pv(w, 0);
-	Fl_Window_show_pFl_Window_pv_pv(w, 0, 0);
+	Fl_Window_show(w);
+	Fl_Window_show_pv(w, 0);
+	Fl_Window_show_pv_pv(w, 0, 0);
 	delete_Fl_Window(w);
 	w = 0;
 
diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index 0a5a3c9b8..7bb483f90 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -15,8 +15,8 @@ int main() {
   assert(Op_GreaterThanEqual(op2, op1), "geq failed");
   Op_PlusEqual(op3, op1);
   assert(Op_LessThan(op1, op2) && Op_LessThan(op2, op3), "lt failed");
-  assert(3 == *Op_IndexInto(op3, Op_IndexIntoConst(op2, Op_Functor_pOp(op1))), "[] or () failed");
-  assert(5 == Op_Functor_pOp_i(op3, 2), "f(x) failed");
+  assert(3 == *Op_IndexInto(op3, Op_IndexIntoConst(op2, Op_Functor(op1))), "[] or () failed");
+  assert(5 == Op_Functor_i(op3, 2), "f(x) failed");
   
   delete_Op(op1);
   delete_Op(op2);
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 32b801a1b..7e2e3afe5 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -722,15 +722,13 @@ ready:
        }
     }
 
-  virtual void functionWrapperAppendOverloaded(String *name, const ParmList *parms)
+  virtual void functionWrapperAppendOverloaded(String *name, Parm* first_param)
     {
        String *over_suffix = NewString("");
        Parm *p;
        String *mangled;
 
-       for (p = (Parm*)parms; p; p = nextSibling(p)) {
-            if (Getattr(p, "c:objstruct"))
-              continue;
+       for (p = first_param; p; p = nextSibling(p)) {
             mangled = get_mangled_type(Getattr(p, "type"));
             Printv(over_suffix, "_", mangled, NIL);
        }
@@ -1117,7 +1115,36 @@ ready:
        // mangle name if function is overloaded
        if (Getattr(n, "sym:overloaded")) {
             if (!Getattr(n, "copy_constructor")) {
-                 functionWrapperAppendOverloaded(name, parms);
+		Parm* first_param = (Parm*)parms;
+		if (first_param) {
+		  // Skip the first "this" parameter of the wrapped methods, it doesn't participate in overload resolution and would just result in extra long
+		  // and ugly names.
+		  //
+		  // The check for c:globalfun is needed to avoid dropping the first argument of static methods which don't have "this" pointer neither, in
+		  // spite of being members. Of course, the constructors don't have it neither.
+		  if (!Checkattr(n, "nodeType", "constructor") &&
+			Checkattr(n, "ismember", "1") &&
+			  !Checkattr(n, "c:globalfun", "1")) {
+		    first_param = nextSibling(first_param);
+
+		    // A special case of overloading on const/non-const "this" pointer only, we still need to distinguish between those.
+		    if (SwigType_isconst(Getattr(n, "decl"))) {
+		      const char * const nonconst = Char(Getattr(n, "decl")) + 9 /* strlen("q(const).") */;
+		      for (Node* nover = Getattr(n, "sym:overloaded"); nover; nover = Getattr(nover, "sym:nextSibling")) {
+			if (nover == n)
+			  continue;
+
+			if (Cmp(Getattr(nover, "decl"), nonconst) == 0) {
+			  // We have an overload differing by const only, disambiguate.
+			  Append(name, "_const");
+			  break;
+			}
+		      }
+		    }
+		  }
+
+		  functionWrapperAppendOverloaded(name, first_param);
+		}
             }
        }
 

From 0480694a7a4de69a86bd70e9e0a913008623a110 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 23:37:10 +0200
Subject: [PATCH 272/508] Remove the now unused
 functionWrapperCPPSpecificMarkFirstParam()

There is no need to set c:objstruct for the first parameter of the methods now
that we take care of it for disambiguating between overloads explicitly and
this function doesn't seem to be useful for anything else, simply drop it.
---
 Source/Modules/c.cxx | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 7e2e3afe5..2b13c20ca 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1079,23 +1079,6 @@ ready:
        DelWrapper(wrapper);
     }
 
-  virtual void functionWrapperCPPSpecificMarkFirstParam(Node *n)
-    {
-       bool is_global = IS_SET_TO_ONE(n, "c:globalfun");  // possibly no longer neede
-       String *storage = Getattr(n, "storage");
-       ParmList *parms = Getattr(n, "parms");
-
-       // mark the first parameter as object-struct
-       if (!is_global && storage && (Cmp(storage, "static") != 0)) {
-            if (IS_SET_TO_ONE(n, "ismember") &&
-                  (Cmp(nodeType(n), "constructor") != 0)) {
-                 Setattr(parms, "c:objstruct", "1");
-                 if (!Getattr(parms, "lname"))
-                   Setattr(parms, "lname", "arg1");
-            }
-       }
-    }
-
   virtual void functionWrapperCPPSpecific(Node *n)
     {
       // Use special actions for special methods if set up.
@@ -1110,8 +1093,6 @@ ready:
        SwigType *type = Getattr(n, "type");
        SwigType *tdtype = NULL;
 
-       functionWrapperCPPSpecificMarkFirstParam(n);
-
        // mangle name if function is overloaded
        if (Getattr(n, "sym:overloaded")) {
             if (!Getattr(n, "copy_constructor")) {

From 862abb42e6ff640406587fef83eb8c2b88d584af Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 23:40:36 +0200
Subject: [PATCH 273/508] Allow suppressing progress messages when running C
 test suite

This makes the warnings more noticeable.
---
 Examples/test-suite/c/Makefile.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 3c0dc0ddb..b94cf0eb1 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -10,6 +10,9 @@ srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
 top_builddir = ../@top_builddir@
 
+# This can be set to ":" to avoid progress messages.
+ECHO_PROGRESS := echo
+
 CPP_TEST_CASES := \
 				 cpp_basic_class \
 				 cpp_basic_class_method \
@@ -147,9 +150,9 @@ SRCDIR       = ../$(srcdir)/
 # Makes a directory for the testcase if it does not exist
 setup = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \
-	  echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \
+	  $(ECHO_PROGRESS) "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \
 	else								  \
-	  echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ;		  \
+	  $(ECHO_PROGRESS) "$(ACTION)ing testcase $* under $(LANGUAGE)" ;		  \
 	fi;								  \
 	if [ ! -d $* ]; then						  \
 		mkdir $*;						  \

From 97fc60ef51ec9e35ca43e4888829c844191d8c31 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 21 Apr 2016 23:50:57 +0200
Subject: [PATCH 274/508] Get rid of c:objstruct attribute

The only remaining use of this attribute is to test for whether we're wrapping
a ctor and it is simpler and more clear to just check the node type directly
in this case.

This attribute was pretty confusing as it was used for parameters and entire
declarations, so removing it makes things more clear and simpler.
---
 Source/Modules/c.cxx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 2b13c20ca..b0d3baf7b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -917,6 +917,7 @@ ready:
        String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
+       bool const is_ctor = Cmp(nodeType(n), "constructor") == 0;
        bool is_void_return = (SwigType_type(type) == T_VOID);
        bool return_object = false;
        // create new function wrapper object
@@ -926,7 +927,7 @@ ready:
        Setattr(n, "wrap:name", wname);
 
        // add variable for holding result of original function 'cppresult'
-       if (!is_void_return && !IS_SET_TO_ONE(n, "c:objstruct")) {
+       if (!is_void_return && !is_ctor) {
             String *tm;
             if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) {
                  functionWrapperAddCPPResult(wrapper, type, tm);
@@ -978,7 +979,6 @@ ready:
        }
 
        // handle special cases of cpp return result
-       bool const is_ctor = Cmp(nodeType(n), "constructor") == 0;
        if (!is_ctor) {
             if (SwigType_isenum(SwigType_base(type))){
                  if (return_object)
@@ -1025,7 +1025,7 @@ ready:
        action = emit_action(n);
 
        // emit output typemap if needed
-       if (!is_void_return && (Cmp(Getattr(n, "c:objstruct"), "1") != 0)) {
+       if (!is_void_return && !is_ctor) {
             String *tm;
             if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) {
                  Replaceall(tm, "$result", "result");
@@ -1532,8 +1532,6 @@ ready:
 
     Delete(arg_lnames);
 
-    Setattr(n, "c:objstruct", "1");
-
     return is_copy_ctor ? Language::copyconstructorHandler(n) : Language::constructorHandler(n);
   }
 

From 75d9cb47694e1d2a8d4d36bcbe668fc89e3496fb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 01:37:24 +0200
Subject: [PATCH 275/508] Remove C-specific cpp_basic_global_var_built_in unit
 test

There is no need for it, the common global_vars unit test is more extensive
and passes too now.
---
 Examples/test-suite/c/Makefile.in                   |  1 -
 .../c/cpp_basic_global_var_built_in_runme.c         | 13 -------------
 Examples/test-suite/c/global_vars_runme.c           | 12 ++++++++++++
 Examples/test-suite/cpp_basic_global_var_built_in.i |  5 -----
 4 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
 create mode 100644 Examples/test-suite/c/global_vars_runme.c
 delete mode 100644 Examples/test-suite/cpp_basic_global_var_built_in.i

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index b94cf0eb1..857464a61 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -19,7 +19,6 @@ CPP_TEST_CASES := \
 				 cpp_basic_class_virtual_method \
 				 cpp_basic_class_var_pub_member_built_in \
 				 cpp_basic_class_var_pub_member_class \
-				 cpp_basic_global_var_built_in \
 				 cpp_basic_global_var_class \
 				 cpp_basic_namespaced_class \
 				 cpp_basic_template_function \
diff --git a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
deleted file mode 100644
index 3ed025fc5..000000000
--- a/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include 
-#include "cpp_basic_global_var_built_in/cpp_basic_global_var_built_in_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    assert(myGlobalInt == 42);
-
-    myGlobalInt = 4711;
-
-    assert(myGlobalInt == 4711);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/global_vars_runme.c b/Examples/test-suite/c/global_vars_runme.c
new file mode 100644
index 000000000..3802ab6be
--- /dev/null
+++ b/Examples/test-suite/c/global_vars_runme.c
@@ -0,0 +1,12 @@
+#include 
+#include "global_vars/global_vars_wrap.h"
+
+int main(int argc, const char *argv[])
+{
+    init();
+
+    assert(strcmp(b_get(), "string b") == 0);
+    assert(x == 1234);
+
+    return 0;
+}
diff --git a/Examples/test-suite/cpp_basic_global_var_built_in.i b/Examples/test-suite/cpp_basic_global_var_built_in.i
deleted file mode 100644
index c0cc1ba91..000000000
--- a/Examples/test-suite/cpp_basic_global_var_built_in.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%module cpp_basic_global_var_atom
-
-%inline {
-    int myGlobalInt = 42;
-}

From 5fd1f28477f05522f907e66785a04576a0f1da26 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 01:46:44 +0200
Subject: [PATCH 276/508] Do not export static global variables at all

They shouldn't be exported and can't be when using shared libraries.
---
 Source/Modules/c.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index b0d3baf7b..394ceb689 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -500,6 +500,10 @@ public:
    * ------------------------------------------------------------------------ */  
 
   virtual int globalvariableHandler(Node *n) {
+    // Don't export static globals, they won't be accessible when using a shared library, for example.
+    if (Checkattr(n, "storage", "static"))
+      return SWIG_NOWRAP;
+
     // We can't export variables defined inside namespaces to C directly, whatever their type.
     String* const scope = Swig_scopename_prefix(Getattr(n, "name"));
     if (!scope) {

From 7f4549a0f3b33a8406d4f10c1fe67b6f9720eb8f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 01:47:04 +0200
Subject: [PATCH 277/508] Ensure that we define bool before using it for
 variables

It would have been better to hook into the fragment machinery, but for now do
it directly to make sure the generated code compiles.
---
 Source/Modules/c.cxx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 394ceb689..e9d8f10ec 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1247,6 +1247,11 @@ ready:
 
 	  if (!SwigType_isbuiltin(btype))
 	    return NIL;
+
+	  // Final complication: define bool if it is used here.
+	  if (Cmp(btype, "bool") == 0) {
+	    Printv(f_wrappers_types, "#include \n\n", NIL);
+	  }
 	}
       }
     }

From 4a0ed9cb424ea6ea1c1c86827dff7eee442fb6ca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 01:53:19 +0200
Subject: [PATCH 278/508] Declare printf() before using it in std_vector
 example

Just add missing #include .
---
 Examples/c/std_vector/runme.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index ec43f7505..7761b5747 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -1,3 +1,5 @@
+#include 
+
 #include "example_wrap.h"
 
 int main() {

From 4ba57e577a9dee25e6a4d7af61d24aa3a0f59c91 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 01:53:35 +0200
Subject: [PATCH 279/508] Fix obvious memory leaks in the std_vector example

Delete the class when we're done with it.
---
 Examples/c/std_vector/runme.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index 7761b5747..ef12180f9 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -35,5 +35,7 @@ int main() {
     printf("%s %d\n", A_name_get(a), A_value_get(a));
   }
   
+  delete_Klass(klass);
+
   SWIG_exit(0);
 }

From b24665fa6aeaccd6690f09682d533e4180611b1d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 19:10:13 +0200
Subject: [PATCH 280/508] Add names of the functions being wrapped to symbol
 table

At the very least this results in clear error messages when running SWIG if
the symbol is encountered twice instead of errors given only when compiling
the generated code later.
---
 Source/Modules/c.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index e9d8f10ec..0a1d549db 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1152,6 +1152,10 @@ ready:
    * ---------------------------------------------------------------------- */
    
   virtual int functionWrapper(Node *n) {
+    if (!Getattr(n, "sym:overloaded")) {
+      if (!addSymbol(Getattr(n, "sym:name"), n))
+	return SWIG_ERROR;
+    }
 
     if (CPlusPlus) {
          functionWrapperCPPSpecific(n);

From bda731cd8fce8667d13a60b2b15375cd5461efbf Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 19:20:20 +0200
Subject: [PATCH 281/508] Change naming convention for wrapped ctors and dtor

Use Foo_{new,delete}() instead of {new,delete}_Foo() to ensure that all
methods of the class Foo start with the corresponding prefix.
---
 Doc/Manual/C.html                             | 24 +++++++++----------
 Examples/c/class/runme.c                      |  8 +++----
 Examples/c/exception/runme.c                  |  2 +-
 Examples/c/std_vector/runme.c                 |  6 ++---
 Examples/test-suite/c/abstract_access_runme.c |  6 ++---
 Examples/test-suite/c/abstract_change_runme.c | 14 +++++------
 .../test-suite/c/abstract_typedef_runme.c     |  8 +++----
 .../test-suite/c/abstract_virtual_runme.c     | 12 +++++-----
 Examples/test-suite/c/add_link_runme.c        |  6 ++---
 .../test-suite/c/anonymous_bitfield_runme.c   |  4 ++--
 Examples/test-suite/c/cast_operator_runme.c   |  4 ++--
 .../c/cpp_basic_class_method_runme.c          |  4 ++--
 Examples/test-suite/c/cpp_basic_class_runme.c |  4 ++--
 ...asic_class_var_pub_member_built_in_runme.c |  4 ++--
 ...p_basic_class_var_pub_member_class_runme.c |  8 +++----
 .../c/cpp_basic_class_virtual_method_runme.c  | 16 ++++++-------
 .../c/cpp_basic_namespaced_class_runme.c      |  4 ++--
 Examples/test-suite/c/cpp_basic_runme.c       | 18 +++++++-------
 .../c/cpp_basic_template_class_runme.c        |  4 ++--
 Examples/test-suite/c/cpp_enum_runme.c        |  8 +++----
 Examples/test-suite/c/exception_order_runme.c |  2 +-
 .../test-suite/c/operator_overload_runme.c    |  8 +++----
 Source/Modules/c.cxx                          |  8 +++++++
 23 files changed, 95 insertions(+), 87 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 6ad664664..42e283714 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -367,8 +367,8 @@ The generated functions make calls to class' constructors and destructors, respe
 
      
 
 
      -Circle * new_Circle(double r);
-void delete_Circle(Circle * self);
+Circle * Circle_new(double r);
+void Circle_delete(Circle * self);
 
      
 
 
      
@@ -397,9 +397,9 @@ Our application code could look like this:
 
      
 
 
      -  Circle *c = new_Circle(1.5);
+  Circle *c = Circle_new(1.5);
   printf("radius: %f\narea: %f\n", Circle_radius_get(c), Circle_area(c));
-  delete_Circle(c);
+  Circle_delete(c);
 
      
 
 
      
@@ -482,18 +482,18 @@ What we would like to generate as a C interface of this function would be someth
 // wrapper header file
 typedef struct SwigObj_SomeClass SomeClass;
 
-SomeClass * new_SomeClass();
+SomeClass * SomeClass_new();
 
-void delete_SomeClass(SomeClass * carg1);
+void SomeClass_delete(SomeClass * carg1);
         
 SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
         
         
 typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
         
-SomeIntTemplateClass * new_SomeIntTemplateClass();
+SomeIntTemplateClass * SomeIntTemplateClass_new();
         
-void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
+void SomeIntTemplateClass_delete(SomeIntTemplateClass * carg1);
 
      
 
 
      The Wrapper
      
@@ -616,18 +616,18 @@ above.
 // wrapper header file
 typedef struct SwigObj_SomeClass SomeClass;
 
-SomeClass * new_SomeClass();
+SomeClass * SomeClass_new();
 
-void delete_SomeClass(SomeClass * carg1);
+void SomeClass_delete(SomeClass * carg1);
 
 SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
 
 
 typedef struct SwigObj_SomeIntTemplateClass SomeIntTemplateClass;
 
-SomeIntTemplateClass * new_SomeIntTemplateClass();
+SomeIntTemplateClass * SomeIntTemplateClass_new();
 
-void delete_SomeIntTemplateClass(SomeIntTemplateClass * carg1);
+void SomeIntTemplateClass_delete(SomeIntTemplateClass * carg1);
 
      
 
 
      36.5 Exception handling
      
diff --git a/Examples/c/class/runme.c b/Examples/c/class/runme.c
index 4c1f33ca0..4aa613968 100644
--- a/Examples/c/class/runme.c
+++ b/Examples/c/class/runme.c
@@ -4,9 +4,9 @@
 
 int main(int argc, char **argv) {
   printf("Creating some objects:\n");
-  Circle* c = new_Circle(10);
+  Circle* c = Circle_new(10);
   printf("    Created circle\n");
-  Square* s = new_Square(10);
+  Square* s = Square_new(10);
   printf("    Created square\n");
 
   printf("\nA total of %d shapes were created\n", Shape_nshapes_get());
@@ -33,8 +33,8 @@ int main(int argc, char **argv) {
 
   printf("\nGuess I'll clean up now\n");
 
-  delete_Square(s);
-  delete_Circle(c);
+  Square_delete(s);
+  Circle_delete(c);
 
   printf("%d shapes remain\n", Shape_nshapes_get());
   printf("Goodbye\n");
diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index 6480f3d50..4094a9859 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -7,7 +7,7 @@
 #include "example_wrap.h"
 
 int main() {
-  Test *t = new_Test();
+  Test *t = Test_new();
 
   SWIG_try {
     Test_unknown(t);
diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index ef12180f9..b29ffa14a 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -3,7 +3,7 @@
 #include "example_wrap.h"
 
 int main() {
-  Klass *klass = new_Klass();
+  Klass *klass = Klass_new();
   Vint *vint = Klass_vi_get(klass);
   VA *va = Klass_va_get(klass);
 
@@ -26,7 +26,7 @@ int main() {
   printf("\nVector of objects:\n");
   
   for (i = 0; i < 10; i++) {
-    A *a = new_A_std_string_i("hello", i);
+    A *a = A_new_std_string_i("hello", i);
     VA_push_back(va, a);
   }
     
@@ -35,7 +35,7 @@ int main() {
     printf("%s %d\n", A_name_get(a), A_value_get(a));
   }
   
-  delete_Klass(klass);
+  Klass_delete(klass);
 
   SWIG_exit(0);
 }
diff --git a/Examples/test-suite/c/abstract_access_runme.c b/Examples/test-suite/c/abstract_access_runme.c
index e27c9b363..5e282394c 100644
--- a/Examples/test-suite/c/abstract_access_runme.c
+++ b/Examples/test-suite/c/abstract_access_runme.c
@@ -2,11 +2,11 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	D *d = new_D();
+	D *d = D_new();
 
 	assert(D_do_x(d) == 1);
 
-	delete_D(d);
+	D_delete(d);
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Examples/test-suite/c/abstract_change_runme.c b/Examples/test-suite/c/abstract_change_runme.c
index 125fad7e9..3696bc493 100644
--- a/Examples/test-suite/c/abstract_change_runme.c
+++ b/Examples/test-suite/c/abstract_change_runme.c
@@ -2,9 +2,9 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Base *ba = new_Base();
-	Derived *d = new_Derived();
-	Bottom *bo = new_Bottom();
+	Base *ba = Base_new();
+	Derived *d = Derived_new();
+	Bottom *bo = Bottom_new();
 
 	assert(Base_PublicProtectedPublic1(ba) == 0);
 	assert(Base_PublicProtectedPublic2(ba) == 0);
@@ -26,9 +26,9 @@ int main(int argc, const char *argv[]) {
 	assert(Bottom_WasProtected3(ba) == 0);
 	assert(Bottom_WasProtected4(ba) == 0);
 
-	delete_Base(ba);
-	delete_Derived(d);
-	delete_Bottom(bo);
+	Base_delete(ba);
+	Derived_delete(d);
+	Bottom_delete(bo);
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Examples/test-suite/c/abstract_typedef_runme.c b/Examples/test-suite/c/abstract_typedef_runme.c
index 0019b1cc9..62c4c65d5 100644
--- a/Examples/test-suite/c/abstract_typedef_runme.c
+++ b/Examples/test-suite/c/abstract_typedef_runme.c
@@ -3,13 +3,13 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Engine *e = new_Engine();
-	A *a = new_A();
+	Engine *e = Engine_new();
+	A *a = A_new();
 
 	assert(AbstractBaseClass_write(a, e) == true);
 
-	delete_A(a);
-	delete_Engine(e);
+	A_delete(a);
+	Engine_delete(e);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/abstract_virtual_runme.c b/Examples/test-suite/c/abstract_virtual_runme.c
index 77dca7f88..91f1b9652 100644
--- a/Examples/test-suite/c/abstract_virtual_runme.c
+++ b/Examples/test-suite/c/abstract_virtual_runme.c
@@ -2,17 +2,17 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	B *b = new_B();
-	D *d = new_D();
-	E *e = new_E();
+	B *b = B_new();
+	D *d = D_new();
+	E *e = E_new();
 
 	assert(B_foo(b) == 0);
 	assert(D_foo(d) == 0);
 	assert(E_foo(e) == 0);
 
-	delete_B(b);
-	delete_D(d);
-	delete_E(e);
+	B_delete(b);
+	D_delete(d);
+	E_delete(e);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/add_link_runme.c b/Examples/test-suite/c/add_link_runme.c
index c9080dbf9..809e55e75 100644
--- a/Examples/test-suite/c/add_link_runme.c
+++ b/Examples/test-suite/c/add_link_runme.c
@@ -2,13 +2,13 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Foo *f = new_Foo();
+	Foo *f = Foo_new();
 	Foo *f2 = Foo_blah(f);
 
 	assert(f2 != 0);
 
-	delete_Foo(f);
-	delete_Foo(f2);
+	Foo_delete(f);
+	Foo_delete(f2);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/anonymous_bitfield_runme.c b/Examples/test-suite/c/anonymous_bitfield_runme.c
index 3370341ec..a3d93149f 100644
--- a/Examples/test-suite/c/anonymous_bitfield_runme.c
+++ b/Examples/test-suite/c/anonymous_bitfield_runme.c
@@ -2,7 +2,7 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Foo *f = new_Foo();
+	Foo *f = Foo_new();
 
 	assert(f != 0);
 
@@ -23,7 +23,7 @@ int main(int argc, const char *argv[]) {
 	Foo_seq_set(f, 1);
 	assert(Foo_seq_get(f) == 1);
 
-	delete_Foo(f);
+	Foo_delete(f);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/cast_operator_runme.c b/Examples/test-suite/c/cast_operator_runme.c
index 66ccf984a..1b90bbcb4 100644
--- a/Examples/test-suite/c/cast_operator_runme.c
+++ b/Examples/test-suite/c/cast_operator_runme.c
@@ -3,10 +3,10 @@
 #include "cast_operator/cast_operator_wrap.h"
 
 int main() {
-  A *a = new_A();
+  A *a = A_new();
   if (strcmp(A_tochar(a), "hi"))
     fprintf(stderr, "cast failed\n");
-  delete_A(a);
+  A_delete(a);
   SWIG_exit(0);
 }
 
diff --git a/Examples/test-suite/c/cpp_basic_class_method_runme.c b/Examples/test-suite/c/cpp_basic_class_method_runme.c
index 93fb4e190..9061c40fb 100644
--- a/Examples/test-suite/c/cpp_basic_class_method_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_method_runme.c
@@ -3,11 +3,11 @@
 
 int main(int argc, const char *argv[])
 {
-    MyClass *mc = new_MyClass();
+    MyClass *mc = MyClass_new();
 
     assert(MyClass_someMethod(mc) == 42);
 
-    delete_MyClass(mc);
+    MyClass_delete(mc);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp_basic_class_runme.c b/Examples/test-suite/c/cpp_basic_class_runme.c
index 0b835ee21..13b4bc641 100644
--- a/Examples/test-suite/c/cpp_basic_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_runme.c
@@ -3,9 +3,9 @@
 int main(int argc, const char *argv[])
 {
     MyClass *mc;
-    mc = new_MyClass();
+    mc = MyClass_new();
 
-    delete_MyClass(mc);
+    MyClass_delete(mc);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
index d3dbf9fdf..6d2898933 100644
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
@@ -3,13 +3,13 @@
 
 int main(int argc, const char *argv[])
 {
-    MyClass *mc = new_MyClass();
+    MyClass *mc = MyClass_new();
 
     assert(MyClass_myPubInt_get(mc) == 42);
     MyClass_myPubInt_set(mc, 4711);
     assert(MyClass_myPubInt_get(mc) == 4711);
 
-    delete_MyClass(mc);
+    MyClass_delete(mc);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
index cc4127d9e..de700e46b 100644
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
@@ -6,15 +6,15 @@ int main(int argc, const char *argv[])
     MyClass *mc;
     MySecondClass *mc2;
 
-    mc2 = new_MySecondClass();
-    mc = new_MyClass();
+    mc2 = MySecondClass_new();
+    mc = MyClass_new();
 
     assert(MySecondClass_myPubClassInstance_get(mc2));
     MySecondClass_myPubClassInstance_set(mc2, mc);
     assert(MySecondClass_myPubClassInstance_get(mc2));
 
-    delete_MyClass(mc);
-    delete_MySecondClass(mc2);
+    MyClass_delete(mc);
+    MySecondClass_delete(mc2);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
index a5cabe8a7..034104a6f 100644
--- a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
@@ -3,10 +3,10 @@
 
 int main()
 {
-    BaseClass *bc = new_BaseClass();
-    NonMethodOverwritingClass *noc = new_NonMethodOverwritingClass();
-    MethodOverwritingClass *oc = new_MethodOverwritingClass();
-    BaseClass *inherited_bc = (BaseClass*)new_MethodOverwritingClass();
+    BaseClass *bc = BaseClass_new();
+    NonMethodOverwritingClass *noc = NonMethodOverwritingClass_new();
+    MethodOverwritingClass *oc = MethodOverwritingClass_new();
+    BaseClass *inherited_bc = (BaseClass*)MethodOverwritingClass_new();
 
     assert(BaseClass_myInt(bc) == 0xba53);
     assert(NonMethodOverwritingClass_myInt(noc) == 0xba53);
@@ -15,10 +15,10 @@ int main()
     assert(BaseClass_myInt((BaseClass*)oc) == 0xa173123d);
     assert(BaseClass_myInt(inherited_bc) == 0xa173123d);
     
-    delete_BaseClass(bc);
-    delete_NonMethodOverwritingClass(noc);
-    delete_MethodOverwritingClass(oc);
-    delete_BaseClass(inherited_bc);
+    BaseClass_delete(bc);
+    NonMethodOverwritingClass_delete(noc);
+    MethodOverwritingClass_delete(oc);
+    BaseClass_delete(inherited_bc);
     
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
index 95a1ce5c3..27527ceeb 100644
--- a/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
@@ -3,9 +3,9 @@
 int main(int argc, const char *argv[])
 {
     myNamespace_MyClass *mc;
-    mc = new_myNamespace_MyClass();
+    mc = myNamespace_MyClass_new();
 
-    delete_myNamespace_MyClass(mc);
+    myNamespace_MyClass_delete(mc);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index 4de994340..e8397480c 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -3,7 +3,7 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Foo *f = new_Foo(5);
+	Foo *f = Foo_new(5);
 
 	// test global static variables
 	// TODO: Implement or document as not available
@@ -36,7 +36,7 @@ int main(int argc, const char *argv[]) {
 	// because of unclear implementation details
 	//assert(c_init_ref != 0);
 
-	Bar *b = new_Bar();
+	Bar *b = Bar_new();
 
 	// check default value set by constructor
 	assert(Bar_cint_get(b) == 3);
@@ -55,9 +55,9 @@ int main(int argc, const char *argv[]) {
 	Foo_num_set(Bar_fref_get(b), 1);
 	assert(Foo_num_get(Bar_fref_get(b)) == 1);
 	// create new Bar instance and check static member value
-	Bar *b2 = new_Bar();
+	Bar *b2 = Bar_new();
 	assert(Foo_num_get(Bar_fref_get(b2)) == 1);
-	delete_Bar(b2);
+	Bar_delete(b2);
 	b2 = 0;
 
 	// Try to set a pointer
@@ -68,7 +68,7 @@ int main(int argc, const char *argv[]) {
 
 	Foo *f2 = Bar_testFoo(b, 2, f);
 	assert(Foo_num_get(f2) == 11);
-	delete_Foo(f2);
+	Foo_delete(f2);
 	f2 = 0;
 
 	// test static variables
@@ -93,16 +93,16 @@ int main(int argc, const char *argv[]) {
 	assert(test_func_ptr(f, 2) == -14);
 #endif
 
-	delete_Bar(b);
-	delete_Foo(f);
+	Bar_delete(b);
+	Foo_delete(f);
 
-	Fl_Window *w = new_Fl_Window();
+	Fl_Window *w = Fl_Window_new();
 	// Test whether macro worked for code extension
 	// and test optional function parameters
 	Fl_Window_show(w);
 	Fl_Window_show_pv(w, 0);
 	Fl_Window_show_pv_pv(w, 0, 0);
-	delete_Fl_Window(w);
+	Fl_Window_delete(w);
 	w = 0;
 
 	return 0;
diff --git a/Examples/test-suite/c/cpp_basic_template_class_runme.c b/Examples/test-suite/c/cpp_basic_template_class_runme.c
index f2aac8cd5..b4da41e64 100644
--- a/Examples/test-suite/c/cpp_basic_template_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_template_class_runme.c
@@ -2,12 +2,12 @@
 #include "cpp_basic_template_class/cpp_basic_template_class_wrap.h"
 
 int main() {
-	MyTemplateClass_Int *ci = new_MyTemplateClass_Int();
+	MyTemplateClass_Int *ci = MyTemplateClass_Int_new();
 
 	MyTemplateClass_Int_someMemberVariable_set(ci, 42);
 	assert(MyTemplateClass_Int_someMemberVariable_get(ci) == 42);
 
-	delete_MyTemplateClass_Int(ci);
+	MyTemplateClass_Int_delete(ci);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c
index e72a2fdee..82148bc7b 100644
--- a/Examples/test-suite/c/cpp_enum_runme.c
+++ b/Examples/test-suite/c/cpp_enum_runme.c
@@ -8,7 +8,7 @@ int main(int argc, const char *argv[]) {
 	int e = ENUM_ONE, *p;
 
 	// check the constructor's default value
-	StructWithEnums *s = new_StructWithEnums();
+	StructWithEnums *s = StructWithEnums_new();
 	assert(StructWithEnums_some_enum_get(s) == ENUM_ONE);
 
 	// check setter
@@ -43,9 +43,9 @@ int main(int argc, const char *argv[]) {
 	p = StructWithEnums_enum_test8(s);
 	assert(*p == ENUM_TWO);
 	
-	delete_StructWithEnums(s);
+	StructWithEnums_delete(s);
 
-	Foo *f = new_Foo();
+	Foo *f = Foo_new();
 
 	// check the constructor's default value
 	assert(Foo_hola_get(f) == Foo_Hello);
@@ -53,7 +53,7 @@ int main(int argc, const char *argv[]) {
 	Foo_hola_set(f, Foo_Hi);
 	assert(Foo_hola_get(f) == Foo_Hi);
 
-	delete_Foo(f);
+	Foo_delete(f);
 
 	//check C enum
 	hi = Hi;
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index 1d9e58e49..9233c2716 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -3,7 +3,7 @@
 #include "exception_order/exception_order_wrap.h"
 
 int main() {
-  A* a = new_A();
+  A* a = A_new();
 
   SWIG_try {
     A_foo(a);
diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index 7bb483f90..00e525a9c 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -7,7 +7,7 @@
 int main() {
   Op_sanity_check();
   
-  Op *op1 = new_Op_i(1), *op2 = new_Op_i(2), *op3 = copy_Op(op1);
+  Op *op1 = Op_new_i(1), *op2 = Op_new_i(2), *op3 = Op_copy(op1);
 
   assert(Op_NotEqual(op1, op2), "neq failed");
   Op_PlusPlusPrefix(op3);  
@@ -18,8 +18,8 @@ int main() {
   assert(3 == *Op_IndexInto(op3, Op_IndexIntoConst(op2, Op_Functor(op1))), "[] or () failed");
   assert(5 == Op_Functor_i(op3, 2), "f(x) failed");
   
-  delete_Op(op1);
-  delete_Op(op2);
-  delete_Op(op3);
+  Op_delete(op1);
+  Op_delete(op2);
+  Op_delete(op3);
   SWIG_exit(0);
 }
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0a1d549db..0027ac724 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -379,6 +379,14 @@ public:
     SWIG_typemap_lang("c");
     SWIG_config_file("c.swg");
 
+    // The default naming convention is to use new_Foo(), copy_Foo() and delete_Foo() for the default/copy ctor and dtor of the class Foo, but we prefer to
+    // start all Foo methods with the same prefix, so change this. Notice that new/delete are chosen to ensure that we avoid conflicts with the existing class
+    // methods, more natural create/destroy, for example, could result in errors if the class already had a method with the same name, but this is impossible
+    // for the chosen names as they're keywords in C++ ("copy" is still a problem but we'll just have to live with it).
+    Swig_name_register("construct", "%n%c_new");
+    Swig_name_register("copy", "%n%c_copy");
+    Swig_name_register("destroy", "%n%c_delete");
+
     allow_overloading();
   }
 

From 10d25c7327b7d959dbe5e322c7644c73654fc8c6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 23:09:34 +0200
Subject: [PATCH 282/508] Drop longjmp-based exception handling approach

Using longjmp was incompatible with using C++ objects in the code using the
wrappers, and using this C API from C++ to avoid ABI incompatibilities between
different C++ compilers is one of the main reasons for using this module.

Also, this required using a separate SwigObj instead of just using the real
object pointer which inevitably resulted in memory leaks whenever a non owned
object was returned from anywhere, e.g. from a member accessor or any method
returning pointer or reference.

Abandon the attempts to recreate C++ exceptions in C and just use a very
simple approach allowing to pass an error message out of band after any
function call in a global variable. An alternative could be to add a special
"out" error parameter to each and every function, but this risked being too
verbose, especially for the functions which don't really throw, and the calls
to SWIG_PendingException_get() won't need to be made explicitly when using a
C++ wrapper around the generated C API in the future.

This simplifies both the module and the generated code, in particular we don't
need any runtime code at all any more and there is no need for an extra level
of indirection for every object.

It also makes a couple more tests pass.
---
 Examples/c/exception/runme.c                  |  60 ++---
 Examples/test-suite/c/Makefile.in             |   3 -
 Examples/test-suite/c/exception_order_runme.c |  62 ++----
 Lib/c/c.swg                                   |  77 ++-----
 Lib/c/cexcept.swg                             | 206 +++---------------
 Lib/exception.i                               |  16 --
 Source/Modules/c.cxx                          |  81 +------
 7 files changed, 92 insertions(+), 413 deletions(-)

diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index 4094a9859..1a9277224 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -3,57 +3,41 @@
  */
 
 #include 
+#include 
 
 #include "example_wrap.h"
 
+static void show_exception(const char* prefix) {
+  SWIG_CException* ex = SWIG_PendingException_get();
+  assert(ex);
+  printf("%s exception: %s (%d)\n", prefix, SWIG_CException_msg_get(ex), SWIG_CException_code_get(ex));
+  SWIG_PendingException_reset();
+}
+
 int main() {
   Test *t = Test_new();
 
-  SWIG_try {
-    Test_unknown(t);
-  }
-  SWIG_catch(SWIG_AnyException) {
-    printf("incomplete type: %s\n", SWIG_exc.msg);
-  }
-  SWIG_endtry;
+  Test_unknown(t);
+  show_exception("Unknown");
 
-  SWIG_try {
-    Test_simple(t);
-  }
-  SWIG_catch(SWIG_AnyException) {
-    printf("%s\n", SWIG_exc.msg);
-  }
-  SWIG_endtry;
+  Test_simple(t);
+  show_exception("Int");
 
-  SWIG_try {
-    Test_message(t);
-  }
-  SWIG_catch(SWIG_AnyException) {
-    printf("%s\n", SWIG_exc.msg);
-  }
-  SWIG_endtry;
+  Test_message(t);
+  show_exception("String");
 
-  SWIG_try {
-    Test_hosed(t);
-  }
-  SWIG_catch(Exc) {
-    printf("%d %s\n", Exc_code_get(SWIG_exc.klass), 
-        Exc_msg_get(SWIG_exc.klass));
-  }
+  Test_hosed(t);
+  show_exception("Custom");
 
   int i;
   for (i = 0; i < 4; ++i) {
-    SWIG_try {
-      Test_multi(t, i);
+    Test_multi(t, i);
+    if (!SWIG_PendingException_get()) {
+        printf("Success for i=%d\n", i);
+    } else {
+        printf("For i=%d", i);
+        show_exception("");
     }
-    SWIG_catch(Exc) {
-      printf("%d %s\n", Exc_code_get(SWIG_exc.klass), 
-          Exc_msg_get(SWIG_exc.klass));
-    }
-    SWIG_catch(SWIG_AnyException) {
-      printf("%s\n", SWIG_exc.msg);
-    }
-    SWIG_endtry;
   }
 
   SWIG_exit(0);
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 857464a61..c3175ae5d 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -34,7 +34,6 @@ FAILING_C_TESTS := \
     lextype \
     li_carrays \
     li_cdata \
-    li_constraints \
     li_cpointer \
     nested \
     nested_extend_c \
@@ -88,12 +87,10 @@ FAILING_CPP_TESTS := \
     nested_class \
     nested_scope \
     nested_template_base \
-    overload_arrays \
     smart_pointer_extend \
     smart_pointer_not \
     smart_pointer_template_defaults_overload \
     struct_initialization_cpp \
-    template_arg_typename \
     template_basic \
     template_default \
     template_default_class_parms_typedef \
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index 9233c2716..5e7322872 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -5,60 +5,40 @@
 int main() {
   A* a = A_new();
 
-  SWIG_try {
-    A_foo(a);
-  }
-  SWIG_catch(E1) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
+  A_foo(a);
+  if (!SWIG_PendingException_get()) {
     fprintf(stderr, "foo: bad exception order\n");
+  } else {
+      SWIG_PendingException_reset();
   }
-  SWIG_endtry;
 
-  SWIG_try {
-    A_bar(a);
-  }
-  SWIG_catch(E2) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
+  A_bar(a);
+  if (!SWIG_PendingException_get()) {
     fprintf(stderr, "bar: bad exception order\n");
+  } else {
+      SWIG_PendingException_reset();
   }
-  SWIG_endtry;
 
-  SWIG_try {
-    A_foobar(a);
+  A_foobar(a);
+  if (!SWIG_PendingException_get()) {
+    fprintf(stderr, "foobar: bad exception order\n");
+  } else {
+      SWIG_PendingException_reset();
   }
-  SWIG_catch(SWIG_AnyException) {
-    if (strcmp(SWIG_exc.msg, "postcatch unknown") != 0) {
-      fprintf(stderr, "bad exception order\n");
-      SWIG_throw_msg(SWIG_exc.klass, SWIG_exc.msg);
-    }
-  }
-  SWIG_endtry;
 
-  SWIG_try {
-    A_barfoo(a, 1);
-  }
-  SWIG_catch(E1) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
+  A_barfoo(a, 1);
+  if (!SWIG_PendingException_get()) {
     fprintf(stderr, "barfoo(1): bad exception order\n");
+  } else {
+      SWIG_PendingException_reset();
   }
-  SWIG_endtry;
 
-  SWIG_try {
-    A_barfoo(a, 2);
-  }
-  SWIG_catch(E2) {
-
-  }
-  SWIG_catch(SWIG_AnyException) {
+  A_barfoo(a, 2);
+  if (!SWIG_PendingException_get()) {
     fprintf(stderr, "barfoo(2): bad exception order\n");
+  } else {
+      SWIG_PendingException_reset();
   }
-  SWIG_endtry;
 
   SWIG_exit(0);
 }
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index b4572d9b5..5d35b1bf4 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -14,8 +14,6 @@
 #include 
 #include 
 
-#define SWIG_STR2(x) #x
-#define SWIG_STR(x) SWIG_STR2(x)
 #define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else
 %}
 
@@ -140,12 +138,12 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
 }
 
 %typemap(in) SWIGTYPE {
-  $1 = *($1_ltype *) ($input->obj);
+  $1 = *($1_ltype *)$input;
 }
 
 %typemap(in) SWIGTYPE * {
   if ($input)
-    $1 = ($1_ltype) $input->obj;
+    $1 = ($1_ltype) $input;
 }
 
 %typemap(in) SWIGTYPE ** {
@@ -159,7 +157,7 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
     size_t i = 0;
     for ( ; i < $1_dim0; ++i)
       if ($input[i])
-        $1[i] = ($*1_ltype) $input[i]->obj;
+        $1[i] = ($*1_ltype) $input[i];
       else
         $1[i] = ($*1_ltype) 0;
   }
@@ -174,7 +172,7 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
     for ( ; i < $1_dim0; ++i) {
       for ( ; j < $1_dim1; ++j) {
         if ($input[i][j])
-          $1[i][j] = * ($*1_ltype) $input[i][j]->obj;
+          $1[i][j] = * ($*1_ltype) $input[i][j];
         else
           $1[i][j] = * ($*1_ltype) 0;
       }
@@ -191,14 +189,14 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
 
 %typemap(in) SWIGTYPE & {
   if ($input)
-    $1 = ($1_ltype) $input->obj;
+    $1 = ($1_ltype) $input;
   else
     $1 = ($1_ltype) 0;
 }
 
 %typemap(in) SWIGTYPE *& {
   if ($input)
-    $1 = ($1_ltype) &(*$input)->obj;
+    $1 = ($1_ltype) $input;
   else
     $1 = ($1_ltype) 0;
 }
@@ -220,16 +218,16 @@ same_action_all_primitive_types(out, "$result = $1;")
 }
 
 %typemap(out) SWIGTYPE *&, SWIGTYPE ** {
-  static SwigObj* _ptr = (SwigObj*) SWIG_create_object($1, SWIG_STR(($1_basetype)));
+  static SwigObj* _ptr = (SwigObj*) $1;
   $result = &_ptr;
 }
 
 %typemap(out) SWIGTYPE {
-  $result = (SwigObj*) SWIG_create_object(&$1, SWIG_STR(($1_basetype)));
+  $result = (SwigObj*) &$1;
 }
 
 %typemap(out) SWIGTYPE *, SWIGTYPE & {
-  $result = (SwigObj*) SWIG_create_object($1, SWIG_STR(($1_basetype)));
+  $result = (SwigObj*) $1;
 }
 
 %typemap(out) SWIGTYPE * [ANY], SWIGTYPE [ANY][ANY] {
@@ -238,13 +236,13 @@ same_action_all_primitive_types(out, "$result = $1;")
     size_t i = 0;
     if (_temp) {
         for ( ; i < $1_dim0; ++i)
-          SWIG_destroy_object< $1_ltype >(_temp[i]);
+          delete ($1_ltype *)_temp[i];
         free(_temp);
     }
     _temp = (SwigObj**) malloc($1_dim0 * sizeof(SwigObj*));
     for (i = 0 ; i < $1_dim0; ++i) {
       if ($1[i]) {
-        _temp[i] = SWIG_create_object($1[i], SWIG_STR(($1_ltype)));
+        _temp[i] = $1[i];
       }
       else
         _temp[i] = (SwigObj*) 0;
@@ -277,59 +275,18 @@ same_type_all_primitive_types_but_void(cppouttype);
 #ifdef SWIG_CPPMODE
 
 %insert("runtime") %{
-typedef struct {
-  void *obj;
-  const char* symname;
-  bool (*derives_from)(const char* type);
-} SwigObj;
-
-template  SWIGINTERN void SWIG_destroy_object(SwigObj* object) {
-  if (!object)
-    return;
-
-  delete static_cast(object->obj);
-
-  free(object);
-}
-
-template  struct SWIG_derives_from {
-  static bool check(const char* type) { return false; }
-};
-
-template  SWIGINTERN SwigObj* SWIG_create_object(T* obj, const char* symname) {
-  SwigObj* const result = (SwigObj*)malloc(sizeof(SwigObj));
-  if (result) {
-    result->obj = const_cast(static_cast(obj));
-    result->symname = symname;
-    result->derives_from = SWIG_derives_from::check;
-  }
-
-  return result;
-}
+typedef struct SwigObj SwigObj;
 %}
 
 %insert("cheader") %{
-    typedef struct SwigObjStruct SwigObj;
+typedef struct SwigObj SwigObj;
 %}
 
-  #ifdef SWIG_C_EXCEPT
-  
+#ifdef SWIG_C_EXCEPT
 %include "cexcept.swg"
-    
-  #else
-    
-%insert("runtime") %{
-#ifdef __cplusplus
-extern "C" {
-#endif
-SWIGEXPORTC int SWIG_exit(int code) { exit(code); }
-#ifdef __cplusplus
-}
-#endif
-%}
+#endif // SWIG_C_EXCEPT
 
-  #endif
-#else
+#endif // SWIG_CPPMODE
 
 %insert("runtime") %{
 #ifdef __cplusplus
@@ -340,5 +297,3 @@ SWIGEXPORTC int SWIG_exit(int code) { exit(code); }
 }
 #endif
 %}
-
-#endif
diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg
index dd3e6f15a..dc3709e8c 100644
--- a/Lib/c/cexcept.swg
+++ b/Lib/c/cexcept.swg
@@ -4,194 +4,44 @@
  * Exception handling code and typemaps for C module.
  * ----------------------------------------------------------------------------- */
 
-%typemap(throws) BASIC_INT_TYPES {
-  char error_msg[256];
-  sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
-  SWIG_CThrowException(0, error_msg);
-}
+%ignore SWIG_CException::SWIG_CException;
 
-%apply BASIC_INT_TYPES { int, long, short, unsigned int, unsigned long, unsigned short, int &, long &, short &, unsigned int &, unsigned long &, unsigned short & };
+%inline %{
+class SWIG_CException {
+public:
+  SWIG_CException(int code, const char* msg) : code(code), msg(strdup(msg)) { }
 
-%typemap(throws) char *, const char * {
-  SWIG_CThrowException(0, $1);
-}
+  const int code;
+  const char* const msg;
 
-// this should match only SwigObj objects
-%typemap(throws) SWIGTYPE {
-  SwigObj *c_ex;
-  c_ex = SWIG_create_object(&$1, SWIG_STR($1_basetype));
-  SWIG_CThrowException(c_ex, "C++ $1_type exception thrown");
-}
+private:
+  friend void SWIG_PendingException_reset();
 
-%typemap(throws) SWIGTYPE * {
-  SwigObj *c_ex;
-  c_ex = SWIG_create_object($1, SWIG_STR($1_basetype));
-  SWIG_CThrowException(c_ex, "C++ $1_type exception thrown");
-}
+  ~SWIG_CException() { free(const_cast(msg)); }
 
-%insert("runtime") %{
-#include 
+  SWIG_CException(const SWIG_CException& ex);
+  SWIG_CException& operator=(const SWIG_CException& ex);
+};
 
-SWIGINTERN void SWIG_terminate();
-
-#define SWIG_MAX_RT_STACK 256
-#define SWIG_REGISTRY_INIT 256
-
-SWIGEXPORTC struct SWIG_exc_struct {
-  int code;
-  char *msg;
-  SwigObj *klass;
-  int handled;
-} SWIG_exc = { 0, 0, 0, 0 };
-
-SWIGEXPORTC jmp_buf SWIG_rt_env;
-SWIGINTERN jmp_buf SWIG_cpp_back_env;
-SWIGINTERN jmp_buf *SWIG_rt_stack_base = 0;
-SWIGINTERN jmp_buf *SWIG_rt_stack_ptr = 0;
-
-SWIGINTERN void SWIG_rt_stack_push() {
-  if (!SWIG_rt_stack_base) {
-    SWIG_rt_stack_base = SWIG_rt_stack_ptr = (jmp_buf *) malloc(sizeof(jmp_buf) * SWIG_MAX_RT_STACK);
-    if ((SWIG_exc.code = setjmp(SWIG_rt_env))) {
-      // deallocate C++ exception
-      if (setjmp(SWIG_rt_env) == 0) {
-        SWIG_rt_stack_push();
-        SWIG_exc.handled = 1;
-        longjmp(SWIG_cpp_back_env, 1);
-      }
-      SWIG_terminate();
-    }
-  }
-
-  // TODO: check for stack overflow
-  memcpy(SWIG_rt_stack_ptr, SWIG_rt_env, sizeof(SWIG_rt_env));
-  SWIG_rt_stack_ptr++;
-}
-
-SWIGINTERN void SWIG_rt_stack_pop() {
-  if (SWIG_rt_stack_ptr == SWIG_rt_stack_base)
-    return;
-  SWIG_rt_stack_ptr--;
-  memcpy(SWIG_rt_env, SWIG_rt_stack_ptr, sizeof(SWIG_rt_env));
-}
-
-SWIGINTERN void SWIG_cleanup() {
-  if (SWIG_rt_stack_base)
-    free(SWIG_rt_stack_base);
-  if (SWIG_exc.msg)
-   free(SWIG_exc.msg);
-  if (SWIG_exc.klass) {
-    free(SWIG_exc.klass);
+static SWIG_CException *SWIG_PendingException = 0;
+inline SWIG_CException* SWIG_PendingException_get() { return SWIG_PendingException; }
+inline void SWIG_PendingException_reset() {
+  if (SWIG_PendingException) {
+    delete SWIG_PendingException;
+    SWIG_PendingException = 0;
   }
 }
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SWIGEXPORTC void SWIG_rt_try() {
-  SWIG_rt_stack_push();
-}
-
-SWIGEXPORTC int SWIG_rt_catch(const char *type) {
-  int result = 0;
-  if (!type || (strcmp("SWIG_AnyException", type) == 0)) {
-    result = 1;
-  }
-  else if (SWIG_exc.klass) {
-    result = strcmp(SWIG_exc.klass->symname, type) == 0 || SWIG_exc.klass->derives_from(type);
-  }
-  if (result) {
-    SWIG_rt_stack_pop();
-    SWIG_exc.handled = 1;
-  }
-  return result;
-}
-
-SWIGEXPORTC void SWIG_rt_throw(SwigObj *klass, const char *msg) {
-  if (SWIG_exc.msg) {
-    free(SWIG_exc.msg);
-    SWIG_exc.msg = (char *) 0;
-  }
-  if (msg) {
-    SWIG_exc.msg = (char *) malloc(strlen(msg) + 1);
-    strcpy(SWIG_exc.msg, msg);
-  }
-  SWIG_exc.klass = klass;
-  SWIG_exc.handled = 0;
-  longjmp(SWIG_rt_env, 1);
-}
-
-SWIGEXPORTC void SWIG_rt_unhandled() {
-  if (SWIG_exc.msg) { 
-    free(SWIG_exc.msg);
-    SWIG_exc.msg = 0;
-  }
-  SWIG_rt_stack_pop();
-  longjmp(SWIG_rt_env, SWIG_exc.code);
-}
-
-SWIGEXPORTC void SWIG_rt_endtry() {
-  if (SWIG_exc.handled) {
-    if (setjmp(SWIG_rt_env) == 0) {
-      SWIG_rt_stack_push();
-      longjmp(SWIG_cpp_back_env, 1);
-    }
-  }
-  else {
-    SWIG_rt_stack_pop();  // pop the SWIG_try context
-  }
-}
-
-SWIGEXPORTC int SWIG_exit(int code) {
-  SWIG_cleanup();
-  exit(code);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-SWIGINTERN void SWIG_terminate() {
-  fprintf(stderr, "Unhandled exception: %s\n%s\nExitting...\n", 
-    typeid(*SWIG_exc.klass).name(),
-    SWIG_exc.msg ? SWIG_exc.msg : "");
-  SWIG_exit(SWIG_exc.code);
-}
-
-#define SWIG_CThrowException(klass, msg) \
-  if (setjmp(SWIG_cpp_back_env) == 0) \
-    SWIG_rt_throw((SwigObj *) klass, msg);
 %}
 
-%insert("cheader") %{
-// special value indicating any type of exception like 'catch(...)'
-#define SWIG_AnyException "SWIG_AnyException"
+%insert("runtime") "swigerrors.swg"
 
-#include 
+#define SWIG_exception(code, msg)\
+  SWIG_PendingException = new SWIG_CException(code, msg)
 
-SWIGIMPORT jmp_buf SWIG_rt_env;
-
-SWIGIMPORT struct SWIG_exc_struct {
-  int code;
-  char *msg;
-  SwigObj *klass;
-} SWIG_exc;
-
-SWIGIMPORT void SWIG_rt_try();
-SWIGIMPORT int SWIG_rt_catch(const char *type);
-SWIGIMPORT void SWIG_rt_throw(SwigObj *klass, const char * msg);
-SWIGIMPORT int SWIG_rt_unhandled();
-SWIGIMPORT void SWIG_rt_endtry();
-SWIGIMPORT int SWIG_exit(int code);
-
-#define SWIG_try \
-  SWIG_rt_try(); \
-  if ((SWIG_exc.code = setjmp(SWIG_rt_env)) == 0) 
-#define SWIG_catch(type) else if (SWIG_rt_catch(#type))
-#define SWIG_throw(klass) SWIG_rt_throw((SwigObj *) klass, 0);
-#define SWIG_throw_msg(klass, msg) SWIG_rt_throw((SwigObj *) klass, msg);
-#define SWIG_endtry else SWIG_rt_unhandled(); SWIG_rt_endtry();
-
-%}
+%typemap(throws, noblock="1") char *, const char * {
+  SWIG_exception(SWIG_RuntimeError, $1);
+}
 
+%typemap(throws, noblock="1") SWIGTYPE {
+  SWIG_exception(SWIG_UnknownError, "exception of type $1_type");
+}
diff --git a/Lib/exception.i b/Lib/exception.i
index 5f891bb23..437eee6f0 100644
--- a/Lib/exception.i
+++ b/Lib/exception.i
@@ -205,22 +205,6 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
 
 #endif // SWIGLUA
 
-#ifdef SWIGC
-
-%inline %{
-struct SWIG_CException {
-  SWIG_CException(int code) {
-    SWIG_exc.code = code;
-  }
-};
-%}
-
-#define SWIG_exception(code, msg)\
-  SwigObj *_ex = SWIG_create_object(new SWIG_CException(code), "SWIG_CException"); \
-  SWIG_CThrowException(_ex, msg);
-
-#endif // SWIGC
-
 #ifdef SWIGD
 %{
 SWIGINTERN void SWIG_DThrowException(int code, const char *msg) {
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0027ac724..6d8f04d43 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -129,17 +129,12 @@ class C:public Language {
   String *int_string;
   String *tl_namespace; // optional top level namespace
 
-  // Contains fully expanded names of the classes for which we have already specialized SWIG_derives_from<>.
-  Hash *already_specialized_derives_from;
-
   // If non-null, contains wrap:action code to be used in the next functionWrapper() call.
   String *special_wrap_action;
 
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
 
-  bool except_flag;
-
   // Selects between the wrappers (public) declarations and (private) definitions.
   enum output_target {
     output_wrapper_decl,
@@ -156,9 +151,8 @@ public:
     empty_string(NewString("")),
     int_string(NewString("int")),
     tl_namespace(NULL),
-    already_specialized_derives_from(NULL),
-    special_wrap_action(NULL),
-    except_flag(true) {
+    special_wrap_action(NULL)
+  {
   }
 
 
@@ -350,6 +344,7 @@ public:
    * ------------------------------------------------------------ */
 
   virtual void main(int argc, char *argv[]) {
+    bool except_flag = CPlusPlus;
 
     // look for certain command line options
     for (int i = 1; i < argc; i++) {
@@ -363,9 +358,6 @@ public:
       }
     }
 
-    if (!CPlusPlus) 
-      except_flag = false;
-
     // add a symbol to the parser for conditional compilation
     Preprocessor_define("SWIGC 1", 0);
     if (except_flag)
@@ -1053,12 +1045,6 @@ ready:
             Append(wrapper->code, action);
        }
 
-       String *except = Getattr(n, "feature:except");
-       if (Getattr(n, "throws") || except) {
-            if (!except || (Cmp(except, "0") != 0))
-              Printf(wrapper->code, "if (SWIG_exc.handled) {\nSWIG_rt_stack_pop();\nlongjmp(SWIG_rt_env, 1);\n}\n");
-       }
-
        // insert cleanup code
        for (p = parms; p; ) {
             String *tm;
@@ -1319,10 +1305,6 @@ ready:
     if (CPlusPlus) {
       // inheritance support: attach all members from base classes to this class
       if (List *baselist = Getattr(n, "bases")) {
-	// We may need to specialize SWIG_derives_from<> for this class: its unique check() method will return true iff it's given the name of any subclasses of
-	// this class. Notice that it may happen that all our base classes are ignored, in which case we don't do anything.
-	int specialize_derives_from = -1;
-
 	Iterator i;
 	for (i = First(baselist); i.item; i = Next(i)) {
 	  // look for member variables and functions
@@ -1362,51 +1344,6 @@ ready:
 	      }
 	    }
 	  }
-
-	  // Account for this base class in the RTTI checks.
-	  String* const name = Getattr(i.item, "sym:name");
-	  if (name) {
-	    if (specialize_derives_from == -1) {
-	      // Check if we hadn't specialized it already. Somewhat surprisingly, this can happen for an instantiation of a template with default parameter(s)
-	      // if it appears both without them and with the default values explicitly given as it happens in e.g. template_default2 unit test.
-	      SwigType* const fulltype = Swig_symbol_template_deftype(Getattr(n, "name"), NULL);
-	      String* const fulltype_str = SwigType_str(fulltype, NULL);
-	      Delete(fulltype);
-
-	      if (!already_specialized_derives_from || !Getattr(already_specialized_derives_from, fulltype_str)) {
-		if (!already_specialized_derives_from) {
-		  already_specialized_derives_from = NewHash();
-		}
-
-		Setattr(already_specialized_derives_from, fulltype_str, "1");
-
-		Printv(f_wrappers_cxx,
-		    "template<> struct SWIG_derives_from< ", fulltype_str, " > {\n",
-		    cindent, "static bool check(const char* type) {\n",
-		    cindent, cindent, "return ",
-		    NIL);
-
-		specialize_derives_from = true;
-	      } else {
-		specialize_derives_from = false;
-	      }
-
-	      Delete(fulltype_str);
-	    }
-	    else if (specialize_derives_from) {
-	      // Continue the already started specialization.
-	      Printv(f_wrappers_cxx, " ||\n", cindent, cindent, NIL);
-	    }
-
-	    if (specialize_derives_from) {
-	      Printv(f_wrappers_cxx, "strcmp(type, \"", name, "\") == 0", NIL);
-	    }
-	  }
-	}
-
-	if (specialize_derives_from == true) {
-	  // End SWIG_derives_from specialization.
-	  Printv(f_wrappers_cxx, ";\n  }\n};\n\n", NIL);
 	}
       }
 
@@ -1532,7 +1469,6 @@ ready:
   virtual int constructorHandler(Node *n) {
     Node *klass = Swig_methodclass(n);
     String *classname = Getattr(klass, "classtype");
-    String *newclassname = Getattr(klass, "sym:name");
 
     bool const is_copy_ctor = Getattr(n, "copy_constructor");
     String *arg_lnames;
@@ -1544,12 +1480,7 @@ ready:
     }
 
     // TODO-C: We need to call the extension ctor here instead of hard-coding "new classname".
-    special_wrap_action = NewStringf(
-	"result = SWIG_create_object(new %s%s, \"%s\");",
-	classname,
-	arg_lnames,
-	newclassname
-      );
+    special_wrap_action = NewStringf("result = (SwigObj*)new %s%s;", classname, arg_lnames);
 
     Delete(arg_lnames);
 
@@ -1564,9 +1495,7 @@ ready:
     Node *klass = Swig_methodclass(n);
 
     // TODO-C: We need to use the extension dtor here if one is defined.
-    special_wrap_action = NewStringf(
-	"SWIG_destroy_object< %s >(carg1);", Getattr(klass, "classtype")
-      );
+    special_wrap_action = NewStringf("delete (%s *)carg1;", Getattr(klass, "classtype"));
 
     return Language::destructorHandler(n);
   }

From dfac9ce32542128aabb1e2538e7c2d4b78894be6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 23:40:35 +0200
Subject: [PATCH 283/508] Show how to handle a custom exception class in the
 example

Define "throws" typemap for it.
---
 Examples/c/exception/example.i | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Examples/c/exception/example.i b/Examples/c/exception/example.i
index 75700b305..7d34fc051 100644
--- a/Examples/c/exception/example.i
+++ b/Examples/c/exception/example.i
@@ -5,6 +5,10 @@
 #include "example.h"
 %}
 
+%typemap(throws, noblock="1") Exc {
+  SWIG_exception(SWIG_RuntimeError, $1.msg);
+}
+
 /* Let's just grab the original header file here */
 %include "example.h"
 

From 55f7d51979068efd5731ea471de3cce4fc5501f4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 23:40:59 +0200
Subject: [PATCH 284/508] Fix memory leak in the exception example

Delete the object we allocate.
---
 Examples/c/exception/runme.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index 1a9277224..dff0b7e2a 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -40,6 +40,8 @@ int main() {
     }
   }
 
+  Test_delete(t);
+
   SWIG_exit(0);
 }
 

From a6f53d18ea84acdc01fa8652ec9d25904eafc201 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 22 Apr 2016 23:48:31 +0200
Subject: [PATCH 285/508] Fix memory leak in std::vector example

Delete the object we allocate.
---
 Examples/c/std_vector/runme.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index b29ffa14a..d80ecc21c 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -28,6 +28,7 @@ int main() {
   for (i = 0; i < 10; i++) {
     A *a = A_new_std_string_i("hello", i);
     VA_push_back(va, a);
+    A_delete(a);
   }
     
   for (i = 0; i < VA_size(va); i++) {

From d3412499bb2a3f80b76a530699c8baea445e33bd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 23 Apr 2016 01:20:28 +0200
Subject: [PATCH 286/508] Use the original function name in C code wrappers

Using "sym:name" in the wrapping code is wrong, it is different from "name" if
the function has been renamed and we need to call the original C function, not
whichever name it is exported under.
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6d8f04d43..916875a3b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -694,7 +694,7 @@ ready:
             Printv(wrapper->code, return_type, " result;\n", NIL);
             Printf(wrapper->code, "result = ");
        }
-       Printv(wrapper->code, name, "(", arg_names, ");\n", NIL);
+       Printv(wrapper->code, Getattr(n, "name"), "(", arg_names, ");\n", NIL);
        Append(wrapper->code, append_feature(n));
        if (!is_void_return)
          Printf(wrapper->code, "return result;\n");

From bca00c65dddb926df9aa7488502e16ea20020cb3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 23 Apr 2016 01:30:35 +0200
Subject: [PATCH 287/508] Implement cdata typemaps for C

Just use the struct directly in the C wrappers.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Lib/cdata.i                       | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index c3175ae5d..b4b80a2d3 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -33,7 +33,6 @@ FAILING_C_TESTS := \
     function_typedef \
     lextype \
     li_carrays \
-    li_cdata \
     li_cpointer \
     nested \
     nested_extend_c \
diff --git a/Lib/cdata.i b/Lib/cdata.i
index b9b8e1887..23e552cf9 100644
--- a/Lib/cdata.i
+++ b/Lib/cdata.i
@@ -21,6 +21,28 @@ typedef struct SWIGCDATA {
 }
 %typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH);
 
+#elif SWIGC
+
+%insert("cheader") {
+typedef struct SWIGCDATA {
+    char *data;
+    int   len;
+} SWIGCDATA;
+}
+
+%typemap(ctype) SWIGCDATA "SWIGCDATA"
+%typemap(cppouttype) SWIGCDATA "SWIGCDATA"
+
+%typemap(out) SWIGCDATA {
+    $result = $1;
+}
+
+%typemap(ctype) (const void *indata, int inlen) "const SWIGCDATA*"
+%typemap(in) (const void *indata, int inlen) {
+    $1 = $input->data;
+    $2 = $input->len;
+}
+
 #elif SWIGCHICKEN
 
 %typemap(out) SWIGCDATA {

From 0c936d90894fd639b38c488c5a30fa948194f140 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 23 Apr 2016 02:34:52 +0200
Subject: [PATCH 288/508] Simplify and inline functionWrapperAddCPPResult()

This function seemed to be doing a few unnecessary things, e.g. it resolved
the typedefs which doesn't seem to be necessary and the test for member
pointer seems to be useless too.

Just add a local "cppresult" directly in the caller instead of using a
separate function to do all this.
---
 Source/Modules/c.cxx | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 916875a3b..10cdd50fc 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -740,20 +740,6 @@ ready:
        Delete(over_suffix);
     }
 
-  static void functionWrapperAddCPPResult(Wrapper *wrapper, const SwigType *type, const String *tm)
-    {
-       SwigType *cpptype;
-       SwigType *tdtype = SwigType_typedef_resolve_all(tm);
-       if (tdtype)
-         cpptype = tdtype;
-       else
-         cpptype = (SwigType*)tm;
-       if (SwigType_ismemberpointer(type))
-         Wrapper_add_local(wrapper, "cppresult", SwigType_str(type, "cppresult"));
-       else
-         Wrapper_add_local(wrapper, "cppresult", SwigType_str(cpptype, "cppresult"));
-    }
-
   String *get_wrapper_func_return_type(output_target target, Node *n)
     {
        SwigType *type = Getattr(n, "type");
@@ -932,9 +918,8 @@ ready:
 
        // add variable for holding result of original function 'cppresult'
        if (!is_void_return && !is_ctor) {
-            String *tm;
-            if ((tm = Swig_typemap_lookup("cppouttype", n, "", 0))) {
-                 functionWrapperAddCPPResult(wrapper, type, tm);
+            if (String *tm = Swig_typemap_lookup("cppouttype", n, "", 0)) {
+		 Wrapper_add_local(wrapper, "cppresult", SwigType_str(tm, "cppresult"));
                  return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1");
             }
             else {

From 1912fd3a424c48d2d1a9ef7812631e5b3faee487 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 24 Apr 2016 22:41:24 +0200
Subject: [PATCH 289/508] Suppress a warning in abstract_typedef unit test

Use an explicit cast to cast from derived to base, there is no better solution
currently.
---
 Examples/test-suite/c/abstract_typedef_runme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/c/abstract_typedef_runme.c b/Examples/test-suite/c/abstract_typedef_runme.c
index 62c4c65d5..134738748 100644
--- a/Examples/test-suite/c/abstract_typedef_runme.c
+++ b/Examples/test-suite/c/abstract_typedef_runme.c
@@ -6,7 +6,7 @@ int main(int argc, const char *argv[]) {
 	Engine *e = Engine_new();
 	A *a = A_new();
 
-	assert(AbstractBaseClass_write(a, e) == true);
+	assert(AbstractBaseClass_write((AbstractBaseClass*)a, e) == true);
 
 	A_delete(a);
 	Engine_delete(e);

From 8fa28e0ce9c59d2cf42eee938f8bcc30ea8196dd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 24 Apr 2016 22:47:51 +0200
Subject: [PATCH 290/508] Don't lose the correct sym:name when inheriting base
 class methods

For some reason, the copy of the function made in the derived class used the
"name" attribute instead of "sym:name", which means that any %renames attached
to it were lost and didn't affect the derived class version.

Fix this and also a problem uncovered by doing it in the operator_overload
unit test as the assignment operator shouldn't be inherited at all, the
compiler-generated operator is used instead if the derived class doesn't
define its own one.
---
 Source/Modules/c.cxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 10cdd50fc..fe68c1489 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1299,6 +1299,8 @@ ready:
 		|| (Cmp(Getattr(node, "kind"), "function") == 0)) {
 	      if ((Cmp(Getattr(node, "access"), "public") == 0)
 		  && (Cmp(Getattr(node, "storage"), "static") != 0)) {
+		  // Assignment operators are not inherited in C++.
+		  if (Cmp(Getattr(node, "name"), "operator =") != 0) {
 		    Node *new_node = copy_node(node);
 		    String *parent_name = Getattr(parentNode(node), "name");
 		    Hash *dupl_name_node = is_in(Getattr(node, "name"), n);
@@ -1306,14 +1308,14 @@ ready:
 		    // inheritance, change both names to avoid ambiguity
 		    if (dupl_name_node) {
 		      String *cif = Getattr(dupl_name_node, "c:inherited_from");
-		      String *old_name = Getattr(dupl_name_node, "name");
+		      String *old_name = Getattr(dupl_name_node, "sym:name");
 		      if (cif && parent_name && (Cmp(cif, parent_name) != 0)) {
-			Setattr(dupl_name_node, "name", NewStringf("%s%s", cif ? cif : "", old_name));
+			Setattr(dupl_name_node, "sym:name", NewStringf("%s%s", cif ? cif : "", old_name));
 			Setattr(dupl_name_node, "c:base_name", old_name);
 			Setattr(new_node, "name", NewStringf("%s%s", parent_name, old_name));
 			Setattr(new_node, "c:base_name", old_name);
 			Setattr(new_node, "c:inherited_from", parent_name);
-			Setattr(new_node, "sym:name", Getattr(new_node, "name"));
+			Setattr(new_node, "sym:name", Getattr(node, "sym:name"));
 			Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
 			set_nodeType(new_node, "cdecl");
 			appendChild(n, new_node);
@@ -1321,11 +1323,12 @@ ready:
 		    }
 		    else {
 		      Setattr(new_node, "c:inherited_from", parent_name);
-		      Setattr(new_node, "sym:name", Getattr(new_node, "name"));
+		      Setattr(new_node, "sym:name", Getattr(node, "sym:name"));
 		      Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
 		      set_nodeType(new_node, "cdecl");
 		      appendChild(n, new_node);
 		    }
+		  }
 	      }
 	    }
 	  }

From f533e3c488da6e5431cef6e6e428619e533ad3f4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 25 Apr 2016 22:22:27 +0200
Subject: [PATCH 291/508] Pass const references to primitive types by value

Change the typemaps to use values, not pointers, for arguments of "T const&"
type, this is much more natural in C.
---
 Lib/c/c.swg | 58 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 5d35b1bf4..339259d6f 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -37,13 +37,15 @@ macro_name(TM, size_t);
 %enddef
 
 // This is used to handle all primitive types as just themselves.
+// This macro doesn't cover const references, use either cref_as_value or
+// cref_as_ptr below in addition to it.
 // Notice that const pointers are mapped to non-const ones as we need to
 // declare variables of this type when it's used as a return type, and top
 // level const doesn't matter anyhow in the function declarations.
 %define same_type(TM, T)
 %typemap(TM) T, const T "T"
 %typemap(TM) T*, T&, T[ANY], T[] "T *"
-%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *"
+%typemap(TM) const T*, const T[ANY], const T[] "const T *"
 %typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **"
 %typemap(TM) const T**, const T*&, T *const &, const T*[ANY], const T[ANY][ANY] "const T **"
 // constant pointers
@@ -52,15 +54,23 @@ macro_name(TM, size_t);
 %typemap(TM) const T* * const "const T* *"
 %enddef
 
+%define cref_as_value(TM, T)
+%typemap(TM) const T& "T"
+%enddef
+
+%define cref_as_ptr(TM, T)
+%typemap(TM) const T& "T *"
+%enddef
+
 %define same_type_all_primitive_types_but_void(TM)
-same_macro_all_primitive_types_but_void(same_type,TM);
 %enddef
 
 //Used by 'in' and 'out' typemaps
-%define same_action(TM, T, ACTION)
+%define same_action(TM, T, ACTION, ACTION_CREF)
 %typemap(TM) T, const T ACTION
+%typemap(TM) const T& ACTION_CREF
 %typemap(TM) T*, T&, T[ANY], T[] ACTION
-%typemap(TM) const T&, const T*, const T[ANY], const T[] ACTION
+%typemap(TM) const T*, const T[ANY], const T[] ACTION
 %typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] ACTION
 %typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] ACTION
 // constant pointers
@@ -69,22 +79,22 @@ same_macro_all_primitive_types_but_void(same_type,TM);
 %typemap(TM) const T* * const ACTION
 %enddef
 
-%define same_action_all_primitive_types(TM, ACTION)
-same_action(TM, short, ACTION);
-same_action(TM, unsigned short, ACTION);
-same_action(TM, int, ACTION);
-same_action(TM, unsigned int, ACTION);
-same_action(TM, long, ACTION);
-same_action(TM, unsigned long, ACTION);
-same_action(TM, long long, ACTION);
-same_action(TM, unsigned long long, ACTION);
-same_action(TM, char, ACTION);
-same_action(TM, signed char, ACTION);
-same_action(TM, unsigned char, ACTION);
+%define same_action_all_primitive_types(TM, ACTION, ACTION_CREF)
+same_action(TM, short, ACTION, ACTION_CREF);
+same_action(TM, unsigned short, ACTION, ACTION_CREF);
+same_action(TM, int, ACTION, ACTION_CREF);
+same_action(TM, unsigned int, ACTION, ACTION_CREF);
+same_action(TM, long, ACTION, ACTION_CREF);
+same_action(TM, unsigned long, ACTION, ACTION_CREF);
+same_action(TM, long long, ACTION, ACTION_CREF);
+same_action(TM, unsigned long long, ACTION, ACTION_CREF);
+same_action(TM, char, ACTION, ACTION_CREF);
+same_action(TM, signed char, ACTION, ACTION_CREF);
+same_action(TM, unsigned char, ACTION, ACTION_CREF);
 //unsigned only
-same_action(TM, float, ACTION);
-same_action(TM, double, ACTION);
-same_action(TM, size_t, ACTION);
+same_action(TM, float, ACTION, ACTION_CREF);
+same_action(TM, double, ACTION, ACTION_CREF);
+same_action(TM, size_t, ACTION, ACTION_CREF);
 %typemap(TM) void*, void const* ACTION
 %enddef
 
@@ -99,7 +109,8 @@ same_action(TM, size_t, ACTION);
 %typemap(ctype) void* * const "void* * const"
 %typemap(ctype) const void* * const "const void* * const"
 
-same_type_all_primitive_types_but_void(ctype);
+same_macro_all_primitive_types_but_void(same_type,ctype);
+same_macro_all_primitive_types_but_void(cref_as_value,ctype);
 
 // objects
 %typemap(ctype) SWIGTYPE      "$&resolved_type*"
@@ -117,7 +128,7 @@ same_type_all_primitive_types_but_void(ctype);
 %typemap(ctype, fragment="stdbool_inc") const bool & "const $1_ltype"
 
 // Typemaps for assigning wrapper parameters to local variables
-same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
+same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
 
 %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;"
 %typemap(in) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;"
@@ -203,7 +214,7 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;")
 
 
 // Typemaps for assigning result values to a special return variable
-same_action_all_primitive_types(out, "$result = $1;")
+same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
 
 %typemap(out) void ""
 
@@ -254,7 +265,8 @@ same_action_all_primitive_types(out, "$result = $1;")
 }
 
 // typemaps for 'cppresult'
-same_type_all_primitive_types_but_void(cppouttype);
+same_macro_all_primitive_types_but_void(same_type,cppouttype);
+same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
 
 %typemap(cppouttype, retobj="1") SWIGTYPE      "$1_ltype *"
 %typemap(cppouttype) SWIGTYPE *    "$1_ltype"

From 8eba14c6e010d247dd50d01f44c871cf9791cd1c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 14:21:51 +0200
Subject: [PATCH 292/508] Resolve typedefs in parameter types after applying
 ctype typemap

Typedefs were not resolved for non-object types in spite of
SwigType_typedef_resolve_all() call as it didn't affect "c_parm_type".

Actually it is not even clear if resolving typedefs is a good idea as using
them probably makes the generated code more clear, but at least in the case of
nested typedefs we do need to do it as "Class::Type" can't appear in C code.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Source/Modules/c.cxx              | 12 ++++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index b4b80a2d3..7deaa0dfa 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -53,7 +53,6 @@ FAILING_CPP_TESTS := \
     arrays_global_twodim \
     char_strings \
     constant_pointers \
-    default_arg_values \
     default_args \
     default_constructor \
     director_enum \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index fe68c1489..5fd2d0540 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -817,16 +817,20 @@ ready:
             String *c_parm_type = 0;
             String *arg_name = NewString("");
 
-            SwigType *tdtype = SwigType_typedef_resolve_all(type);
-            if (tdtype)
-              type = tdtype;
-
             Printf(arg_name, "c%s", lname);
 
 	    if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
 		 c_parm_type = Copy(tm);
 		 substituteResolvedType(wrapper ? output_wrapper_def : output_wrapper_decl, type, c_parm_type);
 
+		 // We prefer to keep typedefs in the wrapper functions signatures as it makes them more readable, but we can't do it for nested typedefs as
+		 // they're not valid in C, so resolve them in this case.
+		 if (strstr(Char(c_parm_type), "::")) {
+		   SwigType* const tdtype = SwigType_typedef_resolve_all(c_parm_type);
+		   Delete(c_parm_type);
+		   c_parm_type = tdtype;
+		 }
+
 		 // template handling
 		 Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
 	    }

From 29563ec98e288c2526db1987e85443db45e9cdd3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 14:41:55 +0200
Subject: [PATCH 293/508] Fix typemaps for bool

The existing typemaps didn't make much sense, simplify (there doesn't seem to
be any point in using $1_basetype when dealing with "bool") them and treat
"const bool&" as "bool", not as pointer, as this is much more convenient in C.

This also allows another unit test to pass.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Lib/c/c.swg                       | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 7deaa0dfa..9c7245e97 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -91,7 +91,6 @@ FAILING_CPP_TESTS := \
     struct_initialization_cpp \
     template_basic \
     template_default \
-    template_default_class_parms_typedef \
     template_enum \
     template_explicit \
     template_typedef_fnc \
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 339259d6f..4447e9fa8 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -123,9 +123,8 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype);
 %typemap(ctype) enum SWIGTYPE "int"
 %typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
 
-%typemap(ctype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
-%typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
-%typemap(ctype, fragment="stdbool_inc") const bool & "const $1_ltype"
+%typemap(ctype, fragment="stdbool_inc") bool, const bool, const bool & "bool"
+%typemap(ctype, fragment="stdbool_inc") bool *, const bool *, bool & "bool *"
 
 // Typemaps for assigning wrapper parameters to local variables
 same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
@@ -280,9 +279,8 @@ same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
 %typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
 %typemap(cppouttype) SWIGTYPE (CLASS::*) "$1_ltype"
 
-%typemap(cppouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
-%typemap(cppouttype, fragment="stdbool_inc") bool & "$1_basetype*"
-%typemap(cppouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
+%typemap(cppouttype, fragment="stdbool_inc") bool, const bool, const bool & "bool"
+%typemap(cppouttype, fragment="stdbool_inc") bool *, const bool *, bool & "bool *"
 
 #ifdef SWIG_CPPMODE
 

From d89a95a48ce08a7d37e2b9f049102c608375096b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 14:47:36 +0200
Subject: [PATCH 294/508] Use std/std_vector.i instead of a poor copy in
 c/std_vector.i

At the very least, this gives us a working vector and allows
"li_std_vector" unit test to pass. It is also just nice to reuse the existing
typemaps instead of having another copy of them.

As C doesn't have UTL, some parts of std_vector.i had to be excluded from it
however.
---
 Examples/c/std_vector/runme.c     |  4 +-
 Examples/test-suite/c/Makefile.in |  1 -
 Lib/c/std_alloc.i                 |  1 +
 Lib/c/std_common.i                |  4 ++
 Lib/c/std_container.i             |  1 +
 Lib/c/std_vector.i                | 67 +++++--------------------------
 Lib/std/std_vector.i              |  9 ++++-
 7 files changed, 27 insertions(+), 60 deletions(-)
 create mode 100644 Lib/c/std_alloc.i
 create mode 100644 Lib/c/std_container.i

diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index d80ecc21c..07456064e 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -17,7 +17,7 @@ int main() {
   printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint));
   
   for (i = 0; i < Vint_size(vint); i++)
-    printf("%d%c", Vint_at(vint, i), i+1 == Vint_size(vint) ? '\n' : ',');
+    printf("%d%c", Vint_get(vint, i), i+1 == Vint_size(vint) ? '\n' : ',');
   
   Vint_clear(vint); 
   Vint_reserve(vint, 100);
@@ -32,7 +32,7 @@ int main() {
   }
     
   for (i = 0; i < VA_size(va); i++) {
-    A *a = VA_at(va, i);
+    A *a = VA_get(va, i);
     printf("%s %d\n", A_name_get(a), A_value_get(a));
   }
   
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 9c7245e97..972721ed0 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -76,7 +76,6 @@ FAILING_CPP_TESTS := \
     li_std_map \
     li_std_pair \
     li_std_pair_using \
-    li_std_vector \
     li_windows \
     member_funcptr_galore \
     member_pointer \
diff --git a/Lib/c/std_alloc.i b/Lib/c/std_alloc.i
new file mode 100644
index 000000000..35dc051be
--- /dev/null
+++ b/Lib/c/std_alloc.i
@@ -0,0 +1 @@
+%include 
diff --git a/Lib/c/std_common.i b/Lib/c/std_common.i
index c21a2e564..1fbcdbc9b 100644
--- a/Lib/c/std_common.i
+++ b/Lib/c/std_common.i
@@ -1,3 +1,7 @@
+%include 
+%include 
+%include 
+
 %include 
 
 %apply size_t { std::size_t };
diff --git a/Lib/c/std_container.i b/Lib/c/std_container.i
new file mode 100644
index 000000000..7a265f328
--- /dev/null
+++ b/Lib/c/std_container.i
@@ -0,0 +1 @@
+%include 
diff --git a/Lib/c/std_vector.i b/Lib/c/std_vector.i
index 509758120..8b433ad7d 100644
--- a/Lib/c/std_vector.i
+++ b/Lib/c/std_vector.i
@@ -1,58 +1,13 @@
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * std_vector.i
- * ----------------------------------------------------------------------------- */
+// Wrap const and non-const at() methods as set() and get(), this is simpler to use from C and more clear.
+%define %swig_vector_methods(Type...)
+  %extend {
+    void set(size_type n, const value_type& val) { self->at(n) = val; }
+    value_type get(size_type n) const { return self->at(n); }
+  }
+%enddef
 
-%include 
-
-%{
-#include 
-#include 
-%}
-
-namespace std {
-    
-    template class vector {      
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        typedef const value_type& const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        bool empty() const;
-        void clear();
-        void push_back(const value_type& x);
-        const_reference at(size_type i);
-    };
-    
-    %define specialize_std_vector(T)
-    template<> class vector {
-      public:
-        typedef size_t size_type;
-        typedef T value_type;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        bool empty() const;
-        void clear();
-        void push_back(T x) { this->push_back(x); }
-        T at(size_type i) { return this->at(i); }
-    };
-    %enddef
-    
-    specialize_std_vector(int);
-    specialize_std_vector(bool);
-    /*specialize_std_vector(long);
-    specialize_std_vector(char);
-    specialize_std_vector(double);
-    specialize_std_vector(int*);
-    specialize_std_vector(char*);*/
-}
+%define %swig_vector_methods_val(Type...)
+  %swig_vector_methods(Type...)
+%enddef
 
+%include 
diff --git a/Lib/std/std_vector.i b/Lib/std/std_vector.i
index fae759a36..2c78b0eb9 100644
--- a/Lib/std/std_vector.i
+++ b/Lib/std/std_vector.i
@@ -68,6 +68,7 @@ namespace std {
     typedef const _Tp& const_reference;
     typedef _Alloc allocator_type;
 
+#ifndef SWIGC
     %traits_swigtype(_Tp);
     %traits_enum(_Tp);
 
@@ -85,6 +86,7 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp, _Alloc >);
+#endif // !SWIGC
 
 #ifdef %swig_vector_methods
     // Add swig/language extra methods
@@ -110,6 +112,7 @@ namespace std {
     typedef value_type const_reference;
     typedef _Alloc allocator_type;
 
+#ifndef SWIGC
     %traits_swigtype(_Tp);
 
     %fragment(SWIG_Traits_frag(std::vector< _Tp*, _Alloc >), "header",
@@ -126,6 +129,7 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp*, _Alloc >);
+#endif // !SWIGC
 
 #ifdef %swig_vector_methods_val
     // Add swig/language extra methods
@@ -150,6 +154,7 @@ namespace std {
     typedef value_type const_reference;
     typedef _Alloc allocator_type;
 
+#ifndef SWIGC
     %traits_swigtype(_Tp);
 
     %fragment(SWIG_Traits_frag(std::vector< _Tp const*, _Alloc >), "header",
@@ -166,6 +171,7 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp const*, _Alloc >);
+#endif // !SWIGC
 
 #ifdef %swig_vector_methods_val
     // Add swig/language extra methods
@@ -191,6 +197,7 @@ namespace std {
     typedef value_type const_reference;
     typedef _Alloc allocator_type;
 
+#ifndef SWIGC
     %traits_swigtype(bool);
 
     %fragment(SWIG_Traits_frag(std::vector), "header",
@@ -207,7 +214,7 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector);
-
+#endif // !SWIGC
 
 #ifdef %swig_vector_methods_val
     // Add swig/language extra methods

From 65d9cad1caf05cb481e380ec830307dcf9043492 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 16:07:06 +0200
Subject: [PATCH 295/508] Don't force inheritance of ignored methods

If a symbol is ignored in the base class, it shouldn't appear in the derived
class neither.
---
 Source/Modules/c.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 5fd2d0540..fe2af153f 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1303,8 +1303,8 @@ ready:
 		|| (Cmp(Getattr(node, "kind"), "function") == 0)) {
 	      if ((Cmp(Getattr(node, "access"), "public") == 0)
 		  && (Cmp(Getattr(node, "storage"), "static") != 0)) {
-		  // Assignment operators are not inherited in C++.
-		  if (Cmp(Getattr(node, "name"), "operator =") != 0) {
+		  // Assignment operators are not inherited in C++ and symbols without sym:name should be ignored, not copied into the derived class.
+		  if (Getattr(node, "sym:name") && Cmp(Getattr(node, "name"), "operator =") != 0) {
 		    Node *new_node = copy_node(node);
 		    String *parent_name = Getattr(parentNode(node), "name");
 		    Hash *dupl_name_node = is_in(Getattr(node, "name"), n);

From fe8c6fad441f8ff5f50a70bdaab122ab6f9eaa71 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 15:36:59 +0200
Subject: [PATCH 296/508] Ignore std::vector::get_allocator()

This is not really useful in C wrappers and results in ugly descriptor for the
allocator type appearing in the output, better to avoid it.
---
 Lib/c/std_vector.i | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Lib/c/std_vector.i b/Lib/c/std_vector.i
index 8b433ad7d..8dca57af5 100644
--- a/Lib/c/std_vector.i
+++ b/Lib/c/std_vector.i
@@ -4,6 +4,9 @@
     void set(size_type n, const value_type& val) { self->at(n) = val; }
     value_type get(size_type n) const { return self->at(n); }
   }
+
+  // Standard typemaps wrap get_allocator(), but it's not really useful for us, so don't bother with it.
+  %ignore get_allocator
 %enddef
 
 %define %swig_vector_methods_val(Type...)

From 2ce15d3e6aa10baa6e188f516a316bc1fa9b2986 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 16:11:10 +0200
Subject: [PATCH 297/508] Don't leak a Node in C::classHandler()

Delete the copied node if we end up not using it.
---
 Source/Modules/c.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index fe2af153f..93783b5ae 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1323,6 +1323,8 @@ ready:
 			Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
 			set_nodeType(new_node, "cdecl");
 			appendChild(n, new_node);
+		      } else {
+			Delete(new_node);
 		      }
 		    }
 		    else {

From 6e0e728a14dba3d5dde1bb85bb0d7b7418e98e9b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 16:22:24 +0200
Subject: [PATCH 298/508] Refactor node copying in C::classHandler()

Don't create a new node just to delete it if we don't need it, but rather only
create it if we do need it.

Also copy as much as can be copied in copy_node() helper, it was confusing to
copy part of the attributes in it and part in the caller. And one of them
("c:inherited_from") was even copied twice, it was first created in the
function and then unconditionally overwritten by the caller -- don't do this
any more.

No real changes.
---
 Source/Modules/c.cxx | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 93783b5ae..0b25f8ee4 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1152,6 +1152,8 @@ ready:
 
   /* ---------------------------------------------------------------------
    * copy_node()
+   *
+   * This is not a general-purpose node copying function, but just a helper of classHandler().
    * --------------------------------------------------------------------- */
 
   Node *copy_node(Node *node) {
@@ -1164,9 +1166,13 @@ ready:
     Setattr(new_node, "parms", Copy(Getattr(node, "parms")));
     Setattr(new_node, "type", Copy(Getattr(node, "type")));
     Setattr(new_node, "decl", Copy(Getattr(node, "decl")));
-    String *cif = Getattr(node, "c:inherited_from");
-    if (cif) 
-      Setattr(new_node, "c:inherited_from", Copy(cif));
+
+    Node* const parent = parentNode(node);
+    Setattr(new_node, "c:inherited_from", Getattr(parent, "name"));
+    Setattr(new_node, "sym:name", Getattr(node, "sym:name"));
+    Setattr(new_node, "sym:symtab", Getattr(parent, "symtab"));
+    set_nodeType(new_node, "cdecl");
+
     return new_node;
   }
 
@@ -1305,7 +1311,6 @@ ready:
 		  && (Cmp(Getattr(node, "storage"), "static") != 0)) {
 		  // Assignment operators are not inherited in C++ and symbols without sym:name should be ignored, not copied into the derived class.
 		  if (Getattr(node, "sym:name") && Cmp(Getattr(node, "name"), "operator =") != 0) {
-		    Node *new_node = copy_node(node);
 		    String *parent_name = Getattr(parentNode(node), "name");
 		    Hash *dupl_name_node = is_in(Getattr(node, "name"), n);
 		    // if there's a duplicate inherited name, due to the C++ multiple
@@ -1316,23 +1321,14 @@ ready:
 		      if (cif && parent_name && (Cmp(cif, parent_name) != 0)) {
 			Setattr(dupl_name_node, "sym:name", NewStringf("%s%s", cif ? cif : "", old_name));
 			Setattr(dupl_name_node, "c:base_name", old_name);
+			Node *new_node = copy_node(node);
 			Setattr(new_node, "name", NewStringf("%s%s", parent_name, old_name));
 			Setattr(new_node, "c:base_name", old_name);
-			Setattr(new_node, "c:inherited_from", parent_name);
-			Setattr(new_node, "sym:name", Getattr(node, "sym:name"));
-			Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
-			set_nodeType(new_node, "cdecl");
 			appendChild(n, new_node);
-		      } else {
-			Delete(new_node);
 		      }
 		    }
 		    else {
-		      Setattr(new_node, "c:inherited_from", parent_name);
-		      Setattr(new_node, "sym:name", Getattr(node, "sym:name"));
-		      Setattr(new_node, "sym:symtab", Getattr(n, "symtab"));
-		      set_nodeType(new_node, "cdecl");
-		      appendChild(n, new_node);
+		      appendChild(n, copy_node(node));
 		    }
 		  }
 	      }

From 11426ac1cdc60103161048d0c6c34e148c14d633 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 19:40:08 +0200
Subject: [PATCH 299/508] Drop code dealing with tmap:ctype:out which is never
 used

This typemap attribute is not used with C (so far), there is no point in
checking for it in the code.
---
 Source/Modules/c.cxx | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0b25f8ee4..a8c05d214 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -747,18 +747,8 @@ ready:
        String *tm;
 
        if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
-            // handle simple typemap cases
-            String *ctypeout = Getattr(n, "tmap:ctype:out");
-            if (ctypeout)
-              {
-                 return_type = ctypeout;
-                 Printf(stdout, "Obscure ctype:out found! O.o\n");
-              }
-            else
-              {
-                 substituteResolvedType(target, type, tm);
-                 return_type = tm;
-              }
+	 substituteResolvedType(target, type, tm);
+	 return_type = tm;
        }
        else {
             Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));

From ad5de803b5f9d1f0e429ec93e31223e9ce28d297 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 19:41:41 +0200
Subject: [PATCH 300/508] Avoid unnecessary allocation in
 get_wrapper_func_return_type()

Don't call NewString() just to overwrite it with another pointer (and leak the
one allocated by NewString()).
---
 Source/Modules/c.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index a8c05d214..3cb676c79 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -743,7 +743,7 @@ ready:
   String *get_wrapper_func_return_type(output_target target, Node *n)
     {
        SwigType *type = Getattr(n, "type");
-       String *return_type = NewString("");
+       String *return_type;
        String *tm;
 
        if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
@@ -752,6 +752,7 @@ ready:
        }
        else {
             Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
+	    return_type = NewString("");
        }
 
        Replaceall(return_type, "::", "_");

From 0353317a218f1f2eccbb133f458d242ee105d8e6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 19:52:37 +0200
Subject: [PATCH 301/508] Remove substituteResolvedType() return value as it is
 unused

It doesn't matter if this function did anything or not as its output parameter
is always used anyhow by the caller.
---
 Source/Modules/c.cxx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 3cb676c79..0c88dfe99 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -301,19 +301,15 @@ public:
    *   tm - typemap contents that might contain the special variable to be replaced
    * Outputs:
    *   tm - typemap contents complete with the special variable substitution
-   * Return:
-   *   substitution_performed - flag indicating if a substitution was performed
    * ----------------------------------------------------------------------------- */
 
-  bool substituteResolvedType(output_target target, SwigType *pt, String *tm) {
-    bool substitution_performed = false;
+  void substituteResolvedType(output_target target, SwigType *pt, String *tm) {
     SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$resolved_type");
-      substitution_performed = true;
       Delete(classnametype);
     }
     if (Strstr(tm, "$*resolved_type")) {
@@ -321,7 +317,6 @@ public:
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
   substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$*resolved_type");
-  substitution_performed = true;
       }
       Delete(classnametype);
     }
@@ -329,14 +324,11 @@ public:
       SwigType *classnametype = Copy(strippedtype);
       SwigType_add_pointer(classnametype);
       substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$&resolved_type");
-      substitution_performed = true;
       Delete(classnametype);
     }
 
     Delete(strippedtype);
     Delete(type);
-
-    return substitution_performed;
   }
 
   /* ------------------------------------------------------------

From bf718911976c0faaf14261831da2e3700882088d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 19:54:08 +0200
Subject: [PATCH 302/508] Just get rid of an unnecessary variable

Simplify the code by avoiding a superfluous extra variable.
---
 Source/Modules/c.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 0c88dfe99..47a7c8669 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -736,11 +736,9 @@ ready:
     {
        SwigType *type = Getattr(n, "type");
        String *return_type;
-       String *tm;
 
-       if ((tm = Swig_typemap_lookup("ctype", n, "", 0))) {
-	 substituteResolvedType(target, type, tm);
-	 return_type = tm;
+       if ((return_type = Swig_typemap_lookup("ctype", n, "", 0))) {
+	 substituteResolvedType(target, type, return_type);
        }
        else {
             Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));

From dcda566ce664ce35fa1b1aaa24ce2cd0ac52eb97 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 26 Apr 2016 19:56:34 +0200
Subject: [PATCH 303/508] Remove unnecessary memory allocation from
 substituteResolvedType()

Don't allocate memory just to leak it, SwigType_typedef_resolve_all() already
returns a copy we can use.
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 47a7c8669..834480751 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -304,7 +304,7 @@ public:
    * ----------------------------------------------------------------------------- */
 
   void substituteResolvedType(output_target target, SwigType *pt, String *tm) {
-    SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
+    SwigType *type = SwigType_typedef_resolve_all(pt);
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {

From 2f4eb2d412ba5c24c73a6e72cf6e0f67e16a525e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 27 Apr 2016 13:04:59 +0200
Subject: [PATCH 304/508] Replace output_target parameter with global
 current_output

This will allow implementing replaceSpecialVariables(): as it is called from
inside the typemap lookup code, we can't pass any parameters to it directly,
but we can use a class language-global member variable to it indirectly.

No real changes yet.
---
 Source/Modules/c.cxx | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 834480751..90b7ebe34 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -136,10 +136,10 @@ class C:public Language {
   bool enum_is_empty;
 
   // Selects between the wrappers (public) declarations and (private) definitions.
-  enum output_target {
+  enum {
     output_wrapper_decl,
     output_wrapper_def
-  };
+  } current_output;
 
 public:
 
@@ -246,7 +246,7 @@ public:
    * substituteResolvedTypeSpecialVariable()
    * ----------------------------------------------------------------------------- */
 
-  void substituteResolvedTypeSpecialVariable(output_target target, SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
+  void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
     if (!CPlusPlus) {
       // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
       Clear(tm);
@@ -265,7 +265,7 @@ public:
     } else {
       scoped_dohptr btype(SwigType_base(classnametype));
       String* typestr = NIL;
-      if (target == output_wrapper_def || Cmp(btype, "SwigObj") == 0) {
+      if (current_output == output_wrapper_def || Cmp(btype, "SwigObj") == 0) {
 	// Special case, just leave it unchanged.
 	typestr = NewString("SwigObj");
       } else {
@@ -303,27 +303,27 @@ public:
    *   tm - typemap contents complete with the special variable substitution
    * ----------------------------------------------------------------------------- */
 
-  void substituteResolvedType(output_target target, SwigType *pt, String *tm) {
+  void substituteResolvedType(SwigType *pt, String *tm) {
     SwigType *type = SwigType_typedef_resolve_all(pt);
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
-      substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$resolved_type");
+      substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type");
       Delete(classnametype);
     }
     if (Strstr(tm, "$*resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
-  substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$*resolved_type");
+  substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
       }
       Delete(classnametype);
     }
     if (Strstr(tm, "$&resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       SwigType_add_pointer(classnametype);
-      substituteResolvedTypeSpecialVariable(target, classnametype, tm, "$&resolved_type");
+      substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type");
       Delete(classnametype);
     }
 
@@ -732,13 +732,13 @@ ready:
        Delete(over_suffix);
     }
 
-  String *get_wrapper_func_return_type(output_target target, Node *n)
+  String *get_wrapper_func_return_type(Node *n)
     {
        SwigType *type = Getattr(n, "type");
        String *return_type;
 
        if ((return_type = Swig_typemap_lookup("ctype", n, "", 0))) {
-	 substituteResolvedType(target, type, return_type);
+	 substituteResolvedType(type, return_type);
        }
        else {
             Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
@@ -802,7 +802,7 @@ ready:
 
 	    if ((tm = Getattr(p, "tmap:ctype"))) { // set the appropriate type for parameter
 		 c_parm_type = Copy(tm);
-		 substituteResolvedType(wrapper ? output_wrapper_def : output_wrapper_decl, type, c_parm_type);
+		 substituteResolvedType(type, c_parm_type);
 
 		 // We prefer to keep typedefs in the wrapper functions signatures as it makes them more readable, but we can't do it for nested typedefs as
 		 // they're not valid in C, so resolve them in this case.
@@ -856,10 +856,12 @@ ready:
    * ---------------------------------------------------------------------- */
   void emit_wrapper_func_decl(Node *n, String *name)
     {
+       current_output = output_wrapper_decl;
+
        // C++ function wrapper proxy code
        bool const is_global = IS_SET_TO_ONE(n, "c:globalfun");
        String *wname = is_global ? Swig_name_wrapper(name) : Copy(name);
-       String *preturn_type = get_wrapper_func_return_type(output_wrapper_decl, n);
+       String *preturn_type = get_wrapper_func_return_type(n);
        String *wrapper_call = NewString("");
 
        // add function declaration to the proxy header file
@@ -884,11 +886,13 @@ ready:
 
   virtual void functionWrapperCPPSpecificWrapper(Node *n, String *name)
     {
+       current_output = output_wrapper_def;
+
        // C++ function wrapper
        String *storage = Getattr(n, "storage");
        SwigType *type = Getattr(n, "type");
        SwigType *otype = Copy(type);
-       SwigType *return_type = get_wrapper_func_return_type(output_wrapper_def, n);
+       SwigType *return_type = get_wrapper_func_return_type(n);
        String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;

From 9204e57cc1e15c60706f6aa9e14613012fc0117e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 27 Apr 2016 13:09:23 +0200
Subject: [PATCH 305/508] Fix $typemap() expansion for "ctype" typemap

This didn't work correctly before because we need to override the base class
replaceSpecialVariables() method to expand $resolved_type, which appears
during the expansion, using the type supplied as $typemap() argument instead
of doing it later using it the type to which the typemap containing the macro
is attached.

This is a prerequisite for implementing smart pointers support.
---
 Source/Modules/c.cxx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 90b7ebe34..9e23164a3 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -331,6 +331,18 @@ public:
     Delete(type);
   }
 
+  /*----------------------------------------------------------------------
+   * replaceSpecialVariables()
+   *
+   * Override the base class method to ensure that $resolved_type is expanded correctly inside $typemap().
+   *--------------------------------------------------------------------*/
+
+  virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) {
+    (void)method;
+    SwigType *type = Getattr(parm, "type");
+    substituteResolvedType(type, tm);
+  }
+
   /* ------------------------------------------------------------
    * main()
    * ------------------------------------------------------------ */

From 7a6edf8b820ef80bbb5361bdf1e4c33e7c92f145 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 15 Sep 2016 01:41:20 +0200
Subject: [PATCH 306/508] Remove nonsensical typemaps for SWIGTYPE**

It's not clear why they were defined in the first place, but they broke
li_std_vector_ptr unit test, which now uses "T**", after the latest merge with
master, so just remove them to let the test pass again.
---
 Lib/c/c.swg | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 4447e9fa8..171c7786b 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -119,7 +119,6 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype);
 %typemap(ctype) SWIGTYPE *&    "$resolved_type**"
 %typemap(ctype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
 %typemap(ctype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
-%typemap(ctype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **"
 %typemap(ctype) enum SWIGTYPE "int"
 %typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
 
@@ -156,11 +155,6 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
     $1 = ($1_ltype) $input;
 }
 
-%typemap(in) SWIGTYPE ** {
-  if ($input)
-    $1 = ($1_ltype) $input;
-}
-
 %typemap(in) SWIGTYPE *[ANY] {
   if ($input) {
     $1 = ($1_ltype) malloc($1_dim0 * sizeof($1_basetype));
@@ -192,7 +186,7 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
     $1 = ($1_ltype) 0;
 }
 
-%typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY], SWIGTYPE **, SWIGTYPE *** {
+%typemap(freearg) SWIGTYPE * [ANY], SWIGTYPE * [ANY][ANY] {
   if ($input)
     free($input);
 }
@@ -227,7 +221,7 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
   *($&1_ltype) &$result = $1; 
 }
 
-%typemap(out) SWIGTYPE *&, SWIGTYPE ** {
+%typemap(out) SWIGTYPE *& {
   static SwigObj* _ptr = (SwigObj*) $1;
   $result = &_ptr;
 }
@@ -274,7 +268,6 @@ same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
 %typemap(cppouttype) SWIGTYPE *&   "$1_ltype"
 %typemap(cppouttype) SWIGTYPE [ANY] "$1_ltype"
 %typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype"
-%typemap(cppouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_basetype **"
 %typemap(cppouttype, retobj="1") enum SWIGTYPE "int"
 %typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
 %typemap(cppouttype) SWIGTYPE (CLASS::*) "$1_ltype"

From 93ca7451e69815a9a4aa97304c78c598a9466338 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 15 Sep 2016 01:46:28 +0200
Subject: [PATCH 307/508] Also remove SWIGTYPE*& typemaps for C

They seem unnecessary too and look suspicious, notably the use of "static" in
the "out" typemap is almost certainly wrong.

As all the tests still pass without them, don't bother fixing these typemaps
but just remove them completely.
---
 Lib/c/c.swg | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 171c7786b..7ce4e927a 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -116,7 +116,6 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype);
 %typemap(ctype) SWIGTYPE      "$&resolved_type*"
 %typemap(ctype) SWIGTYPE *    "$resolved_type*"
 %typemap(ctype) SWIGTYPE &    "$*resolved_type*"
-%typemap(ctype) SWIGTYPE *&    "$resolved_type**"
 %typemap(ctype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
 %typemap(ctype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
 %typemap(ctype) enum SWIGTYPE "int"
@@ -198,14 +197,6 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
     $1 = ($1_ltype) 0;
 }
 
-%typemap(in) SWIGTYPE *& {
-  if ($input)
-    $1 = ($1_ltype) $input;
-  else
-    $1 = ($1_ltype) 0;
-}
-
-
 // Typemaps for assigning result values to a special return variable
 same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
 
@@ -221,11 +212,6 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
   *($&1_ltype) &$result = $1; 
 }
 
-%typemap(out) SWIGTYPE *& {
-  static SwigObj* _ptr = (SwigObj*) $1;
-  $result = &_ptr;
-}
-
 %typemap(out) SWIGTYPE {
   $result = (SwigObj*) &$1;
 }
@@ -265,7 +251,6 @@ same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
 %typemap(cppouttype) SWIGTYPE *    "$1_ltype"
 %typemap(cppouttype) const SWIGTYPE * "const $1_ltype"
 %typemap(cppouttype) SWIGTYPE &    "$1_ltype"
-%typemap(cppouttype) SWIGTYPE *&   "$1_ltype"
 %typemap(cppouttype) SWIGTYPE [ANY] "$1_ltype"
 %typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype"
 %typemap(cppouttype, retobj="1") enum SWIGTYPE "int"

From fe5f3677093eecad127afddeb7f7665e05da1813 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 24 Jul 2019 20:35:42 +0200
Subject: [PATCH 308/508] Show "C" in the list of languages at the end of
 configure

If C module wasn't disabled, show that the tests and examples will be
available for it too.
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index a9bc5d5ce..87ebd6027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2872,6 +2872,7 @@ EOF
 AC_OUTPUT
 
 langs=""
+test -n "$SKIP_C"		|| langs="${langs}c "
 test -n "$SKIP_CSHARP"		|| langs="${langs}csharp "
 test -n "$SKIP_D"		|| langs="${langs}d "
 test -n "$SKIP_GO"		|| langs="${langs}go "

From 690bf8e020ed76cc9c75ab025ed70c884f129e0e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 24 Jul 2019 20:47:59 +0200
Subject: [PATCH 309/508] Replace SWIG_exit() with just exit() in test code

SWIG_exit() is not declared anywhere, so would need to be explicitly
declared to avoid warnings, while exit() can be declared just by
including , so prefer to use the latter, especially because
they're one and the same anyhow.
---
 Examples/test-suite/c/cast_operator_runme.c   |  4 +-
 Examples/test-suite/c/char_strings_runme.c    | 42 +++++++++----------
 Examples/test-suite/c/enums_runme.c           |  3 +-
 Examples/test-suite/c/exception_order_runme.c |  3 +-
 .../test-suite/c/operator_overload_runme.c    |  5 ++-
 5 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/Examples/test-suite/c/cast_operator_runme.c b/Examples/test-suite/c/cast_operator_runme.c
index 1b90bbcb4..a2429b93a 100644
--- a/Examples/test-suite/c/cast_operator_runme.c
+++ b/Examples/test-suite/c/cast_operator_runme.c
@@ -1,4 +1,6 @@
 #include 
+#include 
+#include 
 
 #include "cast_operator/cast_operator_wrap.h"
 
@@ -7,6 +9,6 @@ int main() {
   if (strcmp(A_tochar(a), "hi"))
     fprintf(stderr, "cast failed\n");
   A_delete(a);
-  SWIG_exit(0);
+  exit(0);
 }
 
diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index c2de7ddca..ba56fb10e 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -15,7 +15,7 @@ int main() {
     char *str = GetCharHeapString();
     if (strcmp(str, CPLUSPLUS_MSG) != 0) {
       fprintf(stderr, "Test char get 1 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
     DeleteCharHeapString();
   }
@@ -24,7 +24,7 @@ int main() {
     const char *str = GetConstCharProgramCodeString();
     if (strcmp(str, CPLUSPLUS_MSG) != 0) {
       fprintf(stderr, "Test char get 2 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
     DeleteCharHeapString();
   }
@@ -33,7 +33,7 @@ int main() {
     char *str = GetCharStaticString();
     if (strcmp(str, CPLUSPLUS_MSG) != 0) {
       fprintf(stderr, "Test char get 3 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -41,7 +41,7 @@ int main() {
     char *str = GetCharStaticStringFixed();
     if (strcmp(str, CPLUSPLUS_MSG) != 0) {
       fprintf(stderr, "Test char get 4 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -49,7 +49,7 @@ int main() {
     const char *str = GetConstCharStaticStringFixed();
     if (strcmp(str, CPLUSPLUS_MSG) != 0) {
       fprintf(stderr, "Test char get 5 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -59,7 +59,7 @@ int main() {
     sprintf(str, "%s%d", OTHERLAND_MSG, i);
     if (!SetCharHeapString(str, i)) {
       fprintf(stderr, "Test char set 1 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -69,7 +69,7 @@ int main() {
     sprintf(str, "%s%d", OTHERLAND_MSG, i);
     if (!SetCharStaticString(str, i)) {
       fprintf(stderr, "Test char set 2 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -78,7 +78,7 @@ int main() {
     sprintf(str, "%s%d", OTHERLAND_MSG, i);
     if (!SetCharArrayStaticString(str, i)) {
       fprintf(stderr, "Test char set 3 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -87,7 +87,7 @@ int main() {
     sprintf(str, "%s%d", OTHERLAND_MSG, i);
     if (!SetConstCharHeapString(str, i)) {
       fprintf(stderr, "Test char set 4 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -96,7 +96,7 @@ int main() {
     sprintf(str, "%s%d", OTHERLAND_MSG, i);
     if (!SetConstCharStaticString(str, i)) {
       fprintf(stderr, "Test char set 5 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -105,7 +105,7 @@ int main() {
     sprintf(str, "%s%d", OTHERLAND_MSG, i);
     if (!SetConstCharArrayStaticString(str, i)) {
       fprintf(stderr, "Test char set 6 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
   
@@ -116,7 +116,7 @@ int main() {
     char *pong = CharPingPong(ping);
     if (strcmp(ping, pong) != 0) {
       fprintf(stderr, "Test PingPong 1 failed.\nExpected:%d\nReceived:%d\n", ping, pong);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -128,7 +128,7 @@ int main() {
     global_char = str;
     if (strcmp(global_char, str) != 0) {
       fprintf(stderr, "Test variables 1 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -138,7 +138,7 @@ int main() {
     sprintf(global_char_array1, "%s%d", OTHERLAND_MSG, i);
     if (strcmp(global_char_array1, str) != 0) {
       fprintf(stderr, "Test variables 2 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
@@ -148,14 +148,14 @@ int main() {
     sprintf(global_char_array2, "%s%d", OTHERLAND_MSG, i);
     if (strcmp(global_char_array2, str) != 0) {
       fprintf(stderr, "Test variables 3 failed, iteration %d\n", i);
-      SWIG_exit(1);
+      exit(1);
     }
   }
 
   for (i=0; i
+#include 
 
 #include "enums/enums_wrap.h"
 
@@ -8,6 +9,6 @@ int main() {
   bar2(1);
   bar3(1);
   bar1(1);
-  SWIG_exit(0);
+  exit(0);
 }
 
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index 5e7322872..a6483d86f 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -1,4 +1,5 @@
 #include 
+#include 
 
 #include "exception_order/exception_order_wrap.h"
 
@@ -40,6 +41,6 @@ int main() {
       SWIG_PendingException_reset();
   }
 
-  SWIG_exit(0);
+  exit(0);
 }
 
diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index 00e525a9c..ed0c8e450 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -1,8 +1,9 @@
 #include 
+#include 
 
 #include "operator_overload/operator_overload_wrap.h"
 
-#define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); SWIG_exit(0); }
+#define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); exit(1); }
 
 int main() {
   Op_sanity_check();
@@ -21,5 +22,5 @@ int main() {
   Op_delete(op1);
   Op_delete(op2);
   Op_delete(op3);
-  SWIG_exit(0);
+  exit(0);
 }

From b0d99a1cc3c15ff0916f4c6ca0a75a09effd934e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 3 Aug 2019 02:37:18 +0200
Subject: [PATCH 310/508] Don't emit functions added by %extend into C structs

This is never going to work and just results in generating uncompilable
code.

In principle, we could either generate wrappers for these functions
while still handling the struct as a plain C struct, or switch to
generating class-like wrappers for it if it's %extended with any
functions, but for now just ignore them as this is the simplest thing to
do.

Incidentally, this makes the default_args_c test pass again now, after
the last merge with master pulled in such %extend directives into it.
---
 Source/Include/swigwarn.h |  1 +
 Source/Modules/c.cxx      | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h
index da6c05b80..bbb6c419b 100644
--- a/Source/Include/swigwarn.h
+++ b/Source/Include/swigwarn.h
@@ -256,6 +256,7 @@
 /* please leave 740-759 free for Python */
 
 #define WARN_C_TYPEMAP_CTYPE_UNDEF            760
+#define WARN_C_UNSUPPORTTED                   779
 
 /* please leave 760-779 free for C */
 
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9e23164a3..8c53f8f76 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1273,9 +1273,16 @@ ready:
     for ( Node* node = firstChild(n); node; node = nextSibling(node)) {
       String* const ntype = nodeType(node);
       if (Cmp(ntype, "cdecl") == 0) {
-	String* const var_decl = make_c_var_decl(node);
-	Printv(out, cindent, var_decl, ";\n", NIL);
-	Delete(var_decl);
+	SwigType* t = NewString(Getattr(node, "type"));
+	SwigType_push(t, Getattr(node, "decl"));
+	t = SwigType_typedef_resolve_all(t);
+	if (SwigType_isfunction(t)) {
+            Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, "Extending C struct with %s is not currently supported, ignored.\n", SwigType_str(t, 0));
+	} else {
+	  String* const var_decl = make_c_var_decl(node);
+	  Printv(out, cindent, var_decl, ";\n", NIL);
+	  Delete(var_decl);
+	}
       } else if (Cmp(ntype, "enum") == 0) {
 	// This goes directly into f_wrappers_types, before this struct declaration.
 	emit_one(node);

From bbac8ca521ccf023fe57e61dd882168a97d6e83f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 3 Aug 2019 14:40:09 +0200
Subject: [PATCH 311/508] Don't reimplement base class version of
 globalfunctionHandler()

This is useless and the C-specific version didn't handle template
methods added with %extend correctly, so removing this code also fixes
some (but not all yet) failures in extend_template_method.cpptest unit
test.
---
 Source/Modules/c.cxx | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 8c53f8f76..6d72cac32 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -531,25 +531,13 @@ public:
 
   virtual int globalfunctionHandler(Node *n) {
     SwigType *type = Getattr(n, "type");
-    ParmList *parms = Getattr(n, "parms");
-    String *arg_list = NewString("");
-    String *call = empty_string;
-    String *cres = empty_string;
 
-    call = Swig_cfunction_call(Getattr(n, "name"), parms);
-    cres = Swig_cresult(type, "result", call);
-    Setattr(n, "wrap:action", cres);
     Setattr(n, "c:globalfun", "1");
 
     if (!SwigType_ispointer(type) && !SwigType_isreference(type))
       Setattr(n, "c:retval", "1");
 
-    functionWrapper(n);
-
-    Delete(cres);
-    Delete(call);
-    Delete(arg_list);
-    return SWIG_OK;
+    return Language::globalfunctionHandler(n);
   }
 
   /* ----------------------------------------------------------------------

From 875217b1e25ee8e9988d6b987907fac85b69653b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 3 Aug 2019 17:27:45 +0200
Subject: [PATCH 312/508] Disable more tests not passing since the last merge
 with master

They should be fixed later, but for now let at least the working unit
tests pass.
---
 Examples/test-suite/c/Makefile.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 972721ed0..d551350c0 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -56,6 +56,7 @@ FAILING_CPP_TESTS := \
     default_args \
     default_constructor \
     director_enum \
+    director_smartptr \
     director_string \
     enum_thorough \
     extend \
@@ -63,6 +64,7 @@ FAILING_CPP_TESTS := \
     extend_default \
     extend_placement \
     extern_c \
+    extern_template_method \
     features \
     funcptr_cpp \
     global_scope_types \
@@ -70,16 +72,22 @@ FAILING_CPP_TESTS := \
     import_nomodule \
     li_attribute \
     li_boost_shared_ptr \
+    li_boost_shared_ptr_bits \
+    li_boost_shared_ptr_director \
+    li_boost_shared_ptr_template \
     li_carrays_cpp \
     li_std_combinations \
     li_std_deque \
     li_std_map \
     li_std_pair \
     li_std_pair_using \
+    li_std_wstring \
     li_windows \
     member_funcptr_galore \
     member_pointer \
+    member_pointer_const \
     mixed_types \
+    multiple_inheritance_shared_ptr \
     namespace_class \
     nested_class \
     nested_scope \
@@ -87,9 +95,11 @@ FAILING_CPP_TESTS := \
     smart_pointer_extend \
     smart_pointer_not \
     smart_pointer_template_defaults_overload \
+    stl_no_default_constructor \
     struct_initialization_cpp \
     template_basic \
     template_default \
+    template_empty_inherit \
     template_enum \
     template_explicit \
     template_typedef_fnc \
@@ -98,6 +108,7 @@ FAILING_CPP_TESTS := \
     typedef_struct_cpp \
     typemap_array_qualifiers \
     typemap_namespace \
+    typemap_various \
     using_extend \
     varargs \
     varargs_overload \

From b4d08c1787f165eb0db0a609b7a3224a729f0767 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 02:15:48 +0200
Subject: [PATCH 313/508] Get rid of special ctor/dtor handling in C module

By delegating to the base class instead we not only save quite a few
lines of code, but gain support for ctors/dtors defined using %extend,
which didn't work before, allowing to reenable some of the previously
failing tests.
---
 Examples/test-suite/c/Makefile.in      |   7 --
 Examples/test-suite/namespace_extend.i |  18 ++++
 Source/Modules/c.cxx                   | 141 +++++++++----------------
 3 files changed, 65 insertions(+), 101 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index d551350c0..a7159d378 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -33,12 +33,9 @@ FAILING_C_TESTS := \
     function_typedef \
     lextype \
     li_carrays \
-    li_cpointer \
     nested \
     nested_extend_c \
     nested_structs \
-    overload_extend2 \
-    overload_extend_c \
     typedef_struct \
     union_parameter \
     unions \
@@ -54,15 +51,12 @@ FAILING_CPP_TESTS := \
     char_strings \
     constant_pointers \
     default_args \
-    default_constructor \
     director_enum \
     director_smartptr \
     director_string \
     enum_thorough \
     extend \
-    extend_constructor_destructor \
     extend_default \
-    extend_placement \
     extern_c \
     extern_template_method \
     features \
@@ -93,7 +87,6 @@ FAILING_CPP_TESTS := \
     nested_scope \
     nested_template_base \
     smart_pointer_extend \
-    smart_pointer_not \
     smart_pointer_template_defaults_overload \
     stl_no_default_constructor \
     struct_initialization_cpp \
diff --git a/Examples/test-suite/namespace_extend.i b/Examples/test-suite/namespace_extend.i
index 3c414d1af..ba5a0d908 100644
--- a/Examples/test-suite/namespace_extend.i
+++ b/Examples/test-suite/namespace_extend.i
@@ -8,12 +8,30 @@ namespace foo {
    public:
    };
 }
+%}
+
+// C uses different naming convention, with all functions starting with the class prefix.
+#ifdef SWIGC
+%{
+foo::bar *foo_bar_new() {
+   return new foo::bar;
+}
+void     foo_bar_delete(foo::bar *self) {
+   delete self;
+}
+%}
+#else
+%{
 foo::bar *new_foo_bar() {
    return new foo::bar;
 }
 void     delete_foo_bar(foo::bar *self) {
    delete self;
 }
+%}
+#endif
+
+%{
 int foo_bar_blah(foo::bar *self, int x) {
    return x;
 }
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6d72cac32..a71a8fe02 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -129,9 +129,6 @@ class C:public Language {
   String *int_string;
   String *tl_namespace; // optional top level namespace
 
-  // If non-null, contains wrap:action code to be used in the next functionWrapper() call.
-  String *special_wrap_action;
-
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
 
@@ -150,8 +147,7 @@ public:
   C() : 
     empty_string(NewString("")),
     int_string(NewString("int")),
-    tl_namespace(NULL),
-    special_wrap_action(NULL)
+    tl_namespace(NULL)
   {
   }
 
@@ -823,10 +819,7 @@ ready:
             gencomma = 1;
 
             // apply typemaps for input parameter
-            if (Cmp(nodeType(n), "destructor") == 0) {
-                 p = Getattr(p, "tmap:in:next");
-            }
-            else if ((tm = Getattr(p, "tmap:in"))) {
+            if ((tm = Getattr(p, "tmap:in"))) {
                  Replaceall(tm, "$input", arg_name);
 		 if (wrapper) {
 		   Setattr(p, "emit:input", arg_name);
@@ -896,7 +889,6 @@ ready:
        String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
-       bool const is_ctor = Cmp(nodeType(n), "constructor") == 0;
        bool is_void_return = (SwigType_type(type) == T_VOID);
        bool return_object = false;
        // create new function wrapper object
@@ -906,7 +898,7 @@ ready:
        Setattr(n, "wrap:name", wname);
 
        // add variable for holding result of original function 'cppresult'
-       if (!is_void_return && !is_ctor) {
+       if (!is_void_return) {
             if (String *tm = Swig_typemap_lookup("cppouttype", n, "", 0)) {
 		 Wrapper_add_local(wrapper, "cppresult", SwigType_str(tm, "cppresult"));
                  return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1");
@@ -922,14 +914,11 @@ ready:
        Printv(wrapper->def, get_wrapper_func_proto(n, wrapper).get(), NIL);
        Printv(wrapper->def, " {", NIL);
 
-       bool const is_dtor = Cmp(nodeType(n), "destructor") == 0;
-       if (!is_dtor) {
-            // emit variables for holding parameters
-            emit_parameter_variables(parms, wrapper);
+	// emit variables for holding parameters
+	emit_parameter_variables(parms, wrapper);
 
-            // emit variable for holding function return value
-            emit_return_variable(n, return_type, wrapper);
-       }
+	// emit variable for holding function return value
+	emit_return_variable(n, return_type, wrapper);
 
        // insert constraint checking
        for (p = parms; p; ) {
@@ -957,53 +946,42 @@ ready:
        }
 
        // handle special cases of cpp return result
-       if (!is_ctor) {
-            if (SwigType_isenum(SwigType_base(type))){
-                 if (return_object)
-                   Replaceall(action, "result =", "cppresult = (int)");
-                 else Replaceall(action, "result =", "cppresult = (int*)");
-            }
-            else if (return_object && Getattr(n, "c:retval") && !SwigType_isarray(type)
-                  && (Cmp(storage, "static") != 0)) {
-                 // returning object by value
-                 String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref");
-                 String *lstr = SwigType_lstr(type, 0);
-                 if (Cmp(Getattr(n, "kind"), "variable") == 0) {
-                      Delete(action);
-                      action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0));
-                 }
-                 else {
-                      String *call_str = NewStringf("{const %s = %s", str,
-                            SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : "");
-                      Replaceall(action, "result =", call_str);
-                      Delete(call_str);
-                 }
-                 if (Getattr(n, "nested"))
-                   Replaceall(action, "=", NewStringf("= *(%s)(void*) &", SwigType_str(otype, 0)));
-                 Printf(action, "cppresult = (%s*) &_result_ref;}", lstr);
-                 Delete(str);
-                 Delete(lstr);
-            }
-            else
-              Replaceall(action, "result =", "cppresult = ");
+       if (SwigType_isenum(SwigType_base(type))) {
+	 if (return_object)
+	   Replaceall(action, "result =", "cppresult = (int)");
+	 else
+	   Replaceall(action, "result =", "cppresult = (int*)");
+       }
+       else if (return_object && Getattr(n, "c:retval") &&
+		!SwigType_isarray(type) &&
+		(Cmp(storage, "static") != 0)) {
+	 // returning object by value
+	 String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref");
+	 String *lstr = SwigType_lstr(type, 0);
+	 if (Cmp(Getattr(n, "kind"), "variable") == 0) {
+	   Delete(action);
+	   action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0));
+	 }
+	 else {
+	   String *call_str = NewStringf("{const %s = %s", str,
+	     SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : "");
+	   Replaceall(action, "result =", call_str);
+	   Delete(call_str);
+	 }
+	 if (Getattr(n, "nested"))
+	   Replaceall(action, "=", NewStringf("= *(%s)(void*) &", SwigType_str(otype, 0)));
+	 Printf(action, "cppresult = (%s*) &_result_ref;}", lstr);
+	 Delete(str);
+	 Delete(lstr);
+       } else {
+	 Replaceall(action, "result =", "cppresult =");
        }
 
        // prepare action code to use, e.g. insert try-catch blocks
-
-       // We don't take extension ctors and dtors into account currently (objects are always created using hardcoded new in constructorHandler() and destroyed
-       // using SWIG_destroy_object()) and generating them is at best useless and can be harmful when it results in a clash of names between an extension ctor
-       // new_Foo() and the ctor wrapper which has exactly the same name. So for now just drop them completely, which is certainly not right, but not worse than
-       // before.
-       //
-       // TODO-C: Implement proper extension ctors/dtor support.
-       if (is_ctor || is_dtor) {
-	 Delattr(n, "wrap:code");
-       }
-
        action = emit_action(n);
 
        // emit output typemap if needed
-       if (!is_void_return && !is_ctor) {
+       if (!is_void_return) {
             String *tm;
             if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) {
                  Replaceall(tm, "$result", "result");
@@ -1053,13 +1031,6 @@ ready:
 
   virtual void functionWrapperCPPSpecific(Node *n)
     {
-      // Use special actions for special methods if set up.
-      if (special_wrap_action) {
-	Setattr(n, "wrap:action", special_wrap_action);
-	Delete(special_wrap_action);
-	special_wrap_action = NULL;
-      }
-
        ParmList *parms = Getattr(n, "parms");
        String *name = Copy(Getattr(n, "sym:name"));
        SwigType *type = Getattr(n, "type");
@@ -1449,37 +1420,19 @@ ready:
    * --------------------------------------------------------------------- */
 
   virtual int constructorHandler(Node *n) {
-    Node *klass = Swig_methodclass(n);
-    String *classname = Getattr(klass, "classtype");
-
-    bool const is_copy_ctor = Getattr(n, "copy_constructor");
-    String *arg_lnames;
-    if (is_copy_ctor) {
-      arg_lnames = NewStringf("((%s const &)*arg1)", classname);
-    } else {
-      ParmList *parms = Getattr(n, "parms");
-      arg_lnames = Swig_cfunction_call(empty_string, parms);
+    // For some reason, the base class implementation of constructorDeclaration() only takes care of the copy ctor automatically for the languages not
+    // supporting overloading (i.e. not calling allow_overloading(), as we do). So duplicate the relevant part of its code here,
+    if (!Abstract && Getattr(n, "copy_constructor")) {
+      return Language::copyconstructorHandler(n);
     }
 
-    // TODO-C: We need to call the extension ctor here instead of hard-coding "new classname".
-    special_wrap_action = NewStringf("result = (SwigObj*)new %s%s;", classname, arg_lnames);
+    if (GetFlag(n, "feature:extend")) {
+      // Pretend that all ctors added via %extend are overloaded to avoid clash between the functions created for them and the actual exported function, that
+      // could have the same "Foo_new" name otherwise.
+      SetFlag(n, "sym:overloaded");
+    }
 
-    Delete(arg_lnames);
-
-    return is_copy_ctor ? Language::copyconstructorHandler(n) : Language::constructorHandler(n);
-  }
-
-  /* ---------------------------------------------------------------------
-   * destructorHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int destructorHandler(Node *n) {
-    Node *klass = Swig_methodclass(n);
-
-    // TODO-C: We need to use the extension dtor here if one is defined.
-    special_wrap_action = NewStringf("delete (%s *)carg1;", Getattr(klass, "classtype"));
-
-    return Language::destructorHandler(n);
+    return Language::constructorHandler(n);
   }
 
   /* ---------------------------------------------------------------------

From d9b3453763eea78ff6d92fb89df139b04ec811c5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:33:34 +0200
Subject: [PATCH 314/508] Add missing SWIGIMPORT to function declarations

This went unnoticed under Linux, but would have resulted in link errors
for all functions under MSW.
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index a71a8fe02..c717b9b52 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -858,7 +858,7 @@ ready:
        String *wrapper_call = NewString("");
 
        // add function declaration to the proxy header file
-       Printv(f_wrappers_decl, preturn_type, " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
+       Printv(f_wrappers_decl, "SWIGIMPORT ", preturn_type, " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
 
        if (is_global) {
 	 if (!f_wrappers_aliases) {

From 290f49a2c1de22a87b66ddb0491f395e17481322 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:41:29 +0200
Subject: [PATCH 315/508] Remove unused C::tl_namespace member

This was never set to anything, so just drop it.
---
 Source/Modules/c.cxx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index c717b9b52..b57ca59d6 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -127,7 +127,6 @@ class C:public Language {
 
   String *empty_string;
   String *int_string;
-  String *tl_namespace; // optional top level namespace
 
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
@@ -146,8 +145,7 @@ public:
 
   C() : 
     empty_string(NewString("")),
-    int_string(NewString("int")),
-    tl_namespace(NULL)
+    int_string(NewString("int"))
   {
   }
 
@@ -166,7 +164,7 @@ public:
 
      if (nspace) {
           // FIXME: using namespace as class name is a hack.
-          proxyname = Swig_name_member(tl_namespace, nspace, symname);
+          proxyname = Swig_name_member(NULL, nspace, symname);
      } else {
           proxyname = symname;
      }
@@ -220,10 +218,7 @@ public:
             // global enum or enum in a namespace
             String *nspace = Getattr(n, "sym:nspace");
             if (nspace) {
-              if (tl_namespace)
-                enumname = NewStringf("%s_%s_%s", tl_namespace, nspace, symname);
-              else
-                enumname = NewStringf("%s_%s", nspace, symname);
+	      enumname = NewStringf("%s_%s", nspace, symname);
             } else {
               enumname = Copy(symname);
             }

From 83e9d50763c1b2723f559ee077421947ae907148 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:43:02 +0200
Subject: [PATCH 316/508] Remove unused C::int_string field

This was simply never used at all.
---
 Source/Modules/c.cxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index b57ca59d6..6a68fa9f9 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -126,7 +126,6 @@ class C:public Language {
   File *f_init;
 
   String *empty_string;
-  String *int_string;
 
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
@@ -144,8 +143,7 @@ public:
    * ----------------------------------------------------------------------------- */
 
   C() : 
-    empty_string(NewString("")),
-    int_string(NewString("int"))
+    empty_string(NewString(""))
   {
   }
 

From 7bef0b704da22f27397a33fb59307f8eb6178740 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:46:00 +0200
Subject: [PATCH 317/508] Remove unnecessary "virtual" keywords

Don't mark functions not intended to be overridden (nor overriding those
in the base class) as "virtual", this is useless and confusing.

No real changes.
---
 Source/Modules/c.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6a68fa9f9..5b4549e89 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -618,7 +618,7 @@ ready:
     return result;
   }
 
-  virtual void functionWrapperCSpecific(Node *n)
+  void functionWrapperCSpecific(Node *n)
     {
        // this is C function, we don't apply typemaps to it
        String *name = Getattr(n, "sym:name");
@@ -707,7 +707,7 @@ ready:
        }
     }
 
-  virtual void functionWrapperAppendOverloaded(String *name, Parm* first_param)
+  void functionWrapperAppendOverloaded(String *name, Parm* first_param)
     {
        String *over_suffix = NewString("");
        Parm *p;
@@ -870,7 +870,7 @@ ready:
     }
 
 
-  virtual void functionWrapperCPPSpecificWrapper(Node *n, String *name)
+    void functionWrapperCPPSpecificWrapper(Node *n, String *name)
     {
        current_output = output_wrapper_def;
 
@@ -1022,7 +1022,7 @@ ready:
        DelWrapper(wrapper);
     }
 
-  virtual void functionWrapperCPPSpecific(Node *n)
+    void functionWrapperCPPSpecific(Node *n)
     {
        ParmList *parms = Getattr(n, "parms");
        String *name = Copy(Getattr(n, "sym:name"));

From 0599b773771d27801c87f785f1b734627ceebcb0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:47:24 +0200
Subject: [PATCH 318/508] Remove useless overridden extendDirective()

There is no need to override it just to call the base class version.

Also remove the outdated comment, as %extend is supported currently
(albeit with some bugs remaining).

No real changes.
---
 Source/Modules/c.cxx | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 5b4549e89..4fb1c990e 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1559,18 +1559,6 @@ ready:
     Setattr(n, "sym:name", name);
     return Language::classDeclaration(n);
   }
-  
-  /* ---------------------------------------------------------------------
-   * extendDirective()
-   *
-   * The idea is to extend the class with additional variables, using
-   * SwigObj structs. This is not implemented yet.
-   * --------------------------------------------------------------------- */
-
-  virtual int extendDirective(Node *n) {
-    return Language::extendDirective(n);
-  }
-  
 };				/* class C */
 
 /* -----------------------------------------------------------------------------

From 92c922c841d87ab4d742a51d86cd02a7665744f3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:48:20 +0200
Subject: [PATCH 319/508] Remove trailing whitespace

No real changes.
---
 Source/Modules/c.cxx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 4fb1c990e..932a94f93 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -142,7 +142,7 @@ public:
    * C()
    * ----------------------------------------------------------------------------- */
 
-  C() : 
+  C() :
     empty_string(NewString(""))
   {
   }
@@ -179,7 +179,7 @@ public:
    * Return NULL if not otherwise the proxy class name, fully qualified with
    * top level namespace name if the nspace feature is used.
    * ----------------------------------------------------------------------------- */
-  
+
    String *getProxyName(SwigType *t) {
      Node *n = classLookup(t);
 
@@ -281,7 +281,7 @@ public:
   /* -----------------------------------------------------------------------------
    * substituteResolvedType()
    *
-   * Substitute the special variable $csclassname with the proxy class name for classes/structs/unions 
+   * Substitute the special variable $csclassname with the proxy class name for classes/structs/unions
    * that SWIG knows about. Also substitutes enums with enum name.
    * Otherwise use the $descriptor name for the C# class name. Note that the $&csclassname substitution
    * is the same as a $&descriptor substitution, ie one pointer added to descriptor name.
@@ -490,7 +490,7 @@ public:
 
   /* -----------------------------------------------------------------------
    * globalvariableHandler()
-   * ------------------------------------------------------------------------ */  
+   * ------------------------------------------------------------------------ */
 
   virtual int globalvariableHandler(Node *n) {
     // Don't export static globals, they won't be accessible when using a shared library, for example.
@@ -614,7 +614,7 @@ ready:
       Delete(prefix);
     if (type)
       Delete(type);
-    
+
     return result;
   }
 
@@ -1082,7 +1082,7 @@ ready:
   /* ----------------------------------------------------------------------
    * functionWrapper()
    * ---------------------------------------------------------------------- */
-   
+
   virtual int functionWrapper(Node *n) {
     if (!Getattr(n, "sym:overloaded")) {
       if (!addSymbol(Getattr(n, "sym:name"), n))
@@ -1304,7 +1304,7 @@ ready:
       String* const tdname = Getattr(n, "tdname");
       if (tdname)
         Append(struct_def, "typedef struct {\n");
-      else 
+      else
         Printv(struct_def, "struct ", name, " {\n", NIL);
       emit_c_struct_def(struct_def, n);
       if (tdname)
@@ -1541,7 +1541,7 @@ ready:
     Printv(f_wrappers_decl, "#define ", name, " ", value, "\n", NIL);
     return SWIG_OK;
   }
-  
+
   /* ---------------------------------------------------------------------
    * classDeclaration()
    * --------------------------------------------------------------------- */
@@ -1552,7 +1552,7 @@ ready:
     String *prefix = 0;
     if (classtype) {
       prefix = Swig_scopename_prefix(classtype);
-      if (prefix) 
+      if (prefix)
         Printf(name, "%s_", Swig_name_mangle(prefix));
     }
     Append(name, Swig_name_mangle(Getattr(n, "sym:name")));

From d1f8d465287d94fedaaf7af448dff04c4d071774 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:55:52 +0200
Subject: [PATCH 320/508] Fix some very wrongly indented lines and "else" style

Consistently put "else" on the same line as closing "}" from the
matching "if", if any.

No real changes.
---
 Source/Modules/c.cxx | 67 ++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 932a94f93..d154cae58 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -248,9 +248,9 @@ public:
     if (SwigType_isenum(classnametype)) {
       String *enumname = getEnumName(enumLookup(classnametype));
       if (enumname)
-  Replaceall(tm, classnamespecialvariable, enumname);
+	Replaceall(tm, classnamespecialvariable, enumname);
       else
-  Replaceall(tm, classnamespecialvariable, NewStringf("int"));
+	Replaceall(tm, classnamespecialvariable, NewStringf("int"));
     } else {
       scoped_dohptr btype(SwigType_base(classnametype));
       String* typestr = NIL;
@@ -305,7 +305,7 @@ public:
       SwigType *classnametype = Copy(strippedtype);
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
-  substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
+	substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
       }
       Delete(classnametype);
     }
@@ -664,8 +664,7 @@ ready:
                  Replaceall(tm, "$name", name);
                  Printv(wrapper->code, tm, "\n", NIL);
                  p = Getattr(p, "tmap:check:next");
-            }
-            else {
+            } else {
                  p = nextSibling(p);
             }
        }
@@ -723,20 +722,19 @@ ready:
 
   String *get_wrapper_func_return_type(Node *n)
     {
-       SwigType *type = Getattr(n, "type");
-       String *return_type;
+      SwigType *type = Getattr(n, "type");
+      String *return_type;
 
-       if ((return_type = Swig_typemap_lookup("ctype", n, "", 0))) {
-	 substituteResolvedType(type, return_type);
-       }
-       else {
-            Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
-	    return_type = NewString("");
-       }
+      if ((return_type = Swig_typemap_lookup("ctype", n, "", 0))) {
+	substituteResolvedType(type, return_type);
+      } else {
+	Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
+	return_type = NewString("");
+      }
 
-       Replaceall(return_type, "::", "_");
+      Replaceall(return_type, "::", "_");
 
-       return return_type;
+      return return_type;
     }
 
   /* ----------------------------------------------------------------------
@@ -803,8 +801,7 @@ ready:
 
 		 // template handling
 		 Replaceall(c_parm_type, "$tt", SwigType_lstr(type, 0));
-	    }
-	    else {
+	    } else {
 		 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s\n", SwigType_str(type, 0));
 	    }
 
@@ -819,8 +816,7 @@ ready:
 		   Printf(wrapper->code, "%s\n", tm);
 		 }
                  p = Getattr(p, "tmap:in:next");
-            }
-            else {
+            } else {
                  Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0));
                  p = nextSibling(p);
             }
@@ -895,8 +891,7 @@ ready:
             if (String *tm = Swig_typemap_lookup("cppouttype", n, "", 0)) {
 		 Wrapper_add_local(wrapper, "cppresult", SwigType_str(tm, "cppresult"));
                  return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1");
-            }
-            else {
+            } else {
                  Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cppouttype typemap defined for %s\n", SwigType_str(type, 0));
             }
        }
@@ -921,8 +916,7 @@ ready:
                  Replaceall(tm, "$name", name);
                  Printv(wrapper->code, tm, "\n", NIL);
                  p = Getattr(p, "tmap:check:next");
-            }
-            else {
+            } else {
                  p = nextSibling(p);
             }
        }
@@ -944,8 +938,7 @@ ready:
 	   Replaceall(action, "result =", "cppresult = (int)");
 	 else
 	   Replaceall(action, "result =", "cppresult = (int*)");
-       }
-       else if (return_object && Getattr(n, "c:retval") &&
+       } else if (return_object && Getattr(n, "c:retval") &&
 		!SwigType_isarray(type) &&
 		(Cmp(storage, "static") != 0)) {
 	 // returning object by value
@@ -954,8 +947,7 @@ ready:
 	 if (Cmp(Getattr(n, "kind"), "variable") == 0) {
 	   Delete(action);
 	   action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0));
-	 }
-	 else {
+	 } else {
 	   String *call_str = NewStringf("{const %s = %s", str,
 	     SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : "");
 	   Replaceall(action, "result =", call_str);
@@ -981,12 +973,10 @@ ready:
                  Printf(wrapper->code, "%s", tm);
                  if (Len(tm))
                    Printf(wrapper->code, "\n");
-            }
-            else {
+            } else {
                  Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), Getattr(n, "name"));
             }
-       }
-       else {
+       } else {
             Append(wrapper->code, action);
        }
 
@@ -1002,8 +992,7 @@ ready:
                       Printv(wrapper->code, tm, "\n", NIL);
                  }
                  p = Getattr(p, "tmap:freearg:next");
-            }
-            else {
+            } else {
                  p = nextSibling(p);
             }
        }
@@ -1090,10 +1079,9 @@ ready:
     }
 
     if (CPlusPlus) {
-         functionWrapperCPPSpecific(n);
-    }
-    else {
-         functionWrapperCSpecific(n);
+      functionWrapperCPPSpecific(n);
+    } else {
+      functionWrapperCSpecific(n);
     }
 
     return SWIG_OK;
@@ -1282,8 +1270,7 @@ ready:
 			Setattr(new_node, "c:base_name", old_name);
 			appendChild(n, new_node);
 		      }
-		    }
-		    else {
+		    } else {
 		      appendChild(n, copy_node(node));
 		    }
 		  }

From 61e13eb42be0fd106c02fdc61fcdb0a16438c831 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 14:59:48 +0200
Subject: [PATCH 321/508] Get rid of useless IS_SET_TO_ONE macro

Just use the standard GetFlag() instead.
---
 Source/Modules/c.cxx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index d154cae58..b47438879 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -10,12 +10,6 @@
 #include 
 #include "swigmod.h"
 
-#ifdef IS_SET_TO_ONE
-#undef IS_SET_TO_ONE
-#endif
-#define IS_SET_TO_ONE(n, var) \
-       (Cmp(Getattr(n, var), "1") == 0)
-
 int SwigType_isbuiltin(SwigType *t) {
   const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 };
   int i = 0;
@@ -841,7 +835,7 @@ ready:
        current_output = output_wrapper_decl;
 
        // C++ function wrapper proxy code
-       bool const is_global = IS_SET_TO_ONE(n, "c:globalfun");
+       bool const is_global = GetFlag(n, "c:globalfun");
        String *wname = is_global ? Swig_name_wrapper(name) : Copy(name);
        String *preturn_type = get_wrapper_func_return_type(n);
        String *wrapper_call = NewString("");
@@ -875,7 +869,7 @@ ready:
        SwigType *type = Getattr(n, "type");
        SwigType *otype = Copy(type);
        SwigType *return_type = get_wrapper_func_return_type(n);
-       String *wname = IS_SET_TO_ONE(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
+       String *wname = GetFlag(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
        bool is_void_return = (SwigType_type(type) == T_VOID);

From fb0579a0dfdabd894c1d99e8ff5358acfef0912c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 15:23:35 +0200
Subject: [PATCH 322/508] Simplify SWIGTYPE "in" typemap

There is no need to check if the input is non-null, as the effect of
both branches of "if" is the same anyhow.

Also get rid of an extra and unnecessary block.

No real changes.
---
 Lib/c/c.swg | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 7ce4e927a..bcb6a528c 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -190,12 +190,9 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
     free($input);
 }
 
-%typemap(in) SWIGTYPE & {
-  if ($input)
+%typemap(in) SWIGTYPE & %{
     $1 = ($1_ltype) $input;
-  else
-    $1 = ($1_ltype) 0;
-}
+%}
 
 // Typemaps for assigning result values to a special return variable
 same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")

From cb3d9df000e3ef6d084fa46d4a433f15c9fd59dd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 15:44:23 +0200
Subject: [PATCH 323/508] Fix bug with return value of getNamespacedName()

We need to make a copy instead of directly returning whatever sym::name
points to, as this value can be overwritten with something different
later, resulting in weird problems with the value of "proxyname"
attribute changing "on its own".

After this bug fix, a few more unit tests pass.
---
 Examples/test-suite/c/Makefile.in | 5 -----
 Source/Modules/c.cxx              | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index a7159d378..b964b9200 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -51,7 +51,6 @@ FAILING_CPP_TESTS := \
     char_strings \
     constant_pointers \
     default_args \
-    director_enum \
     director_smartptr \
     director_string \
     enum_thorough \
@@ -82,11 +81,7 @@ FAILING_CPP_TESTS := \
     member_pointer_const \
     mixed_types \
     multiple_inheritance_shared_ptr \
-    namespace_class \
     nested_class \
-    nested_scope \
-    nested_template_base \
-    smart_pointer_extend \
     smart_pointer_template_defaults_overload \
     stl_no_default_constructor \
     struct_initialization_cpp \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index b47438879..a50009075 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -158,12 +158,11 @@ public:
           // FIXME: using namespace as class name is a hack.
           proxyname = Swig_name_member(NULL, nspace, symname);
      } else {
-          proxyname = symname;
+          proxyname = Copy(symname);
      }
      Setattr(n, "proxyname", proxyname);
-     Delete(proxyname);
 
-     return Copy(proxyname);
+     return proxyname;
   }
 
   /* -----------------------------------------------------------------------------

From 579c441aa93f3d5ac4008d004155bc85fd50d946 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 17:06:10 +0200
Subject: [PATCH 324/508] Get rid of rather useless "goto" statement in
 get_mangled_type()

It's not significantly simpler to use "goto" in this function, so just
replace it with "return".

Also remove the unnecessary checks for strings being deleted being
non-null, as they always are.

No real changes.
---
 Source/Modules/c.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index a50009075..7cbf25b67 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -577,7 +577,8 @@ public:
       SwigType_del_pointer(type);
       if (SwigType_isfunction(type)) {
         Printf(result, "f");
-        goto ready;
+	Delete(type);
+	return result;
       }
       Delete(type);
       type = Copy(type_arg);
@@ -602,7 +603,6 @@ public:
     else
       Printf(result, "%s", Char(Swig_name_mangle(SwigType_base(type))));
 
-ready:
     if (prefix)
       Delete(prefix);
     if (type)

From 9615021a910d283833033ed8af990c356183f3e3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 17:01:13 +0200
Subject: [PATCH 325/508] Micro optimize handling of prefix in
 get_mangled_type()

Don't bother with a bunch of Replaceall() calls if the prefix is empty
to begin with, which is commonly the case.

No real changes.
---
 Source/Modules/c.cxx | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 7cbf25b67..81415bcd8 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -560,7 +560,6 @@ public:
 
   String *get_mangled_type(SwigType *type_arg) {
     String *result = NewString("");
-    SwigType *prefix = 0;
     SwigType *type = 0;
     SwigType *tdtype = SwigType_typedef_resolve_all(type_arg);
     if (tdtype)
@@ -584,16 +583,18 @@ public:
       type = Copy(type_arg);
     }
 
-    prefix = SwigType_prefix(type);
-    Replaceall(prefix, ".", "");
-    Replaceall(prefix, "const", "c");
-    Replaceall(prefix, "volatile", "v");
-    Replaceall(prefix, "a(", "a");
-    Replaceall(prefix, "m(", "m");
-    Replaceall(prefix, "q(", "");
-    Replaceall(prefix, ")", "");
-    Replaceall(prefix, " ", "");
-    Printf(result, "%s", prefix);
+    SwigType *prefix = SwigType_prefix(type);
+    if (Len(prefix)) {
+      Replaceall(prefix, ".", "");
+      Replaceall(prefix, "const", "c");
+      Replaceall(prefix, "volatile", "v");
+      Replaceall(prefix, "a(", "a");
+      Replaceall(prefix, "m(", "m");
+      Replaceall(prefix, "q(", "");
+      Replaceall(prefix, ")", "");
+      Replaceall(prefix, " ", "");
+      Printf(result, "%s", prefix);
+    }
 
     type = SwigType_base(type);
     if (SwigType_isbuiltin(type))

From 11d7f09f7a75280258ce57168253f880def14508 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 17:09:00 +0200
Subject: [PATCH 326/508] Fix bug with mangling enums in overloaded function
 names

Don't generate "enum foo" in the function names, which obviously can't
contain spaces.

This allows another unit test to pass.
---
 Examples/test-suite/c/Makefile.in |  1 -
 Source/Modules/c.cxx              | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index b964b9200..c98388c20 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -50,7 +50,6 @@ FAILING_CPP_TESTS := \
     arrays_global_twodim \
     char_strings \
     constant_pointers \
-    default_args \
     director_smartptr \
     director_string \
     enum_thorough \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 81415bcd8..01ceb3a1c 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -597,17 +597,21 @@ public:
     }
 
     type = SwigType_base(type);
-    if (SwigType_isbuiltin(type))
+    if (SwigType_isbuiltin(type)) {
       Printf(result, "%c", *Char(SwigType_base(type)));
-    else if (SwigType_isenum(type))
-      Printf(result, "e%s", Swig_scopename_last(type));
-    else
+    } else if (SwigType_isenum(type)) {
+      String* enumname = Swig_scopename_last(type);
+      const char* s = Char(enumname);
+      static const int len_enum_prefix = strlen("enum ");
+      if (strncmp(s, "enum ", len_enum_prefix) == 0)
+	s += len_enum_prefix;
+      Printf(result, "e%s", s);
+    } else {
       Printf(result, "%s", Char(Swig_name_mangle(SwigType_base(type))));
+    }
 
-    if (prefix)
-      Delete(prefix);
-    if (type)
-      Delete(type);
+    Delete(prefix);
+    Delete(type);
 
     return result;
   }

From ef77cefd8d5e6c96936acb8849c819b3d1426b10 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 17:45:59 +0200
Subject: [PATCH 327/508] Rename operator() for C in functors unit test

This ensures that these operators are actually wrapped, instead of just
being ignored with warnings.
---
 Examples/test-suite/functors.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/functors.i b/Examples/test-suite/functors.i
index 363123000..39e3078af 100644
--- a/Examples/test-suite/functors.i
+++ b/Examples/test-suite/functors.i
@@ -1,7 +1,7 @@
 %module functors
 
 // Rename operator() only if the language does not already do this by default
-#if defined(SWIGCSHARP) || defined(SWIGGO) || defined(SWIGGUILE) || defined(SWIGJAVA) || defined(SWIGJAVASCRIPT) || defined(SWIGPHP) || defined(SWIGSCILAB) || defined(SWIGTCL)
+#if defined(SWIGC) || defined(SWIGCSHARP) || defined(SWIGGO) || defined(SWIGGUILE) || defined(SWIGJAVA) || defined(SWIGJAVASCRIPT) || defined(SWIGPHP) || defined(SWIGSCILAB) || defined(SWIGTCL)
 %rename(Funktor) operator();
 #endif
 

From dc2af47e1d4648577a555c27e9dc00f11f75fb0b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 17:47:05 +0200
Subject: [PATCH 328/508] Fix warning about undeclared strcmp() in a unit test

Just include the header declaring it in the test code.
---
 Examples/test-suite/c/global_vars_runme.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/test-suite/c/global_vars_runme.c b/Examples/test-suite/c/global_vars_runme.c
index 3802ab6be..917b2707e 100644
--- a/Examples/test-suite/c/global_vars_runme.c
+++ b/Examples/test-suite/c/global_vars_runme.c
@@ -1,4 +1,5 @@
 #include 
+#include 
 #include "global_vars/global_vars_wrap.h"
 
 int main(int argc, const char *argv[])

From 8f1b9dbbc5454d0e58959962aaa9525807b4dd0a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 4 Aug 2019 17:47:54 +0200
Subject: [PATCH 329/508] Improve constants handling

Handle char constants defined using #define or %constant correctly.

Also handle static member const variables, which didn't work at all
before, and quote values of such variables of char type.
---
 Source/Modules/c.cxx | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 01ceb3a1c..6ec35d85b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1522,7 +1522,32 @@ public:
 
   virtual int constantWrapper(Node *n) {
     String *name = Getattr(n, "sym:name");
-    String *value = Getattr(n, "value");
+    // If it's a #define or a %constant, use raw value and hope that it will work in C as well as in C++. This is not ideal, but using "value" is even worse, as
+    // it doesn't even work for simple char constants such as "#define MY_X 'x'", that would end up unquoted in the generated code.
+    String *value = Getattr(n, "rawval");
+
+    if (!value) {
+      // Check if it's not a static member variable because its "value" is a reference to a C++ variable and won't translate to C correctly.
+      //
+      // Arguably, those should be handled in overridden memberconstantHandler() and not here.
+      value = Getattr(n, "staticmembervariableHandler:value");
+      if (value && Equal(Getattr(n, "valuetype"), "char")) {
+	// We need to quote this value.
+	const unsigned char c = *Char(value);
+	Clear(value);
+	if (isalnum(c)) {
+	  Printf(value, "'%c'", c);
+	} else {
+	  Printf(value, "'\\x%x%x'", c / 0x10, c % 0x10);
+	}
+      }
+    }
+
+    if (!value) {
+      // Fall back on whatever SWIG parsed the value as for all the rest.
+      value = Getattr(n, "value");
+    }
+
     Printv(f_wrappers_decl, "#define ", name, " ", value, "\n", NIL);
     return SWIG_OK;
   }

From ba564d4e4e82d29ea6c5f67b76b17c79254f3417 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 01:35:52 +0200
Subject: [PATCH 330/508] Fix memory leak of getProxyName() return value

This is done not so much to fix the memory leak per se (as there are
gazillions of other ones remaining), but to show that the return value
of getProxyName() does need to be freed, as this was unclear previously,
with it being freed in one place where this function was used, but not
in the other one, here.

Also state this explicitly in the function comment.
---
 Source/Modules/c.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6ec35d85b..021a40be4 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -169,8 +169,7 @@ public:
    * getProxyName()
    *
    * Test to see if a type corresponds to something wrapped with a proxy class.
-   * Return NULL if not otherwise the proxy class name, fully qualified with
-   * top level namespace name if the nspace feature is used.
+   * Return NULL if not, otherwise the proxy class name to be freed by the caller.
    * ----------------------------------------------------------------------------- */
 
    String *getProxyName(SwigType *t) {
@@ -205,6 +204,7 @@ public:
 	  }
           if (proxyname) {
             enumname = NewStringf("%s_%s", proxyname, symname);
+	    Delete(proxyname);
           } else {
             // global enum or enum in a namespace
             String *nspace = Getattr(n, "sym:nspace");

From 10b73ad2c1cec1ae8defd0e100d82042dfabed26 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 02:02:25 +0200
Subject: [PATCH 331/508] Remove unnecessary override of classDeclaration()

It doesn't seem necessary to muck with sym:name explicitly when we
construct the fully qualified name using getNamespacedName() later
anyhow.

Moreover, the overridden version had a bug which resulted in a crash in
template_empty_inherit unit test and simply removing it entirely allows
the test to pass (without breaking anything else).
---
 Examples/test-suite/c/Makefile.in |  1 -
 Source/Modules/c.cxx              | 18 ------------------
 2 files changed, 19 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index c98388c20..d8a557807 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -86,7 +86,6 @@ FAILING_CPP_TESTS := \
     struct_initialization_cpp \
     template_basic \
     template_default \
-    template_empty_inherit \
     template_enum \
     template_explicit \
     template_typedef_fnc \
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 021a40be4..8c5d50df1 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1551,24 +1551,6 @@ public:
     Printv(f_wrappers_decl, "#define ", name, " ", value, "\n", NIL);
     return SWIG_OK;
   }
-
-  /* ---------------------------------------------------------------------
-   * classDeclaration()
-   * --------------------------------------------------------------------- */
-
-  virtual int classDeclaration(Node *n) {
-    String *name = NewString("");
-    String *classtype = Getattr(n, "classtype");
-    String *prefix = 0;
-    if (classtype) {
-      prefix = Swig_scopename_prefix(classtype);
-      if (prefix)
-        Printf(name, "%s_", Swig_name_mangle(prefix));
-    }
-    Append(name, Swig_name_mangle(Getattr(n, "sym:name")));
-    Setattr(n, "sym:name", name);
-    return Language::classDeclaration(n);
-  }
 };				/* class C */
 
 /* -----------------------------------------------------------------------------

From bd02ba19d8ef59370b90dac698cf2d3007d609d8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 02:03:58 +0200
Subject: [PATCH 332/508] Fix getNamespacedName() and reuse it for enum

There doesn't seem to be any unit tests covering this, but the old code
was wrong because it didn't replace periods used as namespace separators
with underscores, which resulted in periods appearing in the output when
nested namespace were used.

Fix this and also reuse the now fixed getNamespacedName() in
getEnumName() which contained its own buggy version of the same code.
---
 Source/Modules/c.cxx | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 8c5d50df1..107f539a0 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -155,10 +155,12 @@ public:
      String *nspace = Getattr(n, "sym:nspace");
 
      if (nspace) {
-          // FIXME: using namespace as class name is a hack.
-          proxyname = Swig_name_member(NULL, nspace, symname);
+       String *nspace_mangled = Copy(nspace);
+       Replaceall(nspace_mangled, ".", "_");
+       proxyname = NewStringf("%s_%s", nspace_mangled, symname);
+       Delete(nspace_mangled);
      } else {
-          proxyname = Copy(symname);
+       proxyname = Copy(symname);
      }
      Setattr(n, "proxyname", proxyname);
 
@@ -207,12 +209,7 @@ public:
 	    Delete(proxyname);
           } else {
             // global enum or enum in a namespace
-            String *nspace = Getattr(n, "sym:nspace");
-            if (nspace) {
-	      enumname = NewStringf("%s_%s", nspace, symname);
-            } else {
-              enumname = Copy(symname);
-            }
+	    enumname = getNamespacedName(n);
           }
           Setattr(n, "enumname", enumname);
           Delete(enumname);

From 649a1c3c98d8c6d220d2f4a1b3e77587adb35e84 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 14:15:18 +0200
Subject: [PATCH 333/508] Provide trivial SWIG_exception definition even in C
 mode

This is not really useful, but gets rid of an annoying warning when
running li_constraints.ctest unit test.
---
 Lib/c/c.swg | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index bcb6a528c..824129a16 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -267,11 +267,19 @@ typedef struct SwigObj SwigObj;
 typedef struct SwigObj SwigObj;
 %}
 
+#endif // SWIG_CPPMODE
+
 #ifdef SWIG_C_EXCEPT
 %include "cexcept.swg"
-#endif // SWIG_C_EXCEPT
-
-#endif // SWIG_CPPMODE
+#else // !SWIG_C_EXCEPT
+// Still define the macro used in some standard typemaps, but we can't
+// implement it in C, so just allow the user predefining their own version.
+%insert("runtime") %{
+#ifndef SWIG_exception
+#define SWIG_exception(code, msg)
+#endif
+%}
+#endif // SWIG_C_EXCEPT/!SWIG_C_EXCEPT
 
 %insert("runtime") %{
 #ifdef __cplusplus

From 2d13e18d076ced9335f496c6321ba714b441752d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 14:31:36 +0200
Subject: [PATCH 334/508] Allow reassigning scoped_dohptr

Not being able to do it is too restrictive in practice and just forces
to use raw DOH pointers, which is not really less dangerous than adding
the assignment operator and reset() method to this class.
---
 Source/Modules/c.cxx | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 107f539a0..52a090c74 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -37,7 +37,17 @@ public:
   ~scoped_dohptr() { Delete(obj_); }
 
   // This is an std::auto_ptr<>-like "destructive" copy ctor which allows to return objects of this type from functions.
-  scoped_dohptr(scoped_dohptr const& tmp) : obj_(tmp.release()) {}
+  scoped_dohptr(scoped_dohptr const& other) : obj_(other.release()) {}
+
+  // Same for the assignment operator.
+  scoped_dohptr& operator=(scoped_dohptr const& other) {
+    if (&other != this) {
+      Delete(obj_);
+      obj_ = other.release();
+    }
+
+    return *this;
+  }
 
   DOH* get() const { return obj_; }
 
@@ -47,12 +57,17 @@ public:
     return obj;
   }
 
+  void reset() {
+    if (obj_) {
+      Delete(obj_);
+      obj_ = NULL;
+    }
+  }
+
   operator DOH*() const { return obj_; }
 
 private:
-  scoped_dohptr& operator=(scoped_dohptr const&);
-
-  DOH* const obj_;
+  DOH* obj_;
 };
 
 // Helper class to output "begin" fragment in the ctor and "end" in the dtor.

From f1ab6b7ef251cc95ce53c36d6e0662728cd93a2c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 14:51:10 +0200
Subject: [PATCH 335/508] Change the generated names for the global functions

Prefix them with namespace-based prefix (e.g. "ns1_ns2_" for a function
inside ns1::ns2) if feature:nspace is on. Otherwise, or if the function
is defined in the global namespace, use the module name as prefix
instead of "_wrap": this is slightly less ugly and results in more
unique names.
---
 Doc/Manual/C.html    | 15 +++++++--------
 Source/Modules/c.cxx | 42 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 42e283714..d08a114cc 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -63,7 +63,6 @@ Flattening C++ language constructs into a set of C-style functions obviously com
 
 
      Known C++ Shortcomings in Generated C API:
      
 
        
-    
      • Namespaced global functions are not namespaced
        • 
     
      • Enums with a context like class or namespace are broken
        • 
     
      • Global variables are not supported
        • 
     
      • Qualifiers are stripped
        • 
@@ -192,11 +191,11 @@ Wrapping C functions and variables is obviously performed in a straightforward w
 
 
 
        
-For each C function declared in the interface file a wrapper function with the prefix _wrap_ is created. Basically, the wrapper function performs a call to the original function, and returns its result. For convenience, a #define func _wrap_func is also provided in the generated header file to make it possible to call the function under its original name. If this is undesirable, SWIG_NO_WRAPPER_ALIASES can be predefined before including the wrapper header to disable these defines.
+For each C function declared in the interface file a wrapper function with a prefix, required to make its name different from the original one, is created. The prefix for the global functions is module_, i.e. the name of the SWIG module followed by underscore. If nspace feature is used, the prefix for a function defined in a namespace is namespace_ -- note that it does not contain the module prefix, as it's not necessary to make a unique function name in this case. The wrapper function performs a call to the original function, and returns its result. For convenience, a #define func prefix_func is also provided in the generated header file to make it possible to call the function under its original name. If this is undesirable, SWIG_NO_WRAPPER_ALIASES can be predefined before including the wrapper header to disable these defines.
 
        
 
 
        
-For example, for function declaration:
+For example, for function declaration in the module mymath:
 
        
 
 
        @@ -208,7 +207,7 @@ The output is simply:
 
        
 
 
        -int _wrap_gcd(int arg1, int arg2) {
+int mymath_gcd(int arg1, int arg2) {
   int result;
   result = gcd(arg1,arg2);
   return result;
@@ -426,7 +425,7 @@ area: 7.068583
           Typecasts wrapper functions return values in proxy functions
        
           
               MyClass *MyClass_new(void) {
        
-               return (MyClass *)_wrap_MyClass_new();
        
+               return (MyClass *)MyClass_new();
        
               }
                   
       
@@ -436,7 +435,7 @@ area: 7.068583
     Mapping of wrapper functions parameters to local C++ variables
        
        
        
        
-          SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
        
+          SwigObj* MyClass_do(SwigObj *carg1) {
        
              SomeCPPClass *arg1 = 0;
        
              if (carg1)
        
                 arg1 = (SomeCPPClass*)carg1->obj
        
@@ -500,7 +499,7 @@ void SomeIntTemplateClass_delete(SomeIntTemplateClass * carg1);
 We'll examine the generation of the wrapper function first.
 
 
        -SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) {
+SWIGEXPORTC SwigObj * module_someFunction(SwigObj * carg1, int carg2) {
   SomeClass * cppresult;
   SomeTemplateClass< int > *arg1 = 0 ;
   int arg2 ;
@@ -544,7 +543,7 @@ Let's go through it step by step and start with the wrapper prototype
 
         ctype                        ctype            ctype
 ---------                    ---------        ---
-SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
+SwigObj * module_someFunction(SwigObj * carg1, int carg2);
 
        
 
 As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 52a090c74..70d850fd8 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -136,6 +136,9 @@ class C:public Language {
 
   String *empty_string;
 
+  // Prefix for module-level symbols, currently just the module name.
+  String *module_prefix;
+
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
 
@@ -152,10 +155,15 @@ public:
    * ----------------------------------------------------------------------------- */
 
   C() :
-    empty_string(NewString(""))
+    empty_string(NewString("")),
+    module_prefix(NULL)
   {
   }
 
+  ~C()
+  {
+    Delete(module_prefix);
+  }
 
   String *getNamespacedName(Node *n)
   {
@@ -182,6 +190,31 @@ public:
      return proxyname;
   }
 
+  // Construct the name to be used for a global (i.e. not member) symbol in C wrappers.
+  //
+  // The returned string must be freed by caller.
+  String *getGlobalWrapperName(Node *n, String *name) const
+  {
+    // Use namespace as the prefix if feature:nspace is in use.
+    scoped_dohptr scopename_prefix(Swig_scopename_prefix(Getattr(n, "name")));
+    if (scopename_prefix) {
+      if (GetFlag(parentNode(n), "feature:nspace")) {
+	scoped_dohptr mangled_prefix(Swig_string_mangle(scopename_prefix));
+	scopename_prefix = mangled_prefix;
+      } else {
+	scopename_prefix.reset();
+      }
+    }
+
+    // Fall back to the module name if we don't use feature:nspace or are outside of any namespace.
+    //
+    // Note that we really, really need to use some prefix, as a global wrapper function can't have the same name as the original function (being wrapped) with
+    // the same name.
+    String* const prefix = scopename_prefix ? scopename_prefix : module_prefix;
+
+    return NewStringf("%s_%s", prefix, name);
+  }
+
   /* -----------------------------------------------------------------------------
    * getProxyName()
    *
@@ -386,6 +419,7 @@ public:
 
   virtual int top(Node *n) {
     String *module = Getattr(n, "name");
+    module_prefix = Copy(module);
     String *outfile = Getattr(n, "outfile");
 
     // initialize I/O
@@ -632,7 +666,7 @@ public:
     {
        // this is C function, we don't apply typemaps to it
        String *name = Getattr(n, "sym:name");
-       String *wname = Swig_name_wrapper(name);
+       String *wname = getGlobalWrapperName(n, name);
        SwigType *type = Getattr(n, "type");
        SwigType *return_type = NULL;
        String *arg_names = NULL;
@@ -852,7 +886,7 @@ public:
 
        // C++ function wrapper proxy code
        bool const is_global = GetFlag(n, "c:globalfun");
-       String *wname = is_global ? Swig_name_wrapper(name) : Copy(name);
+       String *wname = is_global ? getGlobalWrapperName(n, name) : Copy(name);
        String *preturn_type = get_wrapper_func_return_type(n);
        String *wrapper_call = NewString("");
 
@@ -885,7 +919,7 @@ public:
        SwigType *type = Getattr(n, "type");
        SwigType *otype = Copy(type);
        SwigType *return_type = get_wrapper_func_return_type(n);
-       String *wname = GetFlag(n, "c:globalfun") ? Swig_name_wrapper(name) : Copy(name);
+       String *wname = GetFlag(n, "c:globalfun") ? getGlobalWrapperName(n, name) : Copy(name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
        bool is_void_return = (SwigType_type(type) == T_VOID);

From 70bc33a3be0af5a3d47b39ae96ecd62f9f70d3df Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 5 Aug 2019 20:43:09 +0200
Subject: [PATCH 336/508] Add support for "$owner" expansion in "out" typemaps

This is going to be used for the upcoming shared_ptr<> support.
---
 Source/Modules/c.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 70d850fd8..e5fe50222 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1014,6 +1014,7 @@ public:
             String *tm;
             if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) {
                  Replaceall(tm, "$result", "result");
+		 Replaceall(tm, "$owner", GetFlag(n, "feature:new") ? "1" : "0");
                  Printf(wrapper->code, "%s", tm);
                  if (Len(tm))
                    Printf(wrapper->code, "\n");

From 8eda01fd759fce082b4aacce4a92ae3e24c82cf8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 6 Aug 2019 00:24:07 +0200
Subject: [PATCH 337/508] Get rid of extra unnecessary blocks in common
 typemaps

Use "..." instead of "{...}" to avoid generating extra lines with
opening/closing curly braces, which are completely unnecessary.

Also remove an unnecessary "if" check in "in" typemap, which was
useless.

No real changes.
---
 Lib/c/c.swg | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 824129a16..96a463cba 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -145,14 +145,9 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
     $1 = *($&1_ltype) &$input;
 }
 
-%typemap(in) SWIGTYPE {
-  $1 = *($1_ltype *)$input;
-}
+%typemap(in) SWIGTYPE "$1 = *($1_ltype *)$input;"
 
-%typemap(in) SWIGTYPE * {
-  if ($input)
-    $1 = ($1_ltype) $input;
-}
+%typemap(in) SWIGTYPE * "$1 = ($1_ltype) $input;"
 
 %typemap(in) SWIGTYPE *[ANY] {
   if ($input) {
@@ -209,13 +204,9 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
   *($&1_ltype) &$result = $1; 
 }
 
-%typemap(out) SWIGTYPE {
-  $result = (SwigObj*) &$1;
-}
+%typemap(out) SWIGTYPE "$result = (SwigObj*) &$1;"
 
-%typemap(out) SWIGTYPE *, SWIGTYPE & {
-  $result = (SwigObj*) $1;
-}
+%typemap(out) SWIGTYPE *, SWIGTYPE & "$result = (SwigObj*) $1;"
 
 %typemap(out) SWIGTYPE * [ANY], SWIGTYPE [ANY][ANY] {
   static SwigObj **_temp = 0;

From fd3e76365692fe2ec070681d3a59cfef0d77d4ec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 6 Aug 2019 02:35:25 +0200
Subject: [PATCH 338/508] Streamline and fix returning objects by value

Remove the code related to "_result_ref" which was confusing and plain
wrong, as it generated something that compiled but crashed during
run-time due to the use of a pointer to an already destroyed stack
object.

Instead, correct the "out" typemap to create a new copy of the object,
which mostly works fine on its own, except that it depends on using
SwigValueWrapper if necessary, so add the call to cplus_value_type()
does this. This also required removing the code resolving typedefs in
the "type" attribute because it confused the base class logic and still
needs an explicit cast to the actual return type due to the use of (and
probable bug in) get_wrapper_func_return_type().

These changes mean that "cppouttype" typemap is not used any longer, so
remove it too.

A couple more tests pass now.
---
 Examples/test-suite/c/Makefile.in |  4 ---
 Lib/c/c.swg                       | 19 +---------
 Lib/c/std_string.i                | 12 +++++--
 Source/Modules/c.cxx              | 58 ++++++++-----------------------
 4 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index d8a557807..8ec13cb04 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -48,7 +48,6 @@ FAILING_CPP_TESTS := \
     arrays_dimensionless \
     arrays_global \
     arrays_global_twodim \
-    char_strings \
     constant_pointers \
     director_smartptr \
     director_string \
@@ -57,7 +56,6 @@ FAILING_CPP_TESTS := \
     extend_default \
     extern_c \
     extern_template_method \
-    features \
     funcptr_cpp \
     global_scope_types \
     grouping \
@@ -67,7 +65,6 @@ FAILING_CPP_TESTS := \
     li_boost_shared_ptr_bits \
     li_boost_shared_ptr_director \
     li_boost_shared_ptr_template \
-    li_carrays_cpp \
     li_std_combinations \
     li_std_deque \
     li_std_map \
@@ -83,7 +80,6 @@ FAILING_CPP_TESTS := \
     nested_class \
     smart_pointer_template_defaults_overload \
     stl_no_default_constructor \
-    struct_initialization_cpp \
     template_basic \
     template_default \
     template_enum \
diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 96a463cba..20e03548e 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -204,7 +204,7 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
   *($&1_ltype) &$result = $1; 
 }
 
-%typemap(out) SWIGTYPE "$result = (SwigObj*) &$1;"
+%typemap(out) SWIGTYPE "$result = (SwigObj*)new $1_ltype($1);"
 
 %typemap(out) SWIGTYPE *, SWIGTYPE & "$result = (SwigObj*) $1;"
 
@@ -231,23 +231,6 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
     $result = ($1_ltype) 0;
 }
 
-// typemaps for 'cppresult'
-same_macro_all_primitive_types_but_void(same_type,cppouttype);
-same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
-
-%typemap(cppouttype, retobj="1") SWIGTYPE      "$1_ltype *"
-%typemap(cppouttype) SWIGTYPE *    "$1_ltype"
-%typemap(cppouttype) const SWIGTYPE * "const $1_ltype"
-%typemap(cppouttype) SWIGTYPE &    "$1_ltype"
-%typemap(cppouttype) SWIGTYPE [ANY] "$1_ltype"
-%typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype"
-%typemap(cppouttype, retobj="1") enum SWIGTYPE "int"
-%typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
-%typemap(cppouttype) SWIGTYPE (CLASS::*) "$1_ltype"
-
-%typemap(cppouttype, fragment="stdbool_inc") bool, const bool, const bool & "bool"
-%typemap(cppouttype, fragment="stdbool_inc") bool *, const bool *, bool & "bool *"
-
 #ifdef SWIG_CPPMODE
 
 %insert("runtime") %{
diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i
index d7ea01e39..546d34a41 100644
--- a/Lib/c/std_string.i
+++ b/Lib/c/std_string.i
@@ -13,8 +13,6 @@ class string;
 %typemap(ctype) string * "char *"
 %typemap(ctype) string & "char *"
 %typemap(ctype) const string & "char *"
-%typemap(cppouttype, retobj="1") string "std::string*"
-%typemap(cppouttype) const string &, string *, string & "std::string*"
 
 %typemap(in) string {
   if ($input) {
@@ -40,7 +38,15 @@ class string;
     delete $1;
 }
 
-%typemap(out) string, const string &, string *, string & {
+%typemap(out) string {
+  const char *str = cppresult.c_str();
+  size_t len = strlen(str);
+  $result = (char *) malloc(len + 1);
+  memcpy($result, str, len);
+  $result[len] = '\0';
+}
+
+%typemap(out) const string &, string *, string & {
   const char *str = cppresult->c_str();
   size_t len = strlen(str);
   $result = (char *) malloc(len + 1);
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index e5fe50222..a30d3ccfb 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -915,7 +915,6 @@ public:
        current_output = output_wrapper_def;
 
        // C++ function wrapper
-       String *storage = Getattr(n, "storage");
        SwigType *type = Getattr(n, "type");
        SwigType *otype = Copy(type);
        SwigType *return_type = get_wrapper_func_return_type(n);
@@ -923,7 +922,6 @@ public:
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
        bool is_void_return = (SwigType_type(type) == T_VOID);
-       bool return_object = false;
        // create new function wrapper object
        Wrapper *wrapper = NewWrapper();
 
@@ -932,12 +930,12 @@ public:
 
        // add variable for holding result of original function 'cppresult'
        if (!is_void_return) {
-            if (String *tm = Swig_typemap_lookup("cppouttype", n, "", 0)) {
-		 Wrapper_add_local(wrapper, "cppresult", SwigType_str(tm, "cppresult"));
-                 return_object = checkAttribute(n, "tmap:cppouttype:retobj", "1");
-            } else {
-                 Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No cppouttype typemap defined for %s\n", SwigType_str(type, 0));
-            }
+	 SwigType *value_type = cplus_value_type(type);
+	 SwigType* cppresult_type = value_type ? value_type : type;
+	 SwigType* ltype = SwigType_ltype(cppresult_type);
+	 Wrapper_add_local(wrapper, "cppresult", SwigType_str(ltype, "cppresult"));
+	 Delete(ltype);
+	 Delete(value_type);
        }
 
        // create wrapper function prototype
@@ -976,35 +974,7 @@ public:
             Replaceall(action, Getattr(n, "name"), cbase_name);
        }
 
-       // handle special cases of cpp return result
-       if (SwigType_isenum(SwigType_base(type))) {
-	 if (return_object)
-	   Replaceall(action, "result =", "cppresult = (int)");
-	 else
-	   Replaceall(action, "result =", "cppresult = (int*)");
-       } else if (return_object && Getattr(n, "c:retval") &&
-		!SwigType_isarray(type) &&
-		(Cmp(storage, "static") != 0)) {
-	 // returning object by value
-	 String *str = SwigType_str(SwigType_add_reference(SwigType_base(type)), "_result_ref");
-	 String *lstr = SwigType_lstr(type, 0);
-	 if (Cmp(Getattr(n, "kind"), "variable") == 0) {
-	   Delete(action);
-	   action = NewStringf("{const %s = %s;", str, Swig_cmemberget_call(Getattr(n, "name"), type, 0, 0));
-	 } else {
-	   String *call_str = NewStringf("{const %s = %s", str,
-	     SwigType_ispointer(SwigType_typedef_resolve_all(otype)) ? "*" : "");
-	   Replaceall(action, "result =", call_str);
-	   Delete(call_str);
-	 }
-	 if (Getattr(n, "nested"))
-	   Replaceall(action, "=", NewStringf("= *(%s)(void*) &", SwigType_str(otype, 0)));
-	 Printf(action, "cppresult = (%s*) &_result_ref;}", lstr);
-	 Delete(str);
-	 Delete(lstr);
-       } else {
-	 Replaceall(action, "result =", "cppresult =");
-       }
+       Replaceall(action, "result =", "cppresult =");
 
        // prepare action code to use, e.g. insert try-catch blocks
        action = emit_action(n);
@@ -1013,6 +983,14 @@ public:
        if (!is_void_return) {
             String *tm;
             if ((tm = Swig_typemap_lookup_out("out", n, "cppresult", wrapper, action))) {
+	      // This is ugly, but the type of our result variable is not always the same as the actual return type currently because
+	      // get_wrapper_func_return_type() applies ctype typemap to it. These types are more or less compatible though, so we should be able to cast
+	      // between them explicitly.
+	      const char* start = Char(tm);
+	      const char* p = strstr(start, "$result = ");
+	      if (p == start || (p && p[-1] == ' ')) {
+		Insert(tm, p - start + strlen("$result = "), NewStringf("(%s)", return_type));
+	      }
                  Replaceall(tm, "$result", "result");
 		 Replaceall(tm, "$owner", GetFlag(n, "feature:new") ? "1" : "0");
                  Printf(wrapper->code, "%s", tm);
@@ -1060,8 +1038,6 @@ public:
     {
        ParmList *parms = Getattr(n, "parms");
        String *name = Copy(Getattr(n, "sym:name"));
-       SwigType *type = Getattr(n, "type");
-       SwigType *tdtype = NULL;
 
        // mangle name if function is overloaded
        if (Getattr(n, "sym:overloaded")) {
@@ -1099,10 +1075,6 @@ public:
             }
        }
 
-       // resolve correct type
-       if((tdtype = SwigType_typedef_resolve_all(type)))
-         Setattr(n, "type", tdtype);
-
        // make sure lnames are set
        functionWrapperPrepareArgs(parms);
 

From 82ae30722fbdbea63508aba6fe1648371cee0378 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 6 Aug 2019 20:56:19 +0200
Subject: [PATCH 339/508] Include missing header in char_strings test code

Avoid warnings about implicitly-declared strcmp().
---
 Examples/test-suite/c/char_strings_runme.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index ba56fb10e..2020e5998 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -1,5 +1,6 @@
 #include 
 #include 
+#include 
 
 #include "char_strings/char_strings_wrap.h"
 

From f864fa0381a8cf60d7de75359966c1d1f32c39cd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 6 Aug 2019 20:56:48 +0200
Subject: [PATCH 340/508] Fix types of some pointers in char_strings unit test

The tests still passed, but with warnings during compilation.
---
 Examples/test-suite/c/char_strings_runme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index 2020e5998..92edce116 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -179,7 +179,7 @@ int main() {
   // char *& tests
   
   for (i=0; i
Date: Tue, 6 Aug 2019 20:57:44 +0200
Subject: [PATCH 341/508] Mark some C++11 tests as failing with C module too

Allow having the list of failing C++11 tests in the common makefile.
---
 Examples/test-suite/c/Makefile.in | 10 ++++++++++
 Examples/test-suite/common.mk     |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 8ec13cb04..92773fd7a 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -96,6 +96,16 @@ FAILING_CPP_TESTS := \
     varargs_overload \
     virtual_poly \
 
+FAILING_CPP11_TESTS := \
+    cpp11_alternate_function_syntax \
+    cpp11_ref_qualifiers \
+    cpp11_ref_qualifiers_typemaps \
+    cpp11_result_of \
+    cpp11_rvalue_reference \
+    cpp11_rvalue_reference2 \
+    cpp11_rvalue_reference3 \
+    cpp11_type_aliasing \
+
 FAILING_MULTI_CPP_TESTS := \
     clientdata_prop \
     imports \
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 822fc949c..6d230e68a 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -747,6 +747,7 @@ preproc_include.ctest: SWIGOPT += -includeall
 # Allow modules to define temporarily failing tests.
 C_TEST_CASES := $(filter-out $(FAILING_C_TESTS),$(C_TEST_CASES))
 CPP_TEST_CASES := $(filter-out $(FAILING_CPP_TESTS),$(CPP_TEST_CASES))
+CPP11_TEST_CASES := $(filter-out $(FAILING_CPP11_TESTS),$(CPP11_TEST_CASES))
 MULTI_CPP_TEST_CASES := $(filter-out $(FAILING_MULTI_CPP_TESTS),$(MULTI_CPP_TEST_CASES))
 
 
@@ -797,6 +798,7 @@ check-failing-test = \
 check-failing:
 	+-$(foreach t,$(FAILING_C_TESTS),$(call check-failing-test,$t,ctest);)
 	+-$(foreach t,$(FAILING_CPP_TESTS),$(call check-failing-test,$t,cpptest);)
+	+-$(foreach t,$(FAILING_CPP11_TESTS),$(call check-failing-test,$t,cpptest);)
 	+-$(foreach t,$(FAILING_MULTI_CPP_TESTS),$(call check-failing-test,$t,multicpptest);)
 endif
 

From fc1ebd7c182eb5c89d02ada4e30d0089a36e7c7c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 7 Aug 2019 02:13:02 +0200
Subject: [PATCH 342/508] Add trivial but working std::pair typemaps
 implementation

The existing typemaps didn't work at all and making them work would
require defining all the typemaps needed by the Unified Typemaps
Library, which seems to be geared towards dynamic languages.

Just implement completely straightforward (and not very convenient to
use) typemaps instead.

Enable the now passing unit tests and add a runme for one of them.
---
 Examples/test-suite/c/Makefile.in         |  2 --
 Examples/test-suite/c/li_std_pair_runme.c | 42 +++++++++++++++++++++++
 Lib/c/std_pair.i                          | 25 +++++++++++++-
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 Examples/test-suite/c/li_std_pair_runme.c

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 92773fd7a..b9df15b25 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -65,10 +65,8 @@ FAILING_CPP_TESTS := \
     li_boost_shared_ptr_bits \
     li_boost_shared_ptr_director \
     li_boost_shared_ptr_template \
-    li_std_combinations \
     li_std_deque \
     li_std_map \
-    li_std_pair \
     li_std_pair_using \
     li_std_wstring \
     li_windows \
diff --git a/Examples/test-suite/c/li_std_pair_runme.c b/Examples/test-suite/c/li_std_pair_runme.c
new file mode 100644
index 000000000..fbd41feea
--- /dev/null
+++ b/Examples/test-suite/c/li_std_pair_runme.c
@@ -0,0 +1,42 @@
+#include "li_std_pair/li_std_pair_wrap.h"
+#include 
+
+int main() {
+    {
+        IntPair* intPair = makeIntPair(7, 6);
+        assert(IntPair_first_get(intPair)==7 && IntPair_second_get(intPair)==6);
+
+        assert(product1(intPair) == 42);
+        assert(product2(intPair) == 42);
+        assert(product3(intPair) == 42);
+
+        IntPair_delete(intPair);
+    }
+
+    {
+        IntPair* intPairPtr = makeIntPairPtr(7, 6);
+        assert(IntPair_first_get(intPairPtr)==7 && IntPair_second_get(intPairPtr)==6);
+
+        assert(product1(intPairPtr) == 42);
+        assert(product2(intPairPtr) == 42);
+        assert(product3(intPairPtr) == 42);
+    }
+
+    {
+        IntPair* intPairRef = makeIntPairRef(7, 6);
+        assert(IntPair_first_get(intPairRef)==7 && IntPair_second_get(intPairRef)==6);
+
+        assert(product1(intPairRef) == 42);
+        assert(product2(intPairRef) == 42);
+        assert(product3(intPairRef) == 42);
+    }
+
+    {
+        IntPair* intPairConstRef = makeIntPairConstRef(7, 6);
+        assert(IntPair_first_get(intPairConstRef)==7 && IntPair_second_get(intPairConstRef)==6);
+
+        assert(product1(intPairConstRef) == 42);
+        assert(product2(intPairConstRef) == 42);
+        assert(product3(intPairConstRef) == 42);
+    }
+}
diff --git a/Lib/c/std_pair.i b/Lib/c/std_pair.i
index 82ca45c1a..f6e1c7c81 100644
--- a/Lib/c/std_pair.i
+++ b/Lib/c/std_pair.i
@@ -1 +1,24 @@
-%include 
+%{
+#include 
+%}
+
+// Ideal, especially for the simple/primitive types, would be to represent
+// pair as a C struct with the 2 fields, but for now we use the simplest
+// possible implementation, with the accessor functions required to work with
+// the fields.
+
+namespace std {
+  template  struct pair {
+    typedef T first_type;
+    typedef U second_type;
+
+    pair();
+    pair(T first, U second);
+    pair(const pair& other);
+
+    template  pair(const pair &other);
+
+    T first;
+    U second;
+  };
+}

From b5a8ccffa3fe7ebafae5b08fa923a487701b4b46 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 4 Oct 2021 21:43:33 +0200
Subject: [PATCH 343/508] Explicitly refuse to wrap vararg functions

They were not supported currently, but processing them resulted in just
a warning about missing ctype typemap and generated uncompilable code.

Give an error and don't generate any code at all now, which is more
clear and helpful.

Also exclude the part of kwargs_feature test using varargs from C test
suite.
---
 Doc/Manual/C.html                    | 1 +
 Examples/test-suite/kwargs_feature.i | 4 ++++
 Source/Modules/c.cxx                 | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index d08a114cc..4f666fa6a 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -66,6 +66,7 @@ Flattening C++ language constructs into a set of C-style functions obviously com
     
      • Enums with a context like class or namespace are broken
        • 
     
      • Global variables are not supported
        • 
     
      • Qualifiers are stripped
        • 
+    
      • Vararg functions are not supported.
        • 
 
      
 
      36.2 Preliminaries
      
 
diff --git a/Examples/test-suite/kwargs_feature.i b/Examples/test-suite/kwargs_feature.i
index dd5b2638d..ea9401a13 100644
--- a/Examples/test-suite/kwargs_feature.i
+++ b/Examples/test-suite/kwargs_feature.i
@@ -127,6 +127,8 @@ struct ExtendingOptArgs1 {};
 struct ExtendingOptArgs2 {};
 %}
 
+#ifndef SWIGC
+
 // Varargs
 %warnfilter(SWIGWARN_LANG_VARARGS_KEYWORD) VarargConstructor::VarargConstructor; // Can't wrap varargs with keyword arguments enabled
 %warnfilter(SWIGWARN_LANG_VARARGS_KEYWORD) VarargConstructor::vararg_method; // Can't wrap varargs with keyword arguments enabled
@@ -144,3 +146,5 @@ struct VarargConstructor {
   }
 };
 %}
+
+#endif // !SWIGC
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index a30d3ccfb..f3f218b3c 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -825,6 +825,12 @@ public:
                  p = nextSibling(p);
                  continue;
             }
+
+	    if (SwigType_type(type) == T_VARARGS) {
+	      Swig_error(Getfile(n), Getline(n), "Vararg function %s not supported.\n", Getattr(n, "name"));
+	      return scoped_dohptr(NULL);
+	    }
+
             String *lname = Getattr(p, "lname");
             String *c_parm_type = 0;
             String *arg_name = NewString("");

From 3da85eb4c5a7bcfe62317faffeb7a940c9406650 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 4 Oct 2021 22:11:29 +0200
Subject: [PATCH 344/508] Disable only part of cpp11_alternate_function_syntax
 test

Instead of skipping it entirely, just disable the part using member
function pointers, which are not supported in C backend.
---
 Examples/test-suite/c/Makefile.in                     | 1 -
 Examples/test-suite/cpp11_alternate_function_syntax.i | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index b9df15b25..575b3d6f3 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -95,7 +95,6 @@ FAILING_CPP_TESTS := \
     virtual_poly \
 
 FAILING_CPP11_TESTS := \
-    cpp11_alternate_function_syntax \
     cpp11_ref_qualifiers \
     cpp11_ref_qualifiers_typemaps \
     cpp11_result_of \
diff --git a/Examples/test-suite/cpp11_alternate_function_syntax.i b/Examples/test-suite/cpp11_alternate_function_syntax.i
index b3ecabc8c..1a83c27d8 100644
--- a/Examples/test-suite/cpp11_alternate_function_syntax.i
+++ b/Examples/test-suite/cpp11_alternate_function_syntax.i
@@ -9,8 +9,10 @@ struct SomeStruct {
   auto addAlternateConst(int x, int y) const -> int;
   auto addAlternateNoExcept(int x, int y) noexcept -> int;
   auto addAlternateConstNoExcept(int x, int y) const noexcept -> int;
+#ifndef SWIGC
   auto addAlternateMemberPtrParm(int x, int (SomeStruct::*mp)(int, int)) -> int;
   auto addAlternateMemberPtrConstParm(int x, int (SomeStruct::*mp)(int, int) const) const -> int;
+#endif // !SWIGC
 
   virtual auto addFinal(int x, int y) const noexcept -> int final { return x + y; }
   virtual ~SomeStruct() = default;
@@ -21,11 +23,13 @@ auto SomeStruct::addAlternate(int x, int y) -> int { return x + y; }
 auto SomeStruct::addAlternateConst(int x, int y) const -> int { return x + y; }
 auto SomeStruct::addAlternateNoExcept(int x, int y) noexcept -> int { return x + y; }
 auto SomeStruct::addAlternateConstNoExcept(int x, int y) const noexcept -> int { return x + y; }
+#ifndef SWIGC
 auto SomeStruct::addAlternateMemberPtrParm(int x, int (SomeStruct::*mp)(int, int)) -> int {
   return 100*x + (this->*mp)(x, x);
 }
 auto SomeStruct::addAlternateMemberPtrConstParm(int x, int (SomeStruct::*mp)(int, int) const) const -> int {
   return 1000*x + (this->*mp)(x, x);
 }
+#endif // !SWIGC
 
 %}

From 52bd63b31d3ecb5d0d8031d1027090bb417f9af9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Mon, 4 Oct 2021 22:17:06 +0200
Subject: [PATCH 345/508] Test C backend in GitHub CI workflow

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c5a967f5..0809cb2ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,6 +42,7 @@ jobs:
         - SWIGLANG: ""
           compiler: clang
           desc: clang
+        - SWIGLANG: c
         - SWIGLANG: csharp
         # D support can't be enabled because dmd 2.066 fails to build anything
         # under Ubuntu 18.04 due to its standard library (libphobos2.a) not

From 86205e86e3e59f542fadf0184d20036984cb9816 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 5 Oct 2021 00:23:20 +0200
Subject: [PATCH 346/508] Disable warnings about C backend being experimental
 in CI builds

These warnings are perhaps useful for the SWIG end users, but not really
in the CI build logs, where they just create noise and are distracting.
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0809cb2ac..ae4a5e6d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,7 @@ jobs:
           compiler: clang
           desc: clang
         - SWIGLANG: c
+          SWIG_FEATURES: "-w524"
         - SWIGLANG: csharp
         # D support can't be enabled because dmd 2.066 fails to build anything
         # under Ubuntu 18.04 due to its standard library (libphobos2.a) not

From 03b6e2fbe686c84bf6be4a611011bf330ecdf3d1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 5 Oct 2021 00:26:12 +0200
Subject: [PATCH 347/508] Don't use SWIG_exit() in C examples

There doesn't seem to be any reason for using it rather than just
returning from main() as usual, and it provokes warnings about
implicitly declared function when compiling them.
---
 Examples/c/class/runme.c      | 2 +-
 Examples/c/exception/runme.c  | 2 +-
 Examples/c/simple/runme.c     | 2 +-
 Examples/c/std_vector/runme.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Examples/c/class/runme.c b/Examples/c/class/runme.c
index 4aa613968..fd7da2a5a 100644
--- a/Examples/c/class/runme.c
+++ b/Examples/c/class/runme.c
@@ -39,6 +39,6 @@ int main(int argc, char **argv) {
   printf("%d shapes remain\n", Shape_nshapes_get());
   printf("Goodbye\n");
 
-  SWIG_exit(0);
+  return 0;
 }
 
diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index dff0b7e2a..b4181a5b2 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -42,6 +42,6 @@ int main() {
 
   Test_delete(t);
 
-  SWIG_exit(0);
+  return 0;
 }
 
diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c
index dd01a209c..c690ffb98 100644
--- a/Examples/c/simple/runme.c
+++ b/Examples/c/simple/runme.c
@@ -10,6 +10,6 @@ int main(int argc, char **argv) {
   printf("Foo = %f\n", Foo);
   Foo = 3.1415926;
   printf("Foo = %f\n", Foo);
-  SWIG_exit(0);
+  return 0;
 }
 
diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index 07456064e..e99dadedf 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -38,5 +38,5 @@ int main() {
   
   Klass_delete(klass);
 
-  SWIG_exit(0);
+  return 0;
 }

From d2e3cce7d4bb75c58f2d33b32e57964a42d215df Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 5 Oct 2021 00:57:45 +0200
Subject: [PATCH 348/508] Avoid -Wformat warnings in C std_vector example

Use "%zd" for printing size_t values rather than "%d".
---
 Examples/c/std_vector/runme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/c/std_vector/runme.c b/Examples/c/std_vector/runme.c
index e99dadedf..32c905a78 100644
--- a/Examples/c/std_vector/runme.c
+++ b/Examples/c/std_vector/runme.c
@@ -8,20 +8,20 @@ int main() {
   VA *va = Klass_va_get(klass);
 
   printf("Vector of ints:\n");
-  printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint));
+  printf("size=%zd\ncapacity=%zd\n\n", Vint_size(vint), Vint_capacity(vint));
   
   int i;
   for (i = 0; i < 10; i++)
     Vint_push_back(vint, i*i);
   
-  printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint));
+  printf("size=%zd\ncapacity=%zd\n\n", Vint_size(vint), Vint_capacity(vint));
   
   for (i = 0; i < Vint_size(vint); i++)
     printf("%d%c", Vint_get(vint, i), i+1 == Vint_size(vint) ? '\n' : ',');
   
   Vint_clear(vint); 
   Vint_reserve(vint, 100);
-  printf("\nsize=%d\ncapacity=%d\n", Vint_size(vint), Vint_capacity(vint));
+  printf("\nsize=%zd\ncapacity=%zd\n", Vint_size(vint), Vint_capacity(vint));
   
   printf("\nVector of objects:\n");
   

From 5bbaecfb816e5a54d9d6df2169b83e3d32fc0e5b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 5 Oct 2021 01:00:18 +0200
Subject: [PATCH 349/508] Set LD_LIBRARY_PATH when running C examples too

This is needed to find the SWIG-generated shared library when using C
too, as it's already the case for many (but, surprisingly, not all)
other target languages.
---
 Examples/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index b1c18e1b2..bc441e987 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1389,7 +1389,7 @@ c_syntax_check:
 # -----------------------------------------------------------------
 
 c_run: c_compile
-	$(RUNTOOL) ./$(RUNME) $(RUNPIPE)
+	env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) ./$(RUNME) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display

From e1815634ec6806752a0d1783cc99d327efc83489 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 5 Oct 2021 01:34:32 +0200
Subject: [PATCH 350/508] Clean the generated headers for C too

This fixes a check-maintainer-clean problem.
---
 Examples/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index bc441e987..38768615e 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1403,7 +1403,7 @@ c_version:
 # -----------------------------------------------------------------
 
 c_clean:
-	rm -f *_wrap.c *_wrap.cxx
+	rm -f *_wrap.[ch] *_wrap.cxx
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
 	rm -f $(RUNME)

From b88491fe890751a8fada895dfbc47f6f64bd2192 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 7 Oct 2021 13:52:14 +0200
Subject: [PATCH 351/508] Add at least a very minimal run test for std::vector

The test is trivial, but still better than nothing.
---
 Examples/test-suite/c/li_std_vector_runme.c | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 Examples/test-suite/c/li_std_vector_runme.c

diff --git a/Examples/test-suite/c/li_std_vector_runme.c b/Examples/test-suite/c/li_std_vector_runme.c
new file mode 100644
index 000000000..acfcf7869
--- /dev/null
+++ b/Examples/test-suite/c/li_std_vector_runme.c
@@ -0,0 +1,22 @@
+#include "li_std_vector/li_std_vector_wrap.h"
+#include 
+
+int main() {
+    size_t i;
+
+    IntVector* iv = IntVector_new();
+    assert( IntVector_size(iv) == 0 );
+
+    IntVector_push_back(iv, 1);
+    IntVector_push_back(iv, 4);
+    IntVector_push_back(iv, 9);
+    assert( IntVector_size(iv) == 3 );
+
+    for ( i = 0; i < 3; i++ ) {
+        assert( IntVector_get(iv, i) == (i + 1)*(i + 1) );
+    }
+
+    IntVector_delete(iv);
+
+    return 0;
+}

From 9efb508edaf9ba960fe556beb636404a2a7a54fc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 6 Oct 2021 20:20:55 +0200
Subject: [PATCH 352/508] Fix std::map<> typemap

Use simple fixed typemap instead of trying to use the much more complex
one from the UTL which doesn't work for C.

Add a simple test case for std::map<>.
---
 Examples/test-suite/c/Makefile.in        |  1 -
 Examples/test-suite/c/li_std_map_runme.c | 26 ++++++++++
 Lib/c/std_map.i                          | 62 +++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 Examples/test-suite/c/li_std_map_runme.c

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 575b3d6f3..7b2505ee6 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -66,7 +66,6 @@ FAILING_CPP_TESTS := \
     li_boost_shared_ptr_director \
     li_boost_shared_ptr_template \
     li_std_deque \
-    li_std_map \
     li_std_pair_using \
     li_std_wstring \
     li_windows \
diff --git a/Examples/test-suite/c/li_std_map_runme.c b/Examples/test-suite/c/li_std_map_runme.c
new file mode 100644
index 000000000..b3bea8af1
--- /dev/null
+++ b/Examples/test-suite/c/li_std_map_runme.c
@@ -0,0 +1,26 @@
+#include "li_std_map/li_std_map_wrap.h"
+#include 
+
+int main() {
+    A* a1 = A_new_i(3);
+    A* a2 = A_new_i(7);
+
+    mapA* mA = mapA_new();
+    mapA_set(mA, 1, a1);
+    mapA_set(mA, 2, a2);
+
+    assert( mapA_size(mA) == 2 );
+
+    {
+        A* a = mapA_get(mA, 1);
+        assert( A_val_get(a) == 3 );
+    }
+
+    assert( !mapA_has_key(mA, 3) );
+
+    mapA_delete(mA);
+    A_delete(a2);
+    A_delete(a1);
+
+    return 0;
+}
diff --git a/Lib/c/std_map.i b/Lib/c/std_map.i
index 479e921cc..e42d2aecd 100644
--- a/Lib/c/std_map.i
+++ b/Lib/c/std_map.i
@@ -1 +1,61 @@
-%include 
\ No newline at end of file
+/* -----------------------------------------------------------------------------
+ * std_map.i
+ *
+ * SWIG typemaps for std::map
+ * ----------------------------------------------------------------------------- */
+
+%include 
+
+// ------------------------------------------------------------------------
+// std::map
+// ------------------------------------------------------------------------
+
+%{
+#include 
+#include 
+%}
+
+namespace std {
+  template > class map {
+    public:
+      typedef size_t size_type;
+      typedef ptrdiff_t difference_type;
+      typedef K key_type;
+      typedef T mapped_type;
+      typedef std::pair< const K, T > value_type;
+      typedef value_type* pointer;
+      typedef const value_type* const_pointer;
+      typedef value_type& reference;
+      typedef const value_type& const_reference;
+
+      map();
+      map(const map& other);
+
+      size_t size() const;
+      bool empty() const;
+      void clear();
+      %extend {
+        const T& get(const K& key) throw (std::out_of_range) {
+          std::map< K, T, C >::iterator i = self->find(key);
+          if (i != self->end())
+            return i->second;
+          else
+            throw std::out_of_range("key not found");
+        }
+        void set(const K& key, const T& x) {
+          (*self)[key] = x;
+        }
+        void del(const K& key) throw (std::out_of_range) {
+          std::map< K, T, C >::iterator i = self->find(key);
+          if (i != self->end())
+            self->erase(i);
+          else
+            throw std::out_of_range("key not found");
+        }
+        bool has_key(const K& key) {
+          std::map< K, T, C >::iterator i = self->find(key);
+          return i != self->end();
+        }
+      }
+  };
+}

From 0706ed4d35d3f497a0a13086aeffe8da6158747b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 7 Oct 2021 14:19:39 +0200
Subject: [PATCH 353/508] Add simple std::set<> typemaps too

This is similar to the previous commit for std::map<>.
---
 Examples/test-suite/c/li_std_set_runme.c | 33 ++++++++++++++++
 Examples/test-suite/li_std_set.i         |  2 +-
 Lib/c/std_set.i                          | 48 ++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 Examples/test-suite/c/li_std_set_runme.c
 create mode 100644 Lib/c/std_set.i

diff --git a/Examples/test-suite/c/li_std_set_runme.c b/Examples/test-suite/c/li_std_set_runme.c
new file mode 100644
index 000000000..2d5dff16b
--- /dev/null
+++ b/Examples/test-suite/c/li_std_set_runme.c
@@ -0,0 +1,33 @@
+#include "li_std_set/li_std_set_wrap.h"
+#include 
+
+int main() {
+    {
+        IntSet* is = IntSet_new();
+
+        IntSet_add(is, 1);
+        IntSet_add(is, 4);
+        IntSet_add(is, 9);
+
+        assert( IntSet_size(is) == 3 );
+        assert( IntSet_has(is, 4) );
+        assert( !IntSet_has(is, 16) );
+
+        IntSet_delete(is);
+    }
+
+    {
+        StringSet* ss = StringSet_new();
+
+        StringSet_add(ss, "foo");
+        StringSet_add(ss, "bar");
+
+        assert( StringSet_size(ss) == 2 );
+        assert( StringSet_has(ss, "bar") );
+        assert( !StringSet_has(ss, "baz") );
+
+        StringSet_delete(ss);
+    }
+
+    return 0;
+}
diff --git a/Examples/test-suite/li_std_set.i b/Examples/test-suite/li_std_set.i
index 507272d8d..a4d2b4b17 100644
--- a/Examples/test-suite/li_std_set.i
+++ b/Examples/test-suite/li_std_set.i
@@ -22,7 +22,7 @@
     %template(set_int) std::multiset;
     %template(v_int) std::vector;
     %template(set_string) std::set;
-#elif defined(SWIGJAVA) || defined(SWIGCSHARP)
+#elif defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP)
     // This operator is only defined because it's needed to store objects of
     // type Foo in std::set in C++, we don't need to wrap it.
     %ignore operator<;
diff --git a/Lib/c/std_set.i b/Lib/c/std_set.i
new file mode 100644
index 000000000..6bc7ba465
--- /dev/null
+++ b/Lib/c/std_set.i
@@ -0,0 +1,48 @@
+/* -----------------------------------------------------------------------------
+ * std_set.i
+ *
+ * SWIG typesets for std::set
+ * ----------------------------------------------------------------------------- */
+
+%include 
+
+// ------------------------------------------------------------------------
+// std::set
+// ------------------------------------------------------------------------
+
+%{
+#include 
+#include 
+%}
+
+namespace std {
+  template class set {
+    public:
+      typedef size_t size_type;
+      typedef ptrdiff_t difference_type;
+      typedef T key_type;
+      typedef T value_type;
+      typedef value_type* pointer;
+      typedef const value_type* const_pointer;
+      typedef value_type& reference;
+      typedef const value_type& const_reference;
+
+      set();
+      set(const set& other);
+
+      size_t size() const;
+      bool empty() const;
+      void clear();
+      %extend {
+        bool add(const T& item) {
+          return self->insert(item).second;
+        }
+        bool del(const T& item) {
+          return self->erase(item) != 0;
+        }
+        bool has(const T& item) {
+          return self->count(item) != 0;
+        }
+      }
+  };
+}

From 45bb1794070f472dd19e0d23fa00936eff79f116 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 7 Oct 2021 17:29:04 +0200
Subject: [PATCH 354/508] Expand "$null" in typemaps in C backend too

This is used in some exception-related typemaps, both in SWIG itself
(although they're not used with C backend currently) and outside of it.
---
 Doc/Manual/C.html    | 4 ++++
 Source/Modules/c.cxx | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 4f666fa6a..30c7ded2d 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -607,6 +607,10 @@ Finally, the return value variable is returned.
 return result;
 
      
 
+Note that typemaps may use $null special variable which will be
+replaced with either 0 or nothing, depending on whether the function
+has a non-void return value or not.
+
 
      The Proxy
      
 Compared to the wrapper code generation, the header code is very simple.
      
 Basically it contains just the declarations corresponding to the definitions
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index f3f218b3c..8d6751867 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1026,8 +1026,13 @@ public:
             }
        }
 
-       if (!is_void_return)
+       if (is_void_return) {
+	 Replaceall(wrapper->code, "$null", "");
+       } else {
+	 Replaceall(wrapper->code, "$null", "0");
+
          Append(wrapper->code, "return result;\n");
+       }
 
        Append(wrapper->code, "}\n");
 

From 5cbdae42d3924490750f433568252c22ce6681e4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 7 Oct 2021 18:57:15 +0200
Subject: [PATCH 355/508] Revert "Use std/std_vector.i instead of a poor copy
 in c/std_vector.i"

This reverts commit d89a95a48ce08a7d37e2b9f049102c608375096b as,
finally, it's not worth trying to use UTL typemaps from C: this required
bad hacks for std::vector and would be even worse for std::map, so don't
bother with them and just correct the "poor" C typemaps to be slightly
less poor and use them instead.
---
 Lib/c/std_alloc.i     |   1 -
 Lib/c/std_common.i    |   4 --
 Lib/c/std_container.i |   1 -
 Lib/c/std_vector.i    | 102 ++++++++++++++++++++++++++++++++++++------
 Lib/std/std_vector.i  |   9 +---
 5 files changed, 90 insertions(+), 27 deletions(-)
 delete mode 100644 Lib/c/std_alloc.i
 delete mode 100644 Lib/c/std_container.i

diff --git a/Lib/c/std_alloc.i b/Lib/c/std_alloc.i
deleted file mode 100644
index 35dc051be..000000000
--- a/Lib/c/std_alloc.i
+++ /dev/null
@@ -1 +0,0 @@
-%include 
diff --git a/Lib/c/std_common.i b/Lib/c/std_common.i
index 1fbcdbc9b..c21a2e564 100644
--- a/Lib/c/std_common.i
+++ b/Lib/c/std_common.i
@@ -1,7 +1,3 @@
-%include 
-%include 
-%include 
-
 %include 
 
 %apply size_t { std::size_t };
diff --git a/Lib/c/std_container.i b/Lib/c/std_container.i
deleted file mode 100644
index 7a265f328..000000000
--- a/Lib/c/std_container.i
+++ /dev/null
@@ -1 +0,0 @@
-%include 
diff --git a/Lib/c/std_vector.i b/Lib/c/std_vector.i
index 8dca57af5..7ace2a7ec 100644
--- a/Lib/c/std_vector.i
+++ b/Lib/c/std_vector.i
@@ -1,16 +1,92 @@
-// Wrap const and non-const at() methods as set() and get(), this is simpler to use from C and more clear.
-%define %swig_vector_methods(Type...)
-  %extend {
-    void set(size_type n, const value_type& val) { self->at(n) = val; }
-    value_type get(size_type n) const { return self->at(n); }
-  }
+/* -----------------------------------------------------------------------------
+ * std_vector.i
+ *
+ * SWIG typemaps for std::vector
+ * ----------------------------------------------------------------------------- */
 
-  // Standard typemaps wrap get_allocator(), but it's not really useful for us, so don't bother with it.
-  %ignore get_allocator
-%enddef
+%include 
 
-%define %swig_vector_methods_val(Type...)
-  %swig_vector_methods(Type...)
-%enddef
+%{
+#include 
+#include 
+%}
 
-%include 
+namespace std {
+
+    template class vector {
+      public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef T value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
+        vector();
+        vector(size_type n);
+        vector(const vector& other);
+
+        size_type size() const;
+        size_type capacity() const;
+        void reserve(size_type n);
+        bool empty() const;
+        void clear();
+        void push_back(const value_type& x);
+        %extend {
+            const_reference get(int i) throw (std::out_of_range) {
+                int size = int(self->size());
+                if (i>=0 && isize());
+                if (i>=0 && i class vector {
+      public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef bool value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef bool const_reference;
+
+        vector();
+        vector(size_type n);
+        vector(const vector& other);
+
+        size_type size() const;
+        size_type capacity() const;
+        void reserve(size_type n);
+        bool empty() const;
+        void clear();
+        void push_back(bool x);
+        %extend {
+            bool get(int i) throw (std::out_of_range) {
+                int size = int(self->size());
+                if (i>=0 && isize());
+                if (i>=0 && i);
-#endif // !SWIGC
 
 #ifdef %swig_vector_methods
     // Add swig/language extra methods
@@ -112,7 +110,6 @@ namespace std {
     typedef const value_type& const_reference;
     typedef _Alloc allocator_type;
 
-#ifndef SWIGC
     %traits_swigtype(_Tp);
 
     %fragment(SWIG_Traits_frag(std::vector< _Tp*, _Alloc >), "header",
@@ -129,7 +126,6 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp*, _Alloc >);
-#endif // !SWIGC
 
 #ifdef %swig_vector_methods_val
     // Add swig/language extra methods
@@ -154,7 +150,6 @@ namespace std {
     typedef const value_type& const_reference;
     typedef _Alloc allocator_type;
 
-#ifndef SWIGC
     %traits_swigtype(_Tp);
 
     %fragment(SWIG_Traits_frag(std::vector< _Tp const*, _Alloc >), "header",
@@ -171,7 +166,6 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector< _Tp const*, _Alloc >);
-#endif // !SWIGC
 
 #ifdef %swig_vector_methods_val
     // Add swig/language extra methods
@@ -197,7 +191,6 @@ namespace std {
     typedef bool const_reference;
     typedef _Alloc allocator_type;
 
-#ifndef SWIGC
     %traits_swigtype(bool);
 
     %fragment(SWIG_Traits_frag(std::vector), "header",
@@ -214,7 +207,7 @@ namespace std {
     }
 
     %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector);
-#endif // !SWIGC
+
 
 #ifdef %swig_vector_methods_val
     // Add swig/language extra methods

From 3dd96d5b95dbf358d94958d5f938fcc78d91a517 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 7 Oct 2021 18:59:52 +0200
Subject: [PATCH 356/508] Allow using vector with classes without default ctor
 in C too

This is similar to be491506a (Java std::vector improvements for types
that do not have a default constructor., 2019-03-01) for Java, except we
don't have to bother with any compatibility constraints for this, not
yet used by anyone. module.
---
 Examples/test-suite/c/Makefile.in                | 1 -
 Examples/test-suite/stl_no_default_constructor.i | 2 +-
 Lib/c/std_vector.i                               | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 7b2505ee6..0d0668b2a 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -76,7 +76,6 @@ FAILING_CPP_TESTS := \
     multiple_inheritance_shared_ptr \
     nested_class \
     smart_pointer_template_defaults_overload \
-    stl_no_default_constructor \
     template_basic \
     template_default \
     template_enum \
diff --git a/Examples/test-suite/stl_no_default_constructor.i b/Examples/test-suite/stl_no_default_constructor.i
index 32aff2b46..e2d475b34 100644
--- a/Examples/test-suite/stl_no_default_constructor.i
+++ b/Examples/test-suite/stl_no_default_constructor.i
@@ -9,7 +9,7 @@ struct NoDefaultCtor {
 };
 %}
 
-#if defined(SWIGCSHARP) || defined(SWIGJAVA) || defined(SWIGD)
+#if defined(SWIGC) || defined(SWIGCSHARP) || defined(SWIGJAVA) || defined(SWIGD)
 %template(VectorNoDefaultCtor) std::vector;
 #endif
 
diff --git a/Lib/c/std_vector.i b/Lib/c/std_vector.i
index 7ace2a7ec..070814a15 100644
--- a/Lib/c/std_vector.i
+++ b/Lib/c/std_vector.i
@@ -24,7 +24,6 @@ namespace std {
         typedef const value_type& const_reference;
 
         vector();
-        vector(size_type n);
         vector(const vector& other);
 
         size_type size() const;

From d0e979278e196b1edaa76afe77847675f966d907 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Oct 2021 19:48:59 +0200
Subject: [PATCH 357/508] Re-enable passing li_std_pair_using test

This must have been fixed by fc1ebd7c1 (Add trivial but working
std::pair typemaps implementation, 2019-08-07).
---
 Examples/test-suite/c/Makefile.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 0d0668b2a..5d723c69a 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -66,7 +66,6 @@ FAILING_CPP_TESTS := \
     li_boost_shared_ptr_director \
     li_boost_shared_ptr_template \
     li_std_deque \
-    li_std_pair_using \
     li_std_wstring \
     li_windows \
     member_funcptr_galore \

From 10dbb921827ebacf949b15a59c86f3906bc9d738 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 14 Oct 2021 19:54:50 +0200
Subject: [PATCH 358/508] Remove another not failing unit test

This test doesn't really work, as directors support is not implemented
at all in C backend, but remove it from here to prevent reports from
"make check-failing" about "failing test passing".
---
 Examples/test-suite/c/Makefile.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 5d723c69a..644390419 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -50,7 +50,6 @@ FAILING_CPP_TESTS := \
     arrays_global_twodim \
     constant_pointers \
     director_smartptr \
-    director_string \
     enum_thorough \
     extend \
     extend_default \

From 8d7c1c42276494f8f4db9f5722c4e946aaaabcb0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Oct 2021 00:57:25 +0200
Subject: [PATCH 359/508] Eliminate a separate FAILING_CPP_TESTS variable in C
 Makefile

Also undo the changes to common.mk originally done in this branch and
rendered unnecessary by de5e0c865 (C++11 testing moved to a configure
option, 2013-10-08) on master.
---
 Examples/test-suite/c/Makefile.in | 2 --
 Examples/test-suite/common.mk     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 644390419..ae5ede0a3 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -89,8 +89,6 @@ FAILING_CPP_TESTS := \
     varargs \
     varargs_overload \
     virtual_poly \
-
-FAILING_CPP11_TESTS := \
     cpp11_ref_qualifiers \
     cpp11_ref_qualifiers_typemaps \
     cpp11_result_of \
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 5151597e3..482b9bcaf 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -761,7 +761,6 @@ preproc_include.ctest: SWIGOPT += -includeall
 # Allow modules to define temporarily failing tests.
 C_TEST_CASES := $(filter-out $(FAILING_C_TESTS),$(C_TEST_CASES))
 CPP_TEST_CASES := $(filter-out $(FAILING_CPP_TESTS),$(CPP_TEST_CASES))
-CPP11_TEST_CASES := $(filter-out $(FAILING_CPP11_TESTS),$(CPP11_TEST_CASES))
 MULTI_CPP_TEST_CASES := $(filter-out $(FAILING_MULTI_CPP_TESTS),$(MULTI_CPP_TEST_CASES))
 
 
@@ -812,7 +811,6 @@ check-failing-test = \
 check-failing:
 	+-$(foreach t,$(FAILING_C_TESTS),$(call check-failing-test,$t,ctest);)
 	+-$(foreach t,$(FAILING_CPP_TESTS),$(call check-failing-test,$t,cpptest);)
-	+-$(foreach t,$(FAILING_CPP11_TESTS),$(call check-failing-test,$t,cpptest);)
 	+-$(foreach t,$(FAILING_MULTI_CPP_TESTS),$(call check-failing-test,$t,multicpptest);)
 endif
 

From d77e5d8b0e43457a1da05172ad47f10229f924db Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Oct 2021 00:59:34 +0200
Subject: [PATCH 360/508] Enable C++11 testing for C backend

Not all C++11 tests pass, but some (and important ones) do, so do check
them.
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae4a5e6d9..f8025ffd1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,7 @@ jobs:
           compiler: clang
           desc: clang
         - SWIGLANG: c
+          CPP11: 1
           SWIG_FEATURES: "-w524"
         - SWIGLANG: csharp
         # D support can't be enabled because dmd 2.066 fails to build anything

From e78c8f39ed5cc780cc6075fb7e27adfbd61a1b6b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Oct 2021 01:26:22 +0200
Subject: [PATCH 361/508] Add minimal shared_ptr support

Enable the tests and support of shared_ptr in them for C (which required
disabling a previously passing, because not doing anything, attributes
test which is currently broken for unrelated reasons).
---
 Examples/test-suite/c/Makefile.in             | 13 +++--
 .../c/cpp11_shared_ptr_const_runme.c          | 16 ++++++
 .../c/cpp11_shared_ptr_upcast_runme.c         | 26 +++++++++
 .../test-suite/c/li_boost_shared_ptr_runme.c  | 17 ++++++
 Examples/test-suite/director_smartptr.i       |  2 +-
 Examples/test-suite/li_boost_shared_ptr.i     |  2 +-
 .../li_boost_shared_ptr_attribute.i           |  2 +-
 .../test-suite/li_boost_shared_ptr_bits.i     |  2 +-
 .../test-suite/li_boost_shared_ptr_director.i |  2 +-
 .../test-suite/li_boost_shared_ptr_template.i |  2 +-
 Lib/c/boost_shared_ptr.i                      |  5 ++
 Lib/c/std_shared_ptr.i                        | 55 +++++++++++++++++++
 12 files changed, 132 insertions(+), 12 deletions(-)
 create mode 100644 Examples/test-suite/c/cpp11_shared_ptr_const_runme.c
 create mode 100644 Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c
 create mode 100644 Examples/test-suite/c/li_boost_shared_ptr_runme.c
 create mode 100644 Lib/c/boost_shared_ptr.i
 create mode 100644 Lib/c/std_shared_ptr.i

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index ae5ede0a3..c12e1516e 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -26,6 +26,12 @@ CPP_TEST_CASES := \
 				 c_backend_cpp_natural_std_string \
 				 c_backend_cpp_exception
 
+CPP11_TEST_CASES := \
+	cpp11_shared_ptr_const \
+	cpp11_shared_ptr_nullptr_in_containers \
+	cpp11_shared_ptr_overload \
+	cpp11_shared_ptr_upcast \
+
 # The following tests are currently broken and need to be fixed.
 FAILING_C_TESTS := \
     arrays \
@@ -60,10 +66,7 @@ FAILING_CPP_TESTS := \
     grouping \
     import_nomodule \
     li_attribute \
-    li_boost_shared_ptr \
-    li_boost_shared_ptr_bits \
-    li_boost_shared_ptr_director \
-    li_boost_shared_ptr_template \
+    li_boost_shared_ptr_attribute \
     li_std_deque \
     li_std_wstring \
     li_windows \
@@ -71,9 +74,7 @@ FAILING_CPP_TESTS := \
     member_pointer \
     member_pointer_const \
     mixed_types \
-    multiple_inheritance_shared_ptr \
     nested_class \
-    smart_pointer_template_defaults_overload \
     template_basic \
     template_default \
     template_enum \
diff --git a/Examples/test-suite/c/cpp11_shared_ptr_const_runme.c b/Examples/test-suite/c/cpp11_shared_ptr_const_runme.c
new file mode 100644
index 000000000..83beeee42
--- /dev/null
+++ b/Examples/test-suite/c/cpp11_shared_ptr_const_runme.c
@@ -0,0 +1,16 @@
+#include "cpp11_shared_ptr_const_wrap.h"
+#include 
+
+int main(int argc, const char *argv[]) {
+    Foo* f;
+    Foo* f2;
+
+    f = Foo_new(17);
+    assert(Foo_get_m(f) == 17);
+    f2 = cpp11_shared_ptr_const_foo(f);
+    assert(Foo_get_m(f2) == 17);
+    Foo_delete(f2);
+    Foo_delete(f);
+
+    return 0;
+}
diff --git a/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c b/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c
new file mode 100644
index 000000000..e7e3243c9
--- /dev/null
+++ b/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c
@@ -0,0 +1,26 @@
+#include "cpp11_shared_ptr_upcast_wrap.h"
+#include 
+
+int main(int argc, const char *argv[]) {
+    {
+        Derived* d;
+
+        d = Derived_new_i(17);
+        assert( cpp11_shared_ptr_upcast_base_num1((Base *)d) == -1 );
+        assert( cpp11_shared_ptr_upcast_derived_num1(d) == 17 );
+
+        Derived_delete(d);
+    }
+
+    {
+        Derived2* d2;
+
+        d2 = Derived2_new_i(289);
+        assert( cpp11_shared_ptr_upcast_base2_num1((Base2 *)d2) == -1 );
+        assert( cpp11_shared_ptr_upcast_derived2_num1(d2) == 289 );
+
+        Derived2_delete(d2);
+    }
+
+    return 0;
+}
diff --git a/Examples/test-suite/c/li_boost_shared_ptr_runme.c b/Examples/test-suite/c/li_boost_shared_ptr_runme.c
new file mode 100644
index 000000000..36aceec2c
--- /dev/null
+++ b/Examples/test-suite/c/li_boost_shared_ptr_runme.c
@@ -0,0 +1,17 @@
+#include "li_boost_shared_ptr_wrap.h"
+#include 
+#include 
+
+int main(int argc, const char *argv[]) {
+    {
+        Klass* k = Klass_new_rcstd_string("me oh my");
+        assert( strcmp(Klass_getValue(k), "me oh my") == 0 );
+        Klass_delete(k);
+    }
+
+    {
+        Klass* k = li_boost_shared_ptr_factorycreate();
+        assert( strcmp(Klass_getValue(k), "factorycreate") == 0 );
+        Klass_delete(k);
+    }
+}
diff --git a/Examples/test-suite/director_smartptr.i b/Examples/test-suite/director_smartptr.i
index d016af17e..c6bd9b054 100644
--- a/Examples/test-suite/director_smartptr.i
+++ b/Examples/test-suite/director_smartptr.i
@@ -34,7 +34,7 @@ public:
 
 %}
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
+#if defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 
diff --git a/Examples/test-suite/li_boost_shared_ptr.i b/Examples/test-suite/li_boost_shared_ptr.i
index b64197be1..bbca11292 100644
--- a/Examples/test-suite/li_boost_shared_ptr.i
+++ b/Examples/test-suite/li_boost_shared_ptr.i
@@ -44,7 +44,7 @@
 # define SWIG_SHARED_PTR_NAMESPACE SwigBoost
 #endif
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
+#if defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 
diff --git a/Examples/test-suite/li_boost_shared_ptr_attribute.i b/Examples/test-suite/li_boost_shared_ptr_attribute.i
index f15baa693..c06515359 100644
--- a/Examples/test-suite/li_boost_shared_ptr_attribute.i
+++ b/Examples/test-suite/li_boost_shared_ptr_attribute.i
@@ -1,6 +1,6 @@
 %module li_boost_shared_ptr_attribute
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
+#if defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 
diff --git a/Examples/test-suite/li_boost_shared_ptr_bits.i b/Examples/test-suite/li_boost_shared_ptr_bits.i
index 7cf84010e..d18b838e4 100644
--- a/Examples/test-suite/li_boost_shared_ptr_bits.i
+++ b/Examples/test-suite/li_boost_shared_ptr_bits.i
@@ -1,6 +1,6 @@
 %module li_boost_shared_ptr_bits
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
+#if defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 
diff --git a/Examples/test-suite/li_boost_shared_ptr_director.i b/Examples/test-suite/li_boost_shared_ptr_director.i
index b2d9fc131..6d1d32708 100644
--- a/Examples/test-suite/li_boost_shared_ptr_director.i
+++ b/Examples/test-suite/li_boost_shared_ptr_director.i
@@ -4,7 +4,7 @@
 #include 
 %}
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY) || defined(SWIGR)
+#if defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY) || defined(SWIGR)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 
diff --git a/Examples/test-suite/li_boost_shared_ptr_template.i b/Examples/test-suite/li_boost_shared_ptr_template.i
index 3965a976e..3e9312877 100644
--- a/Examples/test-suite/li_boost_shared_ptr_template.i
+++ b/Examples/test-suite/li_boost_shared_ptr_template.i
@@ -30,7 +30,7 @@
 
 %}
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
+#if defined(SWIGC) || defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 
diff --git a/Lib/c/boost_shared_ptr.i b/Lib/c/boost_shared_ptr.i
new file mode 100644
index 000000000..bf4e0959c
--- /dev/null
+++ b/Lib/c/boost_shared_ptr.i
@@ -0,0 +1,5 @@
+#ifndef SWIG_SHARED_PTR_NAMESPACE
+#define SWIG_SHARED_PTR_NAMESPACE boost
+#endif
+
+%include 
diff --git a/Lib/c/std_shared_ptr.i b/Lib/c/std_shared_ptr.i
new file mode 100644
index 000000000..df3b7a669
--- /dev/null
+++ b/Lib/c/std_shared_ptr.i
@@ -0,0 +1,55 @@
+// This could be predefined in e.g. our own boost_shared_ptr.i
+#ifndef SWIG_SHARED_PTR_NAMESPACE
+#define SWIG_SHARED_PTR_NAMESPACE std
+#endif
+
+%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
+
+%naturalvar TYPE;
+%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
+
+// Replace the default "delete arg1" with the code destroying the smart pointer itself instead.
+%feature("unref") TYPE "(void)arg1; delete smartarg1;"
+
+// All smart pointers look like normal objects to the code using the interface.
+%typemap(ctype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
+                SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >&,
+                SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >*
+                "$typemap(ctype, TYPE)";
+
+// Typemap for smart pointer type itself.
+%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >
+  "$result = new $1_ltype($1);"
+
+// And for the plain type.
+%typemap(in) CONST TYPE (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
+  smartarg = (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr *)$input;
+  if (!smartarg || !smartarg->get()) {
+    SWIG_exception(SWIG_RuntimeError, "$1_type value is null");
+    return $null;
+  }
+  $1 = **smartarg;%}
+%typemap(out) CONST TYPE %{
+  $result = (SwigObj*) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr(new $1_ltype($1));%}
+
+// Plain type pointer.
+%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
+  smartarg = (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr *)$input;
+  $1 = (TYPE *)(smartarg ? smartarg->get() : 0);%}
+%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{
+  $result = $1 ? (SwigObj*) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr($1 SWIG_NO_NULL_DELETER_$owner) : 0;%}
+
+// Plain type references.
+%typemap(in) CONST TYPE & (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{
+  smartarg = (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr *)$input;
+  if (!smartarg || !smartarg->get()) {
+    SWIG_exception(SWIG_RuntimeError, "$1_type reference is null");
+    return $null;
+  }
+  $1 = (TYPE *)smartarg->get();%}
+%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & %{
+  $result = (SwigObj*) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr($1 SWIG_NO_NULL_DELETER_$owner);%}
+
+%enddef
+
+%include 

From e45d8f94fca96c8bcb49ef0d18ed2ffab6dbe4f8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Oct 2021 23:02:39 +0200
Subject: [PATCH 362/508] Link C modules with libpthread under Unix systems

Specify -pthread option which should be universally supported under
non-{MSW,Mac} platforms by now and which is required under Linux to link
the tests using boost::shared_ptr<>, which uses pthread_mutex_xxx().
---
 configure.ac | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8ed80e0f..c7dfd357b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2434,20 +2434,31 @@ fi
 
 AC_SUBST(RBIN)
 
-# C module on Mac OS X tweaks
+#----------------------------------------------------------------
+# Nothing to look for in C case, just define some variables
+#----------------------------------------------------------------
+
+# Some tweaks for creating shared modules.
+C_SO='$(SO)'
+
 case $host in
-*-*-darwin*) 
-        C_LDSHARED="cc -dynamiclib"
-        CXX_LDSHARED="g++ -dynamiclib"
+*-*-darwin*)
+        C_LDFLAGS='-dynamiclib'
         C_SO=".dylib"
         ;;
+*-*-cygwin* | *-*-mingw*)
+        # Nothing special to do.
+        ;;
 *)
-        C_LDSHARED='$(LDSHARED)'
-        CXX_LDSHARED='$(CXXSHARED)'
-        C_SO='$(SO)'
+        # This is needed for linking with Boost which uses mutexes and does no
+        # harm in all the other cases.
+        C_LDFLAGS='-pthread'
         ;;
 esac
 
+C_LDSHARED="\$(LDSHARED) $C_LDFLAGS"
+CXX_LDSHARED="\$(CXXSHARED) $C_LDFLAGS"
+
 AC_SUBST(C_LDSHARED)
 AC_SUBST(CXX_LDSHARED)
 AC_SUBST(C_SO)

From e41234c5bc03f752fd7c0ba6686f3bb17df00232 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Oct 2021 23:16:42 +0200
Subject: [PATCH 363/508] Inject just the relevant part of changes.swg in
 generated code

Don't include the entire file, including its header comment, into the
generated code, but just the part that we want to appear there.

This looks nicer and is also more explicit and hence clear.
---
 Lib/c/c.swg       | 3 ++-
 Lib/c/cheader.swg | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 20e03548e..166bd3aa8 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -5,8 +5,9 @@
  * c.swg
  * ----------------------------------------------------------------------------- */ 
 
+%include 
+
 %insert("runtime") "clabels.swg"
-%insert("cheader") "cheader.swg"
 
 %insert("runtime") %{
 #include 
diff --git a/Lib/c/cheader.swg b/Lib/c/cheader.swg
index f33cee1fa..7a8314ecf 100644
--- a/Lib/c/cheader.swg
+++ b/Lib/c/cheader.swg
@@ -2,6 +2,7 @@
  * cheader.swg
  * ----------------------------------------------------------------------------- */
 
+%insert("cheader") %{
 #ifndef SWIGIMPORT
 # ifndef __GNUC__
 #   define __DLL_IMPORT __declspec(dllimport)
@@ -16,3 +17,4 @@
 #endif
 
 #include 
+%}

From d65d7d7df32cf407dcf74f38ba55d5b173bfb933 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Fri, 15 Oct 2021 23:20:21 +0200
Subject: [PATCH 364/508] Make SWIGIMPORT definition more consistent with
 SWIGEXPORT

Use the same checks as for the definition of SWIGEXPORT in
swiglabels.swg.

Also avoid defining __DLL_IMPORT symbol with a reserved name.
---
 Lib/c/cheader.swg | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Lib/c/cheader.swg b/Lib/c/cheader.swg
index 7a8314ecf..c162a8260 100644
--- a/Lib/c/cheader.swg
+++ b/Lib/c/cheader.swg
@@ -4,16 +4,16 @@
 
 %insert("cheader") %{
 #ifndef SWIGIMPORT
-# ifndef __GNUC__
-#   define __DLL_IMPORT __declspec(dllimport)
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGDLLIMPORT
+#   else
+#     define SWIGDLLIMPORT __declspec(dllimport)
+#   endif
 # else
-#   define __DLL_IMPORT __attribute__((dllimport)) extern
-# endif
-# if !defined (__WIN32__)
-#   define SWIGIMPORT extern
-# else
-#   define SWIGIMPORT __DLL_IMPORT
+#   define SWIGDLLIMPORT
 # endif
+# define SWIGIMPORT extern SWIGDLLIMPORT
 #endif
 
 #include 

From 2f6f6df211f92bb9f17608b292c92d2f2bc8ac5f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 20 Oct 2021 01:57:20 +0200
Subject: [PATCH 365/508] Generate wrapper aliases only if requested and not by
 default

Defining the aliases by default results in conflicts when including
headers from multiple modules as e.g. SWIG_PendingException_get() is
defined in all of them, and could also easily result in other unwanted
clashes, so make this opt-in and update the examples and tests relying
on using the wrappers without the module prefix to define
SWIG_DEFINE_WRAPPER_ALIASES explicitly.
---
 Doc/Manual/C.html                                        | 2 +-
 Examples/c/exception/runme.c                             | 1 +
 Examples/c/simple/runme.c                                | 1 +
 Examples/test-suite/c/c_backend_cpp_exception_runme.c    | 2 ++
 .../c/c_backend_cpp_natural_std_string_runme.c           | 2 ++
 Examples/test-suite/c/char_strings_runme.c               | 1 +
 Examples/test-suite/c/cpp_basic_runme.c                  | 1 +
 .../test-suite/c/cpp_basic_template_function_runme.c     | 2 ++
 Examples/test-suite/c/enums_runme.c                      | 1 +
 Examples/test-suite/c/exception_order_runme.c            | 1 +
 Examples/test-suite/c/global_vars_runme.c                | 2 +-
 Examples/test-suite/c/li_std_pair_runme.c                | 1 +
 Examples/test-suite/c/operator_overload_runme.c          | 1 +
 Source/Modules/c.cxx                                     | 9 ++++-----
 14 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 30c7ded2d..7f765f2a7 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -192,7 +192,7 @@ Wrapping C functions and variables is obviously performed in a straightforward w
 
 
 
      
-For each C function declared in the interface file a wrapper function with a prefix, required to make its name different from the original one, is created. The prefix for the global functions is module_, i.e. the name of the SWIG module followed by underscore. If nspace feature is used, the prefix for a function defined in a namespace is namespace_ -- note that it does not contain the module prefix, as it's not necessary to make a unique function name in this case. The wrapper function performs a call to the original function, and returns its result. For convenience, a #define func prefix_func is also provided in the generated header file to make it possible to call the function under its original name. If this is undesirable, SWIG_NO_WRAPPER_ALIASES can be predefined before including the wrapper header to disable these defines.
+For each C function declared in the interface file a wrapper function with a prefix, required to make its name different from the original one, is created. The prefix for the global functions is module_, i.e. the name of the SWIG module followed by underscore. If nspace feature is used, the prefix for a function defined in a namespace is namespace_ -- note that it does not contain the module prefix, as it's not necessary to make a unique function name in this case. The wrapper function performs a call to the original function, and returns its result. For convenience, a #define func prefix_func can be provided in the generated header file to make it possible to call the function under its original name: predefine SWIG_DEFINE_WRAPPER_ALIASES before including the wrapper header to enable these defines, which are disabled by default to avoid accidental name clashes.
 
      
 
 
      
diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index b4181a5b2..907c0d2d4 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -5,6 +5,7 @@
 #include 
 #include 
 
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "example_wrap.h"
 
 static void show_exception(const char* prefix) {
diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c
index c690ffb98..49a1a8be7 100644
--- a/Examples/c/simple/runme.c
+++ b/Examples/c/simple/runme.c
@@ -1,5 +1,6 @@
 #include 
 
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "example_wrap.h"
 
 int main(int argc, char **argv) {
diff --git a/Examples/test-suite/c/c_backend_cpp_exception_runme.c b/Examples/test-suite/c/c_backend_cpp_exception_runme.c
index 314a9ece7..1759e4e31 100644
--- a/Examples/test-suite/c/c_backend_cpp_exception_runme.c
+++ b/Examples/test-suite/c/c_backend_cpp_exception_runme.c
@@ -1,4 +1,6 @@
 #include 
+
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "c_backend_cpp_exception/c_backend_cpp_exception_wrap.h"
 
 int main()
diff --git a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
index f4ddc4836..b94753fd2 100644
--- a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
+++ b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
@@ -1,6 +1,8 @@
 #include 
 #include 
 #include 
+
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "c_backend_cpp_natural_std_string/c_backend_cpp_natural_std_string_wrap.h"
 
 int main()
diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index 92edce116..c1c5d89a6 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -2,6 +2,7 @@
 #include 
 #include 
 
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "char_strings/char_strings_wrap.h"
 
 int main() {
diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index e8397480c..656766479 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -1,3 +1,4 @@
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "cpp_basic/cpp_basic_wrap.h"
 #include 
 #include 
diff --git a/Examples/test-suite/c/cpp_basic_template_function_runme.c b/Examples/test-suite/c/cpp_basic_template_function_runme.c
index 51ccdb0cf..2c984ce3e 100644
--- a/Examples/test-suite/c/cpp_basic_template_function_runme.c
+++ b/Examples/test-suite/c/cpp_basic_template_function_runme.c
@@ -1,4 +1,6 @@
 #include 
+
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "cpp_basic_template_function/cpp_basic_template_function_wrap.h"
 
 int main() {
diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c
index 00eb03647..6134ab0d6 100644
--- a/Examples/test-suite/c/enums_runme.c
+++ b/Examples/test-suite/c/enums_runme.c
@@ -1,6 +1,7 @@
 #include 
 #include 
 
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "enums/enums_wrap.h"
 
 int main() {
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index a6483d86f..5cade5bc8 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -1,6 +1,7 @@
 #include 
 #include 
 
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "exception_order/exception_order_wrap.h"
 
 int main() {
diff --git a/Examples/test-suite/c/global_vars_runme.c b/Examples/test-suite/c/global_vars_runme.c
index 917b2707e..161413d83 100644
--- a/Examples/test-suite/c/global_vars_runme.c
+++ b/Examples/test-suite/c/global_vars_runme.c
@@ -4,7 +4,7 @@
 
 int main(int argc, const char *argv[])
 {
-    init();
+    global_vars_init();
 
     assert(strcmp(b_get(), "string b") == 0);
     assert(x == 1234);
diff --git a/Examples/test-suite/c/li_std_pair_runme.c b/Examples/test-suite/c/li_std_pair_runme.c
index fbd41feea..c163a5177 100644
--- a/Examples/test-suite/c/li_std_pair_runme.c
+++ b/Examples/test-suite/c/li_std_pair_runme.c
@@ -1,3 +1,4 @@
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "li_std_pair/li_std_pair_wrap.h"
 #include 
 
diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index ed0c8e450..7e7acb646 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -1,6 +1,7 @@
 #include 
 #include 
 
+#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "operator_overload/operator_overload_wrap.h"
 
 #define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); exit(1); }
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 8d6751867..61ffedd31 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -476,9 +476,8 @@ public:
       f_wrappers_types = NewString("");
       f_wrappers_decl = NewString("");
 
-      // We also define aliases for the global wrapper functions to allow calling them using their original names, but as this can result in problems (as usual
-      // when using the preprocessor), we provide a way to disable this by defining SWIG_NO_WRAPPER_ALIASES when compiling the generated code and so we use a
-      // separate section for this too.
+      // We may also define aliases for the global wrapper functions to allow calling them using their original names, but as this can result in problems (as
+      // usual when using the preprocessor), this is only done when SWIG_DEFINE_WRAPPER_ALIASES is defined, so use a separate section for this.
       f_wrappers_aliases = NIL;
 
       {
@@ -504,7 +503,7 @@ public:
 	Dump(f_wrappers_aliases, f_wrappers_h);
 	Delete(f_wrappers_aliases);
 
-	Printv(f_wrappers_h, "#endif /* SWIG_NO_WRAPPER_ALIASES */\n", NIL);
+	Printv(f_wrappers_h, "#endif /* SWIG_DEFINE_WRAPPER_ALIASES */\n", NIL);
       }
     } // close wrapper header guard
 
@@ -903,7 +902,7 @@ public:
 	 if (!f_wrappers_aliases) {
 	   // Allocate it on demand.
 	   f_wrappers_aliases = NewStringEmpty();
-	   Printv(f_wrappers_aliases, "#ifndef SWIG_NO_WRAPPER_ALIASES\n", NIL);
+	   Printv(f_wrappers_aliases, "#ifdef SWIG_DEFINE_WRAPPER_ALIASES\n", NIL);
 	 }
 
 	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname);

From 1fb0de9e0007c2c6c4ba3e0baa151d4b9a7e8f59 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 30 Oct 2021 18:47:12 +0200
Subject: [PATCH 366/508] Don't call Swig_scopename_prefix() unnecessarily

No real changes, just make the code do what the comment said it did and
only use the namespace as prefix when "nspace" feature is on instead of
always trying to use it as prefix and then resetting it.

This required adding default ctor and assignment operator from raw
pointer to scoped_dohptr, but they can be useful elsewhere too, while
the actual code in getGlobalWrapperName() is simpler and more readable
now.

No real changes.
---
 Source/Modules/c.cxx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 61ffedd31..2e7931332 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -33,6 +33,7 @@ namespace
 class scoped_dohptr
 {
 public:
+  scoped_dohptr() : obj_(NULL) {}
   explicit scoped_dohptr(DOH* obj) : obj_(obj) {}
   ~scoped_dohptr() { Delete(obj_); }
 
@@ -49,6 +50,16 @@ public:
     return *this;
   }
 
+  // Assignment operator takes ownership of the pointer, just as the ctor does.
+  scoped_dohptr& operator=(DOH* obj) {
+    if (obj != obj_) {
+      Delete(obj_);
+      obj_ = obj;
+    }
+
+    return *this;
+  }
+
   DOH* get() const { return obj_; }
 
   DOH* release() const /* not really */ {
@@ -196,13 +207,12 @@ public:
   String *getGlobalWrapperName(Node *n, String *name) const
   {
     // Use namespace as the prefix if feature:nspace is in use.
-    scoped_dohptr scopename_prefix(Swig_scopename_prefix(Getattr(n, "name")));
-    if (scopename_prefix) {
-      if (GetFlag(parentNode(n), "feature:nspace")) {
+    scoped_dohptr scopename_prefix;
+    if (GetFlag(parentNode(n), "feature:nspace")) {
+      scopename_prefix = Swig_scopename_prefix(Getattr(n, "name"));
+      if (scopename_prefix) {
 	scoped_dohptr mangled_prefix(Swig_string_mangle(scopename_prefix));
 	scopename_prefix = mangled_prefix;
-      } else {
-	scopename_prefix.reset();
       }
     }
 

From d7f06c3721308d35153d58a25052be33da726f89 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 30 Oct 2021 18:51:19 +0200
Subject: [PATCH 367/508] Reuse Swig_string_mangle() instead of using
 Replaceall()

Use the same function in getNamespacedName() which was already used in
getGlobalWrapperName() just below, this is more readable and more clear
than just replacing dots with underscores as we did before.

Also use scoped_dohptr instead of manual Delete() calls.

No real changes.
---
 Source/Modules/c.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 2e7931332..9449a9659 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -189,10 +189,8 @@ public:
      String *nspace = Getattr(n, "sym:nspace");
 
      if (nspace) {
-       String *nspace_mangled = Copy(nspace);
-       Replaceall(nspace_mangled, ".", "_");
-       proxyname = NewStringf("%s_%s", nspace_mangled, symname);
-       Delete(nspace_mangled);
+       scoped_dohptr nspace_mangled(Swig_string_mangle(nspace));
+       proxyname = NewStringf("%s_%s", (DOH*)nspace_mangled, symname);
      } else {
        proxyname = Copy(symname);
      }

From 0434b93cc9c4c9e97b24dc4c541e2b1b1fd42dc7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 30 Oct 2021 21:09:41 +0200
Subject: [PATCH 368/508] Rename getProxyName() to getClassProxyName()

Show that this function only returns non-null result for classes, as
this was not at all obvious before.

No real changes.
---
 Source/Modules/c.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9449a9659..832b383e4 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -224,13 +224,13 @@ public:
   }
 
   /* -----------------------------------------------------------------------------
-   * getProxyName()
+   * getClassProxyName()
    *
    * Test to see if a type corresponds to something wrapped with a proxy class.
    * Return NULL if not, otherwise the proxy class name to be freed by the caller.
    * ----------------------------------------------------------------------------- */
 
-   String *getProxyName(SwigType *t) {
+   String *getClassProxyName(SwigType *t) {
      Node *n = classLookup(t);
 
     return n ? getNamespacedName(n) : NULL;
@@ -256,7 +256,7 @@ public:
           String *proxyname = 0;
           if (String *name = Getattr(n, "name")) {
 	    if (String *scopename_prefix = Swig_scopename_prefix(name)) {
-	      proxyname = getProxyName(scopename_prefix);
+	      proxyname = getClassProxyName(scopename_prefix);
 	      Delete(scopename_prefix);
 	    }
 	  }
@@ -304,7 +304,7 @@ public:
 	// Special case, just leave it unchanged.
 	typestr = NewString("SwigObj");
       } else {
-	typestr = getProxyName(classnametype);
+	typestr = getClassProxyName(classnametype);
 	if (!typestr) {
 	  if (SwigType_isbuiltin(btype)) {
 	    // This should work just as well in C without any changes.

From 080d3075e362c5672e8254acaaa729a19a6ae342 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 30 Oct 2021 21:11:02 +0200
Subject: [PATCH 369/508] Rename getNamespacedName() to getProxyName()

This is a more logical name for this function, as it caches its return
value in "proxyname" attribute and doesn't really have much to do with
namespaces.

No real changes.
---
 Source/Modules/c.cxx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 832b383e4..b0ea99506 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -176,7 +176,8 @@ public:
     Delete(module_prefix);
   }
 
-  String *getNamespacedName(Node *n)
+  // Return the name to be used in proxy code and cache it as "proxyname".
+  String *getProxyName(Node *n)
   {
      if (!n)
       return 0;
@@ -233,7 +234,7 @@ public:
    String *getClassProxyName(SwigType *t) {
      Node *n = classLookup(t);
 
-    return n ? getNamespacedName(n) : NULL;
+    return n ? getProxyName(n) : NULL;
 
    }
 
@@ -265,7 +266,7 @@ public:
 	    Delete(proxyname);
           } else {
             // global enum or enum in a namespace
-	    enumname = getNamespacedName(n);
+	    enumname = getProxyName(n);
           }
           Setattr(n, "enumname", enumname);
           Delete(enumname);
@@ -1274,7 +1275,7 @@ public:
    * --------------------------------------------------------------------- */
 
   virtual int classHandler(Node *n) {
-    String *name = getNamespacedName(n);
+    String *name = getProxyName(n);
 
     if (CPlusPlus) {
       // inheritance support: attach all members from base classes to this class

From 9ac6ab3b8a949628115fe93dff75e91a668e2531 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 2 Nov 2021 17:48:48 +0100
Subject: [PATCH 370/508] Disable SWIGWARN_LANG_EXPERIMENTAL while running test
 suite for C

We really don't need all the warnings while testing, they are only
useful for SWIG users, not when developing it.
---
 Examples/test-suite/c/Makefile.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index c12e1516e..0f69b0221 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -110,6 +110,9 @@ char_binary.cpptest director_binary_string.cpptest li_typemaps.cpptest li_typema
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
+SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning
+
 SRCDIR       = ../$(srcdir)/
 
 # Rules for the different types of tests

From 63a229a40f57ca04054fa71b58db49777acfb973 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 30 Oct 2021 23:54:12 +0200
Subject: [PATCH 371/508] Don't disable experimental warning for C in GHA
 workflow any more

This is not necessary any longer after the previous commit and is better
than setting SWIG_FEATURES in the workflow file, as this resulted in
showing "-w524" in the name of C CI build since the changes of 04a6ad3bb
(Add SWIG_FEATURES into GHA name, 2021-10-21), which was a bit ugly.
---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8025ffd1..6aafa7389 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,6 @@ jobs:
           desc: clang
         - SWIGLANG: c
           CPP11: 1
-          SWIG_FEATURES: "-w524"
         - SWIGLANG: csharp
         # D support can't be enabled because dmd 2.066 fails to build anything
         # under Ubuntu 18.04 due to its standard library (libphobos2.a) not

From 8014af974d188c467a5a5b66d06b46ce435b5671 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 4 Nov 2021 00:24:41 +0100
Subject: [PATCH 372/508] Revert accidental change to Python example

This was done way back in f84342a30 (Modified parameter handling using
typemaps. 'Reference' example. Visibility hint now applies only to the
global functions., 2008-06-28), surely accidentally.
---
 Examples/python/class/example.i | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Examples/python/class/example.i b/Examples/python/class/example.i
index 21b86a346..fbdf7249f 100644
--- a/Examples/python/class/example.i
+++ b/Examples/python/class/example.i
@@ -5,9 +5,5 @@
 #include "example.h"
 %}
 
-%typemap(in) double {
-  /* hello */
-}
-
 /* Let's just grab the original header file here */
 %include "example.h"

From ca56f14aa52a848b8408cdcdb08f324af68198cc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 01:25:16 +0100
Subject: [PATCH 373/508] Refactor scoped_dohptr() to reuse its reset()

No real changes, just avoid some code duplication and add an optional
argument to reset() to make it more compatible with std::unique_ptr<>
and also more flexible.
---
 Source/Modules/c.cxx | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index b0ea99506..78130f39b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -42,20 +42,14 @@ public:
 
   // Same for the assignment operator.
   scoped_dohptr& operator=(scoped_dohptr const& other) {
-    if (&other != this) {
-      Delete(obj_);
-      obj_ = other.release();
-    }
+    reset(other.release());
 
     return *this;
   }
 
   // Assignment operator takes ownership of the pointer, just as the ctor does.
   scoped_dohptr& operator=(DOH* obj) {
-    if (obj != obj_) {
-      Delete(obj_);
-      obj_ = obj;
-    }
+    reset(obj);
 
     return *this;
   }
@@ -68,10 +62,10 @@ public:
     return obj;
   }
 
-  void reset() {
-    if (obj_) {
+  void reset(DOH* obj = NULL) {
+    if (obj != obj_) {
       Delete(obj_);
-      obj_ = NULL;
+      obj_ = obj;
     }
   }
 

From ad3db88e44a4b3de5c672c581951e0c20ff2cafa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 01:26:02 +0100
Subject: [PATCH 374/508] Add maybe_owned_dohptr helper

This class allows to avoid allocating a new DOH object unnecessarily if
we can reuse an existing one.

It is not used yet, but will be soon.
---
 Source/Modules/c.cxx | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 78130f39b..4fcd735b2 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -71,10 +71,47 @@ public:
 
   operator DOH*() const { return obj_; }
 
-private:
+protected:
   DOH* obj_;
 };
 
+// Wrapper for a DOH object which can be owned or not.
+class maybe_owned_dohptr : public scoped_dohptr
+{
+public:
+  explicit maybe_owned_dohptr(DOH* obj = NULL) : scoped_dohptr(obj), owned_(true) {}
+
+  maybe_owned_dohptr(maybe_owned_dohptr const& other) : scoped_dohptr(other) {
+    owned_ = other.owned_;
+
+    // We can live other.owned_ unchanged, as its pointer is null now anyhow.
+  }
+
+  maybe_owned_dohptr& operator=(maybe_owned_dohptr const& other) {
+    reset(other.release());
+    owned_ = other.owned_;
+
+    return *this;
+  }
+
+  ~maybe_owned_dohptr() {
+    if (!owned_)
+      obj_ = NULL; // Prevent it from being deleted by the base class dtor.
+  }
+
+  void assign_owned(DOH* obj) {
+    reset(obj);
+  }
+
+  void assign_non_owned(DOH* obj) {
+    reset(obj);
+    owned_ = false;
+  }
+
+private:
+  bool owned_;
+};
+
 // Helper class to output "begin" fragment in the ctor and "end" in the dtor.
 class begin_end_output_guard
 {

From 4801a3154e48773a1f0ac8e644cd400899e0bbca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 16:16:57 +0100
Subject: [PATCH 375/508] Delete never used variables in function wrapper code

No real changes, just don't bother allocating and deleting strings that
are never used at all.
---
 Source/Modules/c.cxx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 4fcd735b2..5fe9045ee 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -933,7 +933,6 @@ public:
        bool const is_global = GetFlag(n, "c:globalfun");
        String *wname = is_global ? getGlobalWrapperName(n, name) : Copy(name);
        String *preturn_type = get_wrapper_func_return_type(n);
-       String *wrapper_call = NewString("");
 
        // add function declaration to the proxy header file
        Printv(f_wrappers_decl, "SWIGIMPORT ", preturn_type, " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
@@ -950,7 +949,6 @@ public:
 
        // cleanup
        Delete(wname);
-       Delete(wrapper_call);
        Delete(preturn_type);
     }
 
@@ -961,7 +959,6 @@ public:
 
        // C++ function wrapper
        SwigType *type = Getattr(n, "type");
-       SwigType *otype = Copy(type);
        SwigType *return_type = get_wrapper_func_return_type(n);
        String *wname = GetFlag(n, "c:globalfun") ? getGlobalWrapperName(n, name) : Copy(name);
        ParmList *parms = Getattr(n, "parms");
@@ -1080,7 +1077,6 @@ public:
        // cleanup
        Delete(wname);
        Delete(return_type);
-       Delete(otype);
        DelWrapper(wrapper);
     }
 

From 7e5e6a4cf0d6715f627569cc00f5f285851839c2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 16:18:43 +0100
Subject: [PATCH 376/508] Avoid unnecessary allocations of function name

Use maybe_owned_dohptr in function wrapper code to avoid making a copy
unnecessarily just to be able to Delete() this pointer later.

No real changes.
---
 Source/Modules/c.cxx | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 5fe9045ee..3dbf27214 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -930,25 +930,27 @@ public:
        current_output = output_wrapper_decl;
 
        // C++ function wrapper proxy code
-       bool const is_global = GetFlag(n, "c:globalfun");
-       String *wname = is_global ? getGlobalWrapperName(n, name) : Copy(name);
+       maybe_owned_dohptr wname;
+       if (GetFlag(n, "c:globalfun"))
+	 wname.assign_owned(getGlobalWrapperName(n, name));
+       else
+	 wname.assign_non_owned(name);
        String *preturn_type = get_wrapper_func_return_type(n);
 
        // add function declaration to the proxy header file
-       Printv(f_wrappers_decl, "SWIGIMPORT ", preturn_type, " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
+       Printv(f_wrappers_decl, "SWIGIMPORT ", preturn_type, " ", wname.get(), get_wrapper_func_proto(n).get(), ";\n\n", NIL);
 
-       if (is_global) {
+       if (GetFlag(n, "c:globalfun")) {
 	 if (!f_wrappers_aliases) {
 	   // Allocate it on demand.
 	   f_wrappers_aliases = NewStringEmpty();
 	   Printv(f_wrappers_aliases, "#ifdef SWIG_DEFINE_WRAPPER_ALIASES\n", NIL);
 	 }
 
-	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname);
+	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname.get());
        }
 
        // cleanup
-       Delete(wname);
        Delete(preturn_type);
     }
 
@@ -960,7 +962,11 @@ public:
        // C++ function wrapper
        SwigType *type = Getattr(n, "type");
        SwigType *return_type = get_wrapper_func_return_type(n);
-       String *wname = GetFlag(n, "c:globalfun") ? getGlobalWrapperName(n, name) : Copy(name);
+       maybe_owned_dohptr wname;
+       if (GetFlag(n, "c:globalfun"))
+	 wname.assign_owned(getGlobalWrapperName(n, name));
+       else
+	 wname.assign_non_owned(name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
        bool is_void_return = (SwigType_type(type) == T_VOID);
@@ -981,7 +987,7 @@ public:
        }
 
        // create wrapper function prototype
-       Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, NIL);
+       Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname.get(), NIL);
 
        Printv(wrapper->def, get_wrapper_func_proto(n, wrapper).get(), NIL);
        Printv(wrapper->def, " {", NIL);
@@ -1075,7 +1081,6 @@ public:
        Wrapper_print(wrapper, f_wrappers);
 
        // cleanup
-       Delete(wname);
        Delete(return_type);
        DelWrapper(wrapper);
     }

From 07e7086b3914b8670c4a701ce33eb283fb18e929 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 18:43:08 +0100
Subject: [PATCH 377/508] Generate wrapper function name in a single place

Rename getGlobalWrapperName() to getFunctionWrapperName() and make it
work for all functions, not just global ones.

This means that we can test whether the function is global or not in a
single place instead of doing it in two different ones.
---
 Source/Modules/c.cxx | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 3dbf27214..5a6cb5b63 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -231,11 +231,19 @@ public:
      return proxyname;
   }
 
-  // Construct the name to be used for a global (i.e. not member) symbol in C wrappers.
+  // Construct the name to be used for a function with the given name in C wrappers.
   //
   // The returned string must be freed by caller.
-  String *getGlobalWrapperName(Node *n, String *name) const
+  maybe_owned_dohptr getFunctionWrapperName(Node *n, String *name) const
   {
+    maybe_owned_dohptr wname;
+
+    // For class members we don't need to use any prefix at all, as they're already prefixed by the class name, which has the appropriate prefix.
+    if (!GetFlag(n, "c:globalfun")) {
+      wname.assign_non_owned(name);
+      return wname;
+    }
+
     // Use namespace as the prefix if feature:nspace is in use.
     scoped_dohptr scopename_prefix;
     if (GetFlag(parentNode(n), "feature:nspace")) {
@@ -252,7 +260,8 @@ public:
     // the same name.
     String* const prefix = scopename_prefix ? scopename_prefix : module_prefix;
 
-    return NewStringf("%s_%s", prefix, name);
+    wname.assign_owned(NewStringf("%s_%s", prefix, name));
+    return wname;
   }
 
   /* -----------------------------------------------------------------------------
@@ -705,7 +714,7 @@ public:
     {
        // this is C function, we don't apply typemaps to it
        String *name = Getattr(n, "sym:name");
-       String *wname = getGlobalWrapperName(n, name);
+       maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
        SwigType *type = Getattr(n, "type");
        SwigType *return_type = NULL;
        String *arg_names = NULL;
@@ -734,7 +743,7 @@ public:
             Printv(proto, gencomma ? ", " : "", SwigType_str(Getattr(p, "type"), 0), " ", Getattr(p, "lname"), NIL);
             gencomma = 1;
        }
-       Printv(wrapper->def, return_type, " ", wname, "(", proto, ") {\n", NIL);
+       Printv(wrapper->def, return_type, " ", wname.get(), "(", proto, ") {\n", NIL);
 
        // attach 'check' typemaps
        Swig_typemap_attach_parms("check", parms, wrapper);
@@ -770,7 +779,6 @@ public:
        // cleanup
        Delete(proto);
        Delete(arg_names);
-       Delete(wname);
        Delete(return_type);
        DelWrapper(wrapper);
     }
@@ -929,12 +937,7 @@ public:
     {
        current_output = output_wrapper_decl;
 
-       // C++ function wrapper proxy code
-       maybe_owned_dohptr wname;
-       if (GetFlag(n, "c:globalfun"))
-	 wname.assign_owned(getGlobalWrapperName(n, name));
-       else
-	 wname.assign_non_owned(name);
+       maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
        String *preturn_type = get_wrapper_func_return_type(n);
 
        // add function declaration to the proxy header file
@@ -962,11 +965,7 @@ public:
        // C++ function wrapper
        SwigType *type = Getattr(n, "type");
        SwigType *return_type = get_wrapper_func_return_type(n);
-       maybe_owned_dohptr wname;
-       if (GetFlag(n, "c:globalfun"))
-	 wname.assign_owned(getGlobalWrapperName(n, name));
-       else
-	 wname.assign_non_owned(name);
+       maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
        bool is_void_return = (SwigType_type(type) == T_VOID);

From ec4cfd41de020f96a3528106f8d2c164501e2f72 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 16:18:48 +0100
Subject: [PATCH 378/508] Return scoped_dohptr from
 get_wrapper_func_return_type()

Ensure that the returned pointer is deleted automatically instead of
doing it manually.
---
 Source/Modules/c.cxx | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 5a6cb5b63..22be640e4 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -811,7 +811,7 @@ public:
        Delete(over_suffix);
     }
 
-  String *get_wrapper_func_return_type(Node *n)
+  scoped_dohptr get_wrapper_func_return_type(Node *n)
     {
       SwigType *type = Getattr(n, "type");
       String *return_type;
@@ -825,7 +825,7 @@ public:
 
       Replaceall(return_type, "::", "_");
 
-      return return_type;
+      return scoped_dohptr(return_type);
     }
 
   /* ----------------------------------------------------------------------
@@ -938,10 +938,9 @@ public:
        current_output = output_wrapper_decl;
 
        maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
-       String *preturn_type = get_wrapper_func_return_type(n);
 
        // add function declaration to the proxy header file
-       Printv(f_wrappers_decl, "SWIGIMPORT ", preturn_type, " ", wname.get(), get_wrapper_func_proto(n).get(), ";\n\n", NIL);
+       Printv(f_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname.get(), get_wrapper_func_proto(n).get(), ";\n\n", NIL);
 
        if (GetFlag(n, "c:globalfun")) {
 	 if (!f_wrappers_aliases) {
@@ -952,9 +951,6 @@ public:
 
 	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname.get());
        }
-
-       // cleanup
-       Delete(preturn_type);
     }
 
 
@@ -964,7 +960,7 @@ public:
 
        // C++ function wrapper
        SwigType *type = Getattr(n, "type");
-       SwigType *return_type = get_wrapper_func_return_type(n);
+       scoped_dohptr return_type = get_wrapper_func_return_type(n);
        maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
        ParmList *parms = Getattr(n, "parms");
        Parm *p;
@@ -986,7 +982,7 @@ public:
        }
 
        // create wrapper function prototype
-       Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname.get(), NIL);
+       Printv(wrapper->def, "SWIGEXPORTC ", return_type.get(), " ", wname.get(), NIL);
 
        Printv(wrapper->def, get_wrapper_func_proto(n, wrapper).get(), NIL);
        Printv(wrapper->def, " {", NIL);
@@ -1036,7 +1032,7 @@ public:
 	      const char* start = Char(tm);
 	      const char* p = strstr(start, "$result = ");
 	      if (p == start || (p && p[-1] == ' ')) {
-		Insert(tm, p - start + strlen("$result = "), NewStringf("(%s)", return_type));
+		Insert(tm, p - start + strlen("$result = "), NewStringf("(%s)", return_type.get()));
 	      }
                  Replaceall(tm, "$result", "result");
 		 Replaceall(tm, "$owner", GetFlag(n, "feature:new") ? "1" : "0");
@@ -1080,7 +1076,6 @@ public:
        Wrapper_print(wrapper, f_wrappers);
 
        // cleanup
-       Delete(return_type);
        DelWrapper(wrapper);
     }
 

From 81d1fec13c260acc8595737dba089aa05f262538 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 16:30:40 +0100
Subject: [PATCH 379/508] Remove code setting unused "c:retval" attribute

This became unused after the changes of fd3e76365 (Streamline and fix
returning objects by value, 2019-08-06) and allows to simplify code
further as we don't need to override static and non-static member
function handlers at all any more now.
---
 Source/Modules/c.cxx | 47 --------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 22be640e4..6dc6fbcdd 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -606,13 +606,8 @@ public:
    * ------------------------------------------------------------------------ */
 
   virtual int globalfunctionHandler(Node *n) {
-    SwigType *type = Getattr(n, "type");
-
     Setattr(n, "c:globalfun", "1");
 
-    if (!SwigType_ispointer(type) && !SwigType_isreference(type))
-      Setattr(n, "c:retval", "1");
-
     return Language::globalfunctionHandler(n);
   }
 
@@ -1369,40 +1364,6 @@ public:
     return SWIG_OK;
   }
 
-  /* ---------------------------------------------------------------------
-   * staticmemberfunctionHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int staticmemberfunctionHandler(Node *n) {
-    SwigType *type = Getattr(n, "type");
-    SwigType *tdtype;
-    tdtype = SwigType_typedef_resolve_all(type);
-    if (tdtype)
-      type = tdtype;
-    if (type) {
-      if (!SwigType_ispointer(type) && !SwigType_isreference(type))
-        Setattr(n, "c:retval", "1");
-    }
-    return Language::staticmemberfunctionHandler(n);
-  }
-
-  /* ---------------------------------------------------------------------
-   * memberfunctionHandler()
-   * --------------------------------------------------------------------- */
-
-  virtual int memberfunctionHandler(Node *n) {
-    SwigType *type = Getattr(n, "type");
-    SwigType *tdtype;
-    tdtype = SwigType_typedef_resolve_all(type);
-    if (tdtype)
-      type = tdtype;
-    if (type) {
-      if (!SwigType_ispointer(type) && !SwigType_isreference(type))
-        Setattr(n, "c:retval", "1");
-    }
-    return Language::memberfunctionHandler(n);
-  }
-
   /* ---------------------------------------------------------------------
    * staticmembervariableHandler()
    * --------------------------------------------------------------------- */
@@ -1421,10 +1382,6 @@ public:
       SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0)));
       Setattr(n, "type", btype);
     }
-    if (type) {
-      if (!SwigType_ispointer(type) && !SwigType_isreference(type))
-        Setattr(n, "c:retval", "1");
-    }
     Delete(type);
     Delete(btype);
     return Language::staticmembervariableHandler(n);
@@ -1448,10 +1405,6 @@ public:
       SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0)));
       Setattr(n, "type", btype);
     }
-    if (type) {
-      if (!SwigType_ispointer(type) && !SwigType_isreference(type))
-        Setattr(n, "c:retval", "1");
-    }
     Delete(type);
     Delete(btype);
     return Language::membervariableHandler(n);

From f4ee8e5369bdbad947fcae94bc3c7cd69bf1e5ea Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 4 Nov 2021 17:15:16 +0100
Subject: [PATCH 380/508] Fix names of enums and their elements

Use the containing class name as prefix, and add the name of the enum
itself to the prefix for the scoped enums, instead of doing something
strange and semi-random that we did before, with prefixes including the
namespace (which should never be the case without "nspace" feature), but
not the scoped enum.

This also fixes renaming of enum elements, as a side effect, which
didn't work before, add run test for enum_rename unit test to prove it.
---
 Examples/test-suite/c/enum_rename_runme.c | 12 ++++++
 Examples/test-suite/c/enums_runme.c       |  2 +-
 Source/Modules/c.cxx                      | 50 +++++++++++++++++++----
 3 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 Examples/test-suite/c/enum_rename_runme.c

diff --git a/Examples/test-suite/c/enum_rename_runme.c b/Examples/test-suite/c/enum_rename_runme.c
new file mode 100644
index 000000000..0174bc8f0
--- /dev/null
+++ b/Examples/test-suite/c/enum_rename_runme.c
@@ -0,0 +1,12 @@
+#include 
+
+#include "enum_rename/enum_rename_wrap.h"
+
+int main() {
+  assert(M_Jan == 0);
+  assert(May   == 1);
+  assert(M_Dec == 2);
+
+  assert(S_Can  == 1);
+  assert(S_Must == 2);
+}
diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c
index 6134ab0d6..89138b035 100644
--- a/Examples/test-suite/c/enums_runme.c
+++ b/Examples/test-suite/c/enums_runme.c
@@ -6,7 +6,7 @@
 
 int main() {
   assert(GlobalInstance == globalinstance1);
-  assert(Char == 'a');
+  assert(iFoo_Char == 'a');
   bar2(1);
   bar3(1);
   bar1(1);
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 6dc6fbcdd..bc439f0da 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -181,6 +181,9 @@ class C:public Language {
   // Prefix for module-level symbols, currently just the module name.
   String *module_prefix;
 
+  // Used only while generating wrappers for an enum and contains the prefix to use for enum elements if non-null.
+  String *enum_prefix;
+
   // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
   bool enum_is_empty;
 
@@ -1448,10 +1451,32 @@ public:
     }
     Printv(f_wrappers_types, "enum", NIL);
 
-    if (String* const name = Getattr(n, "name")) {
-      String* const enumname = Swig_name_mangle(name);
-      Printv(f_wrappers_types, " ", enumname, NIL);
-      Delete(enumname);
+    if (Node* const klass = getCurrentClass()) {
+      enum_prefix = getProxyName(klass);
+    } else {
+      enum_prefix = NIL;
+    }
+
+    scoped_dohptr enumname;
+
+    // Unnamed enums may just have no name at all or have a synthesized invalid name of the form "$unnamedN$ which is indicated by "unnamed" attribute.
+    //
+    // Also note that we use "name" here and not "sym:name" because the latter is the name of typedef if there is one, while we want to use the name of enum
+    // itself here and, even more importantly, use the enum, and not the typedef, name as prefix for its elements.
+    if (String* const name = Getattr(n, "unnamed") ? NIL : Getattr(n, "name")) {
+      // But the name may included the containing class, so get rid of it.
+      enumname = Swig_scopename_last(name);
+
+      if (enum_prefix) {
+	enumname = NewStringf("%s_%s", enum_prefix, enumname.get());
+      }
+
+      Printv(f_wrappers_types, " ", enumname.get(), NIL);
+
+      // For scoped enums, their name should be prefixed to their elements in addition to any other prefix we use.
+      if (Getattr(n, "scopedenum")) {
+	enum_prefix = enumname.get();
+      }
     }
 
     // We don't know here if we're going to have any non-ignored enum elements, so let enumvalueDeclaration() itself reset this flag if it does get called, this
@@ -1465,6 +1490,8 @@ public:
       Printv(f_wrappers_types, "\n}", NIL);
     }
 
+    enum_prefix = NULL;
+
     if (tdname) {
       String* const enumname = Swig_name_mangle(tdname);
       Printv(f_wrappers_types, " ", enumname, NIL);
@@ -1482,7 +1509,7 @@ public:
   virtual int enumvalueDeclaration(Node *n) {
     if (Cmp(Getattr(n, "ismember"), "1") == 0 && Cmp(Getattr(n, "access"), "public") != 0)
       return SWIG_NOWRAP;
-    Swig_require("enumvalueDeclaration", n, "*value", "?enumvalueex", "?enumvalue", NIL);
+    Swig_require("enumvalueDeclaration", n, "?enumvalueex", "?enumvalue", NIL);
 
     enum_is_empty = false;
 
@@ -1491,8 +1518,15 @@ public:
     else
       Printv(f_wrappers_types, ",\n", NIL);
 
-    String* const enumitemname = Getattr(n, "value");
-    Printv(f_wrappers_types, cindent, Swig_name_mangle(enumitemname), NIL);
+    maybe_owned_dohptr wname;
+
+    String* const symname = Getattr(n, "sym:name");
+    if (enum_prefix) {
+      wname.assign_owned(NewStringf("%s_%s", enum_prefix, symname));
+    } else {
+      wname.assign_non_owned(symname);
+    }
+    Printv(f_wrappers_types, cindent, wname.get(), NIL);
 
     // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum
     // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace).
@@ -1508,7 +1542,7 @@ public:
       if (*Char(value) == '\\') {
 	Push(cvalue, "'");
 	Append(cvalue, "'");
-      } else if (Len(value) == 1 && !Swig_symbol_clookup(enumitemname, NULL)) {
+      } else if (Len(value) == 1 && !Swig_symbol_clookup(value, NULL)) {
 	Push(cvalue, "'");
 	Append(cvalue, "'");
       }

From cda93bd90330800641592700e81631eb6a03a04c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 7 Nov 2021 02:27:37 +0100
Subject: [PATCH 381/508] Fix enum value translation

Don't rely on hack with checking the value length and looking it up,
just check its type instead.
---
 Source/Modules/c.cxx | 49 +++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index bc439f0da..964a66dcf 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1532,35 +1532,32 @@ public:
     // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace).
     String *value = Getattr(n, "enumvalue");
     if (value) {
-      String* const cvalue = Copy(value);
+      // We can't always use the raw value, check its type to see if we need to transform it.
+      maybe_owned_dohptr cvalue;
+      switch (SwigType_type(Getattr(n, "type"))) {
+	case T_BOOL:
+	  // Boolean constants can't appear in C code, so replace them with their values in the simplest possible case. This is not exhaustive, of course,
+	  // but better than nothing and doing the right thing is not simple at all as we'd need to really parse the expression, just textual substitution wouldn't
+	  // be enough (consider e.g. an enum element called "very_true" and another one using it as its value).
+	  if (Cmp(value, "true") == 0) {
+	    cvalue.assign_owned(NewString("1"));
+	  } else if (Cmp(value, "false") == 0) {
+	    cvalue.assign_owned(NewString("0"));
+	  } else {
+	    Swig_error(Getfile(n), Getline(n), "Unsupported boolean enum value \"%s\".\n", value);
+	  }
+	  break;
 
-      // Due to what seems to be a bug in SWIG parser, char values for enum elements lose their quotes, i.e.
-      //
-      //  enum { x = 'a', y = '\x62' };
-      //
-      // in input results in value being just "a" or "\x62". Try to repair this brokenness.
-      if (*Char(value) == '\\') {
-	Push(cvalue, "'");
-	Append(cvalue, "'");
-      } else if (Len(value) == 1 && !Swig_symbol_clookup(value, NULL)) {
-	Push(cvalue, "'");
-	Append(cvalue, "'");
+	case T_CHAR:
+	  // SWIG parser doesn't put single quotes around char values, for some reason, so add them here.
+	  cvalue.assign_owned(NewStringf("'%(escape)s'", value));
+	  break;
+
+	default:
+	  cvalue.assign_non_owned(value);
       }
 
-      // Boolean constants can't appear in C code neither, so replace them with their values in the simplest possible case. This is not exhaustive, of course,
-      // but better than nothing and doing the right thing is not simple at all as we'd need to really parse the expression, just textual substitution wouldn't
-      // be enough (consider e.g. an enum element called "very_true" and another one using it as its value).
-      if (Cmp(value, "true") == 0) {
-	Clear(cvalue);
-	Append(cvalue, "1");
-      } else if (Cmp(value, "false") == 0) {
-	Clear(cvalue);
-	Append(cvalue, "0");
-      }
-
-      Printv(f_wrappers_types, " = ", cvalue, NIL);
-
-      Delete(cvalue);
+      Printv(f_wrappers_types, " = ", cvalue.get(), NIL);
     }
 
     Swig_restore(n);

From 5bf1497d7bd91598579c9d1ab3e6061d0938870d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 00:30:22 +0100
Subject: [PATCH 382/508] Allow customizing type mangling in SWIG preprocessor

Use the "type" naming format for the types mangled by "#@" and "##@"
preprocessor operators, in order to allow customizing them for a
particular backend.

This isn't used by any backend yet, so this doesn't change anything so
far.
---
 Source/Preprocessor/cpp.c |  4 ++--
 Source/Swig/naming.c      | 27 +++++++++++++++++++++++++++
 Source/Swig/swig.h        |  1 +
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c
index 75bec61fd..14d41a001 100644
--- a/Source/Preprocessor/cpp.c
+++ b/Source/Preprocessor/cpp.c
@@ -929,14 +929,14 @@ static String *expand_macro(String *name, List *args, String *line_file) {
       /* Non-standard mangle expansions.  
          The #@Name is replaced by mangle_arg(Name). */
       if (strstr(Char(ns), "\004")) {
-	String *marg = Swig_string_mangle(arg);
+	String *marg = Swig_name_type(arg);
 	Clear(temp);
 	Printf(temp, "\004%s", aname);
 	Replace(ns, temp, marg, DOH_REPLACE_ID_END);
 	Delete(marg);
       }
       if (strstr(Char(ns), "\005")) {
-	String *marg = Swig_string_mangle(arg);
+	String *marg = Swig_name_type(arg);
 	Clear(temp);
 	Clear(tempa);
 	Printf(temp, "\005%s", aname);
diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c
index 1d78e7a47..03a9cd6ff 100644
--- a/Source/Swig/naming.c
+++ b/Source/Swig/naming.c
@@ -172,6 +172,33 @@ String *Swig_name_mangle(const_String_or_char_ptr s) {
 #endif
 }
 
+/* -----------------------------------------------------------------------------
+ * Swig_name_type()
+ *
+ * Returns the name of a type.
+ * ----------------------------------------------------------------------------- */
+
+String *Swig_name_type(const_String_or_char_ptr tname) {
+  String *r, *s;
+  String* f = naming_hash ? Getattr(naming_hash, "type") : NULL;
+
+  /* Don't bother doing anything else if there is no special naming format. */
+  if (f) {
+    s = Copy(f);
+    Replace(s, "%c", tname, DOH_REPLACE_ANY);
+  } else {
+    s = (String*)tname;
+  }
+
+  r = Swig_name_mangle(s);
+
+  if (s != tname)
+    Delete(s);
+
+  return r;
+}
+
+
 /* -----------------------------------------------------------------------------
  * Swig_name_wrapper()
  *
diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h
index 76691269e..b8a3a3d22 100644
--- a/Source/Swig/swig.h
+++ b/Source/Swig/swig.h
@@ -273,6 +273,7 @@ extern int        ParmList_is_compactdefargs(ParmList *p);
   extern void Swig_name_register(const_String_or_char_ptr method, const_String_or_char_ptr format);
   extern void Swig_name_unregister(const_String_or_char_ptr method);
   extern String *Swig_name_mangle(const_String_or_char_ptr s);
+  extern String *Swig_name_type(const_String_or_char_ptr tname);
   extern String *Swig_name_wrapper(const_String_or_char_ptr fname);
   extern String *Swig_name_member(const_String_or_char_ptr nspace, const_String_or_char_ptr classname, const_String_or_char_ptr membername);
   extern String *Swig_name_get(const_String_or_char_ptr nspace, const_String_or_char_ptr vname);

From 54af856d0974810f7305faad296e7c2ca732f6ec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 00:50:33 +0100
Subject: [PATCH 383/508] Fix typemaps for arrays of objects and object
 pointers

These typemaps never worked, but this went unnoticed until now because
the nonsensical "ctype" expansion generated by them still compiled.

With types possibly having a namespace prefix, they didn't any longer,
so define them correctly for the objects using "$resolved_type" and
define the typemap for "void*[]" separately, as "$resolved_type" can't
be used for it.
---
 Lib/c/c.swg | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/c/c.swg b/Lib/c/c.swg
index 166bd3aa8..76fe25024 100644
--- a/Lib/c/c.swg
+++ b/Lib/c/c.swg
@@ -113,12 +113,15 @@ same_action(TM, size_t, ACTION, ACTION_CREF);
 same_macro_all_primitive_types_but_void(same_type,ctype);
 same_macro_all_primitive_types_but_void(cref_as_value,ctype);
 
+// trivial typemap for arrays of void pointers to avoid applying the object typemaps to them
+%typemap(ctype) void*[ANY] "void **"
+
 // objects
 %typemap(ctype) SWIGTYPE      "$&resolved_type*"
 %typemap(ctype) SWIGTYPE *    "$resolved_type*"
 %typemap(ctype) SWIGTYPE &    "$*resolved_type*"
-%typemap(ctype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
-%typemap(ctype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
+%typemap(ctype) SWIGTYPE [ANY] "$resolved_type*"
+%typemap(ctype) SWIGTYPE * [ANY] "$resolved_type**"
 %typemap(ctype) enum SWIGTYPE "int"
 %typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
 

From 6833ead6edfec3398eeb724f68b20aa799a052fe Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 31 Oct 2021 00:38:57 +0200
Subject: [PATCH 384/508] Add -namespace option to use unique prefix for all
 wrappers

Using this option allows to prefix all exported symbols (functions,
enums and enum elements) with a prefix based on the given namespace.

Note that (global) variables can't be exported directly when using the
global namespace prefix, even if they are of C-compatible type.
---
 Doc/Manual/C.html    |  5 +++
 Source/Modules/c.cxx | 86 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 7f765f2a7..0009993b3 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -132,6 +132,11 @@ $ swig -c -help
 C specific options
 
 
+
+-namespace <nspace>
+Generate wrappers with the prefix based on the provided namespace, e.g. if the option value is outer::inner, the prefix outer_inner_ will be used. Notice that this is different from using SWIG nspace feature, as it applies the the prefix to all the symbols, regardless of the namespace they were actually declared in. Notably, this allows to export instantiations of templates defined in the std namespace, such as std::vector, using a custom prefix rather than std_.
+
+
 
 -noexcept
 generate wrappers with no support of exception handling; see Exceptions chapter for more details 
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 964a66dcf..457cc2d65 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -178,6 +178,9 @@ class C:public Language {
 
   String *empty_string;
 
+  // Prefix used for all symbols, if defined.
+  String *ns_prefix;
+
   // Prefix for module-level symbols, currently just the module name.
   String *module_prefix;
 
@@ -201,12 +204,14 @@ public:
 
   C() :
     empty_string(NewString("")),
+    ns_prefix(NULL),
     module_prefix(NULL)
   {
   }
 
   ~C()
   {
+    Delete(ns_prefix);
     Delete(module_prefix);
   }
 
@@ -226,6 +231,8 @@ public:
      if (nspace) {
        scoped_dohptr nspace_mangled(Swig_string_mangle(nspace));
        proxyname = NewStringf("%s_%s", (DOH*)nspace_mangled, symname);
+     } else if (ns_prefix) {
+       proxyname = NewStringf("%s_%s", ns_prefix, symname);
      } else {
        proxyname = Copy(symname);
      }
@@ -247,6 +254,15 @@ public:
       return wname;
     }
 
+    // Static member functions (which do have "c:globalfun" attribute) are a special case: normally we wouldn't want to use prefix for them neither, as they
+    // already use the class name as prefix, but without one, they conflict with the names created by %extend, that use the same "class_method" form,
+    // internally. So we still need to append some prefix to them, but we may avoid doing it if use a global prefix, as this is enough to avoid the conflict
+    // with %extend, and doing this allows to avoid duplicating this prefix (as it is also part of the class name).
+    if (Checkattr(n, "ismember", "1") && ns_prefix) {
+      wname.assign_non_owned(name);
+      return wname;
+    }
+
     // Use namespace as the prefix if feature:nspace is in use.
     scoped_dohptr scopename_prefix;
     if (GetFlag(parentNode(n), "feature:nspace")) {
@@ -257,11 +273,15 @@ public:
       }
     }
 
-    // Fall back to the module name if we don't use feature:nspace or are outside of any namespace.
+    // Fall back to the module name if we don't use feature:nspace and don't have the global prefix neither.
     //
     // Note that we really, really need to use some prefix, as a global wrapper function can't have the same name as the original function (being wrapped) with
     // the same name.
-    String* const prefix = scopename_prefix ? scopename_prefix : module_prefix;
+    String* const prefix = scopename_prefix
+      ? scopename_prefix
+      : ns_prefix
+	? ns_prefix
+	: module_prefix;
 
     wname.assign_owned(NewStringf("%s_%s", prefix, name));
     return wname;
@@ -434,6 +454,16 @@ public:
       if (argv[i]) {
         if (strcmp(argv[i], "-help") == 0) {
           Printf(stdout, "%s\n", usage);
+        } else if (strcmp(argv[i], "-namespace") == 0) {
+	  if (argv[i + 1]) {
+	    scoped_dohptr ns(NewString(argv[i + 1]));
+	    ns_prefix = Swig_string_mangle(ns);
+	    Swig_mark_arg(i);
+	    Swig_mark_arg(i + 1);
+	    i++;
+	  } else {
+	    Swig_arg_error();
+	  }
         } else if (strcmp(argv[i], "-noexcept") == 0) {
           except_flag = false;
           Swig_mark_arg(i);
@@ -454,13 +484,21 @@ public:
     SWIG_typemap_lang("c");
     SWIG_config_file("c.swg");
 
+    String* const ns_prefix_ = ns_prefix ? NewStringf("%s_", ns_prefix) : NewString("");
+
     // The default naming convention is to use new_Foo(), copy_Foo() and delete_Foo() for the default/copy ctor and dtor of the class Foo, but we prefer to
     // start all Foo methods with the same prefix, so change this. Notice that new/delete are chosen to ensure that we avoid conflicts with the existing class
     // methods, more natural create/destroy, for example, could result in errors if the class already had a method with the same name, but this is impossible
     // for the chosen names as they're keywords in C++ ("copy" is still a problem but we'll just have to live with it).
-    Swig_name_register("construct", "%n%c_new");
-    Swig_name_register("copy", "%n%c_copy");
-    Swig_name_register("destroy", "%n%c_delete");
+    Swig_name_register("construct", NewStringf("%s%%n%%c_new", ns_prefix_));
+    Swig_name_register("copy", NewStringf("%s%%n%%c_copy", ns_prefix_));
+    Swig_name_register("destroy", NewStringf("%s%%n%%c_delete", ns_prefix_));
+
+    // These ones are only needed when using a global prefix, as otherwise the defaults are fine.
+    if (ns_prefix) {
+      Swig_name_register("member", NewStringf("%s%%n%%c_%%m", ns_prefix_));
+      Swig_name_register("type", NewStringf("%s%%c", ns_prefix_));
+    }
 
     allow_overloading();
   }
@@ -587,21 +625,33 @@ public:
     if (Checkattr(n, "storage", "static"))
       return SWIG_NOWRAP;
 
-    // We can't export variables defined inside namespaces to C directly, whatever their type.
-    String* const scope = Swig_scopename_prefix(Getattr(n, "name"));
-    if (!scope) {
+    // We can't export variables defined inside namespaces to C directly, whatever their type, and we can only export them under their original name, so we
+    // can't do it when using a global namespace prefix neither.
+    if (!ns_prefix && !scoped_dohptr(Swig_scopename_prefix(Getattr(n, "name")))) {
       // If we can export the variable directly, do it, this will be more convenient to use from C code than accessor functions.
       if (String* const var_decl = make_c_var_decl(n)) {
 	Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL);
 	Delete(var_decl);
 	return SWIG_OK;
       }
-    } else {
-      Delete(scope);
+    }
+
+    // We have to prepend the global prefix to the names of the accessors for this variable, if we use one.
+    //
+    // Note that we can't just register the name format using the prefix for "get" and "set", as we do it for "member", and using it for both would result in
+    // the prefix being used twice for the member variables getters and setters, so we have to work around it here instead.
+    if (ns_prefix && !getCurrentClass()) {
+      Swig_require("c:globalvariableHandler", n, "*sym:name", NIL);
+      Setattr(n, "sym:name", NewStringf("%s_%s", ns_prefix, Getattr(n, "sym:name")));
     }
 
     // Otherwise, e.g. if it's of a C++-only type, or a reference, generate accessor functions for it.
-    return Language::globalvariableHandler(n);
+    int const rc = Language::globalvariableHandler(n);
+
+    if (Getattr(n, "view"))
+      Swig_restore(n);
+
+    return rc;
   }
 
   /* -----------------------------------------------------------------------
@@ -1445,7 +1495,8 @@ public:
       return SWIG_NOWRAP;
 
     // Preserve the typedef if we have it in the input.
-    String* const tdname = Getattr(n, "tdname");
+    maybe_owned_dohptr tdname;
+    tdname.assign_non_owned(Getattr(n, "tdname"));
     if (tdname) {
       Printv(f_wrappers_types, "typedef ", NIL);
     }
@@ -1454,7 +1505,11 @@ public:
     if (Node* const klass = getCurrentClass()) {
       enum_prefix = getProxyName(klass);
     } else {
-      enum_prefix = NIL;
+      enum_prefix = ns_prefix; // Possibly NULL, but that's fine.
+    }
+
+    if (tdname && enum_prefix) {
+      tdname.assign_owned(NewStringf("%s_%s", enum_prefix, tdname.get()));
     }
 
     scoped_dohptr enumname;
@@ -1493,9 +1548,7 @@ public:
     enum_prefix = NULL;
 
     if (tdname) {
-      String* const enumname = Swig_name_mangle(tdname);
-      Printv(f_wrappers_types, " ", enumname, NIL);
-      Delete(enumname);
+      Printv(f_wrappers_types, " ", tdname.get(), NIL);
     }
     Printv(f_wrappers_types, ";\n\n", NIL);
 
@@ -1619,6 +1672,7 @@ extern "C" Language *swig_c(void) {
 
 const char *C::usage = (char *) "\
 C Options (available with -c)\n\
+     -namespace ns - use prefix based on the provided namespace\n\
      -noexcept     - do not generate exception handling code\n\
 \n";
 

From 70309fcb0ad0fdd71a44139c11af427470dca466 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 9 Nov 2021 23:20:31 +0100
Subject: [PATCH 385/508] Refactor code in
 Language::staticmemberfunctionHandler()

No real changes, just move the test for "code" to the outer scope to
facilitate the upcoming changes.

This commit is best viewed ignoring whitespace-only changes.
---
 Source/Modules/lang.cxx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 66aebdea1..3064d22f9 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -1320,16 +1320,18 @@ int Language::staticmemberfunctionHandler(Node *n) {
     Delete(mrename);
     mrename = mangled;
 
-    if (Getattr(n, "sym:overloaded") && code) {
-      Append(cname, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
-    }
+    if (code) {
+      if (Getattr(n, "sym:overloaded")) {
+	Append(cname, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
+      }
 
-    if (!defaultargs && code) {
-      /* Hmmm. An added static member.  We have to create a little wrapper for this */
-      String *mangled_cname = Swig_name_mangle(cname);
-      Swig_add_extension_code(n, mangled_cname, parms, type, code, CPlusPlus, 0);
-      Setattr(n, "extendname", mangled_cname);
-      Delete(mangled_cname);
+      if (!defaultargs) {
+	/* Hmmm. An added static member.  We have to create a little wrapper for this */
+	String *mangled_cname = Swig_name_mangle(cname);
+	Swig_add_extension_code(n, mangled_cname, parms, type, code, CPlusPlus, 0);
+	Setattr(n, "extendname", mangled_cname);
+	Delete(mangled_cname);
+      }
     }
   }
 

From 8594a8def65cf4957120c8f88d1a762b18feb3e1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 9 Nov 2021 23:33:31 +0100
Subject: [PATCH 386/508] Use SWIG-specific suffix for non-overloaded %extend
 functions too

This avoids conflicts between functions synthesized by %extend when
adding static methods to an existing class, and the actual wrapper
functions generated by the backend.

This shouldn't result in any user-visible changes.
---
 Source/Modules/lang.cxx |  3 +++
 Source/Swig/cwrap.c     | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 3064d22f9..196ff47a9 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -1321,8 +1321,11 @@ int Language::staticmemberfunctionHandler(Node *n) {
     mrename = mangled;
 
     if (code) {
+      // See Swig_MethodToFunction() for the explanation of this code.
       if (Getattr(n, "sym:overloaded")) {
 	Append(cname, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
+      } else {
+	Append(cname, "__SWIG");
       }
 
       if (!defaultargs) {
diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c
index d6e5e0cdc..0d8008ef0 100644
--- a/Source/Swig/cwrap.c
+++ b/Source/Swig/cwrap.c
@@ -1076,9 +1076,18 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas
 
     /* Check if the method is overloaded.   If so, and it has code attached, we append an extra suffix
        to avoid a name-clash in the generated wrappers.  This allows overloaded methods to be defined
-       in C. */
-    if (Getattr(n, "sym:overloaded") && code) {
-      Append(mangled, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
+       in C.
+
+       But when not using the suffix used for overloaded functions, we still need to ensure that the
+       wrapper name doesn't conflict with any wrapper functions, so make it sufficiently unique by
+       appending a suffix similar to the one used for overloaded functions to it.
+     */
+    if (code) {
+      if (Getattr(n, "sym:overloaded")) {
+	Append(mangled, Getattr(defaultargs ? defaultargs : n, "sym:overname"));
+      } else {
+	Append(mangled, "__SWIG");
+      }
     }
 
     /* See if there is any code that we need to emit */

From fbf976768aac584ace935dbd4716c4b1a562e79b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 3 Nov 2021 16:38:02 +0100
Subject: [PATCH 387/508] Get rid of "c:globalfun" attribute

Use getCurrentClass() and other existing attributes to check if the
current node is inside a class or not (and hence is global), this is
more explicit and avoids confusion for static member functions that were
marked as being global in spite of being nested inside a class.
---
 Source/Modules/c.cxx | 48 +++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 457cc2d65..9f2512cbe 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -248,17 +248,19 @@ public:
   {
     maybe_owned_dohptr wname;
 
-    // For class members we don't need to use any prefix at all, as they're already prefixed by the class name, which has the appropriate prefix.
-    if (!GetFlag(n, "c:globalfun")) {
-      wname.assign_non_owned(name);
-      return wname;
-    }
-
-    // Static member functions (which do have "c:globalfun" attribute) are a special case: normally we wouldn't want to use prefix for them neither, as they
-    // already use the class name as prefix, but without one, they conflict with the names created by %extend, that use the same "class_method" form,
-    // internally. So we still need to append some prefix to them, but we may avoid doing it if use a global prefix, as this is enough to avoid the conflict
-    // with %extend, and doing this allows to avoid duplicating this prefix (as it is also part of the class name).
-    if (Checkattr(n, "ismember", "1") && ns_prefix) {
+    // The basic idea here is that for class members we don't need to use any prefix at all, as they're already prefixed by the class name, which has the
+    // appropriate prefix, but we need to use a prefix for the other symbols.
+    //
+    // However there are a couple of special cases complicating this:
+    //
+    //  - Friend functions are declared inside the class, but are not member functions, so we have to check for both the current class and "ismember" property.
+    //  - Destructors and implicitly generated constructors don't have "ismember" for some reason, so we need to check for them specifically.
+    //  - Variable getters and setters don't need to use the prefix as they don't clash with anything.
+    if ((getCurrentClass() &&
+	  (Checkattr(n, "ismember", "1") ||
+	    Checkattr(n, "nodeType", "constructor") ||
+	      Checkattr(n, "nodeType", "destructor"))) ||
+-               Checkattr(n, "varget", "1") || Checkattr(n, "varset", "1")) {
       wname.assign_non_owned(name);
       return wname;
     }
@@ -275,8 +277,7 @@ public:
 
     // Fall back to the module name if we don't use feature:nspace and don't have the global prefix neither.
     //
-    // Note that we really, really need to use some prefix, as a global wrapper function can't have the same name as the original function (being wrapped) with
-    // the same name.
+    // Note that we really, really need to use some prefix, as wrapper function can't have the same name as the original function being wrapped.
     String* const prefix = scopename_prefix
       ? scopename_prefix
       : ns_prefix
@@ -654,16 +655,6 @@ public:
     return rc;
   }
 
-  /* -----------------------------------------------------------------------
-   * globalfunctionHandler()
-   * ------------------------------------------------------------------------ */
-
-  virtual int globalfunctionHandler(Node *n) {
-    Setattr(n, "c:globalfun", "1");
-
-    return Language::globalfunctionHandler(n);
-  }
-
   /* ----------------------------------------------------------------------
    * prepend_feature()
    * ---------------------------------------------------------------------- */
@@ -990,7 +981,7 @@ public:
        // add function declaration to the proxy header file
        Printv(f_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname.get(), get_wrapper_func_proto(n).get(), ";\n\n", NIL);
 
-       if (GetFlag(n, "c:globalfun")) {
+       if (Cmp(name, wname) != 0) {
 	 if (!f_wrappers_aliases) {
 	   // Allocate it on demand.
 	   f_wrappers_aliases = NewStringEmpty();
@@ -1140,11 +1131,14 @@ public:
 		  // Skip the first "this" parameter of the wrapped methods, it doesn't participate in overload resolution and would just result in extra long
 		  // and ugly names.
 		  //
-		  // The check for c:globalfun is needed to avoid dropping the first argument of static methods which don't have "this" pointer neither, in
-		  // spite of being members. Of course, the constructors don't have it neither.
+		  // We need to avoid dropping the first argument of static methods which don't have "this" pointer, in spite of being members (and we have to
+		  // use "cplus:staticbase" for this instead of just using Swig_storage_isstatic() because "storage" is reset in staticmemberfunctionHandler()
+		  // and so is not available here.
+		  //
+		  // Of course, the constructors don't have the extra first parameter neither.
 		  if (!Checkattr(n, "nodeType", "constructor") &&
 			Checkattr(n, "ismember", "1") &&
-			  !Checkattr(n, "c:globalfun", "1")) {
+			  !Getattr(n, "cplus:staticbase")) {
 		    first_param = nextSibling(first_param);
 
 		    // A special case of overloading on const/non-const "this" pointer only, we still need to distinguish between those.

From 2f4a09fb21e50a3d20460e4d32c425dd0b96a6c6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 6 Nov 2021 20:43:33 +0100
Subject: [PATCH 388/508] Avoid calling getFunctionWrapperName() twice for each
 function

Pass the wrapper name to emit_wrapper_func_decl() to save on an extra
call to this function.

No real changes, this is just an optimization.
---
 Source/Modules/c.cxx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 9f2512cbe..576e98c8b 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -813,7 +813,7 @@ public:
 
        Wrapper_print(wrapper, f_wrappers);
 
-       emit_wrapper_func_decl(n, name);
+       emit_wrapper_func_decl(n, name, wname);
 
        // cleanup
        Delete(proto);
@@ -972,14 +972,12 @@ public:
    * Also emits a define allowing to use the function without the "_wrap_" prefix.
    * The node here is a function declaration.
    * ---------------------------------------------------------------------- */
-  void emit_wrapper_func_decl(Node *n, String *name)
+  void emit_wrapper_func_decl(Node *n, String *name, String *wname)
     {
        current_output = output_wrapper_decl;
 
-       maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
-
        // add function declaration to the proxy header file
-       Printv(f_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname.get(), get_wrapper_func_proto(n).get(), ";\n\n", NIL);
+       Printv(f_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
 
        if (Cmp(name, wname) != 0) {
 	 if (!f_wrappers_aliases) {
@@ -988,7 +986,7 @@ public:
 	   Printv(f_wrappers_aliases, "#ifdef SWIG_DEFINE_WRAPPER_ALIASES\n", NIL);
 	 }
 
-	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname.get());
+	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname);
        }
     }
 
@@ -1116,6 +1114,8 @@ public:
 
        // cleanup
        DelWrapper(wrapper);
+
+       emit_wrapper_func_decl(n, name, wname);
     }
 
     void functionWrapperCPPSpecific(Node *n)
@@ -1167,7 +1167,6 @@ public:
 
        // C++ function wrapper
        functionWrapperCPPSpecificWrapper(n, name);
-       emit_wrapper_func_decl(n, name);
 
        Delete(name);
     }

From 11bd97653fce1dfc0774133bc94741dc8da7baa3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 6 Nov 2021 20:48:22 +0100
Subject: [PATCH 389/508] Inline functions used only once in
 functionWrapperCPPSpecific()

No real changes, just keep everything in a single function because it is
more clear than having both it and functionWrapperCPPSpecificWrapper()
doing the same thing.
---
 Source/Modules/c.cxx | 125 +++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 69 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 576e98c8b..93cb52b01 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -822,20 +822,6 @@ public:
        DelWrapper(wrapper);
     }
 
-  static void functionWrapperPrepareArgs(const ParmList *parms)
-    {
-       Parm *p;
-       int index = 1;
-       String *lname = 0;
-
-       for (p = (Parm*)parms, index = 1; p; (p = nextSibling(p)), index++) {
-            if(!(lname = Getattr(p, "lname"))) {
-                 lname = NewStringf("arg%d", index);
-                 Setattr(p, "lname", lname);
-            }
-       }
-    }
-
   void functionWrapperAppendOverloaded(String *name, Parm* first_param)
     {
        String *over_suffix = NewString("");
@@ -991,16 +977,68 @@ public:
     }
 
 
-    void functionWrapperCPPSpecificWrapper(Node *n, String *name)
+    void functionWrapperCPPSpecific(Node *n)
     {
-       current_output = output_wrapper_def;
+       ParmList *parms = Getattr(n, "parms");
+       String *name = Copy(Getattr(n, "sym:name"));
+
+       // mangle name if function is overloaded
+       if (Getattr(n, "sym:overloaded")) {
+            if (!Getattr(n, "copy_constructor")) {
+		Parm* first_param = (Parm*)parms;
+		if (first_param) {
+		  // Skip the first "this" parameter of the wrapped methods, it doesn't participate in overload resolution and would just result in extra long
+		  // and ugly names.
+		  //
+		  // We need to avoid dropping the first argument of static methods which don't have "this" pointer, in spite of being members (and we have to
+		  // use "cplus:staticbase" for this instead of just using Swig_storage_isstatic() because "storage" is reset in staticmemberfunctionHandler()
+		  // and so is not available here.
+		  //
+		  // Of course, the constructors don't have the extra first parameter neither.
+		  if (!Checkattr(n, "nodeType", "constructor") &&
+			Checkattr(n, "ismember", "1") &&
+			  !Getattr(n, "cplus:staticbase")) {
+		    first_param = nextSibling(first_param);
+
+		    // A special case of overloading on const/non-const "this" pointer only, we still need to distinguish between those.
+		    if (SwigType_isconst(Getattr(n, "decl"))) {
+		      const char * const nonconst = Char(Getattr(n, "decl")) + 9 /* strlen("q(const).") */;
+		      for (Node* nover = Getattr(n, "sym:overloaded"); nover; nover = Getattr(nover, "sym:nextSibling")) {
+			if (nover == n)
+			  continue;
+
+			if (Cmp(Getattr(nover, "decl"), nonconst) == 0) {
+			  // We have an overload differing by const only, disambiguate.
+			  Append(name, "_const");
+			  break;
+			}
+		      }
+		    }
+		  }
+
+		  functionWrapperAppendOverloaded(name, first_param);
+		}
+            }
+       }
+
+       // make sure lnames are set
+       Parm *p;
+       int index = 1;
+       String *lname = 0;
+
+       for (p = (Parm*)parms, index = 1; p; (p = nextSibling(p)), index++) {
+            if(!(lname = Getattr(p, "lname"))) {
+                 lname = NewStringf("arg%d", index);
+                 Setattr(p, "lname", lname);
+            }
+       }
 
        // C++ function wrapper
+       current_output = output_wrapper_def;
+
        SwigType *type = Getattr(n, "type");
        scoped_dohptr return_type = get_wrapper_func_return_type(n);
        maybe_owned_dohptr wname = getFunctionWrapperName(n, name);
-       ParmList *parms = Getattr(n, "parms");
-       Parm *p;
        bool is_void_return = (SwigType_type(type) == T_VOID);
        // create new function wrapper object
        Wrapper *wrapper = NewWrapper();
@@ -1116,57 +1154,6 @@ public:
        DelWrapper(wrapper);
 
        emit_wrapper_func_decl(n, name, wname);
-    }
-
-    void functionWrapperCPPSpecific(Node *n)
-    {
-       ParmList *parms = Getattr(n, "parms");
-       String *name = Copy(Getattr(n, "sym:name"));
-
-       // mangle name if function is overloaded
-       if (Getattr(n, "sym:overloaded")) {
-            if (!Getattr(n, "copy_constructor")) {
-		Parm* first_param = (Parm*)parms;
-		if (first_param) {
-		  // Skip the first "this" parameter of the wrapped methods, it doesn't participate in overload resolution and would just result in extra long
-		  // and ugly names.
-		  //
-		  // We need to avoid dropping the first argument of static methods which don't have "this" pointer, in spite of being members (and we have to
-		  // use "cplus:staticbase" for this instead of just using Swig_storage_isstatic() because "storage" is reset in staticmemberfunctionHandler()
-		  // and so is not available here.
-		  //
-		  // Of course, the constructors don't have the extra first parameter neither.
-		  if (!Checkattr(n, "nodeType", "constructor") &&
-			Checkattr(n, "ismember", "1") &&
-			  !Getattr(n, "cplus:staticbase")) {
-		    first_param = nextSibling(first_param);
-
-		    // A special case of overloading on const/non-const "this" pointer only, we still need to distinguish between those.
-		    if (SwigType_isconst(Getattr(n, "decl"))) {
-		      const char * const nonconst = Char(Getattr(n, "decl")) + 9 /* strlen("q(const).") */;
-		      for (Node* nover = Getattr(n, "sym:overloaded"); nover; nover = Getattr(nover, "sym:nextSibling")) {
-			if (nover == n)
-			  continue;
-
-			if (Cmp(Getattr(nover, "decl"), nonconst) == 0) {
-			  // We have an overload differing by const only, disambiguate.
-			  Append(name, "_const");
-			  break;
-			}
-		      }
-		    }
-		  }
-
-		  functionWrapperAppendOverloaded(name, first_param);
-		}
-            }
-       }
-
-       // make sure lnames are set
-       functionWrapperPrepareArgs(parms);
-
-       // C++ function wrapper
-       functionWrapperCPPSpecificWrapper(n, name);
 
        Delete(name);
     }

From 3ebf1c1769f1f4b44828cb9b663970e9105aa118 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sat, 6 Nov 2021 21:26:23 +0100
Subject: [PATCH 390/508] Remove redundant cpp_basic_xxx tests

These tests duplicate the other, more complex, existing unit tests, so
it's just not useful to have them at all any more (they could have been
useful at the very beginning of C backend development, when none of the
other tests worked).
---
 Examples/test-suite/c/Makefile.in             |  9 -------
 .../c/cpp_basic_class_method_runme.c          | 13 ----------
 Examples/test-suite/c/cpp_basic_class_runme.c | 11 ---------
 ...asic_class_var_pub_member_built_in_runme.c | 15 ------------
 ...p_basic_class_var_pub_member_class_runme.c | 20 ----------------
 .../c/cpp_basic_class_virtual_method_runme.c  | 24 -------------------
 .../c/cpp_basic_global_var_class_runme.c      |  9 -------
 .../c/cpp_basic_namespaced_class_runme.c      | 11 ---------
 .../c/cpp_basic_template_class_runme.c        | 13 ----------
 .../c/cpp_basic_template_function_runme.c     | 10 --------
 Examples/test-suite/cpp_basic_class.i         |  6 -----
 Examples/test-suite/cpp_basic_class_method.i  | 10 --------
 .../cpp_basic_class_var_pub_member_built_in.i |  9 -------
 .../cpp_basic_class_var_pub_member_class.i    | 10 --------
 .../cpp_basic_class_virtual_method.i          | 20 ----------------
 .../test-suite/cpp_basic_global_var_class.i   |  6 -----
 .../test-suite/cpp_basic_namespaced_class.i   |  9 -------
 .../test-suite/cpp_basic_template_class.i     | 12 ----------
 .../test-suite/cpp_basic_template_function.i  | 13 ----------
 19 files changed, 230 deletions(-)
 delete mode 100644 Examples/test-suite/c/cpp_basic_class_method_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_class_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_global_var_class_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_template_class_runme.c
 delete mode 100644 Examples/test-suite/c/cpp_basic_template_function_runme.c
 delete mode 100644 Examples/test-suite/cpp_basic_class.i
 delete mode 100644 Examples/test-suite/cpp_basic_class_method.i
 delete mode 100644 Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
 delete mode 100644 Examples/test-suite/cpp_basic_class_var_pub_member_class.i
 delete mode 100644 Examples/test-suite/cpp_basic_class_virtual_method.i
 delete mode 100644 Examples/test-suite/cpp_basic_global_var_class.i
 delete mode 100644 Examples/test-suite/cpp_basic_namespaced_class.i
 delete mode 100644 Examples/test-suite/cpp_basic_template_class.i
 delete mode 100644 Examples/test-suite/cpp_basic_template_function.i

diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 0f69b0221..3b52be30e 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -14,15 +14,6 @@ top_builddir = ../@top_builddir@
 ECHO_PROGRESS := echo
 
 CPP_TEST_CASES := \
-				 cpp_basic_class \
-				 cpp_basic_class_method \
-				 cpp_basic_class_virtual_method \
-				 cpp_basic_class_var_pub_member_built_in \
-				 cpp_basic_class_var_pub_member_class \
-				 cpp_basic_global_var_class \
-				 cpp_basic_namespaced_class \
-				 cpp_basic_template_function \
-				 cpp_basic_template_class \
 				 c_backend_cpp_natural_std_string \
 				 c_backend_cpp_exception
 
diff --git a/Examples/test-suite/c/cpp_basic_class_method_runme.c b/Examples/test-suite/c/cpp_basic_class_method_runme.c
deleted file mode 100644
index 9061c40fb..000000000
--- a/Examples/test-suite/c/cpp_basic_class_method_runme.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include 
-#include "cpp_basic_class_method/cpp_basic_class_method_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    MyClass *mc = MyClass_new();
-
-    assert(MyClass_someMethod(mc) == 42);
-
-    MyClass_delete(mc);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_class_runme.c b/Examples/test-suite/c/cpp_basic_class_runme.c
deleted file mode 100644
index 13b4bc641..000000000
--- a/Examples/test-suite/c/cpp_basic_class_runme.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cpp_basic_class/cpp_basic_class_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    MyClass *mc;
-    mc = MyClass_new();
-
-    MyClass_delete(mc);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
deleted file mode 100644
index 6d2898933..000000000
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include 
-#include "cpp_basic_class_var_pub_member_built_in/cpp_basic_class_var_pub_member_built_in_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    MyClass *mc = MyClass_new();
-
-    assert(MyClass_myPubInt_get(mc) == 42);
-    MyClass_myPubInt_set(mc, 4711);
-    assert(MyClass_myPubInt_get(mc) == 4711);
-
-    MyClass_delete(mc);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
deleted file mode 100644
index de700e46b..000000000
--- a/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include 
-#include "cpp_basic_class_var_pub_member_class/cpp_basic_class_var_pub_member_class_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    MyClass *mc;
-    MySecondClass *mc2;
-
-    mc2 = MySecondClass_new();
-    mc = MyClass_new();
-
-    assert(MySecondClass_myPubClassInstance_get(mc2));
-    MySecondClass_myPubClassInstance_set(mc2, mc);
-    assert(MySecondClass_myPubClassInstance_get(mc2));
-
-    MyClass_delete(mc);
-    MySecondClass_delete(mc2);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c b/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
deleted file mode 100644
index 034104a6f..000000000
--- a/Examples/test-suite/c/cpp_basic_class_virtual_method_runme.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include 
-#include "cpp_basic_class_virtual_method/cpp_basic_class_virtual_method_wrap.h"
-
-int main()
-{
-    BaseClass *bc = BaseClass_new();
-    NonMethodOverwritingClass *noc = NonMethodOverwritingClass_new();
-    MethodOverwritingClass *oc = MethodOverwritingClass_new();
-    BaseClass *inherited_bc = (BaseClass*)MethodOverwritingClass_new();
-
-    assert(BaseClass_myInt(bc) == 0xba53);
-    assert(NonMethodOverwritingClass_myInt(noc) == 0xba53);
-    assert(MethodOverwritingClass_myInt(oc) == 0xa173123d);
-    assert(BaseClass_myInt((BaseClass*)noc) == 0xba53);
-    assert(BaseClass_myInt((BaseClass*)oc) == 0xa173123d);
-    assert(BaseClass_myInt(inherited_bc) == 0xa173123d);
-    
-    BaseClass_delete(bc);
-    NonMethodOverwritingClass_delete(noc);
-    MethodOverwritingClass_delete(oc);
-    BaseClass_delete(inherited_bc);
-    
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_global_var_class_runme.c b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
deleted file mode 100644
index 261c23210..000000000
--- a/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include 
-#include "cpp_basic_global_var_class/cpp_basic_global_var_class_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    assert(myGlobalClassInstance_get());
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
deleted file mode 100644
index 27527ceeb..000000000
--- a/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cpp_basic_namespaced_class/cpp_basic_namespaced_class_wrap.h"
-
-int main(int argc, const char *argv[])
-{
-    myNamespace_MyClass *mc;
-    mc = myNamespace_MyClass_new();
-
-    myNamespace_MyClass_delete(mc);
-
-    return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_template_class_runme.c b/Examples/test-suite/c/cpp_basic_template_class_runme.c
deleted file mode 100644
index b4da41e64..000000000
--- a/Examples/test-suite/c/cpp_basic_template_class_runme.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include 
-#include "cpp_basic_template_class/cpp_basic_template_class_wrap.h"
-
-int main() {
-	MyTemplateClass_Int *ci = MyTemplateClass_Int_new();
-
-	MyTemplateClass_Int_someMemberVariable_set(ci, 42);
-	assert(MyTemplateClass_Int_someMemberVariable_get(ci) == 42);
-
-	MyTemplateClass_Int_delete(ci);
-
-	return 0;
-}
diff --git a/Examples/test-suite/c/cpp_basic_template_function_runme.c b/Examples/test-suite/c/cpp_basic_template_function_runme.c
deleted file mode 100644
index 2c984ce3e..000000000
--- a/Examples/test-suite/c/cpp_basic_template_function_runme.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include 
-
-#define SWIG_DEFINE_WRAPPER_ALIASES
-#include "cpp_basic_template_function/cpp_basic_template_function_wrap.h"
-
-int main() {
-    assert(GetMaxInt(3, 5) == 5);
-    
-    return 0;
-}
diff --git a/Examples/test-suite/cpp_basic_class.i b/Examples/test-suite/cpp_basic_class.i
deleted file mode 100644
index bd46a4274..000000000
--- a/Examples/test-suite/cpp_basic_class.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%module cpp_basic_class
-
-%inline{
-    class MyClass {
-    };
-}
diff --git a/Examples/test-suite/cpp_basic_class_method.i b/Examples/test-suite/cpp_basic_class_method.i
deleted file mode 100644
index b67cc2a0b..000000000
--- a/Examples/test-suite/cpp_basic_class_method.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%module cpp_basic_class_method
-
-%inline{
-    class MyClass {
-        public:
-            int someMethod(void) {
-                return 42;
-            }
-    };
-}
diff --git a/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i b/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
deleted file mode 100644
index 114747204..000000000
--- a/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
+++ /dev/null
@@ -1,9 +0,0 @@
-%module cpp_basic_class_var_pub_member_built_in
-
-%inline{
-    class MyClass {
-        public:
-            int myPubInt;
-            MyClass() : myPubInt(42){}
-    };
-}
diff --git a/Examples/test-suite/cpp_basic_class_var_pub_member_class.i b/Examples/test-suite/cpp_basic_class_var_pub_member_class.i
deleted file mode 100644
index 4cbee00c6..000000000
--- a/Examples/test-suite/cpp_basic_class_var_pub_member_class.i
+++ /dev/null
@@ -1,10 +0,0 @@
-%module cpp_basic_class_var_pub_member_class
-
-%inline{
-    class MyClass {
-    };
-    class MySecondClass {
-        public:
-            MyClass myPubClassInstance;
-    };
-}
diff --git a/Examples/test-suite/cpp_basic_class_virtual_method.i b/Examples/test-suite/cpp_basic_class_virtual_method.i
deleted file mode 100644
index 34cd82d20..000000000
--- a/Examples/test-suite/cpp_basic_class_virtual_method.i
+++ /dev/null
@@ -1,20 +0,0 @@
-%module cpp_basic_class_virtual_method
-
-%inline %{
-	class BaseClass {
-	public:
-		virtual int myInt(void) {
-			return 0xba53;
-		}
-	};
-
-	class NonMethodOverwritingClass : public BaseClass{
-	};
-
-	class MethodOverwritingClass : public BaseClass{
-	public:
-		virtual int myInt(void) {
-			return 0xa173123d;
-		}
-	};
-%}
\ No newline at end of file
diff --git a/Examples/test-suite/cpp_basic_global_var_class.i b/Examples/test-suite/cpp_basic_global_var_class.i
deleted file mode 100644
index b99585a72..000000000
--- a/Examples/test-suite/cpp_basic_global_var_class.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%module cpp_basic_global_var_class
-
-%inline {
-    class MyClass {};
-    MyClass myGlobalClassInstance;
-}
diff --git a/Examples/test-suite/cpp_basic_namespaced_class.i b/Examples/test-suite/cpp_basic_namespaced_class.i
deleted file mode 100644
index 31b49b292..000000000
--- a/Examples/test-suite/cpp_basic_namespaced_class.i
+++ /dev/null
@@ -1,9 +0,0 @@
-%module cpp_basic_namespaced_class
-%feature (nspace, "1");
-
-%inline{
-    namespace myNamespace {
-        class MyClass {
-        };
-    }
-}
diff --git a/Examples/test-suite/cpp_basic_template_class.i b/Examples/test-suite/cpp_basic_template_class.i
deleted file mode 100644
index 93db46efb..000000000
--- a/Examples/test-suite/cpp_basic_template_class.i
+++ /dev/null
@@ -1,12 +0,0 @@
-%module cpp_basic_template_class
-
-%inline
-{
-
-template struct MyTemplateClass {
-    T someMemberVariable;
-};
-
-}
-
-%template(MyTemplateClass_Int) MyTemplateClass;
\ No newline at end of file
diff --git a/Examples/test-suite/cpp_basic_template_function.i b/Examples/test-suite/cpp_basic_template_function.i
deleted file mode 100644
index 4f289e5cb..000000000
--- a/Examples/test-suite/cpp_basic_template_function.i
+++ /dev/null
@@ -1,13 +0,0 @@
-%module cpp_basic_template_function
-
-%inline
-{
-	template 
-	T GetMax (T a, T b) {
-	  T result;
-	  result = (a>b)? a : b;
-	  return (result);
-	}
-}
-
-%template(GetMaxInt) GetMax;
\ No newline at end of file

From e8f9bdba80e987458b00a564f54d918e1b6b456f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 7 Nov 2021 01:34:29 +0100
Subject: [PATCH 391/508] Remove wrapper aliases generation and use -namespace
 in the tests

The -namespace option provides a better way of using the wrapped API, so
drop the optional wrapper generation, which is useless when this option
is used and just generates many lines of unwanted junk in the header.

Update the test suite and the examples to compensate to not rely on
being able to define SWIG_DEFINE_WRAPPER_ALIASES and add -namespace
option to all C++ tests, as it's done for C# test suite, and update them
to use the correct prefix and also use the accessors for the global
variables rather than using them directly, as this is impossible when
namespace prefix is used (it would have been possible to define a
preprocessor symbol corresponding to the real variable name, but it's
arguably not worth it).

fixup! Remove wrapper aliases generation and use -namespace in the tests
---
 Doc/Manual/C.html                             |  8 +-
 Examples/c/exception/runme.c                  |  7 +-
 Examples/c/simple/runme.c                     |  3 +-
 Examples/test-suite/c/Makefile.in             |  2 +
 Examples/test-suite/c/abstract_access_runme.c |  6 +-
 .../test-suite/c/abstract_typedef_runme.c     | 10 +-
 .../test-suite/c/abstract_virtual_runme.c     | 18 ++--
 Examples/test-suite/c/add_link_runme.c        |  8 +-
 .../test-suite/c/anonymous_bitfield_runme.c   | 28 +++---
 .../c/c_backend_cpp_exception_runme.c         | 11 +--
 .../c_backend_cpp_natural_std_string_runme.c  |  3 +-
 Examples/test-suite/c/cast_operator_runme.c   |  6 +-
 Examples/test-suite/c/char_strings_runme.c    | 47 +++++----
 .../c/cpp11_shared_ptr_const_runme.c          | 14 +--
 .../c/cpp11_shared_ptr_upcast_runme.c         | 16 +--
 Examples/test-suite/c/cpp_basic_runme.c       | 99 +++++++++----------
 Examples/test-suite/c/cpp_enum_runme.c        | 56 +++++------
 Examples/test-suite/c/enum_rename_runme.c     | 10 +-
 Examples/test-suite/c/enums_runme.c           |  7 +-
 Examples/test-suite/c/exception_order_runme.c | 33 +++----
 Examples/test-suite/c/global_vars_runme.c     |  4 +-
 .../test-suite/c/li_boost_shared_ptr_runme.c  | 12 +--
 Examples/test-suite/c/li_std_map_runme.c      | 24 ++---
 Examples/test-suite/c/li_std_pair_runme.c     | 43 ++++----
 Examples/test-suite/c/li_std_set_runme.c      | 30 +++---
 Examples/test-suite/c/li_std_vector_runme.c   | 16 +--
 .../test-suite/c/operator_overload_runme.c    | 27 +++--
 Examples/test-suite/memberin_extend.i         | 13 ++-
 Examples/test-suite/namespace_extend.i        | 15 +--
 Source/Modules/c.cxx                          | 29 +-----
 30 files changed, 294 insertions(+), 311 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 0009993b3..44566b352 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -197,7 +197,7 @@ Wrapping C functions and variables is obviously performed in a straightforward w
 
 
 
      
-For each C function declared in the interface file a wrapper function with a prefix, required to make its name different from the original one, is created. The prefix for the global functions is module_, i.e. the name of the SWIG module followed by underscore. If nspace feature is used, the prefix for a function defined in a namespace is namespace_ -- note that it does not contain the module prefix, as it's not necessary to make a unique function name in this case. The wrapper function performs a call to the original function, and returns its result. For convenience, a #define func prefix_func can be provided in the generated header file to make it possible to call the function under its original name: predefine SWIG_DEFINE_WRAPPER_ALIASES before including the wrapper header to enable these defines, which are disabled by default to avoid accidental name clashes.
+For each C function declared in the interface file a wrapper function with a prefix, required to make its name different from the original one, is created. The prefix for the global functions is module_, i.e. the name of the SWIG module followed by underscore, by default. If -namespace option is used, the prefix corresponding to the given fixed namespace is used instead. If nspace feature is used, the prefix corresponding to the namespace in which the function is defined is used -- note that, unlike with -namespace option, this prefix can be different for different functions. The wrapper function performs a call to the original function, and returns its result.
 
      
 
 
      
@@ -333,8 +333,10 @@ This section briefly covers the essential aspects of this wrapping.
 
      36.3.3 Enums
      
 
 
      
-C enums are simply copied to the generated code and keep the same name as in
-the original code.
+C enums and unscoped C++ enums are simply copied to the generated code and both the enum itself and its elements keep the same name as in the original code unless -namespace option is used or nspace feature is enabled, in which case the prefix corresponding to the specified namespace is used.
+
      
+
      
+For scoped C++11 enums, the enum name itself is used as an additional prefix.
 
      
 
 
diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c
index 907c0d2d4..640b31c88 100644
--- a/Examples/c/exception/runme.c
+++ b/Examples/c/exception/runme.c
@@ -5,14 +5,13 @@
 #include 
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "example_wrap.h"
 
 static void show_exception(const char* prefix) {
-  SWIG_CException* ex = SWIG_PendingException_get();
+  SWIG_CException* ex = example_SWIG_PendingException_get();
   assert(ex);
   printf("%s exception: %s (%d)\n", prefix, SWIG_CException_msg_get(ex), SWIG_CException_code_get(ex));
-  SWIG_PendingException_reset();
+  example_SWIG_PendingException_reset();
 }
 
 int main() {
@@ -33,7 +32,7 @@ int main() {
   int i;
   for (i = 0; i < 4; ++i) {
     Test_multi(t, i);
-    if (!SWIG_PendingException_get()) {
+    if (!example_SWIG_PendingException_get()) {
         printf("Success for i=%d\n", i);
     } else {
         printf("For i=%d", i);
diff --git a/Examples/c/simple/runme.c b/Examples/c/simple/runme.c
index 49a1a8be7..b75f951cc 100644
--- a/Examples/c/simple/runme.c
+++ b/Examples/c/simple/runme.c
@@ -1,12 +1,11 @@
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "example_wrap.h"
 
 int main(int argc, char **argv) {
   int a = 42;
   int b = 105;
-  int g = gcd(a, b);
+  int g = example_gcd(a, b);
   printf("The gcd of %d and %d is %d\n", a, b, g);
   printf("Foo = %f\n", Foo);
   Foo = 3.1415926;
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 3b52be30e..58b10facc 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -104,6 +104,8 @@ include $(srcdir)/../common.mk
 # Overridden variables here
 SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning
 
+%.cpptest: SWIGOPT += -namespace $*
+
 SRCDIR       = ../$(srcdir)/
 
 # Rules for the different types of tests
diff --git a/Examples/test-suite/c/abstract_access_runme.c b/Examples/test-suite/c/abstract_access_runme.c
index 5e282394c..02d99511f 100644
--- a/Examples/test-suite/c/abstract_access_runme.c
+++ b/Examples/test-suite/c/abstract_access_runme.c
@@ -2,11 +2,11 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	D *d = D_new();
+	abstract_access_D *d = abstract_access_D_new();
 
-	assert(D_do_x(d) == 1);
+	assert(abstract_access_D_do_x(d) == 1);
 
-	D_delete(d);
+	abstract_access_D_delete(d);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/abstract_typedef_runme.c b/Examples/test-suite/c/abstract_typedef_runme.c
index 134738748..5e90c1676 100644
--- a/Examples/test-suite/c/abstract_typedef_runme.c
+++ b/Examples/test-suite/c/abstract_typedef_runme.c
@@ -3,13 +3,13 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Engine *e = Engine_new();
-	A *a = A_new();
+	abstract_typedef_Engine *e = abstract_typedef_Engine_new();
+	abstract_typedef_A *a = abstract_typedef_A_new();
 
-	assert(AbstractBaseClass_write((AbstractBaseClass*)a, e) == true);
+	assert(abstract_typedef_AbstractBaseClass_write((abstract_typedef_AbstractBaseClass*)a, e) == true);
 
-	A_delete(a);
-	Engine_delete(e);
+	abstract_typedef_A_delete(a);
+	abstract_typedef_Engine_delete(e);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/abstract_virtual_runme.c b/Examples/test-suite/c/abstract_virtual_runme.c
index 91f1b9652..7c8c1be37 100644
--- a/Examples/test-suite/c/abstract_virtual_runme.c
+++ b/Examples/test-suite/c/abstract_virtual_runme.c
@@ -2,17 +2,17 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	B *b = B_new();
-	D *d = D_new();
-	E *e = E_new();
+	abstract_virtual_B *b = abstract_virtual_B_new();
+	abstract_virtual_D *d = abstract_virtual_D_new();
+	abstract_virtual_E *e = abstract_virtual_E_new();
 
-	assert(B_foo(b) == 0);
-	assert(D_foo(d) == 0);
-	assert(E_foo(e) == 0);
+	assert(abstract_virtual_B_foo(b) == 0);
+	assert(abstract_virtual_D_foo(d) == 0);
+	assert(abstract_virtual_E_foo(e) == 0);
 
-	B_delete(b);
-	D_delete(d);
-	E_delete(e);
+	abstract_virtual_B_delete(b);
+	abstract_virtual_D_delete(d);
+	abstract_virtual_E_delete(e);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/add_link_runme.c b/Examples/test-suite/c/add_link_runme.c
index 809e55e75..8ebdf485a 100644
--- a/Examples/test-suite/c/add_link_runme.c
+++ b/Examples/test-suite/c/add_link_runme.c
@@ -2,13 +2,13 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Foo *f = Foo_new();
-	Foo *f2 = Foo_blah(f);
+	add_link_Foo *f = add_link_Foo_new();
+	add_link_Foo *f2 = add_link_Foo_blah(f);
 
 	assert(f2 != 0);
 
-	Foo_delete(f);
-	Foo_delete(f2);
+	add_link_Foo_delete(f);
+	add_link_Foo_delete(f2);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/anonymous_bitfield_runme.c b/Examples/test-suite/c/anonymous_bitfield_runme.c
index a3d93149f..55937585e 100644
--- a/Examples/test-suite/c/anonymous_bitfield_runme.c
+++ b/Examples/test-suite/c/anonymous_bitfield_runme.c
@@ -2,28 +2,28 @@
 #include 
 
 int main(int argc, const char *argv[]) {
-	Foo *f = Foo_new();
+	anonymous_bitfield_Foo *f = anonymous_bitfield_Foo_new();
 
 	assert(f != 0);
 
-	Foo_x_set(f, 1);
-	assert(Foo_x_get(f) == 1);
-	assert(Foo_y_get(f) == 0);
+	anonymous_bitfield_Foo_x_set(f, 1);
+	assert(anonymous_bitfield_Foo_x_get(f) == 1);
+	assert(anonymous_bitfield_Foo_y_get(f) == 0);
 
-	Foo_y_set(f, 0);
-	assert(Foo_x_get(f) == 1);
-	assert(Foo_y_get(f) == 0);
+	anonymous_bitfield_Foo_y_set(f, 0);
+	assert(anonymous_bitfield_Foo_x_get(f) == 1);
+	assert(anonymous_bitfield_Foo_y_get(f) == 0);
 
-	Foo_f_set(f, 1);
-	assert(Foo_f_get(f) == 1);
+	anonymous_bitfield_Foo_f_set(f, 1);
+	assert(anonymous_bitfield_Foo_f_get(f) == 1);
 
-	Foo_z_set(f, 1);
-	assert(Foo_z_get(f) == 1);
+	anonymous_bitfield_Foo_z_set(f, 1);
+	assert(anonymous_bitfield_Foo_z_get(f) == 1);
 
-	Foo_seq_set(f, 1);
-	assert(Foo_seq_get(f) == 1);
+	anonymous_bitfield_Foo_seq_set(f, 1);
+	assert(anonymous_bitfield_Foo_seq_get(f) == 1);
 
-	Foo_delete(f);
+	anonymous_bitfield_Foo_delete(f);
 
 	return 0;
 }
diff --git a/Examples/test-suite/c/c_backend_cpp_exception_runme.c b/Examples/test-suite/c/c_backend_cpp_exception_runme.c
index 1759e4e31..206bedbbc 100644
--- a/Examples/test-suite/c/c_backend_cpp_exception_runme.c
+++ b/Examples/test-suite/c/c_backend_cpp_exception_runme.c
@@ -1,15 +1,14 @@
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "c_backend_cpp_exception/c_backend_cpp_exception_wrap.h"
 
 int main()
 {
-	assert(checkVal == 0);
-	throwSomeKnownException();
-	assert(checkVal == 1);
-	throwSomeUnknownException();
-	assert(checkVal == 2);
+	assert(c_backend_cpp_exception_checkVal_get() == 0);
+	c_backend_cpp_exception_throwSomeKnownException();
+	assert(c_backend_cpp_exception_checkVal_get() == 1);
+	c_backend_cpp_exception_throwSomeUnknownException();
+	assert(c_backend_cpp_exception_checkVal_get() == 2);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
index b94753fd2..03cabedd9 100644
--- a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
+++ b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c
@@ -2,12 +2,11 @@
 #include 
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "c_backend_cpp_natural_std_string/c_backend_cpp_natural_std_string_wrap.h"
 
 int main()
 {
-	char *myComposedString = myStringAppend("World, ", "Hello!");
+	char *myComposedString = c_backend_cpp_natural_std_string_myStringAppend("World, ", "Hello!");
 
 	assert(myComposedString);
 	assert(strcmp(myComposedString, "World, Hello!") == 0);
diff --git a/Examples/test-suite/c/cast_operator_runme.c b/Examples/test-suite/c/cast_operator_runme.c
index a2429b93a..e6099672d 100644
--- a/Examples/test-suite/c/cast_operator_runme.c
+++ b/Examples/test-suite/c/cast_operator_runme.c
@@ -5,10 +5,10 @@
 #include "cast_operator/cast_operator_wrap.h"
 
 int main() {
-  A *a = A_new();
-  if (strcmp(A_tochar(a), "hi"))
+  cast_operator_A *a = cast_operator_A_new();
+  if (strcmp(cast_operator_A_tochar(a), "hi"))
     fprintf(stderr, "cast failed\n");
-  A_delete(a);
+  cast_operator_A_delete(a);
   exit(0);
 }
 
diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c
index c1c5d89a6..d653204cd 100644
--- a/Examples/test-suite/c/char_strings_runme.c
+++ b/Examples/test-suite/c/char_strings_runme.c
@@ -2,7 +2,6 @@
 #include 
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "char_strings/char_strings_wrap.h"
 
 int main() {
@@ -14,25 +13,25 @@ int main() {
 
   // get functions
   for (i=0; i
 
 int main(int argc, const char *argv[]) {
-    Foo* f;
-    Foo* f2;
+    cpp11_shared_ptr_const_Foo* f;
+    cpp11_shared_ptr_const_Foo* f2;
 
-    f = Foo_new(17);
-    assert(Foo_get_m(f) == 17);
+    f = cpp11_shared_ptr_const_Foo_new(17);
+    assert(cpp11_shared_ptr_const_Foo_get_m(f) == 17);
     f2 = cpp11_shared_ptr_const_foo(f);
-    assert(Foo_get_m(f2) == 17);
-    Foo_delete(f2);
-    Foo_delete(f);
+    assert(cpp11_shared_ptr_const_Foo_get_m(f2) == 17);
+    cpp11_shared_ptr_const_Foo_delete(f2);
+    cpp11_shared_ptr_const_Foo_delete(f);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c b/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c
index e7e3243c9..493ddf617 100644
--- a/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c
+++ b/Examples/test-suite/c/cpp11_shared_ptr_upcast_runme.c
@@ -3,23 +3,23 @@
 
 int main(int argc, const char *argv[]) {
     {
-        Derived* d;
+        cpp11_shared_ptr_upcast_Derived* d;
 
-        d = Derived_new_i(17);
-        assert( cpp11_shared_ptr_upcast_base_num1((Base *)d) == -1 );
+        d = cpp11_shared_ptr_upcast_Derived_new_i(17);
+        assert( cpp11_shared_ptr_upcast_base_num1((cpp11_shared_ptr_upcast_Base *)d) == -1 );
         assert( cpp11_shared_ptr_upcast_derived_num1(d) == 17 );
 
-        Derived_delete(d);
+        cpp11_shared_ptr_upcast_Derived_delete(d);
     }
 
     {
-        Derived2* d2;
+        cpp11_shared_ptr_upcast_Derived2* d2;
 
-        d2 = Derived2_new_i(289);
-        assert( cpp11_shared_ptr_upcast_base2_num1((Base2 *)d2) == -1 );
+        d2 = cpp11_shared_ptr_upcast_Derived2_new_i(289);
+        assert( cpp11_shared_ptr_upcast_base2_num1((cpp11_shared_ptr_upcast_Base2 *)d2) == -1 );
         assert( cpp11_shared_ptr_upcast_derived2_num1(d2) == 289 );
 
-        Derived2_delete(d2);
+        cpp11_shared_ptr_upcast_Derived2_delete(d2);
     }
 
     return 0;
diff --git a/Examples/test-suite/c/cpp_basic_runme.c b/Examples/test-suite/c/cpp_basic_runme.c
index 656766479..164142d9f 100644
--- a/Examples/test-suite/c/cpp_basic_runme.c
+++ b/Examples/test-suite/c/cpp_basic_runme.c
@@ -1,10 +1,9 @@
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "cpp_basic/cpp_basic_wrap.h"
 #include 
 #include 
 
 int main(int argc, const char *argv[]) {
-	Foo *f = Foo_new(5);
+	cpp_basic_Foo *f = cpp_basic_Foo_new(5);
 
 	// test global static variables
 	// TODO: Implement or document as not available
@@ -12,98 +11,98 @@ int main(int argc, const char *argv[]) {
 	assert(init_ref != 0);
 
 	global_fptr_set(f);
-	assert(Foo_num_get(global_fptr_get()) == 5);
+	assert(cpp_basic_Foo_num_get(global_fptr_get()) == 5);
 
-	assert(Foo_num_get(global_fref_get()) == -4);
-	Foo_num_set(f, 6);
+	assert(cpp_basic_Foo_num_get(global_fref_get()) == -4);
+	cpp_basic_Foo_num_set(f, 6);
 	global_fref_set(f);
-	assert(Foo_num_get(global_fref_get()) == 6);
+	assert(cpp_basic_Foo_num_get(global_fref_get()) == 6);
 
-	Foo_num_set(f, 7);
+	cpp_basic_Foo_num_set(f, 7);
 	global_fval_set(f);
-	assert(Foo_num_get(global_fval_get()) == 7);
+	assert(cpp_basic_Foo_num_get(global_fval_get()) == 7);
 	*/
 
-	Foo_num_set(f, 5);
-	assert(Foo_num_get(f) == 5);
-	assert(Foo_func1(f, 2) == 20);
-	assert(Foo_func2(f, 2) == -10);
+	cpp_basic_Foo_num_set(f, 5);
+	assert(cpp_basic_Foo_num_get(f) == 5);
+	assert(cpp_basic_Foo_func1(f, 2) == 20);
+	assert(cpp_basic_Foo_func2(f, 2) == -10);
 
 	// function pointer set/get tests are missing
 	// because of unclear implementation details
-	//foo_func_ptr_set(f, &Foo_func1);
+	//foo_func_ptr_set(f, &cpp_basic_Foo_func1);
 
 	// test of global static variable is missing
 	// because of unclear implementation details
 	//assert(c_init_ref != 0);
 
-	Bar *b = Bar_new();
+	cpp_basic_Bar *b = cpp_basic_Bar_new();
 
 	// check default value set by constructor
-	assert(Bar_cint_get(b) == 3);
+	assert(cpp_basic_Bar_cint_get(b) == 3);
 
-	// check default value set by Bar initializer
-	assert(Foo_num_get(Bar_fval_get(b)) == 15);
+	// check default value set by cpp_basic_Bar initializer
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_fval_get(b)) == 15);
 	// change, recheck
-	Foo_num_set(Bar_fval_get(b), 2);
-	assert(Foo_num_get(Bar_fval_get(b)) == 2);
+	cpp_basic_Foo_num_set(cpp_basic_Bar_fval_get(b), 2);
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_fval_get(b)) == 2);
 
 	// check references
-	assert(Bar_fref_get(b) != 0);
+	assert(cpp_basic_Bar_fref_get(b) != 0);
 
 	// check global static value and references
-	assert(Foo_num_get(Bar_fref_get(b)) == -4);
-	Foo_num_set(Bar_fref_get(b), 1);
-	assert(Foo_num_get(Bar_fref_get(b)) == 1);
-	// create new Bar instance and check static member value
-	Bar *b2 = Bar_new();
-	assert(Foo_num_get(Bar_fref_get(b2)) == 1);
-	Bar_delete(b2);
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_fref_get(b)) == -4);
+	cpp_basic_Foo_num_set(cpp_basic_Bar_fref_get(b), 1);
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_fref_get(b)) == 1);
+	// create new cpp_basic_Bar instance and check static member value
+	cpp_basic_Bar *b2 = cpp_basic_Bar_new();
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_fref_get(b2)) == 1);
+	cpp_basic_Bar_delete(b2);
 	b2 = 0;
 
 	// Try to set a pointer
-	Bar_fptr_set(b, f);
+	cpp_basic_Bar_fptr_set(b, f);
 
-	assert(Bar_test(b, 2, f) == 9);
-	assert(Bar_test(b, 2, 0) == 4);
+	assert(cpp_basic_Bar_test(b, 2, f) == 9);
+	assert(cpp_basic_Bar_test(b, 2, 0) == 4);
 
-	Foo *f2 = Bar_testFoo(b, 2, f);
-	assert(Foo_num_get(f2) == 11);
-	Foo_delete(f2);
+	cpp_basic_Foo *f2 = cpp_basic_Bar_testFoo(b, 2, f);
+	assert(cpp_basic_Foo_num_get(f2) == 11);
+	cpp_basic_Foo_delete(f2);
 	f2 = 0;
 
 	// test static variables
-	Bar_global_fptr_set(f);
-	assert(Foo_num_get(Bar_global_fptr_get()) == 5);
+	cpp_basic_Bar_global_fptr_set(f);
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_global_fptr_get()) == 5);
 
-	Foo_num_set(f, 6);
-	Bar_global_fref_set(f);
-	assert(Foo_num_get(Bar_global_fref_get()) == 6);
+	cpp_basic_Foo_num_set(f, 6);
+	cpp_basic_Bar_global_fref_set(f);
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_global_fref_get()) == 6);
 
-	Foo_num_set(f, 7);
-	Bar_global_fval_set(f);
-	assert(Foo_num_get(Bar_global_fval_get()) == 7);
+	cpp_basic_Foo_num_set(f, 7);
+	cpp_basic_Bar_global_fval_set(f);
+	assert(cpp_basic_Foo_num_get(cpp_basic_Bar_global_fval_get()) == 7);
 
 	// getting, setting and calling function pointers isn't supported yet
 #if 0
 	SomeTypeForMemFnPtr func1 = get_func1_ptr();
-	Foo_func_ptr_set(f, func1);
+	cpp_basic_Foo_func_ptr_set(f, func1);
 	assert(test_func_ptr(f, 2) == 28);
 	SomeTypeForMemFnPtr func2 = get_func2_ptr();
-	Foo_func_ptr_set(f, func2);
+	cpp_basic_Foo_func_ptr_set(f, func2);
 	assert(test_func_ptr(f, 2) == -14);
 #endif
 
-	Bar_delete(b);
-	Foo_delete(f);
+	cpp_basic_Bar_delete(b);
+	cpp_basic_Foo_delete(f);
 
-	Fl_Window *w = Fl_Window_new();
+	cpp_basic_Fl_Window *w = cpp_basic_Fl_Window_new();
 	// Test whether macro worked for code extension
 	// and test optional function parameters
-	Fl_Window_show(w);
-	Fl_Window_show_pv(w, 0);
-	Fl_Window_show_pv_pv(w, 0, 0);
-	Fl_Window_delete(w);
+	cpp_basic_Fl_Window_show(w);
+	cpp_basic_Fl_Window_show_pv(w, 0);
+	cpp_basic_Fl_Window_show_pv_pv(w, 0, 0);
+	cpp_basic_Fl_Window_delete(w);
 	w = 0;
 
 	return 0;
diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.c
index 82148bc7b..a5968954b 100644
--- a/Examples/test-suite/c/cpp_enum_runme.c
+++ b/Examples/test-suite/c/cpp_enum_runme.c
@@ -5,67 +5,67 @@
 int main(int argc, const char *argv[]) {
 
 	// We don't have "enum SOME_ENUM"
-	int e = ENUM_ONE, *p;
+	int e = cpp_enum_ENUM_ONE, *p;
 
 	// check the constructor's default value
-	StructWithEnums *s = StructWithEnums_new();
-	assert(StructWithEnums_some_enum_get(s) == ENUM_ONE);
+	cpp_enum_StructWithEnums *s = cpp_enum_StructWithEnums_new();
+	assert(cpp_enum_StructWithEnums_some_enum_get(s) == cpp_enum_ENUM_ONE);
 
 	// check setter
-	StructWithEnums_some_enum_set(s, ENUM_TWO);
-	assert(StructWithEnums_some_enum_get(s) == ENUM_TWO);
+	cpp_enum_StructWithEnums_some_enum_set(s, cpp_enum_ENUM_TWO);
+	assert(cpp_enum_StructWithEnums_some_enum_get(s) == cpp_enum_ENUM_TWO);
 
 	// check function call
-	StructWithEnums_enum_test1(s, e, &e, &e);
+	cpp_enum_StructWithEnums_enum_test1(s, e, &e, &e);
 
 	// check function call
-	StructWithEnums_enum_test2(s, e, &e, &e);
+	cpp_enum_StructWithEnums_enum_test2(s, e, &e, &e);
 
 	// check function call
-	assert(StructWithEnums_enum_test3(s) == ENUM_ONE);
+	assert(cpp_enum_StructWithEnums_enum_test3(s) == cpp_enum_ENUM_ONE);
 
 	// check function call
-	assert(StructWithEnums_enum_test4(s) == ENUM_TWO);
+	assert(cpp_enum_StructWithEnums_enum_test4(s) == cpp_enum_ENUM_TWO);
 
 	// check function call
-	p = StructWithEnums_enum_test5(s);
-	assert(*p == ENUM_TWO);
+	p = cpp_enum_StructWithEnums_enum_test5(s);
+	assert(*p == cpp_enum_ENUM_TWO);
 
 	// check function call
-	p = StructWithEnums_enum_test6(s);
-	assert(*p == ENUM_TWO);
+	p = cpp_enum_StructWithEnums_enum_test6(s);
+	assert(*p == cpp_enum_ENUM_TWO);
 
 	// check function call
-	p = StructWithEnums_enum_test7(s);
-	assert(*p == ENUM_TWO);
+	p = cpp_enum_StructWithEnums_enum_test7(s);
+	assert(*p == cpp_enum_ENUM_TWO);
 
 	// check function call
-	p = StructWithEnums_enum_test8(s);
-	assert(*p == ENUM_TWO);
+	p = cpp_enum_StructWithEnums_enum_test8(s);
+	assert(*p == cpp_enum_ENUM_TWO);
 	
-	StructWithEnums_delete(s);
+	cpp_enum_StructWithEnums_delete(s);
 
-	Foo *f = Foo_new();
+	cpp_enum_Foo *f = cpp_enum_Foo_new();
 
 	// check the constructor's default value
-	assert(Foo_hola_get(f) == Foo_Hello);
+	assert(cpp_enum_Foo_hola_get(f) == cpp_enum_Foo_Hello);
 
-	Foo_hola_set(f, Foo_Hi);
-	assert(Foo_hola_get(f) == Foo_Hi);
+	cpp_enum_Foo_hola_set(f, cpp_enum_Foo_Hi);
+	assert(cpp_enum_Foo_hola_get(f) == cpp_enum_Foo_Hi);
 
-	Foo_delete(f);
+	cpp_enum_Foo_delete(f);
 
 	//check C enum
-	hi = Hi;
-	hi = Hello;
+	cpp_enum_hi_set(cpp_enum_Hi);
+	cpp_enum_hi_set(cpp_enum_Hello);
 
 	// check typedef enum
-	play_state t;
+	cpp_enum_play_state t;
 
-	t = PLAY;
+	t = cpp_enum_PLAY;
 	assert(t == 1);
 
-	t = STOP;
+	t = cpp_enum_STOP;
 	assert(t == 0);
 
 	return 0;
diff --git a/Examples/test-suite/c/enum_rename_runme.c b/Examples/test-suite/c/enum_rename_runme.c
index 0174bc8f0..ccc016816 100644
--- a/Examples/test-suite/c/enum_rename_runme.c
+++ b/Examples/test-suite/c/enum_rename_runme.c
@@ -3,10 +3,10 @@
 #include "enum_rename/enum_rename_wrap.h"
 
 int main() {
-  assert(M_Jan == 0);
-  assert(May   == 1);
-  assert(M_Dec == 2);
+  assert(enum_rename_M_Jan == 0);
+  assert(enum_rename_May   == 1);
+  assert(enum_rename_M_Dec == 2);
 
-  assert(S_Can  == 1);
-  assert(S_Must == 2);
+  assert(enum_rename_S_Can  == 1);
+  assert(enum_rename_S_Must == 2);
 }
diff --git a/Examples/test-suite/c/enums_runme.c b/Examples/test-suite/c/enums_runme.c
index 89138b035..24a811766 100644
--- a/Examples/test-suite/c/enums_runme.c
+++ b/Examples/test-suite/c/enums_runme.c
@@ -1,15 +1,14 @@
 #include 
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "enums/enums_wrap.h"
 
 int main() {
   assert(GlobalInstance == globalinstance1);
   assert(iFoo_Char == 'a');
-  bar2(1);
-  bar3(1);
-  bar1(1);
+  enums_bar2(1);
+  enums_bar3(1);
+  enums_bar1(1);
   exit(0);
 }
 
diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c
index 5cade5bc8..2c6e14035 100644
--- a/Examples/test-suite/c/exception_order_runme.c
+++ b/Examples/test-suite/c/exception_order_runme.c
@@ -1,45 +1,44 @@
 #include 
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "exception_order/exception_order_wrap.h"
 
 int main() {
-  A* a = A_new();
+  exception_order_A* a = exception_order_A_new();
 
-  A_foo(a);
-  if (!SWIG_PendingException_get()) {
+  exception_order_A_foo(a);
+  if (!exception_order_SWIG_PendingException_get()) {
     fprintf(stderr, "foo: bad exception order\n");
   } else {
-      SWIG_PendingException_reset();
+      exception_order_SWIG_PendingException_reset();
   }
 
-  A_bar(a);
-  if (!SWIG_PendingException_get()) {
+  exception_order_A_bar(a);
+  if (!exception_order_SWIG_PendingException_get()) {
     fprintf(stderr, "bar: bad exception order\n");
   } else {
-      SWIG_PendingException_reset();
+      exception_order_SWIG_PendingException_reset();
   }
 
-  A_foobar(a);
-  if (!SWIG_PendingException_get()) {
+  exception_order_A_foobar(a);
+  if (!exception_order_SWIG_PendingException_get()) {
     fprintf(stderr, "foobar: bad exception order\n");
   } else {
-      SWIG_PendingException_reset();
+      exception_order_SWIG_PendingException_reset();
   }
 
-  A_barfoo(a, 1);
-  if (!SWIG_PendingException_get()) {
+  exception_order_A_barfoo(a, 1);
+  if (!exception_order_SWIG_PendingException_get()) {
     fprintf(stderr, "barfoo(1): bad exception order\n");
   } else {
-      SWIG_PendingException_reset();
+      exception_order_SWIG_PendingException_reset();
   }
 
-  A_barfoo(a, 2);
-  if (!SWIG_PendingException_get()) {
+  exception_order_A_barfoo(a, 2);
+  if (!exception_order_SWIG_PendingException_get()) {
     fprintf(stderr, "barfoo(2): bad exception order\n");
   } else {
-      SWIG_PendingException_reset();
+      exception_order_SWIG_PendingException_reset();
   }
 
   exit(0);
diff --git a/Examples/test-suite/c/global_vars_runme.c b/Examples/test-suite/c/global_vars_runme.c
index 161413d83..1226152bb 100644
--- a/Examples/test-suite/c/global_vars_runme.c
+++ b/Examples/test-suite/c/global_vars_runme.c
@@ -6,8 +6,8 @@ int main(int argc, const char *argv[])
 {
     global_vars_init();
 
-    assert(strcmp(b_get(), "string b") == 0);
-    assert(x == 1234);
+    assert(strcmp(global_vars_b_get(), "string b") == 0);
+    assert(global_vars_x_get() == 1234);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/li_boost_shared_ptr_runme.c b/Examples/test-suite/c/li_boost_shared_ptr_runme.c
index 36aceec2c..c6ba156e5 100644
--- a/Examples/test-suite/c/li_boost_shared_ptr_runme.c
+++ b/Examples/test-suite/c/li_boost_shared_ptr_runme.c
@@ -4,14 +4,14 @@
 
 int main(int argc, const char *argv[]) {
     {
-        Klass* k = Klass_new_rcstd_string("me oh my");
-        assert( strcmp(Klass_getValue(k), "me oh my") == 0 );
-        Klass_delete(k);
+        li_boost_shared_ptr_Klass* k = li_boost_shared_ptr_Klass_new_rcstd_string("me oh my");
+        assert( strcmp(li_boost_shared_ptr_Klass_getValue(k), "me oh my") == 0 );
+        li_boost_shared_ptr_Klass_delete(k);
     }
 
     {
-        Klass* k = li_boost_shared_ptr_factorycreate();
-        assert( strcmp(Klass_getValue(k), "factorycreate") == 0 );
-        Klass_delete(k);
+        li_boost_shared_ptr_Klass* k = li_boost_shared_ptr_factorycreate();
+        assert( strcmp(li_boost_shared_ptr_Klass_getValue(k), "factorycreate") == 0 );
+        li_boost_shared_ptr_Klass_delete(k);
     }
 }
diff --git a/Examples/test-suite/c/li_std_map_runme.c b/Examples/test-suite/c/li_std_map_runme.c
index b3bea8af1..dd9292f87 100644
--- a/Examples/test-suite/c/li_std_map_runme.c
+++ b/Examples/test-suite/c/li_std_map_runme.c
@@ -2,25 +2,25 @@
 #include 
 
 int main() {
-    A* a1 = A_new_i(3);
-    A* a2 = A_new_i(7);
+    li_std_map_A* a1 = li_std_map_A_new_i(3);
+    li_std_map_A* a2 = li_std_map_A_new_i(7);
 
-    mapA* mA = mapA_new();
-    mapA_set(mA, 1, a1);
-    mapA_set(mA, 2, a2);
+    li_std_map_mapA* mA = li_std_map_mapA_new();
+    li_std_map_mapA_set(mA, 1, a1);
+    li_std_map_mapA_set(mA, 2, a2);
 
-    assert( mapA_size(mA) == 2 );
+    assert( li_std_map_mapA_size(mA) == 2 );
 
     {
-        A* a = mapA_get(mA, 1);
-        assert( A_val_get(a) == 3 );
+        li_std_map_A* a = li_std_map_mapA_get(mA, 1);
+        assert( li_std_map_A_val_get(a) == 3 );
     }
 
-    assert( !mapA_has_key(mA, 3) );
+    assert( !li_std_map_mapA_has_key(mA, 3) );
 
-    mapA_delete(mA);
-    A_delete(a2);
-    A_delete(a1);
+    li_std_map_mapA_delete(mA);
+    li_std_map_A_delete(a2);
+    li_std_map_A_delete(a1);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/li_std_pair_runme.c b/Examples/test-suite/c/li_std_pair_runme.c
index c163a5177..793b160ab 100644
--- a/Examples/test-suite/c/li_std_pair_runme.c
+++ b/Examples/test-suite/c/li_std_pair_runme.c
@@ -1,43 +1,42 @@
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "li_std_pair/li_std_pair_wrap.h"
 #include 
 
 int main() {
     {
-        IntPair* intPair = makeIntPair(7, 6);
-        assert(IntPair_first_get(intPair)==7 && IntPair_second_get(intPair)==6);
+        li_std_pair_IntPair* intPair = li_std_pair_makeIntPair(7, 6);
+        assert(li_std_pair_IntPair_first_get(intPair)==7 && li_std_pair_IntPair_second_get(intPair)==6);
 
-        assert(product1(intPair) == 42);
-        assert(product2(intPair) == 42);
-        assert(product3(intPair) == 42);
+        assert(li_std_pair_product1(intPair) == 42);
+        assert(li_std_pair_product2(intPair) == 42);
+        assert(li_std_pair_product3(intPair) == 42);
 
-        IntPair_delete(intPair);
+        li_std_pair_IntPair_delete(intPair);
     }
 
     {
-        IntPair* intPairPtr = makeIntPairPtr(7, 6);
-        assert(IntPair_first_get(intPairPtr)==7 && IntPair_second_get(intPairPtr)==6);
+        li_std_pair_IntPair* intPairPtr = li_std_pair_makeIntPairPtr(7, 6);
+        assert(li_std_pair_IntPair_first_get(intPairPtr)==7 && li_std_pair_IntPair_second_get(intPairPtr)==6);
 
-        assert(product1(intPairPtr) == 42);
-        assert(product2(intPairPtr) == 42);
-        assert(product3(intPairPtr) == 42);
+        assert(li_std_pair_product1(intPairPtr) == 42);
+        assert(li_std_pair_product2(intPairPtr) == 42);
+        assert(li_std_pair_product3(intPairPtr) == 42);
     }
 
     {
-        IntPair* intPairRef = makeIntPairRef(7, 6);
-        assert(IntPair_first_get(intPairRef)==7 && IntPair_second_get(intPairRef)==6);
+        li_std_pair_IntPair* intPairRef = li_std_pair_makeIntPairRef(7, 6);
+        assert(li_std_pair_IntPair_first_get(intPairRef)==7 && li_std_pair_IntPair_second_get(intPairRef)==6);
 
-        assert(product1(intPairRef) == 42);
-        assert(product2(intPairRef) == 42);
-        assert(product3(intPairRef) == 42);
+        assert(li_std_pair_product1(intPairRef) == 42);
+        assert(li_std_pair_product2(intPairRef) == 42);
+        assert(li_std_pair_product3(intPairRef) == 42);
     }
 
     {
-        IntPair* intPairConstRef = makeIntPairConstRef(7, 6);
-        assert(IntPair_first_get(intPairConstRef)==7 && IntPair_second_get(intPairConstRef)==6);
+        li_std_pair_IntPair* intPairConstRef = li_std_pair_makeIntPairConstRef(7, 6);
+        assert(li_std_pair_IntPair_first_get(intPairConstRef)==7 && li_std_pair_IntPair_second_get(intPairConstRef)==6);
 
-        assert(product1(intPairConstRef) == 42);
-        assert(product2(intPairConstRef) == 42);
-        assert(product3(intPairConstRef) == 42);
+        assert(li_std_pair_product1(intPairConstRef) == 42);
+        assert(li_std_pair_product2(intPairConstRef) == 42);
+        assert(li_std_pair_product3(intPairConstRef) == 42);
     }
 }
diff --git a/Examples/test-suite/c/li_std_set_runme.c b/Examples/test-suite/c/li_std_set_runme.c
index 2d5dff16b..e3a7781fd 100644
--- a/Examples/test-suite/c/li_std_set_runme.c
+++ b/Examples/test-suite/c/li_std_set_runme.c
@@ -3,30 +3,30 @@
 
 int main() {
     {
-        IntSet* is = IntSet_new();
+        li_std_set_IntSet* is = li_std_set_IntSet_new();
 
-        IntSet_add(is, 1);
-        IntSet_add(is, 4);
-        IntSet_add(is, 9);
+        li_std_set_IntSet_add(is, 1);
+        li_std_set_IntSet_add(is, 4);
+        li_std_set_IntSet_add(is, 9);
 
-        assert( IntSet_size(is) == 3 );
-        assert( IntSet_has(is, 4) );
-        assert( !IntSet_has(is, 16) );
+        assert( li_std_set_IntSet_size(is) == 3 );
+        assert( li_std_set_IntSet_has(is, 4) );
+        assert( !li_std_set_IntSet_has(is, 16) );
 
-        IntSet_delete(is);
+        li_std_set_IntSet_delete(is);
     }
 
     {
-        StringSet* ss = StringSet_new();
+        li_std_set_StringSet* ss = li_std_set_StringSet_new();
 
-        StringSet_add(ss, "foo");
-        StringSet_add(ss, "bar");
+        li_std_set_StringSet_add(ss, "foo");
+        li_std_set_StringSet_add(ss, "bar");
 
-        assert( StringSet_size(ss) == 2 );
-        assert( StringSet_has(ss, "bar") );
-        assert( !StringSet_has(ss, "baz") );
+        assert( li_std_set_StringSet_size(ss) == 2 );
+        assert( li_std_set_StringSet_has(ss, "bar") );
+        assert( !li_std_set_StringSet_has(ss, "baz") );
 
-        StringSet_delete(ss);
+        li_std_set_StringSet_delete(ss);
     }
 
     return 0;
diff --git a/Examples/test-suite/c/li_std_vector_runme.c b/Examples/test-suite/c/li_std_vector_runme.c
index acfcf7869..2e8a36360 100644
--- a/Examples/test-suite/c/li_std_vector_runme.c
+++ b/Examples/test-suite/c/li_std_vector_runme.c
@@ -4,19 +4,19 @@
 int main() {
     size_t i;
 
-    IntVector* iv = IntVector_new();
-    assert( IntVector_size(iv) == 0 );
+    li_std_vector_IntVector* iv = li_std_vector_IntVector_new();
+    assert( li_std_vector_IntVector_size(iv) == 0 );
 
-    IntVector_push_back(iv, 1);
-    IntVector_push_back(iv, 4);
-    IntVector_push_back(iv, 9);
-    assert( IntVector_size(iv) == 3 );
+    li_std_vector_IntVector_push_back(iv, 1);
+    li_std_vector_IntVector_push_back(iv, 4);
+    li_std_vector_IntVector_push_back(iv, 9);
+    assert( li_std_vector_IntVector_size(iv) == 3 );
 
     for ( i = 0; i < 3; i++ ) {
-        assert( IntVector_get(iv, i) == (i + 1)*(i + 1) );
+        assert( li_std_vector_IntVector_get(iv, i) == (i + 1)*(i + 1) );
     }
 
-    IntVector_delete(iv);
+    li_std_vector_IntVector_delete(iv);
 
     return 0;
 }
diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c
index 7e7acb646..19e01ccb5 100644
--- a/Examples/test-suite/c/operator_overload_runme.c
+++ b/Examples/test-suite/c/operator_overload_runme.c
@@ -1,27 +1,26 @@
 #include 
 #include 
 
-#define SWIG_DEFINE_WRAPPER_ALIASES
 #include "operator_overload/operator_overload_wrap.h"
 
 #define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); exit(1); }
 
 int main() {
-  Op_sanity_check();
+  operator_overload_Op_sanity_check();
   
-  Op *op1 = Op_new_i(1), *op2 = Op_new_i(2), *op3 = Op_copy(op1);
+  operator_overload_Op *op1 = operator_overload_Op_new_i(1), *op2 = operator_overload_Op_new_i(2), *op3 = operator_overload_Op_copy(op1);
 
-  assert(Op_NotEqual(op1, op2), "neq failed");
-  Op_PlusPlusPrefix(op3);  
-  assert(Op_EqualEqual(op2, op3), "eqeq failed");
-  assert(Op_GreaterThanEqual(op2, op1), "geq failed");
-  Op_PlusEqual(op3, op1);
-  assert(Op_LessThan(op1, op2) && Op_LessThan(op2, op3), "lt failed");
-  assert(3 == *Op_IndexInto(op3, Op_IndexIntoConst(op2, Op_Functor(op1))), "[] or () failed");
-  assert(5 == Op_Functor_i(op3, 2), "f(x) failed");
+  assert(operator_overload_Op_NotEqual(op1, op2), "neq failed");
+  operator_overload_Op_PlusPlusPrefix(op3);
+  assert(operator_overload_Op_EqualEqual(op2, op3), "eqeq failed");
+  assert(operator_overload_Op_GreaterThanEqual(op2, op1), "geq failed");
+  operator_overload_Op_PlusEqual(op3, op1);
+  assert(operator_overload_Op_LessThan(op1, op2) && operator_overload_Op_LessThan(op2, op3), "lt failed");
+  assert(3 == *operator_overload_Op_IndexInto(op3, operator_overload_Op_IndexIntoConst(op2, operator_overload_Op_Functor(op1))), "[] or () failed");
+  assert(5 == operator_overload_Op_Functor_i(op3, 2), "f(x) failed");
   
-  Op_delete(op1);
-  Op_delete(op2);
-  Op_delete(op3);
+  operator_overload_Op_delete(op1);
+  operator_overload_Op_delete(op2);
+  operator_overload_Op_delete(op3);
   exit(0);
 }
diff --git a/Examples/test-suite/memberin_extend.i b/Examples/test-suite/memberin_extend.i
index c6eb10526..3f65b2392 100644
--- a/Examples/test-suite/memberin_extend.i
+++ b/Examples/test-suite/memberin_extend.i
@@ -9,10 +9,19 @@ struct ExtendMe {
 };
 %}
 
+// Use different names for the C backend to be consistent with the global prefix used.
+%inline {
+#ifdef SWIGC
+%#define ADD_PREFIX(name) memberin_extend_ ## name
+#else
+%#define ADD_PREFIX(name) name
+#endif
+}
+
 %{
 #include 
 std::map ExtendMeStringMap;
-void ExtendMe_thing_set(ExtendMe *self, const char *val) {
+void ADD_PREFIX(ExtendMe_thing_set)(ExtendMe *self, const char *val) {
   char *old_val = ExtendMeStringMap[self];
   delete [] old_val;
   if (val) {
@@ -22,7 +31,7 @@ void ExtendMe_thing_set(ExtendMe *self, const char *val) {
     ExtendMeStringMap[self] = 0;
   }
 }
-char * ExtendMe_thing_get(ExtendMe *self) {
+char * ADD_PREFIX(ExtendMe_thing_get)(ExtendMe *self) {
   return ExtendMeStringMap[self];
 }
 %}
diff --git a/Examples/test-suite/namespace_extend.i b/Examples/test-suite/namespace_extend.i
index ba5a0d908..3f672abee 100644
--- a/Examples/test-suite/namespace_extend.i
+++ b/Examples/test-suite/namespace_extend.i
@@ -10,15 +10,20 @@ namespace foo {
 }
 %}
 
-// C uses different naming convention, with all functions starting with the class prefix.
+// C uses different naming convention, with all functions starting with the class prefix
+// and using the global namespace prefix too, if specified (which is the case for the tests).
 #ifdef SWIGC
 %{
-foo::bar *foo_bar_new() {
+foo::bar *namespace_extend_foo_bar_new() {
    return new foo::bar;
 }
-void     foo_bar_delete(foo::bar *self) {
+void     namespace_extend_foo_bar_delete(foo::bar *self) {
    delete self;
 }
+
+int namespace_extend_foo_bar_blah(foo::bar *self, int x) {
+   return x;
+}
 %}
 #else
 %{
@@ -28,14 +33,12 @@ foo::bar *new_foo_bar() {
 void     delete_foo_bar(foo::bar *self) {
    delete self;
 }
-%}
-#endif
 
-%{
 int foo_bar_blah(foo::bar *self, int x) {
    return x;
 }
 %}
+#endif
 
 namespace foo {
     class bar {
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 93cb52b01..4d52aec57 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -173,7 +173,6 @@ class C:public Language {
   File *f_wrappers_cxx;
   File *f_wrappers_types;
   File *f_wrappers_decl;
-  File *f_wrappers_aliases;
   File *f_init;
 
   String *empty_string;
@@ -567,10 +566,6 @@ public:
       f_wrappers_types = NewString("");
       f_wrappers_decl = NewString("");
 
-      // We may also define aliases for the global wrapper functions to allow calling them using their original names, but as this can result in problems (as
-      // usual when using the preprocessor), this is only done when SWIG_DEFINE_WRAPPER_ALIASES is defined, so use a separate section for this.
-      f_wrappers_aliases = NIL;
-
       {
 
         cplusplus_output_guard
@@ -589,13 +584,6 @@ public:
 
       Dump(f_wrappers_h_body, f_wrappers_h);
       Delete(f_wrappers_h_body);
-
-      if (f_wrappers_aliases) {
-	Dump(f_wrappers_aliases, f_wrappers_h);
-	Delete(f_wrappers_aliases);
-
-	Printv(f_wrappers_h, "#endif /* SWIG_DEFINE_WRAPPER_ALIASES */\n", NIL);
-      }
     } // close wrapper header guard
 
     // write all to the file
@@ -813,7 +801,7 @@ public:
 
        Wrapper_print(wrapper, f_wrappers);
 
-       emit_wrapper_func_decl(n, name, wname);
+       emit_wrapper_func_decl(n, wname);
 
        // cleanup
        Delete(proto);
@@ -955,25 +943,14 @@ public:
    * emit_wrapper_func_decl()
    *
    * Declares the wrapper function, using the C types used for it, in the header.
-   * Also emits a define allowing to use the function without the "_wrap_" prefix.
    * The node here is a function declaration.
    * ---------------------------------------------------------------------- */
-  void emit_wrapper_func_decl(Node *n, String *name, String *wname)
+  void emit_wrapper_func_decl(Node *n, String *wname)
     {
        current_output = output_wrapper_decl;
 
        // add function declaration to the proxy header file
        Printv(f_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL);
-
-       if (Cmp(name, wname) != 0) {
-	 if (!f_wrappers_aliases) {
-	   // Allocate it on demand.
-	   f_wrappers_aliases = NewStringEmpty();
-	   Printv(f_wrappers_aliases, "#ifdef SWIG_DEFINE_WRAPPER_ALIASES\n", NIL);
-	 }
-
-	 Printf(f_wrappers_aliases, "#define %s %s\n", name, wname);
-       }
     }
 
 
@@ -1153,7 +1130,7 @@ public:
        // cleanup
        DelWrapper(wrapper);
 
-       emit_wrapper_func_decl(n, name, wname);
+       emit_wrapper_func_decl(n, wname);
 
        Delete(name);
     }

From 521933816021e8c93a62e0be5fe2a8de5fbb93a6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 02:17:07 +0100
Subject: [PATCH 392/508] Fix previously unused access_change unit test runme
 file

This file had a wrong name and so wasn't used at all.

Do use it now, after renaming it to the required name and fixing its
compilation.
---
 Examples/test-suite/c/abstract_change_runme.c | 34 -------------------
 Examples/test-suite/c/access_change_runme.c   | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 Examples/test-suite/c/abstract_change_runme.c
 create mode 100644 Examples/test-suite/c/access_change_runme.c

diff --git a/Examples/test-suite/c/abstract_change_runme.c b/Examples/test-suite/c/abstract_change_runme.c
deleted file mode 100644
index 3696bc493..000000000
--- a/Examples/test-suite/c/abstract_change_runme.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "abstract_typedef2/abstract_change_wrap.h"
-#include 
-
-int main(int argc, const char *argv[]) {
-	Base *ba = Base_new();
-	Derived *d = Derived_new();
-	Bottom *bo = Bottom_new();
-
-	assert(Base_PublicProtectedPublic1(ba) == 0);
-	assert(Base_PublicProtectedPublic2(ba) == 0);
-	assert(Base_PublicProtectedPublic3(ba) == 0);
-	assert(Base_PublicProtectedPublic4(ba) == 0);
-
-	assert(Derived_WasProtected1(ba) == 0);
-	assert(Derived_WasProtected2(ba) == 0);
-	assert(Derived_WasProtected3(ba) == 0);
-	assert(Derived_WasProtected4(ba) == 0);
-
-	assert(Bottom_PublicProtectedPublic1(ba) == 0);
-	assert(Bottom_PublicProtectedPublic2(ba) == 0);
-	assert(Bottom_PublicProtectedPublic3(ba) == 0);
-	assert(Bottom_PublicProtectedPublic4(ba) == 0);
-
-	assert(Bottom_WasProtected1(ba) == 0);
-	assert(Bottom_WasProtected2(ba) == 0);
-	assert(Bottom_WasProtected3(ba) == 0);
-	assert(Bottom_WasProtected4(ba) == 0);
-
-	Base_delete(ba);
-	Derived_delete(d);
-	Bottom_delete(bo);
-
-	return 0;
-}
diff --git a/Examples/test-suite/c/access_change_runme.c b/Examples/test-suite/c/access_change_runme.c
new file mode 100644
index 000000000..c17af6bc4
--- /dev/null
+++ b/Examples/test-suite/c/access_change_runme.c
@@ -0,0 +1,34 @@
+#include "access_change_wrap.h"
+#include 
+
+int main(int argc, const char *argv[]) {
+	access_change_BaseInt *ba = access_change_BaseInt_new();
+	access_change_DerivedInt *d = access_change_DerivedInt_new();
+	access_change_BottomInt *bo = access_change_BottomInt_new();
+
+	assert(access_change_BaseInt_PublicProtectedPublic1(ba) == 0);
+	assert(access_change_BaseInt_PublicProtectedPublic2(ba) == 0);
+	assert(access_change_BaseInt_PublicProtectedPublic3(ba) == 0);
+	assert(access_change_BaseInt_PublicProtectedPublic4(ba) == 0);
+
+	assert(access_change_DerivedInt_WasProtected1((access_change_DerivedInt*)ba) == 0);
+	assert(access_change_DerivedInt_WasProtected2((access_change_DerivedInt*)ba) == 0);
+	assert(access_change_DerivedInt_WasProtected3((access_change_DerivedInt*)ba) == 0);
+	assert(access_change_DerivedInt_WasProtected4((access_change_DerivedInt*)ba) == 0);
+
+	assert(access_change_BottomInt_PublicProtectedPublic1((access_change_BottomInt*)ba) == 0);
+	assert(access_change_BottomInt_PublicProtectedPublic2((access_change_BottomInt*)ba) == 0);
+	assert(access_change_BottomInt_PublicProtectedPublic3((access_change_BottomInt*)ba) == 0);
+	assert(access_change_BottomInt_PublicProtectedPublic4((access_change_BottomInt*)ba) == 0);
+
+	assert(access_change_BottomInt_WasProtected1((access_change_BottomInt*)ba) == 0);
+	assert(access_change_BottomInt_WasProtected2((access_change_BottomInt*)ba) == 0);
+	assert(access_change_BottomInt_WasProtected3((access_change_BottomInt*)ba) == 0);
+	assert(access_change_BottomInt_WasProtected4((access_change_BottomInt*)ba) == 0);
+
+	access_change_BaseInt_delete(ba);
+	access_change_DerivedInt_delete(d);
+	access_change_BottomInt_delete(bo);
+
+	return 0;
+}

From 3765a08743393e25eb0de77c5e97bc2c4c4a5f31 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 15:21:59 +0100
Subject: [PATCH 393/508] Allow having C++ test cases for C backend

Support compiling and running either _runme.c or _runme.cxx files for
the given test (but not both).

Add a simple C++ test file to check that it actually works.
---
 Examples/Makefile.in                          |  7 ++++++-
 Examples/c/class/Makefile                     |  2 +-
 Examples/c/exception/Makefile                 |  2 +-
 Examples/c/simple/Makefile                    |  2 +-
 Examples/c/std_vector/Makefile                |  2 +-
 Examples/test-suite/c/Makefile.in             | 20 ++++++++++++-------
 .../c/abstract_inherit_ok_runme.cxx           | 12 +++++++++++
 7 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 Examples/test-suite/c/abstract_inherit_ok_runme.cxx

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 38768615e..037ca8bb8 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1375,9 +1375,14 @@ c_cpp: $(SRCDIR_SRCS)
 	$(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 
-c_compile: $(SRCDIR)$(RUNME).c
+c_compile_c: $(SRCDIR)$(RUNME).c
 	$(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. -I.. $< -L. -l$(TARGET)
 
+c_compile_cxx: $(SRCDIR)$(RUNME).cxx
+	$(COMPILETOOL) $(CXX) $(CXXFLAGS) -o $(RUNME) -I. -I.. $< -L. -l$(TARGET)
+
+$(eval c_compile: c_compile_$(RUNME_EXT))
+
 # This target is used for the unit tests: if we don't have any test code to
 # run, we at least can check that the generated header can be included without
 # giving any syntax errors.
diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile
index e66aaabda..7104242cc 100644
--- a/Examples/c/class/Makefile
+++ b/Examples/c/class/Makefile
@@ -7,7 +7,7 @@ INTERFACE  = example.i
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=c c_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile
index e66aaabda..7104242cc 100644
--- a/Examples/c/exception/Makefile
+++ b/Examples/c/exception/Makefile
@@ -7,7 +7,7 @@ INTERFACE  = example.i
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=c c_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
diff --git a/Examples/c/simple/Makefile b/Examples/c/simple/Makefile
index b6b6066d7..908203a85 100644
--- a/Examples/c/simple/Makefile
+++ b/Examples/c/simple/Makefile
@@ -7,7 +7,7 @@ INTERFACE  = example.i
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=c c_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' \
diff --git a/Examples/c/std_vector/Makefile b/Examples/c/std_vector/Makefile
index e66aaabda..7104242cc 100644
--- a/Examples/c/std_vector/Makefile
+++ b/Examples/c/std_vector/Makefile
@@ -7,7 +7,7 @@ INTERFACE  = example.i
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' c_run
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=c c_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 58b10facc..a56aabbf8 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -5,7 +5,7 @@
 LANGUAGE     = c
 C            = gcc
 CXX          = g++
-SCRIPTSUFFIX = _runme.c
+RUNMESUFFIX  = _runme
 srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
 top_builddir = ../@top_builddir@
@@ -108,6 +108,11 @@ SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning
 
 SRCDIR       = ../$(srcdir)/
 
+# Make function to check if we have an executable test for the given test base name.
+define has_runme
+-f $(srcdir)/$1$(RUNMESUFFIX).c -o -f $(srcdir)/$1$(RUNMESUFFIX).cxx
+endef
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)
@@ -122,7 +127,7 @@ SRCDIR       = ../$(srcdir)/
 %.multicpptest: 
 	$(setup)
 	+(cd $* && $(swig_and_compile_multi_cpp))
-	+if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	+if [ $(call has_runme,$*) ]; then \
 	  $(do_run_testcase); \
 	else \
 	  cd $* && for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list`; do \
@@ -132,7 +137,7 @@ SRCDIR       = ../$(srcdir)/
 
 # Makes a directory for the testcase if it does not exist
 setup = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \
+	if [  $(call has_runme,$*) ]; then	  \
 	  $(ECHO_PROGRESS) "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \
 	else								  \
 	  $(ECHO_PROGRESS) "$(ACTION)ing testcase $* under $(LANGUAGE)" ;		  \
@@ -153,14 +158,15 @@ syntax_check_testcase = \
 do_run_testcase = \
 	cd $* && $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
 	  SRCDIR='$(SRCDIR)' \
-	  RUNME=$*_runme \
+	  RUNME=$*$(RUNMESUFFIX) \
+	  RUNME_EXT=$(patsubst .%,%,$(suffix $(wildcard $(srcdir)/$*$(RUNMESUFFIX).c*))) \
 	  TARGET='$*' \
 	  c_run
 
-# Only compile and run testcase if a file with _rume.c appended to the testcase
-# name is found, otherwise only check the syntax of the generated files.
+# Only compile and run testcase if we have a runme for it, otherwise only check
+# the syntax of the generated files.
 run_testcase = \
-	+if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	+if [ $(call has_runme,$*) ]; then \
 	  $(do_run_testcase); \
 	else \
 	  cd $* && $(call syntax_check_testcase,$*); \
diff --git a/Examples/test-suite/c/abstract_inherit_ok_runme.cxx b/Examples/test-suite/c/abstract_inherit_ok_runme.cxx
new file mode 100644
index 000000000..147c549dc
--- /dev/null
+++ b/Examples/test-suite/c/abstract_inherit_ok_runme.cxx
@@ -0,0 +1,12 @@
+#include "abstract_inherit_ok_wrap.h"
+#include 
+
+int main(int argc, const char *argv[]) {
+    abstract_inherit_ok_Foo* const spam = (abstract_inherit_ok_Foo*)abstract_inherit_ok_Spam_new();
+
+    assert(abstract_inherit_ok_Foo_blah(spam) == 0);
+
+    abstract_inherit_ok_Foo_delete(spam);
+
+    return 0;
+}

From e7fa72fc0657086b44f5890a0ae803a07b233403 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 17:13:43 +0100
Subject: [PATCH 394/508] Don't generate invalid forward enum declarations

Such declarations are invalid without specifying the underlying type
(which is only possible since C++11) and are useless anyhow, so just
don't bother emitting them.
---
 Source/Modules/c.cxx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 4d52aec57..1fede5f19 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -1440,6 +1440,17 @@ public:
     return Language::constructorHandler(n);
   }
 
+  /* ----------------------------------------------------------------------
+   * Language::enumforwardDeclaration()
+   * ---------------------------------------------------------------------- */
+
+  virtual int enumforwardDeclaration(Node *n) {
+    // Base implementation of this function calls enumDeclaration() for "missing" enums, i.e. those without any definition at all. This results in invalid (at
+    // least in C++) enum declarations in the output, so simply don't do this here.
+    (void) n;
+    return SWIG_OK;
+  }
+
   /* ---------------------------------------------------------------------
    * enumDeclaration()
    * --------------------------------------------------------------------- */

From 0f734e1164660a15319f0f574dbd5cef9da3c104 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 17:30:26 +0100
Subject: [PATCH 395/508] Don't generate empty enum declarations

They are invalid in C++ and there shouldn't actually be any in valid
input, but they do occur in SWIG test suite.

Don't generate anything for them in the output, especially because doing
this is not really more complicated than using "enum_is_empty" field
that we had previously and might even be a tad simpler, as it doesn't
split the "{" and "}" output between two different functions.
---
 Source/Modules/c.cxx | 50 ++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 1fede5f19..3d516c59d 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -186,8 +186,9 @@ class C:public Language {
   // Used only while generating wrappers for an enum and contains the prefix to use for enum elements if non-null.
   String *enum_prefix;
 
-  // Used only while generating wrappers for an enum, initially true and reset to false as soon as we see any enum elements.
-  bool enum_is_empty;
+  // Used only while generating wrappers for an enum, as we don't know if enum will have any elements or not in advance and we must not generate an empty enum,
+  // so we accumulate the full declaration here and then write it to f_wrappers_types at once only if there are any elements.
+  String *enum_decl;
 
   // Selects between the wrappers (public) declarations and (private) definitions.
   enum {
@@ -1462,13 +1463,16 @@ public:
     if (getCurrentClass() && (cplus_mode != PUBLIC))
       return SWIG_NOWRAP;
 
+    // We don't know here if we're going to have any non-ignored enum elements, so generate enum declaration in a temporary string.
+    enum_decl = NewStringEmpty();
+
     // Preserve the typedef if we have it in the input.
     maybe_owned_dohptr tdname;
     tdname.assign_non_owned(Getattr(n, "tdname"));
     if (tdname) {
-      Printv(f_wrappers_types, "typedef ", NIL);
+      Printv(enum_decl, "typedef ", NIL);
     }
-    Printv(f_wrappers_types, "enum", NIL);
+    Printv(enum_decl, "enum", NIL);
 
     if (Node* const klass = getCurrentClass()) {
       enum_prefix = getProxyName(klass);
@@ -1494,7 +1498,7 @@ public:
 	enumname = NewStringf("%s_%s", enum_prefix, enumname.get());
       }
 
-      Printv(f_wrappers_types, " ", enumname.get(), NIL);
+      Printv(enum_decl, " ", enumname.get(), NIL);
 
       // For scoped enums, their name should be prefixed to their elements in addition to any other prefix we use.
       if (Getattr(n, "scopedenum")) {
@@ -1502,23 +1506,27 @@ public:
       }
     }
 
-    // We don't know here if we're going to have any non-ignored enum elements, so let enumvalueDeclaration() itself reset this flag if it does get called, this
-    // is simpler than trying to determine it here, even if it's a bit ugly because we generate the opening brace there, but the closing one here.
-    enum_is_empty = true;
+    Printv(enum_decl, " {\n", NIL);
+
+    int const len_orig = Len(enum_decl);
 
     // Emit each enum item.
     Language::enumDeclaration(n);
 
-    if (!enum_is_empty) {
-      Printv(f_wrappers_types, "\n}", NIL);
+    // Only emit the enum declaration if there were actually any items.
+    if (Len(enum_decl) > len_orig) {
+      Printv(enum_decl, "\n}", NIL);
+
+      if (tdname) {
+	Printv(enum_decl, " ", tdname.get(), NIL);
+      }
+      Printv(enum_decl, ";\n\n", NIL);
+
+      Append(f_wrappers_types, enum_decl);
     }
 
     enum_prefix = NULL;
-
-    if (tdname) {
-      Printv(f_wrappers_types, " ", tdname.get(), NIL);
-    }
-    Printv(f_wrappers_types, ";\n\n", NIL);
+    Delete(enum_decl);
 
     return SWIG_OK;
   }
@@ -1532,12 +1540,8 @@ public:
       return SWIG_NOWRAP;
     Swig_require("enumvalueDeclaration", n, "?enumvalueex", "?enumvalue", NIL);
 
-    enum_is_empty = false;
-
-    if (GetFlag(n, "firstenumitem"))
-      Printv(f_wrappers_types, " {\n", NIL);
-    else
-      Printv(f_wrappers_types, ",\n", NIL);
+    if (!GetFlag(n, "firstenumitem"))
+      Printv(enum_decl, ",\n", NIL);
 
     maybe_owned_dohptr wname;
 
@@ -1547,7 +1551,7 @@ public:
     } else {
       wname.assign_non_owned(symname);
     }
-    Printv(f_wrappers_types, cindent, wname.get(), NIL);
+    Printv(enum_decl, cindent, wname.get(), NIL);
 
     // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum
     // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace).
@@ -1578,7 +1582,7 @@ public:
 	  cvalue.assign_non_owned(value);
       }
 
-      Printv(f_wrappers_types, " = ", cvalue.get(), NIL);
+      Printv(enum_decl, " = ", cvalue.get(), NIL);
     }
 
     Swig_restore(n);

From 2ab549611b547ad134de17c97209da654f27ee1d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 17:38:20 +0100
Subject: [PATCH 396/508] Syntax check generated headers using both C and C++
 compilers

For C++ tests, check header compilation using C++ compiler too, as this
detects constructs valid in C but invalid in C++ and will also be useful
for checking C++-specific parts of the headers that will be generated in
the future.
---
 Examples/Makefile.in              | 13 ++++++++-----
 Examples/test-suite/c/Makefile.in | 26 ++++++++++++++------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 037ca8bb8..344eabcb8 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1363,8 +1363,6 @@ C_LDSHARED = @C_LDSHARED@
 CXX_LDSHARED = @CXX_LDSHARED@
 C_SO = @C_SO@
 
-SYNTAX_CHECK := $(CC) -fsyntax-only -x c
-
 c: $(SRCDIR_SRCS)
 	$(SWIG) -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) -I$(SRCDIR) $(CFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(INCLUDES)
@@ -1385,9 +1383,14 @@ $(eval c_compile: c_compile_$(RUNME_EXT))
 
 # This target is used for the unit tests: if we don't have any test code to
 # run, we at least can check that the generated header can be included without
-# giving any syntax errors.
-c_syntax_check:
-	$(SYNTAX_CHECK) -I$(SRCDIR)$(INTERFACEDIR) $(C_HEADER)
+# giving any syntax errors, both when compiling it as C and C++ code.
+c_syntax_check: c_syntax_check_c c_syntax_check_cxx
+
+c_syntax_check_c:
+	$(CC) -fsyntax-only -x c -I$(SRCDIR)$(INTERFACEDIR) $(C_HEADER)
+
+c_syntax_check_cxx:
+	$(CXX) -fsyntax-only -x c++ -I$(SRCDIR)$(INTERFACEDIR) $(C_HEADER)
 
 # -----------------------------------------------------------------
 # Run C example
diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index a56aabbf8..d23eafdba 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -117,12 +117,20 @@ endef
 %.cpptest: 
 	$(setup)
 	+(cd $* && $(swig_and_compile_cpp))
-	$(run_testcase)
+	+if [ $(call has_runme,$*) ]; then \
+	  $(do_run_testcase); \
+	else \
+	  cd $* && $(call syntax_check_testcase,$*); \
+	fi
 
 %.ctest:
 	$(setup)
 	+(cd $* && $(swig_and_compile_c))
-	$(run_testcase)
+	+if [ $(call has_runme,$*) ]; then \
+	  $(do_run_testcase); \
+	else \
+	  cd $* && $(call syntax_check_testcase,$*,_c); \
+	fi
 
 %.multicpptest: 
 	$(setup)
@@ -147,12 +155,15 @@ setup = \
 	fi;
 
 # Checks the header syntax if there is no runnable testcase for it.
+#
+# The optional second argument can be "_c" to check syntax using C compiler only
+# (by default both C and C++ compilers are used).
 syntax_check_testcase = \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
 	  SRCDIR='$(SRCDIR)' \
 	  INTERFACEDIR='$(INTERFACEDIR)' \
 	  C_HEADER=$1_wrap.h \
-	  c_syntax_check
+	  c_syntax_check$2
 
 # Compiles C files then runs the testcase unconditionally.
 do_run_testcase = \
@@ -163,15 +174,6 @@ do_run_testcase = \
 	  TARGET='$*' \
 	  c_run
 
-# Only compile and run testcase if we have a runme for it, otherwise only check
-# the syntax of the generated files.
-run_testcase = \
-	+if [ $(call has_runme,$*) ]; then \
-	  $(do_run_testcase); \
-	else \
-	  cd $* && $(call syntax_check_testcase,$*); \
-	fi
-
 # Clean: remove testcase directories
 %.clean:
 	@if [ -d $* ]; then \

From afc02cbc016f2be1d9dcd5311ea97ea66fd05eee Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 18:52:54 +0100
Subject: [PATCH 397/508] Remove unused f_wrappers_cxx

This variable wasn't used since a long time and removing it doesn't
affect generated code.
---
 Source/Modules/c.cxx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 3d516c59d..94ffed382 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -170,7 +170,6 @@ class C:public Language {
   File *f_runtime;
   File *f_header;
   File *f_wrappers;
-  File *f_wrappers_cxx;
   File *f_wrappers_types;
   File *f_wrappers_decl;
   File *f_init;
@@ -523,7 +522,6 @@ public:
     f_init = NewString("");
     f_header = NewString("");
     f_wrappers = NewString("");
-    f_wrappers_cxx = NewString("");
 
     Swig_banner(f_begin);
 
@@ -589,7 +587,6 @@ public:
 
     // write all to the file
     Dump(f_header, f_runtime);
-    Dump(f_wrappers_cxx, f_runtime);
     Wrapper_pretty_print(f_wrappers, f_runtime);
     Dump(f_init, f_runtime);
     Dump(f_runtime, f_begin);
@@ -598,7 +595,6 @@ public:
     Delete(f_begin);
     Delete(f_header);
     Delete(f_wrappers);
-    Delete(f_wrappers_cxx);
     Delete(f_wrappers_h);
     Delete(f_init);
     Delete(f_runtime);

From 2454efb989bb102d0e932c3ae71f122bdf1fe72b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 18:53:28 +0100
Subject: [PATCH 398/508] Use Dump() instead of Wrapper_pretty_print()

This should be faster and we don't really need to prettify the wrappers
code which is already quite decent.
---
 Source/Modules/c.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 94ffed382..f31d6429f 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -587,7 +587,7 @@ public:
 
     // write all to the file
     Dump(f_header, f_runtime);
-    Wrapper_pretty_print(f_wrappers, f_runtime);
+    Dump(f_wrappers, f_runtime);
     Dump(f_init, f_runtime);
     Dump(f_runtime, f_begin);
 

From 8d1faa5b3b328a771ffe331cfb60897d55f0fd5a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 19:15:52 +0100
Subject: [PATCH 399/508] Rename various files used in C backend code

Also explain better what each of them is used for and use scoped_dohptr
instead of deleting them manually.

Stop writing everything to f_begin, which didn't make any sense, and use
a separate f_wrappers_cxx object for the contents of the cxx output file.

No real changes.
---
 Source/Modules/c.cxx | 52 +++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index f31d6429f..a5236d388 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -166,13 +166,12 @@ const char* const cindent = "  ";
 class C:public Language {
   static const char *usage;
 
-  File *f_begin;
-  File *f_runtime;
-  File *f_header;
-  File *f_wrappers;
+  // These files contain types used by the wrappers declarations and the declarations themselves and end up in the output header file.
   File *f_wrappers_types;
   File *f_wrappers_decl;
-  File *f_init;
+
+  // This one contains wrapper functions definitions and end up in the output C++ file.
+  File *f_wrappers;
 
   String *empty_string;
 
@@ -513,21 +512,17 @@ public:
     String *outfile = Getattr(n, "outfile");
 
     // initialize I/O
-    f_begin = NewFile(outfile, "w", SWIG_output_files());
-    if (!f_begin) {
+    const scoped_dohptr f_wrappers_cxx(NewFile(outfile, "w", SWIG_output_files()));
+    if (!f_wrappers_cxx) {
       FileErrorDisplay(outfile);
       SWIG_exit(EXIT_FAILURE);
     }
-    f_runtime = NewString("");
-    f_init = NewString("");
-    f_header = NewString("");
-    f_wrappers = NewString("");
 
-    Swig_banner(f_begin);
+    Swig_banner(f_wrappers_cxx);
 
     // Open the file where all wrapper declarations will be written to in the end.
     String* const outfile_h = Getattr(n, "outfile_h");
-    File* const f_wrappers_h = NewFile(outfile_h, "w", SWIG_output_files());
+    const scoped_dohptr f_wrappers_h(NewFile(outfile_h, "w", SWIG_output_files()));
     if (!f_wrappers_h) {
       FileErrorDisplay(outfile_h);
         SWIG_exit(EXIT_FAILURE);
@@ -535,11 +530,22 @@ public:
 
     Swig_banner(f_wrappers_h);
 
+    // Associate file with the SWIG sections with the same name, so that e.g. "%header" contents end up in f_header etc.
+    const scoped_dohptr f_begin(NewStringEmpty());
+    const scoped_dohptr f_header(NewStringEmpty());
+    const scoped_dohptr f_runtime(NewStringEmpty());
+    const scoped_dohptr f_init(NewStringEmpty());
+
+    // This one is used outside of this function, so it's a member variable rather than a local one.
+    f_wrappers = NewStringEmpty();
+
     Swig_register_filebyname("begin", f_begin);
     Swig_register_filebyname("header", f_header);
     Swig_register_filebyname("wrapper", f_wrappers);
     Swig_register_filebyname("runtime", f_runtime);
     Swig_register_filebyname("init", f_init);
+
+    // This one is C-specific and goes directly to the output header file.
     Swig_register_filebyname("cheader", f_wrappers_h);
 
     {
@@ -561,7 +567,7 @@ public:
 
       // All the struct types used by the functions go to f_wrappers_types so that they're certain to be defined before they're used by any functions. All the
       // functions declarations go directly to f_wrappers_decl and f_wrappers_h_body combines both of them.
-      String* const f_wrappers_h_body = NewString("");
+      const scoped_dohptr f_wrappers_h_body(NewStringEmpty());
       f_wrappers_types = NewString("");
       f_wrappers_decl = NewString("");
 
@@ -582,22 +588,14 @@ public:
       } // close extern "C" guards
 
       Dump(f_wrappers_h_body, f_wrappers_h);
-      Delete(f_wrappers_h_body);
     } // close wrapper header guard
 
     // write all to the file
-    Dump(f_header, f_runtime);
-    Dump(f_wrappers, f_runtime);
-    Dump(f_init, f_runtime);
-    Dump(f_runtime, f_begin);
-
-    // cleanup
-    Delete(f_begin);
-    Delete(f_header);
-    Delete(f_wrappers);
-    Delete(f_wrappers_h);
-    Delete(f_init);
-    Delete(f_runtime);
+    Dump(f_begin, f_wrappers_cxx);
+    Dump(f_runtime, f_wrappers_cxx);
+    Dump(f_header, f_wrappers_cxx);
+    Dump(f_wrappers, f_wrappers_cxx);
+    Dump(f_init, f_wrappers_cxx);
 
     return SWIG_OK;
   }

From 55d7db6b2739a9c030375dec16ef23eb62385c89 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Wed, 10 Nov 2021 19:35:42 +0100
Subject: [PATCH 400/508] Get rid of an unnecessary intermediate string

Write the wrapper types and declarations directly to f_wrappers_h,
without passing by an intermediate f_wrappers_h_body which just
complicated things unnecessarily.

This means that "extern "C" { ... }" is now around the functions
declarations only, and not around the types and the declarations, but
this seems like a desirable side effect.

No real changes.
---
 Source/Modules/c.cxx | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index a5236d388..2f5953a81 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -566,28 +566,24 @@ public:
         include_guard_wrappers_h(f_wrappers_h, include_guard_begin, include_guard_end);
 
       // All the struct types used by the functions go to f_wrappers_types so that they're certain to be defined before they're used by any functions. All the
-      // functions declarations go directly to f_wrappers_decl and f_wrappers_h_body combines both of them.
-      const scoped_dohptr f_wrappers_h_body(NewStringEmpty());
+      // functions declarations go directly to f_wrappers_decl we write both of them to f_wrappers_h at the end.
       f_wrappers_types = NewString("");
       f_wrappers_decl = NewString("");
 
       {
-
         cplusplus_output_guard
           cplusplus_guard_wrappers(f_wrappers),
-          cplusplus_guard_wrappers_h(f_wrappers_h_body);
+          cplusplus_guard_wrappers_h(f_wrappers_decl);
 
         // emit code for children
         Language::top(n);
-
-        Dump(f_wrappers_types, f_wrappers_h_body);
-        Delete(f_wrappers_types);
-
-        Dump(f_wrappers_decl, f_wrappers_h_body);
-        Delete(f_wrappers_decl);
       } // close extern "C" guards
 
-      Dump(f_wrappers_h_body, f_wrappers_h);
+      Dump(f_wrappers_types, f_wrappers_h);
+      Delete(f_wrappers_types);
+
+      Dump(f_wrappers_decl, f_wrappers_h);
+      Delete(f_wrappers_decl);
     } // close wrapper header guard
 
     // write all to the file

From 7cbbfab198e203f6a4fd167639ccf087fcb3a2ce Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Thu, 18 Nov 2021 23:56:39 +0100
Subject: [PATCH 401/508] Show using C++ wrapper API for the "class" example

This almost exactly mirrors the existing C examples, but modify both
examples slightly to make their output show which language is used.
---
 Examples/c/class/Makefile  |  8 +++++++-
 Examples/c/class/runme.c   |  4 ++--
 Examples/c/class/runme.cxx | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 Examples/c/class/runme.cxx

diff --git a/Examples/c/class/Makefile b/Examples/c/class/Makefile
index 7104242cc..b031415ad 100644
--- a/Examples/c/class/Makefile
+++ b/Examples/c/class/Makefile
@@ -5,10 +5,16 @@ CXXSRCS    = example.cxx
 TARGET     = example
 INTERFACE  = example.i
 
-check: build
+check_c: build
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=c c_run
 
+check_cxx: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=cxx c_run
+
+check: check_c check_cxx
+
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \
 	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
diff --git a/Examples/c/class/runme.c b/Examples/c/class/runme.c
index fd7da2a5a..f7f463031 100644
--- a/Examples/c/class/runme.c
+++ b/Examples/c/class/runme.c
@@ -3,7 +3,7 @@
 #include "example_wrap.h"
 
 int main(int argc, char **argv) {
-  printf("Creating some objects:\n");
+  printf("Creating some objects from C:\n");
   Circle* c = Circle_new(10);
   printf("    Created circle\n");
   Square* s = Square_new(10);
@@ -37,7 +37,7 @@ int main(int argc, char **argv) {
   Circle_delete(c);
 
   printf("%d shapes remain\n", Shape_nshapes_get());
-  printf("Goodbye\n");
+  printf("Goodbye from C\n");
 
   return 0;
 }
diff --git a/Examples/c/class/runme.cxx b/Examples/c/class/runme.cxx
new file mode 100644
index 000000000..c7994c7ff
--- /dev/null
+++ b/Examples/c/class/runme.cxx
@@ -0,0 +1,41 @@
+#include 
+
+#include "example_wrap.h"
+
+int main(int argc, char **argv) {
+  { // Block containing the Circle and Square objects.
+  std::cout << "Creating some objects from C++:\n";
+  example::Circle c(10);
+  std::cout << "    Created circle\n";
+  example::Square s(10);
+  std::cout << "    Created square\n";
+
+  std::cout << "\nA total of " << example::Shape::nshapes() << " shapes were created\n";
+
+  c.x(20);
+  c.y(30);
+
+  example::Shape& shape = s;
+  shape.x(-10);
+  shape.y(5);
+
+  std::cout << "\nHere is their current positions:\n";
+  std::cout << "    Circle = (" << c.x() << " " << c.y() << ")\n";
+  std::cout << "    Square = (" << s.x() << " " << s.y() << ")\n";
+
+  std::cout << "\nHere are some properties of the shapes:\n";
+  example::Shape* shapes[] = {&c, &s};
+  for (int i = 0; i < 2; i++) {
+    std::cout << "    " << (i ? "Square" : "Circle") << "\n";
+    std::cout << "    area      = " << shapes[i]->area() << "\n";
+    std::cout << "    perimeter = " << shapes[i]->perimeter() << "\n";
+  }
+
+  std::cout << "\nGuess I'll clean up now\n";
+  }
+
+  std::cout << example::Shape::nshapes() << " shapes remain\n";
+  std::cout << "Goodbye from C++\n";
+
+  return 0;
+}

From 606c1c6ea058655ee2f795dadace8aa740d5b757 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Sun, 21 Nov 2021 01:54:02 +0100
Subject: [PATCH 402/508] Make sure gcc gives error for passing scoped_dohptr
 to Printv()

After making this mistake too many times already, make sure it doesn't
happen again by requiring gcc to give an error for any attempt to pass
a non-trivial object to vararg functions such as Printv(), Printf(),
Swig_error() etc.
---
 Source/Modules/c.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index 2f5953a81..f65b40446 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -29,6 +29,13 @@ int SwigType_isbuiltin(SwigType *t) {
 namespace
 {
 
+// When using scoped_dohptr, it's very simple to accidentally pass it to a vararg function, such as Printv() or Printf(), resulting in catastrophic results
+// during run-time (crash or, worse, junk in the generated output), so make sure gcc warning about this, which is not enabled by default for some reason (see
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64867 for more information), is enabled.
+#ifdef __GNUC__
+  #pragma GCC diagnostic error "-Wconditionally-supported"
+#endif // __GNUC__
+
 // Delete a DOH object on scope exit.
 class scoped_dohptr
 {

From 0483e4017c4bb23ea88280b6ca6c79acebea28f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin 
Date: Tue, 16 Nov 2021 23:36:02 +0100
Subject: [PATCH 403/508] Start adding C++ wrappers generation

Disable them for the test suite, as plenty things don't work yet, but
there is already more than enough code to not want to add even more
fixes to the same commit.
---
 Doc/Manual/C.html                 |  25 +-
 Examples/test-suite/c/Makefile.in |   2 +-
 Source/Modules/c.cxx              | 600 +++++++++++++++++++++++++++++-
 3 files changed, 621 insertions(+), 6 deletions(-)

diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html
index 44566b352..72c7aa8e0 100644
--- a/Doc/Manual/C.html
+++ b/Doc/Manual/C.html
@@ -28,6 +28,7 @@
 
    • Classes
  • Exception handling +
  • C++ wrappers @@ -58,7 +59,7 @@ With wrapper interfaces generated by SWIG, it is easy to use the functionality o

    -Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences. All data and functions become global. Manipulating objects requires explicit calls to special functions. We are losing the high level abstraction and have to work around it. +Flattening C++ language constructs into a set of C-style functions obviously comes with many limitations and inconveniences, but this module is actually also capable of generating C++ wrappers defined completely inline using the C functions, thus wrapping the original C++ library API in another, similar C++ API. Contrary to the natural initial reaction, this is far from being completely pointless, as wrapping C++ API in this way avoids all problems due to C++ ABI issues, e.g. it is now possible to use the original C++ API using a different C++ compiler, or a different version of the same compiler, or even the same compiler, but with different compilation options affecting the ABI. The C++ wrapper API is not identical to the original one, but strives to be as close to it as possible.

    Known C++ Shortcomings in Generated C API:

    @@ -137,6 +138,11 @@ $ swig -c -help Generate wrappers with the prefix based on the provided namespace, e.g. if the option value is outer::inner, the prefix outer_inner_ will be used. Notice that this is different from using SWIG nspace feature, as it applies the the prefix to all the symbols, regardless of the namespace they were actually declared in. Notably, this allows to export instantiations of templates defined in the std namespace, such as std::vector, using a custom prefix rather than std_. + +-nocxx +Don't generate C++ wrappers, even when -c++ option is used. See C++ Wrappers section for more details. + + -noexcept generate wrappers with no support of exception handling; see Exceptions chapter for more details @@ -643,6 +649,23 @@ void SomeIntTemplateClass_delete(SomeIntTemplateClass * carg1);

    36.5 Exception handling

    +

    36.6 C++ Wrappers

    + +

    +When -c++ command line option is used (and -nocxx one is not), the header file generated by SWIG will also contain the declarations of C++ wrapper functions and classes mirroring the original API. All C++ wrappers are fully inline, i.e. don't need to be compiled separately, and are always defined inside the namespace (or nested namespaces) specified by -namespace command-line option or the namespace with the same name as the SWIG module name if this option is not specified. +

    + +

    +C++ wrappers try to provide a similar API to the original C++ API being wrapped, notably any class Foo in the original API appears as a class with the same name in the wrappers namespace, and has the same, or similar, public methods. A class Bar deriving from Foo also derives from it in the wrappers and so on. There are some differences with the original API, however. Some of them are due to fundamental limitations of the approach used, e.g.: +

      +
    • Only template instantiations are present in the wrappers, not the templates themselves.
      • +
    + +Other ones are due to things that could be supported but haven't been implemented yet: +
      +
    • Only single, not multiple, inheritance is currently supported.
      • +
    +

    diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index d23eafdba..47175ec8d 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -102,7 +102,7 @@ char_binary.cpptest director_binary_string.cpptest li_typemaps.cpptest li_typema include $(srcdir)/../common.mk # Overridden variables here -SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning +SWIGOPT += -w524 -nocxx # Suppress SWIGWARN_LANG_EXPERIMENTAL warning %.cpptest: SWIGOPT += -namespace $* diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index f65b40446..3ddb0cf33 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -168,6 +168,528 @@ public: // String containing one indentation level for the generated code. const char* const cindent = " "; +/* + cxx_class_wrapper + + Outputs the declaration of the class wrapping the given one if we're generating C++ wrappers, i.e. if the provided File is not null. +*/ +class cxx_class_wrapper +{ +public: + // The pointer passed to the ctor is set to this object and restored to its previous value in dtor, ensuring that it never becomes dangling. + // + // The file pointer may be null, in which case we simply don't do anything. + // + // Finally, the node pointer must be valid, point to a class and remain valid for the lifetime of this object. + cxx_class_wrapper(cxx_class_wrapper** pp, File* f_out, Node* n) : current_wrapper_(pp), old_wrapper_(*current_wrapper_), f_out_(f_out) { + if (!f_out_) + return; + + class_node_ = NULL; + + scoped_dohptr base_classes(NewStringEmpty()); + if (List *baselist = Getattr(n, "bases")) { + Iterator i = First(baselist); + if (i.item) { + first_base_ = Copy(i.item); + + i = Next(i); + if (i.item) { + Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), + "Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n", + Getattr(n, "sym:name") + ); + + // Return before initializing class_node_, so that the dtor won't output anything neither. + return; + } + } + + Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); + } + + Printv(f_out_, + "class ", Getattr(n, "sym:name"), base_classes.get(), " {\n" + "public:\n", + NIL + ); + + class_node_ = n; + + // We're going to generate C++ wrappers for this class, so set up the pointer to do it. + *current_wrapper_ = this; + } + + // Emit wrapper of a member function. + // + // Shouldn't be called if we're not emitting C++ wrappers for this class. + void emit_member_function(Node* n) { + // We don't need to redeclare functions inherited from the base class, as we use real inheritance. + if (Getattr(n, "c:inherited_from")) + return; + + // Also ignore friend function declarations: they appear inside the class, but we shouldn't generate any wrappers for them. + if (Checkattr(n, "storage", "friend")) + return; + + // As mentioned elsewhere, we can't use Swig_storage_isstatic() here because the "storage" attribute is temporarily saved in another view when this + // function is being executed, so rely on another attribute to determine if it's a static function instead. + const bool is_member = Checkattr(n, "ismember", "1"); + const bool is_static = is_member && Getattr(n, "cplus:staticbase"); + const bool is_ctor = Checkattr(n, "nodeType", "constructor"); + + // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. + SwigType* const ret_type = Getattr(n, "type"); + scoped_dohptr ret_ctype(Swig_typemap_lookup("ctype", n, "", NULL)); + if (!ret_ctype) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), + "No ctype typemap defined for the return type \"%s\" of %s\n", + SwigType_str(ret_type, NULL), + Getattr(n, "sym:name") + ); + return; + } + + scoped_dohptr ret_cxxtype(Copy(ret_ctype)); + const expr_wrapper ret_block = resolve_ret_type(ret_type, ret_cxxtype); + + // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. + scoped_dohptr parms_cxx(NewStringEmpty()); + scoped_dohptr parms_call(NewStringEmpty()); + + Parm* p = Getattr(n, "parms"); + if (p && is_member && !is_ctor && !is_static) { + // We should have "this" as the first parameter and we need to just skip it, as we handle it specially in C++ wrappers. + if (Checkattr(p, "name", "self")) { + p = nextSibling(p); + } else { + // This is not supposed to happen, so warn if it does. + Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), + "Unexpected first parameter \"%s\" in %s\n", + Getattr(p, "name"), + Getattr(n, "sym:name")); + } + } + + for (; p; p = nextSibling(p)) { + // Static variables use fully qualified names, so we can't just use the name directly. + scoped_dohptr name_ptr; + String* name = Getattr(p, "name"); + if (!name) { + // Parameters can also not have any names at all, in which case we use auto-generated one. + name = Getattr(p, "lname"); + } else if (Strstr(name, "::")) { + name_ptr = Swig_scopename_last(name); + name = name_ptr.get(); + } + + SwigType* const ptype = Getattr(p, "type"); + scoped_dohptr pcxxtype(Copy(Getattr(p, "tmap:ctype"))); + + const expr_wrapper parm_cast = resolve_param_type(ptype, pcxxtype); + + if (Len(parms_cxx)) + Append(parms_cxx, ", "); + Printv(parms_cxx, pcxxtype.get(), " ", name, NIL); + + if (Len(parms_call)) + Append(parms_call, ", "); + Printv(parms_call, parm_cast.start.get(), name, parm_cast.end.get(), NIL); + } + + // For some reason overloaded functions use fully-qualified name, so we can't just use the name directly. + scoped_dohptr name_ptr(Swig_scopename_last(Getattr(n, "name"))); + String* const name = name_ptr.get(); + String* const wname = Getattr(n, "wrap:name"); + + if (Checkattr(n, "kind", "variable")) { + if (Checkattr(n, "memberget", "1")) { + Printv(f_out_, + cindent, ret_cxxtype.get(), " ", name, "() const " + "{ ", + ret_block.start.get(), + Getattr(n, "sym:name"), "(swig_self())", + ret_block.end.get(), + "; }\n", + NIL + ); + } else if (Checkattr(n, "memberset", "1")) { + Printv(f_out_, + cindent, "void ", name, "(", parms_cxx.get(), ") " + "{ ", Getattr(n, "sym:name"), "(swig_self(), ", parms_call.get(), "); }\n", + NIL + ); + } else if (Checkattr(n, "varget", "1")) { + Printv(f_out_, + cindent, "static ", ret_cxxtype.get(), " ", name, "() " + "{ ", + ret_block.start.get(), + Getattr(n, "sym:name"), "()", + ret_block.end.get(), + "; }\n", + NIL + ); + } else if (Checkattr(n, "varset", "1")) { + Printv(f_out_, + cindent, "static void ", name, "(", parms_cxx.get(), ") " + "{ ", Getattr(n, "sym:name"), "(", parms_call.get(), "); }\n", + NIL + ); + } else { + Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), + "Not generating C++ wrappers for variable %s\n", + Getattr(n, "sym:name") + ); + } + } else if (is_ctor) { + // Note that we use the sym:name of the class rather than than any attribute of ctor itself because its sym:name is the name of the C wrapper function by + // now (and its name is not suitable to be used in the generated code, e.g. it could be a template). + String* const classname = Getattr(class_node_, "sym:name"); + + // Delegate to the ctor from opaque C pointer taking ownership of the object. + Printv(f_out_, + cindent, classname, "(", parms_cxx.get(), ") : ", + classname, "{", wname, "(", parms_call.get(), ")} {}\n", + NIL + ); + } else if (Checkattr(n, "nodeType", "destructor")) { + // See the comment above. + String* const classname = Getattr(class_node_, "sym:name"); + + if (first_base_) { + // Delete the pointer and reset the ownership flag to ensure that the base class doesn't do it again. + Printv(f_out_, + cindent, get_virtual_prefix(n), "~", classname, "() {\n", + cindent, cindent, "if (swig_owns_self_) {\n", + cindent, cindent, cindent, wname, "(swig_self());\n", + cindent, cindent, cindent, "swig_owns_self_ = false;\n", + cindent, cindent, "}\n", + cindent, "}\n", + NIL + ); + } else { + // Slightly simplified version for classes without base classes, as we don't need to reset swig_self_ then. + Printv(f_out_, + cindent, get_virtual_prefix(n), "~", classname, "() {\n", + cindent, cindent, "if (swig_owns_self_)\n", + cindent, cindent, cindent, wname, "(swig_self_);\n", + cindent, "}\n", + NIL + ); + } + } else if (is_member) { + // Wrapper parameters list may or not include "this" pointer and may or not have other parameters, so construct it piecewise for simplicity. + scoped_dohptr wparms(NewStringEmpty()); + if (!is_static) + Append(wparms, "swig_self()"); + if (Len(parms_call)) { + if (Len(wparms)) + Append(wparms, ", "); + Append(wparms, parms_call); + } + + Printv(f_out_, + cindent, + is_static ? "static " : get_virtual_prefix(n), ret_cxxtype.get(), " ", + name, "(", parms_cxx.get(), ")", + get_const_suffix(n), " { ", + NIL + ); + + Printv(f_out_, + ret_block.start.get(), + wname, "(", wparms.get(), ")", + ret_block.end.get(), + NIL + ); + + Printv(f_out_, + "; }\n", + NIL + ); + } else { + // This is something we don't know about + Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), + "Not generating C++ wrappers for %s\n", + Getattr(n, "sym:name") + ); + } + } + + ~cxx_class_wrapper() { + if (!f_out_) + return; + + // Don't do anything if generation of the wrapper for this class was disabled in ctor. + if (!class_node_) + return; + + *current_wrapper_ = old_wrapper_; + + // This is the name used for the class pointers in C wrappers. + scoped_dohptr c_class_ptr = get_c_class_ptr(class_node_); + + // We need to generate a ctor from the C object pointer, which is required to be able to create objects of this class from pointers created by C wrappers + // and also by any derived classes. + Printv(f_out_, + "\n", + cindent, "explicit ", Getattr(class_node_, "sym:name"), "(", c_class_ptr.get(), " swig_self, " + "bool swig_owns_self = true) : ", + NIL + ); + + if (first_base_) { + // In this case we delegate to the base class ctor, but need a cast because it expects a different pointer type (as these types are opaque, there is no + // relationship between them). We rely on proxyname being already set + Printv(f_out_, + Getattr(first_base_, "sym:name"), + "{(", get_c_class_ptr(first_base_).get(), ")swig_self, swig_owns_self}", + NIL + ); + } else { + // Just initialize our own field. + Printv(f_out_, + "swig_self_{swig_self}, swig_owns_self_{swig_owns_self}", + NIL + ); + } + + Append(f_out_, " {}\n"); + + // We also need a swig_self() method for accessing the C object pointer. + Printv(f_out_, + cindent, c_class_ptr.get(), " swig_self() const noexcept ", + NIL + ); + + if (first_base_) { + // If we have a base class, we reuse its existing "self" pointer. + Printv(f_out_, + "{ return (", c_class_ptr.get(), ")", Getattr(first_base_, "sym:name"), "::swig_self(); }\n", + NIL + ); + } else { + // We use our own pointer, which we also have to declare, together with the ownership flag. + // + // Perhaps we could avoid having a separate bool flag by reusing the low-order bit of the pointer itself as the indicator of ownership and masking it when + // retrieving it here in the future. If we decide to implement this optimization, the code generated here should be the only thing that would need to + // change. + Printv(f_out_, + "{ return swig_self_; }\n", + cindent, c_class_ptr.get(), " swig_self_;\n", + cindent, "bool swig_owns_self_;\n", + NIL + ); + } + + Printv(f_out_, + "};\n" + "\n", + NIL + ); + } + + +private: + // Struct describing a wrapper around some expression: start part goes before the expression and the end part after it. + // Both parts may be empty. + struct expr_wrapper + { + expr_wrapper() : start(NewStringEmpty()), end(NewStringEmpty()) + { + } + + scoped_dohptr start; + scoped_dohptr end; + }; + + + // Various helpers. + + // Return the string containing the pointer type used for representing the objects of the given class in the C wrappers. + // + // Returned value includes "*" at the end. + static scoped_dohptr get_c_class_ptr(Node* class_node) { + return scoped_dohptr(NewStringf("SwigObj_%s*", Getattr(class_node, "proxyname"))); + } + + // Return "virtual " if this is a virtual function, empty string otherwise. + static const char* get_virtual_prefix(Node* n) { + return Checkattr(n, "storage", "virtual") ? "virtual " : ""; + } + + // Return " const" if this is a const function, empty string otherwise. + static const char* get_const_suffix(Node* n) { + String* const qualifier = Getattr(n, "qualifier"); + return qualifier && strncmp(Char(qualifier), "q(const)", 8) == 0 ? " const" : ""; + } + + // Replace "resolved_type" occurrences in the string with the value corresponding to the given type. + // + // Also fills in the provided cast expressions, if they're not null, with the casts needed to translate from C type to C++ type (this is used for the + // parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). + static void do_resolve_type(SwigType* type, String* s, expr_wrapper* parm_cast, expr_wrapper* ret_block) { + enum TypeKind + { + Type_Ptr, + Type_Ref, + Type_Obj, + Type_Max + } typeKind = Type_Max; + + // These correspond to the typemaps for SWIGTYPE*, SWIGTYPE& and SWIGTYPE, respectively, defined in c.swg. + static const char* typemaps[Type_Max] = { + "$resolved_type*", + "$*resolved_type*", + "$&resolved_type*", + }; + + for (int i = 0; i < Type_Max; ++i) { + if (Strstr(s, typemaps[i])) { + typeKind = static_cast(i); + break; + } + } + + if (typeKind == Type_Max) { + if (Strstr(s, "resolved_type")) { + Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, + "Unsupported typemap used for \"%s\"\n", + type + ); + } + + if (ret_block) { + Append(ret_block->start, "return "); + } + + return; + } + + scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); + scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); + + scoped_dohptr typestr; + String* classname; + if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { + typestr = SwigType_str(type, 0); + classname = Getattr(class_node, "sym:name"); + } else { + // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. + typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); + classname = NULL; + } + + switch (typeKind) { + case Type_Ptr: + if (parm_cast) { + Append(parm_cast->end, "->swig_self()"); + } + + if (ret_block) { + if (classname) { + // We currently assume that all pointers are new, which is probably wrong. + Append(ret_block->start, "auto swig_res = "); + Printv(ret_block->end, + "; " + "return swig_res ? new ", classname, "(swig_res) : nullptr", + NIL + ); + } else { + // We can't convert an opaque pointer into anything, so just return it as is. + Append(ret_block->start, "return "); + } + } + break; + + case Type_Ref: + if (ret_block) { + if (classname) { + // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object + // must be constructed using the special ctor not taking the pointer ownership. + typestr = Copy(classname); + + Printv(ret_block->start, + "return ", classname, "{", + NIL + ); + Printv(ret_block->end, + ", false}", + NIL + ); + } else { + // We can't do anything at all in this case. + Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); + } + } + + if (parm_cast) { + Append(parm_cast->end, ".swig_self()"); + } + break; + + case Type_Obj: + if (ret_block) { + if (classname) { + // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened. + Printv(ret_block->start, + "return ", typestr.get(), "(", + NIL + ); + Append(ret_block->end, ")"); + } else { + Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); + } + } + + if (parm_cast) { + Append(parm_cast->end, ".swig_self()"); + } + break; + + case Type_Max: + // Unreachable, but keep here to avoid -Wswitch warnings. + assert(0); + } + + Replaceall(s, typemaps[typeKind], typestr); + } + + static expr_wrapper resolve_param_type(SwigType* type, String* s) { + expr_wrapper parm_cast; + do_resolve_type(type, s, &parm_cast, NULL); + return parm_cast; + } + + // Note that the returned wrapper always already contains "return". + static expr_wrapper resolve_ret_type(SwigType* type, String* s) { + expr_wrapper ret_block; + if (SwigType_type(type) != T_VOID) { + do_resolve_type(type, s, NULL, &ret_block); + } + //else: Don't even add "return" in this case. + + return ret_block; + } + + + cxx_class_wrapper** const current_wrapper_; + cxx_class_wrapper* const old_wrapper_; + File* const f_out_; + + // The class node itself, left null only if we skip generating wrappers for it for whatever reason. + Node* class_node_; + + // We currently don't support generating C++ wrappers for classes using multiple inheritance. This could be implemented, with some tweaks to allow + // initializing the other base classes after creating the most-derived object, but hasn't been done yet. Until then we store just the first base class (if + // any, this member can also be null). + scoped_dohptr first_base_; + + // Non copyable. + cxx_class_wrapper(const cxx_class_wrapper&); + cxx_class_wrapper& operator=(const cxx_class_wrapper&); +}; + } // anonymous namespace class C:public Language { @@ -177,12 +699,18 @@ class C:public Language { File *f_wrappers_types; File *f_wrappers_decl; + // This file contains C++ wrappers if they're generated. + File *f_wrappers_decl_cxx; + // This one contains wrapper functions definitions and end up in the output C++ file. File *f_wrappers; String *empty_string; - // Prefix used for all symbols, if defined. + // Namespace used for the C++ wrappers, set from -namespace command-line option if specified or from the module name otherwise. + String *ns_cxx; + + // Prefix used for all symbols, if non-null. If ns_cxx was specified, it is a mangled version of it. String *ns_prefix; // Prefix for module-level symbols, currently just the module name. @@ -195,12 +723,18 @@ class C:public Language { // so we accumulate the full declaration here and then write it to f_wrappers_types at once only if there are any elements. String *enum_decl; + // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. + cxx_class_wrapper* cxx_class_wrapper_; + // Selects between the wrappers (public) declarations and (private) definitions. enum { output_wrapper_decl, output_wrapper_def } current_output; + // Set to true if C++ wrappers should be generated. + bool cxx_wrappers; + public: /* ----------------------------------------------------------------------------- @@ -209,13 +743,16 @@ public: C() : empty_string(NewString("")), + ns_cxx(NULL), ns_prefix(NULL), - module_prefix(NULL) + module_prefix(NULL), + cxx_class_wrapper_(NULL) { } ~C() { + Delete(ns_cxx); Delete(ns_prefix); Delete(module_prefix); } @@ -454,6 +991,7 @@ public: virtual void main(int argc, char *argv[]) { bool except_flag = CPlusPlus; + cxx_wrappers = CPlusPlus; // look for certain command line options for (int i = 1; i < argc; i++) { @@ -462,14 +1000,17 @@ public: Printf(stdout, "%s\n", usage); } else if (strcmp(argv[i], "-namespace") == 0) { if (argv[i + 1]) { - scoped_dohptr ns(NewString(argv[i + 1])); - ns_prefix = Swig_string_mangle(ns); + ns_cxx = NewString(argv[i + 1]); + ns_prefix = Swig_string_mangle(ns_cxx); Swig_mark_arg(i); Swig_mark_arg(i + 1); i++; } else { Swig_arg_error(); } + } else if (strcmp(argv[i], "-nocxx") == 0) { + cxx_wrappers = false; + Swig_mark_arg(i); } else if (strcmp(argv[i], "-noexcept") == 0) { except_flag = false; Swig_mark_arg(i); @@ -577,6 +1118,44 @@ public: f_wrappers_types = NewString(""); f_wrappers_decl = NewString(""); + scoped_dohptr cxx_ns_end; + if (cxx_wrappers) { + f_wrappers_decl_cxx = NewString(""); + + if (!ns_cxx) { + // We need some namespace for the C++ wrappers as otherwise their names could conflict with the C functions, so use the module name if nothing was + // explicitly specified. + ns_cxx = Copy(module); + } + + Append(f_wrappers_decl_cxx, "#ifdef __cplusplus\n\n"); + + // Generate possibly nested namespace declarations, as unfortunately we can't rely on C++17 nested namespace definitions being always available. + cxx_ns_end = NewStringEmpty(); + for (const char* c = Char(ns_cxx);;) { + const char* const next = strstr(c, "::"); + + maybe_owned_dohptr ns_component; + if (next) { + ns_component.assign_owned(NewStringWithSize(c, next - c)); + } else { + ns_component.assign_non_owned((DOH*)c); + } + + Printf(f_wrappers_decl_cxx, "namespace %s {\n", ns_component.get()); + Printf(cxx_ns_end, "}\n"); + + if (!next) + break; + + c = next + 2; + } + + Append(f_wrappers_decl_cxx, "\n"); + } else { + f_wrappers_decl_cxx = NIL; + } + { cplusplus_output_guard cplusplus_guard_wrappers(f_wrappers), @@ -591,6 +1170,13 @@ public: Dump(f_wrappers_decl, f_wrappers_h); Delete(f_wrappers_decl); + + if (f_wrappers_decl_cxx) { + Printv(f_wrappers_decl_cxx, cxx_ns_end.get(), "\n#endif /* __cplusplus */\n", NIL); + + Dump(f_wrappers_decl_cxx, f_wrappers_h); + Delete(f_wrappers_decl_cxx); + } } // close wrapper header guard // write all to the file @@ -1130,6 +1716,9 @@ public: emit_wrapper_func_decl(n, wname); + if (cxx_class_wrapper_) + cxx_class_wrapper_->emit_member_function(n); + Delete(name); } @@ -1307,6 +1896,8 @@ public: String *name = getProxyName(n); if (CPlusPlus) { + cxx_class_wrapper cxx_class_wrapper_obj(&cxx_class_wrapper_, f_wrappers_decl_cxx, n); + // inheritance support: attach all members from base classes to this class if (List *baselist = Getattr(n, "bases")) { Iterator i; @@ -1642,6 +2233,7 @@ extern "C" Language *swig_c(void) { const char *C::usage = (char *) "\ C Options (available with -c)\n\ -namespace ns - use prefix based on the provided namespace\n\ + -nocxx - do not generate C++ wrappers\n\ -noexcept - do not generate exception handling code\n\ \n"; From 036e3eb08ce6be07af3e6f82c4583eaf6018d38e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 21 Nov 2021 01:44:33 +0100 Subject: [PATCH 404/508] Correctly skip ignored base classes in C++ wrappers Don't refuse to generate C++ wrapper class if there is just one real base class and the other one(s) are ignored. --- Source/Modules/c.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 3ddb0cf33..c8daf22d4 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -189,12 +189,11 @@ public: scoped_dohptr base_classes(NewStringEmpty()); if (List *baselist = Getattr(n, "bases")) { - Iterator i = First(baselist); - if (i.item) { - first_base_ = Copy(i.item); + for (Iterator i = First(baselist); i.item; i = Next(i)) { + if (Checkattr(i.item, "feature:ignore", "1")) + continue; - i = Next(i); - if (i.item) { + if (first_base_) { Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), "Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n", Getattr(n, "sym:name") @@ -203,6 +202,8 @@ public: // Return before initializing class_node_, so that the dtor won't output anything neither. return; } + + first_base_ = Copy(i.item); } Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); From c434b867d7c3e650693be859f1e70047fab37bed Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 21 Nov 2021 18:00:13 +0100 Subject: [PATCH 405/508] Strip namespaces from parameter types This fixes e.g. li_boost_shared_ptr unit test, which uses Space::Klass that should be known as just Klass (inside the outer namespace) in the generated C++ wrappers. --- Source/Modules/c.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index c8daf22d4..ce5ce4f5a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -575,6 +575,14 @@ private: if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { typestr = SwigType_str(type, 0); classname = Getattr(class_node, "sym:name"); + + // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the + // class name, which is not. + scoped_dohptr basetype(SwigType_base(type)); + scoped_dohptr basetypestr(SwigType_str(basetype, 0)); + if (Cmp(basetypestr, classname) != 0) { + Replaceall(typestr, basetypestr, classname); + } } else { // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); From 7c6fb542d39b883c24450bd2f73b17b0647d6bb9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 21 Nov 2021 21:27:59 +0100 Subject: [PATCH 406/508] Convert li_boost_shared_ptr runtime test to C++ from C It's simpler to write tests in C++ rather than C and checking the generated C++ API also checks the C API it uses underneath, so there is no need to have both. --- .../test-suite/c/li_boost_shared_ptr_runme.c | 17 ----------------- .../test-suite/c/li_boost_shared_ptr_runme.cxx | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 Examples/test-suite/c/li_boost_shared_ptr_runme.c create mode 100644 Examples/test-suite/c/li_boost_shared_ptr_runme.cxx diff --git a/Examples/test-suite/c/li_boost_shared_ptr_runme.c b/Examples/test-suite/c/li_boost_shared_ptr_runme.c deleted file mode 100644 index c6ba156e5..000000000 --- a/Examples/test-suite/c/li_boost_shared_ptr_runme.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "li_boost_shared_ptr_wrap.h" -#include -#include - -int main(int argc, const char *argv[]) { - { - li_boost_shared_ptr_Klass* k = li_boost_shared_ptr_Klass_new_rcstd_string("me oh my"); - assert( strcmp(li_boost_shared_ptr_Klass_getValue(k), "me oh my") == 0 ); - li_boost_shared_ptr_Klass_delete(k); - } - - { - li_boost_shared_ptr_Klass* k = li_boost_shared_ptr_factorycreate(); - assert( strcmp(li_boost_shared_ptr_Klass_getValue(k), "factorycreate") == 0 ); - li_boost_shared_ptr_Klass_delete(k); - } -} diff --git a/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx b/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx new file mode 100644 index 000000000..42348a037 --- /dev/null +++ b/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx @@ -0,0 +1,15 @@ +#include "li_boost_shared_ptr_wrap.h" +#include +#include + +int main(int argc, const char *argv[]) { + { + li_boost_shared_ptr::Klass k("me oh my"); + assert( strcmp(k.getValue(), "me oh my") == 0 ); + } + + { + li_boost_shared_ptr::Klass k{li_boost_shared_ptr_factorycreate()}; + assert( strcmp(k.getValue(), "factorycreate") == 0 ); + } +} From e78f5dac45ffbb13daafdf8ce1cda6803ed7e0a5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Nov 2021 21:53:35 +0100 Subject: [PATCH 407/508] Add temp_ptr_setter and use it with cxx_class_wrapper The new helper class will be also useful in other places, so extract it from cxx_class_wrapper. No real changes, this is just a refactoring. --- Source/Modules/c.cxx | 55 +++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index ce5ce4f5a..f1a188e2d 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -119,6 +119,33 @@ private: bool owned_; }; + +// Helper class setting the given pointer to the given value in its ctor and resetting it in the dtor. +// +// Used to non-intrusively set a pointer to some object only during this object life-time. +template +class temp_ptr_setter +{ +public: + // Pointer must be non-null, its current value is restored when this object is destroyed. + temp_ptr_setter(T* ptr, T value) : ptr_(ptr), value_orig_(*ptr) { + *ptr_ = value; + } + + ~temp_ptr_setter() { + *ptr_ = value_orig_; + } + +private: + T* const ptr_; + T const value_orig_; + + // Non copyable. + temp_ptr_setter(const temp_ptr_setter&); + temp_ptr_setter& operator=(const temp_ptr_setter&); +}; + + // Helper class to output "begin" fragment in the ctor and "end" in the dtor. class begin_end_output_guard { @@ -176,17 +203,15 @@ const char* const cindent = " "; class cxx_class_wrapper { public: - // The pointer passed to the ctor is set to this object and restored to its previous value in dtor, ensuring that it never becomes dangling. - // // The file pointer may be null, in which case we simply don't do anything. // - // Finally, the node pointer must be valid, point to a class and remain valid for the lifetime of this object. - cxx_class_wrapper(cxx_class_wrapper** pp, File* f_out, Node* n) : current_wrapper_(pp), old_wrapper_(*current_wrapper_), f_out_(f_out) { + // The node pointer must be valid, point to a class and remain valid for the lifetime of this object. + cxx_class_wrapper(File* f_out, Node* n) : f_out_(f_out) { + class_node_ = NULL; + if (!f_out_) return; - class_node_ = NULL; - scoped_dohptr base_classes(NewStringEmpty()); if (List *baselist = Getattr(n, "bases")) { for (Iterator i = First(baselist); i.item; i = Next(i)) { @@ -216,15 +241,13 @@ public: ); class_node_ = n; - - // We're going to generate C++ wrappers for this class, so set up the pointer to do it. - *current_wrapper_ = this; } // Emit wrapper of a member function. - // - // Shouldn't be called if we're not emitting C++ wrappers for this class. void emit_member_function(Node* n) { + if (!class_node_) + return; + // We don't need to redeclare functions inherited from the base class, as we use real inheritance. if (Getattr(n, "c:inherited_from")) return; @@ -418,15 +441,10 @@ public: } ~cxx_class_wrapper() { - if (!f_out_) - return; - // Don't do anything if generation of the wrapper for this class was disabled in ctor. if (!class_node_) return; - *current_wrapper_ = old_wrapper_; - // This is the name used for the class pointers in C wrappers. scoped_dohptr c_class_ptr = get_c_class_ptr(class_node_); @@ -682,8 +700,6 @@ private: } - cxx_class_wrapper** const current_wrapper_; - cxx_class_wrapper* const old_wrapper_; File* const f_out_; // The class node itself, left null only if we skip generating wrappers for it for whatever reason. @@ -1905,7 +1921,8 @@ public: String *name = getProxyName(n); if (CPlusPlus) { - cxx_class_wrapper cxx_class_wrapper_obj(&cxx_class_wrapper_, f_wrappers_decl_cxx, n); + cxx_class_wrapper cxx_class_wrapper_obj(f_wrappers_decl_cxx, n); + temp_ptr_setter set_cxx_class_wrapper(&cxx_class_wrapper_, &cxx_class_wrapper_obj); // inheritance support: attach all members from base classes to this class if (List *baselist = Getattr(n, "bases")) { From a980c036d6790b3159dec1c1b9c11a53e94ce64e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Nov 2021 01:24:36 +0100 Subject: [PATCH 408/508] Fix $typemap expansion for C++ wrappers This required slightly changing the approach used for resolving types in emit_member_function(), as we can't resolve the type and the casts to/from it independently any more, but need to do both at once, as this is required when it's done indirectly due to $typemap() expansion, and we can't make "return" part of the returned wrapper as we could end with multiple "returns". So replace expr_wrapper with type_desc containing both the wrappers and the type itself and add "return" in emit_member_function() itself for non-void functions. Also use IIFE so that we can always just prepend this "return" in the beginning. Also connect things up so that C++-specific type resolution function is used while C++ wrappers are being generated. --- Source/Modules/c.cxx | 230 +++++++++++++++++++++++++++---------------- 1 file changed, 144 insertions(+), 86 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index f1a188e2d..040356ff1 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -209,6 +209,9 @@ public: cxx_class_wrapper(File* f_out, Node* n) : f_out_(f_out) { class_node_ = NULL; + rtype_desc_ = + ptype_desc_ = NULL; + if (!f_out_) return; @@ -263,19 +266,26 @@ public: const bool is_ctor = Checkattr(n, "nodeType", "constructor"); // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. - SwigType* const ret_type = Getattr(n, "type"); - scoped_dohptr ret_ctype(Swig_typemap_lookup("ctype", n, "", NULL)); - if (!ret_ctype) { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), - "No ctype typemap defined for the return type \"%s\" of %s\n", - SwigType_str(ret_type, NULL), - Getattr(n, "sym:name") - ); - return; - } - scoped_dohptr ret_cxxtype(Copy(ret_ctype)); - const expr_wrapper ret_block = resolve_ret_type(ret_type, ret_cxxtype); + const char* maybe_return; + type_desc rtype_desc; + if (SwigType_type(Getattr(n, "type")) != T_VOID) { + rtype_desc = lookup_cxx_ret_type(n); + if (!rtype_desc.type()) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), + "No ctype typemap defined for the return type \"%s\" of %s\n", + SwigType_str(Getattr(n, "type"), NULL), + Getattr(n, "sym:name") + ); + return; + } + + maybe_return = "return "; + } else { + // There is no need to do anything else with "void" and we don't even need "return" for it. + rtype_desc.set_void_type(); + maybe_return = ""; + } // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. scoped_dohptr parms_cxx(NewStringEmpty()); @@ -307,18 +317,23 @@ public: name = name_ptr.get(); } - SwigType* const ptype = Getattr(p, "type"); - scoped_dohptr pcxxtype(Copy(Getattr(p, "tmap:ctype"))); - - const expr_wrapper parm_cast = resolve_param_type(ptype, pcxxtype); + const type_desc ptype_desc = lookup_cxx_parm_type(p); + if (!ptype_desc.type()) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), + "No ctype typemap defined for the parameter \"%s\" of %s\n", + name, + Getattr(n, "sym:name") + ); + return; + } if (Len(parms_cxx)) Append(parms_cxx, ", "); - Printv(parms_cxx, pcxxtype.get(), " ", name, NIL); + Printv(parms_cxx, ptype_desc.type(), " ", name, NIL); if (Len(parms_call)) Append(parms_call, ", "); - Printv(parms_call, parm_cast.start.get(), name, parm_cast.end.get(), NIL); + Printv(parms_call, ptype_desc.wrap_start(), name, ptype_desc.wrap_end(), NIL); } // For some reason overloaded functions use fully-qualified name, so we can't just use the name directly. @@ -329,11 +344,11 @@ public: if (Checkattr(n, "kind", "variable")) { if (Checkattr(n, "memberget", "1")) { Printv(f_out_, - cindent, ret_cxxtype.get(), " ", name, "() const " + cindent, rtype_desc.type(), " ", name, "() const " "{ ", - ret_block.start.get(), + "return ", rtype_desc.wrap_start(), Getattr(n, "sym:name"), "(swig_self())", - ret_block.end.get(), + rtype_desc.wrap_end(), "; }\n", NIL ); @@ -345,11 +360,11 @@ public: ); } else if (Checkattr(n, "varget", "1")) { Printv(f_out_, - cindent, "static ", ret_cxxtype.get(), " ", name, "() " + cindent, "static ", rtype_desc.type(), " ", name, "() " "{ ", - ret_block.start.get(), + "return ", rtype_desc.wrap_start(), Getattr(n, "sym:name"), "()", - ret_block.end.get(), + rtype_desc.wrap_end(), "; }\n", NIL ); @@ -414,20 +429,13 @@ public: Printv(f_out_, cindent, - is_static ? "static " : get_virtual_prefix(n), ret_cxxtype.get(), " ", + is_static ? "static " : get_virtual_prefix(n), rtype_desc.type(), " ", name, "(", parms_cxx.get(), ")", get_const_suffix(n), " { ", - NIL - ); - - Printv(f_out_, - ret_block.start.get(), + maybe_return, + rtype_desc.wrap_start(), wname, "(", wparms.get(), ")", - ret_block.end.get(), - NIL - ); - - Printv(f_out_, + rtype_desc.wrap_end(), "; }\n", NIL ); @@ -509,17 +517,52 @@ public: } -private: - // Struct describing a wrapper around some expression: start part goes before the expression and the end part after it. - // Both parts may be empty. - struct expr_wrapper - { - expr_wrapper() : start(NewStringEmpty()), end(NewStringEmpty()) - { + // This function is called from C::replaceSpecialVariables() but only does something non-trivial when it's called by our own lookup_cxx_xxx_type() functions. + bool replaceSpecialVariables(String *method, String *tm, Parm *parm) { + if (!ptype_desc_ && !rtype_desc_) + return false; + + if (Cmp(method, "ctype") != 0) { + Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, "Unsupported %s typemap %s\n", method, tm); + return false; } - scoped_dohptr start; - scoped_dohptr end; + if (SwigType *type = Getattr(parm, "type")) { + if (ptype_desc_) + ptype_desc_->set_type(type); + if (rtype_desc_) + rtype_desc_->set_type(type); + + do_resolve_type(parm, tm, ptype_desc_, rtype_desc_); + } + + return true; + } + +private: + // This struct contains the type itself and, optionally, wrappers around expressions of this type: start part goes before the expression and the end part + // after it (and both parts may be empty). + class type_desc + { + public: + // Ctor initializes the object to an empty/unknown state, call set_type() later to finish initialization. + type_desc() : wrap_start_(NewStringEmpty()), wrap_end_(NewStringEmpty()) {} + + // String must be non-null. + void set_type(String* type) { type_ = Copy(type); } + void set_void_type() { type_ = NewString("void"); } + + // If this one returns NULL, it means that we don't have any type information at all. + String* type() const { return type_; } + + // These ones are always non-NULL (but possibly empty). + String* wrap_start() const { return wrap_start_; } + String* wrap_end() const { return wrap_end_; } + + private: + scoped_dohptr type_; + scoped_dohptr wrap_start_; + scoped_dohptr wrap_end_; }; @@ -545,9 +588,9 @@ private: // Replace "resolved_type" occurrences in the string with the value corresponding to the given type. // - // Also fills in the provided cast expressions, if they're not null, with the casts needed to translate from C type to C++ type (this is used for the - // parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). - static void do_resolve_type(SwigType* type, String* s, expr_wrapper* parm_cast, expr_wrapper* ret_block) { + // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type + // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). + static void do_resolve_type(Node* n, String* s, type_desc* ptype_desc, type_desc* rtype_desc) { enum TypeKind { Type_Ptr, @@ -574,17 +617,14 @@ private: if (Strstr(s, "resolved_type")) { Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, "Unsupported typemap used for \"%s\"\n", - type + Getattr(n, "sym:name") ); } - if (ret_block) { - Append(ret_block->start, "return "); - } - return; } + String* const type = Getattr(n, "type"); scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); @@ -609,38 +649,37 @@ private: switch (typeKind) { case Type_Ptr: - if (parm_cast) { - Append(parm_cast->end, "->swig_self()"); + if (ptype_desc) { + Append(ptype_desc->wrap_end(), "->swig_self()"); } - if (ret_block) { + if (rtype_desc) { if (classname) { // We currently assume that all pointers are new, which is probably wrong. - Append(ret_block->start, "auto swig_res = "); - Printv(ret_block->end, + // + // We generate here an immediately-invoked lambda, as we need something that can appear after a "return". + Append(rtype_desc->wrap_start(), "[=] { auto swig_res = "); + Printv(rtype_desc->wrap_end(), "; " - "return swig_res ? new ", classname, "(swig_res) : nullptr", + "return swig_res ? new ", classname, "(swig_res) : nullptr; }()", NIL ); - } else { - // We can't convert an opaque pointer into anything, so just return it as is. - Append(ret_block->start, "return "); } } break; case Type_Ref: - if (ret_block) { + if (rtype_desc) { if (classname) { // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object // must be constructed using the special ctor not taking the pointer ownership. typestr = Copy(classname); - Printv(ret_block->start, - "return ", classname, "{", + Printv(rtype_desc->wrap_start(), + classname, "{", NIL ); - Printv(ret_block->end, + Printv(rtype_desc->wrap_end(), ", false}", NIL ); @@ -650,27 +689,27 @@ private: } } - if (parm_cast) { - Append(parm_cast->end, ".swig_self()"); + if (ptype_desc) { + Append(ptype_desc->wrap_end(), ".swig_self()"); } break; case Type_Obj: - if (ret_block) { + if (rtype_desc) { if (classname) { // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened. - Printv(ret_block->start, - "return ", typestr.get(), "(", + Printv(rtype_desc->wrap_start(), + typestr.get(), "(", NIL ); - Append(ret_block->end, ")"); + Append(rtype_desc->wrap_end(), ")"); } else { Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); } } - if (parm_cast) { - Append(parm_cast->end, ".swig_self()"); + if (ptype_desc) { + Append(ptype_desc->wrap_end(), ".swig_self()"); } break; @@ -682,21 +721,32 @@ private: Replaceall(s, typemaps[typeKind], typestr); } - static expr_wrapper resolve_param_type(SwigType* type, String* s) { - expr_wrapper parm_cast; - do_resolve_type(type, s, &parm_cast, NULL); - return parm_cast; + type_desc lookup_cxx_parm_type(Node* n) { + type_desc ptype_desc; + + // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. + temp_ptr_setter set(&ptype_desc_, &ptype_desc); + + if (String* type = Swig_typemap_lookup("ctype", n, "", NULL)) { + ptype_desc.set_type(type); + do_resolve_type(n, ptype_desc.type(), &ptype_desc, NULL); + } + + return ptype_desc; } - // Note that the returned wrapper always already contains "return". - static expr_wrapper resolve_ret_type(SwigType* type, String* s) { - expr_wrapper ret_block; - if (SwigType_type(type) != T_VOID) { - do_resolve_type(type, s, NULL, &ret_block); - } - //else: Don't even add "return" in this case. + type_desc lookup_cxx_ret_type(Node* n) { + type_desc rtype_desc; - return ret_block; + // As above, ensure our replaceSpecialVariables() is used. + temp_ptr_setter set(&rtype_desc_, &rtype_desc); + + if (String* type = Swig_typemap_lookup("ctype", n, "", NULL)) { + rtype_desc.set_type(type); + do_resolve_type(n, rtype_desc.type(), NULL, &rtype_desc); + } + + return rtype_desc; } @@ -710,6 +760,11 @@ private: // any, this member can also be null). scoped_dohptr first_base_; + // These pointers are temporarily set to non-null value only while expanding a typemap for C++ wrappers, see replaceSpecialVariables(). + type_desc* ptype_desc_; + type_desc* rtype_desc_; + + // Non copyable. cxx_class_wrapper(const cxx_class_wrapper&); cxx_class_wrapper& operator=(const cxx_class_wrapper&); @@ -1005,7 +1060,10 @@ public: *--------------------------------------------------------------------*/ virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) { - (void)method; + // This function is called by Swig_typemap_lookup(), which may be called when generating C or C++ wrappers, so delegate to the latter one if necessary. + if (cxx_class_wrapper_ && cxx_class_wrapper_->replaceSpecialVariables(method, tm, parm)) + return; + SwigType *type = Getattr(parm, "type"); substituteResolvedType(type, tm); } From a13da1f8a969e16dfe83e2febf196d458f3c56f1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Nov 2021 19:32:40 +0100 Subject: [PATCH 409/508] Refactor code to use cxx_wrappers struct No real changes, just prepare for adding more File objects to be used for C++ wrappers generation: we can't generate all of them in a single pass because there may be dependencies between classes. --- Source/Modules/c.cxx | 159 +++++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 74 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 040356ff1..cc4e8183f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -195,6 +195,26 @@ public: // String containing one indentation level for the generated code. const char* const cindent = " "; + +/* + Struct containing information needed only for generating C++ wrappers. +*/ +struct cxx_wrappers +{ + // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. + cxx_wrappers() : f_decls(NULL) {} + + void initialize() { + f_decls = NewStringEmpty(); + } + + bool is_initialized() const { return f_decls != NULL; } + + + // Full declarations of the classes. + File* f_decls; +}; + /* cxx_class_wrapper @@ -203,16 +223,16 @@ const char* const cindent = " "; class cxx_class_wrapper { public: - // The file pointer may be null, in which case we simply don't do anything. + // If the provided cxx_wrappers object is not initialized, this class doesn't do anything. // // The node pointer must be valid, point to a class and remain valid for the lifetime of this object. - cxx_class_wrapper(File* f_out, Node* n) : f_out_(f_out) { + cxx_class_wrapper(const cxx_wrappers& cxx_wrappers, Node* n) : cxx_wrappers_(cxx_wrappers) { class_node_ = NULL; rtype_desc_ = ptype_desc_ = NULL; - if (!f_out_) + if (!cxx_wrappers_.is_initialized()) return; scoped_dohptr base_classes(NewStringEmpty()); @@ -237,7 +257,7 @@ public: Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); } - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, "class ", Getattr(n, "sym:name"), base_classes.get(), " {\n" "public:\n", NIL @@ -343,7 +363,7 @@ public: if (Checkattr(n, "kind", "variable")) { if (Checkattr(n, "memberget", "1")) { - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, rtype_desc.type(), " ", name, "() const " "{ ", "return ", rtype_desc.wrap_start(), @@ -353,13 +373,13 @@ public: NIL ); } else if (Checkattr(n, "memberset", "1")) { - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, "void ", name, "(", parms_cxx.get(), ") " "{ ", Getattr(n, "sym:name"), "(swig_self(), ", parms_call.get(), "); }\n", NIL ); } else if (Checkattr(n, "varget", "1")) { - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, "static ", rtype_desc.type(), " ", name, "() " "{ ", "return ", rtype_desc.wrap_start(), @@ -369,7 +389,7 @@ public: NIL ); } else if (Checkattr(n, "varset", "1")) { - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, "static void ", name, "(", parms_cxx.get(), ") " "{ ", Getattr(n, "sym:name"), "(", parms_call.get(), "); }\n", NIL @@ -386,7 +406,7 @@ public: String* const classname = Getattr(class_node_, "sym:name"); // Delegate to the ctor from opaque C pointer taking ownership of the object. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, classname, "(", parms_cxx.get(), ") : ", classname, "{", wname, "(", parms_call.get(), ")} {}\n", NIL @@ -397,7 +417,7 @@ public: if (first_base_) { // Delete the pointer and reset the ownership flag to ensure that the base class doesn't do it again. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, get_virtual_prefix(n), "~", classname, "() {\n", cindent, cindent, "if (swig_owns_self_) {\n", cindent, cindent, cindent, wname, "(swig_self());\n", @@ -408,7 +428,7 @@ public: ); } else { // Slightly simplified version for classes without base classes, as we don't need to reset swig_self_ then. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, get_virtual_prefix(n), "~", classname, "() {\n", cindent, cindent, "if (swig_owns_self_)\n", cindent, cindent, cindent, wname, "(swig_self_);\n", @@ -427,7 +447,7 @@ public: Append(wparms, parms_call); } - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, is_static ? "static " : get_virtual_prefix(n), rtype_desc.type(), " ", name, "(", parms_cxx.get(), ")", @@ -458,7 +478,7 @@ public: // We need to generate a ctor from the C object pointer, which is required to be able to create objects of this class from pointers created by C wrappers // and also by any derived classes. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, "\n", cindent, "explicit ", Getattr(class_node_, "sym:name"), "(", c_class_ptr.get(), " swig_self, " "bool swig_owns_self = true) : ", @@ -468,30 +488,30 @@ public: if (first_base_) { // In this case we delegate to the base class ctor, but need a cast because it expects a different pointer type (as these types are opaque, there is no // relationship between them). We rely on proxyname being already set - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, Getattr(first_base_, "sym:name"), "{(", get_c_class_ptr(first_base_).get(), ")swig_self, swig_owns_self}", NIL ); } else { // Just initialize our own field. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, "swig_self_{swig_self}, swig_owns_self_{swig_owns_self}", NIL ); } - Append(f_out_, " {}\n"); + Append(cxx_wrappers_.f_decls, " {}\n"); // We also need a swig_self() method for accessing the C object pointer. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, cindent, c_class_ptr.get(), " swig_self() const noexcept ", NIL ); if (first_base_) { // If we have a base class, we reuse its existing "self" pointer. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, "{ return (", c_class_ptr.get(), ")", Getattr(first_base_, "sym:name"), "::swig_self(); }\n", NIL ); @@ -501,7 +521,7 @@ public: // Perhaps we could avoid having a separate bool flag by reusing the low-order bit of the pointer itself as the indicator of ownership and masking it when // retrieving it here in the future. If we decide to implement this optimization, the code generated here should be the only thing that would need to // change. - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, "{ return swig_self_; }\n", cindent, c_class_ptr.get(), " swig_self_;\n", cindent, "bool swig_owns_self_;\n", @@ -509,7 +529,7 @@ public: ); } - Printv(f_out_, + Printv(cxx_wrappers_.f_decls, "};\n" "\n", NIL @@ -750,7 +770,7 @@ private: } - File* const f_out_; + const cxx_wrappers& cxx_wrappers_; // The class node itself, left null only if we skip generating wrappers for it for whatever reason. Node* class_node_; @@ -779,9 +799,6 @@ class C:public Language { File *f_wrappers_types; File *f_wrappers_decl; - // This file contains C++ wrappers if they're generated. - File *f_wrappers_decl_cxx; - // This one contains wrapper functions definitions and end up in the output C++ file. File *f_wrappers; @@ -803,17 +820,17 @@ class C:public Language { // so we accumulate the full declaration here and then write it to f_wrappers_types at once only if there are any elements. String *enum_decl; - // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. - cxx_class_wrapper* cxx_class_wrapper_; - // Selects between the wrappers (public) declarations and (private) definitions. enum { output_wrapper_decl, output_wrapper_def } current_output; - // Set to true if C++ wrappers should be generated. - bool cxx_wrappers; + // This object contains information necessary only for C++ wrappers generation, use its is_initialized() to check if this is being done. + cxx_wrappers cxx_wrappers_; + + // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. + cxx_class_wrapper* cxx_class_wrapper_; public: @@ -1074,7 +1091,7 @@ public: virtual void main(int argc, char *argv[]) { bool except_flag = CPlusPlus; - cxx_wrappers = CPlusPlus; + bool use_cxx_wrappers = CPlusPlus; // look for certain command line options for (int i = 1; i < argc; i++) { @@ -1092,7 +1109,7 @@ public: Swig_arg_error(); } } else if (strcmp(argv[i], "-nocxx") == 0) { - cxx_wrappers = false; + use_cxx_wrappers = false; Swig_mark_arg(i); } else if (strcmp(argv[i], "-noexcept") == 0) { except_flag = false; @@ -1130,6 +1147,10 @@ public: Swig_name_register("type", NewStringf("%s%%c", ns_prefix_)); } + if (use_cxx_wrappers) { + cxx_wrappers_.initialize(); + } + allow_overloading(); } @@ -1201,44 +1222,6 @@ public: f_wrappers_types = NewString(""); f_wrappers_decl = NewString(""); - scoped_dohptr cxx_ns_end; - if (cxx_wrappers) { - f_wrappers_decl_cxx = NewString(""); - - if (!ns_cxx) { - // We need some namespace for the C++ wrappers as otherwise their names could conflict with the C functions, so use the module name if nothing was - // explicitly specified. - ns_cxx = Copy(module); - } - - Append(f_wrappers_decl_cxx, "#ifdef __cplusplus\n\n"); - - // Generate possibly nested namespace declarations, as unfortunately we can't rely on C++17 nested namespace definitions being always available. - cxx_ns_end = NewStringEmpty(); - for (const char* c = Char(ns_cxx);;) { - const char* const next = strstr(c, "::"); - - maybe_owned_dohptr ns_component; - if (next) { - ns_component.assign_owned(NewStringWithSize(c, next - c)); - } else { - ns_component.assign_non_owned((DOH*)c); - } - - Printf(f_wrappers_decl_cxx, "namespace %s {\n", ns_component.get()); - Printf(cxx_ns_end, "}\n"); - - if (!next) - break; - - c = next + 2; - } - - Append(f_wrappers_decl_cxx, "\n"); - } else { - f_wrappers_decl_cxx = NIL; - } - { cplusplus_output_guard cplusplus_guard_wrappers(f_wrappers), @@ -1254,11 +1237,39 @@ public: Dump(f_wrappers_decl, f_wrappers_h); Delete(f_wrappers_decl); - if (f_wrappers_decl_cxx) { - Printv(f_wrappers_decl_cxx, cxx_ns_end.get(), "\n#endif /* __cplusplus */\n", NIL); + if (cxx_wrappers_.is_initialized()) { + if (!ns_cxx) { + // We need some namespace for the C++ wrappers as otherwise their names could conflict with the C functions, so use the module name if nothing was + // explicitly specified. + ns_cxx = Copy(module); + } - Dump(f_wrappers_decl_cxx, f_wrappers_h); - Delete(f_wrappers_decl_cxx); + Printv(f_wrappers_h, "#ifdef __cplusplus\n\n", NIL); + + // Generate possibly nested namespace declarations, as unfortunately we can't rely on C++17 nested namespace definitions being always available. + scoped_dohptr cxx_ns_end(NewStringEmpty()); + for (const char* c = Char(ns_cxx);;) { + const char* const next = strstr(c, "::"); + + maybe_owned_dohptr ns_component; + if (next) { + ns_component.assign_owned(NewStringWithSize(c, next - c)); + } else { + ns_component.assign_non_owned((DOH*)c); + } + + Printf(f_wrappers_h, "namespace %s {\n", ns_component.get()); + Printf(cxx_ns_end, "}\n"); + + if (!next) + break; + + c = next + 2; + } + + Dump(cxx_files_.f_decls, f_wrappers_h); + + Printv(f_wrappers_h, cxx_ns_end.get(), "\n#endif /* __cplusplus */\n", NIL); } } // close wrapper header guard @@ -1979,7 +1990,7 @@ public: String *name = getProxyName(n); if (CPlusPlus) { - cxx_class_wrapper cxx_class_wrapper_obj(f_wrappers_decl_cxx, n); + cxx_class_wrapper cxx_class_wrapper_obj(cxx_wrappers_, n); temp_ptr_setter set_cxx_class_wrapper(&cxx_class_wrapper_, &cxx_class_wrapper_obj); // inheritance support: attach all members from base classes to this class From b0c99911641611fe675ac44f2d5eb2cde603d227 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Nov 2021 20:24:20 +0100 Subject: [PATCH 410/508] Separate forward declarations and implementations of C++ wrappers This allows the generated code to compile when different classes depend on each other, as the class must be forward-declared to be mentioned at all (as either parameter or return type) and fully defined in order to be used in either role, as we need to use its ctor or call swig_self() on it. --- Source/Modules/c.cxx | 56 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index cc4e8183f..e30a0fc6b 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -202,17 +202,27 @@ const char* const cindent = " "; struct cxx_wrappers { // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. - cxx_wrappers() : f_decls(NULL) {} + cxx_wrappers() : f_fwd_decls(NULL), f_decls(NULL), f_impls(NULL) {} void initialize() { + f_fwd_decls = NewStringEmpty(); f_decls = NewStringEmpty(); + f_impls = NewStringEmpty(); } - bool is_initialized() const { return f_decls != NULL; } + bool is_initialized() const { return f_fwd_decls != NULL; } + // The order of the members here is the same as the order in which they appear in the output file. + + // Forward declarations of the classes. + File* f_fwd_decls; + // Full declarations of the classes. File* f_decls; + + // Implementation of the classes. + File* f_impls; }; /* @@ -257,6 +267,11 @@ public: Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); } + Printv(cxx_wrappers_.f_fwd_decls, + "class ", Getattr(n, "sym:name"), ";\n", + NIL + ); + Printv(cxx_wrappers_.f_decls, "class ", Getattr(n, "sym:name"), base_classes.get(), " {\n" "public:\n", @@ -361,6 +376,8 @@ public: String* const name = name_ptr.get(); String* const wname = Getattr(n, "wrap:name"); + String* const classname = Getattr(class_node_, "sym:name"); + if (Checkattr(n, "kind", "variable")) { if (Checkattr(n, "memberget", "1")) { Printv(cxx_wrappers_.f_decls, @@ -401,20 +418,18 @@ public: ); } } else if (is_ctor) { - // Note that we use the sym:name of the class rather than than any attribute of ctor itself because its sym:name is the name of the C wrapper function by - // now (and its name is not suitable to be used in the generated code, e.g. it could be a template). - String* const classname = Getattr(class_node_, "sym:name"); - // Delegate to the ctor from opaque C pointer taking ownership of the object. Printv(cxx_wrappers_.f_decls, - cindent, classname, "(", parms_cxx.get(), ") : ", + cindent, classname, "(", parms_cxx.get(), ");\n", + NIL + ); + + Printv(cxx_wrappers_.f_impls, + "inline ", classname, "::", classname, "(", parms_cxx.get(), ") : ", classname, "{", wname, "(", parms_call.get(), ")} {}\n", NIL ); } else if (Checkattr(n, "nodeType", "destructor")) { - // See the comment above. - String* const classname = Getattr(class_node_, "sym:name"); - if (first_base_) { // Delete the pointer and reset the ownership flag to ensure that the base class doesn't do it again. Printv(cxx_wrappers_.f_decls, @@ -451,7 +466,15 @@ public: cindent, is_static ? "static " : get_virtual_prefix(n), rtype_desc.type(), " ", name, "(", parms_cxx.get(), ")", - get_const_suffix(n), " { ", + get_const_suffix(n), ";\n", + NIL + ); + + Printv(cxx_wrappers_.f_impls, + "inline ", rtype_desc.type(), " ", + classname, "::", name, "(", parms_cxx.get(), ")", + get_const_suffix(n), + " { ", maybe_return, rtype_desc.wrap_start(), wname, "(", wparms.get(), ")", @@ -1267,9 +1290,16 @@ public: c = next + 2; } - Dump(cxx_files_.f_decls, f_wrappers_h); + Printv(f_wrappers_h, "\n", NIL); + Dump(cxx_wrappers_.f_fwd_decls, f_wrappers_h); - Printv(f_wrappers_h, cxx_ns_end.get(), "\n#endif /* __cplusplus */\n", NIL); + Printv(f_wrappers_h, "\n", NIL); + Dump(cxx_wrappers_.f_decls, f_wrappers_h); + + Printv(f_wrappers_h, "\n", NIL); + Dump(cxx_wrappers_.f_impls, f_wrappers_h); + + Printv(f_wrappers_h, "\n", cxx_ns_end.get(), "\n#endif /* __cplusplus */\n", NIL); } } // close wrapper header guard From 8d1fbbacb383a3d25edf7bccad1004ac406d780a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Nov 2021 23:51:49 +0100 Subject: [PATCH 411/508] Use correct base class C proxy name even if it's not set yet Replace C::getProxyName() with global get_c_proxy_name() and use it in cxx_class_wrapper rather than relying on "proxyname" attribute being already set because this might not be the case if the base class is defined in another SWIG module just %import'ed from the current one: in this case, the class is known, but no wrappers had been generated for it yet, so "proxyname" for it is not set. Note that, unlike getProxyName(), the new function doesn't bother with always copying the string, as we may be sure it remains valid as it's referenced by the node, as one of its attributes. --- Source/Modules/c.cxx | 62 +++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e30a0fc6b..d37472ac5 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -195,6 +195,27 @@ public: // String containing one indentation level for the generated code. const char* const cindent = " "; +// Returns the non-owned string to the name of the class or enum to use in C wrappers. +String* get_c_proxy_name(Node* n) { + String *proxyname = Getattr(n, "proxyname"); + if (!proxyname) { + String *symname = Getattr(n, "sym:name"); + String *nspace = Getattr(n, "sym:nspace"); + + if (nspace) { + scoped_dohptr nspace_mangled(Swig_string_mangle(nspace)); + proxyname = NewStringf("%s_%s", (DOH*)nspace_mangled, symname); + } else { + proxyname = Swig_name_type(symname); + } + Setattr(n, "proxyname", proxyname); + + Delete(proxyname); // It stays alive because it's referenced by the hash. + } + + return proxyname; +} + /* Struct containing information needed only for generating C++ wrappers. @@ -510,7 +531,7 @@ public: if (first_base_) { // In this case we delegate to the base class ctor, but need a cast because it expects a different pointer type (as these types are opaque, there is no - // relationship between them). We rely on proxyname being already set + // relationship between them). Printv(cxx_wrappers_.f_decls, Getattr(first_base_, "sym:name"), "{(", get_c_class_ptr(first_base_).get(), ")swig_self, swig_owns_self}", @@ -615,7 +636,7 @@ private: // // Returned value includes "*" at the end. static scoped_dohptr get_c_class_ptr(Node* class_node) { - return scoped_dohptr(NewStringf("SwigObj_%s*", Getattr(class_node, "proxyname"))); + return scoped_dohptr(NewStringf("SwigObj_%s*", get_c_proxy_name(class_node))); } // Return "virtual " if this is a virtual function, empty string otherwise. @@ -877,32 +898,6 @@ public: Delete(module_prefix); } - // Return the name to be used in proxy code and cache it as "proxyname". - String *getProxyName(Node *n) - { - if (!n) - return 0; - - String *proxyname = NULL; - if ((proxyname = Getattr(n, "proxyname"))) - return Copy(proxyname); - - String *symname = Getattr(n, "sym:name"); - String *nspace = Getattr(n, "sym:nspace"); - - if (nspace) { - scoped_dohptr nspace_mangled(Swig_string_mangle(nspace)); - proxyname = NewStringf("%s_%s", (DOH*)nspace_mangled, symname); - } else if (ns_prefix) { - proxyname = NewStringf("%s_%s", ns_prefix, symname); - } else { - proxyname = Copy(symname); - } - Setattr(n, "proxyname", proxyname); - - return proxyname; - } - // Construct the name to be used for a function with the given name in C wrappers. // // The returned string must be freed by caller. @@ -960,7 +955,7 @@ public: String *getClassProxyName(SwigType *t) { Node *n = classLookup(t); - return n ? getProxyName(n) : NULL; + return n ? Copy(get_c_proxy_name(n)) : NULL; } @@ -992,7 +987,7 @@ public: Delete(proxyname); } else { // global enum or enum in a namespace - enumname = getProxyName(n); + enumname = Copy(get_c_proxy_name(n)); } Setattr(n, "enumname", enumname); Delete(enumname); @@ -2017,7 +2012,7 @@ public: * --------------------------------------------------------------------- */ virtual int classHandler(Node *n) { - String *name = getProxyName(n); + String* const name = get_c_proxy_name(n); if (CPlusPlus) { cxx_class_wrapper cxx_class_wrapper_obj(cxx_wrappers_, n); @@ -2064,7 +2059,6 @@ public: // declare type for specific class in the proxy header Printv(f_wrappers_types, "typedef struct SwigObj_", name, " ", name, ";\n\n", NIL); - Delete(name); return Language::classHandler(n); } else { // this is C struct, just declare it in the proxy @@ -2082,8 +2076,6 @@ public: Printv(f_wrappers_types, struct_def, NIL); Delete(struct_def); - - Delete(name); } return SWIG_OK; } @@ -2188,7 +2180,7 @@ public: Printv(enum_decl, "enum", NIL); if (Node* const klass = getCurrentClass()) { - enum_prefix = getProxyName(klass); + enum_prefix = get_c_proxy_name(klass); } else { enum_prefix = ns_prefix; // Possibly NULL, but that's fine. } From 03c6099ac1fc32192079f1ff5219cc7a495d679b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Nov 2021 02:03:25 +0100 Subject: [PATCH 412/508] Define "classname" in cxx_class_wrapper dtor too No changes, just a tiny refactoring before the upcoming commit. --- Source/Modules/c.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d37472ac5..b85e3336f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -520,11 +520,13 @@ public: // This is the name used for the class pointers in C wrappers. scoped_dohptr c_class_ptr = get_c_class_ptr(class_node_); + String* const classname = Getattr(class_node_, "sym:name"); + // We need to generate a ctor from the C object pointer, which is required to be able to create objects of this class from pointers created by C wrappers // and also by any derived classes. Printv(cxx_wrappers_.f_decls, "\n", - cindent, "explicit ", Getattr(class_node_, "sym:name"), "(", c_class_ptr.get(), " swig_self, " + cindent, "explicit ", classname, "(", c_class_ptr.get(), " swig_self, " "bool swig_owns_self = true) : ", NIL ); From 79e9d43c1b8c1034afb2e8f5e9c1abb412ed1d70 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Nov 2021 02:04:10 +0100 Subject: [PATCH 413/508] Disable broken default-generated copy ctor in C++ wrappers We can't rely on the default-generated copy ctor because it simply copies the (possibly) owned pointer, resulting in double destruction if it's ever used, so disable it completely unless it is explicitly declared in the original class, in which case we can wrap it using the C function wrapper defined for it. Note that we probably should also wrap default-generated copy ctor of the original class, if it has any, but currently we don't do it even at C wrappers level, and so can't do it for C++ wrappers neither. --- Source/Modules/c.cxx | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index b85e3336f..633e34558 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -300,6 +300,7 @@ public: ); class_node_ = n; + has_copy_ctor_ = false; } // Emit wrapper of a member function. @@ -450,6 +451,10 @@ public: classname, "{", wname, "(", parms_call.get(), ")} {}\n", NIL ); + + // Remember that we had a copy ctor. + if (Checkattr(n, "copy_constructor", "1")) + has_copy_ctor_ = true; } else if (Checkattr(n, "nodeType", "destructor")) { if (first_base_) { // Delete the pointer and reset the ownership flag to ensure that the base class doesn't do it again. @@ -549,6 +554,23 @@ public: Append(cxx_wrappers_.f_decls, " {}\n"); + // If the class doesn't have a copy ctor, forbid copying it: we currently must do it even if the original class has a perfectly cromulent implicit copy ctor + // because we don't wrap it and copying would use the trivial ctor that would just copy the swig_self_ pointer resulting in double destruction of it later. + // To fix this, we would need to always provide our own C wrapper for the copy ctor, which is not something we do currently. + if (!has_copy_ctor_) { + Printv(cxx_wrappers_.f_decls, + cindent, classname, "(", classname, " const&) = delete;\n", + NIL + ); + } + + // We currently never wrap the assignment operator, so we have to always disable it for the same reason we disable the copy ctor above. + // It would definitely be nice to provide the assignment, if possible. + Printv(cxx_wrappers_.f_decls, + cindent, classname, "& operator=(", classname, " const&) = delete;\n", + NIL + ); + // We also need a swig_self() method for accessing the C object pointer. Printv(cxx_wrappers_.f_decls, cindent, c_class_ptr.get(), " swig_self() const noexcept ", @@ -830,6 +852,9 @@ private: type_desc* ptype_desc_; type_desc* rtype_desc_; + // True if the class defines an explicit copy ctor. + bool has_copy_ctor_; + // Non copyable. cxx_class_wrapper(const cxx_class_wrapper&); From 3f3438093dc6b085ad86c8b728aeee1b733c433a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Nov 2021 02:06:08 +0100 Subject: [PATCH 414/508] Define move ctor and assignment operator for C++ wrappers This can be done naturally and there doesn't seem to be any reason not to do it. --- Source/Modules/c.cxx | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 633e34558..c0ea65a91 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -571,6 +571,28 @@ public: NIL ); + // OTOH we may always provide move ctor and assignment, as we can always implement them trivially ourselves. + if (first_base_) { + Printv(cxx_wrappers_.f_decls, + cindent, classname, "(", classname, "&& obj) = default;\n", + cindent, classname, "& operator=(", classname, "&& obj) = default;\n", + NIL + ); + } else { + Printv(cxx_wrappers_.f_decls, + cindent, classname, "(", classname, "&& obj) : " + "swig_self_{obj.swig_self_}, swig_owns_self_{obj.swig_owns_self_} { " + "obj.swig_owns_self_ = false; " + "}\n", + cindent, classname, "& operator=(", classname, "&& obj) { " + "swig_self_ = obj.swig_self_; swig_owns_self_ = obj.swig_owns_self_; " + "obj.swig_owns_self_ = false; " + "return *this; " + "}\n", + NIL + ); + } + // We also need a swig_self() method for accessing the C object pointer. Printv(cxx_wrappers_.f_decls, cindent, c_class_ptr.get(), " swig_self() const noexcept ", From adb96f8b7a2fb3ccf17307cb3ce8dc916a989c21 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Nov 2021 02:14:38 +0100 Subject: [PATCH 415/508] Always pass wrapper objects by const reference in C++ wrappers Passing them by value doesn't seem to have any advantages, as the copy will be made internally anyhow if the original function took them by value and doing an extra one doesn't seem necessary, but does have a big drawback of not compiling if the class doesn't define a copy ctor. --- Source/Modules/c.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index c0ea65a91..4008bf8a9 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -819,6 +819,10 @@ private: } if (ptype_desc) { + // It doesn't seem like it can ever be useful to pass an object by value to a wrapper function and it can fail if it doesn't have a copy ctor (see + // code related to has_copy_ctor_ in our dtor above), so always pass it by const reference instead. + Append(typestr, " const&"); + Append(ptype_desc->wrap_end(), ".swig_self()"); } break; From 43276f22a7cbe5f69b7d7fe5587f831c0e7380a9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 21 Nov 2021 22:25:46 +0100 Subject: [PATCH 416/508] Enable testing some C++ wrappers code in the test suite C++ wrappers still don't compile for about a hundred tests, but they do compile for almost 500 more of them, so it's still valuable to be able to check that there are no regressions for those that do work now. --- Examples/test-suite/c/Makefile.in | 102 +++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 47175ec8d..d6e326cc3 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -102,7 +102,107 @@ char_binary.cpptest director_binary_string.cpptest li_typemaps.cpptest li_typema include $(srcdir)/../common.mk # Overridden variables here -SWIGOPT += -w524 -nocxx # Suppress SWIGWARN_LANG_EXPERIMENTAL warning +SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning + +%.ctest: SWIGOPT += -nocxx + +# Tests for which C++ wrappers currently don't compile. +apply_strings.cpptest \ +autodoc.cpptest \ +class_ignore.cpptest \ +class_scope_weird.cpptest \ +contract.cpptest \ +conversion.cpptest \ +conversion_namespace.cpptest \ +conversion_ns_template.cpptest \ +cpp11_default_delete.cpptest \ +cpp11_explicit_conversion_operators.cpptest \ +cpp11_final_override.cpptest \ +cpp11_initializer_list.cpptest \ +cpp11_noexcept.cpptest \ +cpp11_shared_ptr_upcast.cpptest \ +cpp11_strongly_typed_enumerations.cpptest \ +cpp_typedef.cpptest \ +default_constructor.cpptest \ +derived_nested.cpptest \ +director_basic.cpptest \ +director_classes.cpptest \ +director_conversion_operators.cpptest \ +director_frob.cpptest \ +director_property.cpptest \ +director_string.cpptest \ +dynamic_cast.cpptest \ +extend_template_method.cpptest \ +features.cpptest \ +global_namespace.cpptest \ +ignore_parameter.cpptest \ +inherit_target_language.cpptest \ +kind.cpptest \ +li_boost_shared_ptr_bits.cpptest \ +li_boost_shared_ptr_director.cpptest \ +li_std_except.cpptest \ +li_std_map.cpptest \ +li_std_vector.cpptest \ +li_std_vector_enum.cpptest \ +li_std_vector_ptr.cpptest \ +li_swigtype_inout.cpptest \ +member_template.cpptest \ +multiple_inheritance_abstract.cpptest \ +multiple_inheritance_interfaces.cpptest \ +multiple_inheritance_nspace.cpptest \ +multiple_inheritance_shared_ptr.cpptest \ +namespace_class.cpptest \ +namespace_virtual_method.cpptest \ +naturalvar_more.cpptest \ +nested_ignore.cpptest \ +nested_scope_flat.cpptest \ +operator_pointer_ref.cpptest \ +operbool.cpptest \ +overload_arrays.cpptest \ +overload_complicated.cpptest \ +overload_null.cpptest \ +overload_template.cpptest \ +overload_template_fast.cpptest \ +pure_virtual.cpptest \ +refcount.cpptest \ +rename1.cpptest \ +rename2.cpptest \ +rename3.cpptest \ +rename4.cpptest \ +rename_wildcard.cpptest \ +return_const_value.cpptest \ +smart_pointer_ignore.cpptest \ +smart_pointer_member.cpptest \ +smart_pointer_multi_typedef.cpptest \ +smart_pointer_template_const_overload.cpptest \ +smart_pointer_templatemethods.cpptest \ +smart_pointer_typedef.cpptest \ +template_arg_scope.cpptest \ +template_const_ref.cpptest \ +template_default_arg.cpptest \ +template_default_arg_overloaded.cpptest \ +template_default_vw.cpptest \ +template_extend_overload.cpptest \ +template_inherit_abstract.cpptest \ +template_methods.cpptest \ +template_nested.cpptest \ +template_nested_flat.cpptest \ +template_ns_enum2.cpptest \ +template_opaque.cpptest \ +template_qualifier.cpptest \ +template_retvalue.cpptest \ +template_static.cpptest \ +template_typedef_class_template.cpptest \ +template_typedef_cplx5.cpptest \ +template_typemaps.cpptest \ +template_typemaps_typedef.cpptest \ +template_typemaps_typedef2.cpptest \ +typename.cpptest \ +valuewrapper_const.cpptest \ +valuewrapper_opaque.cpptest \ +: SWIGOPT += -nocxx + +%.multicpptest: SWIGOPT += -nocxx %.cpptest: SWIGOPT += -namespace $* From d2546e23ffe72b34acb41069253ca7d1b6c36bef Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Nov 2021 20:16:42 +0100 Subject: [PATCH 417/508] Don't use exception specification with C++ compiler in example Support for the exception specifications using types was removed in C++17 (and "throw ()" in C++20), so don't use them when using the C++ compiler any longer, as this broke the example with recent g++ versions that use C++17 by default. We still need them for SWIG, however, so use SWIG_THROW macro, defined differently for SWIG and the compiler, to preserve the existing behaviour. Using %except might be a better idea, but would require more changes. --- Examples/c/exception/example.h | 20 ++++++-------------- Examples/c/exception/example.i | 3 +++ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Examples/c/exception/example.h b/Examples/c/exception/example.h index 2b84bd5f5..ae97e15e5 100644 --- a/Examples/c/exception/example.h +++ b/Examples/c/exception/example.h @@ -3,6 +3,7 @@ #ifndef SWIG struct A { }; +#define SWIG_THROW(...) #endif class Exc { @@ -15,38 +16,29 @@ public: char msg[256]; }; -#if defined(_MSC_VER) - #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) -#endif - class Test { public: - int simple() throw(int&) { + int simple() SWIG_THROW(int&) { throw(37); return 1; } - int message() throw(const char *) { + int message() SWIG_THROW(const char *) { throw("I died."); return 1; } - int hosed() throw(Exc) { + int hosed() SWIG_THROW(Exc) { throw(Exc(42,"Hosed")); return 1; } - int unknown() throw(A*) { + int unknown() SWIG_THROW(A*) { static A a; throw &a; return 1; } - int multi(int x) throw(int, const char *, Exc) { + int multi(int x) SWIG_THROW(int, const char *, Exc) { if (x == 1) throw(37); if (x == 2) throw("Bleah!"); if (x == 3) throw(Exc(42,"No-go-diggy-die")); return 1; } }; - -#if defined(_MSC_VER) - #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) -#endif - diff --git a/Examples/c/exception/example.i b/Examples/c/exception/example.i index 7d34fc051..d0404b93d 100644 --- a/Examples/c/exception/example.i +++ b/Examples/c/exception/example.i @@ -9,6 +9,9 @@ SWIG_exception(SWIG_RuntimeError, $1.msg); } +/* This needs to be defined for SWIG, even though it can't be used in C++ any more. */ +#define SWIG_THROW(...) throw(__VA_ARGS__) + /* Let's just grab the original header file here */ %include "example.h" From f42b0eaa7166e4ef708d511b8305075de23fd9cf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Nov 2021 01:55:46 +0100 Subject: [PATCH 418/508] Use different executable names for C and C++ examples Trying to create the same "runme" executable for both C and C++ examples could result in errors when using parallel make, as one of the targets could fail to write to the file being currently executed. Using separate names works around this problem. --- Examples/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 344eabcb8..5af51f8ec 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1374,10 +1374,10 @@ c_cpp: $(SRCDIR_SRCS) $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_compile_c: $(SRCDIR)$(RUNME).c - $(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME) -I. -I.. $< -L. -l$(TARGET) + $(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME)_$(RUNME_EXT) -I. -I.. $< -L. -l$(TARGET) c_compile_cxx: $(SRCDIR)$(RUNME).cxx - $(COMPILETOOL) $(CXX) $(CXXFLAGS) -o $(RUNME) -I. -I.. $< -L. -l$(TARGET) + $(COMPILETOOL) $(CXX) $(CXXFLAGS) -o $(RUNME)_$(RUNME_EXT) -I. -I.. $< -L. -l$(TARGET) $(eval c_compile: c_compile_$(RUNME_EXT)) @@ -1397,7 +1397,7 @@ c_syntax_check_cxx: # ----------------------------------------------------------------- c_run: c_compile - env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) ./$(RUNME) $(RUNPIPE) + env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) ./$(RUNME)_$(RUNME_EXT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display @@ -1414,7 +1414,7 @@ c_clean: rm -f *_wrap.[ch] *_wrap.cxx rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ - rm -f $(RUNME) + rm -f $(RUNME)_c $(RUNME)_cxx ################################################################## ##### SCILAB ###### From 43c7aefeb13ee2d9b663cfa5561a544a5827507c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Nov 2021 01:01:36 +0100 Subject: [PATCH 419/508] Don't leak namespace prefix variable No real changes, just delete a local variable. --- Source/Modules/c.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 4008bf8a9..fa8a9f44f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1218,6 +1218,8 @@ public: Swig_name_register("type", NewStringf("%s%%c", ns_prefix_)); } + Delete(ns_prefix_); + if (use_cxx_wrappers) { cxx_wrappers_.initialize(); } From f7f59f4648e81bc976ca20cb30b94e6f5ca45405 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Nov 2021 01:04:40 +0100 Subject: [PATCH 420/508] Rename module_prefix to just module_name It is used as a prefix, but it's really just the name of the module, so the new name is less confusing. There also doesn't seem to be any need to copy/delete it, just keep a pointer, it's not going to change. No real changes. --- Source/Modules/c.cxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index fa8a9f44f..8afbf9f2f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -907,8 +907,8 @@ class C:public Language { // Prefix used for all symbols, if non-null. If ns_cxx was specified, it is a mangled version of it. String *ns_prefix; - // Prefix for module-level symbols, currently just the module name. - String *module_prefix; + // Name of the module, used as a prefix for module-level symbols if ns_prefix is null. + String *module_name; // Used only while generating wrappers for an enum and contains the prefix to use for enum elements if non-null. String *enum_prefix; @@ -939,7 +939,7 @@ public: empty_string(NewString("")), ns_cxx(NULL), ns_prefix(NULL), - module_prefix(NULL), + module_name(NULL), cxx_class_wrapper_(NULL) { } @@ -948,7 +948,6 @@ public: { Delete(ns_cxx); Delete(ns_prefix); - Delete(module_prefix); } // Construct the name to be used for a function with the given name in C wrappers. @@ -992,7 +991,7 @@ public: ? scopename_prefix : ns_prefix ? ns_prefix - : module_prefix; + : module_name; wname.assign_owned(NewStringf("%s_%s", prefix, name)); return wname; @@ -1232,8 +1231,7 @@ public: * --------------------------------------------------------------------- */ virtual int top(Node *n) { - String *module = Getattr(n, "name"); - module_prefix = Copy(module); + module_name = Getattr(n, "name"); String *outfile = Getattr(n, "outfile"); // initialize I/O @@ -1274,7 +1272,7 @@ public: Swig_register_filebyname("cheader", f_wrappers_h); { - String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", Char(module)); + String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", module_name); String* const include_guard_begin = NewStringf( "#ifndef %s\n" "#define %s\n\n", @@ -1314,7 +1312,7 @@ public: if (!ns_cxx) { // We need some namespace for the C++ wrappers as otherwise their names could conflict with the C functions, so use the module name if nothing was // explicitly specified. - ns_cxx = Copy(module); + ns_cxx = Copy(module_name); } Printv(f_wrappers_h, "#ifdef __cplusplus\n\n", NIL); From 17fbb0a5286c8ca3212835f0069853a5f974c305 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Nov 2021 02:50:37 +0100 Subject: [PATCH 421/508] Include required headers for %imported modules We need the types from the imported modules, so #include the header generated for it. Unfortunately we have to half-guess the name used for that header, as it's not available anywhere (and can't really be, as it could be changed by a command line option used for another SWIG invocation that was used to compile that module), but this seems to work well enough in practice. In particular, this fixes failures in multi cpp tests, so that we don't need FAILING_MULTI_CPP_TESTS any longer. --- Examples/test-suite/c/Makefile.in | 8 +----- Examples/test-suite/import_fragments_a.i | 4 +-- Source/Modules/c.cxx | 32 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index d6e326cc3..31adc9eb5 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -89,12 +89,6 @@ FAILING_CPP_TESTS := \ cpp11_rvalue_reference3 \ cpp11_type_aliasing \ -FAILING_MULTI_CPP_TESTS := \ - clientdata_prop \ - imports \ - import_stl \ - template_typedef_import \ - # Ignore warnings about failing to apply typemaps because none are defined: # usually there is no need for special typemaps in C. char_binary.cpptest director_binary_string.cpptest li_typemaps.cpptest li_typemaps_apply.cpptest long_long_apply.cpptest: SWIGOPT += -w453 @@ -202,7 +196,7 @@ valuewrapper_const.cpptest \ valuewrapper_opaque.cpptest \ : SWIGOPT += -nocxx -%.multicpptest: SWIGOPT += -nocxx +%.multicpptest: SWIGOPT += -namespace $* %.cpptest: SWIGOPT += -namespace $* diff --git a/Examples/test-suite/import_fragments_a.i b/Examples/test-suite/import_fragments_a.i index 1babea95f..01167baec 100644 --- a/Examples/test-suite/import_fragments_a.i +++ b/Examples/test-suite/import_fragments_a.i @@ -1,5 +1,5 @@ -#if !defined(SWIGGO) -// Prevent Go from generating a Go module import - this test is not set up as true multiple modules +#if !defined(SWIGC) && !defined(SWIGGO) +// Prevent C/Go from generating a C include/Go module import - this test is not set up as true multiple modules %module import_fragments_a #endif diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8afbf9f2f..76c7d5cd1 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1361,6 +1361,38 @@ public: return SWIG_OK; } + /* ----------------------------------------------------------------------- + * importDirective() + * ------------------------------------------------------------------------ */ + + virtual int importDirective(Node *n) { + // When we import another module, we need access to its declarations in our header, so we must include the header generated for that module. Unfortunately + // there doesn't seem to be any good way to get the name of that header, so we try to guess it from the header name of this module. This is obviously not + // completely reliable, but works reasonably well in practice and it's not clear what else could we do, short of requiring some C-specific %import attribute + // specifying the name of the header explicitly. + + // First, find the top node. + for (Node* top = parentNode(n); top; top = parentNode(top)) { + if (Checkattr(top, "nodeType", "top")) { + // Get its header name. + scoped_dohptr header_name(Copy(Getattr(top, "outfile_h"))); + + // Strip the output directory from the file name, as it should be common to all generated headers. + Replace(header_name, SWIG_output_directory(), "", DOH_REPLACE_FIRST); + + // And replace our module name with the name of the one being imported. + Replace(header_name, module_name, imported_module_name, DOH_REPLACE_FIRST); + + // Finally inject inclusion of this header. + Printv(Swig_filebyname("cheader"), "#include \"", header_name.get(), "\"\n", NIL); + + break; + } + } + + return Language::importDirective(n); + } + /* ----------------------------------------------------------------------- * globalvariableHandler() * ------------------------------------------------------------------------ */ From 52f8412a4677346444f655d7034d4e4852f71e84 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Nov 2021 01:15:22 +0100 Subject: [PATCH 422/508] Simplify importDirective() code Don't bother finding the "top" node when we can just save the contents of its "outfile_h" attribute in top(), where we already use it (and we already save the module name). No real changes, just make the code simpler and marginally faster. This commit is best viewed ignoring whitespace-only changes. --- Source/Modules/c.cxx | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 76c7d5cd1..289f8fc77 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -910,6 +910,9 @@ class C:public Language { // Name of the module, used as a prefix for module-level symbols if ns_prefix is null. String *module_name; + // Name of the output header, set in top(). + String *outfile_h; + // Used only while generating wrappers for an enum and contains the prefix to use for enum elements if non-null. String *enum_prefix; @@ -940,6 +943,7 @@ public: ns_cxx(NULL), ns_prefix(NULL), module_name(NULL), + outfile_h(NULL), cxx_class_wrapper_(NULL) { } @@ -1244,7 +1248,7 @@ public: Swig_banner(f_wrappers_cxx); // Open the file where all wrapper declarations will be written to in the end. - String* const outfile_h = Getattr(n, "outfile_h"); + outfile_h = Getattr(n, "outfile_h"); const scoped_dohptr f_wrappers_h(NewFile(outfile_h, "w", SWIG_output_files())); if (!f_wrappers_h) { FileErrorDisplay(outfile_h); @@ -1371,23 +1375,19 @@ public: // completely reliable, but works reasonably well in practice and it's not clear what else could we do, short of requiring some C-specific %import attribute // specifying the name of the header explicitly. - // First, find the top node. - for (Node* top = parentNode(n); top; top = parentNode(top)) { - if (Checkattr(top, "nodeType", "top")) { - // Get its header name. - scoped_dohptr header_name(Copy(Getattr(top, "outfile_h"))); + // We can only do something if we have a module name. + if (String* const imported_module_name = Getattr(n, "module")) { + // Start with our header name. + scoped_dohptr header_name(Copy(outfile_h)); - // Strip the output directory from the file name, as it should be common to all generated headers. - Replace(header_name, SWIG_output_directory(), "", DOH_REPLACE_FIRST); + // Strip the output directory from the file name, as it should be common to all generated headers. + Replace(header_name, SWIG_output_directory(), "", DOH_REPLACE_FIRST); - // And replace our module name with the name of the one being imported. - Replace(header_name, module_name, imported_module_name, DOH_REPLACE_FIRST); + // And replace our module name with the name of the one being imported. + Replace(header_name, module_name, imported_module_name, DOH_REPLACE_FIRST); - // Finally inject inclusion of this header. - Printv(Swig_filebyname("cheader"), "#include \"", header_name.get(), "\"\n", NIL); - - break; - } + // Finally inject inclusion of this header. + Printv(Swig_filebyname("cheader"), "#include \"", header_name.get(), "\"\n", NIL); } return Language::importDirective(n); From 9a8ebbb9988817b8cc712602d33dd3a2b30e051c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Nov 2021 01:43:25 +0100 Subject: [PATCH 423/508] Throw SWIG_CException from C++ wrappers automatically Check for the pending exception after every call to a wrapper function not marked "noexcept" and throw a C++ exception if necessary. Add C++ version of the exception example to show how this works. Also change SWIG_CException to use member functions for checking for and resetting pending exceptions, this seems better than having separate functions for it and will make it easier to customize exception handling later by just replacing SWIG_CException class with something else. Note that we still use a global (and not a member) function for raising the exception, but this one is not exported at all, and needs to be a function in order to be easily callable from other modules (see the upcoming commit). --- Examples/c/exception/Makefile | 8 +- Examples/c/exception/runme.c | 6 +- Examples/c/exception/runme.cxx | 69 +++++++++++++ Examples/test-suite/c/exception_order_runme.c | 20 ++-- Lib/c/cexcept.swg | 45 ++++++--- Source/Modules/c.cxx | 96 +++++++++++++++++-- 6 files changed, 207 insertions(+), 37 deletions(-) create mode 100644 Examples/c/exception/runme.cxx diff --git a/Examples/c/exception/Makefile b/Examples/c/exception/Makefile index 7104242cc..b031415ad 100644 --- a/Examples/c/exception/Makefile +++ b/Examples/c/exception/Makefile @@ -5,10 +5,16 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i -check: build +check_c: build $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=c c_run +check_cxx: build + $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' RUNME_EXT=cxx c_run + +check: check_c check_cxx + build: $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ diff --git a/Examples/c/exception/runme.c b/Examples/c/exception/runme.c index 640b31c88..3cc64b620 100644 --- a/Examples/c/exception/runme.c +++ b/Examples/c/exception/runme.c @@ -8,10 +8,10 @@ #include "example_wrap.h" static void show_exception(const char* prefix) { - SWIG_CException* ex = example_SWIG_PendingException_get(); + SWIG_CException* ex = SWIG_CException_get_pending(); assert(ex); printf("%s exception: %s (%d)\n", prefix, SWIG_CException_msg_get(ex), SWIG_CException_code_get(ex)); - example_SWIG_PendingException_reset(); + SWIG_CException_reset_pending(); } int main() { @@ -32,7 +32,7 @@ int main() { int i; for (i = 0; i < 4; ++i) { Test_multi(t, i); - if (!example_SWIG_PendingException_get()) { + if (!SWIG_CException_get_pending()) { printf("Success for i=%d\n", i); } else { printf("For i=%d", i); diff --git a/Examples/c/exception/runme.cxx b/Examples/c/exception/runme.cxx new file mode 100644 index 000000000..1f4ce38a7 --- /dev/null +++ b/Examples/c/exception/runme.cxx @@ -0,0 +1,69 @@ +/* + * NOTE: this won't run with -noexcept flag + */ + +#include +#include + +#include "example_wrap.h" + +using Exception = example::SWIG_CException; + +static int exit_code = 0; + +static void show_exception(const char* prefix, Exception const& ex) { + printf("%s exception: %s (%d)\n", prefix, ex.msg(), ex.code()); +} + +static void missing_exception(const char* prefix) { + printf("*** ERROR: %s: expected exception not thrown.\n", prefix); + exit_code++; +} + +int main() { + example::Test t; + + try { + t.unknown(); + missing_exception("Unknown"); + } catch (Exception const& e) { + show_exception("Unknown", e); + } + + try { + t.simple(); + missing_exception("Int"); + } catch (Exception const& e) { + show_exception("Int", e); + } + + try { + t.message(); + missing_exception("String"); + } catch (Exception const& e) { + show_exception("String", e); + } + + try { + t.hosed(); + missing_exception("Custom"); + } catch (Exception const& e) { + show_exception("Custom", e); + } + + for (int i = 0; i < 4; ++i) { + try { + t.multi(i); + if (i == 0) { + printf("Success for i=%d\n", i); + } else { + missing_exception("Multi"); + } + } catch (Exception const& e) { + printf("For i=%d", i); + show_exception("", e); + } + } + + return exit_code; +} diff --git a/Examples/test-suite/c/exception_order_runme.c b/Examples/test-suite/c/exception_order_runme.c index 2c6e14035..a4ca46522 100644 --- a/Examples/test-suite/c/exception_order_runme.c +++ b/Examples/test-suite/c/exception_order_runme.c @@ -7,38 +7,38 @@ int main() { exception_order_A* a = exception_order_A_new(); exception_order_A_foo(a); - if (!exception_order_SWIG_PendingException_get()) { + if (!exception_order_SWIG_CException_get_pending()) { fprintf(stderr, "foo: bad exception order\n"); } else { - exception_order_SWIG_PendingException_reset(); + exception_order_SWIG_CException_reset_pending(); } exception_order_A_bar(a); - if (!exception_order_SWIG_PendingException_get()) { + if (!exception_order_SWIG_CException_get_pending()) { fprintf(stderr, "bar: bad exception order\n"); } else { - exception_order_SWIG_PendingException_reset(); + exception_order_SWIG_CException_reset_pending(); } exception_order_A_foobar(a); - if (!exception_order_SWIG_PendingException_get()) { + if (!exception_order_SWIG_CException_get_pending()) { fprintf(stderr, "foobar: bad exception order\n"); } else { - exception_order_SWIG_PendingException_reset(); + exception_order_SWIG_CException_reset_pending(); } exception_order_A_barfoo(a, 1); - if (!exception_order_SWIG_PendingException_get()) { + if (!exception_order_SWIG_CException_get_pending()) { fprintf(stderr, "barfoo(1): bad exception order\n"); } else { - exception_order_SWIG_PendingException_reset(); + exception_order_SWIG_CException_reset_pending(); } exception_order_A_barfoo(a, 2); - if (!exception_order_SWIG_PendingException_get()) { + if (!exception_order_SWIG_CException_get_pending()) { fprintf(stderr, "barfoo(2): bad exception order\n"); } else { - exception_order_SWIG_PendingException_reset(); + exception_order_SWIG_CException_reset_pending(); } exit(0); diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index dc3709e8c..9f6f00b3f 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -4,39 +4,58 @@ * Exception handling code and typemaps for C module. * ----------------------------------------------------------------------------- */ -%ignore SWIG_CException::SWIG_CException; +// This function is special: it's used by various typemaps (via SWIG_exception +// macro below) and needs to be defined, but we don't want to export it. +%ignore SWIG_CException_Raise; +%{ +extern "C" void SWIG_CException_Raise(int code, const char* msg); +%} %inline %{ class SWIG_CException { public: - SWIG_CException(int code, const char* msg) : code(code), msg(strdup(msg)) { } + SWIG_CException(const SWIG_CException& ex) throw() : code(ex.code), msg(strdup(ex.msg)) { } const int code; const char* const msg; -private: - friend void SWIG_PendingException_reset(); + static SWIG_CException* get_pending() throw() { + return PendingException; + } + static void reset_pending() throw() { + if (PendingException) { + delete PendingException; + PendingException = 0; + } + } + +private: + friend void SWIG_CException_Raise(int code, const char* msg); + + static SWIG_CException* PendingException; + + SWIG_CException(int code, const char* msg) : code(code), msg(strdup(msg)) { } ~SWIG_CException() { free(const_cast(msg)); } - SWIG_CException(const SWIG_CException& ex); SWIG_CException& operator=(const SWIG_CException& ex); }; +%} -static SWIG_CException *SWIG_PendingException = 0; -inline SWIG_CException* SWIG_PendingException_get() { return SWIG_PendingException; } -inline void SWIG_PendingException_reset() { - if (SWIG_PendingException) { - delete SWIG_PendingException; - SWIG_PendingException = 0; - } +// This part is implementation only and doesn't need to be seen by SWIG. +%{ +SWIG_CException *SWIG_CException::PendingException = 0; + +SWIGEXPORTC void SWIG_CException_Raise(int code, const char* msg) { + delete SWIG_CException::PendingException; + SWIG_CException::PendingException = new SWIG_CException(code, msg); } %} %insert("runtime") "swigerrors.swg" #define SWIG_exception(code, msg)\ - SWIG_PendingException = new SWIG_CException(code, msg) + SWIG_CException_Raise(code, msg) %typemap(throws, noblock="1") char *, const char * { SWIG_exception(SWIG_RuntimeError, $1); diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 289f8fc77..8691db6fd 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -223,17 +223,51 @@ String* get_c_proxy_name(Node* n) { struct cxx_wrappers { // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. - cxx_wrappers() : f_fwd_decls(NULL), f_decls(NULL), f_impls(NULL) {} + cxx_wrappers() : + except_check_start("swig_check("), except_check_end(")"), + f_fwd_decls(NULL), f_decls(NULL), f_impls(NULL) { + } + + // This can be called before initialize() to disable generating exception support code. + void disable_exceptions() { + assert(!f_fwd_decls); // Check we are not called too late. + + except_check_start = + except_check_end = ""; + } void initialize() { f_fwd_decls = NewStringEmpty(); f_decls = NewStringEmpty(); f_impls = NewStringEmpty(); + + // Generate the functions which will be used in all wrappers to check for the exceptions if necessary. + if (*except_check_start != '\0') { + Printv(f_impls, + "void swig_check() {\n", + cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", + cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", + cindent, cindent, "SWIG_CException::reset_pending();\n", + cindent, cindent, "throw swig_ex_copy;\n", + cindent, "}\n", + "}\n\n", + "template T swig_check(T x) {\n", + cindent, "swig_check();\n", + cindent, "return x;\n", + "}\n\n", + NIL + ); + } } bool is_initialized() const { return f_fwd_decls != NULL; } + // Used for generating exception checks around the calls unless disable_exceptions() is called. + const char* except_check_start; + const char* except_check_end; + + // The order of the members here is the same as the order in which they appear in the output file. // Forward declarations of the classes. @@ -324,7 +358,6 @@ public: // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. - const char* maybe_return; type_desc rtype_desc; if (SwigType_type(Getattr(n, "type")) != T_VOID) { rtype_desc = lookup_cxx_ret_type(n); @@ -336,12 +369,9 @@ public: ); return; } - - maybe_return = "return "; } else { // There is no need to do anything else with "void" and we don't even need "return" for it. rtype_desc.set_void_type(); - maybe_return = ""; } // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. @@ -393,6 +423,17 @@ public: Printv(parms_call, ptype_desc.wrap_start(), name, ptype_desc.wrap_end(), NIL); } + // Avoid checking for exceptions unnecessarily. Note that this is more than an optimization: we'd get into infinite recursion if we checked for exceptions + // thrown by members of SWIG_CException itself if we didn't do it. + const char* except_check_start = cxx_wrappers_.except_check_start; + const char* except_check_end = cxx_wrappers_.except_check_end; + if (*except_check_start) { + if (Checkattr(n, "noexcept", "true") || (Checkattr(n, "throw", "1") && !Getattr(n, "throws"))) { + except_check_start = + except_check_end = ""; + } + } + // For some reason overloaded functions use fully-qualified name, so we can't just use the name directly. scoped_dohptr name_ptr(Swig_scopename_last(Getattr(n, "name"))); String* const name = name_ptr.get(); @@ -448,7 +489,11 @@ public: Printv(cxx_wrappers_.f_impls, "inline ", classname, "::", classname, "(", parms_cxx.get(), ") : ", - classname, "{", wname, "(", parms_call.get(), ")} {}\n", + classname, "{", + except_check_start, + wname, "(", parms_call.get(), ")", + except_check_end, + "} {}\n", NIL ); @@ -501,10 +546,36 @@ public: classname, "::", name, "(", parms_cxx.get(), ")", get_const_suffix(n), " { ", - maybe_return, - rtype_desc.wrap_start(), - wname, "(", wparms.get(), ")", - rtype_desc.wrap_end(), + NIL + ); + + if (rtype_desc.is_void()) { + Printv(cxx_wrappers_.f_impls, + wname, "(", wparms.get(), ")", + NIL + ); + + if (*except_check_start) { + Printv(cxx_wrappers_.f_impls, + "; ", + except_check_start, + except_check_end, + NIL + ); + } + } else { + Printv(cxx_wrappers_.f_impls, + "return ", + rtype_desc.wrap_start(), + except_check_start, + wname, "(", wparms.get(), ")", + except_check_end, + rtype_desc.wrap_end(), + NIL + ); + } + + Printv(cxx_wrappers_.f_impls, "; }\n", NIL ); @@ -662,6 +733,8 @@ private: void set_type(String* type) { type_ = Copy(type); } void set_void_type() { type_ = NewString("void"); } + bool is_void() const { return type_ && Cmp(type_, "void") == 0; } + // If this one returns NULL, it means that we don't have any type information at all. String* type() const { return type_; } @@ -1224,6 +1297,9 @@ public: Delete(ns_prefix_); if (use_cxx_wrappers) { + if (!except_flag) + cxx_wrappers_.disable_exceptions(); + cxx_wrappers_.initialize(); } From 727a65c0e81ff347d64bb10a9489fd4883d5bc7e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Nov 2021 21:14:56 +0100 Subject: [PATCH 424/508] Fix using exception in modules importing other modules Ensure that we have only a single SWIG_CException_Raise() function across all modules instead of having per-module functions and, worse, per-module PendingException variables, which resulted in compile-time errors and couldn't work anyhow because function checking for the current exception didn't necessarily use the same "global" variable where it was stored. More formally, old version resulted in ODR violations and undefined behaviour. The way we avoid it now is rather ugly and consists in excluding SWIG_CException from wrapping using the hack in the source code which postpones wrapping this class until the very end and checks if we had encountered any %import directives and simply doesn't wrap it if we did. The same code is used to define the special SWIG_CException_DEFINED preprocessor symbol which is then used in the generated code to prevent the SWIG_CException class declaration from being compiled as part of the wrapper too (because this still happens due to %inline being used for its definition, and there doesn't seem to be any better way to avoid this). This is definitely not pretty, but at least adding "throw(char*)" to a couple of functions in mod_[ab].i test suite files works now instead of failing (even without linking and running) as before. This commit doesn't modify the test suite to avoid possible problems with the other languages, however. --- Lib/c/cexcept.swg | 10 ++++++++++ Source/Modules/c.cxx | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index 9f6f00b3f..7fb6252c4 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -11,7 +11,14 @@ extern "C" void SWIG_CException_Raise(int code, const char* msg); %} +// This class is special too because its name is used in c.cxx source. It is +// only defined if the code there didn't predefine SWIG_CException_DEFINED +// because the class is already defined in another module. +// +// It has to be seen by SWIG because we want to generate wrappers for its +// public functions to be able to use it from the application code. %inline %{ +#ifndef SWIG_CException_DEFINED class SWIG_CException { public: SWIG_CException(const SWIG_CException& ex) throw() : code(ex.code), msg(strdup(ex.msg)) { } @@ -40,16 +47,19 @@ private: SWIG_CException& operator=(const SWIG_CException& ex); }; +#endif // SWIG_CException_DEFINED %} // This part is implementation only and doesn't need to be seen by SWIG. %{ +#ifndef SWIG_CException_DEFINED SWIG_CException *SWIG_CException::PendingException = 0; SWIGEXPORTC void SWIG_CException_Raise(int code, const char* msg) { delete SWIG_CException::PendingException; SWIG_CException::PendingException = new SWIG_CException(code, msg); } +#endif // SWIG_CException_DEFINED %} %insert("runtime") "swigerrors.swg" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8691db6fd..a4327629b 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -240,10 +240,12 @@ struct cxx_wrappers f_fwd_decls = NewStringEmpty(); f_decls = NewStringEmpty(); f_impls = NewStringEmpty(); + } + void output_exception_support(File* f_out) { // Generate the functions which will be used in all wrappers to check for the exceptions if necessary. if (*except_check_start != '\0') { - Printv(f_impls, + Printv(f_out, "void swig_check() {\n", cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", @@ -1005,6 +1007,10 @@ class C:public Language { // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. cxx_class_wrapper* cxx_class_wrapper_; + // Non-owning, possibly null pointer to SWIG_CException class node. We only wrap this class if we don't import any other modules because there must be only + // one pending exception pointer for the entire module, not one per each of its submodules. + Node* exception_class_node_; + public: /* ----------------------------------------------------------------------------- @@ -1017,7 +1023,8 @@ public: ns_prefix(NULL), module_name(NULL), outfile_h(NULL), - cxx_class_wrapper_(NULL) + cxx_class_wrapper_(NULL), + exception_class_node_(NULL) { } @@ -1380,6 +1387,11 @@ public: // emit code for children Language::top(n); + + if (exception_class_node_) { + // Really emit the wrappers for the exception class now that we know that we need it. + Language::classDeclaration(exception_class_node_); + } } // close extern "C" guards Dump(f_wrappers_types, f_wrappers_h); @@ -1424,6 +1436,11 @@ public: Printv(f_wrappers_h, "\n", NIL); Dump(cxx_wrappers_.f_decls, f_wrappers_h); + // Also emit C++-specific exceptions support if not done in another module yet. + if (exception_class_node_) { + cxx_wrappers_.output_exception_support(f_wrappers_h); + } + Printv(f_wrappers_h, "\n", NIL); Dump(cxx_wrappers_.f_impls, f_wrappers_h); @@ -1464,6 +1481,11 @@ public: // Finally inject inclusion of this header. Printv(Swig_filebyname("cheader"), "#include \"", header_name.get(), "\"\n", NIL); + + // One more thing: if we have imported another module, it must have already defined SWIG_CException, so set the flag indicating that we shouldn't do it + // again in this one and define the symbol to skip compiling its implementation. + exception_class_node_ = NULL; + Printv(Swig_filebyname("runtime"), "#define SWIG_CException_DEFINED 1\n", NIL); } return Language::importDirective(n); @@ -2168,6 +2190,22 @@ public: } } + /* --------------------------------------------------------------------- + * classDeclaration() + * --------------------------------------------------------------------- */ + + virtual int classDeclaration(Node *n) { + if (Cmp(Getattr(n, "name"), "SWIG_CException") == 0) { + // We don't know if we're going to need to wrap this class or not yet, it depends on whether any other modules are included by this one, and while we + // could walk the entire tree looking for "import" nodes, it seems simpler to just wait until our importDirective() is called and handle this class at the + // end in top() if it won't have been. + exception_class_node_ = n; + return SWIG_NOWRAP; + } + + return Language::classDeclaration(n); + } + /* --------------------------------------------------------------------- * classHandler() * --------------------------------------------------------------------- */ From 9dd1301ec4d2508d95d55a602072bd39fb230780 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Nov 2021 01:56:29 +0100 Subject: [PATCH 425/508] Improve the fix for exceptions support with multiple modules The approach of the parent commit almost worked, but broke down if the main module itself redefined typemaps for SWIGTYPE, as this broke generation of SWIG_CException wrappers when we finally did it at the end. This probably could be salvaged by explicitly defining the typemaps for SWIG_CException itself and also "int" and "char*", used for its functions, but this just seems too fragile so switch to a different approach instead: examine the parse tree immediately when starting generation to check if it contains any %imports, and decide whether we need to generate exceptions support in this module based on this. New version seems more robust and easier to understand, and is probably not noticeably slower. Still keep the one in the previous commit just in case we need/want to return to it later -- but keep in min the typemap redefinition problem described above if we do it. --- Source/Modules/c.cxx | 145 ++++++++++++++++++++++++++----------------- 1 file changed, 88 insertions(+), 57 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index a4327629b..19083e1b8 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -29,6 +29,12 @@ int SwigType_isbuiltin(SwigType *t) { namespace { +enum exceptions_support { + exceptions_support_enabled, // Default value in C++ mode. + exceptions_support_disabled, // Not needed at all. + exceptions_support_imported // Needed, but already defined in an imported module. +}; + // When using scoped_dohptr, it's very simple to accidentally pass it to a vararg function, such as Printv() or Printf(), resulting in catastrophic results // during run-time (crash or, worse, junk in the generated output), so make sure gcc warning about this, which is not enabled by default for some reason (see // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64867 for more information), is enabled. @@ -216,6 +222,26 @@ String* get_c_proxy_name(Node* n) { return proxyname; } +// Returns the first named "import" node under the given one (which must be non-NULL). May return NULL. +Node* find_first_named_import(Node* parent) { + for (Node* n = firstChild(parent); n; n = nextSibling(n)) { + if (Cmp(nodeType(n), "import") == 0) { + // We've almost succeeded, but there are sometimes some weird unnamed import modules that don't really count for our purposes, so skip them. + if (Getattr(n, "module")) + return n; + } else if (Cmp(nodeType(n), "include") == 0) { + // Recurse into this node as included files may contain imports too. + if (Node* const import = find_first_named_import(n)) + return import; + } else { + // We consider that import nodes can only occur in the global scope, some don't bother recursing here. If this turns out to be false, we'd just need to + // start doing it. + } + } + + return NULL; +} + /* Struct containing information needed only for generating C++ wrappers. @@ -224,48 +250,56 @@ struct cxx_wrappers { // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. cxx_wrappers() : - except_check_start("swig_check("), except_check_end(")"), + except_check_start(NULL), except_check_end(NULL), f_fwd_decls(NULL), f_decls(NULL), f_impls(NULL) { } - // This can be called before initialize() to disable generating exception support code. - void disable_exceptions() { - assert(!f_fwd_decls); // Check we are not called too late. - - except_check_start = - except_check_end = ""; - } - void initialize() { f_fwd_decls = NewStringEmpty(); f_decls = NewStringEmpty(); f_impls = NewStringEmpty(); } - void output_exception_support(File* f_out) { - // Generate the functions which will be used in all wrappers to check for the exceptions if necessary. - if (*except_check_start != '\0') { - Printv(f_out, - "void swig_check() {\n", - cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", - cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", - cindent, cindent, "SWIG_CException::reset_pending();\n", - cindent, cindent, "throw swig_ex_copy;\n", - cindent, "}\n", - "}\n\n", - "template T swig_check(T x) {\n", - cindent, "swig_check();\n", - cindent, "return x;\n", - "}\n\n", - NIL - ); + // This function must be called after initialize(). The two can't be combined because we don't yet know if we're going to use exceptions or not when we + // initialize the object of this class in C::main(), so this one is called later from C::top(). + void initialize_exceptions(exceptions_support support) { + switch (support) { + case exceptions_support_enabled: + // Generate the functions which will be used in all wrappers to check for the exceptions only in this case, i.e. do not do it if they're already defined + // in another module imported by this one. + Printv(f_impls, + "void swig_check() {\n", + cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", + cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", + cindent, cindent, "SWIG_CException::reset_pending();\n", + cindent, cindent, "throw swig_ex_copy;\n", + cindent, "}\n", + "}\n\n", + "template T swig_check(T x) {\n", + cindent, "swig_check();\n", + cindent, "return x;\n", + "}\n\n", + NIL + ); + + // fall through + + case exceptions_support_imported: + except_check_start = "swig_check("; + except_check_end = ")"; + break; + + case exceptions_support_disabled: + except_check_start = + except_check_end = ""; + break; } } bool is_initialized() const { return f_fwd_decls != NULL; } - // Used for generating exception checks around the calls unless disable_exceptions() is called. + // Used for generating exception checks around the calls, see initialize_exceptions(). const char* except_check_start; const char* except_check_end; @@ -1001,16 +1035,15 @@ class C:public Language { output_wrapper_def } current_output; + // Selects between various kinds of needed support for exception-related code. + exceptions_support exceptions_support_; + // This object contains information necessary only for C++ wrappers generation, use its is_initialized() to check if this is being done. cxx_wrappers cxx_wrappers_; // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. cxx_class_wrapper* cxx_class_wrapper_; - // Non-owning, possibly null pointer to SWIG_CException class node. We only wrap this class if we don't import any other modules because there must be only - // one pending exception pointer for the entire module, not one per each of its submodules. - Node* exception_class_node_; - public: /* ----------------------------------------------------------------------------- @@ -1023,8 +1056,7 @@ public: ns_prefix(NULL), module_name(NULL), outfile_h(NULL), - cxx_class_wrapper_(NULL), - exception_class_node_(NULL) + cxx_class_wrapper_(NULL) { } @@ -1303,12 +1335,10 @@ public: Delete(ns_prefix_); - if (use_cxx_wrappers) { - if (!except_flag) - cxx_wrappers_.disable_exceptions(); + exceptions_support_ = except_flag ? exceptions_support_enabled : exceptions_support_disabled; + if (use_cxx_wrappers) cxx_wrappers_.initialize(); - } allow_overloading(); } @@ -1358,6 +1388,23 @@ public: // This one is C-specific and goes directly to the output header file. Swig_register_filebyname("cheader", f_wrappers_h); + // Deal with exceptions support. + if (exceptions_support_ == exceptions_support_enabled) { + // We need to check if we have any %imported modules, as they would already define the exception support code and we want to have exactly one copy of it + // in the generated shared library, so check for "import" nodes. + if (find_first_named_import(n)) { + // We import another module, which will have already defined SWIG_CException, so set the flag indicating that we shouldn't do it again in this one and + // define the symbol to skip compiling its implementation. + Printv(f_runtime, "#define SWIG_CException_DEFINED 1\n", NIL); + + // Also set a flag telling classDeclaration() to skip creating SWIG_CException wrappers. + exceptions_support_ = exceptions_support_imported; + } + } + + if (cxx_wrappers_.is_initialized()) + cxx_wrappers_.initialize_exceptions(exceptions_support_); + { String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", module_name); String* const include_guard_begin = NewStringf( @@ -1387,11 +1434,6 @@ public: // emit code for children Language::top(n); - - if (exception_class_node_) { - // Really emit the wrappers for the exception class now that we know that we need it. - Language::classDeclaration(exception_class_node_); - } } // close extern "C" guards Dump(f_wrappers_types, f_wrappers_h); @@ -1436,11 +1478,6 @@ public: Printv(f_wrappers_h, "\n", NIL); Dump(cxx_wrappers_.f_decls, f_wrappers_h); - // Also emit C++-specific exceptions support if not done in another module yet. - if (exception_class_node_) { - cxx_wrappers_.output_exception_support(f_wrappers_h); - } - Printv(f_wrappers_h, "\n", NIL); Dump(cxx_wrappers_.f_impls, f_wrappers_h); @@ -1481,11 +1518,6 @@ public: // Finally inject inclusion of this header. Printv(Swig_filebyname("cheader"), "#include \"", header_name.get(), "\"\n", NIL); - - // One more thing: if we have imported another module, it must have already defined SWIG_CException, so set the flag indicating that we shouldn't do it - // again in this one and define the symbol to skip compiling its implementation. - exception_class_node_ = NULL; - Printv(Swig_filebyname("runtime"), "#define SWIG_CException_DEFINED 1\n", NIL); } return Language::importDirective(n); @@ -2196,11 +2228,10 @@ public: virtual int classDeclaration(Node *n) { if (Cmp(Getattr(n, "name"), "SWIG_CException") == 0) { - // We don't know if we're going to need to wrap this class or not yet, it depends on whether any other modules are included by this one, and while we - // could walk the entire tree looking for "import" nodes, it seems simpler to just wait until our importDirective() is called and handle this class at the - // end in top() if it won't have been. - exception_class_node_ = n; - return SWIG_NOWRAP; + // Ignore this class only if it was already wrapped in another module, imported from this one (if exceptions are disabled, we shouldn't be even parsing + // SWIG_CException in the first place and if they're enabled, we handle it normally). + if (exceptions_support_ == exceptions_support_imported) + return SWIG_NOWRAP; } return Language::classDeclaration(n); From c7fa9126ce2abf6c8ba5799380c3415972d541dc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Nov 2021 02:34:09 +0100 Subject: [PATCH 426/508] Use a unique prefix for SWIG_CException_Raise() This allows using different modules generated by SWIG in the same process without conflicts. --- Source/Modules/c.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 19083e1b8..8a47e8ac7 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1390,6 +1390,14 @@ public: // Deal with exceptions support. if (exceptions_support_ == exceptions_support_enabled) { + // Redefine SWIG_CException_Raise() to have a unique prefix in the shared library built from SWIG-generated sources to allow using more than one extension + // in the same process without conflicts. This has to be done in this hackish way because we really need to change the name of the function itself, not + // its wrapper (which is not even generated). + Printv(f_runtime, + "#define SWIG_CException_Raise ", (ns_prefix ? ns_prefix : module_name), "_SWIG_CException_Raise\n", + NIL + ); + // We need to check if we have any %imported modules, as they would already define the exception support code and we want to have exactly one copy of it // in the generated shared library, so check for "import" nodes. if (find_first_named_import(n)) { From 38b76bb7c63f397c5164cf4619da88706e73ff43 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Nov 2021 19:03:46 +0100 Subject: [PATCH 427/508] Make global SWIG_CException::PendingException thread-local This allows different threads to use the same library concurrently without corrupting each other's exceptions. Note that this requires C++11 support for wrapper compilation too. If this really turns out to be a problem, we could always just #define thread_local as compiler-specific equivalent such as "__thread" for gcc or "__declspec(thread)" for MSVC, which are available since forever. --- Lib/c/cexcept.swg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index 7fb6252c4..3a317d65e 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -40,7 +40,7 @@ public: private: friend void SWIG_CException_Raise(int code, const char* msg); - static SWIG_CException* PendingException; + static thread_local SWIG_CException* PendingException; SWIG_CException(int code, const char* msg) : code(code), msg(strdup(msg)) { } ~SWIG_CException() { free(const_cast(msg)); } @@ -53,7 +53,7 @@ private: // This part is implementation only and doesn't need to be seen by SWIG. %{ #ifndef SWIG_CException_DEFINED -SWIG_CException *SWIG_CException::PendingException = 0; +thread_local SWIG_CException *SWIG_CException::PendingException = 0; SWIGEXPORTC void SWIG_CException_Raise(int code, const char* msg) { delete SWIG_CException::PendingException; From aa0df5faa08f5c598d0627dd432121c5d1d25d0c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 01:03:12 +0100 Subject: [PATCH 428/508] Make swig_check() inline as it should have always been Fix link errors when including the generated header from more than one translation unit. --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8a47e8ac7..e3bd64974 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -268,7 +268,7 @@ struct cxx_wrappers // Generate the functions which will be used in all wrappers to check for the exceptions only in this case, i.e. do not do it if they're already defined // in another module imported by this one. Printv(f_impls, - "void swig_check() {\n", + "inline void swig_check() {\n", cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", cindent, cindent, "SWIG_CException::reset_pending();\n", From 55dc976b9fe6273073c741f718bf923532eb0998 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 15:35:39 +0100 Subject: [PATCH 429/508] Use "noexcept for internal ctor and special move operators No real changes, but just make the trivial non-throwing members explicitly noexcept. --- Source/Modules/c.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index e3bd64974..8b5cccede 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -639,7 +639,7 @@ public: Printv(cxx_wrappers_.f_decls, "\n", cindent, "explicit ", classname, "(", c_class_ptr.get(), " swig_self, " - "bool swig_owns_self = true) : ", + "bool swig_owns_self = true) noexcept : ", NIL ); @@ -687,11 +687,11 @@ public: ); } else { Printv(cxx_wrappers_.f_decls, - cindent, classname, "(", classname, "&& obj) : " + cindent, classname, "(", classname, "&& obj) noexcept : " "swig_self_{obj.swig_self_}, swig_owns_self_{obj.swig_owns_self_} { " "obj.swig_owns_self_ = false; " "}\n", - cindent, classname, "& operator=(", classname, "&& obj) { " + cindent, classname, "& operator=(", classname, "&& obj) noexcept { " "swig_self_ = obj.swig_self_; swig_owns_self_ = obj.swig_owns_self_; " "obj.swig_owns_self_ = false; " "return *this; " From c02738270ba5ace332987ecc8d5299631f1c3e4c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 15:40:47 +0100 Subject: [PATCH 430/508] Rename cxx_wrappers::f_fwd_decls to f_types This section will contain other types declarations too soon, so rename it in preparation for it. No real changes so far. --- Source/Modules/c.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8b5cccede..47e25e45a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -251,11 +251,11 @@ struct cxx_wrappers // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. cxx_wrappers() : except_check_start(NULL), except_check_end(NULL), - f_fwd_decls(NULL), f_decls(NULL), f_impls(NULL) { + f_types(NULL), f_decls(NULL), f_impls(NULL) { } void initialize() { - f_fwd_decls = NewStringEmpty(); + f_types = NewStringEmpty(); f_decls = NewStringEmpty(); f_impls = NewStringEmpty(); } @@ -296,7 +296,7 @@ struct cxx_wrappers } } - bool is_initialized() const { return f_fwd_decls != NULL; } + bool is_initialized() const { return f_types != NULL; } // Used for generating exception checks around the calls, see initialize_exceptions(). @@ -306,8 +306,8 @@ struct cxx_wrappers // The order of the members here is the same as the order in which they appear in the output file. - // Forward declarations of the classes. - File* f_fwd_decls; + // This section contains forward declarations of the classes. + File* f_types; // Full declarations of the classes. File* f_decls; @@ -358,7 +358,7 @@ public: Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); } - Printv(cxx_wrappers_.f_fwd_decls, + Printv(cxx_wrappers_.f_types, "class ", Getattr(n, "sym:name"), ";\n", NIL ); @@ -1481,7 +1481,7 @@ public: } Printv(f_wrappers_h, "\n", NIL); - Dump(cxx_wrappers_.f_fwd_decls, f_wrappers_h); + Dump(cxx_wrappers_.f_types, f_wrappers_h); Printv(f_wrappers_h, "\n", NIL); Dump(cxx_wrappers_.f_decls, f_wrappers_h); From 1087e250d6c9b8a01db4a9c9c64c2ae8414c5bb7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 15:48:02 +0100 Subject: [PATCH 431/508] Fix long-standing confusion between Files and Strings Don't use "f_" prefix and "File *" type for the variables that are strings and not files. Use "sect_" prefix, which means "section", and "String *" for them. This finally stops using misleading types (even if they all map to "void*" anyhow) for the variables, which could result in using file-only functions with non-files or string-only functions (e.g. Append()) with two "f_" variables, only for it to work with one of them but not the other (which was a real file, unlike the first one). No real changes, this just clarifies the types. --- Source/Modules/c.cxx | 166 +++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 47e25e45a..9cf1b7195 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -251,13 +251,13 @@ struct cxx_wrappers // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. cxx_wrappers() : except_check_start(NULL), except_check_end(NULL), - f_types(NULL), f_decls(NULL), f_impls(NULL) { + sect_types(NULL), sect_decls(NULL), sect_impls(NULL) { } void initialize() { - f_types = NewStringEmpty(); - f_decls = NewStringEmpty(); - f_impls = NewStringEmpty(); + sect_types = NewStringEmpty(); + sect_decls = NewStringEmpty(); + sect_impls = NewStringEmpty(); } // This function must be called after initialize(). The two can't be combined because we don't yet know if we're going to use exceptions or not when we @@ -267,7 +267,7 @@ struct cxx_wrappers case exceptions_support_enabled: // Generate the functions which will be used in all wrappers to check for the exceptions only in this case, i.e. do not do it if they're already defined // in another module imported by this one. - Printv(f_impls, + Printv(sect_impls, "inline void swig_check() {\n", cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", @@ -296,7 +296,7 @@ struct cxx_wrappers } } - bool is_initialized() const { return f_types != NULL; } + bool is_initialized() const { return sect_types != NULL; } // Used for generating exception checks around the calls, see initialize_exceptions(). @@ -307,19 +307,19 @@ struct cxx_wrappers // The order of the members here is the same as the order in which they appear in the output file. // This section contains forward declarations of the classes. - File* f_types; + String* sect_types; // Full declarations of the classes. - File* f_decls; + String* sect_decls; // Implementation of the classes. - File* f_impls; + String* sect_impls; }; /* cxx_class_wrapper - Outputs the declaration of the class wrapping the given one if we're generating C++ wrappers, i.e. if the provided File is not null. + Outputs the declaration of the class wrapping the given one if we're generating C++ wrappers, i.e. if the provided cxx_wrappers object is initialized. */ class cxx_class_wrapper { @@ -358,12 +358,12 @@ public: Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); } - Printv(cxx_wrappers_.f_types, + Printv(cxx_wrappers_.sect_types, "class ", Getattr(n, "sym:name"), ";\n", NIL ); - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, "class ", Getattr(n, "sym:name"), base_classes.get(), " {\n" "public:\n", NIL @@ -479,7 +479,7 @@ public: if (Checkattr(n, "kind", "variable")) { if (Checkattr(n, "memberget", "1")) { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, rtype_desc.type(), " ", name, "() const " "{ ", "return ", rtype_desc.wrap_start(), @@ -489,13 +489,13 @@ public: NIL ); } else if (Checkattr(n, "memberset", "1")) { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, "void ", name, "(", parms_cxx.get(), ") " "{ ", Getattr(n, "sym:name"), "(swig_self(), ", parms_call.get(), "); }\n", NIL ); } else if (Checkattr(n, "varget", "1")) { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, "static ", rtype_desc.type(), " ", name, "() " "{ ", "return ", rtype_desc.wrap_start(), @@ -505,7 +505,7 @@ public: NIL ); } else if (Checkattr(n, "varset", "1")) { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, "static void ", name, "(", parms_cxx.get(), ") " "{ ", Getattr(n, "sym:name"), "(", parms_call.get(), "); }\n", NIL @@ -518,12 +518,12 @@ public: } } else if (is_ctor) { // Delegate to the ctor from opaque C pointer taking ownership of the object. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, classname, "(", parms_cxx.get(), ");\n", NIL ); - Printv(cxx_wrappers_.f_impls, + Printv(cxx_wrappers_.sect_impls, "inline ", classname, "::", classname, "(", parms_cxx.get(), ") : ", classname, "{", except_check_start, @@ -539,7 +539,7 @@ public: } else if (Checkattr(n, "nodeType", "destructor")) { if (first_base_) { // Delete the pointer and reset the ownership flag to ensure that the base class doesn't do it again. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, get_virtual_prefix(n), "~", classname, "() {\n", cindent, cindent, "if (swig_owns_self_) {\n", cindent, cindent, cindent, wname, "(swig_self());\n", @@ -550,7 +550,7 @@ public: ); } else { // Slightly simplified version for classes without base classes, as we don't need to reset swig_self_ then. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, get_virtual_prefix(n), "~", classname, "() {\n", cindent, cindent, "if (swig_owns_self_)\n", cindent, cindent, cindent, wname, "(swig_self_);\n", @@ -569,7 +569,7 @@ public: Append(wparms, parms_call); } - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, is_static ? "static " : get_virtual_prefix(n), rtype_desc.type(), " ", name, "(", parms_cxx.get(), ")", @@ -577,7 +577,7 @@ public: NIL ); - Printv(cxx_wrappers_.f_impls, + Printv(cxx_wrappers_.sect_impls, "inline ", rtype_desc.type(), " ", classname, "::", name, "(", parms_cxx.get(), ")", get_const_suffix(n), @@ -586,13 +586,13 @@ public: ); if (rtype_desc.is_void()) { - Printv(cxx_wrappers_.f_impls, + Printv(cxx_wrappers_.sect_impls, wname, "(", wparms.get(), ")", NIL ); if (*except_check_start) { - Printv(cxx_wrappers_.f_impls, + Printv(cxx_wrappers_.sect_impls, "; ", except_check_start, except_check_end, @@ -600,7 +600,7 @@ public: ); } } else { - Printv(cxx_wrappers_.f_impls, + Printv(cxx_wrappers_.sect_impls, "return ", rtype_desc.wrap_start(), except_check_start, @@ -611,7 +611,7 @@ public: ); } - Printv(cxx_wrappers_.f_impls, + Printv(cxx_wrappers_.sect_impls, "; }\n", NIL ); @@ -636,7 +636,7 @@ public: // We need to generate a ctor from the C object pointer, which is required to be able to create objects of this class from pointers created by C wrappers // and also by any derived classes. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, "\n", cindent, "explicit ", classname, "(", c_class_ptr.get(), " swig_self, " "bool swig_owns_self = true) noexcept : ", @@ -646,26 +646,26 @@ public: if (first_base_) { // In this case we delegate to the base class ctor, but need a cast because it expects a different pointer type (as these types are opaque, there is no // relationship between them). - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, Getattr(first_base_, "sym:name"), "{(", get_c_class_ptr(first_base_).get(), ")swig_self, swig_owns_self}", NIL ); } else { // Just initialize our own field. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, "swig_self_{swig_self}, swig_owns_self_{swig_owns_self}", NIL ); } - Append(cxx_wrappers_.f_decls, " {}\n"); + Append(cxx_wrappers_.sect_decls, " {}\n"); // If the class doesn't have a copy ctor, forbid copying it: we currently must do it even if the original class has a perfectly cromulent implicit copy ctor // because we don't wrap it and copying would use the trivial ctor that would just copy the swig_self_ pointer resulting in double destruction of it later. // To fix this, we would need to always provide our own C wrapper for the copy ctor, which is not something we do currently. if (!has_copy_ctor_) { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, classname, "(", classname, " const&) = delete;\n", NIL ); @@ -673,20 +673,20 @@ public: // We currently never wrap the assignment operator, so we have to always disable it for the same reason we disable the copy ctor above. // It would definitely be nice to provide the assignment, if possible. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, classname, "& operator=(", classname, " const&) = delete;\n", NIL ); // OTOH we may always provide move ctor and assignment, as we can always implement them trivially ourselves. if (first_base_) { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, classname, "(", classname, "&& obj) = default;\n", cindent, classname, "& operator=(", classname, "&& obj) = default;\n", NIL ); } else { - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, classname, "(", classname, "&& obj) noexcept : " "swig_self_{obj.swig_self_}, swig_owns_self_{obj.swig_owns_self_} { " "obj.swig_owns_self_ = false; " @@ -701,14 +701,14 @@ public: } // We also need a swig_self() method for accessing the C object pointer. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, cindent, c_class_ptr.get(), " swig_self() const noexcept ", NIL ); if (first_base_) { // If we have a base class, we reuse its existing "self" pointer. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, "{ return (", c_class_ptr.get(), ")", Getattr(first_base_, "sym:name"), "::swig_self(); }\n", NIL ); @@ -718,7 +718,7 @@ public: // Perhaps we could avoid having a separate bool flag by reusing the low-order bit of the pointer itself as the indicator of ownership and masking it when // retrieving it here in the future. If we decide to implement this optimization, the code generated here should be the only thing that would need to // change. - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, "{ return swig_self_; }\n", cindent, c_class_ptr.get(), " swig_self_;\n", cindent, "bool swig_owns_self_;\n", @@ -726,7 +726,7 @@ public: ); } - Printv(cxx_wrappers_.f_decls, + Printv(cxx_wrappers_.sect_decls, "};\n" "\n", NIL @@ -1002,11 +1002,11 @@ class C:public Language { static const char *usage; // These files contain types used by the wrappers declarations and the declarations themselves and end up in the output header file. - File *f_wrappers_types; - File *f_wrappers_decl; + String *sect_wrappers_types; + String *sect_wrappers_decl; // This one contains wrapper functions definitions and end up in the output C++ file. - File *f_wrappers; + String *sect_wrappers; String *empty_string; @@ -1026,7 +1026,7 @@ class C:public Language { String *enum_prefix; // Used only while generating wrappers for an enum, as we don't know if enum will have any elements or not in advance and we must not generate an empty enum, - // so we accumulate the full declaration here and then write it to f_wrappers_types at once only if there are any elements. + // so we accumulate the full declaration here and then write it to sect_wrappers_types at once only if there are any elements. String *enum_decl; // Selects between the wrappers (public) declarations and (private) definitions. @@ -1204,7 +1204,7 @@ public: typestr = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype)); // And make sure it is declared before it is used. - Printf(f_wrappers_types, "typedef struct %s %s;\n\n", typestr, typestr); + Printf(sect_wrappers_types, "typedef struct %s %s;\n\n", typestr, typestr); } } } @@ -1370,20 +1370,20 @@ public: Swig_banner(f_wrappers_h); - // Associate file with the SWIG sections with the same name, so that e.g. "%header" contents end up in f_header etc. - const scoped_dohptr f_begin(NewStringEmpty()); - const scoped_dohptr f_header(NewStringEmpty()); - const scoped_dohptr f_runtime(NewStringEmpty()); - const scoped_dohptr f_init(NewStringEmpty()); + // Associate file with the SWIG sections with the same name, so that e.g. "%header" contents end up in sect_header etc. + const scoped_dohptr sect_begin(NewStringEmpty()); + const scoped_dohptr sect_header(NewStringEmpty()); + const scoped_dohptr sect_runtime(NewStringEmpty()); + const scoped_dohptr sect_init(NewStringEmpty()); // This one is used outside of this function, so it's a member variable rather than a local one. - f_wrappers = NewStringEmpty(); + sect_wrappers = NewStringEmpty(); - Swig_register_filebyname("begin", f_begin); - Swig_register_filebyname("header", f_header); - Swig_register_filebyname("wrapper", f_wrappers); - Swig_register_filebyname("runtime", f_runtime); - Swig_register_filebyname("init", f_init); + Swig_register_filebyname("begin", sect_begin); + Swig_register_filebyname("header", sect_header); + Swig_register_filebyname("wrapper", sect_wrappers); + Swig_register_filebyname("runtime", sect_runtime); + Swig_register_filebyname("init", sect_init); // This one is C-specific and goes directly to the output header file. Swig_register_filebyname("cheader", f_wrappers_h); @@ -1393,7 +1393,7 @@ public: // Redefine SWIG_CException_Raise() to have a unique prefix in the shared library built from SWIG-generated sources to allow using more than one extension // in the same process without conflicts. This has to be done in this hackish way because we really need to change the name of the function itself, not // its wrapper (which is not even generated). - Printv(f_runtime, + Printv(sect_runtime, "#define SWIG_CException_Raise ", (ns_prefix ? ns_prefix : module_name), "_SWIG_CException_Raise\n", NIL ); @@ -1403,7 +1403,7 @@ public: if (find_first_named_import(n)) { // We import another module, which will have already defined SWIG_CException, so set the flag indicating that we shouldn't do it again in this one and // define the symbol to skip compiling its implementation. - Printv(f_runtime, "#define SWIG_CException_DEFINED 1\n", NIL); + Printv(sect_runtime, "#define SWIG_CException_DEFINED 1\n", NIL); // Also set a flag telling classDeclaration() to skip creating SWIG_CException wrappers. exceptions_support_ = exceptions_support_imported; @@ -1432,23 +1432,23 @@ public: // All the struct types used by the functions go to f_wrappers_types so that they're certain to be defined before they're used by any functions. All the // functions declarations go directly to f_wrappers_decl we write both of them to f_wrappers_h at the end. - f_wrappers_types = NewString(""); - f_wrappers_decl = NewString(""); + sect_wrappers_types = NewString(""); + sect_wrappers_decl = NewString(""); { cplusplus_output_guard - cplusplus_guard_wrappers(f_wrappers), - cplusplus_guard_wrappers_h(f_wrappers_decl); + cplusplus_guard_wrappers(sect_wrappers), + cplusplus_guard_wrappers_h(sect_wrappers_decl); // emit code for children Language::top(n); } // close extern "C" guards - Dump(f_wrappers_types, f_wrappers_h); - Delete(f_wrappers_types); + Dump(sect_wrappers_types, f_wrappers_h); + Delete(sect_wrappers_types); - Dump(f_wrappers_decl, f_wrappers_h); - Delete(f_wrappers_decl); + Dump(sect_wrappers_decl, f_wrappers_h); + Delete(sect_wrappers_decl); if (cxx_wrappers_.is_initialized()) { if (!ns_cxx) { @@ -1481,24 +1481,24 @@ public: } Printv(f_wrappers_h, "\n", NIL); - Dump(cxx_wrappers_.f_types, f_wrappers_h); + Dump(cxx_wrappers_.sect_types, f_wrappers_h); Printv(f_wrappers_h, "\n", NIL); - Dump(cxx_wrappers_.f_decls, f_wrappers_h); + Dump(cxx_wrappers_.sect_decls, f_wrappers_h); Printv(f_wrappers_h, "\n", NIL); - Dump(cxx_wrappers_.f_impls, f_wrappers_h); + Dump(cxx_wrappers_.sect_impls, f_wrappers_h); Printv(f_wrappers_h, "\n", cxx_ns_end.get(), "\n#endif /* __cplusplus */\n", NIL); } } // close wrapper header guard // write all to the file - Dump(f_begin, f_wrappers_cxx); - Dump(f_runtime, f_wrappers_cxx); - Dump(f_header, f_wrappers_cxx); - Dump(f_wrappers, f_wrappers_cxx); - Dump(f_init, f_wrappers_cxx); + Dump(sect_begin, f_wrappers_cxx); + Dump(sect_runtime, f_wrappers_cxx); + Dump(sect_header, f_wrappers_cxx); + Dump(sect_wrappers, f_wrappers_cxx); + Dump(sect_init, f_wrappers_cxx); return SWIG_OK; } @@ -1545,7 +1545,7 @@ public: if (!ns_prefix && !scoped_dohptr(Swig_scopename_prefix(Getattr(n, "name")))) { // If we can export the variable directly, do it, this will be more convenient to use from C code than accessor functions. if (String* const var_decl = make_c_var_decl(n)) { - Printv(f_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL); + Printv(sect_wrappers_decl, "SWIGIMPORT ", var_decl, ";\n\n", NIL); Delete(var_decl); return SWIG_OK; } @@ -1725,7 +1725,7 @@ public: Printf(wrapper->code, "return result;\n"); Printf(wrapper->code, "}"); - Wrapper_print(wrapper, f_wrappers); + Wrapper_print(wrapper, sect_wrappers); emit_wrapper_func_decl(n, wname); @@ -1876,7 +1876,7 @@ public: current_output = output_wrapper_decl; // add function declaration to the proxy header file - Printv(f_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL); + Printv(sect_wrappers_decl, "SWIGIMPORT ", get_wrapper_func_return_type(n).get(), " ", wname, get_wrapper_func_proto(n).get(), ";\n\n", NIL); } @@ -2051,7 +2051,7 @@ public: Append(wrapper->code, "}\n"); - Wrapper_print(wrapper, f_wrappers); + Wrapper_print(wrapper, sect_wrappers); // cleanup DelWrapper(wrapper); @@ -2176,7 +2176,7 @@ public: // Final complication: define bool if it is used here. if (Cmp(btype, "bool") == 0) { - Printv(f_wrappers_types, "#include \n\n", NIL); + Printv(sect_wrappers_types, "#include \n\n", NIL); } } } @@ -2201,7 +2201,7 @@ public: * emit_c_struct_def() * * Append the declarations of C struct members to the given string. - * Notice that this function has a side effect of outputting all enum declarations inside the struct into f_wrappers_types directly. + * Notice that this function has a side effect of outputting all enum declarations inside the struct into sect_wrappers_types directly. * This is done to avoid gcc warnings "declaration does not declare anything" given for the anonymous enums inside the structs. * --------------------------------------------------------------------- */ @@ -2220,7 +2220,7 @@ public: Delete(var_decl); } } else if (Cmp(ntype, "enum") == 0) { - // This goes directly into f_wrappers_types, before this struct declaration. + // This goes directly into sect_wrappers_types, before this struct declaration. emit_one(node); } else { // WARNING: proxy declaration can be different than original code @@ -2295,7 +2295,7 @@ public: } // declare type for specific class in the proxy header - Printv(f_wrappers_types, "typedef struct SwigObj_", name, " ", name, ";\n\n", NIL); + Printv(sect_wrappers_types, "typedef struct SwigObj_", name, " ", name, ";\n\n", NIL); return Language::classHandler(n); } else { @@ -2312,7 +2312,7 @@ public: else Append(struct_def, "};\n\n"); - Printv(f_wrappers_types, struct_def, NIL); + Printv(sect_wrappers_types, struct_def, NIL); Delete(struct_def); } return SWIG_OK; @@ -2465,7 +2465,7 @@ public: } Printv(enum_decl, ";\n\n", NIL); - Append(f_wrappers_types, enum_decl); + Append(sect_wrappers_types, enum_decl); } enum_prefix = NULL; @@ -2564,7 +2564,7 @@ public: value = Getattr(n, "value"); } - Printv(f_wrappers_decl, "#define ", name, " ", value, "\n", NIL); + Printv(sect_wrappers_decl, "#define ", name, " ", value, "\n", NIL); return SWIG_OK; } }; /* class C */ From 30bbb6ae1c3f2d2b1e5c85e852093ae0c96befc5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 16:02:14 +0100 Subject: [PATCH 432/508] Slightly simplify code in enumDeclaration() Don't bother with maybe_owned_dohptr, we can just use tdname directly at the cost of a single "if" at the end, so do it like this as it's more clear and shorter. --- Source/Modules/c.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 9cf1b7195..539fe32aa 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -2410,8 +2410,7 @@ public: enum_decl = NewStringEmpty(); // Preserve the typedef if we have it in the input. - maybe_owned_dohptr tdname; - tdname.assign_non_owned(Getattr(n, "tdname")); + String* const tdname = Getattr(n, "tdname"); if (tdname) { Printv(enum_decl, "typedef ", NIL); } @@ -2423,10 +2422,6 @@ public: enum_prefix = ns_prefix; // Possibly NULL, but that's fine. } - if (tdname && enum_prefix) { - tdname.assign_owned(NewStringf("%s_%s", enum_prefix, tdname.get())); - } - scoped_dohptr enumname; // Unnamed enums may just have no name at all or have a synthesized invalid name of the form "$unnamedN$ which is indicated by "unnamed" attribute. @@ -2461,7 +2456,11 @@ public: Printv(enum_decl, "\n}", NIL); if (tdname) { - Printv(enum_decl, " ", tdname.get(), NIL); + if (enum_prefix) { + Printv(enum_decl, " ", enum_prefix, "_", tdname, NIL); + } else { + Printv(enum_decl, " ", tdname, NIL); + } } Printv(enum_decl, ";\n\n", NIL); From e8cb7cc952c2de047381388b30a804d7a852d27b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 18:47:19 +0100 Subject: [PATCH 433/508] Simplify code dealing with enum prefix Use enum_prefix_, ending with "_" if it's not empty, as it can be used unconditionally instead of having to check whether it's null every time first. No real changes, this is just a simplification. --- Source/Modules/c.cxx | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 539fe32aa..0571a83f5 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1022,8 +1022,8 @@ class C:public Language { // Name of the output header, set in top(). String *outfile_h; - // Used only while generating wrappers for an enum and contains the prefix to use for enum elements if non-null. - String *enum_prefix; + // Used only while generating wrappers for an enum and contains the prefix, ending with underscore, to use for enum elements or is empty. + scoped_dohptr enum_prefix_; // Used only while generating wrappers for an enum, as we don't know if enum will have any elements or not in advance and we must not generate an empty enum, // so we accumulate the full declaration here and then write it to sect_wrappers_types at once only if there are any elements. @@ -2416,6 +2416,7 @@ public: } Printv(enum_decl, "enum", NIL); + String* enum_prefix; if (Node* const klass = getCurrentClass()) { enum_prefix = get_c_proxy_name(klass); } else { @@ -2444,6 +2445,8 @@ public: } } + enum_prefix_ = enum_prefix ? NewStringf("%s_", enum_prefix) : NewStringEmpty(); + Printv(enum_decl, " {\n", NIL); int const len_orig = Len(enum_decl); @@ -2456,18 +2459,13 @@ public: Printv(enum_decl, "\n}", NIL); if (tdname) { - if (enum_prefix) { - Printv(enum_decl, " ", enum_prefix, "_", tdname, NIL); - } else { - Printv(enum_decl, " ", tdname, NIL); - } + Printv(enum_decl, " ", enum_prefix_.get(), tdname, NIL); } Printv(enum_decl, ";\n\n", NIL); Append(sect_wrappers_types, enum_decl); } - enum_prefix = NULL; Delete(enum_decl); return SWIG_OK; @@ -2485,15 +2483,8 @@ public: if (!GetFlag(n, "firstenumitem")) Printv(enum_decl, ",\n", NIL); - maybe_owned_dohptr wname; - String* const symname = Getattr(n, "sym:name"); - if (enum_prefix) { - wname.assign_owned(NewStringf("%s_%s", enum_prefix, symname)); - } else { - wname.assign_non_owned(symname); - } - Printv(enum_decl, cindent, wname.get(), NIL); + Printv(enum_decl, cindent, enum_prefix_.get(), symname, NIL); // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace). From 8643dcf4265c3b97471a7df8f82c8edf67c97e73 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 16:22:20 +0100 Subject: [PATCH 434/508] Generate C++ enum wrappers They are almost identical to C enums, but are more convenient to use from C++ code, as the (possibly long) prefix doesn't need to be fully specified if namespace using directive is used. For now restrict the wrapper enums generation to global enums only. --- Source/Modules/c.cxx | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 0571a83f5..b67387449 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1044,6 +1044,9 @@ class C:public Language { // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. cxx_class_wrapper* cxx_class_wrapper_; + // This is parallel to enum_decl but for C++ enum declaration. + String *cxx_enum_decl; + public: /* ----------------------------------------------------------------------------- @@ -2409,12 +2412,18 @@ public: // We don't know here if we're going to have any non-ignored enum elements, so generate enum declaration in a temporary string. enum_decl = NewStringEmpty(); + // Another string for C++ enum declaration, which differs from the C one because it never uses the prefix, as C++ enums are declared in the correct scope. + cxx_enum_decl = cxx_wrappers_.is_initialized() && !cxx_class_wrapper_ ? NewStringEmpty() : NULL; // Preserve the typedef if we have it in the input. String* const tdname = Getattr(n, "tdname"); if (tdname) { Printv(enum_decl, "typedef ", NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, "typedef ", NIL); } Printv(enum_decl, "enum", NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, "enum", NIL); String* enum_prefix; if (Node* const klass = getCurrentClass()) { @@ -2433,6 +2442,10 @@ public: // But the name may included the containing class, so get rid of it. enumname = Swig_scopename_last(name); + // C++ enum name shouldn't include the prefix, as this enum is inside a namespace. + if (cxx_enum_decl) + Printv(cxx_enum_decl, " ", enumname.get(), NIL); + if (enum_prefix) { enumname = NewStringf("%s_%s", enum_prefix, enumname.get()); } @@ -2448,6 +2461,8 @@ public: enum_prefix_ = enum_prefix ? NewStringf("%s_", enum_prefix) : NewStringEmpty(); Printv(enum_decl, " {\n", NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, " {\n", NIL); int const len_orig = Len(enum_decl); @@ -2457,16 +2472,27 @@ public: // Only emit the enum declaration if there were actually any items. if (Len(enum_decl) > len_orig) { Printv(enum_decl, "\n}", NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, "\n}", NIL); if (tdname) { Printv(enum_decl, " ", enum_prefix_.get(), tdname, NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, " ", tdname, NIL); } Printv(enum_decl, ";\n\n", NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, ";\n\n", NIL); Append(sect_wrappers_types, enum_decl); + if (cxx_enum_decl) { + Append(cxx_wrappers_.sect_types, cxx_enum_decl); + } } Delete(enum_decl); + if (cxx_enum_decl) + Delete(cxx_enum_decl); return SWIG_OK; } @@ -2480,11 +2506,16 @@ public: return SWIG_NOWRAP; Swig_require("enumvalueDeclaration", n, "?enumvalueex", "?enumvalue", NIL); - if (!GetFlag(n, "firstenumitem")) + if (!GetFlag(n, "firstenumitem")) { Printv(enum_decl, ",\n", NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, ",\n", NIL); + } String* const symname = Getattr(n, "sym:name"); Printv(enum_decl, cindent, enum_prefix_.get(), symname, NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, cindent, symname, NIL); // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace). @@ -2516,6 +2547,8 @@ public: } Printv(enum_decl, " = ", cvalue.get(), NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, " = ", cvalue.get(), NIL); } Swig_restore(n); From 059f615a61d521683c23d4d47f315d5655a3d1da Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 16:25:29 +0100 Subject: [PATCH 435/508] Generate C++ wrapper enums for nested enums too This doesn't seem to be more difficult to do, just ensure that the nested enums use the proper indentation and output them in the section containing the class declaration, rather than the global ones. --- Source/Modules/c.cxx | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index b67387449..8effb0024 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -373,6 +373,14 @@ public: has_copy_ctor_ = false; } + // Get indentation used inside this class declaration. + const char* get_indent() const { + // Currently we always use a single level of indent, but this would need to change if/when nested classes are supported. + // + // As the first step, we should probably change all occurrences of "cindent" in this class itself to use get_indent() instead. + return cindent; + } + // Emit wrapper of a member function. void emit_member_function(Node* n) { if (!class_node_) @@ -1047,6 +1055,9 @@ class C:public Language { // This is parallel to enum_decl but for C++ enum declaration. String *cxx_enum_decl; + // An extra indent level needed for nested C++ enums. + const char* cxx_enum_indent; + public: /* ----------------------------------------------------------------------------- @@ -2413,7 +2424,18 @@ public: enum_decl = NewStringEmpty(); // Another string for C++ enum declaration, which differs from the C one because it never uses the prefix, as C++ enums are declared in the correct scope. - cxx_enum_decl = cxx_wrappers_.is_initialized() && !cxx_class_wrapper_ ? NewStringEmpty() : NULL; + cxx_enum_decl = cxx_wrappers_.is_initialized() ? NewStringEmpty() : NULL; + + // If we're currently generating a wrapper class, we need an extra level of indent. + if (cxx_enum_decl) { + if (cxx_class_wrapper_) { + cxx_enum_indent = cxx_class_wrapper_->get_indent(); + Append(cxx_enum_decl, cxx_enum_indent); + } else { + cxx_enum_indent = ""; + } + } + // Preserve the typedef if we have it in the input. String* const tdname = Getattr(n, "tdname"); if (tdname) { @@ -2473,7 +2495,7 @@ public: if (Len(enum_decl) > len_orig) { Printv(enum_decl, "\n}", NIL); if (cxx_enum_decl) - Printv(cxx_enum_decl, "\n}", NIL); + Printv(cxx_enum_decl, "\n", cxx_enum_indent, "}", NIL); if (tdname) { Printv(enum_decl, " ", enum_prefix_.get(), tdname, NIL); @@ -2486,7 +2508,9 @@ public: Append(sect_wrappers_types, enum_decl); if (cxx_enum_decl) { - Append(cxx_wrappers_.sect_types, cxx_enum_decl); + // Enums declared in global scopes can be just defined before everything else, but nested enums have to be defined inside the declaration of the class, + // which we must be in process of creating, so output them in the appropriate section. + Append(cxx_class_wrapper_ ? cxx_wrappers_.sect_decls : cxx_wrappers_.sect_types, cxx_enum_decl); } } @@ -2515,7 +2539,7 @@ public: String* const symname = Getattr(n, "sym:name"); Printv(enum_decl, cindent, enum_prefix_.get(), symname, NIL); if (cxx_enum_decl) - Printv(cxx_enum_decl, cindent, symname, NIL); + Printv(cxx_enum_decl, cxx_enum_indent, cindent, symname, NIL); // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace). From 9a974040face3b5e0caef3f9c6265d2ec2f218aa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Nov 2021 18:48:12 +0100 Subject: [PATCH 436/508] Fix naming scoped enums elements in C++ wrappers For now still use prefix for them, as otherwise enum element names may conflict with the other names defined in the same scope. The upcoming commits will handle them as scoped enums in the wrappers too. --- Source/Modules/c.cxx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8effb0024..43cebfcf0 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1052,6 +1052,9 @@ class C:public Language { // Non-owning pointer to the current C++ class wrapper if we're currently generating one or NULL. cxx_class_wrapper* cxx_class_wrapper_; + // This is parallel to enum_prefix_ but for C++ enum elements. + scoped_dohptr cxx_enum_prefix_; + // This is parallel to enum_decl but for C++ enum declaration. String *cxx_enum_decl; @@ -2454,7 +2457,11 @@ public: enum_prefix = ns_prefix; // Possibly NULL, but that's fine. } + // C++ enum names don't use the prefix, as they're defined in namespace or class scope. + String* cxx_enum_prefix = NULL; + scoped_dohptr enumname; + scoped_dohptr cxx_enumname; // Unnamed enums may just have no name at all or have a synthesized invalid name of the form "$unnamedN$ which is indicated by "unnamed" attribute. // @@ -2464,23 +2471,27 @@ public: // But the name may included the containing class, so get rid of it. enumname = Swig_scopename_last(name); - // C++ enum name shouldn't include the prefix, as this enum is inside a namespace. + // C++ enum name shouldn't include the prefix, so make a copy before enumname is modified below. if (cxx_enum_decl) - Printv(cxx_enum_decl, " ", enumname.get(), NIL); + cxx_enumname = Copy(enumname); if (enum_prefix) { enumname = NewStringf("%s_%s", enum_prefix, enumname.get()); } Printv(enum_decl, " ", enumname.get(), NIL); + if (cxx_enum_decl) + Printv(cxx_enum_decl, " ", cxx_enumname.get(), NIL); // For scoped enums, their name should be prefixed to their elements in addition to any other prefix we use. if (Getattr(n, "scopedenum")) { enum_prefix = enumname.get(); + cxx_enum_prefix = cxx_enumname.get(); } } enum_prefix_ = enum_prefix ? NewStringf("%s_", enum_prefix) : NewStringEmpty(); + cxx_enum_prefix_ = cxx_enum_prefix ? NewStringf("%s_", cxx_enum_prefix) : NewStringEmpty(); Printv(enum_decl, " {\n", NIL); if (cxx_enum_decl) @@ -2539,7 +2550,7 @@ public: String* const symname = Getattr(n, "sym:name"); Printv(enum_decl, cindent, enum_prefix_.get(), symname, NIL); if (cxx_enum_decl) - Printv(cxx_enum_decl, cxx_enum_indent, cindent, symname, NIL); + Printv(cxx_enum_decl, cxx_enum_indent, cindent, cxx_enum_prefix_.get(), symname, NIL); // We only use "enumvalue", which comes from the input, and not "enumvalueex" synthesized by SWIG itself because C should use the correct value for the enum // items without an explicit one anyhow (and "enumvalueex" can't be always used as is in C code for enum elements inside a class or even a namespace). From 4a3f4ba89691131f4fc680bbc4450c7450466361 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Nov 2021 15:33:53 +0100 Subject: [PATCH 437/508] Improve error given for unsupported typemap in C++ wrappers This error message should never happen, normally, but still make it more informative if it does, as it could be just completely useless if there was no sym:name attribute on the node (as is often the case for the function parameters, for example). --- Source/Modules/c.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 43cebfcf0..b9abf79a9 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -840,18 +840,19 @@ private: } } + String* const type = Getattr(n, "type"); + if (typeKind == Type_Max) { if (Strstr(s, "resolved_type")) { Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, - "Unsupported typemap used for \"%s\"\n", - Getattr(n, "sym:name") + "Unsupported typemap \"%s\" used for type \"%s\" of \"%s\"\n", + s, type, Getattr(n, "name") ); } return; } - String* const type = Getattr(n, "type"); scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); From 6fb95e7e971101b46999336a9ab9c2bbe4fd93ff Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Nov 2021 15:45:38 +0100 Subject: [PATCH 438/508] Fix wording of another error message Don't use "reference return type" for the typemap used for returning objects by value. --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index b9abf79a9..80588ce67 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -932,7 +932,7 @@ private: ); Append(rtype_desc->wrap_end(), ")"); } else { - Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); + Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); } } From 1c06a43e356e695dc4dd5617ed2f6a52107d8e40 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 30 Nov 2021 00:02:29 +0100 Subject: [PATCH 439/508] Do use sym:name for the enum names themselves Ever since fb4d70027 (Represent enums as themselves in generated code, 2016-04-14) the code used "name" attribute for the enums themselves instead of "sym:name". The reason for this was documented in the comment added in f4ee8e536 (Fix names of enums and their elements, 2021-11-04), but this explanation was only half-correct: although we indeed shouldn't use sym:name for typedefs, we should use it for the enums themselves, as otherwise renaming them didn't work and enums were generated in the wrappers with the wrong names. Fix this by using sym:name for non typedef'd enums. --- Source/Modules/c.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 80588ce67..8713a942d 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -2465,12 +2465,15 @@ public: scoped_dohptr cxx_enumname; // Unnamed enums may just have no name at all or have a synthesized invalid name of the form "$unnamedN$ which is indicated by "unnamed" attribute. - // - // Also note that we use "name" here and not "sym:name" because the latter is the name of typedef if there is one, while we want to use the name of enum - // itself here and, even more importantly, use the enum, and not the typedef, name as prefix for its elements. - if (String* const name = Getattr(n, "unnamed") ? NIL : Getattr(n, "name")) { - // But the name may included the containing class, so get rid of it. - enumname = Swig_scopename_last(name); + if (String* const name = Getattr(n, "unnamed") ? NULL : Getattr(n, "sym:name")) { + // If it's a typedef, its sym:name is the typedef name, but we don't want to use it here (we already use it for the typedef we generate), so use the + // actual C++ name instead. + if (tdname) { + // But the name may include the containing class, so get rid of it. + enumname = Swig_scopename_last(Getattr(n, "name")); + } else { + enumname = Copy(name); + } // C++ enum name shouldn't include the prefix, so make a copy before enumname is modified below. if (cxx_enum_decl) From 06c651431cfe69760cabc68172d01cebcfd80e12 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 30 Nov 2021 01:39:34 +0100 Subject: [PATCH 440/508] Fix enum names for renamed typedefs Also use sym:name even for typedefs for enums themselves, as they can %renamed as well. Note that this means that "tdname" itself should probably be never used at all at this level, but it's still used for structs in C mode, which is almost certainly wrong. --- Source/Modules/c.cxx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8713a942d..cac1ec49f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -2440,9 +2440,11 @@ public: } } + String* const symname = Getattr(n, "sym:name"); + // Preserve the typedef if we have it in the input. - String* const tdname = Getattr(n, "tdname"); - if (tdname) { + bool const is_typedef = Checkattr(n, "allows_typedef", "1"); + if (is_typedef) { Printv(enum_decl, "typedef ", NIL); if (cxx_enum_decl) Printv(cxx_enum_decl, "typedef ", NIL); @@ -2465,10 +2467,10 @@ public: scoped_dohptr cxx_enumname; // Unnamed enums may just have no name at all or have a synthesized invalid name of the form "$unnamedN$ which is indicated by "unnamed" attribute. - if (String* const name = Getattr(n, "unnamed") ? NULL : Getattr(n, "sym:name")) { + if (String* const name = Getattr(n, "unnamed") ? NULL : symname) { // If it's a typedef, its sym:name is the typedef name, but we don't want to use it here (we already use it for the typedef we generate), so use the // actual C++ name instead. - if (tdname) { + if (is_typedef) { // But the name may include the containing class, so get rid of it. enumname = Swig_scopename_last(Getattr(n, "name")); } else { @@ -2512,10 +2514,10 @@ public: if (cxx_enum_decl) Printv(cxx_enum_decl, "\n", cxx_enum_indent, "}", NIL); - if (tdname) { - Printv(enum_decl, " ", enum_prefix_.get(), tdname, NIL); + if (is_typedef) { + Printv(enum_decl, " ", enum_prefix_.get(), symname, NIL); if (cxx_enum_decl) - Printv(cxx_enum_decl, " ", tdname, NIL); + Printv(cxx_enum_decl, " ", symname, NIL); } Printv(enum_decl, ";\n\n", NIL); if (cxx_enum_decl) From 815c7c0361e6239566cfc6449996f33abe0a38c1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Nov 2021 21:40:27 +0100 Subject: [PATCH 441/508] Don't call getEnumName() with NULL node No real changes, just a tiny refactoring in preparation for the upcoming changes. This commit is best viewed ignoring whitespace-only changes. --- Source/Modules/c.cxx | 48 +++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index cac1ec49f..d6af57d7e 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1154,30 +1154,27 @@ public: * ----------------------------------------------------------------------------- */ String *getEnumName(Node *n) { - String *enumname = NULL; - if (n) { - enumname = Getattr(n, "enumname"); - if (!enumname) { - String *symname = Getattr(n, "sym:name"); - if (symname) { - // Add in class scope when referencing enum if not a global enum - String *proxyname = 0; - if (String *name = Getattr(n, "name")) { - if (String *scopename_prefix = Swig_scopename_prefix(name)) { - proxyname = getClassProxyName(scopename_prefix); - Delete(scopename_prefix); - } + String *enumname = Getattr(n, "enumname"); + if (!enumname) { + String *symname = Getattr(n, "sym:name"); + if (symname) { + // Add in class scope when referencing enum if not a global enum + String *proxyname = 0; + if (String *name = Getattr(n, "name")) { + if (String *scopename_prefix = Swig_scopename_prefix(name)) { + proxyname = getClassProxyName(scopename_prefix); + Delete(scopename_prefix); } - if (proxyname) { - enumname = NewStringf("%s_%s", proxyname, symname); - Delete(proxyname); - } else { - // global enum or enum in a namespace - enumname = Copy(get_c_proxy_name(n)); - } - Setattr(n, "enumname", enumname); - Delete(enumname); - } + } + if (proxyname) { + enumname = NewStringf("%s_%s", proxyname, symname); + Delete(proxyname); + } else { + // global enum or enum in a namespace + enumname = Copy(get_c_proxy_name(n)); + } + Setattr(n, "enumname", enumname); + Delete(enumname); } } @@ -1199,14 +1196,15 @@ public: return; } + scoped_dohptr btype(SwigType_base(classnametype)); if (SwigType_isenum(classnametype)) { - String *enumname = getEnumName(enumLookup(classnametype)); + Node* const enum_node = enumLookup(btype); + String* const enumname = enum_node ? getEnumName(enum_node) : NULL; if (enumname) Replaceall(tm, classnamespecialvariable, enumname); else Replaceall(tm, classnamespecialvariable, NewStringf("int")); } else { - scoped_dohptr btype(SwigType_base(classnametype)); String* typestr = NIL; if (current_output == output_wrapper_def || Cmp(btype, "SwigObj") == 0) { // Special case, just leave it unchanged. From 579c343d5fe706a204f3739e339d35c988b51abd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Nov 2021 21:12:53 +0100 Subject: [PATCH 442/508] Represent enums as enums, not int, if possible Use enum types instead of int for the enum-valued parameters and function return values, this is more type-safe and clear for the users of the library. Change cpp_enum unit test to use C++ to check that C++ enum wrappers can at least be compiled, but still use C API in it. Note that enum whose underlying type is bigger than int still don't work, but this is no different from what it was before, so just document this limitation but don't do anything else about it for now. This commit is best viewed ignoring whitespace-only changes. --- Doc/Manual/C.html | 1 + .../{cpp_enum_runme.c => cpp_enum_runme.cxx} | 3 +- Lib/c/c.swg | 8 +- Source/Modules/c.cxx | 282 ++++++++++++------ 4 files changed, 198 insertions(+), 96 deletions(-) rename Examples/test-suite/c/{cpp_enum_runme.c => cpp_enum_runme.cxx} (96%) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 72c7aa8e0..eb9089d0c 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -664,6 +664,7 @@ C++ wrappers try to provide a similar API to the original C++ API being wrapped, Other ones are due to things that could be supported but haven't been implemented yet:
    • Only single, not multiple, inheritance is currently supported.
      • +
    • Only enums using int (or smaller type) as underlying type are supported.

    diff --git a/Examples/test-suite/c/cpp_enum_runme.c b/Examples/test-suite/c/cpp_enum_runme.cxx similarity index 96% rename from Examples/test-suite/c/cpp_enum_runme.c rename to Examples/test-suite/c/cpp_enum_runme.cxx index a5968954b..060c127df 100644 --- a/Examples/test-suite/c/cpp_enum_runme.c +++ b/Examples/test-suite/c/cpp_enum_runme.cxx @@ -4,8 +4,7 @@ int main(int argc, const char *argv[]) { - // We don't have "enum SOME_ENUM" - int e = cpp_enum_ENUM_ONE, *p; + enum cpp_enum_SOME_ENUM e = cpp_enum_ENUM_ONE, *p; // check the constructor's default value cpp_enum_StructWithEnums *s = cpp_enum_StructWithEnums_new(); diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 76fe25024..67da4e96c 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -122,8 +122,12 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype); %typemap(ctype) SWIGTYPE & "$*resolved_type*" %typemap(ctype) SWIGTYPE [ANY] "$resolved_type*" %typemap(ctype) SWIGTYPE * [ANY] "$resolved_type**" -%typemap(ctype) enum SWIGTYPE "int" -%typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *" + +// enums +%typemap(ctype) enum SWIGTYPE "$resolved_type" +%typemap(ctype) enum SWIGTYPE * "$resolved_type*" +%typemap(ctype) enum SWIGTYPE & "$*resolved_type*" +%typemap(ctype) enum SWIGTYPE [ANY] "$resolved_type*" %typemap(ctype, fragment="stdbool_inc") bool, const bool, const bool & "bool" %typemap(ctype, fragment="stdbool_inc") bool *, const bool *, bool & "bool *" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d6af57d7e..bbb563bbf 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -823,14 +823,16 @@ private: Type_Ptr, Type_Ref, Type_Obj, + Type_Enm, Type_Max } typeKind = Type_Max; - // These correspond to the typemaps for SWIGTYPE*, SWIGTYPE& and SWIGTYPE, respectively, defined in c.swg. + // These correspond to the typemaps for SWIGTYPE*, SWIGTYPE&, SWIGTYPE and enum SWIGTYPE, respectively, defined in c.swg. static const char* typemaps[Type_Max] = { "$resolved_type*", "$*resolved_type*", "$&resolved_type*", + "$resolved_type", }; for (int i = 0; i < Type_Max; ++i) { @@ -853,101 +855,180 @@ private: return; } + // The logic here is somewhat messy because we use the same "$resolved_type*" typemap for pointers/references to both enums and classes, but we actually + // need to do quite different things for them. It could probably be simplified by changing the typemaps to be distinct, but this would require also updating + // the code for C wrappers generation in substituteResolvedTypeSpecialVariable(). scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); - scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); + scoped_dohptr base_resolved_type(SwigType_base(resolved_type)); scoped_dohptr typestr; - String* classname; - if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { - typestr = SwigType_str(type, 0); - classname = Getattr(class_node, "sym:name"); + if (SwigType_isenum(base_resolved_type)) { + String* enumname = NULL; + if (Node* const enum_node = Language::instance()->enumLookup(base_resolved_type)) { + // This is the name of the enum in C wrappers, it should be already set by getEnumName(). + enumname = Getattr(enum_node, "enumname"); - // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the - // class name, which is not. - scoped_dohptr basetype(SwigType_base(type)); - scoped_dohptr basetypestr(SwigType_str(basetype, 0)); - if (Cmp(basetypestr, classname) != 0) { - Replaceall(typestr, basetypestr, classname); + if (enumname) { + String* const enum_symname = Getattr(enum_node, "sym:name"); + + if (Checkattr(enum_node, "ismember", "1")) { + Node* const parent_class = parentNode(enum_node); + typestr = NewStringf("%s::%s", Getattr(parent_class, "sym:name"), enum_symname); + } else { + typestr = Copy(enum_symname); + } + } + } + + if (!enumname) { + // Unknown enums are mapped to int and no casts are necessary in this case. + typestr = NewString("int"); + } + + if (SwigType_ispointer(type)) + Append(typestr, " *"); + else if (SwigType_isreference(type)) + Append(typestr, " &"); + + scoped_dohptr rtype_cast(enumname ? NewStringf("(%s)", typestr.get()) : NewStringEmpty()); + + switch (typeKind) { + case Type_Ptr: + if (rtype_desc) { + Append(rtype_desc->wrap_start(), rtype_cast); + } + + if (ptype_desc) { + if (enumname) + Printv(ptype_desc->wrap_start(), "(", enumname, "*)", NIL); + } + break; + + case Type_Ref: + if (rtype_desc) { + Printv(rtype_desc->wrap_start(), rtype_cast.get(), "*(", NIL); + Append(rtype_desc->wrap_end(), ")"); + } + + if (ptype_desc) { + if (enumname) + Printv(ptype_desc->wrap_start(), "(", enumname, "*)", NIL); + Append(ptype_desc->wrap_start(), "&"); + } + break; + + case Type_Enm: + if (rtype_desc) { + Append(rtype_desc->wrap_start(), rtype_cast); + } + + if (ptype_desc) { + if (enumname) + Printv(ptype_desc->wrap_start(), "(", enumname, ")", NIL); + } + break; + + case Type_Obj: + case Type_Max: + // Unreachable, but keep here to avoid -Wswitch warnings. + assert(0); } } else { - // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. - typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); - classname = NULL; - } + scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); - switch (typeKind) { - case Type_Ptr: - if (ptype_desc) { - Append(ptype_desc->wrap_end(), "->swig_self()"); + String* classname; + if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { + typestr = SwigType_str(type, 0); + classname = Getattr(class_node, "sym:name"); + + // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the + // class name, which is not. + scoped_dohptr basetype(SwigType_base(type)); + scoped_dohptr basetypestr(SwigType_str(basetype, 0)); + if (Cmp(basetypestr, classname) != 0) { + Replaceall(typestr, basetypestr, classname); } + } else { + // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. + typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); + classname = NULL; + } - if (rtype_desc) { - if (classname) { - // We currently assume that all pointers are new, which is probably wrong. - // - // We generate here an immediately-invoked lambda, as we need something that can appear after a "return". - Append(rtype_desc->wrap_start(), "[=] { auto swig_res = "); - Printv(rtype_desc->wrap_end(), - "; " - "return swig_res ? new ", classname, "(swig_res) : nullptr; }()", - NIL - ); + switch (typeKind) { + case Type_Ptr: + if (ptype_desc) { + Append(ptype_desc->wrap_end(), "->swig_self()"); } - } - break; - case Type_Ref: - if (rtype_desc) { - if (classname) { - // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object - // must be constructed using the special ctor not taking the pointer ownership. - typestr = Copy(classname); - - Printv(rtype_desc->wrap_start(), - classname, "{", - NIL - ); - Printv(rtype_desc->wrap_end(), - ", false}", - NIL - ); - } else { - // We can't do anything at all in this case. - Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); + if (rtype_desc) { + if (classname) { + // We currently assume that all pointers are new, which is probably wrong. + // + // We generate here an immediately-invoked lambda, as we need something that can appear after a "return". + Append(rtype_desc->wrap_start(), "[=] { auto swig_res = "); + Printv(rtype_desc->wrap_end(), + "; " + "return swig_res ? new ", classname, "(swig_res) : nullptr; }()", + NIL + ); + } } - } + break; - if (ptype_desc) { - Append(ptype_desc->wrap_end(), ".swig_self()"); - } - break; + case Type_Ref: + if (rtype_desc) { + if (classname) { + // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object + // must be constructed using the special ctor not taking the pointer ownership. + typestr = Copy(classname); - case Type_Obj: - if (rtype_desc) { - if (classname) { - // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened. - Printv(rtype_desc->wrap_start(), - typestr.get(), "(", - NIL - ); - Append(rtype_desc->wrap_end(), ")"); - } else { - Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); + Printv(rtype_desc->wrap_start(), + classname, "{", + NIL + ); + Printv(rtype_desc->wrap_end(), + ", false}", + NIL + ); + } else { + // We can't do anything at all in this case. + Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); + } } - } - if (ptype_desc) { - // It doesn't seem like it can ever be useful to pass an object by value to a wrapper function and it can fail if it doesn't have a copy ctor (see - // code related to has_copy_ctor_ in our dtor above), so always pass it by const reference instead. - Append(typestr, " const&"); + if (ptype_desc) { + Append(ptype_desc->wrap_end(), ".swig_self()"); + } + break; - Append(ptype_desc->wrap_end(), ".swig_self()"); - } - break; + case Type_Obj: + if (rtype_desc) { + if (classname) { + // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened. + Printv(rtype_desc->wrap_start(), + typestr.get(), "(", + NIL + ); + Append(rtype_desc->wrap_end(), ")"); + } else { + Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); + } + } - case Type_Max: - // Unreachable, but keep here to avoid -Wswitch warnings. - assert(0); + if (ptype_desc) { + // It doesn't seem like it can ever be useful to pass an object by value to a wrapper function and it can fail if it doesn't have a copy ctor (see + // code related to has_copy_ctor_ in our dtor above), so always pass it by const reference instead. + Append(typestr, " const&"); + + Append(ptype_desc->wrap_end(), ".swig_self()"); + } + break; + + case Type_Enm: + case Type_Max: + // Unreachable, but keep here to avoid -Wswitch warnings. + assert(0); + } } Replaceall(s, typemaps[typeKind], typestr); @@ -1156,6 +1237,11 @@ public: String *getEnumName(Node *n) { String *enumname = Getattr(n, "enumname"); if (!enumname) { + // We can't use forward-declared enums because we can't define them for C wrappers (we could forward declare them in C++ if their underlying type, + // available as "inherit" node attribute, is specified, but not in C), so we have no choice but to use "int" for them. + if (Checkattr(n, "sym:weak", "1")) + return NULL; + String *symname = Getattr(n, "sym:name"); if (symname) { // Add in class scope when referencing enum if not a global enum @@ -1187,24 +1273,36 @@ public: * ----------------------------------------------------------------------------- */ void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) { - if (!CPlusPlus) { - // Just use the original C type when not using C++, we know that this type can be used in the wrappers. - Clear(tm); - String* const s = SwigType_str(classnametype, 0); - Append(tm, s); - Delete(s); - return; - } - scoped_dohptr btype(SwigType_base(classnametype)); - if (SwigType_isenum(classnametype)) { + if (SwigType_isenum(btype)) { Node* const enum_node = enumLookup(btype); String* const enumname = enum_node ? getEnumName(enum_node) : NULL; - if (enumname) - Replaceall(tm, classnamespecialvariable, enumname); - else - Replaceall(tm, classnamespecialvariable, NewStringf("int")); + + // We use the enum name in the wrapper declaration if it's available, as this makes it more type safe, but we always use just int for the function + // definition because we don't have the enum declaration in scope there. This obviously only actually works if the actual enum underlying type is int (or + // smaller). + maybe_owned_dohptr c_enumname; + if (current_output == output_wrapper_decl && enumname) { + // We need to add "enum" iff this is not already a typedef for the enum. + if (Checkattr(enum_node, "allows_typedef", "1")) + c_enumname.assign_non_owned(enumname); + else + c_enumname.assign_owned(NewStringf("enum %s", enumname)); + } else { + c_enumname.assign_owned(NewString("int")); + } + + Replaceall(tm, classnamespecialvariable, c_enumname); } else { + if (!CPlusPlus) { + // Just use the original C type when not using C++, we know that this type can be used in the wrappers. + Clear(tm); + String* const s = SwigType_str(classnametype, 0); + Append(tm, s); + Delete(s); + return; + } + String* typestr = NIL; if (current_output == output_wrapper_def || Cmp(btype, "SwigObj") == 0) { // Special case, just leave it unchanged. From a031ec34740f953f9f28fe9e57562f1a4382ea75 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 30 Nov 2021 02:29:31 +0100 Subject: [PATCH 443/508] Enable two previously failing tests that pass now This is just the result of rerunning "make check-failing". --- Examples/test-suite/c/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 31adc9eb5..f18e60496 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -46,7 +46,6 @@ FAILING_CPP_TESTS := \ arrays_global \ arrays_global_twodim \ constant_pointers \ - director_smartptr \ enum_thorough \ extend \ extend_default \ @@ -74,7 +73,6 @@ FAILING_CPP_TESTS := \ typedef_array_member \ typedef_funcptr \ typedef_struct_cpp \ - typemap_array_qualifiers \ typemap_namespace \ typemap_various \ using_extend \ From e4bb84f3bdecfe758c95d7220188521dadf09b61 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Nov 2021 14:54:39 +0100 Subject: [PATCH 444/508] Represent scoped enums as scoped enums in C++ wrappers This is better than turning them into unscoped enums with a prefix for the elements. --- Source/Modules/c.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index bbb563bbf..adcc18384 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -2573,9 +2573,17 @@ public: enumname = Copy(name); } - // C++ enum name shouldn't include the prefix, so make a copy before enumname is modified below. - if (cxx_enum_decl) - cxx_enumname = Copy(enumname); + const bool scoped_enum = Checkattr(n, "scopedenum", "1"); + + if (cxx_enum_decl) { + // In C++ we can use actual scoped enums instead of emulating them with element prefixes. + if (scoped_enum) + Printv(cxx_enum_decl, " class", NIL); + + // And enum name itself shouldn't include the prefix neither, as this enum is either inside a namespace or inside a class, so use enumname before it + // gets updated below. + Printv(cxx_enum_decl, " ", enumname.get(), NIL); + } if (enum_prefix) { enumname = NewStringf("%s_%s", enum_prefix, enumname.get()); @@ -2586,7 +2594,7 @@ public: Printv(cxx_enum_decl, " ", cxx_enumname.get(), NIL); // For scoped enums, their name should be prefixed to their elements in addition to any other prefix we use. - if (Getattr(n, "scopedenum")) { + if (scoped_enum) { enum_prefix = enumname.get(); cxx_enum_prefix = cxx_enumname.get(); } From efdfad65652f6adb350d753cd72f6cd271311b34 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 2 Dec 2021 00:31:33 +0100 Subject: [PATCH 445/508] Avoid redundant casts for function result in generated code No real changes, just avoid somewhat ridiculously looking consecutive casts to the same type in the generated code. --- Source/Modules/c.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index adcc18384..9acaa9f69 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -2124,7 +2124,12 @@ public: const char* start = Char(tm); const char* p = strstr(start, "$result = "); if (p == start || (p && p[-1] == ' ')) { - Insert(tm, p - start + strlen("$result = "), NewStringf("(%s)", return_type.get())); + p += strlen("$result = "); + scoped_dohptr result_cast(NewStringf("(%s)", return_type.get())); + + // However don't add a cast which is already there. + if (strncmp(p, Char(result_cast), strlen(Char(result_cast))) != 0) + Insert(tm, p - start, result_cast); } Replaceall(tm, "$result", "result"); Replaceall(tm, "$owner", GetFlag(n, "feature:new") ? "1" : "0"); From d33e76e045d419b1c2a76c0e5c1f4283bfa431ac Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Dec 2021 03:00:17 +0100 Subject: [PATCH 446/508] Fix bug with deleting even non-owned pointers in C++ wrappers Only take ownership of the objects returned from functions that are explicitly annotated with %newobject or from functions returning objects by value -- as in this case nothing else can own the returned object anyhow. This required changing the code slightly to let do_resolve_type() access the function node pointer, as the information we need is only available in it and not in the dummy node passed to us when we're called from inside Swig_typemap_lookup() due to $typemap() expansion. --- Source/Modules/c.cxx | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 9acaa9f69..0cd47b5e1 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -330,6 +330,7 @@ public: cxx_class_wrapper(const cxx_wrappers& cxx_wrappers, Node* n) : cxx_wrappers_(cxx_wrappers) { class_node_ = NULL; + node_func_ = NULL; rtype_desc_ = ptype_desc_ = NULL; @@ -394,6 +395,8 @@ public: if (Checkattr(n, "storage", "friend")) return; + temp_ptr_setter set(&node_func_, n); + // As mentioned elsewhere, we can't use Swig_storage_isstatic() here because the "storage" attribute is temporarily saved in another view when this // function is being executed, so rely on another attribute to determine if it's a static function instead. const bool is_member = Checkattr(n, "ismember", "1"); @@ -448,7 +451,7 @@ public: name = name_ptr.get(); } - const type_desc ptype_desc = lookup_cxx_parm_type(p); + const type_desc ptype_desc = lookup_cxx_parm_type(n, p); if (!ptype_desc.type()) { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), "No ctype typemap defined for the parameter \"%s\" of %s\n", @@ -758,7 +761,7 @@ public: if (rtype_desc_) rtype_desc_->set_type(type); - do_resolve_type(parm, tm, ptype_desc_, rtype_desc_); + do_resolve_type(node_func_, type, tm, ptype_desc_, rtype_desc_); } return true; @@ -815,9 +818,12 @@ private: // Replace "resolved_type" occurrences in the string with the value corresponding to the given type. // + // Note that the node here is the function itself, but type may be either its return type or the type of one of its parameters, so it's passed as a different + // parameter. + // // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). - static void do_resolve_type(Node* n, String* s, type_desc* ptype_desc, type_desc* rtype_desc) { + static void do_resolve_type(Node* n, String* type, String* s, type_desc* ptype_desc, type_desc* rtype_desc) { enum TypeKind { Type_Ptr, @@ -842,8 +848,6 @@ private: } } - String* const type = Getattr(n, "type"); - if (typeKind == Type_Max) { if (Strstr(s, "resolved_type")) { Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, @@ -954,6 +958,7 @@ private: classname = NULL; } + const char* const owns = GetFlag(n, "feature:new") ? "true" : "false"; switch (typeKind) { case Type_Ptr: if (ptype_desc) { @@ -962,13 +967,11 @@ private: if (rtype_desc) { if (classname) { - // We currently assume that all pointers are new, which is probably wrong. - // // We generate here an immediately-invoked lambda, as we need something that can appear after a "return". Append(rtype_desc->wrap_start(), "[=] { auto swig_res = "); Printv(rtype_desc->wrap_end(), "; " - "return swig_res ? new ", classname, "(swig_res) : nullptr; }()", + "return swig_res ? new ", classname, "(swig_res, ", owns, ") : nullptr; }()", NIL ); } @@ -1009,7 +1012,16 @@ private: typestr.get(), "(", NIL ); - Append(rtype_desc->wrap_end(), ")"); + + // Normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this seems + // not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for shared_ptr<> for example. + // + // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap + // expansion and so may not be a reference any more. + Printv(rtype_desc->wrap_end(), + ", ", SwigType_isreference(Getattr(n, "type")) ? owns : "true", ")", + NIL + ); } else { Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); } @@ -1034,15 +1046,15 @@ private: Replaceall(s, typemaps[typeKind], typestr); } - type_desc lookup_cxx_parm_type(Node* n) { + type_desc lookup_cxx_parm_type(Node* n, Parm* p) { type_desc ptype_desc; // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. temp_ptr_setter set(&ptype_desc_, &ptype_desc); - if (String* type = Swig_typemap_lookup("ctype", n, "", NULL)) { + if (String* type = Swig_typemap_lookup("ctype", p, "", NULL)) { ptype_desc.set_type(type); - do_resolve_type(n, ptype_desc.type(), &ptype_desc, NULL); + do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); } return ptype_desc; @@ -1056,7 +1068,7 @@ private: if (String* type = Swig_typemap_lookup("ctype", n, "", NULL)) { rtype_desc.set_type(type); - do_resolve_type(n, rtype_desc.type(), NULL, &rtype_desc); + do_resolve_type(n, Getattr(n, "type"), rtype_desc.type(), NULL, &rtype_desc); } return rtype_desc; @@ -1074,6 +1086,7 @@ private: scoped_dohptr first_base_; // These pointers are temporarily set to non-null value only while expanding a typemap for C++ wrappers, see replaceSpecialVariables(). + Node* node_func_; type_desc* ptype_desc_; type_desc* rtype_desc_; From 19e0ecbb9d09fbf4bdc8138e9984673ec52f48fb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Dec 2021 03:38:04 +0100 Subject: [PATCH 447/508] Don't leak the pointer returned by SWIG_CException::get_pending() This pointer is always new (if non-null) and so must be deleted. --- Source/Modules/c.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 0cd47b5e1..16424b400 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -271,6 +271,7 @@ struct cxx_wrappers "inline void swig_check() {\n", cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", + cindent, cindent, "delete swig_ex;\n", cindent, cindent, "SWIG_CException::reset_pending();\n", cindent, cindent, "throw swig_ex_copy;\n", cindent, "}\n", From bfc6623bbd0c94632769e346002845548b03d9e6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Dec 2021 03:38:33 +0100 Subject: [PATCH 448/508] Make SWIG_CException dtor public to fix memory leak The actual dtor was never called when the wrapper object was destroyed before, due to dtor being private. --- Lib/c/cexcept.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index 3a317d65e..8c9545657 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -22,6 +22,7 @@ extern "C" void SWIG_CException_Raise(int code, const char* msg); class SWIG_CException { public: SWIG_CException(const SWIG_CException& ex) throw() : code(ex.code), msg(strdup(ex.msg)) { } + ~SWIG_CException() { free(const_cast(msg)); } const int code; const char* const msg; @@ -43,7 +44,6 @@ private: static thread_local SWIG_CException* PendingException; SWIG_CException(int code, const char* msg) : code(code), msg(strdup(msg)) { } - ~SWIG_CException() { free(const_cast(msg)); } SWIG_CException& operator=(const SWIG_CException& ex); }; From c4187f495f33021e89b91430dca4c69a147e9351 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Dec 2021 03:50:13 +0100 Subject: [PATCH 449/508] Fix definition of move assignment operator for wrapper classes Classes not deriving from another class in the hierarchy must take care of freeing their current pointer before reassigning it. This should have been part of 3f3438093 (Define move ctor and assignment operator for C++ wrappers, 2021-11-24). --- Source/Modules/c.cxx | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 16424b400..982b03ea7 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -372,6 +372,7 @@ public: ); class_node_ = n; + dtor_wname_ = NULL; has_copy_ctor_ = false; } @@ -569,6 +570,9 @@ public: cindent, "}\n", NIL ); + + // We're also going to need this in move assignment operator. + dtor_wname_ = wname; } } else if (is_member) { // Wrapper parameters list may or not include "this" pointer and may or not have other parameters, so construct it piecewise for simplicity. @@ -703,11 +707,24 @@ public: "swig_self_{obj.swig_self_}, swig_owns_self_{obj.swig_owns_self_} { " "obj.swig_owns_self_ = false; " "}\n", - cindent, classname, "& operator=(", classname, "&& obj) noexcept { " - "swig_self_ = obj.swig_self_; swig_owns_self_ = obj.swig_owns_self_; " - "obj.swig_owns_self_ = false; " - "return *this; " - "}\n", + cindent, classname, "& operator=(", classname, "&& obj) noexcept {\n", + NIL + ); + + if (dtor_wname_) { + Printv(cxx_wrappers_.sect_decls, + cindent, cindent, "if (swig_owns_self_)\n", + cindent, cindent, cindent, dtor_wname_, "(swig_self_);\n", + NIL + ); + } + + Printv(cxx_wrappers_.sect_decls, + cindent, cindent, "swig_self_ = obj.swig_self_;\n", + cindent, cindent, "swig_owns_self_ = obj.swig_owns_self_;\n", + cindent, cindent, "obj.swig_owns_self_ = false;\n", + cindent, cindent, "return *this;\n", + cindent, "}\n", NIL ); } @@ -1091,6 +1108,9 @@ private: type_desc* ptype_desc_; type_desc* rtype_desc_; + // Name of the C function used for deleting the owned object, if any. + String* dtor_wname_; + // True if the class defines an explicit copy ctor. bool has_copy_ctor_; From 628e2cf6d255c6baf0962e3e249d8db5d42bec66 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 4 Dec 2021 17:34:58 +0100 Subject: [PATCH 450/508] Make std::{set,map} has() and has_key() methods const They don't modify the object, so should be callable on const objects. --- Lib/c/std_map.i | 4 ++-- Lib/c/std_set.i | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/c/std_map.i b/Lib/c/std_map.i index e42d2aecd..42d620827 100644 --- a/Lib/c/std_map.i +++ b/Lib/c/std_map.i @@ -52,8 +52,8 @@ namespace std { else throw std::out_of_range("key not found"); } - bool has_key(const K& key) { - std::map< K, T, C >::iterator i = self->find(key); + bool has_key(const K& key) const { + std::map< K, T, C >::const_iterator i = self->find(key); return i != self->end(); } } diff --git a/Lib/c/std_set.i b/Lib/c/std_set.i index 6bc7ba465..1127a0a50 100644 --- a/Lib/c/std_set.i +++ b/Lib/c/std_set.i @@ -40,7 +40,7 @@ namespace std { bool del(const T& item) { return self->erase(item) != 0; } - bool has(const T& item) { + bool has(const T& item) const { return self->count(item) != 0; } } From aacc930023a9bbd1fd7aaf73b918f8dd7934b014 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Dec 2021 03:05:30 +0100 Subject: [PATCH 451/508] Streamline and improve std::string typemaps Avoid unnecessary heap allocations, just use temporary variables. Actually update the string parameters passed by pointer/non-const reference. This requires the pointers passed to actually be non-const, so update the C-specific unit test runme to use a char buffer instead of a literal string. Also simplify the code copying the string contents to just use strdup() (if there are ever any platforms where this POSIX functions is not available, we could just define it ourselves once instead of using strlen() + malloc() + memcpy() manually twice). --- .../c_backend_cpp_natural_std_string_runme.c | 3 +- Lib/c/std_string.i | 84 +++++++++++-------- 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c index 03cabedd9..cb605e00e 100644 --- a/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c +++ b/Examples/test-suite/c/c_backend_cpp_natural_std_string_runme.c @@ -6,7 +6,8 @@ int main() { - char *myComposedString = c_backend_cpp_natural_std_string_myStringAppend("World, ", "Hello!"); + char buf[] = "World, "; + char *myComposedString = c_backend_cpp_natural_std_string_myStringAppend(buf, "Hello!"); assert(myComposedString); assert(strcmp(myComposedString, "World, Hello!") == 0); diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index 546d34a41..cf2dee864 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -2,6 +2,31 @@ #include %} +%fragment("SwigStrInOut", "header") { +class SwigStrInOut { + std::string str_; + char* ptr_; + size_t len_; +public: + void init(char* ptr) { + ptr_ = ptr; + if (ptr_) { + str_ = ptr_; + len_ = str_.length(); + } + } + + std::string* str() { return &str_; } + + ~SwigStrInOut() { + if (ptr_) { + memcpy(ptr_, str_.c_str(), len_); + ptr_[len_] = '\0'; + } + } +}; +} + namespace std { // use "const string &" typemaps for wrapping member strings @@ -9,49 +34,34 @@ namespace std { class string; -%typemap(ctype) string "char *" +%typemap(ctype) string, const string & "const char *" %typemap(ctype) string * "char *" %typemap(ctype) string & "char *" -%typemap(ctype) const string & "char *" -%typemap(in) string { - if ($input) { - $1.assign($input); - } - else { - $1.resize(0); - } -} +%typemap(in) string %{ + if ($input) + $1 = $input; +%} -%typemap(in) const string &, string *, string & { - if ($input) { - $1 = new std::string($input); - } - else { - $1 = new std::string(); - $1->resize(0); - } -} +%typemap(in) const string & (std::string temp) %{ + if ($input) + temp = $input; + $1 = &temp; +%} -%typemap(freearg) const string &, string *, string & { - if ($1) - delete $1; -} +%typemap(in, fragment="SwigStrInOut") string * (SwigStrInOut temp), string & (SwigStrInOut temp) %{ + temp.init($input); + $1 = temp.str(); +%} -%typemap(out) string { - const char *str = cppresult.c_str(); - size_t len = strlen(str); - $result = (char *) malloc(len + 1); - memcpy($result, str, len); - $result[len] = '\0'; -} +// Note that we don't support strings with embedded NULs, as there is no way to +// return their length to C code anyhow. +%typemap(out) string %{ + $result = strdup(cppresult.c_str()); +%} -%typemap(out) const string &, string *, string & { - const char *str = cppresult->c_str(); - size_t len = strlen(str); - $result = (char *) malloc(len + 1); - memcpy($result, str, len); - $result[len] = '\0'; -} +%typemap(out) const string &, string *, string & %{ + $result = strdup(cppresult->c_str()); +%} } From 4a3ae6f8d3959fbbf0b9de629c94727f00e8d24f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Dec 2021 20:24:38 +0100 Subject: [PATCH 452/508] Don't generate C++ wrappers for overridden virtual functions This is harmless, but also useless, as the implementation is the same as the existing one in the base class anyhow. --- Source/Modules/c.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 982b03ea7..199ca260a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -393,6 +393,11 @@ public: if (Getattr(n, "c:inherited_from")) return; + // And we even don't need to redeclare virtual functions actually overridden in the derived class, as their implementation is the same as in the base class + // anyhow, so don't bother generating needless extra code. + if (Getattr(n, "override")) + return; + // Also ignore friend function declarations: they appear inside the class, but we shouldn't generate any wrappers for them. if (Checkattr(n, "storage", "friend")) return; From a335fff2ec6303cb54d03596d266d2cff149f85d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Dec 2021 20:49:20 +0100 Subject: [PATCH 453/508] Avoid errors due to generating identical overloads Add typecheck typemaps for primitive types and string and call Swig_overload_check() to ensure that we don't generate two wrappers functions taking the same "const char*" type if we have overloads taking it and "std::string" (or a reference) in the original code. --- Lib/c/c.swg | 84 ++++++++++++++++++++++++++++++++++++++++++++ Lib/c/std_string.i | 4 +++ Source/Modules/c.cxx | 8 +++++ 3 files changed, 96 insertions(+) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 67da4e96c..081955d51 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -239,6 +239,90 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;") $result = ($1_ltype) 0; } +/* Typecheck typemaps - The purpose of these is merely to issue a warning for overloaded C++ functions + * that cannot be overloaded in the wrappers as more than one C++ type maps to a single C type */ + +%typecheck(SWIG_TYPECHECK_BOOL) + bool, + const bool & + "" + +%typecheck(SWIG_TYPECHECK_CHAR) + char, + const char & + "" + +%typecheck(SWIG_TYPECHECK_INT8) + signed char, + const signed char & + "" + +%typecheck(SWIG_TYPECHECK_UINT8) + unsigned char, + const unsigned char & + "" + +%typecheck(SWIG_TYPECHECK_INT16) + short, + const short & + "" + +%typecheck(SWIG_TYPECHECK_UINT16) + unsigned short, + const unsigned short & + "" + +%typecheck(SWIG_TYPECHECK_INT32) + int, + long, + const int &, + const long & + "" + +%typecheck(SWIG_TYPECHECK_UINT32) + unsigned int, + unsigned long, + const unsigned int &, + const unsigned long & + "" + +%typecheck(SWIG_TYPECHECK_INT64) + long long, + const long long & + "" + +%typecheck(SWIG_TYPECHECK_UINT64) + unsigned long long, + const unsigned long long & + "" + +%typecheck(SWIG_TYPECHECK_FLOAT) + float, + const float & + "" + +%typecheck(SWIG_TYPECHECK_DOUBLE) + double, + const double & + "" + +%typecheck(SWIG_TYPECHECK_STRING) + char *, + char *&, + char[ANY], + char[] + "" + +%typecheck(SWIG_TYPECHECK_POINTER) + SWIGTYPE, + SWIGTYPE *, + SWIGTYPE &, + SWIGTYPE &&, + SWIGTYPE *const&, + SWIGTYPE [], + SWIGTYPE (CLASS::*) + "" + #ifdef SWIG_CPPMODE %insert("runtime") %{ diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index cf2dee864..896fa7195 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -64,4 +64,8 @@ class string; $result = strdup(cppresult->c_str()); %} +// This is required to warn about clashes between the overloaded functions +// taking strings and raw pointers in the generated wrappers. +%typemap(typecheck) string, const string &, string *, string & = char *; + } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 199ca260a..3b6990d32 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -402,6 +402,14 @@ public: if (Checkattr(n, "storage", "friend")) return; + // Usually generating wrappers for overloaded methods is fine, but sometimes their types can clash after applying typemaps and in this case we have no + // choice but to avoid generating them, as otherwise we'd just generate uncompilable code. + if (Getattr(n, "sym:overloaded")) { + Swig_overload_check(n); + if (Getattr(n, "overload:ignore")) + return; + } + temp_ptr_setter set(&node_func_, n); // As mentioned elsewhere, we can't use Swig_storage_isstatic() here because the "storage" attribute is temporarily saved in another view when this From 7c46ff1b6e2be624841ac9320a63be0631c7c609 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 04:25:44 +0100 Subject: [PATCH 454/508] Add "cxxheader" section to allow injecting extra C++ declarations This can also be used to include extra C++ headers. Document this section as well as the already existing "cheader" one. --- Doc/Manual/C.html | 12 ++++++++++++ Source/Modules/c.cxx | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index eb9089d0c..a31329200 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -199,6 +199,15 @@ This will compile the application code (runme.c) and link it against th Wrapping C functions and variables is obviously performed in a straightforward way. There is no need to perform type conversions, and all language constructs can be preserved in their original form. However, SWIG allows you to enhance the code with some additional elements, for instance using check typemap or %extend directive.

    +

    +It is also possible to output arbitrary additional code into the generated header by using %insert directive with cheader section, e.g. +

    +%insert("cheader") %{
+#include "another.h"
+%}
+
    +

    +

    36.3.1 Functions

    @@ -668,5 +677,8 @@ Other ones are due to things that could be supported but haven't been implemente

    +Note that cxxheader section can be used to output additional +declarations to the C++-only part of the generated header. + diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 3b6990d32..5898619d5 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -251,13 +251,17 @@ struct cxx_wrappers // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. cxx_wrappers() : except_check_start(NULL), except_check_end(NULL), - sect_types(NULL), sect_decls(NULL), sect_impls(NULL) { + sect_cxx_h(NULL), sect_types(NULL), sect_decls(NULL), sect_impls(NULL) { } void initialize() { + sect_cxx_h = NewStringEmpty(); sect_types = NewStringEmpty(); sect_decls = NewStringEmpty(); sect_impls = NewStringEmpty(); + + // Allow using SWIG directive to inject code here. + Swig_register_filebyname("cxxheader", sect_cxx_h); } // This function must be called after initialize(). The two can't be combined because we don't yet know if we're going to use exceptions or not when we @@ -307,6 +311,10 @@ struct cxx_wrappers // The order of the members here is the same as the order in which they appear in the output file. + // This section doesn't contain anything by default but can be used by typemaps etc. It is the only section outside of the namespace in which all the other + // declaration live. + String* sect_cxx_h; + // This section contains forward declarations of the classes. String* sect_types; @@ -1619,6 +1627,7 @@ public: } Printv(f_wrappers_h, "#ifdef __cplusplus\n\n", NIL); + Dump(cxx_wrappers_.sect_cxx_h, f_wrappers_h); // Generate possibly nested namespace declarations, as unfortunately we can't rely on C++17 nested namespace definitions being always available. scoped_dohptr cxx_ns_end(NewStringEmpty()); From 4ab28437a7f5b46879a69e3a017c87b37bb8c419 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 03:06:05 +0100 Subject: [PATCH 455/508] Separate cxx_rtype_desc from type_desc class Maintaining just wrapper start/end fragments is too limiting, at least for the return type, so allow making the "return action" a formatted string in which the return value can be inserted at any place. This will allow making return types more customizable in the upcoming commits, but there are no changes yet, this is just a refactoring. --- Source/Modules/c.cxx | 245 ++++++++++++++++++++++++------------------- 1 file changed, 139 insertions(+), 106 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 5898619d5..ebef75b52 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -325,6 +325,75 @@ struct cxx_wrappers String* sect_impls; }; +/* + Information about the function return type. + */ +class cxx_rtype_desc +{ +public: + // Default ctor creates a "void" return type. + cxx_rtype_desc() {} + + // If this returns true, get_return_code() can't be called. + bool is_void() const { + return !type_; + } + + // This function must be called before calling get_return_code(). + void set_type(String* type) { + type_ = Copy(type); + } + + // This function must also be called before calling get_return_code(). + // + // NB: It takes ownership of the string, the intended use is to pass it NewStringf(...). + void set_return_value(String* new_string) { + value_ = new_string; + } + + // This function may be called to change the return code from the simple "return %s;" which is the default. + // + // The argument must contain exactly one "%s" in it, which will be replaced with the return value itself. + // + // NB: It also takes the ownership of the string, as with set_return_value() it's intended to be used with NewStringf(). + void set_return_action(String* new_string) { + action_ = new_string; + } + + // Simpler variant of set_return_action() which allows to omit the leading return and the trailing semicolon if the action is of the form "return something". + void set_return_expr(String* new_string) { + action_ = NewStringf("return %s;", new_string); + Delete(new_string); + } + + // Return the function return type: can always be called, even for void functions (for which it just returns "void"). + String* type() const { + return type_ ? type_ : get_void_type(); + } + + // Return the string containing the code for returning the value, previously set by set_return_value(). + // + // The returned string ends with a semicolon, i.e. is a complete statement (or possibly more than one). + // + // Asserts unless both set_type() and set_return_value() had been called. + scoped_dohptr get_return_code() const { + assert(type_); + assert(value_); + + return scoped_dohptr(NewStringf(action_ ? Char(action_) : "return %s;", value_.get())); + } + +private: + static String* get_void_type() { + static String* const void_type = NewString("void"); + return void_type; + } + + scoped_dohptr type_; + scoped_dohptr value_; + scoped_dohptr action_; +}; + /* cxx_class_wrapper @@ -340,7 +409,7 @@ public: class_node_ = NULL; node_func_ = NULL; - rtype_desc_ = + rtype_desc_ = NULL; ptype_desc_ = NULL; if (!cxx_wrappers_.is_initialized()) @@ -428,10 +497,9 @@ public: // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. - type_desc rtype_desc; + cxx_rtype_desc rtype_desc; if (SwigType_type(Getattr(n, "type")) != T_VOID) { - rtype_desc = lookup_cxx_ret_type(n); - if (!rtype_desc.type()) { + if (!lookup_cxx_ret_type(rtype_desc, n)) { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), "No ctype typemap defined for the return type \"%s\" of %s\n", SwigType_str(Getattr(n, "type"), NULL), @@ -439,9 +507,6 @@ public: ); return; } - } else { - // There is no need to do anything else with "void" and we don't even need "return" for it. - rtype_desc.set_void_type(); } // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. @@ -513,13 +578,10 @@ public: if (Checkattr(n, "kind", "variable")) { if (Checkattr(n, "memberget", "1")) { + rtype_desc.set_return_value(NewStringf("%s(swig_self())", Getattr(n, "sym:name"))); Printv(cxx_wrappers_.sect_decls, cindent, rtype_desc.type(), " ", name, "() const " - "{ ", - "return ", rtype_desc.wrap_start(), - Getattr(n, "sym:name"), "(swig_self())", - rtype_desc.wrap_end(), - "; }\n", + "{ ", rtype_desc.get_return_code().get(), " }\n", NIL ); } else if (Checkattr(n, "memberset", "1")) { @@ -529,13 +591,10 @@ public: NIL ); } else if (Checkattr(n, "varget", "1")) { + rtype_desc.set_return_value(NewStringf("%s()", Getattr(n, "sym:name"))); Printv(cxx_wrappers_.sect_decls, cindent, "static ", rtype_desc.type(), " ", name, "() " - "{ ", - "return ", rtype_desc.wrap_start(), - Getattr(n, "sym:name"), "()", - rtype_desc.wrap_end(), - "; }\n", + "{ ", rtype_desc.get_return_code().get(), " }\n", NIL ); } else if (Checkattr(n, "varset", "1")) { @@ -624,34 +683,25 @@ public: if (rtype_desc.is_void()) { Printv(cxx_wrappers_.sect_impls, - wname, "(", wparms.get(), ")", + wname, "(", wparms.get(), ");", NIL ); if (*except_check_start) { Printv(cxx_wrappers_.sect_impls, - "; ", + " ", except_check_start, except_check_end, + ";", NIL ); } } else { - Printv(cxx_wrappers_.sect_impls, - "return ", - rtype_desc.wrap_start(), - except_check_start, - wname, "(", wparms.get(), ")", - except_check_end, - rtype_desc.wrap_end(), - NIL - ); + rtype_desc.set_return_value(NewStringf("%s%s(%s)%s", except_check_start, wname, wparms.get(), except_check_end)); + Append(cxx_wrappers_.sect_impls, rtype_desc.get_return_code()); } - Printv(cxx_wrappers_.sect_impls, - "; }\n", - NIL - ); + Append(cxx_wrappers_.sect_impls, " }\n"); } else { // This is something we don't know about Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), @@ -817,9 +867,6 @@ private: // String must be non-null. void set_type(String* type) { type_ = Copy(type); } - void set_void_type() { type_ = NewString("void"); } - - bool is_void() const { return type_ && Cmp(type_, "void") == 0; } // If this one returns NULL, it means that we don't have any type information at all. String* type() const { return type_; } @@ -862,7 +909,7 @@ private: // // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). - static void do_resolve_type(Node* n, String* type, String* s, type_desc* ptype_desc, type_desc* rtype_desc) { + static void do_resolve_type(Node* n, String* type, String* s, type_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { enum TypeKind { Type_Ptr, @@ -933,49 +980,48 @@ private: else if (SwigType_isreference(type)) Append(typestr, " &"); - scoped_dohptr rtype_cast(enumname ? NewStringf("(%s)", typestr.get()) : NewStringEmpty()); + if (enumname) { + switch (typeKind) { + case Type_Ptr: + if (rtype_desc) { + rtype_desc->set_return_expr(NewStringf("(%s)%%s", typestr.get())); + } - switch (typeKind) { - case Type_Ptr: - if (rtype_desc) { - Append(rtype_desc->wrap_start(), rtype_cast); - } - - if (ptype_desc) { - if (enumname) + if (ptype_desc) { Printv(ptype_desc->wrap_start(), "(", enumname, "*)", NIL); - } - break; + } + break; - case Type_Ref: - if (rtype_desc) { - Printv(rtype_desc->wrap_start(), rtype_cast.get(), "*(", NIL); - Append(rtype_desc->wrap_end(), ")"); - } + case Type_Ref: + if (rtype_desc) { + rtype_desc->set_return_expr(NewStringf("(%s)(*(%%s))", typestr.get())); + } - if (ptype_desc) { - if (enumname) + if (ptype_desc) { Printv(ptype_desc->wrap_start(), "(", enumname, "*)", NIL); - Append(ptype_desc->wrap_start(), "&"); - } - break; + } + break; - case Type_Enm: - if (rtype_desc) { - Append(rtype_desc->wrap_start(), rtype_cast); - } + case Type_Enm: + if (rtype_desc) { + rtype_desc->set_return_expr(NewStringf("(%s)%%s", typestr.get())); + } - if (ptype_desc) { - if (enumname) + if (ptype_desc) { Printv(ptype_desc->wrap_start(), "(", enumname, ")", NIL); - } - break; + } + break; - case Type_Obj: - case Type_Max: - // Unreachable, but keep here to avoid -Wswitch warnings. - assert(0); + case Type_Obj: + case Type_Max: + // Unreachable, but keep here to avoid -Wswitch warnings. + assert(0); + } } + + // This is the only thing we need to do even when we don't have the enum name. + if (typeKind == Type_Ref && ptype_desc) + Append(ptype_desc->wrap_start(), "&"); } else { scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); @@ -1006,13 +1052,10 @@ private: if (rtype_desc) { if (classname) { - // We generate here an immediately-invoked lambda, as we need something that can appear after a "return". - Append(rtype_desc->wrap_start(), "[=] { auto swig_res = "); - Printv(rtype_desc->wrap_end(), - "; " - "return swig_res ? new ", classname, "(swig_res, ", owns, ") : nullptr; }()", - NIL - ); + rtype_desc->set_return_action(NewStringf("auto swig_res = %%s; " + "return swig_res ? new %s(swig_res, %s) : nullptr;", + classname, owns + )); } } break; @@ -1024,14 +1067,7 @@ private: // must be constructed using the special ctor not taking the pointer ownership. typestr = Copy(classname); - Printv(rtype_desc->wrap_start(), - classname, "{", - NIL - ); - Printv(rtype_desc->wrap_end(), - ", false}", - NIL - ); + rtype_desc->set_return_expr(NewStringf("%s{%%s, false}", classname)); } else { // We can't do anything at all in this case. Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); @@ -1046,21 +1082,18 @@ private: case Type_Obj: if (rtype_desc) { if (classname) { - // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened. - Printv(rtype_desc->wrap_start(), - typestr.get(), "(", - NIL - ); - - // Normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this seems - // not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for shared_ptr<> for example. + // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened, so we don't test + // for it here, unlike in Type_Ptr case. + // + // Also, normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this + // seems not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for e.g. shared_ptr<>. // // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap // expansion and so may not be a reference any more. - Printv(rtype_desc->wrap_end(), - ", ", SwigType_isreference(Getattr(n, "type")) ? owns : "true", ")", - NIL - ); + rtype_desc->set_return_expr(NewStringf("%s{%%s, %s}", + typestr.get(), + SwigType_isreference(Getattr(n, "type")) ? owns : "true" + )); } else { Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); } @@ -1099,18 +1132,18 @@ private: return ptype_desc; } - type_desc lookup_cxx_ret_type(Node* n) { - type_desc rtype_desc; - + bool lookup_cxx_ret_type(cxx_rtype_desc& rtype_desc, Node* n) { // As above, ensure our replaceSpecialVariables() is used. - temp_ptr_setter set(&rtype_desc_, &rtype_desc); + temp_ptr_setter set(&rtype_desc_, &rtype_desc); - if (String* type = Swig_typemap_lookup("ctype", n, "", NULL)) { - rtype_desc.set_type(type); - do_resolve_type(n, Getattr(n, "type"), rtype_desc.type(), NULL, &rtype_desc); - } + String* type = Swig_typemap_lookup("ctype", n, "", NULL); + if (!type) + return false; - return rtype_desc; + rtype_desc.set_type(type); + do_resolve_type(n, Getattr(n, "type"), rtype_desc.type(), NULL, &rtype_desc); + + return true; } @@ -1127,7 +1160,7 @@ private: // These pointers are temporarily set to non-null value only while expanding a typemap for C++ wrappers, see replaceSpecialVariables(). Node* node_func_; type_desc* ptype_desc_; - type_desc* rtype_desc_; + cxx_rtype_desc* rtype_desc_; // Name of the C function used for deleting the owned object, if any. String* dtor_wname_; From e3a13016982038e049d5c8957aefabff1394292d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 16:53:44 +0100 Subject: [PATCH 456/508] Rename cxx_rtype_desc::set_return_xxx() to apply_out_typemap() Instead of using ad hoc terminology, just call the string used here a typemap because this is what it actually is. Also keep just a single function and prepend "$result =" to it automatically if necessary, as this is more convenient. Still no real changes, but this will make it simpler to add support for user-specified cxxout typemap. --- Source/Modules/c.cxx | 96 +++++++++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 27 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index ebef75b52..9c37ab25f 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -351,19 +351,16 @@ public: value_ = new_string; } - // This function may be called to change the return code from the simple "return %s;" which is the default. + // This function applies the given typemap, which must set $result variable from $cresult containing the result of C wrapper function call. // - // The argument must contain exactly one "%s" in it, which will be replaced with the return value itself. + // If it is not called, the trivial "$result = $cresult" typemap is used and, in fact, the extra variables are optimized away and just "return $cresult" is + // generated directly for brevity. // - // NB: It also takes the ownership of the string, as with set_return_value() it's intended to be used with NewStringf(). - void set_return_action(String* new_string) { - action_ = new_string; - } - - // Simpler variant of set_return_action() which allows to omit the leading return and the trailing semicolon if the action is of the form "return something". - void set_return_expr(String* new_string) { - action_ = NewStringf("return %s;", new_string); - Delete(new_string); + // If the string doesn't start with "$result = ", it is prepended to it implicitly, for convenience. + // + // NB: It takes ownership of the string, which is typically returned from Swig_typemap_lookup(). + void apply_out_typemap(String* new_out_tm_string) { + out_tm_ = new_out_tm_string; } // Return the function return type: can always be called, even for void functions (for which it just returns "void"). @@ -380,7 +377,53 @@ public: assert(type_); assert(value_); - return scoped_dohptr(NewStringf(action_ ? Char(action_) : "return %s;", value_.get())); + if (!out_tm_) { + // Trivial case when we return the same value, just do it. + // + // Add extra spaces after/before opening/closing braces because we keep everything on the same line in this case. + return scoped_dohptr(NewStringf(" return %s; ", value_.get())); + } + + // We need to start by introducing a temporary variable for the C call result because if $cresult is used twice by the typemap, we don't want to call the + // function twice. Note that just "auto" is enough because C functions can't return references, but we need "auto&&" for C++ result which can be anything + // (defined by the user in their typemaps). + scoped_dohptr code(NewStringf( + "\n" + "%sauto swig_cres = %s;\n", + cindent, value_.get() + )); + + // We support 2 cases: either typemap is a statement, or multiple statements, containing assignment to $result, in which case this assignment must occur at + // its beginning. + bool const has_result = strstr(Char(out_tm_), "$result = ") != NULL; + if (has_result) { + Printv(code, cindent, "auto&& ", NIL); + } else { + // Or the typemap is just an expression, which can be returned directly, without defining $result at all. Note that this is more than an optimization as + // it allows the generated code to work even with non-copyable classes. + Printv(code, cindent, "return ", NIL); + } + + // Skip leading whitespace and chop the trailing whitespace from the typemap to keep indentation consistent. + const char* tm = Char(out_tm_); + while (isspace(*tm)) + ++tm; + Append(code, tm); + Chop(code); + + if ((Char(code))[Len(code) - 1] != ';') + Append(code, ";"); + + Replaceall(code, "$cresult", "swig_cres"); + + if (has_result) { + Printf(code, "\n%sreturn $result;\n", cindent); + Replaceall(code, "$result", "swig_cxxres"); + } else { + Append(code, "\n"); + } + + return code; } private: @@ -391,7 +434,7 @@ private: scoped_dohptr type_; scoped_dohptr value_; - scoped_dohptr action_; + scoped_dohptr out_tm_; }; /* @@ -581,7 +624,7 @@ public: rtype_desc.set_return_value(NewStringf("%s(swig_self())", Getattr(n, "sym:name"))); Printv(cxx_wrappers_.sect_decls, cindent, rtype_desc.type(), " ", name, "() const " - "{ ", rtype_desc.get_return_code().get(), " }\n", + "{", rtype_desc.get_return_code().get(), "}\n", NIL ); } else if (Checkattr(n, "memberset", "1")) { @@ -594,7 +637,7 @@ public: rtype_desc.set_return_value(NewStringf("%s()", Getattr(n, "sym:name"))); Printv(cxx_wrappers_.sect_decls, cindent, "static ", rtype_desc.type(), " ", name, "() " - "{ ", rtype_desc.get_return_code().get(), " }\n", + "{", rtype_desc.get_return_code().get(), "}\n", NIL ); } else if (Checkattr(n, "varset", "1")) { @@ -677,22 +720,21 @@ public: "inline ", rtype_desc.type(), " ", classname, "::", name, "(", parms_cxx.get(), ")", get_const_suffix(n), - " { ", + " {", NIL ); if (rtype_desc.is_void()) { Printv(cxx_wrappers_.sect_impls, - wname, "(", wparms.get(), ");", + " ", wname, "(", wparms.get(), "); ", NIL ); if (*except_check_start) { Printv(cxx_wrappers_.sect_impls, - " ", except_check_start, except_check_end, - ";", + "; ", NIL ); } @@ -701,7 +743,7 @@ public: Append(cxx_wrappers_.sect_impls, rtype_desc.get_return_code()); } - Append(cxx_wrappers_.sect_impls, " }\n"); + Append(cxx_wrappers_.sect_impls, "}\n"); } else { // This is something we don't know about Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), @@ -984,7 +1026,7 @@ private: switch (typeKind) { case Type_Ptr: if (rtype_desc) { - rtype_desc->set_return_expr(NewStringf("(%s)%%s", typestr.get())); + rtype_desc->apply_out_typemap(NewStringf("(%s)$cresult", typestr.get())); } if (ptype_desc) { @@ -994,7 +1036,7 @@ private: case Type_Ref: if (rtype_desc) { - rtype_desc->set_return_expr(NewStringf("(%s)(*(%%s))", typestr.get())); + rtype_desc->apply_out_typemap(NewStringf("(%s)(*($cresult))", typestr.get())); } if (ptype_desc) { @@ -1004,7 +1046,7 @@ private: case Type_Enm: if (rtype_desc) { - rtype_desc->set_return_expr(NewStringf("(%s)%%s", typestr.get())); + rtype_desc->apply_out_typemap(NewStringf("(%s)$cresult", typestr.get())); } if (ptype_desc) { @@ -1052,8 +1094,8 @@ private: if (rtype_desc) { if (classname) { - rtype_desc->set_return_action(NewStringf("auto swig_res = %%s; " - "return swig_res ? new %s(swig_res, %s) : nullptr;", + rtype_desc->apply_out_typemap(NewStringf( + "$cresult ? new %s($cresult, %s) : nullptr;", classname, owns )); } @@ -1067,7 +1109,7 @@ private: // must be constructed using the special ctor not taking the pointer ownership. typestr = Copy(classname); - rtype_desc->set_return_expr(NewStringf("%s{%%s, false}", classname)); + rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, false}", classname)); } else { // We can't do anything at all in this case. Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); @@ -1090,7 +1132,7 @@ private: // // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap // expansion and so may not be a reference any more. - rtype_desc->set_return_expr(NewStringf("%s{%%s, %s}", + rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, %s}", typestr.get(), SwigType_isreference(Getattr(n, "type")) ? owns : "true" )); From 8b871b10fe27f518b63d5df19bcceec51e12288a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 16:58:00 +0100 Subject: [PATCH 457/508] Replace type_desc with cxx_ptype_desc This is similar to the last two commits for cxx_rtype_desc and uses a more appropriate and more specific class for holding parameter type description. This is just a refactoring, no real changes yet. --- Source/Modules/c.cxx | 98 ++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 9c37ab25f..05c9d3a5b 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -437,6 +437,47 @@ private: scoped_dohptr out_tm_; }; +/* + Information about a function parameter. + + This is similar to cxx_rtype_desc, but is used for the parameters and not the return type. + */ +class cxx_ptype_desc +{ +public: + // Ctor initializes the object to an empty/unknown state, call set_type() later to finish initialization. + cxx_ptype_desc() {} + + // This function must be called (with a non-null string) before calling get_param_code(). + void set_type(String* type) { type_ = Copy(type); } + + // If this one returns NULL, it means that we don't have any type information at all. + String* type() const { return type_; } + + // This may be called before calling get_param_code() if a translation from C++ to C type is necessary. By default the parameter is passed "as is". + void apply_in_typemap(String* new_in_tm_string) { + in_tm_ = new_in_tm_string; + } + + // Return the full expression needed to pass the given value as parameter to C wrapper function. + scoped_dohptr get_param_code(String* value) const { + assert(type_); + + if (!in_tm_) { + return scoped_dohptr(Copy(value)); + } + + // There doesn't seem to be any simple way to use the full SWIG typemap expansion machinery here, so just do it manually. + scoped_dohptr code(Copy(in_tm_)); + Replace(code, "$1", value, DOH_REPLACE_NUMBER_END); + return code; + } + +private: + scoped_dohptr type_; + scoped_dohptr in_tm_; +}; + /* cxx_class_wrapper @@ -598,7 +639,7 @@ public: if (Len(parms_call)) Append(parms_call, ", "); - Printv(parms_call, ptype_desc.wrap_start(), name, ptype_desc.wrap_end(), NIL); + Append(parms_call, ptype_desc.get_param_code(name)); } // Avoid checking for exceptions unnecessarily. Note that this is more than an optimization: we'd get into infinite recursion if we checked for exceptions @@ -899,31 +940,6 @@ public: } private: - // This struct contains the type itself and, optionally, wrappers around expressions of this type: start part goes before the expression and the end part - // after it (and both parts may be empty). - class type_desc - { - public: - // Ctor initializes the object to an empty/unknown state, call set_type() later to finish initialization. - type_desc() : wrap_start_(NewStringEmpty()), wrap_end_(NewStringEmpty()) {} - - // String must be non-null. - void set_type(String* type) { type_ = Copy(type); } - - // If this one returns NULL, it means that we don't have any type information at all. - String* type() const { return type_; } - - // These ones are always non-NULL (but possibly empty). - String* wrap_start() const { return wrap_start_; } - String* wrap_end() const { return wrap_end_; } - - private: - scoped_dohptr type_; - scoped_dohptr wrap_start_; - scoped_dohptr wrap_end_; - }; - - // Various helpers. // Return the string containing the pointer type used for representing the objects of the given class in the C wrappers. @@ -951,7 +967,7 @@ private: // // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). - static void do_resolve_type(Node* n, String* type, String* s, type_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { + static void do_resolve_type(Node* n, String* type, String* s, cxx_ptype_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { enum TypeKind { Type_Ptr, @@ -1030,7 +1046,7 @@ private: } if (ptype_desc) { - Printv(ptype_desc->wrap_start(), "(", enumname, "*)", NIL); + ptype_desc->apply_in_typemap(NewStringf("(%s*)$1", enumname)); } break; @@ -1040,7 +1056,7 @@ private: } if (ptype_desc) { - Printv(ptype_desc->wrap_start(), "(", enumname, "*)", NIL); + ptype_desc->apply_in_typemap(NewStringf("(%s*)&($1)", enumname)); } break; @@ -1050,7 +1066,7 @@ private: } if (ptype_desc) { - Printv(ptype_desc->wrap_start(), "(", enumname, ")", NIL); + ptype_desc->apply_in_typemap(NewStringf("(%s)$1", enumname)); } break; @@ -1059,11 +1075,11 @@ private: // Unreachable, but keep here to avoid -Wswitch warnings. assert(0); } + } else { + // This is the only thing we need to do even when we don't have the enum name. + if (typeKind == Type_Ref && ptype_desc) + ptype_desc->apply_in_typemap(NewString("&($1)")); } - - // This is the only thing we need to do even when we don't have the enum name. - if (typeKind == Type_Ref && ptype_desc) - Append(ptype_desc->wrap_start(), "&"); } else { scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); @@ -1089,7 +1105,7 @@ private: switch (typeKind) { case Type_Ptr: if (ptype_desc) { - Append(ptype_desc->wrap_end(), "->swig_self()"); + ptype_desc->apply_in_typemap(NewString("$1->swig_self()")); } if (rtype_desc) { @@ -1117,7 +1133,7 @@ private: } if (ptype_desc) { - Append(ptype_desc->wrap_end(), ".swig_self()"); + ptype_desc->apply_in_typemap(NewString("$1.swig_self()")); } break; @@ -1146,7 +1162,7 @@ private: // code related to has_copy_ctor_ in our dtor above), so always pass it by const reference instead. Append(typestr, " const&"); - Append(ptype_desc->wrap_end(), ".swig_self()"); + ptype_desc->apply_in_typemap(NewString("$1.swig_self()")); } break; @@ -1160,11 +1176,11 @@ private: Replaceall(s, typemaps[typeKind], typestr); } - type_desc lookup_cxx_parm_type(Node* n, Parm* p) { - type_desc ptype_desc; + cxx_ptype_desc lookup_cxx_parm_type(Node* n, Parm* p) { + cxx_ptype_desc ptype_desc; // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. - temp_ptr_setter set(&ptype_desc_, &ptype_desc); + temp_ptr_setter set(&ptype_desc_, &ptype_desc); if (String* type = Swig_typemap_lookup("ctype", p, "", NULL)) { ptype_desc.set_type(type); @@ -1201,7 +1217,7 @@ private: // These pointers are temporarily set to non-null value only while expanding a typemap for C++ wrappers, see replaceSpecialVariables(). Node* node_func_; - type_desc* ptype_desc_; + cxx_ptype_desc* ptype_desc_; cxx_rtype_desc* rtype_desc_; // Name of the C function used for deleting the owned object, if any. From fd11a591a30e89ab989aacac8a8b8810b6efe1ad Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 04:27:23 +0100 Subject: [PATCH 458/508] Add cxx{in,out}type typemaps and use them for std::string This makes using returning strings much simpler to use from C++ code as the returned pointers don't have to be deleted manually -- although, of course, this does require an extra allocation and copy and so should be avoided for the very long strings. Add a new runtime test showing how simple and convenient it is to use the functions working with string using the C++ wrappers now. --- Doc/Manual/C.html | 20 ++++ .../c/li_boost_shared_ptr_runme.cxx | 4 +- Examples/test-suite/c/li_std_string_runme.cxx | 26 +++++ Lib/c/std_string.i | 19 ++++ Source/Modules/c.cxx | 96 +++++++++++++------ 5 files changed, 135 insertions(+), 30 deletions(-) create mode 100644 Examples/test-suite/c/li_std_string_runme.cxx diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index a31329200..e69d4f02b 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -476,6 +476,26 @@ area: 7.068583 Type of the result variable used for the return value if the wrapped function is a C++ function + + cxxintype + Defines the type for the parameters of C++ wrapper functions corresponding to this type. By default is the same as ctype, but may sometimes be different to make the functions more convenient to use. For example, ctype for std::string is const char*, but cxxintype typemap for it is std::string const&, i.e. even though the C++ string passed as a raw pointer via C API, the C++ wrapper still accepts a C++ string. If this typemap is defined, cxxin should normally be defined as well. If it is not defined, ctype is used. + + + + cxxouttype + Similar to cxxintype, but is used for the function return values and together with cxxout typemap. Also defaults to ctype if not defined. + + + + cxxin + Defines how to transform cxxintype value to ctype + + + + cxxout + Defines how to transform ctype value returned by a function to cxxouttype + +

    C Typemaps, a Code Generation Walkthrough

    diff --git a/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx b/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx index 42348a037..8d5149f71 100644 --- a/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx +++ b/Examples/test-suite/c/li_boost_shared_ptr_runme.cxx @@ -5,11 +5,11 @@ int main(int argc, const char *argv[]) { { li_boost_shared_ptr::Klass k("me oh my"); - assert( strcmp(k.getValue(), "me oh my") == 0 ); + assert( k.getValue() == "me oh my" ); } { li_boost_shared_ptr::Klass k{li_boost_shared_ptr_factorycreate()}; - assert( strcmp(k.getValue(), "factorycreate") == 0 ); + assert( k.getValue() == "factorycreate" ); } } diff --git a/Examples/test-suite/c/li_std_string_runme.cxx b/Examples/test-suite/c/li_std_string_runme.cxx new file mode 100644 index 000000000..05714fc59 --- /dev/null +++ b/Examples/test-suite/c/li_std_string_runme.cxx @@ -0,0 +1,26 @@ +#include "li_std_string_wrap.h" + +#include + +using namespace li_std_string; + +int main(int argc, const char *argv[]) { + Structure st; + assert( st.MemberString().empty() ); + + st.MemberString("bloordyblop"); + assert( st.MemberString() == "bloordyblop" ); + + assert( st.MemberString2() == "member string 2" ); + + assert( st.ConstMemberString() == "const member string" ); + + st.StaticMemberString(std::string("static bloordyblop")); + assert( st.StaticMemberString() == "static bloordyblop" ); + + assert( Structure::StaticMemberString2() == "static member string 2" ); + assert( Structure::ConstStaticMemberString() == "const static member string" ); + + Foo f; + assert( f.test("1+") == "1+1" ); +} diff --git a/Lib/c/std_string.i b/Lib/c/std_string.i index 896fa7195..e97cad5f3 100644 --- a/Lib/c/std_string.i +++ b/Lib/c/std_string.i @@ -27,6 +27,10 @@ public: }; } +%fragment("include_string", "cxxheader") %{ +#include +%} + namespace std { // use "const string &" typemaps for wrapping member strings @@ -68,4 +72,19 @@ class string; // taking strings and raw pointers in the generated wrappers. %typemap(typecheck) string, const string &, string *, string & = char *; + +// Define typemaps for wrapping strings back into std::string in C++ wrappers +// and accepting strings directly. + +%typemap(cxxintype, fragment="include_string") string, const string & "std::string const&" + +%typemap(cxxin) string, const string & "$1.c_str()" + +%typemap(cxxouttype, fragment="include_string") string, const string & "std::string" + +%typemap(cxxout, noblock="1") string, const string & %{ + $result = std::string($cresult); + free(const_cast($cresult)); +%} + } diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 05c9d3a5b..005b53c45 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -611,35 +611,49 @@ public: } } - for (; p; p = nextSibling(p)) { - // Static variables use fully qualified names, so we can't just use the name directly. - scoped_dohptr name_ptr; - String* name = Getattr(p, "name"); - if (!name) { - // Parameters can also not have any names at all, in which case we use auto-generated one. - name = Getattr(p, "lname"); - } else if (Strstr(name, "::")) { - name_ptr = Swig_scopename_last(name); - name = name_ptr.get(); + if (p) { + // We want to use readable parameter names in our wrappers instead of the autogenerated arg$N if possible, so do it, and do it before calling + // Swig_typemap_attach_parms(), as this uses the parameter names for typemap expansion. + for (Parm* p2 = p; p2; p2 = nextSibling(p2)) { + String* name = Getattr(p, "name"); + if (!name) { + // Can't do anything for unnamed parameters. + continue; + } + + // Static variables use fully qualified names, so we need to strip the scope from them. + scoped_dohptr name_ptr; + if (Strstr(name, "::")) { + name_ptr = Swig_scopename_last(name); + name = name_ptr.get(); + } + + Setattr(p, "lname", name); } - const type_desc ptype_desc = lookup_cxx_parm_type(n, p); - if (!ptype_desc.type()) { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), - "No ctype typemap defined for the parameter \"%s\" of %s\n", - name, - Getattr(n, "sym:name") - ); - return; + Swig_typemap_attach_parms("cxxin", p, NULL); + + for (; p; p = nextSibling(p)) { + String* const name = Getattr(p, "lname"); + + const cxx_ptype_desc ptype_desc = lookup_cxx_parm_type(n, p); + if (!ptype_desc.type()) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), + "No ctype typemap defined for the parameter \"%s\" of %s\n", + name, + Getattr(n, "sym:name") + ); + return; + } + + if (Len(parms_cxx)) + Append(parms_cxx, ", "); + Printv(parms_cxx, ptype_desc.type(), " ", name, NIL); + + if (Len(parms_call)) + Append(parms_call, ", "); + Append(parms_call, ptype_desc.get_param_code(name)); } - - if (Len(parms_cxx)) - Append(parms_cxx, ", "); - Printv(parms_cxx, ptype_desc.type(), " ", name, NIL); - - if (Len(parms_call)) - Append(parms_call, ", "); - Append(parms_call, ptype_desc.get_param_code(name)); } // Avoid checking for exceptions unnecessarily. Note that this is more than an optimization: we'd get into infinite recursion if we checked for exceptions @@ -1006,6 +1020,9 @@ private: // The logic here is somewhat messy because we use the same "$resolved_type*" typemap for pointers/references to both enums and classes, but we actually // need to do quite different things for them. It could probably be simplified by changing the typemaps to be distinct, but this would require also updating // the code for C wrappers generation in substituteResolvedTypeSpecialVariable(). + // + // An even better idea might be to try to define this using cxx{in,out} typemaps for the various types and let the generic SWIG machinery do all the + // matching instead of doing it in the code here. scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); scoped_dohptr base_resolved_type(SwigType_base(resolved_type)); @@ -1182,11 +1199,23 @@ private: // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. temp_ptr_setter set(&ptype_desc_, &ptype_desc); - if (String* type = Swig_typemap_lookup("ctype", p, "", NULL)) { + bool use_cxxin = true; + String* type = Swig_typemap_lookup("cxxintype", p, "", NULL); + if (!type) { + use_cxxin = false; + type = Swig_typemap_lookup("ctype", p, "", NULL); + } + + if (type) { ptype_desc.set_type(type); do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); } + if (use_cxxin) { + if (String* in_tm = Getattr(p, "tmap:cxxin")) + ptype_desc.apply_in_typemap(Copy(in_tm)); + } + return ptype_desc; } @@ -1194,13 +1223,24 @@ private: // As above, ensure our replaceSpecialVariables() is used. temp_ptr_setter set(&rtype_desc_, &rtype_desc); - String* type = Swig_typemap_lookup("ctype", n, "", NULL); + bool use_cxxout = true; + String* type(Swig_typemap_lookup("cxxouttype", n, "", NULL)); + if (!type) { + use_cxxout = false; + type = Swig_typemap_lookup("ctype", n, "", NULL); + } + if (!type) return false; rtype_desc.set_type(type); do_resolve_type(n, Getattr(n, "type"), rtype_desc.type(), NULL, &rtype_desc); + if (use_cxxout) { + if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL)) + rtype_desc.apply_out_typemap(out_tm); + } + return true; } From e2d32f33b2b480ada4e96c666dd3664ba7df17c6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 17:19:14 +0100 Subject: [PATCH 459/508] Add support for "cxxcode" typemap This allows injecting arbitrary code into the generated C++ classes and can be useful for defining extra constructors or operators, for example. --- Doc/Manual/C.html | 5 +++++ Source/Modules/c.cxx | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index e69d4f02b..414171dcf 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -496,6 +496,11 @@ area: 7.068583 Defines how to transform ctype value returned by a function to cxxouttype + + cxxcode + May contain arbitrary code that will be injected in the declaration of the C++ wrapper class corresponding to the given type. Ignored for non-class types. + +

    C Typemaps, a Code Generation Walkthrough

    diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 005b53c45..90c015cc3 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -528,10 +528,22 @@ public: Printv(cxx_wrappers_.sect_decls, "class ", Getattr(n, "sym:name"), base_classes.get(), " {\n" - "public:\n", + "public:", NIL ); + // If we have any extra code, inject it. Note that we need a hack with an artificial extra node to use Swig_typemap_lookup(), as it needs a "type" attribute + // which the class node doesn't have. + scoped_dohptr dummy(NewHash()); + Setattr(dummy, "type", Getattr(n, "name")); + Setfile(dummy, Getfile(n)); + Setline(dummy, Getline(n)); + scoped_dohptr cxxcode(Swig_typemap_lookup("cxxcode", dummy, "", NULL)); + if (!cxxcode || *Char(cxxcode) != '\n') + Append(cxx_wrappers_.sect_decls, "\n"); + if (cxxcode) + Append(cxx_wrappers_.sect_decls, cxxcode); + class_node_ = n; dtor_wname_ = NULL; has_copy_ctor_ = false; From f9b4ea2841dbf795393b392355f1bd9c673f5fba Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 20:22:26 +0100 Subject: [PATCH 460/508] Define a local variable for sym:name attribute No changes, this is just a tiny simplification. --- Source/Modules/c.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 90c015cc3..8011dd5a7 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -499,6 +499,8 @@ public: if (!cxx_wrappers_.is_initialized()) return; + String* const classname = Getattr(n, "sym:name"); + scoped_dohptr base_classes(NewStringEmpty()); if (List *baselist = Getattr(n, "bases")) { for (Iterator i = First(baselist); i.item; i = Next(i)) { @@ -508,7 +510,7 @@ public: if (first_base_) { Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), "Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n", - Getattr(n, "sym:name") + classname ); // Return before initializing class_node_, so that the dtor won't output anything neither. @@ -522,12 +524,12 @@ public: } Printv(cxx_wrappers_.sect_types, - "class ", Getattr(n, "sym:name"), ";\n", + "class ", classname, ";\n", NIL ); Printv(cxx_wrappers_.sect_decls, - "class ", Getattr(n, "sym:name"), base_classes.get(), " {\n" + "class ", classname, base_classes.get(), " {\n" "public:", NIL ); From 8d9f3e88b29880ac32823c8522d7bda95b772428 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 20:22:49 +0100 Subject: [PATCH 461/508] Expand special variables in cxxcode typemap This makes the typemap much more useful, as it can now reference the name of the class it is being expanded for and the type of the C pointer used by it (in principle, the latter could be recovered by using decltype(), but this results in rather verbose code inside static methods where a dummy pointer to the type must be constructed first, so using another special variable seems like a simpler solution). --- Doc/Manual/C.html | 2 +- Source/Modules/c.cxx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 414171dcf..356380210 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -498,7 +498,7 @@ area: 7.068583 cxxcode - May contain arbitrary code that will be injected in the declaration of the C++ wrapper class corresponding to the given type. Ignored for non-class types. + May contain arbitrary code that will be injected in the declaration of the C++ wrapper class corresponding to the given type. Ignored for non-class types. The special variable $cxxclassname is replaced with the name of the class inside this typemap expansion and $cclassptrname is replaced with the name of the pointer type used to represent the class in C wrapper functions. diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 8011dd5a7..0092b1300 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -543,8 +543,11 @@ public: scoped_dohptr cxxcode(Swig_typemap_lookup("cxxcode", dummy, "", NULL)); if (!cxxcode || *Char(cxxcode) != '\n') Append(cxx_wrappers_.sect_decls, "\n"); - if (cxxcode) + if (cxxcode) { + Replaceall(cxxcode, "$cxxclassname", classname); + Replaceall(cxxcode, "$cclassptrname", get_c_class_ptr(n)); Append(cxx_wrappers_.sect_decls, cxxcode); + } class_node_ = n; dtor_wname_ = NULL; From b072b2dc8706dd89c19c14d21b28dc5852682623 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Dec 2021 21:52:21 +0100 Subject: [PATCH 462/508] Represent empty shared pointers by null pointers at C level This is much more convenient and allows checking if the shared pointer is empty easily, unlike before, when it couldn't be done and adding support for it would have required adding extra functions. Also add a way to check whether an object is null in C++ wrappers of the classes handled via shared pointers and static null() method for creating null objects of such classes. --- Lib/c/std_shared_ptr.i | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Lib/c/std_shared_ptr.i b/Lib/c/std_shared_ptr.i index df3b7a669..a82a49c45 100644 --- a/Lib/c/std_shared_ptr.i +++ b/Lib/c/std_shared_ptr.i @@ -17,9 +17,20 @@ SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >* "$typemap(ctype, TYPE)"; -// Typemap for smart pointer type itself. -%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > - "$result = new $1_ltype($1);" +// Typemap for smart pointer type itself: these are somewhat special because we represent empty shared pointers as null pointers at C level because there is +// no advantage in using a non-null pointer in this case, while testing for NULL is much simpler than testing whether a shared pointer is empty. +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > empty) %{ + $1 = $input ? *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr*)$input : empty; %} + +%typemap(in) const SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >& (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > empty) %{ + $1 = $input ? (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr*)$input : ∅ %} + +// Note that "&" here is required because "$1" ends up being SwigValueWrapper and not the shared pointer itself. This is wrong and should be fixed by disabling +// the use of SwigValueWrapper for shared pointers entirely, as it's never needed for them. +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > %{ $result = (&$1 ? new $1_ltype($1) : 0); %} + +// Use of "*" here is due to the fact that "$1" is a pointer, but we want to test the smart pointer itself. +%typemap(out) const SWIG_SHARED_PTR_QNAMESPACE::shared_ptr& %{ $result = (*$1 ? $1 : 0); %} // And for the plain type. %typemap(in) CONST TYPE (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ @@ -50,6 +61,12 @@ %typemap(out, fragment="SWIG_null_deleter") CONST TYPE & %{ $result = (SwigObj*) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr($1 SWIG_NO_NULL_DELETER_$owner);%} +// Allow creating null shared pointers and testing them for validity. +%typemap(cxxcode) TYPE %{ + static $cxxclassname null() { return $cxxclassname{($cclassptrname)nullptr, false}; } + explicit operator bool() const { return swig_self_ != nullptr; } +%} + %enddef %include From 45feb91551b61c1947f0fdcc6487a00401382b45 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 00:09:37 +0100 Subject: [PATCH 463/508] Move cxx_wrappers definition after cxx_{r,p}type_desc No changes, just prepare for starting to use the "desc" classes in cxx_wrappers. --- Source/Modules/c.cxx | 165 ++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 0092b1300..095f52685 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -243,88 +243,6 @@ Node* find_first_named_import(Node* parent) { } -/* - Struct containing information needed only for generating C++ wrappers. -*/ -struct cxx_wrappers -{ - // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. - cxx_wrappers() : - except_check_start(NULL), except_check_end(NULL), - sect_cxx_h(NULL), sect_types(NULL), sect_decls(NULL), sect_impls(NULL) { - } - - void initialize() { - sect_cxx_h = NewStringEmpty(); - sect_types = NewStringEmpty(); - sect_decls = NewStringEmpty(); - sect_impls = NewStringEmpty(); - - // Allow using SWIG directive to inject code here. - Swig_register_filebyname("cxxheader", sect_cxx_h); - } - - // This function must be called after initialize(). The two can't be combined because we don't yet know if we're going to use exceptions or not when we - // initialize the object of this class in C::main(), so this one is called later from C::top(). - void initialize_exceptions(exceptions_support support) { - switch (support) { - case exceptions_support_enabled: - // Generate the functions which will be used in all wrappers to check for the exceptions only in this case, i.e. do not do it if they're already defined - // in another module imported by this one. - Printv(sect_impls, - "inline void swig_check() {\n", - cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", - cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", - cindent, cindent, "delete swig_ex;\n", - cindent, cindent, "SWIG_CException::reset_pending();\n", - cindent, cindent, "throw swig_ex_copy;\n", - cindent, "}\n", - "}\n\n", - "template T swig_check(T x) {\n", - cindent, "swig_check();\n", - cindent, "return x;\n", - "}\n\n", - NIL - ); - - // fall through - - case exceptions_support_imported: - except_check_start = "swig_check("; - except_check_end = ")"; - break; - - case exceptions_support_disabled: - except_check_start = - except_check_end = ""; - break; - } - } - - bool is_initialized() const { return sect_types != NULL; } - - - // Used for generating exception checks around the calls, see initialize_exceptions(). - const char* except_check_start; - const char* except_check_end; - - - // The order of the members here is the same as the order in which they appear in the output file. - - // This section doesn't contain anything by default but can be used by typemaps etc. It is the only section outside of the namespace in which all the other - // declaration live. - String* sect_cxx_h; - - // This section contains forward declarations of the classes. - String* sect_types; - - // Full declarations of the classes. - String* sect_decls; - - // Implementation of the classes. - String* sect_impls; -}; - /* Information about the function return type. */ @@ -478,6 +396,89 @@ private: scoped_dohptr in_tm_; }; + +/* + Struct containing information needed only for generating C++ wrappers. +*/ +struct cxx_wrappers +{ + // Default ctor doesn't do anything, use initialize() if C++ wrappers really need to be generated. + cxx_wrappers() : + except_check_start(NULL), except_check_end(NULL), + sect_cxx_h(NULL), sect_types(NULL), sect_decls(NULL), sect_impls(NULL) { + } + + void initialize() { + sect_cxx_h = NewStringEmpty(); + sect_types = NewStringEmpty(); + sect_decls = NewStringEmpty(); + sect_impls = NewStringEmpty(); + + // Allow using SWIG directive to inject code here. + Swig_register_filebyname("cxxheader", sect_cxx_h); + } + + // This function must be called after initialize(). The two can't be combined because we don't yet know if we're going to use exceptions or not when we + // initialize the object of this class in C::main(), so this one is called later from C::top(). + void initialize_exceptions(exceptions_support support) { + switch (support) { + case exceptions_support_enabled: + // Generate the functions which will be used in all wrappers to check for the exceptions only in this case, i.e. do not do it if they're already defined + // in another module imported by this one. + Printv(sect_impls, + "inline void swig_check() {\n", + cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", + cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", + cindent, cindent, "delete swig_ex;\n", + cindent, cindent, "SWIG_CException::reset_pending();\n", + cindent, cindent, "throw swig_ex_copy;\n", + cindent, "}\n", + "}\n\n", + "template T swig_check(T x) {\n", + cindent, "swig_check();\n", + cindent, "return x;\n", + "}\n\n", + NIL + ); + + // fall through + + case exceptions_support_imported: + except_check_start = "swig_check("; + except_check_end = ")"; + break; + + case exceptions_support_disabled: + except_check_start = + except_check_end = ""; + break; + } + } + + bool is_initialized() const { return sect_types != NULL; } + + + // Used for generating exception checks around the calls, see initialize_exceptions(). + const char* except_check_start; + const char* except_check_end; + + + // The order of the members here is the same as the order in which they appear in the output file. + + // This section doesn't contain anything by default but can be used by typemaps etc. It is the only section outside of the namespace in which all the other + // declaration live. + String* sect_cxx_h; + + // This section contains forward declarations of the classes. + String* sect_types; + + // Full declarations of the classes. + String* sect_decls; + + // Implementation of the classes. + String* sect_impls; +}; + /* cxx_class_wrapper From 9f80bc81137af39479bd268f6b5bd857b56e89af Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 00:10:44 +0100 Subject: [PATCH 464/508] Move void check and error reporting to lookup_cxx_ret_type() This code doesn't belong to emit_member_function() as it's relevant for all functions, not just the member ones. No real changes. --- Source/Modules/c.cxx | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 095f52685..d4dc89ae5 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -600,16 +600,8 @@ public: // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. cxx_rtype_desc rtype_desc; - if (SwigType_type(Getattr(n, "type")) != T_VOID) { - if (!lookup_cxx_ret_type(rtype_desc, n)) { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), - "No ctype typemap defined for the return type \"%s\" of %s\n", - SwigType_str(Getattr(n, "type"), NULL), - Getattr(n, "sym:name") - ); - return; - } - } + if (!lookup_cxx_ret_type(rtype_desc, n)) + return; // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. scoped_dohptr parms_cxx(NewStringEmpty()); @@ -1238,6 +1230,12 @@ private: } bool lookup_cxx_ret_type(cxx_rtype_desc& rtype_desc, Node* n) { + String* const func_type = Getattr(n, "type"); + if (SwigType_type(func_type) == T_VOID) { + // Nothing to do, rtype_desc is void by default. + return true; + } + // As above, ensure our replaceSpecialVariables() is used. temp_ptr_setter set(&rtype_desc_, &rtype_desc); @@ -1248,11 +1246,17 @@ private: type = Swig_typemap_lookup("ctype", n, "", NULL); } - if (!type) + if (!type) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), + "No ctype typemap defined for the return type \"%s\" of %s\n", + SwigType_str(func_type, NULL), + Getattr(n, "sym:name") + ); return false; + } rtype_desc.set_type(type); - do_resolve_type(n, Getattr(n, "type"), rtype_desc.type(), NULL, &rtype_desc); + do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc); if (use_cxxout) { if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL)) From f4ecc3c06a715249ff2040e196474bb3f9522077 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 00:52:21 +0100 Subject: [PATCH 465/508] Move type-resolving code to cxx_wrappers This is also not specific to class wrappers, but can, and will be, used for the global functions, so move it to a place where it can be reused. No changes yet. --- Source/Modules/c.cxx | 659 ++++++++++++++++++++++--------------------- 1 file changed, 337 insertions(+), 322 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d4dc89ae5..aead32a69 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -406,6 +406,9 @@ struct cxx_wrappers cxx_wrappers() : except_check_start(NULL), except_check_end(NULL), sect_cxx_h(NULL), sect_types(NULL), sect_decls(NULL), sect_impls(NULL) { + node_func_ = NULL; + rtype_desc_ = NULL; + ptype_desc_ = NULL; } void initialize() { @@ -458,6 +461,100 @@ struct cxx_wrappers bool is_initialized() const { return sect_types != NULL; } + // All the functions below are only used when is_initialized() returns true. + + // Fill the provided rtype_desc with the type information for the given function node. + // + // Returns false in case of error, i.e. if function wrapper can't be generated at all. + bool lookup_cxx_ret_type(cxx_rtype_desc& rtype_desc, Node* n) { + String* const func_type = Getattr(n, "type"); + if (SwigType_type(func_type) == T_VOID) { + // Nothing to do, rtype_desc is void by default. + return true; + } + + // As above, ensure our replaceSpecialVariables() is used. + temp_ptr_setter set(&rtype_desc_, &rtype_desc); + + bool use_cxxout = true; + String* type(Swig_typemap_lookup("cxxouttype", n, "", NULL)); + if (!type) { + use_cxxout = false; + type = Swig_typemap_lookup("ctype", n, "", NULL); + } + + if (!type) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), + "No ctype typemap defined for the return type \"%s\" of %s\n", + SwigType_str(func_type, NULL), + Getattr(n, "sym:name") + ); + return false; + } + + rtype_desc.set_type(type); + do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc); + + if (use_cxxout) { + if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL)) + rtype_desc.apply_out_typemap(out_tm); + } + + return true; + } + + // Return the type description for the given parameter of the function. + cxx_ptype_desc lookup_cxx_parm_type(Node* n, Parm* p) { + cxx_ptype_desc ptype_desc; + + // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. + temp_ptr_setter set(&ptype_desc_, &ptype_desc); + + bool use_cxxin = true; + String* type = Swig_typemap_lookup("cxxintype", p, "", NULL); + if (!type) { + use_cxxin = false; + type = Swig_typemap_lookup("ctype", p, "", NULL); + } + + if (type) { + ptype_desc.set_type(type); + do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); + } + + if (use_cxxin) { + if (String* in_tm = Getattr(p, "tmap:cxxin")) + ptype_desc.apply_in_typemap(Copy(in_tm)); + } + + return ptype_desc; + } + + + // This function is called from C::replaceSpecialVariables() but only does something non-trivial when it's called by our own lookup_cxx_xxx_type() functions. + bool replaceSpecialVariables(String *method, String *tm, Parm *parm) { + if (!ptype_desc_ && !rtype_desc_) + return false; + + if (Cmp(method, "ctype") != 0) { + Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, "Unsupported %s typemap %s\n", method, tm); + return false; + } + + if (SwigType *type = Getattr(parm, "type")) { + if (ptype_desc_) + ptype_desc_->set_type(type); + if (rtype_desc_) + rtype_desc_->set_type(type); + + do_resolve_type(node_func_, type, tm, ptype_desc_, rtype_desc_); + } + + return true; + } + + + // Used for generating exception checks around the calls, see initialize_exceptions(). const char* except_check_start; const char* except_check_end; @@ -477,6 +574,236 @@ struct cxx_wrappers // Implementation of the classes. String* sect_impls; + + +private: + // Replace "resolved_type" occurrences in the string with the value corresponding to the given type. + // + // Note that the node here is the function itself, but type may be either its return type or the type of one of its parameters, so it's passed as a different + // parameter. + // + // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type + // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). + static void do_resolve_type(Node* n, String* type, String* s, cxx_ptype_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { + enum TypeKind + { + Type_Ptr, + Type_Ref, + Type_Obj, + Type_Enm, + Type_Max + } typeKind = Type_Max; + + // These correspond to the typemaps for SWIGTYPE*, SWIGTYPE&, SWIGTYPE and enum SWIGTYPE, respectively, defined in c.swg. + static const char* typemaps[Type_Max] = { + "$resolved_type*", + "$*resolved_type*", + "$&resolved_type*", + "$resolved_type", + }; + + for (int i = 0; i < Type_Max; ++i) { + if (Strstr(s, typemaps[i])) { + typeKind = static_cast(i); + break; + } + } + + if (typeKind == Type_Max) { + if (Strstr(s, "resolved_type")) { + Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, + "Unsupported typemap \"%s\" used for type \"%s\" of \"%s\"\n", + s, type, Getattr(n, "name") + ); + } + + return; + } + + // The logic here is somewhat messy because we use the same "$resolved_type*" typemap for pointers/references to both enums and classes, but we actually + // need to do quite different things for them. It could probably be simplified by changing the typemaps to be distinct, but this would require also updating + // the code for C wrappers generation in substituteResolvedTypeSpecialVariable(). + // + // An even better idea might be to try to define this using cxx{in,out} typemaps for the various types and let the generic SWIG machinery do all the + // matching instead of doing it in the code here. + scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); + scoped_dohptr base_resolved_type(SwigType_base(resolved_type)); + + scoped_dohptr typestr; + if (SwigType_isenum(base_resolved_type)) { + String* enumname = NULL; + if (Node* const enum_node = Language::instance()->enumLookup(base_resolved_type)) { + // This is the name of the enum in C wrappers, it should be already set by getEnumName(). + enumname = Getattr(enum_node, "enumname"); + + if (enumname) { + String* const enum_symname = Getattr(enum_node, "sym:name"); + + if (Checkattr(enum_node, "ismember", "1")) { + Node* const parent_class = parentNode(enum_node); + typestr = NewStringf("%s::%s", Getattr(parent_class, "sym:name"), enum_symname); + } else { + typestr = Copy(enum_symname); + } + } + } + + if (!enumname) { + // Unknown enums are mapped to int and no casts are necessary in this case. + typestr = NewString("int"); + } + + if (SwigType_ispointer(type)) + Append(typestr, " *"); + else if (SwigType_isreference(type)) + Append(typestr, " &"); + + if (enumname) { + switch (typeKind) { + case Type_Ptr: + if (rtype_desc) { + rtype_desc->apply_out_typemap(NewStringf("(%s)$cresult", typestr.get())); + } + + if (ptype_desc) { + ptype_desc->apply_in_typemap(NewStringf("(%s*)$1", enumname)); + } + break; + + case Type_Ref: + if (rtype_desc) { + rtype_desc->apply_out_typemap(NewStringf("(%s)(*($cresult))", typestr.get())); + } + + if (ptype_desc) { + ptype_desc->apply_in_typemap(NewStringf("(%s*)&($1)", enumname)); + } + break; + + case Type_Enm: + if (rtype_desc) { + rtype_desc->apply_out_typemap(NewStringf("(%s)$cresult", typestr.get())); + } + + if (ptype_desc) { + ptype_desc->apply_in_typemap(NewStringf("(%s)$1", enumname)); + } + break; + + case Type_Obj: + case Type_Max: + // Unreachable, but keep here to avoid -Wswitch warnings. + assert(0); + } + } else { + // This is the only thing we need to do even when we don't have the enum name. + if (typeKind == Type_Ref && ptype_desc) + ptype_desc->apply_in_typemap(NewString("&($1)")); + } + } else { + scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); + + String* classname; + if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { + typestr = SwigType_str(type, 0); + classname = Getattr(class_node, "sym:name"); + + // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the + // class name, which is not. + scoped_dohptr basetype(SwigType_base(type)); + scoped_dohptr basetypestr(SwigType_str(basetype, 0)); + if (Cmp(basetypestr, classname) != 0) { + Replaceall(typestr, basetypestr, classname); + } + } else { + // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. + typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); + classname = NULL; + } + + const char* const owns = GetFlag(n, "feature:new") ? "true" : "false"; + switch (typeKind) { + case Type_Ptr: + if (ptype_desc) { + ptype_desc->apply_in_typemap(NewString("$1->swig_self()")); + } + + if (rtype_desc) { + if (classname) { + rtype_desc->apply_out_typemap(NewStringf( + "$cresult ? new %s($cresult, %s) : nullptr;", + classname, owns + )); + } + } + break; + + case Type_Ref: + if (rtype_desc) { + if (classname) { + // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object + // must be constructed using the special ctor not taking the pointer ownership. + typestr = Copy(classname); + + rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, false}", classname)); + } else { + // We can't do anything at all in this case. + Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); + } + } + + if (ptype_desc) { + ptype_desc->apply_in_typemap(NewString("$1.swig_self()")); + } + break; + + case Type_Obj: + if (rtype_desc) { + if (classname) { + // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened, so we don't test + // for it here, unlike in Type_Ptr case. + // + // Also, normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this + // seems not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for e.g. shared_ptr<>. + // + // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap + // expansion and so may not be a reference any more. + rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, %s}", + typestr.get(), + SwigType_isreference(Getattr(n, "type")) ? owns : "true" + )); + } else { + Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); + } + } + + if (ptype_desc) { + // It doesn't seem like it can ever be useful to pass an object by value to a wrapper function and it can fail if it doesn't have a copy ctor (see + // code related to has_copy_ctor_ in our dtor above), so always pass it by const reference instead. + Append(typestr, " const&"); + + ptype_desc->apply_in_typemap(NewString("$1.swig_self()")); + } + break; + + case Type_Enm: + case Type_Max: + // Unreachable, but keep here to avoid -Wswitch warnings. + assert(0); + } + } + + Replaceall(s, typemaps[typeKind], typestr); + } + + + // These pointers are temporarily set to non-null value only while expanding a typemap for C++ wrappers, see replaceSpecialVariables(). + cxx_ptype_desc* ptype_desc_; + cxx_rtype_desc* rtype_desc_; + + // This one is set from the outside, so make it public for simplicity. +public: + Node* node_func_; }; /* @@ -490,13 +817,9 @@ public: // If the provided cxx_wrappers object is not initialized, this class doesn't do anything. // // The node pointer must be valid, point to a class and remain valid for the lifetime of this object. - cxx_class_wrapper(const cxx_wrappers& cxx_wrappers, Node* n) : cxx_wrappers_(cxx_wrappers) { + cxx_class_wrapper(cxx_wrappers& cxx_wrappers, Node* n) : cxx_wrappers_(cxx_wrappers) { class_node_ = NULL; - node_func_ = NULL; - rtype_desc_ = NULL; - ptype_desc_ = NULL; - if (!cxx_wrappers_.is_initialized()) return; @@ -589,7 +912,7 @@ public: return; } - temp_ptr_setter set(&node_func_, n); + temp_ptr_setter set(&cxx_wrappers_.node_func_, n); // As mentioned elsewhere, we can't use Swig_storage_isstatic() here because the "storage" attribute is temporarily saved in another view when this // function is being executed, so rely on another attribute to determine if it's a static function instead. @@ -600,7 +923,7 @@ public: // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. cxx_rtype_desc rtype_desc; - if (!lookup_cxx_ret_type(rtype_desc, n)) + if (!cxx_wrappers_.lookup_cxx_ret_type(rtype_desc, n)) return; // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. @@ -646,7 +969,7 @@ public: for (; p; p = nextSibling(p)) { String* const name = Getattr(p, "lname"); - const cxx_ptype_desc ptype_desc = lookup_cxx_parm_type(n, p); + const cxx_ptype_desc ptype_desc = cxx_wrappers_.lookup_cxx_parm_type(n, p); if (!ptype_desc.type()) { Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), "No ctype typemap defined for the parameter \"%s\" of %s\n", @@ -940,29 +1263,6 @@ public: ); } - - // This function is called from C::replaceSpecialVariables() but only does something non-trivial when it's called by our own lookup_cxx_xxx_type() functions. - bool replaceSpecialVariables(String *method, String *tm, Parm *parm) { - if (!ptype_desc_ && !rtype_desc_) - return false; - - if (Cmp(method, "ctype") != 0) { - Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, "Unsupported %s typemap %s\n", method, tm); - return false; - } - - if (SwigType *type = Getattr(parm, "type")) { - if (ptype_desc_) - ptype_desc_->set_type(type); - if (rtype_desc_) - rtype_desc_->set_type(type); - - do_resolve_type(node_func_, type, tm, ptype_desc_, rtype_desc_); - } - - return true; - } - private: // Various helpers. @@ -984,290 +1284,8 @@ private: return qualifier && strncmp(Char(qualifier), "q(const)", 8) == 0 ? " const" : ""; } - // Replace "resolved_type" occurrences in the string with the value corresponding to the given type. - // - // Note that the node here is the function itself, but type may be either its return type or the type of one of its parameters, so it's passed as a different - // parameter. - // - // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type - // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). - static void do_resolve_type(Node* n, String* type, String* s, cxx_ptype_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { - enum TypeKind - { - Type_Ptr, - Type_Ref, - Type_Obj, - Type_Enm, - Type_Max - } typeKind = Type_Max; - // These correspond to the typemaps for SWIGTYPE*, SWIGTYPE&, SWIGTYPE and enum SWIGTYPE, respectively, defined in c.swg. - static const char* typemaps[Type_Max] = { - "$resolved_type*", - "$*resolved_type*", - "$&resolved_type*", - "$resolved_type", - }; - - for (int i = 0; i < Type_Max; ++i) { - if (Strstr(s, typemaps[i])) { - typeKind = static_cast(i); - break; - } - } - - if (typeKind == Type_Max) { - if (Strstr(s, "resolved_type")) { - Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, - "Unsupported typemap \"%s\" used for type \"%s\" of \"%s\"\n", - s, type, Getattr(n, "name") - ); - } - - return; - } - - // The logic here is somewhat messy because we use the same "$resolved_type*" typemap for pointers/references to both enums and classes, but we actually - // need to do quite different things for them. It could probably be simplified by changing the typemaps to be distinct, but this would require also updating - // the code for C wrappers generation in substituteResolvedTypeSpecialVariable(). - // - // An even better idea might be to try to define this using cxx{in,out} typemaps for the various types and let the generic SWIG machinery do all the - // matching instead of doing it in the code here. - scoped_dohptr resolved_type(SwigType_typedef_resolve_all(type)); - scoped_dohptr base_resolved_type(SwigType_base(resolved_type)); - - scoped_dohptr typestr; - if (SwigType_isenum(base_resolved_type)) { - String* enumname = NULL; - if (Node* const enum_node = Language::instance()->enumLookup(base_resolved_type)) { - // This is the name of the enum in C wrappers, it should be already set by getEnumName(). - enumname = Getattr(enum_node, "enumname"); - - if (enumname) { - String* const enum_symname = Getattr(enum_node, "sym:name"); - - if (Checkattr(enum_node, "ismember", "1")) { - Node* const parent_class = parentNode(enum_node); - typestr = NewStringf("%s::%s", Getattr(parent_class, "sym:name"), enum_symname); - } else { - typestr = Copy(enum_symname); - } - } - } - - if (!enumname) { - // Unknown enums are mapped to int and no casts are necessary in this case. - typestr = NewString("int"); - } - - if (SwigType_ispointer(type)) - Append(typestr, " *"); - else if (SwigType_isreference(type)) - Append(typestr, " &"); - - if (enumname) { - switch (typeKind) { - case Type_Ptr: - if (rtype_desc) { - rtype_desc->apply_out_typemap(NewStringf("(%s)$cresult", typestr.get())); - } - - if (ptype_desc) { - ptype_desc->apply_in_typemap(NewStringf("(%s*)$1", enumname)); - } - break; - - case Type_Ref: - if (rtype_desc) { - rtype_desc->apply_out_typemap(NewStringf("(%s)(*($cresult))", typestr.get())); - } - - if (ptype_desc) { - ptype_desc->apply_in_typemap(NewStringf("(%s*)&($1)", enumname)); - } - break; - - case Type_Enm: - if (rtype_desc) { - rtype_desc->apply_out_typemap(NewStringf("(%s)$cresult", typestr.get())); - } - - if (ptype_desc) { - ptype_desc->apply_in_typemap(NewStringf("(%s)$1", enumname)); - } - break; - - case Type_Obj: - case Type_Max: - // Unreachable, but keep here to avoid -Wswitch warnings. - assert(0); - } - } else { - // This is the only thing we need to do even when we don't have the enum name. - if (typeKind == Type_Ref && ptype_desc) - ptype_desc->apply_in_typemap(NewString("&($1)")); - } - } else { - scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); - - String* classname; - if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { - typestr = SwigType_str(type, 0); - classname = Getattr(class_node, "sym:name"); - - // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the - // class name, which is not. - scoped_dohptr basetype(SwigType_base(type)); - scoped_dohptr basetypestr(SwigType_str(basetype, 0)); - if (Cmp(basetypestr, classname) != 0) { - Replaceall(typestr, basetypestr, classname); - } - } else { - // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. - typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); - classname = NULL; - } - - const char* const owns = GetFlag(n, "feature:new") ? "true" : "false"; - switch (typeKind) { - case Type_Ptr: - if (ptype_desc) { - ptype_desc->apply_in_typemap(NewString("$1->swig_self()")); - } - - if (rtype_desc) { - if (classname) { - rtype_desc->apply_out_typemap(NewStringf( - "$cresult ? new %s($cresult, %s) : nullptr;", - classname, owns - )); - } - } - break; - - case Type_Ref: - if (rtype_desc) { - if (classname) { - // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object - // must be constructed using the special ctor not taking the pointer ownership. - typestr = Copy(classname); - - rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, false}", classname)); - } else { - // We can't do anything at all in this case. - Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); - } - } - - if (ptype_desc) { - ptype_desc->apply_in_typemap(NewString("$1.swig_self()")); - } - break; - - case Type_Obj: - if (rtype_desc) { - if (classname) { - // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened, so we don't test - // for it here, unlike in Type_Ptr case. - // - // Also, normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this - // seems not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for e.g. shared_ptr<>. - // - // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap - // expansion and so may not be a reference any more. - rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, %s}", - typestr.get(), - SwigType_isreference(Getattr(n, "type")) ? owns : "true" - )); - } else { - Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); - } - } - - if (ptype_desc) { - // It doesn't seem like it can ever be useful to pass an object by value to a wrapper function and it can fail if it doesn't have a copy ctor (see - // code related to has_copy_ctor_ in our dtor above), so always pass it by const reference instead. - Append(typestr, " const&"); - - ptype_desc->apply_in_typemap(NewString("$1.swig_self()")); - } - break; - - case Type_Enm: - case Type_Max: - // Unreachable, but keep here to avoid -Wswitch warnings. - assert(0); - } - } - - Replaceall(s, typemaps[typeKind], typestr); - } - - cxx_ptype_desc lookup_cxx_parm_type(Node* n, Parm* p) { - cxx_ptype_desc ptype_desc; - - // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. - temp_ptr_setter set(&ptype_desc_, &ptype_desc); - - bool use_cxxin = true; - String* type = Swig_typemap_lookup("cxxintype", p, "", NULL); - if (!type) { - use_cxxin = false; - type = Swig_typemap_lookup("ctype", p, "", NULL); - } - - if (type) { - ptype_desc.set_type(type); - do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); - } - - if (use_cxxin) { - if (String* in_tm = Getattr(p, "tmap:cxxin")) - ptype_desc.apply_in_typemap(Copy(in_tm)); - } - - return ptype_desc; - } - - bool lookup_cxx_ret_type(cxx_rtype_desc& rtype_desc, Node* n) { - String* const func_type = Getattr(n, "type"); - if (SwigType_type(func_type) == T_VOID) { - // Nothing to do, rtype_desc is void by default. - return true; - } - - // As above, ensure our replaceSpecialVariables() is used. - temp_ptr_setter set(&rtype_desc_, &rtype_desc); - - bool use_cxxout = true; - String* type(Swig_typemap_lookup("cxxouttype", n, "", NULL)); - if (!type) { - use_cxxout = false; - type = Swig_typemap_lookup("ctype", n, "", NULL); - } - - if (!type) { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n), - "No ctype typemap defined for the return type \"%s\" of %s\n", - SwigType_str(func_type, NULL), - Getattr(n, "sym:name") - ); - return false; - } - - rtype_desc.set_type(type); - do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc); - - if (use_cxxout) { - if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL)) - rtype_desc.apply_out_typemap(out_tm); - } - - return true; - } - - - const cxx_wrappers& cxx_wrappers_; + cxx_wrappers& cxx_wrappers_; // The class node itself, left null only if we skip generating wrappers for it for whatever reason. Node* class_node_; @@ -1277,11 +1295,6 @@ private: // any, this member can also be null). scoped_dohptr first_base_; - // These pointers are temporarily set to non-null value only while expanding a typemap for C++ wrappers, see replaceSpecialVariables(). - Node* node_func_; - cxx_ptype_desc* ptype_desc_; - cxx_rtype_desc* rtype_desc_; - // Name of the C function used for deleting the owned object, if any. String* dtor_wname_; @@ -1586,7 +1599,7 @@ public: virtual void replaceSpecialVariables(String *method, String *tm, Parm *parm) { // This function is called by Swig_typemap_lookup(), which may be called when generating C or C++ wrappers, so delegate to the latter one if necessary. - if (cxx_class_wrapper_ && cxx_class_wrapper_->replaceSpecialVariables(method, tm, parm)) + if (cxx_wrappers_.is_initialized() && cxx_wrappers_.replaceSpecialVariables(method, tm, parm)) return; SwigType *type = Getattr(parm, "type"); @@ -2386,8 +2399,10 @@ public: emit_wrapper_func_decl(n, wname); - if (cxx_class_wrapper_) - cxx_class_wrapper_->emit_member_function(n); + if (cxx_wrappers_.is_initialized()) { + if (cxx_class_wrapper_) + cxx_class_wrapper_->emit_member_function(n); + } Delete(name); } From a40b7b6d1c7693126bf8703d01fb752972ca021b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 16:16:36 +0100 Subject: [PATCH 466/508] Change lookup_cxx_parm_type() to return bool too This is more consistent with lookup_cxx_ret_type() and makes using it simpler. Also move error reporting into this function itself as it could fail for other reasons than missing "ctype" typemap too. No real changes. --- Source/Modules/c.cxx | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index aead32a69..5eaa204da 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -504,9 +504,7 @@ struct cxx_wrappers } // Return the type description for the given parameter of the function. - cxx_ptype_desc lookup_cxx_parm_type(Node* n, Parm* p) { - cxx_ptype_desc ptype_desc; - + bool lookup_cxx_parm_type(cxx_ptype_desc& ptype_desc, Node* n, Parm* p) { // Ensure our own replaceSpecialVariables() is used for $typemap() expansion. temp_ptr_setter set(&ptype_desc_, &ptype_desc); @@ -517,17 +515,24 @@ struct cxx_wrappers type = Swig_typemap_lookup("ctype", p, "", NULL); } - if (type) { - ptype_desc.set_type(type); - do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); + if (!type) { + Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), + "No ctype typemap defined for the parameter \"%s\" of %s\n", + Getattr(p, "name"), + Getattr(n, "sym:name") + ); + return false; } + ptype_desc.set_type(type); + do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); + if (use_cxxin) { if (String* in_tm = Getattr(p, "tmap:cxxin")) ptype_desc.apply_in_typemap(Copy(in_tm)); } - return ptype_desc; + return true; } @@ -969,15 +974,9 @@ public: for (; p; p = nextSibling(p)) { String* const name = Getattr(p, "lname"); - const cxx_ptype_desc ptype_desc = cxx_wrappers_.lookup_cxx_parm_type(n, p); - if (!ptype_desc.type()) { - Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(p), Getline(p), - "No ctype typemap defined for the parameter \"%s\" of %s\n", - name, - Getattr(n, "sym:name") - ); + cxx_ptype_desc ptype_desc; + if (!cxx_wrappers_.lookup_cxx_parm_type(ptype_desc, n, p)) return; - } if (Len(parms_cxx)) Append(parms_cxx, ", "); From a2bd9eec0567a78e5e35c17ccf6411fb29caf6a1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 16:19:56 +0100 Subject: [PATCH 467/508] Don't generate C++ wrappers for functions using unsupported types This is far from ideal, but better than generating uncompilable code in this case. --- Source/Modules/c.cxx | 78 +++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 5eaa204da..6c1b54f34 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -493,7 +493,8 @@ struct cxx_wrappers } rtype_desc.set_type(type); - do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc); + if (!do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc)) + return false; if (use_cxxout) { if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL)) @@ -525,7 +526,8 @@ struct cxx_wrappers } ptype_desc.set_type(type); - do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL); + if (!do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL)) + return false; if (use_cxxin) { if (String* in_tm = Getattr(p, "tmap:cxxin")) @@ -552,7 +554,8 @@ struct cxx_wrappers if (rtype_desc_) rtype_desc_->set_type(type); - do_resolve_type(node_func_, type, tm, ptype_desc_, rtype_desc_); + if (!do_resolve_type(node_func_, type, tm, ptype_desc_, rtype_desc_)) + return false; } return true; @@ -589,7 +592,7 @@ private: // // Also fills in the start/end wrapper parts of the provided type descriptions if they're not null, with the casts needed to translate from C type to C++ type // (this is used for the parameters of C++ functions, hence the name) and from C types to C++ types (which is used for the function return values). - static void do_resolve_type(Node* n, String* type, String* s, cxx_ptype_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { + static bool do_resolve_type(Node* n, String* type, String* s, cxx_ptype_desc* ptype_desc, cxx_rtype_desc* rtype_desc) { enum TypeKind { Type_Ptr, @@ -620,9 +623,11 @@ private: "Unsupported typemap \"%s\" used for type \"%s\" of \"%s\"\n", s, type, Getattr(n, "name") ); + + return false; } - return; + return true; } // The logic here is somewhat messy because we use the same "$resolved_type*" typemap for pointers/references to both enums and classes, but we actually @@ -721,11 +726,17 @@ private: Replaceall(typestr, basetypestr, classname); } } else { - // This is something unknown, so just use an opaque typedef already declared in C wrappers section for it. - typestr = NewStringf("SWIGTYPE%s*", SwigType_manglestr(stripped_type)); classname = NULL; } + if (!classname) { + Swig_warning(WARN_C_UNSUPPORTTED, input_file, line_number, + "Unsupported C++ wrapper function %s type \"%s\"\n", + ptype_desc ? "parameter" : "return", SwigType_str(type, 0) + ); + return false; + } + const char* const owns = GetFlag(n, "feature:new") ? "true" : "false"; switch (typeKind) { case Type_Ptr: @@ -734,27 +745,20 @@ private: } if (rtype_desc) { - if (classname) { - rtype_desc->apply_out_typemap(NewStringf( - "$cresult ? new %s($cresult, %s) : nullptr;", - classname, owns - )); - } + rtype_desc->apply_out_typemap(NewStringf( + "$cresult ? new %s($cresult, %s) : nullptr;", + classname, owns + )); } break; case Type_Ref: if (rtype_desc) { - if (classname) { - // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object - // must be constructed using the special ctor not taking the pointer ownership. - typestr = Copy(classname); + // We can't return a reference, as this requires an existing object and we don't have any, so we have to return an object instead, and this object + // must be constructed using the special ctor not taking the pointer ownership. + typestr = Copy(classname); - rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, false}", classname)); - } else { - // We can't do anything at all in this case. - Swig_error(input_file, line_number, "Unknown reference return type \"%s\"\n", typestr.get()); - } + rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, false}", classname)); } if (ptype_desc) { @@ -764,22 +768,18 @@ private: case Type_Obj: if (rtype_desc) { - if (classname) { - // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened, so we don't test - // for it here, unlike in Type_Ptr case. - // - // Also, normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this - // seems not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for e.g. shared_ptr<>. - // - // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap - // expansion and so may not be a reference any more. - rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, %s}", - typestr.get(), - SwigType_isreference(Getattr(n, "type")) ? owns : "true" - )); - } else { - Swig_error(input_file, line_number, "Unknown object return type \"%s\"\n", typestr.get()); - } + // The pointer returned by C function wrapping a function returning an object should never be null unless an exception happened, so we don't test + // for it here, unlike in Type_Ptr case. + // + // Also, normally all returned objects should be owned by their wrappers, but there is a special case of objects not being returned by value: this + // seems not to make sense, but can actually happen when typemaps map references or pointers to objects, like they do for e.g. shared_ptr<>. + // + // Note that we must use the type of the function, retrieved from its node, here and not the type passed to us which is the result of typemap + // expansion and so may not be a reference any more. + rtype_desc->apply_out_typemap(NewStringf("%s{$cresult, %s}", + typestr.get(), + SwigType_isreference(Getattr(n, "type")) ? owns : "true" + )); } if (ptype_desc) { @@ -799,6 +799,8 @@ private: } Replaceall(s, typemaps[typeKind], typestr); + + return true; } From f3b0b42145419be937578088fa770938484d0b30 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 16:28:01 +0100 Subject: [PATCH 468/508] Add cxx_wrappers::is_exception_support_enabled() No real changes, just add a helper function to make the code more clear. --- Source/Modules/c.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 6c1b54f34..7660b871d 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -460,6 +460,8 @@ struct cxx_wrappers bool is_initialized() const { return sect_types != NULL; } + bool is_exception_support_enabled() const { return *except_check_start != '\0'; } + // All the functions below are only used when is_initialized() returns true. @@ -994,7 +996,7 @@ public: // thrown by members of SWIG_CException itself if we didn't do it. const char* except_check_start = cxx_wrappers_.except_check_start; const char* except_check_end = cxx_wrappers_.except_check_end; - if (*except_check_start) { + if (cxx_wrappers_.is_exception_support_enabled()) { if (Checkattr(n, "noexcept", "true") || (Checkattr(n, "throw", "1") && !Getattr(n, "throws"))) { except_check_start = except_check_end = ""; From 09f22c74538f14be71df0c08079ec033f8890279 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 16:50:57 +0100 Subject: [PATCH 469/508] Remove unnecessary stripped_type variable from do_resolve_type() It's unnecessary to strip qualifiers ourselves when classLookup() already does it internally anyhow. --- Source/Modules/c.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 7660b871d..375535011 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -713,10 +713,8 @@ private: ptype_desc->apply_in_typemap(NewString("&($1)")); } } else { - scoped_dohptr stripped_type(SwigType_strip_qualifiers(resolved_type)); - String* classname; - if (Node* const class_node = Language::instance()->classLookup(stripped_type)) { + if (Node* const class_node = Language::instance()->classLookup(type)) { typestr = SwigType_str(type, 0); classname = Getattr(class_node, "sym:name"); From 730384834def9825351142e6cd9cabc8be3fb82f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 16:51:53 +0100 Subject: [PATCH 470/508] Fix dealing with class typedefs in do_resolve_type() We must use the string for the resolved type, i.e. after replacing typedefs with their expansions, as otherwise typedefs could leak into the generated header. In principle it might be possible to actually use the original typedefs in the C++ part of the wrappers, but then we'd need to propagate the typedef definitions there too and we don't do it currently. --- Source/Modules/c.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 375535011..4dfdeb92a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -715,12 +715,12 @@ private: } else { String* classname; if (Node* const class_node = Language::instance()->classLookup(type)) { - typestr = SwigType_str(type, 0); + typestr = SwigType_str(resolved_type, 0); classname = Getattr(class_node, "sym:name"); // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the // class name, which is not. - scoped_dohptr basetype(SwigType_base(type)); + scoped_dohptr basetype(SwigType_base(resolved_type)); scoped_dohptr basetypestr(SwigType_str(basetype, 0)); if (Cmp(basetypestr, classname) != 0) { Replaceall(typestr, basetypestr, classname); From 57ba3a72453a436e6ae08446de45e4a9f1db63c6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 16:56:56 +0100 Subject: [PATCH 471/508] Factor out C++ function generation into cxx_function_wrapper No real changes, just factor out the code for (non-special) functions generation from emit_member_function() into a separate cxx_function_wrapper class, so that it could be reused for the global functions generation too. --- Source/Modules/c.cxx | 256 ++++++++++++++++++++++++++----------------- 1 file changed, 154 insertions(+), 102 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 4dfdeb92a..b4d6d6ee3 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -813,6 +813,135 @@ public: Node* node_func_; }; +/* + cxx_function_wrapper + + Outputs the C++ wrapper function. It's different from the C function because it is declared inside the namespace and so doesn't need the usual prefix and may + also have different parameter and return types when objects and/or cxx{in,out}type typemaps are involved. + */ +class cxx_function_wrapper +{ +public: + // Call can_wrap() to check if this wrapper can be emitted later. + explicit cxx_function_wrapper(cxx_wrappers& cxx_wrappers, Node* n, Parm* p) : cxx_wrappers_(cxx_wrappers) { + func_node = NULL; + + except_check_start = + except_check_end = ""; + + // Usually generating wrappers for overloaded methods is fine, but sometimes their types can clash after applying typemaps and in this case we have no + // choice but to avoid generating them, as otherwise we'd just generate uncompilable code. + if (Getattr(n, "sym:overloaded")) { + Swig_overload_check(n); + if (Getattr(n, "overload:ignore")) + return; + } + + if (!cxx_wrappers_.lookup_cxx_ret_type(rtype_desc, n)) + return; + + parms_cxx = NewStringEmpty(); + parms_call = NewStringEmpty(); + + if (p) { + // We want to use readable parameter names in our wrappers instead of the autogenerated arg$N if possible, so do it, and do it before calling + // Swig_typemap_attach_parms(), as this uses the parameter names for typemap expansion. + for (Parm* p2 = p; p2; p2 = nextSibling(p2)) { + String* name = Getattr(p, "name"); + if (!name) { + // Can't do anything for unnamed parameters. + continue; + } + + // Static variables use fully qualified names, so we need to strip the scope from them. + scoped_dohptr name_ptr; + if (Strstr(name, "::")) { + name_ptr = Swig_scopename_last(name); + name = name_ptr.get(); + } + + Setattr(p, "lname", name); + } + + Swig_typemap_attach_parms("cxxin", p, NULL); + + for (; p; p = nextSibling(p)) { + String* const name = Getattr(p, "lname"); + + cxx_ptype_desc ptype_desc; + if (!cxx_wrappers_.lookup_cxx_parm_type(ptype_desc, n, p)) + return; + + if (Len(parms_cxx)) + Append(parms_cxx, ", "); + Printv(parms_cxx, ptype_desc.type(), " ", name, NIL); + + if (Len(parms_call)) + Append(parms_call, ", "); + Append(parms_call, ptype_desc.get_param_code(name)); + } + } + + + // Avoid checking for exceptions unnecessarily. Note that this is more than an optimization: we'd get into infinite recursion if we checked for exceptions + // thrown by members of SWIG_CException itself if we didn't do it. + if (cxx_wrappers_.is_exception_support_enabled() && + !Checkattr(n, "noexcept", "true") && + (!Checkattr(n, "throw", "1") || Getattr(n, "throws"))) { + except_check_start = cxx_wrappers_.except_check_start; + except_check_end = cxx_wrappers_.except_check_end; + } + + // Everything is fine, so set func_node to indicate success. + func_node = n; + } + + bool can_wrap() const { return func_node != NULL; } + + // Emit just the function body, including the braces around it. + void emit_body(String* wparms) { + String* const wname = Getattr(func_node, "wrap:name"); + + Append(cxx_wrappers_.sect_impls, "{"); + + if (rtype_desc.is_void()) { + Printv(cxx_wrappers_.sect_impls, + " ", wname, "(", wparms, "); ", + NIL + ); + + if (*except_check_start != '\0') { + Printv(cxx_wrappers_.sect_impls, + except_check_start, + except_check_end, + "; ", + NIL + ); + } + } else { + rtype_desc.set_return_value(NewStringf("%s%s(%s)%s", except_check_start, wname, wparms, except_check_end)); + Append(cxx_wrappers_.sect_impls, rtype_desc.get_return_code()); + } + + Append(cxx_wrappers_.sect_impls, "}\n"); + } + + + cxx_wrappers& cxx_wrappers_; + Node* func_node; + cxx_rtype_desc rtype_desc; + scoped_dohptr parms_cxx; + scoped_dohptr parms_call; + const char* except_check_start; + const char* except_check_end; + +private: + // Non copyable. + cxx_function_wrapper(const cxx_function_wrapper&); + cxx_function_wrapper& operator=(const cxx_function_wrapper&); +}; + + /* cxx_class_wrapper @@ -911,32 +1040,12 @@ public: if (Checkattr(n, "storage", "friend")) return; - // Usually generating wrappers for overloaded methods is fine, but sometimes their types can clash after applying typemaps and in this case we have no - // choice but to avoid generating them, as otherwise we'd just generate uncompilable code. - if (Getattr(n, "sym:overloaded")) { - Swig_overload_check(n); - if (Getattr(n, "overload:ignore")) - return; - } - - temp_ptr_setter set(&cxx_wrappers_.node_func_, n); - // As mentioned elsewhere, we can't use Swig_storage_isstatic() here because the "storage" attribute is temporarily saved in another view when this // function is being executed, so rely on another attribute to determine if it's a static function instead. const bool is_member = Checkattr(n, "ismember", "1"); const bool is_static = is_member && Getattr(n, "cplus:staticbase"); const bool is_ctor = Checkattr(n, "nodeType", "constructor"); - // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. - - cxx_rtype_desc rtype_desc; - if (!cxx_wrappers_.lookup_cxx_ret_type(rtype_desc, n)) - return; - - // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. - scoped_dohptr parms_cxx(NewStringEmpty()); - scoped_dohptr parms_call(NewStringEmpty()); - Parm* p = Getattr(n, "parms"); if (p && is_member && !is_ctor && !is_static) { // We should have "this" as the first parameter and we need to just skip it, as we handle it specially in C++ wrappers. @@ -951,59 +1060,18 @@ public: } } - if (p) { - // We want to use readable parameter names in our wrappers instead of the autogenerated arg$N if possible, so do it, and do it before calling - // Swig_typemap_attach_parms(), as this uses the parameter names for typemap expansion. - for (Parm* p2 = p; p2; p2 = nextSibling(p2)) { - String* name = Getattr(p, "name"); - if (!name) { - // Can't do anything for unnamed parameters. - continue; - } + cxx_function_wrapper func_wrapper(cxx_wrappers_, n, p); + if (!func_wrapper.can_wrap()) + return; - // Static variables use fully qualified names, so we need to strip the scope from them. - scoped_dohptr name_ptr; - if (Strstr(name, "::")) { - name_ptr = Swig_scopename_last(name); - name = name_ptr.get(); - } - - Setattr(p, "lname", name); - } - - Swig_typemap_attach_parms("cxxin", p, NULL); - - for (; p; p = nextSibling(p)) { - String* const name = Getattr(p, "lname"); - - cxx_ptype_desc ptype_desc; - if (!cxx_wrappers_.lookup_cxx_parm_type(ptype_desc, n, p)) - return; - - if (Len(parms_cxx)) - Append(parms_cxx, ", "); - Printv(parms_cxx, ptype_desc.type(), " ", name, NIL); - - if (Len(parms_call)) - Append(parms_call, ", "); - Append(parms_call, ptype_desc.get_param_code(name)); - } - } - - // Avoid checking for exceptions unnecessarily. Note that this is more than an optimization: we'd get into infinite recursion if we checked for exceptions - // thrown by members of SWIG_CException itself if we didn't do it. - const char* except_check_start = cxx_wrappers_.except_check_start; - const char* except_check_end = cxx_wrappers_.except_check_end; - if (cxx_wrappers_.is_exception_support_enabled()) { - if (Checkattr(n, "noexcept", "true") || (Checkattr(n, "throw", "1") && !Getattr(n, "throws"))) { - except_check_start = - except_check_end = ""; - } - } + // Define aliases for the stuff actually stored in the function wrapper object. + cxx_rtype_desc& rtype_desc = func_wrapper.rtype_desc; + String* const parms_cxx = func_wrapper.parms_cxx; + String* const parms_call = func_wrapper.parms_call; // For some reason overloaded functions use fully-qualified name, so we can't just use the name directly. scoped_dohptr name_ptr(Swig_scopename_last(Getattr(n, "name"))); - String* const name = name_ptr.get(); + String* const name = name_ptr; String* const wname = Getattr(n, "wrap:name"); String* const classname = Getattr(class_node_, "sym:name"); @@ -1018,8 +1086,8 @@ public: ); } else if (Checkattr(n, "memberset", "1")) { Printv(cxx_wrappers_.sect_decls, - cindent, "void ", name, "(", parms_cxx.get(), ") " - "{ ", Getattr(n, "sym:name"), "(swig_self(), ", parms_call.get(), "); }\n", + cindent, "void ", name, "(", parms_cxx, ") " + "{ ", Getattr(n, "sym:name"), "(swig_self(), ", parms_call, "); }\n", NIL ); } else if (Checkattr(n, "varget", "1")) { @@ -1031,8 +1099,8 @@ public: ); } else if (Checkattr(n, "varset", "1")) { Printv(cxx_wrappers_.sect_decls, - cindent, "static void ", name, "(", parms_cxx.get(), ") " - "{ ", Getattr(n, "sym:name"), "(", parms_call.get(), "); }\n", + cindent, "static void ", name, "(", parms_cxx, ") " + "{ ", Getattr(n, "sym:name"), "(", parms_call, "); }\n", NIL ); } else { @@ -1044,16 +1112,16 @@ public: } else if (is_ctor) { // Delegate to the ctor from opaque C pointer taking ownership of the object. Printv(cxx_wrappers_.sect_decls, - cindent, classname, "(", parms_cxx.get(), ");\n", + cindent, classname, "(", parms_cxx, ");\n", NIL ); Printv(cxx_wrappers_.sect_impls, - "inline ", classname, "::", classname, "(", parms_cxx.get(), ") : ", + "inline ", classname, "::", classname, "(", parms_cxx, ") : ", classname, "{", - except_check_start, - wname, "(", parms_call.get(), ")", - except_check_end, + func_wrapper.except_check_start, + wname, "(", parms_call, ")", + func_wrapper.except_check_end, "} {}\n", NIL ); @@ -1100,39 +1168,20 @@ public: Printv(cxx_wrappers_.sect_decls, cindent, is_static ? "static " : get_virtual_prefix(n), rtype_desc.type(), " ", - name, "(", parms_cxx.get(), ")", + name, "(", parms_cxx, ")", get_const_suffix(n), ";\n", NIL ); Printv(cxx_wrappers_.sect_impls, "inline ", rtype_desc.type(), " ", - classname, "::", name, "(", parms_cxx.get(), ")", + classname, "::", name, "(", parms_cxx, ")", get_const_suffix(n), - " {", + " ", NIL ); - if (rtype_desc.is_void()) { - Printv(cxx_wrappers_.sect_impls, - " ", wname, "(", wparms.get(), "); ", - NIL - ); - - if (*except_check_start) { - Printv(cxx_wrappers_.sect_impls, - except_check_start, - except_check_end, - "; ", - NIL - ); - } - } else { - rtype_desc.set_return_value(NewStringf("%s%s(%s)%s", except_check_start, wname, wparms.get(), except_check_end)); - Append(cxx_wrappers_.sect_impls, rtype_desc.get_return_code()); - } - - Append(cxx_wrappers_.sect_impls, "}\n"); + func_wrapper.emit_body(wparms); } else { // This is something we don't know about Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), @@ -2401,8 +2450,11 @@ public: emit_wrapper_func_decl(n, wname); if (cxx_wrappers_.is_initialized()) { - if (cxx_class_wrapper_) + temp_ptr_setter set(&cxx_wrappers_.node_func_, n); + + if (cxx_class_wrapper_) { cxx_class_wrapper_->emit_member_function(n); + } } Delete(name); From 26810a5f0258b0835f86b8a33ee82a6af9018cd6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 20:47:33 +0100 Subject: [PATCH 472/508] Fix support for "numinputs" in typemap argument in C++ wrappers Ignore the parameters with numinputs==0 for C++ wrappers too, just as it was already done for C ones. --- Source/Modules/c.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index b4d6d6ee3..d8979c9fd 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -865,7 +865,10 @@ public: Swig_typemap_attach_parms("cxxin", p, NULL); - for (; p; p = nextSibling(p)) { + for (; p; p = Getattr(p, "tmap:in:next")) { + if (Checkattr(p, "tmap:in:numinputs", "0")) + continue; + String* const name = Getattr(p, "lname"); cxx_ptype_desc ptype_desc; From 184e6201511868d7576463010c0bc71bb8fc9bae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 23:33:31 +0100 Subject: [PATCH 473/508] Fix $resolvedType expansion for references to pointers Use the base type, not the full type, to deal with the special case of references to pointers which are blacklisted by classLookup(), for some reason, but can be represented at C wrappers level. --- Source/Modules/c.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index d8979c9fd..6a5c1c3cb 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1582,7 +1582,7 @@ public: // Special case, just leave it unchanged. typestr = NewString("SwigObj"); } else { - typestr = getClassProxyName(classnametype); + typestr = getClassProxyName(btype); if (!typestr) { if (SwigType_isbuiltin(btype)) { // This should work just as well in C without any changes. From c5cd287ec685fd790b8659eda120ea6c5a2b4141 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 00:10:50 +0100 Subject: [PATCH 474/508] Enable some C++ tests by just using a different namespace Using "typename" or "dynamic_cast" as C++ namespace names unsurprisingly resulted in compilation errors, so don't do this. --- Examples/test-suite/c/Makefile.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index f18e60496..65e4e0bd6 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -123,7 +123,6 @@ director_conversion_operators.cpptest \ director_frob.cpptest \ director_property.cpptest \ director_string.cpptest \ -dynamic_cast.cpptest \ extend_template_method.cpptest \ features.cpptest \ global_namespace.cpptest \ @@ -189,14 +188,19 @@ template_typedef_cplx5.cpptest \ template_typemaps.cpptest \ template_typemaps_typedef.cpptest \ template_typemaps_typedef2.cpptest \ -typename.cpptest \ valuewrapper_const.cpptest \ valuewrapper_opaque.cpptest \ : SWIGOPT += -nocxx +# Avoid conflict with the C++ keyword for some tests. +SWIG_NS = $* + +dynamic_cast.cpptest: SWIG_NS = dyn_cast +typename.cpptest: SWIG_NS = type_name + %.multicpptest: SWIGOPT += -namespace $* -%.cpptest: SWIGOPT += -namespace $* +%.cpptest: SWIGOPT += -namespace $(SWIG_NS) SRCDIR = ../$(srcdir)/ From cc76e3a1d787404d7e49f0a8648ca367d0f002bc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 00:14:06 +0100 Subject: [PATCH 475/508] Fix crash for classes with ignored base class This fixes class_ignore.cpptest. --- Examples/test-suite/c/Makefile.in | 1 - Source/Modules/c.cxx | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 65e4e0bd6..9b096a688 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -101,7 +101,6 @@ SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning # Tests for which C++ wrappers currently don't compile. apply_strings.cpptest \ autodoc.cpptest \ -class_ignore.cpptest \ class_scope_weird.cpptest \ contract.cpptest \ conversion.cpptest \ diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 6a5c1c3cb..a0d2e6caf 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -983,7 +983,8 @@ public: first_base_ = Copy(i.item); } - Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); + if (first_base_) + Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); } Printv(cxx_wrappers_.sect_types, From edff57c2ada727b414617d96e6f8f8d651ed5fde Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 00:53:35 +0100 Subject: [PATCH 476/508] Don't generate C++ setters and getters inline The type of the member may be incomplete, so generate the definitions of these functions in a separate section, after declaring all the wrapper classes, just as it was already done for the other functions. This fixes compiling some of the previously failing tests in C++ mode. --- Source/Modules/c.cxx | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index a0d2e6caf..bf3f85d11 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1082,28 +1082,48 @@ public: if (Checkattr(n, "kind", "variable")) { if (Checkattr(n, "memberget", "1")) { - rtype_desc.set_return_value(NewStringf("%s(swig_self())", Getattr(n, "sym:name"))); Printv(cxx_wrappers_.sect_decls, - cindent, rtype_desc.type(), " ", name, "() const " + cindent, rtype_desc.type(), " ", name, "() const;\n", + NIL + ); + + rtype_desc.set_return_value(NewStringf("%s(swig_self())", Getattr(n, "sym:name"))); + Printv(cxx_wrappers_.sect_impls, + "inline ", rtype_desc.type(), " ", classname, "::", name, "() const " "{", rtype_desc.get_return_code().get(), "}\n", NIL ); } else if (Checkattr(n, "memberset", "1")) { Printv(cxx_wrappers_.sect_decls, - cindent, "void ", name, "(", parms_cxx, ") " + cindent, "void ", name, "(", parms_cxx, ");\n", + NIL + ); + + Printv(cxx_wrappers_.sect_impls, + "inline void ", classname, "::", name, "(", parms_cxx, ") " "{ ", Getattr(n, "sym:name"), "(swig_self(), ", parms_call, "); }\n", NIL ); } else if (Checkattr(n, "varget", "1")) { - rtype_desc.set_return_value(NewStringf("%s()", Getattr(n, "sym:name"))); Printv(cxx_wrappers_.sect_decls, - cindent, "static ", rtype_desc.type(), " ", name, "() " + cindent, "static ", rtype_desc.type(), " ", name, "();\n", + NIL + ); + + rtype_desc.set_return_value(NewStringf("%s()", Getattr(n, "sym:name"))); + Printv(cxx_wrappers_.sect_impls, + "inline ", rtype_desc.type(), " ", classname, "::", name, "() " "{", rtype_desc.get_return_code().get(), "}\n", NIL ); } else if (Checkattr(n, "varset", "1")) { Printv(cxx_wrappers_.sect_decls, - cindent, "static void ", name, "(", parms_cxx, ") " + cindent, "static void ", name, "(", parms_cxx, ");\n", + NIL + ); + + Printv(cxx_wrappers_.sect_impls, + "inline void ", classname, "::", name, "(", parms_cxx, ") " "{ ", Getattr(n, "sym:name"), "(", parms_call, "); }\n", NIL ); From 74e8a6e729df2d5c064458f603095e5887f03e93 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 00:35:09 +0100 Subject: [PATCH 477/508] Reenable C++ wrappers for some of the previously failing tests Document the reason for failure for some of those that still fail without -nocxx. --- Examples/test-suite/c/Makefile.in | 139 ++++++++++-------------------- 1 file changed, 47 insertions(+), 92 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 9b096a688..a7ed48e11 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -99,97 +99,52 @@ SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning %.ctest: SWIGOPT += -nocxx # Tests for which C++ wrappers currently don't compile. -apply_strings.cpptest \ -autodoc.cpptest \ -class_scope_weird.cpptest \ -contract.cpptest \ -conversion.cpptest \ -conversion_namespace.cpptest \ -conversion_ns_template.cpptest \ -cpp11_default_delete.cpptest \ -cpp11_explicit_conversion_operators.cpptest \ -cpp11_final_override.cpptest \ -cpp11_initializer_list.cpptest \ -cpp11_noexcept.cpptest \ -cpp11_shared_ptr_upcast.cpptest \ -cpp11_strongly_typed_enumerations.cpptest \ -cpp_typedef.cpptest \ -default_constructor.cpptest \ -derived_nested.cpptest \ -director_basic.cpptest \ -director_classes.cpptest \ -director_conversion_operators.cpptest \ -director_frob.cpptest \ -director_property.cpptest \ -director_string.cpptest \ -extend_template_method.cpptest \ -features.cpptest \ -global_namespace.cpptest \ -ignore_parameter.cpptest \ -inherit_target_language.cpptest \ -kind.cpptest \ -li_boost_shared_ptr_bits.cpptest \ -li_boost_shared_ptr_director.cpptest \ -li_std_except.cpptest \ -li_std_map.cpptest \ -li_std_vector.cpptest \ -li_std_vector_enum.cpptest \ -li_std_vector_ptr.cpptest \ -li_swigtype_inout.cpptest \ -member_template.cpptest \ -multiple_inheritance_abstract.cpptest \ -multiple_inheritance_interfaces.cpptest \ -multiple_inheritance_nspace.cpptest \ -multiple_inheritance_shared_ptr.cpptest \ -namespace_class.cpptest \ -namespace_virtual_method.cpptest \ -naturalvar_more.cpptest \ -nested_ignore.cpptest \ -nested_scope_flat.cpptest \ -operator_pointer_ref.cpptest \ -operbool.cpptest \ -overload_arrays.cpptest \ -overload_complicated.cpptest \ -overload_null.cpptest \ -overload_template.cpptest \ -overload_template_fast.cpptest \ -pure_virtual.cpptest \ -refcount.cpptest \ -rename1.cpptest \ -rename2.cpptest \ -rename3.cpptest \ -rename4.cpptest \ -rename_wildcard.cpptest \ -return_const_value.cpptest \ -smart_pointer_ignore.cpptest \ -smart_pointer_member.cpptest \ -smart_pointer_multi_typedef.cpptest \ -smart_pointer_template_const_overload.cpptest \ -smart_pointer_templatemethods.cpptest \ -smart_pointer_typedef.cpptest \ -template_arg_scope.cpptest \ -template_const_ref.cpptest \ -template_default_arg.cpptest \ -template_default_arg_overloaded.cpptest \ -template_default_vw.cpptest \ -template_extend_overload.cpptest \ -template_inherit_abstract.cpptest \ -template_methods.cpptest \ -template_nested.cpptest \ -template_nested_flat.cpptest \ -template_ns_enum2.cpptest \ -template_opaque.cpptest \ -template_qualifier.cpptest \ -template_retvalue.cpptest \ -template_static.cpptest \ -template_typedef_class_template.cpptest \ -template_typedef_cplx5.cpptest \ -template_typemaps.cpptest \ -template_typemaps_typedef.cpptest \ -template_typemaps_typedef2.cpptest \ -valuewrapper_const.cpptest \ -valuewrapper_opaque.cpptest \ -: SWIGOPT += -nocxx +contract.cpptest: SWIG_NOCXX = -nocxx # Class derived from a base class with multiple base classes and hence ignored. +conversion.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type not handled specially. +conversion_namespace.cpptest: SWIG_NOCXX = -nocxx # Conversion operator name not handled correctly. +conversion_ns_template.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return not handled specially. +cpp11_default_delete.cpptest: SWIG_NOCXX = -nocxx # Assignment operator and r-value references not handled. +cpp11_explicit_conversion_operators.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. +cpp11_noexcept.cpptest: SWIG_NOCXX = -nocxx # Assignment operator. +default_constructor.cpptest: SWIG_NOCXX = -nocxx # Something weird with OSRSpatialReferenceShadow. +director_classes.cpptest: SWIG_NOCXX = -nocxx # Ref to pointer +director_conversion_operators.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. +director_frob.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. +extend_template_method.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. +features.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type not handled specially. +global_namespace.cpptest: SWIG_NOCXX = -nocxx # Const const reference type. +li_boost_shared_ptr_director.cpptest: SWIG_NOCXX = -nocxx # Ref to pointer +li_std_vector_ptr.cpptest: SWIG_NOCXX = -nocxx # Ref to pointer +member_template.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. +multiple_inheritance_abstract.cpptest: SWIG_NOCXX = -nocxx # Multiple inheritance not supported. +multiple_inheritance_interfaces.cpptest: SWIG_NOCXX = -nocxx +multiple_inheritance_nspace.cpptest: SWIG_NOCXX = -nocxx +multiple_inheritance_shared_ptr.cpptest: SWIG_NOCXX = -nocxx +namespace_class.cpptest: SWIG_NOCXX = -nocxx # Many broken type names. +operator_pointer_ref.cpptest: SWIG_NOCXX = -nocxx +operbool.cpptest: SWIG_NOCXX = -nocxx +overload_null.cpptest: SWIG_NOCXX = -nocxx +overload_template.cpptest: SWIG_NOCXX = -nocxx +overload_template_fast.cpptest: SWIG_NOCXX = -nocxx +pure_virtual.cpptest: SWIG_NOCXX = -nocxx +rename1.cpptest: SWIG_NOCXX = -nocxx +rename2.cpptest: SWIG_NOCXX = -nocxx +rename3.cpptest: SWIG_NOCXX = -nocxx +rename4.cpptest: SWIG_NOCXX = -nocxx +rename_wildcard.cpptest: SWIG_NOCXX = -nocxx +return_const_value.cpptest: SWIG_NOCXX = -nocxx +smart_pointer_member.cpptest: SWIG_NOCXX = -nocxx +smart_pointer_template_const_overload.cpptest: SWIG_NOCXX = -nocxx +smart_pointer_templatemethods.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. +template_const_ref.cpptest: SWIG_NOCXX = -nocxx +template_default_arg_overloaded.cpptest: SWIG_NOCXX = -nocxx +template_inherit_abstract.cpptest: SWIG_NOCXX = -nocxx +template_methods.cpptest: SWIG_NOCXX = -nocxx +template_nested.cpptest: SWIG_NOCXX = -nocxx +template_nested_flat.cpptest: SWIG_NOCXX = -nocxx +template_qualifier.cpptest: SWIG_NOCXX = -nocxx +template_static.cpptest: SWIG_NOCXX = -nocxx +valuewrapper_const.cpptest: SWIG_NOCXX = -nocxx # Misplaced const. # Avoid conflict with the C++ keyword for some tests. SWIG_NS = $* @@ -199,7 +154,7 @@ typename.cpptest: SWIG_NS = type_name %.multicpptest: SWIGOPT += -namespace $* -%.cpptest: SWIGOPT += -namespace $(SWIG_NS) +%.cpptest: SWIGOPT += -namespace $(SWIG_NS) $(SWIG_NOCXX) SRCDIR = ../$(srcdir)/ From bec35fa0c2b478a71fbda9096f6080a792235a8f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 02:25:50 +0100 Subject: [PATCH 478/508] Define "equivalent" typecheck typemap attribute for shared_ptr<> This is required to handle overloaded functions taking shared_ptr or raw type correctly and is checked in cpp11_shared_ptr_overload unit test. --- Lib/c/std_shared_ptr.i | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Lib/c/std_shared_ptr.i b/Lib/c/std_shared_ptr.i index a82a49c45..d2049f5f9 100644 --- a/Lib/c/std_shared_ptr.i +++ b/Lib/c/std_shared_ptr.i @@ -67,6 +67,18 @@ explicit operator bool() const { return swig_self_ != nullptr; } %} +// This is required to handle overloads on shared_ptr/normal type correctly. +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER, equivalent="TYPE *") + TYPE CONST, + TYPE CONST &, + TYPE CONST *, + TYPE *CONST&, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& + "" + %enddef %include From 3d0fe23e29bf470a42842f9fb9a35343ff705a37 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 02:59:29 +0100 Subject: [PATCH 479/508] Move setting parameter/return type inside do_resolve_type() No real changes, this just prepares for more changes later. --- Source/Modules/c.cxx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index bf3f85d11..ec18d2520 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -494,8 +494,7 @@ struct cxx_wrappers return false; } - rtype_desc.set_type(type); - if (!do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc)) + if (!do_resolve_type(n, func_type, type, NULL, &rtype_desc)) return false; if (use_cxxout) { @@ -527,8 +526,7 @@ struct cxx_wrappers return false; } - ptype_desc.set_type(type); - if (!do_resolve_type(n, Getattr(p, "type"), ptype_desc.type(), &ptype_desc, NULL)) + if (!do_resolve_type(n, Getattr(p, "type"), type, &ptype_desc, NULL)) return false; if (use_cxxin) { @@ -629,6 +627,12 @@ private: return false; } + // Nothing else needed. + if (rtype_desc) + rtype_desc->set_type(s); + if (ptype_desc) + ptype_desc->set_type(s); + return true; } @@ -800,6 +804,11 @@ private: Replaceall(s, typemaps[typeKind], typestr); + if (rtype_desc) + rtype_desc->set_type(s); + if (ptype_desc) + ptype_desc->set_type(s); + return true; } From 1fd4c647b898d2a6e2a8a9aa25ad2f8e6ec2a5aa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 2021 03:26:44 +0100 Subject: [PATCH 480/508] Add support for const references to pointers They're used in some unit tests and we can support them by handling them just as pointers in C++ wrappers (this was already the case for C wrappers). --- Examples/test-suite/c/Makefile.in | 3 --- Lib/c/c.swg | 1 + Source/Modules/c.cxx | 11 ++++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index a7ed48e11..f7325c100 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -107,14 +107,11 @@ cpp11_default_delete.cpptest: SWIG_NOCXX = -nocxx # Assignment operator and r-va cpp11_explicit_conversion_operators.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. cpp11_noexcept.cpptest: SWIG_NOCXX = -nocxx # Assignment operator. default_constructor.cpptest: SWIG_NOCXX = -nocxx # Something weird with OSRSpatialReferenceShadow. -director_classes.cpptest: SWIG_NOCXX = -nocxx # Ref to pointer director_conversion_operators.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. director_frob.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. extend_template_method.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. features.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type not handled specially. global_namespace.cpptest: SWIG_NOCXX = -nocxx # Const const reference type. -li_boost_shared_ptr_director.cpptest: SWIG_NOCXX = -nocxx # Ref to pointer -li_std_vector_ptr.cpptest: SWIG_NOCXX = -nocxx # Ref to pointer member_template.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. multiple_inheritance_abstract.cpptest: SWIG_NOCXX = -nocxx # Multiple inheritance not supported. multiple_inheritance_interfaces.cpptest: SWIG_NOCXX = -nocxx diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 081955d51..806ca5f11 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -119,6 +119,7 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype); // objects %typemap(ctype) SWIGTYPE "$&resolved_type*" %typemap(ctype) SWIGTYPE * "$resolved_type*" +%typemap(ctype) SWIGTYPE * const & "$resolved_type*" %typemap(ctype) SWIGTYPE & "$*resolved_type*" %typemap(ctype) SWIGTYPE [ANY] "$resolved_type*" %typemap(ctype) SWIGTYPE * [ANY] "$resolved_type**" diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index ec18d2520..78d24ad7b 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -719,7 +719,16 @@ private: } else { String* classname; if (Node* const class_node = Language::instance()->classLookup(type)) { - typestr = SwigType_str(resolved_type, 0); + // Special case: if this is a pointer passed by (const) reference, we return just the pointer directly because we don't have any pointer-valued variable + // to give out a reference to. + if (typeKind == Type_Ptr && strncmp(Char(resolved_type), "r.q(const).", 11) == 0) { + scoped_dohptr deref_type(Copy(resolved_type)); + Delslice(deref_type, 0, 11); + typestr = SwigType_str(deref_type, 0); + } else { + typestr = SwigType_str(resolved_type, 0); + } + classname = Getattr(class_node, "sym:name"); // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the From 86dbf6bcb52c0e4d5238cd46d440ddbad8dd8dea Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Dec 2021 20:49:15 +0100 Subject: [PATCH 481/508] Generate C++ wrappers for the global functions too This ensures that global functions can also use C++ classes, enums etc for their parameters and return types. C++ wrappers for a couple of tests had to be disabled, but this is not really a regression as wrapping global functions just made apparent problems that were not visible before because the corresponding wrappers were not created at all. --- Examples/test-suite/c/Makefile.in | 4 ++++ Source/Modules/c.cxx | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index f7325c100..ac445e123 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -112,6 +112,8 @@ director_frob.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type. extend_template_method.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. features.cpptest: SWIG_NOCXX = -nocxx # Conversion operator return type not handled specially. global_namespace.cpptest: SWIG_NOCXX = -nocxx # Const const reference type. +li_carrays_cpp.cpptest: SWIG_NOCXX = -nocxx # Arrays not really supported currently. +li_cdata_cpp.cpptest: SWIG_NOCXX = -nocxx # No support for multiarg typemaps required here. member_template.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. multiple_inheritance_abstract.cpptest: SWIG_NOCXX = -nocxx # Multiple inheritance not supported. multiple_inheritance_interfaces.cpptest: SWIG_NOCXX = -nocxx @@ -133,6 +135,7 @@ return_const_value.cpptest: SWIG_NOCXX = -nocxx smart_pointer_member.cpptest: SWIG_NOCXX = -nocxx smart_pointer_template_const_overload.cpptest: SWIG_NOCXX = -nocxx smart_pointer_templatemethods.cpptest: SWIG_NOCXX = -nocxx # Wrong form of template function name. +struct_initialization_cpp.cpptest: SWIG_NOCXX = -nocxx # Arrays in initialization not supported. template_const_ref.cpptest: SWIG_NOCXX = -nocxx template_default_arg_overloaded.cpptest: SWIG_NOCXX = -nocxx template_inherit_abstract.cpptest: SWIG_NOCXX = -nocxx @@ -141,6 +144,7 @@ template_nested.cpptest: SWIG_NOCXX = -nocxx template_nested_flat.cpptest: SWIG_NOCXX = -nocxx template_qualifier.cpptest: SWIG_NOCXX = -nocxx template_static.cpptest: SWIG_NOCXX = -nocxx +typemap_array_qualifiers.cpptest: SWIG_NOCXX = -nocxx # Arrays not supported. valuewrapper_const.cpptest: SWIG_NOCXX = -nocxx # Misplaced const. # Avoid conflict with the C++ keyword for some tests. diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 78d24ad7b..073b95bc2 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -920,6 +920,8 @@ public: bool can_wrap() const { return func_node != NULL; } // Emit just the function body, including the braces around it. + // + // This helper is used both by our emit() and emit_member_function(). void emit_body(String* wparms) { String* const wname = Getattr(func_node, "wrap:name"); @@ -947,6 +949,23 @@ public: Append(cxx_wrappers_.sect_impls, "}\n"); } + // Do emit the function wrapper. + void emit() { + // The wrapper function name should be sym:name, but we change it to include the namespace prefix in our own globalvariableHandler(), so now we have to undo + // this by using the value saved there, if available. This is definitely clumsy and it would be better to avoid it, but this would probably need to be done + // by separating C and C++ wrapper generation in two different passes and so would require significantly more changes than this hack. + String* name = Getattr(func_node, "c:globalvariableHandler:sym:name"); + if (!name) + name = Getattr(func_node, "sym:name"); + + Printv(cxx_wrappers_.sect_impls, + "inline ", rtype_desc.type(), " ", name, "(", parms_cxx.get(), ") ", + NIL + ); + + emit_body(parms_call); + } + cxx_wrappers& cxx_wrappers_; Node* func_node; @@ -2496,6 +2515,10 @@ public: if (cxx_class_wrapper_) { cxx_class_wrapper_->emit_member_function(n); + } else { + cxx_function_wrapper w(cxx_wrappers_, n, Getattr(n, "parms")); + if (w.can_wrap()) + w.emit(); } } From f06bba320a1ef8ae344e867613e00fc5d30e50b6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 9 Dec 2021 00:18:05 +0100 Subject: [PATCH 482/508] Make it possible to customize swig_check() definition Move this function definition to cexcept.swg from the code and only define it if SWIG_swig_check_DEFINED is not defined yet, which both simplifies the code in C.cxx and makes exception handling code more flexible, as it's now possible to predefine SWIG_swig_check_DEFINED in the code injected into the "cxxheader" section to replace the default implementation. Show an example of doing this in the documentation and document handling exceptions with C API too. The changes above required adding a new "cxxcode" section, corresponding to the "implementation" part of C++ wrappers and defining a new SWIG_CXX_WRAPPERS preprocessor symbol to allow only adding C++-specific code when C++ wrappers are actually generated. Also improve the documentation of the C-specific sections in the manual. --- Doc/Manual/C.html | 52 ++++++++++++++++++++++++++++++++++++++++++-- Lib/c/cexcept.swg | 33 ++++++++++++++++++++++++++++ Source/Modules/c.cxx | 23 +++----------------- 3 files changed, 86 insertions(+), 22 deletions(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 356380210..03ac9954a 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -683,6 +683,10 @@ void SomeIntTemplateClass_delete(SomeIntTemplateClass * carg1);

    36.5 Exception handling

    +

    +Any call to a C++ function may throw an exception, which cannot be caught by C code. Instead, the special SWIG_CException_get_pending() function must be called to check for this. If it returns a non-null pointer, SWIG_CException_msg_get() can be called to retrieve the error message associated with the exception. Finally, SWIG_CException_reset_pending() must be called to free the exception object and reset the current pending exception. Note that exception handling is much simpler when using C++, rather than C, wrappers, see sections 36.6.2. +

    +

    36.6 C++ Wrappers

    @@ -702,8 +706,52 @@ Other ones are due to things that could be supported but haven't been implemente

    -Note that cxxheader section can be used to output additional -declarations to the C++-only part of the generated header. +

    36.6.1 Additional sections

    + +Generated C++ code can be customized by inserting custom code in the following sections: + +
      +
    • cxxheader for including additional headers and other declarations in the global scope.
      • +
    • cxxcode for additional code to appear after the declarations of all wrapper classes, inside the module-specific namespace.
      • +
    + +

    36.6.2 Exception handling

    + +

    +Exception handling in C++ is more natural, as the exceptions are re-thrown when using C++ wrappers and so can be caught, as objects of the special SWIG_CException type, using the usual try/catch statement. The objects of SWIG_CException class have code() and msg() methods, with the latter returning the error message associated with the exception. +

    + +

    +If necessary, a custom exception type may be used instead of SWIG_CException. To do this, a custom implementation of swig_check() function, called to check for the pending exception and throw the corresponding C++ exception if necessary, must be provided and SWIG_swig_check_DEFINED preprocessor symbol must be defined to prevent the default implementation of this function from being compiled: +

    +
    +%insert(cxxheader) %{
+#ifndef SWIG_swig_check_DEFINED
+#define SWIG_swig_check_DEFINED 1
+
+#include 
+
+class Exception : public std::runtime_error {
+public:
+    explicit Exception(const char* msg) : std::runtime_error{msg} {}
+};
+
+inline void swig_check() {
+  if (auto* swig_ex = SWIG_CException_get_pending()) {
+    Exception const e{SWIG_CException_msg_get(swig_ex)};
+    SWIG_CException_reset_pending();
+    throw e;
+  }
+}
+
+template  T swig_check(T x) {
+  swig_check();
+  return x;
+}
+
+#endif // SWIG_swig_check_DEFINED
+%}
+
    diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index 8c9545657..57171273d 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -62,6 +62,39 @@ SWIGEXPORTC void SWIG_CException_Raise(int code, const char* msg) { #endif // SWIG_CException_DEFINED %} +#ifdef SWIG_CXX_WRAPPERS + +// This is somewhat of a hack, but our generated header may include another +// generated header, when using multiple modules, and defining swig_check() in +// all of them would result in errors, so we use SWIG_swig_check_DEFINED to +// prevent this from happening. +// +// This also has a nice side effect of allowing the user code to predefine this +// symbol and provide their own SWIG_swig_check_DEFINED implementation to +// customize exception handling. +%insert("cxxcode") %{ +#ifndef SWIG_swig_check_DEFINED +#define SWIG_swig_check_DEFINED 1 + +inline void swig_check() { + if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) { + SWIG_CException swig_ex_copy{*swig_ex}; + delete swig_ex; + SWIG_CException::reset_pending(); + throw swig_ex_copy; + } +} + +template T swig_check(T x) { + swig_check(); + return x; +} + +#endif // SWIG_swig_check_DEFINED +%} + +#endif // SWIG_CXX_WRAPPERS + %insert("runtime") "swigerrors.swg" #define SWIG_exception(code, msg)\ diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 073b95bc2..120a9fe1c 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -419,6 +419,7 @@ struct cxx_wrappers // Allow using SWIG directive to inject code here. Swig_register_filebyname("cxxheader", sect_cxx_h); + Swig_register_filebyname("cxxcode", sect_impls); } // This function must be called after initialize(). The two can't be combined because we don't yet know if we're going to use exceptions or not when we @@ -426,26 +427,6 @@ struct cxx_wrappers void initialize_exceptions(exceptions_support support) { switch (support) { case exceptions_support_enabled: - // Generate the functions which will be used in all wrappers to check for the exceptions only in this case, i.e. do not do it if they're already defined - // in another module imported by this one. - Printv(sect_impls, - "inline void swig_check() {\n", - cindent, "if (SWIG_CException* swig_ex = SWIG_CException::get_pending()) {\n", - cindent, cindent, "SWIG_CException swig_ex_copy{*swig_ex};\n", - cindent, cindent, "delete swig_ex;\n", - cindent, cindent, "SWIG_CException::reset_pending();\n", - cindent, cindent, "throw swig_ex_copy;\n", - cindent, "}\n", - "}\n\n", - "template T swig_check(T x) {\n", - cindent, "swig_check();\n", - cindent, "return x;\n", - "}\n\n", - NIL - ); - - // fall through - case exceptions_support_imported: except_check_start = "swig_check("; except_check_end = ")"; @@ -1756,6 +1737,8 @@ public: Preprocessor_define("SWIG_C_EXCEPT 1", 0); if (CPlusPlus) Preprocessor_define("SWIG_CPPMODE 1", 0); + if (use_cxx_wrappers) + Preprocessor_define("SWIG_CXX_WRAPPERS 1", 0); SWIG_library_directory("c"); From e15d3e17ac636f6176cb2eb008b59a157253c56e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 9 Dec 2021 00:36:09 +0100 Subject: [PATCH 483/508] Allow skipping creating C++ wrappers with cxxignore feature This can be useful to avoid errors due to features not supported at C++ level in some tests. --- Doc/Manual/C.html | 7 ++++++- Source/Modules/c.cxx | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 03ac9954a..2161d2739 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -706,7 +706,7 @@ Other ones are due to things that could be supported but haven't been implemente

    -

    36.6.1 Additional sections

    +

    36.6.1 Additional customization possibilities

    Generated C++ code can be customized by inserting custom code in the following sections: @@ -715,6 +715,11 @@ Generated C++ code can be customized by inserting custom code in the following s
  • cxxcode for additional code to appear after the declarations of all wrapper classes, inside the module-specific namespace.
    • +The following features are taken into account when generating C++ wrappers: +
      +
    • cxxignore May be set to skip generation of C++ wrappers for the given function or class, while still generating C wrappers for them.
      • +
    +

    36.6.2 Exception handling

    diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 120a9fe1c..5e6a4cd91 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -828,6 +828,9 @@ public: except_check_start = except_check_end = ""; + if (Checkattr(n, "feature:cxxignore", "1")) + return; + // Usually generating wrappers for overloaded methods is fine, but sometimes their types can clash after applying typemaps and in this case we have no // choice but to avoid generating them, as otherwise we'd just generate uncompilable code. if (Getattr(n, "sym:overloaded")) { @@ -980,6 +983,9 @@ public: if (!cxx_wrappers_.is_initialized()) return; + if (Checkattr(n, "feature:cxxignore", "1")) + return; + String* const classname = Getattr(n, "sym:name"); scoped_dohptr base_classes(NewStringEmpty()); From 6a96b8d477714658257e13e082741c192f034527 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 9 Dec 2021 00:50:26 +0100 Subject: [PATCH 484/508] Disable warnings about unsupported features in C test suite There are too many of them currently for them to be useful. --- Examples/test-suite/c/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index ac445e123..c23e2a71f 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -94,7 +94,9 @@ char_binary.cpptest director_binary_string.cpptest li_typemaps.cpptest li_typema include $(srcdir)/../common.mk # Overridden variables here -SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning + +# Suppress warnings about experimental status and unsupported features -- there are just too many of those for now for these warnings to be useful. +SWIGOPT += -w524 -w779 %.ctest: SWIGOPT += -nocxx From 0fcdec302c304a3710ed635ac142085f36642962 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2022 01:10:16 +0100 Subject: [PATCH 485/508] Revert some insignificant changes done in historical C branch This undoes parts of a2dc2756c (Several major fixes for: arrays, static members, member func.ptrs., exceptions, ... Lots of tests runs ok now., 2009-04-13) that shouldn't have been done in the first place. --- Examples/test-suite/arrays_dimensionless.i | 4 ---- Examples/test-suite/dynamic_cast.i | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Examples/test-suite/arrays_dimensionless.i b/Examples/test-suite/arrays_dimensionless.i index 717021643..11dc022f7 100644 --- a/Examples/test-suite/arrays_dimensionless.i +++ b/Examples/test-suite/arrays_dimensionless.i @@ -9,14 +9,10 @@ int globalints[] = {100, 200, 300}; const int constglobalints[] = {400, 500, 600}; -class CC {}; - struct Bar { static int ints[]; - static CC ccs[]; }; int Bar::ints[] = {700, 800, 900}; -CC Bar::ccs[] = {CC(), CC()}; double arr_bool(bool array[], int length) { double sum=0.0; int i=0; for(; i Date: Tue, 4 Jan 2022 01:10:43 +0100 Subject: [PATCH 486/508] Remove commented out code from c/std_except.i This was added in 32e03aa13 (Many major improvements. Almost all testsuite compiles now., 2009-04-15) and never really used. --- Lib/c/std_except.i | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Lib/c/std_except.i b/Lib/c/std_except.i index 5b6a929cd..cc5a7fca2 100644 --- a/Lib/c/std_except.i +++ b/Lib/c/std_except.i @@ -18,17 +18,3 @@ namespace std %ignore exception; struct exception {}; } - -/* -%typemap(throws) std::bad_exception "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" -%typemap(throws) std::domain_error "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" -%typemap(throws) std::exception "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" -%typemap(throws) std::invalid_argument "SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, $1.what());\n return $null;" -%typemap(throws) std::length_error "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;" -%typemap(throws) std::logic_error "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" -%typemap(throws) std::out_of_range "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;" -%typemap(throws) std::overflow_error "SWIG_JavaThrowException(jenv, SWIG_JavaArithmeticException, $1.what());\n return $null;" -%typemap(throws) std::range_error "SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());\n return $null;" -%typemap(throws) std::runtime_error "SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.what());\n return $null;" -%typemap(throws) std::underflow_error "SWIG_JavaThrowException(jenv, SWIG_JavaArithmeticException, $1.what());\n return $null;" -*/ From 3b7f772dde67ced85f0247c8e947f57acd64875b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2022 01:24:12 +0100 Subject: [PATCH 487/508] Remove extra trailing blank line in examples makefile This was removed in master but somehow survived in this branch. --- Examples/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 5af51f8ec..94372b8e5 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1693,4 +1693,3 @@ d_clean: rm -f *_wrap* *~ .~* $(RUNME) $(RUNME).exe `find . -name \*.d | grep -v $(RUNME).d` rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ - From 92c3b373378a882613dab13133656d7617135a1d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2022 01:26:40 +0100 Subject: [PATCH 488/508] Avoid defining custom assert() macro in one of the C tests This was inconsistent with all the other tests and the macro suffered from several problems. Just drop it and use the standard macro with the same name instead. --- Examples/test-suite/c/operator_overload_runme.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Examples/test-suite/c/operator_overload_runme.c b/Examples/test-suite/c/operator_overload_runme.c index 19e01ccb5..1dde8ae8f 100644 --- a/Examples/test-suite/c/operator_overload_runme.c +++ b/Examples/test-suite/c/operator_overload_runme.c @@ -1,23 +1,22 @@ +#include #include #include #include "operator_overload/operator_overload_wrap.h" -#define assert(x,msg) if (!x) { printf("%d: %s\n", x, msg); exit(1); } - int main() { operator_overload_Op_sanity_check(); operator_overload_Op *op1 = operator_overload_Op_new_i(1), *op2 = operator_overload_Op_new_i(2), *op3 = operator_overload_Op_copy(op1); - assert(operator_overload_Op_NotEqual(op1, op2), "neq failed"); + assert(operator_overload_Op_NotEqual(op1, op2)); operator_overload_Op_PlusPlusPrefix(op3); - assert(operator_overload_Op_EqualEqual(op2, op3), "eqeq failed"); - assert(operator_overload_Op_GreaterThanEqual(op2, op1), "geq failed"); + assert(operator_overload_Op_EqualEqual(op2, op3)); + assert(operator_overload_Op_GreaterThanEqual(op2, op1)); operator_overload_Op_PlusEqual(op3, op1); - assert(operator_overload_Op_LessThan(op1, op2) && operator_overload_Op_LessThan(op2, op3), "lt failed"); - assert(3 == *operator_overload_Op_IndexInto(op3, operator_overload_Op_IndexIntoConst(op2, operator_overload_Op_Functor(op1))), "[] or () failed"); - assert(5 == operator_overload_Op_Functor_i(op3, 2), "f(x) failed"); + assert(operator_overload_Op_LessThan(op1, op2) && operator_overload_Op_LessThan(op2, op3)); + assert(3 == *operator_overload_Op_IndexInto(op3, operator_overload_Op_IndexIntoConst(op2, operator_overload_Op_Functor(op1)))); + assert(5 == operator_overload_Op_Functor_i(op3, 2)); operator_overload_Op_delete(op1); operator_overload_Op_delete(op2); From cb974ef6624e220d3963efa9fa36f16f727be5f5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2022 01:29:21 +0100 Subject: [PATCH 489/508] Use COMPILETOOL with C_LDSHARED and CXX_LDSHARED This is consistent with the way this is done for the other backends and allows to avoid overriding these variables for partialcheck target. Co-Authored-By: Olly Betts --- Examples/Makefile.in | 4 ++-- Examples/test-suite/common.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 94372b8e5..dfb3c728d 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1366,12 +1366,12 @@ C_SO = @C_SO@ c: $(SRCDIR_SRCS) $(SWIG) -c $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH) $(CC) -c $(CCSHARED) -I$(SRCDIR) $(CFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(INCLUDES) - $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) + $(COMPILETOOL) $(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_cpp: $(SRCDIR_SRCS) $(SWIG) -c++ -c $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) -I$(SRCDIR) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) - $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) + $(COMPILETOOL) $(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO) c_compile_c: $(SRCDIR)$(RUNME).c $(COMPILETOOL) $(CC) $(CFLAGS) -o $(RUNME)_$(RUNME_EXT) -I. -I.. $< -L. -l$(TARGET) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 482b9bcaf..5a44980cc 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -816,7 +816,7 @@ endif # partialcheck target runs SWIG only, ie no compilation or running of tests (for a subset of languages) partialcheck: - $(MAKE) check CC=true CXX=true LDSHARED=true CXXSHARED=true RUNTOOL=true COMPILETOOL=true C_LDSHARED=true CXX_LDSHARED=true + $(MAKE) check CC=true CXX=true LDSHARED=true CXXSHARED=true RUNTOOL=true COMPILETOOL=true swig_and_compile_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ From 9a2e48b447b439e5a6309a0dc9d2da72ecf46971 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2022 01:32:25 +0100 Subject: [PATCH 490/508] Clean up class example header Apply changes of b115c984a (More cleaning up of the class examples, 2014-05-05) and other similar commits to the header in this branch too. --- Examples/c/class/example.h | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/Examples/c/class/example.h b/Examples/c/class/example.h index 46d901361..0dff185b2 100644 --- a/Examples/c/class/example.h +++ b/Examples/c/class/example.h @@ -7,11 +7,11 @@ public: } virtual ~Shape() { nshapes--; - }; - double x, y; + } + double x, y; void move(double dx, double dy); - virtual double area(void) = 0; - virtual double perimeter(void) = 0; + virtual double area() = 0; + virtual double perimeter() = 0; static int nshapes; }; @@ -19,21 +19,16 @@ class Circle : public Shape { private: double radius; public: - Circle(double r) : radius(r) { }; - virtual double area(void); - virtual double perimeter(void); + Circle(double r) : radius(r) { } + virtual double area(); + virtual double perimeter(); }; class Square : public Shape { private: double width; public: - Square(double w) : width(w) { }; - virtual double area(void); - virtual double perimeter(void); + Square(double w) : width(w) { } + virtual double area(); + virtual double perimeter(); }; - - - - - From 7eb67cecca39a3691a50b0da1877e6ed58b0f9d3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2022 01:33:55 +0100 Subject: [PATCH 491/508] Restore the use of matrix.desc in GHA workflow file This is not used currently, but keep it there as this change is not related to C backend addition. --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef4b78f2c..1168e5dc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,9 @@ jobs: runs-on: ${{ matrix.os || 'ubuntu-20.04' }} - # By default, the name of the build is the language used and SWIG options. - name: ${{ matrix.SWIGLANG || 'none' }}${{ matrix.PY3 }} ${{ matrix.ENGINE}} ${{ matrix.VER }} ${{ matrix.SWIG_FEATURES }} ${{ (matrix.compiler || 'gcc') }}${{ matrix.GCC }} ${{ matrix.CPPSTD }} ${{ matrix.CSTD }} ${{ matrix.continue-on-error && '(can fail)' }} + # By default, the name of the build is the language used and SWIG options, but matrix entries + # can define the additional "desc" field with any additional information to include in the name. + name: ${{ matrix.SWIGLANG || 'none' }}${{ matrix.PY3 }} ${{ matrix.ENGINE}} ${{ matrix.VER }} ${{ matrix.SWIG_FEATURES }} ${{ (matrix.compiler || 'gcc') }}${{ matrix.GCC }} ${{ matrix.CPPSTD }} ${{ matrix.CSTD }} ${{ matrix.desc }} ${{ matrix.continue-on-error && '(can fail)' }} strategy: matrix: From c1fcf99ea70146982758f02db6058bd7dc58fdf1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Jan 2022 16:35:21 +0100 Subject: [PATCH 492/508] Revert change to handling "#@" in SWIG preprocessor The extra flexibility in expanding "#@" was considered inappropriate, see the discussion in #2096, so revert the preprocessor part of the changes of 5bf1497d7 (Allow customizing type mangling in SWIG preprocessor, 2021-11-10). This unfortunately means that the macros used in don't work for C backend any longer, so a previously passed unit test had to be disabled. --- Examples/test-suite/c/Makefile.in | 1 + Source/Preprocessor/cpp.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index c23e2a71f..547dc9cad 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -56,6 +56,7 @@ FAILING_CPP_TESTS := \ grouping \ import_nomodule \ li_attribute \ + li_attribute_template \ li_boost_shared_ptr_attribute \ li_std_deque \ li_std_wstring \ diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 14d41a001..75bec61fd 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -929,14 +929,14 @@ static String *expand_macro(String *name, List *args, String *line_file) { /* Non-standard mangle expansions. The #@Name is replaced by mangle_arg(Name). */ if (strstr(Char(ns), "\004")) { - String *marg = Swig_name_type(arg); + String *marg = Swig_string_mangle(arg); Clear(temp); Printf(temp, "\004%s", aname); Replace(ns, temp, marg, DOH_REPLACE_ID_END); Delete(marg); } if (strstr(Char(ns), "\005")) { - String *marg = Swig_name_type(arg); + String *marg = Swig_string_mangle(arg); Clear(temp); Clear(tempa); Printf(temp, "\005%s", aname); From faa5d8bbf5976fde9ccc45f754c104558affb08f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Jan 2022 16:40:46 +0100 Subject: [PATCH 493/508] Change value of WARN_C_UNSUPPORTTED for consistency Use consecutive value for the C-specific warnings instead of reserving the first and last values of the range for consistency with the other modules. --- Source/Include/swigwarn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index b12cce942..12e4ab675 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -256,7 +256,7 @@ /* please leave 740-759 free for Python */ #define WARN_C_TYPEMAP_CTYPE_UNDEF 760 -#define WARN_C_UNSUPPORTTED 779 +#define WARN_C_UNSUPPORTTED 761 /* please leave 760-779 free for C */ From 4748e4f3798188c07bcd7b3a0a9ab159390d5169 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Jan 2022 16:46:34 +0100 Subject: [PATCH 494/508] Remove more insignificant differences with examples in master Follow the she style of the other existing examples. --- Examples/c/class/example.cxx | 10 +++++----- Examples/c/class/example.i | 1 - Examples/c/exception/example.h | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Examples/c/class/example.cxx b/Examples/c/class/example.cxx index 1e8e203dd..046304519 100644 --- a/Examples/c/class/example.cxx +++ b/Examples/c/class/example.cxx @@ -1,4 +1,4 @@ -/* File : example.c */ +/* File : example.cxx */ #include "example.h" #define M_PI 3.14159265358979323846 @@ -11,18 +11,18 @@ void Shape::move(double dx, double dy) { int Shape::nshapes = 0; -double Circle::area(void) { +double Circle::area() { return M_PI*radius*radius; } -double Circle::perimeter(void) { +double Circle::perimeter() { return 2*M_PI*radius; } -double Square::area(void) { +double Square::area() { return width*width; } -double Square::perimeter(void) { +double Square::perimeter() { return 4*width; } diff --git a/Examples/c/class/example.i b/Examples/c/class/example.i index 75700b305..fbdf7249f 100644 --- a/Examples/c/class/example.i +++ b/Examples/c/class/example.i @@ -7,4 +7,3 @@ /* Let's just grab the original header file here */ %include "example.h" - diff --git a/Examples/c/exception/example.h b/Examples/c/exception/example.h index ae97e15e5..7e8361e4a 100644 --- a/Examples/c/exception/example.h +++ b/Examples/c/exception/example.h @@ -1,5 +1,6 @@ /* File : example.h */ +#include #ifndef SWIG struct A { }; @@ -10,7 +11,7 @@ class Exc { public: Exc(int c, const char *m) { code = c; - strncpy(msg,m,256); + strncpy(msg,m,255); } int code; char msg[256]; From 3caf2857428860fd2147b261f9eb53e9d79d2985 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 14:27:51 +0200 Subject: [PATCH 495/508] Make method wrappers suffix optional and disabled by default Unfortunately the changes of 26bf86322 (Use SWIG-specific for non-overloaded synthesized functions too, 2021-11-09) did break some existing code bases using SWIG as they hardcoded the old wrapper function names. So turn this off by default and add a global variable allowing to enable this, which can be done for a specific language only. This is ugly but, unfortunately, there is no way to use the Language object from the C function Swig_MethodToFunction(), so the only alternative would be to add another parameter to it, but it already has 6 of them, so it wouldn't really be that much better. See #2366, #2368, #2370. --- Source/Modules/lang.cxx | 3 ++- Source/Modules/main.cxx | 1 + Source/Swig/cwrap.c | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index eb61752b8..343b8007f 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -77,6 +77,7 @@ static Hash *classhash; extern int GenerateDefault; extern int ForceExtern; extern int AddExtern; +extern int UseWrapperSuffix; /* import modes */ @@ -1324,7 +1325,7 @@ int Language::staticmemberfunctionHandler(Node *n) { // See Swig_MethodToFunction() for the explanation of this code. if (Getattr(n, "sym:overloaded")) { Append(cname, Getattr(defaultargs ? defaultargs : n, "sym:overname")); - } else { + } else if (UseWrapperSuffix) { Append(cname, "__SWIG"); } diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index 9344a7299..aaf3948ea 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -37,6 +37,7 @@ int Verbose = 0; int AddExtern = 0; int NoExcept = 0; int SwigRuntime = 0; // 0 = no option, 1 = -runtime, 2 = -noruntime +int UseWrapperSuffix = 0; // If 1, append suffix to non-overloaded functions too. /* Suppress warning messages for private inheritance, preprocessor evaluation etc... WARN_PP_EVALUATION 202 diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 36e69332c..3b20f4e4f 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -15,6 +15,8 @@ #include "swig.h" #include "cparse.h" +extern int UseWrapperSuffix; // from main.cxx + static const char *cresult_variable_name = "result"; static Parm *nonvoid_parms(Parm *p) { @@ -1083,13 +1085,13 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas in C. But when not using the suffix used for overloaded functions, we still need to ensure that the - wrapper name doesn't conflict with any wrapper functions, so make it sufficiently unique by - appending a suffix similar to the one used for overloaded functions to it. + wrapper name doesn't conflict with any wrapper functions for some languages, so optionally make + it sufficiently unique by appending a suffix similar to the one used for overloaded functions to it. */ if (code) { if (Getattr(n, "sym:overloaded")) { Append(mangled, Getattr(defaultargs ? defaultargs : n, "sym:overname")); - } else { + } else if (UseWrapperSuffix) { Append(mangled, "__SWIG"); } } From f83e2a7de712b79c25fce4cb4353e03bab2eb7cb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 14:39:23 +0200 Subject: [PATCH 496/508] Stop using SWIG_exit() in C backend This function doesn't exist any more. --- Source/Modules/c.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 5e6a4cd91..3c1b186c7 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -1790,7 +1790,7 @@ public: const scoped_dohptr f_wrappers_cxx(NewFile(outfile, "w", SWIG_output_files())); if (!f_wrappers_cxx) { FileErrorDisplay(outfile); - SWIG_exit(EXIT_FAILURE); + Exit(EXIT_FAILURE); } Swig_banner(f_wrappers_cxx); @@ -1800,7 +1800,7 @@ public: const scoped_dohptr f_wrappers_h(NewFile(outfile_h, "w", SWIG_output_files())); if (!f_wrappers_h) { FileErrorDisplay(outfile_h); - SWIG_exit(EXIT_FAILURE); + Exit(EXIT_FAILURE); } Swig_banner(f_wrappers_h); From 81866a0ce2d6fb703bb88655e5aad49ca0b5fe0f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 14:46:38 +0200 Subject: [PATCH 497/508] Re-enable use of method suffix for C module This avoids conflicts with the actual function being wrapped. --- Source/Modules/c.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 3c1b186c7..72b34c228 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -10,6 +10,8 @@ #include #include "swigmod.h" +extern int UseWrapperSuffix; // from main.cxx + int SwigType_isbuiltin(SwigType *t) { const char* builtins[] = { "void", "short", "int", "long", "char", "float", "double", "bool", 0 }; int i = 0; @@ -1476,6 +1478,7 @@ public: outfile_h(NULL), cxx_class_wrapper_(NULL) { + UseWrapperSuffix = 1; } ~C() From 523e58aa069c15c587cb3b58256c8d7b70ffa041 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 15:08:31 +0200 Subject: [PATCH 498/508] Check for multiple inheritance of the base classes too If C++ wrappers for a class are not generated because it uses multiple inheritance, we can't generate the C++ wrappers for any classes deriving from it neither, so don't do it. This fixes failure in multiple_inheritance_overload unit test. --- Source/Modules/c.cxx | 62 ++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 72b34c228..90df1852d 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -968,6 +968,39 @@ private: }; +/* + Return true if the class, or one of its base classes, uses multiple inheritance, i.e. has more than one base class. + + The output first_base parameter is optional and is filled with the first base class (if any). +*/ +bool uses_multiple_inheritance(Node* n, scoped_dohptr* first_base_out = NULL) { + if (first_base_out) + first_base_out->reset(); + + List* const baselist = Getattr(n, "bases"); + if (!baselist) + return false; + + scoped_dohptr first_base; + for (Iterator i = First(baselist); i.item; i = Next(i)) { + if (Checkattr(i.item, "feature:ignore", "1")) + continue; + + if (first_base) + return true; + + if (uses_multiple_inheritance(i.item)) + return true; + + first_base = Copy(i.item); + } + + if (first_base_out) + *first_base_out = first_base; + + return false; +} + /* cxx_class_wrapper @@ -991,28 +1024,19 @@ public: String* const classname = Getattr(n, "sym:name"); scoped_dohptr base_classes(NewStringEmpty()); - if (List *baselist = Getattr(n, "bases")) { - for (Iterator i = First(baselist); i.item; i = Next(i)) { - if (Checkattr(i.item, "feature:ignore", "1")) - continue; + if (uses_multiple_inheritance(n, &first_base_)) { + Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), + "Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n", + classname + ); - if (first_base_) { - Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), - "Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n", - classname - ); - - // Return before initializing class_node_, so that the dtor won't output anything neither. - return; - } - - first_base_ = Copy(i.item); - } - - if (first_base_) - Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); + // Return before initializing class_node_, so that the dtor won't output anything neither. + return; } + if (first_base_) + Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); + Printv(cxx_wrappers_.sect_types, "class ", classname, ";\n", NIL From 2796f394f531aa09a033db7f393ce3b4c8c04a44 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 15:09:51 +0200 Subject: [PATCH 499/508] Exclude argcargvtest unit test from C test suite There is no argcargv.i for C yet. --- Examples/test-suite/argcargvtest.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/argcargvtest.i b/Examples/test-suite/argcargvtest.i index 5711441d9..6ce5e68fd 100644 --- a/Examples/test-suite/argcargvtest.i +++ b/Examples/test-suite/argcargvtest.i @@ -1,6 +1,6 @@ %module argcargvtest -#if !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGGO) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCAML) && !defined(SWIGR) && !defined(SWIGSCILAB) +#if !defined(SWIGC) && !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGGO) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCAML) && !defined(SWIGR) && !defined(SWIGSCILAB) %include %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) } From 049d3c309bfb0c04946c3c8fcf033df8e2fec8ef Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 15:30:31 +0200 Subject: [PATCH 500/508] Fix handling of const object parameters and return types Simply ignore the const on them, to avoid ending up with an extra and invalid "const" in the generated code. This fixes director_pass_by_value and typemap_out_optimal unit tests after the latest merge. --- Source/Modules/c.cxx | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 90df1852d..f8aed2a02 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -702,16 +702,34 @@ private: } else { String* classname; if (Node* const class_node = Language::instance()->classLookup(type)) { - // Special case: if this is a pointer passed by (const) reference, we return just the pointer directly because we don't have any pointer-valued variable - // to give out a reference to. - if (typeKind == Type_Ptr && strncmp(Char(resolved_type), "r.q(const).", 11) == 0) { - scoped_dohptr deref_type(Copy(resolved_type)); - Delslice(deref_type, 0, 11); - typestr = SwigType_str(deref_type, 0); - } else { - typestr = SwigType_str(resolved_type, 0); + // Deal with some special cases: + switch (typeKind) { + case Type_Ptr: + // If this is a pointer passed by const reference, we return just the pointer directly because we don't have any pointer-valued variable to give out + // a reference to. + if (strncmp(Char(resolved_type), "r.q(const).", 11) == 0) { + scoped_dohptr deref_type(Copy(resolved_type)); + Delslice(deref_type, 0, 11); + typestr = SwigType_str(deref_type, 0); + } + break; + + case Type_Obj: + // Const objects are just objects for our purposes here, remove the const from them to avoid having "const const" in the output. + if (SwigType_isconst(resolved_type)) + SwigType_del_qualifier(resolved_type); + break; + + case Type_Ref: + case Type_Enm: + case Type_Max: + // Nothing special to do. + break; } + if (!typestr) + typestr = SwigType_str(resolved_type, 0); + classname = Getattr(class_node, "sym:name"); // We don't use namespaces, but the type may contain them, so get rid of them by replacing the base type name, which is fully qualified, with just the From 0688ac7e0778de93943a329bdd58891787152365 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 15:37:51 +0200 Subject: [PATCH 501/508] Recognize C language in the test flags script --- Tools/testflags.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/testflags.py b/Tools/testflags.py index 16e4d8aee..24cd80469 100755 --- a/Tools/testflags.py +++ b/Tools/testflags.py @@ -9,6 +9,7 @@ def get_cflags(language, std, compiler): # use c99 or gnu99 if feature is necessary for using target language c_common = c_common + " -Wdeclaration-after-statement" cflags = { + "c":"-Werror " + c_common, "csharp":"-Werror " + c_common, "d":"-Werror " + c_common, "go":"-Werror " + c_common, @@ -40,6 +41,7 @@ def get_cxxflags(language, std, compiler): std = "c++98" cxx_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wmissing-field-initializers" cxxflags = { + "c":"-Werror " + cxx_common, "csharp":"-Werror " + cxx_common, "d":"-Werror " + cxx_common, "go":"-Werror " + cxx_common, From 2b2fe7785a084df3c435d43f3b559661eb210b64 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 17:22:30 +0200 Subject: [PATCH 502/508] Fix enabling C++11 for C CI builds Set CPPSTD as CPP11 is not used any longer. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47b435aa3..418834786 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: - SWIGLANG: "" compiler: clang - SWIGLANG: c - CPP11: 1 + CPPSTD: c++11 - SWIGLANG: csharp # D support can't be enabled because dmd 2.066 fails to build anything # under Ubuntu 18.04 due to its standard library (libphobos2.a) not From 23144219af886b03ea416e10442a761d392407a4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 17:30:54 +0200 Subject: [PATCH 503/508] Use "int" for variables printed out using "%d" in the code Fix -Wformat warnings in the char_strings runtime test. --- Examples/test-suite/c/char_strings_runme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c index d653204cd..6724a673b 100644 --- a/Examples/test-suite/c/char_strings_runme.c +++ b/Examples/test-suite/c/char_strings_runme.c @@ -8,8 +8,8 @@ int main() { char *CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; char *OTHERLAND_MSG = "Little message from the safe world."; - long count = 10000; - long i = 0; + int count = 10000; + int i = 0; // get functions for (i=0; i Date: Sat, 17 Sep 2022 17:33:31 +0200 Subject: [PATCH 504/508] Exclude li_std_auto_ptr test from C test suite There are (and there probably will never be) std::auto_ptr<> typemaps for this language. --- Examples/test-suite/c/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 547dc9cad..f5b88b4f8 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -58,6 +58,7 @@ FAILING_CPP_TESTS := \ li_attribute \ li_attribute_template \ li_boost_shared_ptr_attribute \ + li_std_auto_ptr \ li_std_deque \ li_std_wstring \ li_windows \ From b88df82c557c2ef10ea7556a02bbb57e2060c271 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2022 17:39:04 +0200 Subject: [PATCH 505/508] Fix another format mismatch error in char_strings runtime test --- Examples/test-suite/c/char_strings_runme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/c/char_strings_runme.c b/Examples/test-suite/c/char_strings_runme.c index 6724a673b..65ef205ec 100644 --- a/Examples/test-suite/c/char_strings_runme.c +++ b/Examples/test-suite/c/char_strings_runme.c @@ -116,7 +116,7 @@ int main() { sprintf(ping, "%s%d", OTHERLAND_MSG, i); char *pong = char_strings_CharPingPong(ping); if (strcmp(ping, pong) != 0) { - fprintf(stderr, "Test PingPong 1 failed.\nExpected:%d\nReceived:%d\n", ping, pong); + fprintf(stderr, "Test PingPong 1 failed.\nExpected:%s\nReceived:%s\n", ping, pong); exit(1); } } From 83ae863d4a21b1f699b248417efe9a019516b91b Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Fri, 17 Feb 2023 18:55:32 -0700 Subject: [PATCH 506/508] Add names to c function params --- Source/Modules/c.cxx | 19 +++++++++++++++---- Source/Swig/cwrap.c | 3 ++- Source/Swig/typemap.c | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index f8aed2a02..57bd664ea 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -869,7 +869,7 @@ public: // We want to use readable parameter names in our wrappers instead of the autogenerated arg$N if possible, so do it, and do it before calling // Swig_typemap_attach_parms(), as this uses the parameter names for typemap expansion. for (Parm* p2 = p; p2; p2 = nextSibling(p2)) { - String* name = Getattr(p, "name"); + String* name = Getattr(p2, "name"); if (!name) { // Can't do anything for unnamed parameters. continue; @@ -2411,10 +2411,21 @@ public: String *lname = 0; for (p = (Parm*)parms, index = 1; p; (p = nextSibling(p)), index++) { - if(!(lname = Getattr(p, "lname"))) { - lname = NewStringf("arg%d", index); - Setattr(p, "lname", lname); + String* name = Getattr(p, "name"); + if (!name) { + // Can't do anything for unnamed parameters. + if(!(lname = Getattr(p, "lname"))) { + lname = NewStringf("arg%d", index); + Setattr(p, "lname", lname); + } + continue; + } + scoped_dohptr name_ptr; + if (Strstr(name, "::")) { + name_ptr = Swig_scopename_last(name); + name = name_ptr.get(); } + Setattr(p, "lname", name); } // C++ function wrapper diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 3b20f4e4f..ae932f277 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -58,7 +58,8 @@ const char *Swig_cresult_name(void) { String *Swig_cparm_name(Parm *p, int i) { String *name = NewStringf("arg%d", i + 1); if (p) { - Setattr(p, "lname", name); + String *lname = Getattr(p, "lname"); + if (!lname) Setattr(p, "lname", name); } return name; diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index d6f48814d..d0fec2570 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1834,7 +1834,7 @@ void Swig_typemap_attach_parms(const_String_or_char_ptr tmap_method, ParmList *p for (i = 0; i < nmatch; i++) { SwigType *type = Getattr(p, "type"); String *pname = Getattr(p, "name"); - String *lname = Getattr(p, "lname"); + String *lname = Swig_cparm_name(p, argnum-1); SwigType *mtype = Getattr(p, "tmap:match"); SwigType *matchtype = mtype ? mtype : type; From 2a71d012c0a9bed9b61e96225dbda023f36f8c27 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Fri, 17 Feb 2023 21:07:37 -0700 Subject: [PATCH 507/508] Resolve conflicts in same name vars --- Source/Modules/c.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 57bd664ea..0c06927ce 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -8,6 +8,7 @@ * ----------------------------------------------------------------------------- */ #include +#include #include "swigmod.h" extern int UseWrapperSuffix; // from main.cxx @@ -2409,6 +2410,7 @@ public: Parm *p; int index = 1; String *lname = 0; + std::map strmap; for (p = (Parm*)parms, index = 1; p; (p = nextSibling(p)), index++) { String* name = Getattr(p, "name"); @@ -2425,7 +2427,15 @@ public: name_ptr = Swig_scopename_last(name); name = name_ptr.get(); } - Setattr(p, "lname", name); + if (strmap.count(Hashval(name))) { + strmap[Hashval(name)]++; + String* nname = NewStringf("%s%d", name, strmap[Hashval(name)]); + Setattr(p, "lname", nname); + } + else { + Setattr(p, "lname", name); + strmap[Hashval(name)] = 1; + } } // C++ function wrapper From 494153fe869cf76493c20fbc2e1e648d431c35c1 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Sat, 18 Feb 2023 00:43:25 -0700 Subject: [PATCH 508/508] Fix cxx --- Source/Modules/c.cxx | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index c0db494c5..d50d3475a 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -843,7 +843,7 @@ class cxx_function_wrapper { public: // Call can_wrap() to check if this wrapper can be emitted later. - explicit cxx_function_wrapper(cxx_wrappers& cxx_wrappers, Node* n, Parm* p) : cxx_wrappers_(cxx_wrappers) { + explicit cxx_function_wrapper(cxx_wrappers& cxx_wrappers, Node* n, Parm* parms) : cxx_wrappers_(cxx_wrappers) { func_node = NULL; except_check_start = @@ -866,29 +866,42 @@ public: parms_cxx = NewStringEmpty(); parms_call = NewStringEmpty(); - if (p) { + if (parms) { // We want to use readable parameter names in our wrappers instead of the autogenerated arg$N if possible, so do it, and do it before calling // Swig_typemap_attach_parms(), as this uses the parameter names for typemap expansion. - for (Parm* p2 = p; p2; p2 = nextSibling(p2)) { - String* name = Getattr(p2, "name"); + + Parm *p; + int index = 1; + String *lname = 0; + std::map strmap; + + for (p = (Parm*)parms, index = 1; p; (p = nextSibling(p)), index++) { + String* name = Getattr(p, "name"); if (!name) { // Can't do anything for unnamed parameters. continue; } // Static variables use fully qualified names, so we need to strip the scope from them. - scoped_dohptr name_ptr; - if (Strstr(name, "::")) { - name_ptr = Swig_scopename_last(name); - name = name_ptr.get(); - } - - Setattr(p, "lname", name); + scoped_dohptr name_ptr; + if (Strstr(name, "::")) { + name_ptr = Swig_scopename_last(name); + name = name_ptr.get(); + } + if (strmap.count(Hashval(name))) { + strmap[Hashval(name)]++; + String* nname = NewStringf("%s%d", name, strmap[Hashval(name)]); + Setattr(p, "lname", nname); + } + else { + Setattr(p, "lname", name); + strmap[Hashval(name)] = 1; + } } Swig_typemap_attach_parms("cxxin", p, NULL); - for (; p; p = Getattr(p, "tmap:in:next")) { + for (p = parms; p; p = Getattr(p, "tmap:in:next")) { if (Checkattr(p, "tmap:in:numinputs", "0")) continue;