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

@@ -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)
 	
 

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);
-%}
+

Source/Modules/c.cxx

@@ -7,7 +7,7 @@
  * C language module for SWIG.
  * ----------------------------------------------------------------------------- */
 
-char cvsroot_c_cxx[] = "$Id: c.cxx 10452 2008-05-15 21:16:48Z wsfulton $";
+char cvsroot_c_cxx[] = "$Id$";
 
 #include "swigmod.h"
 
@@ -15,10 +15,14 @@ class C:public Language {
   static const char *usage;
 
   File *f_runtime;
-  File *f_runtime_h;
   File *f_header;
   File *f_wrappers;
   File *f_init;
+  File *f_shadow_c;
+
+  String *f_shadow;
+
+  bool shadow_flag;
 
 public:
 
@@ -26,7 +30,7 @@ public:
    * C()
    * ----------------------------------------------------------------------------- */
 
-   C() {
+  C() : shadow_flag(true) {
   }
 
   /* ------------------------------------------------------------
@@ -49,6 +53,10 @@ 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], "-noproxy") == 0) {
+          shadow_flag = false;
         }
       }
     }
@@ -59,8 +67,6 @@ public:
    * --------------------------------------------------------------------- */
 
   virtual int top(Node *n) {
-    Printf(stdout, "top called\n");
-
     String *module = Getattr(n, "name");
     String *outfile = Getattr(n, "outfile");
 
@@ -74,6 +80,26 @@ public:
     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);
@@ -82,6 +108,13 @@ public:
     /* 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);
@@ -98,36 +131,65 @@ public:
   }
 
   virtual int functionWrapper(Node *n) {
-    Printf(stdout, "creating function wrapper\n");
     String *name = Getattr(n, "sym:name");
-    String *type = Getattr(n, "type");
+    SwigType *type = Getattr(n, "type");
     ParmList *parms = Getattr(n, "parms");
-    String *wrapname = Getattr(n, "wrap:name");
 
+    /* create new wrapper name */
     Wrapper *wrapper = NewWrapper();
     String *wname = Swig_name_wrapper(name);
-
     Setattr(n, "wrap:name", wname);
 
-    String *parse_args = NewString("");
+    /* create wrapper function prototype */
-    Parm *parm;
+    Printv(wrapper->def, type, " ", wname, "(", NIL);
-    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);
+    /* prepare parameter list */
-    Printv(wrapper->code, Getattr(n, "type"), " result;\n", NIL);
+    Parm *p, *np;
-    Printv(wrapper->code, Getattr(n, "wrap:action"), "\n", NIL);
+    for (p = parms; p; ) {
-    Printv(wrapper->code, "return result;\n}\n", NIL);
+      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);