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/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* *~
+

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

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

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"
+

Examples/c/class/runme.c

@@ -0,0 +1,43 @@
+#include <stdio.h>
+
+#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;
+}
+