MSVC now fails with: error C4596: 'foo': illegal qualified name in member declaration Such redundant qualification is invalid. Compilers used to be permissive here (so it's useful for SWIG to handle it), but compilers increasingly complain about it so adjust the testcase to show the compiler a valid version, and only test the redundant qualification with SWIG.
273 lines
7.6 KiB
OpenEdge ABL
273 lines
7.6 KiB
OpenEdge ABL
%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
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct1;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass1;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion1;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass2;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct2;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion2;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass4Typedef;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct4Typedef;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion4Typedef;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass5;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct5;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion5;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultiple;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleDerived;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleAnonTypedef1;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleNamedTypedef;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerSameName;
|
|
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer2::IgnoreMe;
|
|
|
|
%inline %{
|
|
|
|
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
|
|
/* ISO C++ prohibits anonymous structs [-Werror=pedantic] */
|
|
#pragma GCC diagnostic ignored "-Wpedantic"
|
|
#endif
|
|
|
|
namespace bar {
|
|
int foo() { return 0; }
|
|
}
|
|
|
|
struct Outer {
|
|
typedef int Integer;
|
|
///////////////////////////////////////////
|
|
struct InnerStruct1 {
|
|
Integer x;
|
|
};
|
|
|
|
class InnerClass1 {
|
|
public:
|
|
Integer x;
|
|
};
|
|
|
|
union InnerUnion1 {
|
|
Integer x;
|
|
double y;
|
|
};
|
|
|
|
///////////////////////////////////////////
|
|
#if defined(__GNUC__) || defined(_MSC_VER) || defined(SWIG)
|
|
/* some compilers do not accept these */
|
|
class {
|
|
public:
|
|
Integer a;
|
|
};
|
|
|
|
struct {
|
|
Integer b;
|
|
};
|
|
#else
|
|
Integer a;
|
|
Integer b;
|
|
#endif
|
|
|
|
union {
|
|
Integer c;
|
|
double d;
|
|
};
|
|
|
|
///////////////////////////////////////////
|
|
class InnerClass2 {
|
|
public:
|
|
Integer x;
|
|
} InnerClass2Instance;
|
|
|
|
struct InnerStruct2 {
|
|
Integer x;
|
|
} InnerStruct2Instance;
|
|
|
|
union InnerUnion2 {
|
|
Integer x;
|
|
double y;
|
|
} InnerUnion2Instance;
|
|
|
|
///////////////////////////////////////////
|
|
class {
|
|
public:
|
|
Integer x;
|
|
} InnerClass3Instance;
|
|
|
|
struct {
|
|
Integer x;
|
|
} InnerStruct3Instance;
|
|
|
|
union {
|
|
Integer x;
|
|
double y;
|
|
} InnerUnion3Instance;
|
|
|
|
///////////////////////////////////////////
|
|
typedef class {
|
|
public:
|
|
Integer x;
|
|
} InnerClass4Typedef;
|
|
|
|
#ifdef SWIG
|
|
// SWIG should ignore the redundant qualification here (#508)...
|
|
int Outer::foo(){ return 1; }
|
|
#else
|
|
// ..but that redundant qualification is actually invalid and many compilers
|
|
// now reject it with an error, so feed a valid version to the compiler.
|
|
int foo(){ return 1; }
|
|
#endif
|
|
|
|
typedef struct {
|
|
Integer x;
|
|
} InnerStruct4Typedef;
|
|
|
|
friend int bar::foo(); // should parse correctly (#508)
|
|
|
|
typedef union {
|
|
Integer x;
|
|
double y;
|
|
} InnerUnion4Typedef;
|
|
|
|
///////////////////////////////////////////
|
|
typedef class InnerClass5 {
|
|
public:
|
|
Integer x;
|
|
} InnerClass5Typedef;
|
|
|
|
typedef struct InnerStruct5 {
|
|
Integer x;
|
|
} InnerStruct5Typedef;
|
|
|
|
typedef union InnerUnion5 {
|
|
Integer x;
|
|
double y;
|
|
} InnerUnion5Typedef;
|
|
|
|
// bug #909387 - inner declared types are treated as forward declarations
|
|
InnerStruct1* makeInnerStruct1() { return 0; }
|
|
InnerClass1* makeInnerClass1() { return 0; }
|
|
InnerUnion1* makeInnerUnion1() { return 0; }
|
|
|
|
InnerStruct2* makeInnerStruct2() { return 0; }
|
|
InnerClass2* makeInnerClass2() { return 0; }
|
|
InnerUnion2* makeInnerUnion2() { return 0; }
|
|
|
|
InnerStruct4Typedef* makeInnerStruct4Typedef() { return 0; }
|
|
InnerClass4Typedef* makeInnerClass4Typedef() { return 0; }
|
|
InnerUnion4Typedef* makeInnerUnion4Typedef() { return 0; }
|
|
|
|
InnerStruct5* makeInnerStruct5() { return 0; }
|
|
InnerClass5* makeInnerClass5() { return 0; }
|
|
InnerUnion5* makeInnerUnion5() { return 0; }
|
|
|
|
InnerStruct5Typedef* makeInnerStruct5Typedef() { return 0; }
|
|
InnerClass5Typedef* makeInnerClass5Typedef() { return 0; }
|
|
InnerUnion5Typedef* makeInnerUnion5Typedef() { return 0; }
|
|
|
|
///////////////////////////////////////////
|
|
struct InnerMultiple {
|
|
Integer x;
|
|
} MultipleInstance1, MultipleInstance2, *MultipleInstance3, MultipleInstance4[2];
|
|
|
|
struct InnerMultipleDerived : public InnerMultiple {
|
|
Integer xx;
|
|
} MultipleDerivedInstance1, MultipleDerivedInstance2, *MultipleDerivedInstance3, MultipleDerivedInstance4[2];
|
|
|
|
struct {
|
|
Integer x;
|
|
} MultipleInstanceAnon1, MultipleInstanceAnon2, *MultipleInstanceAnon3, MultipleInstanceAnon4[2];
|
|
|
|
struct : public InnerMultiple {
|
|
Integer xx;
|
|
} MultipleInstanceAnonDerived1, MultipleInstanceAnonDerived2, *MultipleInstanceAnonDerived3, MultipleInstanceAnonDerived4[2];
|
|
|
|
#if (defined(__GNUC__) && __GNUC__ < 12) || defined(_MSC_VER) || defined(SWIG)
|
|
/* some compilers do not accept these */
|
|
struct : public InnerMultiple {
|
|
Integer xx;
|
|
};
|
|
|
|
class : public InnerMultiple {
|
|
public:
|
|
Integer yy;
|
|
};
|
|
#else
|
|
Integer xx;
|
|
Integer yy;
|
|
#endif
|
|
|
|
///////////////////////////////////////////
|
|
typedef struct {
|
|
Integer x;
|
|
} InnerMultipleAnonTypedef1, InnerMultipleAnonTypedef2, *InnerMultipleAnonTypedef3;
|
|
|
|
InnerMultipleAnonTypedef1* makeInnerMultipleAnonTypedef1() { return 0; }
|
|
InnerMultipleAnonTypedef2* makeInnerMultipleAnonTypedef2() { return 0; }
|
|
InnerMultipleAnonTypedef3* makeInnerMultipleAnonTypedef3() { return 0; }
|
|
|
|
typedef struct InnerMultipleNamedTypedef {
|
|
Integer x;
|
|
} InnerMultipleNamedTypedef1, InnerMultipleNamedTypedef2, *InnerMultipleNamedTypedef3;
|
|
|
|
InnerMultipleNamedTypedef* makeInnerMultipleNamedTypedef() { return 0; }
|
|
InnerMultipleNamedTypedef1* makeInnerMultipleNamedTypedef1() { return 0; }
|
|
InnerMultipleNamedTypedef2* makeInnerMultipleNamedTypedef2() { return 0; }
|
|
InnerMultipleNamedTypedef3* makeInnerMultipleNamedTypedef3() { return 0; }
|
|
|
|
///////////////////////////////////////////
|
|
typedef struct InnerSameName {
|
|
Integer x;
|
|
struct InnerSameName2 {};
|
|
} InnerSameName;
|
|
|
|
InnerSameName* makeInnerSameName() { return 0; }
|
|
};
|
|
#if defined(SWIGCSHARP) || defined (SWIGJAVA)
|
|
// place a class with the same name as in Outer in global scope, to test language symbol table
|
|
class InnerSameName {};
|
|
class InnerSameName2 {};
|
|
#endif
|
|
%}
|
|
|
|
// Ignore nested struct instance
|
|
%ignore Outer2::IgnoreMeInstance;
|
|
%{
|
|
struct Outer2 {
|
|
struct IgnoreMe {
|
|
int xx;
|
|
};
|
|
};
|
|
%}
|
|
|
|
struct Outer2 {
|
|
struct IgnoreMe {
|
|
int xx;
|
|
} IgnoreMeInstance;
|
|
};
|
|
|
|
|