From bc7a06758728608bb75f3334a9734ed52e938646 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 15 Aug 2020 12:26:21 +0100 Subject: Remove Examples/contract This set of examples was never tested/documented There is an equivalent testcase in Examples/test-suite/contract.i --- Examples/contract/simple_c/example.c | 11 ------ Examples/contract/simple_c/example.i | 19 ----------- Examples/contract/simple_c/runme1.py | 17 ---------- Examples/contract/simple_c/runme2.py | 20 ----------- Examples/contract/simple_cxx/example.cxx | 30 ----------------- Examples/contract/simple_cxx/example.h | 34 ------------------- Examples/contract/simple_cxx/example.i | 28 ---------------- Examples/contract/simple_cxx/runme1.py | 33 ------------------ Examples/contract/simple_cxx/runme2.py | 44 ------------------------ Examples/contract/simple_cxx/runme3.py | 57 -------------------------------- 10 files changed, 293 deletions(-) delete mode 100644 Examples/contract/simple_c/example.c delete mode 100644 Examples/contract/simple_c/example.i delete mode 100644 Examples/contract/simple_c/runme1.py delete mode 100644 Examples/contract/simple_c/runme2.py delete mode 100644 Examples/contract/simple_cxx/example.cxx delete mode 100644 Examples/contract/simple_cxx/example.h delete mode 100644 Examples/contract/simple_cxx/example.i delete mode 100644 Examples/contract/simple_cxx/runme1.py delete mode 100644 Examples/contract/simple_cxx/runme2.py delete mode 100644 Examples/contract/simple_cxx/runme3.py diff --git a/Examples/contract/simple_c/example.c b/Examples/contract/simple_c/example.c deleted file mode 100644 index 85a3e1417..000000000 --- a/Examples/contract/simple_c/example.c +++ /dev/null @@ -1,11 +0,0 @@ -#include - -int Circle (int x, int y, int radius) { - /* Draw Circle */ - printf("Drawing the circle...\n"); - /* Return -1 to test contract post assertion */ - if (radius == 2) - return -1; - else - return 1; -} diff --git a/Examples/contract/simple_c/example.i b/Examples/contract/simple_c/example.i deleted file mode 100644 index 49df09af6..000000000 --- a/Examples/contract/simple_c/example.i +++ /dev/null @@ -1,19 +0,0 @@ -/* File : example.i */ - -/* Basic C example for swig contract */ -/* Tiger, University of Chicago, 2003 */ - -%module example - -%contract Circle (int x, int y, int radius) { -require: - x >= 0; - y >= 0; - radius > x; -ensure: - Circle >= 0; -} - -%inline %{ -extern int Circle (int x, int y, int radius); -%} diff --git a/Examples/contract/simple_c/runme1.py b/Examples/contract/simple_c/runme1.py deleted file mode 100644 index abd8df62f..000000000 --- a/Examples/contract/simple_c/runme1.py +++ /dev/null @@ -1,17 +0,0 @@ -import example -# Call the Circle() function correctly - -x = 1; -y = 1; -r = 3; - -c = example.Circle(x, y, r) - -# test post-assertion -x = 1; -y = 1; -r = 2; - -c = example.Circle(x, y, r) - -print "The return value of Circle(%d, %d, %d) is %d" % (x,y,r,c) diff --git a/Examples/contract/simple_c/runme2.py b/Examples/contract/simple_c/runme2.py deleted file mode 100644 index 48d4a3f10..000000000 --- a/Examples/contract/simple_c/runme2.py +++ /dev/null @@ -1,20 +0,0 @@ -import example - -# Call the Circle() function correctly - -x = 1; -y = 1; -r = 3; - -c = example.Circle(x, y, r) - -print "The return value of Circle(%d, %d, %d) is %d" % (x,y,r,c) - -# test pre-assertion -x = 1; -y = -1; -r = 3; - -c = example.Circle(x, y, r) - -print "The return value of Circle(%d, %d, %d) is %d" % (x,y,r,c) diff --git a/Examples/contract/simple_cxx/example.cxx b/Examples/contract/simple_cxx/example.cxx deleted file mode 100644 index e3dd2ca7a..000000000 --- a/Examples/contract/simple_cxx/example.cxx +++ /dev/null @@ -1,30 +0,0 @@ -#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 -1 is to test post-assertion */ - if (radius == 1) - return -1; - 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/contract/simple_cxx/example.h b/Examples/contract/simple_cxx/example.h deleted file mode 100644 index de708bb7b..000000000 --- a/Examples/contract/simple_cxx/example.h +++ /dev/null @@ -1,34 +0,0 @@ -/* 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/contract/simple_cxx/example.i b/Examples/contract/simple_cxx/example.i deleted file mode 100644 index 9b47409d0..000000000 --- a/Examples/contract/simple_cxx/example.i +++ /dev/null @@ -1,28 +0,0 @@ -%module example - -%contract Circle::Circle(double radius) { -require: - radius > 0; -} - -%contract Circle::area(void) { -ensure: - area > 0; -} - -%contract Shape::move(double dx, double dy) { -require: - dx > 0; -} - -/* should be no effect, since there is no move() for class Circle */ -%contract Circle::move(double dx, double dy) { -require: - dy > 1; -} - -# include must be after contracts -%{ -#include "example.h" -%} -%include "example.h" diff --git a/Examples/contract/simple_cxx/runme1.py b/Examples/contract/simple_cxx/runme1.py deleted file mode 100644 index 9028d02d9..000000000 --- a/Examples/contract/simple_cxx/runme1.py +++ /dev/null @@ -1,33 +0,0 @@ -import example - -# Create the Circle object - -r = 2; -print " Creating circle (radium: %d) :" % r -c = example.Circle(r) - -# Set the location of the object - -c.x = 20 -c.y = 30 -print " Here is its current position:" -print " Circle = (%f, %f)" % (c.x,c.y) - -# ----- Call some methods ----- - -print "\n Here are some properties of the Circle:" -print " area = ", c.area() -print " perimeter = ", c.perimeter() -dx = 1; -dy = 1; -print " Moving with (%d, %d)..." % (dx, dy) -c.move(dx, dy) - -del c - -print "===================================" - -# test construction */ -r = -1; -print " Creating circle (radium: %d) :" % r -c = example.Circle(r) diff --git a/Examples/contract/simple_cxx/runme2.py b/Examples/contract/simple_cxx/runme2.py deleted file mode 100644 index 5f9c0df5b..000000000 --- a/Examples/contract/simple_cxx/runme2.py +++ /dev/null @@ -1,44 +0,0 @@ -import example - -# Create the Circle object - -r = 2; -print " Creating circle (radium: %d) :" % r -c = example.Circle(r) - -# Set the location of the object - -c.x = 20 -c.y = 30 -print " Here is its current position:" -print " Circle = (%f, %f)" % (c.x,c.y) - -# ----- Call some methods ----- - -print "\n Here are some properties of the Circle:" -print " area = ", c.area() -print " perimeter = ", c.perimeter() -dx = 1; -dy = 1; -print " Moving with (%d, %d)..." % (dx, dy) -c.move(dx, dy) - -del c - -print "===================================" - -# test area function */ -r = 1; -print " Creating circle (radium: %d) :" % r -c = example.Circle(r) -# Set the location of the object - -c.x = 20 -c.y = 30 -print " Here is its current position:" -print " Circle = (%f, %f)" % (c.x,c.y) - -# ----- Call some methods ----- - -print "\n Here are some properties of the Circle:" -print " area = ", c.area() diff --git a/Examples/contract/simple_cxx/runme3.py b/Examples/contract/simple_cxx/runme3.py deleted file mode 100644 index a663732b1..000000000 --- a/Examples/contract/simple_cxx/runme3.py +++ /dev/null @@ -1,57 +0,0 @@ -import example - -# Create the Circle object - -r = 2; -print " Creating circle (radium: %d) :" % r -c = example.Circle(r) - -# Set the location of the object - -c.x = 20 -c.y = 30 -print " Here is its current position:" -print " Circle = (%f, %f)" % (c.x,c.y) - -# ----- Call some methods ----- - -print "\n Here are some properties of the Circle:" -print " area = ", c.area() -print " perimeter = ", c.perimeter() -dx = 1; -dy = 1; -print " Moving with (%d, %d)..." % (dx, dy) -c.move(dx, dy) - -del c - -print "===================================" - -# test move function */ -r = 2; -print " Creating circle (radium: %d) :" % r -c = example.Circle(r) -# Set the location of the object - -c.x = 20 -c.y = 30 -print " Here is its current position:" -print " Circle = (%f, %f)" % (c.x,c.y) - -# ----- Call some methods ----- - -print "\n Here are some properties of the Circle:" -print " area = ", c.area() -print " perimeter = ", c.perimeter() - -# no error for Circle's pre-assertion -dx = 1; -dy = -1; -print " Moving with (%d, %d)..." % (dx, dy) -c.move(dx, dy) - -# error with Shape's pre-assertion -dx = -1; -dy = 1; -print " Moving with (%d, %d)..." % (dx, dy) -c.move(dx, dy) -- cgit v1.2.1