From d6077129e49b824f6a01cba628b84c096c291f50 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 9 Oct 2017 07:21:41 +0100 Subject: [PATCH] Testcase changes to satisfy pep8 E742 and E743 checks Closes #1110 --- Examples/test-suite/class_scope_namespace.i | 8 ++++---- .../java/class_scope_namespace_runme.java | 2 +- .../template_partial_specialization_runme.java | 4 ++-- ...ate_partial_specialization_typedef_runme.java | 4 ++-- .../test-suite/template_partial_specialization.i | 16 ++++++++-------- .../template_partial_specialization_typedef.i | 16 ++++++++-------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Examples/test-suite/class_scope_namespace.i b/Examples/test-suite/class_scope_namespace.i index 730c076aa..47d918157 100644 --- a/Examples/test-suite/class_scope_namespace.i +++ b/Examples/test-suite/class_scope_namespace.i @@ -3,7 +3,7 @@ %module class_scope_namespace %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) H::HH; -%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Space8::I::II; +%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Space8::I_::II; %inline %{ struct A; @@ -107,12 +107,12 @@ void hhh(H::HH) {} namespace Space8 { struct II; - struct I { + struct I_ { struct II { - void ii(Space8::I::II, I::II) {} + void ii(Space8::I_::II, I_::II) {} }; }; - void iii(Space8::I::II, I::II) {} + void iii(Space8::I_::II, I_::II) {} } struct J; diff --git a/Examples/test-suite/java/class_scope_namespace_runme.java b/Examples/test-suite/java/class_scope_namespace_runme.java index 9d74a6ca6..e55393e2b 100644 --- a/Examples/test-suite/java/class_scope_namespace_runme.java +++ b/Examples/test-suite/java/class_scope_namespace_runme.java @@ -22,7 +22,7 @@ public class class_scope_namespace_runme { F f = new F(); G g = new G(); H.HH h = new H.HH(); - I.II i = new I.II(); + I_.II i = new I_.II(); J j = new J(); K k = new K(); L l = new L(); diff --git a/Examples/test-suite/java/template_partial_specialization_runme.java b/Examples/test-suite/java/template_partial_specialization_runme.java index ef8c4e80e..097c33d86 100644 --- a/Examples/test-suite/java/template_partial_specialization_runme.java +++ b/Examples/test-suite/java/template_partial_specialization_runme.java @@ -23,10 +23,10 @@ public class template_partial_specialization_runme { new G().g(); new H().h(); - new I().i(); new J().j(); new K().k(); - new L().l(); + new M().m(); + new N().n(); new BB().b(); new BBB().b(); diff --git a/Examples/test-suite/java/template_partial_specialization_typedef_runme.java b/Examples/test-suite/java/template_partial_specialization_typedef_runme.java index 6ae95eb6a..04653cdc0 100644 --- a/Examples/test-suite/java/template_partial_specialization_typedef_runme.java +++ b/Examples/test-suite/java/template_partial_specialization_typedef_runme.java @@ -23,10 +23,10 @@ public class template_partial_specialization_typedef_runme { new G().g(); new H().h(); - new I().i(); new J().j(); new K().k(); - new L().l(); + new M().m(); + new N().n(); new BB().b(); new BBB().b(); diff --git a/Examples/test-suite/template_partial_specialization.i b/Examples/test-suite/template_partial_specialization.i index a7afd3000..9727b52f8 100644 --- a/Examples/test-suite/template_partial_specialization.i +++ b/Examples/test-suite/template_partial_specialization.i @@ -12,10 +12,10 @@ namespace One { template <> struct OneParm { void g() {} }; template <> struct OneParm { void h() {} }; - template <> struct OneParm { void i() {} }; - template <> struct OneParm { void j() {} }; - template <> struct OneParm { void k() {} }; - template <> struct OneParm { void l() {} }; + template <> struct OneParm { void j() {} }; + template <> struct OneParm { void k() {} }; + template <> struct OneParm { void m() {} }; + template <> struct OneParm { void n() {} }; } %} @@ -33,12 +33,12 @@ namespace One { // %template scope explicit specializations namespace One { - %template(I) One::OneParm; - %template(J) ::One::OneParm; + %template(J) One::OneParm; + %template(K) ::One::OneParm; } -%template(K) ::One::OneParm; +%template(M) ::One::OneParm; namespace One { - %template(L) OneParm; + %template(N) OneParm; } // %template scope partial specializations diff --git a/Examples/test-suite/template_partial_specialization_typedef.i b/Examples/test-suite/template_partial_specialization_typedef.i index 9c00efc98..6f8a11591 100644 --- a/Examples/test-suite/template_partial_specialization_typedef.i +++ b/Examples/test-suite/template_partial_specialization_typedef.i @@ -39,10 +39,10 @@ namespace One { template <> struct OneParm { void g() {} }; template <> struct OneParm { void h() {} }; - template <> struct OneParm { void i() {} }; - template <> struct OneParm { void j() {} }; - template <> struct OneParm { void k() {} }; - template <> struct OneParm { void l() {} }; + template <> struct OneParm { void j() {} }; + template <> struct OneParm { void k() {} }; + template <> struct OneParm { void m() {} }; + template <> struct OneParm { void n() {} }; } %} @@ -60,12 +60,12 @@ namespace One { // %template scope explicit specializations namespace One { - %template(I) One::OneParm; - %template(J) ::One::OneParm; + %template(J) One::OneParm; + %template(K) ::One::OneParm; } -%template(K) ::One::OneParm; +%template(M) ::One::OneParm; namespace One { - %template(L) OneParm; + %template(N) OneParm; } // %template scope partial specializations