6 files changed, 147 insertions, 0 deletions
diff --git a/Examples/d/enum/Makefile b/Examples/d/enum/Makefile
new file mode 100644
index 000000000..b5808cf0d
--- /dev/null
+++ b/Examples/d/enum/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.cxx example_wrap.cxx
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	cd $(WORKING_DIR); \
+	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
+	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+
+clean::
+	cd $(WORKING_DIR); \
+	$(MAKE) -f $(TOP)/Makefile d_clean
+
+check: all
+	cd $(WORKING_DIR); \
+	$(MAKE) -f $(TOP)/Makefile d_run
diff --git a/Examples/d/enum/d1/runme.d b/Examples/d/enum/d1/runme.d
new file mode 100644
index 000000000..d986986d1
--- /dev/null
+++ b/Examples/d/enum/d1/runme.d
@@ -0,0 +1,28 @@
+module runme;
+
+import tango.io.Stdout;
+import example;
+
+void main() {
+  Stdout( "Printing out some enum values:" ).newline;
+  Stdout("  color:").newline;
+  Stdout.formatln("    {} = {}", color.RED, cast(int)color.RED);
+  Stdout.formatln("    {} = {}", color.BLUE, cast(int)color.BLUE);
+  Stdout.formatln("    {} = {}", color.GREEN, cast(int)color.GREEN);
+
+  Stdout("\n  Foo.speed:").newline;
+  Stdout.formatln("    Foo.{} = {}", Foo.speed.IMPULSE, cast(int)Foo.speed.IMPULSE);
+  Stdout.formatln("    Foo.{} = {}", Foo.speed.WARP, cast(int)Foo.speed.WARP);
+  Stdout.formatln("    Foo.{} = {}", Foo.speed.LUDICROUS , cast(int)Foo.speed.LUDICROUS);
+
+  Stdout("\nTesting use of enums with functions:").newline;
+  example.enum_test(color.RED, Foo.speed.IMPULSE);
+  example.enum_test(color.BLUE, Foo.speed.WARP);
+  example.enum_test(color.GREEN, Foo.speed.LUDICROUS);
+
+  Stdout( "\nTesting use of enum with class method:" ).newline;
+  scope f = new Foo();
+  f.enum_test(Foo.speed.IMPULSE);
+  f.enum_test(Foo.speed.WARP);
+  f.enum_test(Foo.speed.LUDICROUS);
+}
diff --git a/Examples/d/enum/d2/runme.d b/Examples/d/enum/d2/runme.d
new file mode 100644
index 000000000..acaec8ae8
--- /dev/null
+++ b/Examples/d/enum/d2/runme.d
@@ -0,0 +1,28 @@
+module runme;
+
+import std.stdio;
+import example;
+
+void main() {
+  writeln( "Printing out some enum values:" );
+  writeln("  color:");
+  writefln("    %s = %s", color.RED, cast(int)color.RED);
+  writefln("    %s = %s", color.BLUE, cast(int)color.BLUE);
+  writefln("    %s = %s", color.GREEN, cast(int)color.GREEN);
+
+  writeln("\n  Foo.speed:");
+  writefln("    Foo.%s = %s", Foo.speed.IMPULSE, cast(int)Foo.speed.IMPULSE);
+  writefln("    Foo.%s = %s", Foo.speed.WARP, cast(int)Foo.speed.WARP);
+  writefln("    Foo.%s = %s", Foo.speed.LUDICROUS , cast(int)Foo.speed.LUDICROUS);
+
+  writeln("\nTesting use of enums with functions:");
+  example.enum_test(color.RED, Foo.speed.IMPULSE);
+  example.enum_test(color.BLUE, Foo.speed.WARP);
+  example.enum_test(color.GREEN, Foo.speed.LUDICROUS);
+
+  writeln( "\nTesting use of enum with class method:" );
+  scope f = new Foo();
+  f.enum_test(Foo.speed.IMPULSE);
+  f.enum_test(Foo.speed.WARP);
+  f.enum_test(Foo.speed.LUDICROUS);
+}
diff --git a/Examples/d/enum/example.cxx b/Examples/d/enum/example.cxx
new file mode 100644
index 000000000..df7bb6328
--- /dev/null
+++ b/Examples/d/enum/example.cxx
@@ -0,0 +1,37 @@
+/* File : example.cxx */
+
+#include "example.h"
+#include <stdio.h>
+
+void Foo::enum_test(speed s) {
+  if (s == IMPULSE) {
+    printf("IMPULSE speed\n");
+  } else if (s == WARP) {
+    printf("WARP speed\n");
+  } else if (s == LUDICROUS) {
+    printf("LUDICROUS speed\n");
+  } else {
+    printf("Unknown speed\n");
+  }
+}
+
+void enum_test(color c, Foo::speed s) {
+  if (c == RED) {
+    printf("color = RED, ");
+  } else if (c == BLUE) {
+    printf("color = BLUE, ");
+  } else if (c == GREEN) {
+    printf("color = GREEN, ");
+  } else {
+    printf("color = Unknown color!, ");
+  }
+  if (s == Foo::IMPULSE) {
+    printf("speed = IMPULSE speed\n");
+  } else if (s == Foo::WARP) {
+    printf("speed = WARP speed\n");
+  } else if (s == Foo::LUDICROUS) {
+    printf("speed = LUDICROUS speed\n");
+  } else {
+    printf("speed = Unknown speed!\n");
+  }
+}
diff --git a/Examples/d/enum/example.h b/Examples/d/enum/example.h
new file mode 100644
index 000000000..9119cd9fc
--- /dev/null
+++ b/Examples/d/enum/example.h
@@ -0,0 +1,13 @@
+/* File : example.h */
+
+enum color { RED, BLUE, GREEN };
+
+class Foo {
+ public:
+  Foo() { }
+  enum speed { IMPULSE=10, WARP=20, LUDICROUS=30 };
+  void enum_test(speed s);
+};
+
+void enum_test(color c, Foo::speed s);
+
diff --git a/Examples/d/enum/example.i b/Examples/d/enum/example.i
new file mode 100644
index 000000000..23ee8a822
--- /dev/null
+++ b/Examples/d/enum/example.i
@@ -0,0 +1,11 @@
+/* File : example.i */
+%module example
+
+%{
+#include "example.h"
+%}
+
+/* Let's just grab the original header file here */
+
+%include "example.h"
+