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

Merge branch 'abstract-conversion-operators'

Browse source 
* abstract-conversion-operators:
  Add test cases for abstract user-defined conversion operators
  Recognize C++ conversion operators with trailing '= 0' as abstract
This commit is contained in:
William S Fulton 2020-02-14 07:12:26 +00:00
commit c914b1eb78
3 changed files with 52 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/common.mk
View file

@ -184,6 +184,7 @@ CPP_TEST_CASES += \
director_classes \
director_classic \
director_constructor \
director_conversion_operators \
director_default \
director_detect \
director_enum \

35
Examples/test-suite/director_conversion_operators.i Normal file
View file

@ -0,0 +1,35 @@
%module(directors="1") director_conversion_operators
%feature("director");
%warnfilter(SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) Bar;
%rename(toFoo) Bar::operator Foo();
%rename(toFooPtr) Bar::operator Foo *();
%rename(toFooRef) Bar::operator Foo &();
%rename(toFooPtrRef) Bar::operator Foo *&();
%rename(toOtherFoo) Bar::operator OtherFoo();
%rename(toOtherFooPtr) Bar::operator OtherFoo *();
%rename(toOtherFooRef) Bar::operator OtherFoo &();
%rename(toOtherFooPtrRef) Bar::operator OtherFoo *&();
%inline %{
struct Foo {
};
struct OtherFoo {
};
struct Bar {
Foo myFoo;
Foo *myFooPtr;
virtual ~Bar() { }
virtual operator Foo () { return Foo(); }
virtual operator Foo *() { return &myFoo; }
virtual operator Foo &() { return myFoo; }
virtual operator Foo *&() { return myFooPtr; }
virtual operator OtherFoo () = 0;
virtual operator OtherFoo *() = 0;
virtual operator OtherFoo &() = 0;
virtual operator OtherFoo *&() = 0;
};
%}

17
Source/CParse/parser.y
View file

@ -4800,6 +4800,9 @@ cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN p
if ($8.qualifier) {
SwigType_push($4,$8.qualifier);
}
if ($8.val) {
Setattr($$,"value",$8.val);
}
Setattr($$,"refqualifier",$8.refqualifier);
Setattr($$,"decl",$4);
Setattr($$,"parms",$6);
@ -4818,6 +4821,9 @@ cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN p
if ($8.qualifier) {
SwigType_push(decl,$8.qualifier);
}
if ($8.val) {
Setattr($$,"value",$8.val);
}
Setattr($$,"refqualifier",$8.refqualifier);
Setattr($$,"decl",decl);
Setattr($$,"parms",$6);
@ -4836,6 +4842,9 @@ cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN p
if ($8.qualifier) {
SwigType_push(decl,$8.qualifier);
}
if ($8.val) {
Setattr($$,"value",$8.val);
}
Setattr($$,"refqualifier",$8.refqualifier);
Setattr($$,"decl",decl);
Setattr($$,"parms",$6);
@ -4856,6 +4865,9 @@ cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN p
if ($9.qualifier) {
SwigType_push(decl,$9.qualifier);
}
if ($9.val) {
Setattr($$,"value",$9.val);
}
Setattr($$,"refqualifier",$9.refqualifier);
Setattr($$,"decl",decl);
Setattr($$,"parms",$7);
@ -4873,7 +4885,10 @@ cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN p
if ($7.qualifier) {
SwigType_push(t,$7.qualifier);
}
Setattr($$,"refqualifier",$7.refqualifier);
if ($7.val) {
Setattr($$,"value",$7.val);
}
Setattr($$,"refqualifier",$7.refqualifier);
Setattr($$,"decl",t);
Setattr($$,"parms",$5);
Setattr($$,"conversion_operator","1");