[D] nspace support.
As for C# and Java, this doesn't work for free functions/variables yet. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12534 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
David Nadlinger
parent
a63cde3827
commit
ce6516fb4c
13 changed files with 757 additions and 164 deletions
|
|
@ -65,13 +65,13 @@ run_testcase = \
|
|||
cd $*$(VERSIONSUFFIX) && \
|
||||
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
|
||||
DFLAGS='-of$*_runme' \
|
||||
DSRCS='../$(srcdir)/$(TESTPREFIX)$*$(TESTSUFFIX) $*/*.d' d_compile && \
|
||||
DSRCS='../$(srcdir)/$(TESTPREFIX)$*$(TESTSUFFIX) `find $* -name *.d`' d_compile && \
|
||||
env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme; \
|
||||
else \
|
||||
cd $*$(VERSIONSUFFIX) && \
|
||||
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
|
||||
DFLAGS='-c' \
|
||||
DSRCS='$*/*.d' d_compile && cd .. ; \
|
||||
DSRCS='`find $* -name *.d`' d_compile && cd .. ; \
|
||||
fi
|
||||
|
||||
# Clean: remove testcase directories
|
||||
|
|
|
|||
32
Examples/test-suite/d/nspace_extend_runme.1.d
Normal file
32
Examples/test-suite/d/nspace_extend_runme.1.d
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
module nspace_extend_runme;
|
||||
|
||||
static import oi1c = nspace_extend.Outer.Inner1.Color;
|
||||
static import oi2c = nspace_extend.Outer.Inner2.Color;
|
||||
|
||||
void main() {
|
||||
{
|
||||
// constructors and destructors
|
||||
scope color1 = new oi1c.Color();
|
||||
scope color = new oi1c.Color(color1);
|
||||
|
||||
// class methods
|
||||
color.colorInstanceMethod(20.0);
|
||||
oi1c.Color.colorStaticMethod(20.0);
|
||||
auto created = oi1c.Color.create();
|
||||
}
|
||||
{
|
||||
// constructors and destructors
|
||||
scope color2 = new oi2c.Color();
|
||||
scope color = new oi2c.Color(color2);
|
||||
|
||||
// class methods
|
||||
color.colorInstanceMethod(20.0);
|
||||
oi2c.Color.colorStaticMethod(20.0);
|
||||
auto created = oi2c.Color.create();
|
||||
|
||||
// Same class different namespaces
|
||||
auto col1 = new oi1c.Color();
|
||||
auto col2 = oi2c.Color.create();
|
||||
col2.colors(col1, col1, col2, col2, col2);
|
||||
}
|
||||
}
|
||||
32
Examples/test-suite/d/nspace_extend_runme.2.d
Normal file
32
Examples/test-suite/d/nspace_extend_runme.2.d
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
module nspace_extend_runme;
|
||||
|
||||
static import oi1c = nspace_extend.Outer.Inner1.Color;
|
||||
static import oi2c = nspace_extend.Outer.Inner2.Color;
|
||||
|
||||
void main() {
|
||||
{
|
||||
// constructors and destructors
|
||||
scope color1 = new oi1c.Color();
|
||||
scope color = new oi1c.Color(color1);
|
||||
|
||||
// class methods
|
||||
color.colorInstanceMethod(20.0);
|
||||
oi1c.Color.colorStaticMethod(20.0);
|
||||
auto created = oi1c.Color.create();
|
||||
}
|
||||
{
|
||||
// constructors and destructors
|
||||
scope color2 = new oi2c.Color();
|
||||
scope color = new oi2c.Color(color2);
|
||||
|
||||
// class methods
|
||||
color.colorInstanceMethod(20.0);
|
||||
oi2c.Color.colorStaticMethod(20.0);
|
||||
auto created = oi2c.Color.create();
|
||||
|
||||
// Same class different namespaces
|
||||
auto col1 = new oi1c.Color();
|
||||
auto col2 = oi2c.Color.create();
|
||||
col2.colors(col1, col1, col2, col2, col2);
|
||||
}
|
||||
}
|
||||
87
Examples/test-suite/d/nspace_runme.1.d
Normal file
87
Examples/test-suite/d/nspace_runme.1.d
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
module nspace_runme;
|
||||
|
||||
import nspace.nspace;
|
||||
static import nspace.NoNSpacePlease;
|
||||
static import nspace.Outer.namespce;
|
||||
static import nspace.Outer.Inner1.Channel;
|
||||
static import oi1c = nspace.Outer.Inner1.Color;
|
||||
static import nspace.Outer.Inner2.Channel;
|
||||
static import nspace.Outer.Inner2.Color;
|
||||
static import nspace.Outer.Inner3.Blue;
|
||||
static import nspace.Outer.Inner4.Blue;
|
||||
static import nspace.Outer.SomeClass;
|
||||
|
||||
void main() {
|
||||
// constructors and destructors
|
||||
auto color1 = new oi1c.Color();
|
||||
auto color = new oi1c.Color(color1);
|
||||
|
||||
// class methods
|
||||
color.colorInstanceMethod(20.0);
|
||||
oi1c.Color.colorStaticMethod(20.0);
|
||||
auto created = oi1c.Color.create();
|
||||
|
||||
// class enums
|
||||
auto someClass = new nspace.Outer.SomeClass.SomeClass();
|
||||
auto channel = someClass.GetInner1ColorChannel();
|
||||
if (channel != oi1c.Color.Channel.Transmission) {
|
||||
throw new Exception("Transmission wrong");
|
||||
}
|
||||
|
||||
// class anonymous enums
|
||||
int val1 = oi1c.Color.ColorEnumVal1;
|
||||
int val2 = oi1c.Color.ColorEnumVal2;
|
||||
if (val1 != 0 || val2 != 0x22) {
|
||||
throw new Exception("ColorEnumVal wrong");
|
||||
}
|
||||
|
||||
// instance member variables
|
||||
color.instanceMemberVariable = 123;
|
||||
if (color.instanceMemberVariable != 123) {
|
||||
throw new Exception("instance member variable failed");
|
||||
}
|
||||
|
||||
// static member variables
|
||||
oi1c.Color.staticMemberVariable = 789;
|
||||
if (oi1c.Color.staticMemberVariable != 789) {
|
||||
throw new Exception("static member variable failed");
|
||||
}
|
||||
if (oi1c.Color.staticConstMemberVariable != 222) {
|
||||
throw new Exception("static const member variable failed");
|
||||
}
|
||||
if (oi1c.Color.staticConstEnumMemberVariable != oi1c.Color.Channel.Transmission) {
|
||||
throw new Exception("static const enum member variable failed");
|
||||
}
|
||||
|
||||
// check globals in a namespace don't get mangled with the nspace option
|
||||
nspace.nspace.namespaceFunction(color);
|
||||
nspace.nspace.namespaceVar = 111;
|
||||
if (nspace.nspace.namespaceVar != 111) {
|
||||
throw new Exception("global var failed");
|
||||
}
|
||||
|
||||
// Same class different namespaces
|
||||
auto col1 = new oi1c.Color();
|
||||
auto col2 = nspace.Outer.Inner2.Color.Color.create();
|
||||
col2.colors(col1, col1, col2, col2, col2);
|
||||
|
||||
// global enums
|
||||
auto outerChannel1 = someClass.GetInner1Channel();
|
||||
if (outerChannel1 != nspace.Outer.Inner1.Channel.Channel.Transmission1) {
|
||||
throw new Exception("Transmission1 wrong");
|
||||
}
|
||||
auto outerChannel2 = someClass.GetInner2Channel();
|
||||
if (outerChannel2 != nspace.Outer.Inner2.Channel.Channel.Transmission2) {
|
||||
throw new Exception("Transmission2 wrong");
|
||||
}
|
||||
|
||||
// turn feature off / ignoring
|
||||
auto ns = new nspace.Outer.namespce.namespce();
|
||||
auto nons = new nspace.NoNSpacePlease.NoNSpacePlease();
|
||||
|
||||
// Derived class
|
||||
auto blue3 = new nspace.Outer.Inner3.Blue.Blue();
|
||||
blue3.blueInstanceMethod();
|
||||
auto blue4 = new nspace.Outer.Inner4.Blue.Blue();
|
||||
blue4.blueInstanceMethod();
|
||||
}
|
||||
77
Examples/test-suite/d/nspace_runme.2.d
Normal file
77
Examples/test-suite/d/nspace_runme.2.d
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
module nspace_runme;
|
||||
|
||||
import std.exception;
|
||||
import nspace.nspace;
|
||||
static import nspace.NoNSpacePlease;
|
||||
static import nspace.Outer.namespce;
|
||||
static import nspace.Outer.Inner1.Channel;
|
||||
static import oi1c = nspace.Outer.Inner1.Color;
|
||||
static import nspace.Outer.Inner2.Channel;
|
||||
static import nspace.Outer.Inner2.Color;
|
||||
static import nspace.Outer.Inner3.Blue;
|
||||
static import nspace.Outer.Inner4.Blue;
|
||||
static import nspace.Outer.SomeClass;
|
||||
|
||||
void main() {
|
||||
// constructors and destructors
|
||||
auto color1 = new oi1c.Color();
|
||||
auto color = new oi1c.Color(color1);
|
||||
|
||||
// class methods
|
||||
color.colorInstanceMethod(20.0);
|
||||
oi1c.Color.colorStaticMethod(20.0);
|
||||
auto created = oi1c.Color.create();
|
||||
|
||||
// class enums
|
||||
auto someClass = new nspace.Outer.SomeClass.SomeClass();
|
||||
auto channel = someClass.GetInner1ColorChannel();
|
||||
enforce(channel == oi1c.Color.Channel.Transmission,
|
||||
"Transmission wrong");
|
||||
|
||||
// class anonymous enums
|
||||
int val1 = oi1c.Color.ColorEnumVal1;
|
||||
int val2 = oi1c.Color.ColorEnumVal2;
|
||||
enforce(val1 == 0 && val2 == 0x22, "ColorEnumVal wrong");
|
||||
|
||||
// instance member variables
|
||||
color.instanceMemberVariable = 123;
|
||||
enforce(color.instanceMemberVariable == 123,
|
||||
"instance member variable failed");
|
||||
|
||||
// static member variables
|
||||
oi1c.Color.staticMemberVariable = 789;
|
||||
enforce(oi1c.Color.staticMemberVariable == 789,
|
||||
"static member variable failed");
|
||||
enforce(oi1c.Color.staticConstMemberVariable == 222,
|
||||
"static const member variable failed");
|
||||
enforce(oi1c.Color.staticConstEnumMemberVariable == oi1c.Color.Channel.Transmission,
|
||||
"static const enum member variable failed");
|
||||
|
||||
// check globals in a namespace don't get mangled with the nspace option
|
||||
nspace.nspace.namespaceFunction(color);
|
||||
nspace.nspace.namespaceVar = 111;
|
||||
enforce(nspace.nspace.namespaceVar == 111, "global var failed");
|
||||
|
||||
// Same class different namespaces
|
||||
auto col1 = new oi1c.Color();
|
||||
auto col2 = nspace.Outer.Inner2.Color.Color.create();
|
||||
col2.colors(col1, col1, col2, col2, col2);
|
||||
|
||||
// global enums
|
||||
auto outerChannel1 = someClass.GetInner1Channel();
|
||||
enforce(outerChannel1 == nspace.Outer.Inner1.Channel.Channel.Transmission1,
|
||||
"Transmission1 wrong");
|
||||
auto outerChannel2 = someClass.GetInner2Channel();
|
||||
enforce(outerChannel2 == nspace.Outer.Inner2.Channel.Channel.Transmission2,
|
||||
"Transmission2 wrong");
|
||||
|
||||
// turn feature off / ignoring
|
||||
auto ns = new nspace.Outer.namespce.namespce();
|
||||
auto nons = new nspace.NoNSpacePlease.NoNSpacePlease();
|
||||
|
||||
// Derived class
|
||||
auto blue3 = new nspace.Outer.Inner3.Blue.Blue();
|
||||
blue3.blueInstanceMethod();
|
||||
auto blue4 = new nspace.Outer.Inner4.Blue.Blue();
|
||||
blue4.blueInstanceMethod();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue