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

scilab: fix tests having too long identifier names

Browse source
This commit is contained in:
Simon Marchetto 2014-09-29 17:32:49 +02:00
commit 35ff88709e
3 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Examples/test-suite/director_frob.i
View file

@ -1,13 +1,19 @@
%module(directors="1") director_frob; %module(directors="1") director_frob;
#pragma SWIG nowarn=SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR #pragma SWIG nowarn=SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR
#ifdef SWIGSCILAB
%rename(cb) coreCallbacks;
%rename(On3dEngRedrawn) coreCallbacksOn3dEngineRedrawnData;
%rename (_On3dEngRedrawn) coreCallbacks_On3dEngineRedrawnData;
#endif
%header %{ %header %{
#include <iostream> #include <iostream>
%} %}
%feature("director"); %feature("director");
%feature("nodirector") Bravo::abs_method(); // ok %feature("nodirector") Bravo::abs_method(); // ok
%feature("director") Charlie::abs_method(); // ok %feature("director") Charlie::abs_method(); // okl
%feature("nodirector") Delta::abs_method(); // ok %feature("nodirector") Delta::abs_method(); // ok
%inline %{ %inline %{
@ -17,7 +23,7 @@
virtual ~Alpha() { }; virtual ~Alpha() { };
virtual const char* abs_method() = 0; virtual const char* abs_method() = 0;
}; };
struct Bravo : Alpha struct Bravo : Alpha
{ {
const char* abs_method() const char* abs_method()
@ -26,14 +32,14 @@
} }
}; };
struct Charlie : Bravo struct Charlie : Bravo
{ {
const char* abs_method() const char* abs_method()
{ {
return "Charlie::abs_method()"; return "Charlie::abs_method()";
} }
}; };
struct Delta : Charlie struct Delta : Charlie
{ {
}; };

16
Examples/test-suite/nested.i
View file

@ -6,6 +6,22 @@ Also tests reported error when a #define placed in a deeply embedded struct/unio
%module nested %module nested
#ifdef SWIGSCILAB
%rename(OutStNamed) OuterStructNamed;
%rename(InStNamed) InnerStructNamed;
%rename(inUnNamed) inner_union_named;
%rename(OutStUnnamed) OuterStructUnnamed;
%rename(inStUnnamed) inner_struct_unnamed;
%rename(OutStUnnamed_inUnUnnamed) OuterStructUnnamed::inner_union_unnamed;
%rename(OutSt) OuterStruct;
%rename(OutNestedSt) outer_nested_struct;
%rename(InNestedSt) inner_nested_struct;
%rename(InNestedUn) InnerNestedUnion;
%rename(EmbdUn) EmbeddedUnion;
#endif
%inline %{ %inline %{
struct TestStruct { struct TestStruct {

28
Examples/test-suite/nested_class.i
View file

@ -1,5 +1,33 @@
%module nested_class %module nested_class
#if defined(SWIGSCILAB)
%rename(Out) Outer;
%rename(InSt1) InnerStruct1;
%rename(InCls1) InnerClass1;
%rename(InCls2) InnerClass2;
%rename(InClas3Inst) InnerClass3Instance;
%rename(InSt3Inst) InnerStruct3Instance;
%rename(InCls4Type) InnerClass4Typedef;
%rename(InSt4Type) InnerStruct4Typedef;
%rename(InCls5Type) InnerClass5Typedef;
%rename(InSt5Type) InnerStruct5Typedef;
%rename(InMul) InnerMultiple;
%rename(InMulDrv) InnerMultipleDerived;
%rename(MulInst1) MultipleInstance1;
%rename(MulInst2) MultipleInstance2;
%rename(MulInst3) MultipleInstance3;
%rename(MulInst4) MultipleInstance4;
%rename(MulDrvInst1) MultipleDerivedInstance1;
%rename(MulDrvInst2) MultipleDerivedInstance2;
%rename(MulDrvInst3) MultipleDerivedInstance3;
%rename(MulDrvInst4) MultipleDerivedInstance4;
%rename(MulInstAnnDrv1) MultipleInstanceAnonDerived1;
%rename(MulInstAnnDrv2) MultipleInstanceAnonDerived2;
%rename(MulInstAnnDrv3) MultipleInstanceAnonDerived3;
%rename(MulInstAnnDrv4) MultipleInstanceAnonDerived4;
#endif
#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS #pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct1; %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct1;
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass1; %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass1;