jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Any 'using' statements in the protected section of a class were previously ignored with dirprot mode, certainly with Java and C#. Also directors - a call to a method being defined in the base class, not overridden in a subcalss, but again overridden in a class derived from the first subclass was not being dispatched correcly to the most derived class - affecting non-scripting languages. Fix for C# is based on recent fix for D.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12419 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-02-01 07:02:50 +00:00
commit 4a73d986dd
12 changed files with 209 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Examples/test-suite/java/director_protected_runme.java
View file

@ -19,6 +19,7 @@ public class director_protected_runme {
Foo f = b.create();
director_protected_FooBar fb = new director_protected_FooBar();
director_protected_FooBar2 fb2 = new director_protected_FooBar2();
director_protected_FooBar3 fb3 = new director_protected_FooBar3();
{
String s = fb.used();
@ -60,11 +61,34 @@ public class director_protected_runme {
if ( !Modifier.isProtected(method.getModifiers()) )
throw new RuntimeException("Foo::ping should be protected" );
method = b.getClass().getDeclaredMethod("cheer", (java.lang.Class[])null);
if ( !Modifier.isProtected(method.getModifiers()) )
throw new RuntimeException("Bar::cheer should be protected" );
method = f.getClass().getDeclaredMethod("cheer", (java.lang.Class[])null);
if ( !Modifier.isProtected(method.getModifiers()) )
throw new RuntimeException("Foo::cheer should be protected" );
} catch (NoSuchMethodException n) {
throw new RuntimeException("NoSuchmethodException caught. Test failed.");
throw new RuntimeException(n);
} catch (SecurityException s) {
throw new RuntimeException("SecurityException caught. Test failed.");
}
if (!fb3.cheer().equals("director_protected_FooBar3::cheer();"))
throw new RuntimeException("bad fb3::cheer");
if (!fb2.callping().equals("director_protected_FooBar2::ping();"))
throw new RuntimeException("bad fb2.callping");
if (!fb2.callcheer().equals("director_protected_FooBar2::pang();Bar::pong();Foo::pong();director_protected_FooBar2::ping();"))
throw new RuntimeException("bad fb2.callcheer");
if (!fb3.callping().equals("Bar::ping();"))
throw new RuntimeException("bad fb3.callping");
if (!fb3.callcheer().equals("director_protected_FooBar3::cheer();"))
throw new RuntimeException("bad fb3.callcheer");
}
}
@ -83,3 +107,9 @@ class director_protected_FooBar2 extends Bar {
}
}
class director_protected_FooBar3 extends Bar {
public String cheer() {
return "director_protected_FooBar3::cheer();";
}
}