Skip to content

[generator] Fix potential callback naming conflict. #1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Aug 9, 2024
Merged

[generator] Fix potential callback naming conflict. #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima
JNIEnv.DeleteLocalRef (local_ref);
}

static Delegate cb_OnAnimationEnd_I;
static Delegate cb_OnAnimationEnd_OnAnimationEnd_I_Z;
#pragma warning disable 0169
static Delegate GetOnAnimationEnd_IHandler ()
{
if (cb_OnAnimationEnd_I == null)
cb_OnAnimationEnd_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I));
return cb_OnAnimationEnd_I;
if (cb_OnAnimationEnd_OnAnimationEnd_I_Z == null)
cb_OnAnimationEnd_OnAnimationEnd_I_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I));
return cb_OnAnimationEnd_OnAnimationEnd_I_Z;
}

static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1)
Expand All @@ -92,13 +92,13 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima
return JNIEnv.CallBooleanMethod (((global::Java.Lang.Object) this).Handle, id_OnAnimationEnd_I, __args);
}

static Delegate cb_OnAnimationEnd_II;
static Delegate cb_OnAnimationEnd_OnAnimationEnd_II_Z;
#pragma warning disable 0169
static Delegate GetOnAnimationEnd_IIHandler ()
{
if (cb_OnAnimationEnd_II == null)
cb_OnAnimationEnd_II = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II));
return cb_OnAnimationEnd_II;
if (cb_OnAnimationEnd_OnAnimationEnd_II_Z == null)
cb_OnAnimationEnd_OnAnimationEnd_II_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II));
return cb_OnAnimationEnd_OnAnimationEnd_II_Z;
}

static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2)
Expand Down
8 changes: 4 additions & 4 deletions .../Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter
JNIEnv.DeleteLocalRef (local_ref);
}

static Delegate cb_DoSomething;
static Delegate cb_DoSomething_DoSomething_V;
#pragma warning disable 0169
static Delegate GetDoSomethingHandler ()
{
if (cb_DoSomething == null)
cb_DoSomething = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething));
return cb_DoSomething;
if (cb_DoSomething_DoSomething_V == null)
cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething));
return cb_DoSomething_DoSomething_V;
}

static void n_DoSomething (IntPtr jnienv, IntPtr native__this)
Expand Down
72 changes: 36 additions & 36 deletions ...generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ public partial class MyClass {
}
}

static Delegate? cb_get_Count;
static Delegate? cb_get_Count_get_Count_I;
#pragma warning disable 0169
static Delegate Getget_CountHandler ()
{
if (cb_get_Count == null)
cb_get_Count = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count));
return cb_get_Count;
if (cb_get_Count_get_Count_I == null)
cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count));
return cb_get_Count_get_Count_I;
}

static int n_get_Count (IntPtr jnienv, IntPtr native__this)
Expand All @@ -65,13 +65,13 @@ public partial class MyClass {
}
#pragma warning restore 0169

static Delegate? cb_set_Count_I;
static Delegate? cb_set_Count_set_Count_I_V;
#pragma warning disable 0169
static Delegate Getset_Count_IHandler ()
{
if (cb_set_Count_I == null)
cb_set_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I));
return cb_set_Count_I;
if (cb_set_Count_set_Count_I_V == null)
cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I));
return cb_set_Count_set_Count_I_V;
}

static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value)
Expand Down Expand Up @@ -105,13 +105,13 @@ public partial class MyClass {
}
}

static Delegate? cb_get_Key;
static Delegate? cb_get_Key_get_Key_Ljava_lang_String_;
#pragma warning disable 0169
static Delegate Getget_KeyHandler ()
{
if (cb_get_Key == null)
cb_get_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key));
return cb_get_Key;
if (cb_get_Key_get_Key_Ljava_lang_String_ == null)
cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key));
return cb_get_Key_get_Key_Ljava_lang_String_;
}

static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this)
Expand All @@ -121,13 +121,13 @@ public partial class MyClass {
}
#pragma warning restore 0169

static Delegate? cb_set_Key_Ljava_lang_String_;
static Delegate? cb_set_Key_set_Key_Ljava_lang_String__V;
#pragma warning disable 0169
static Delegate Getset_Key_Ljava_lang_String_Handler ()
{
if (cb_set_Key_Ljava_lang_String_ == null)
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_));
return cb_set_Key_Ljava_lang_String_;
if (cb_set_Key_set_Key_Ljava_lang_String__V == null)
cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_));
return cb_set_Key_set_Key_Ljava_lang_String__V;
}

static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value)
Expand Down Expand Up @@ -188,13 +188,13 @@ public partial class MyClass {
}
}

static Delegate? cb_get_AbstractCount;
static Delegate? cb_get_AbstractCount_get_AbstractCount_I;
#pragma warning disable 0169
static Delegate Getget_AbstractCountHandler ()
{
if (cb_get_AbstractCount == null)
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount));
return cb_get_AbstractCount;
if (cb_get_AbstractCount_get_AbstractCount_I == null)
cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount));
return cb_get_AbstractCount_get_AbstractCount_I;
}

static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this)
Expand All @@ -204,13 +204,13 @@ public partial class MyClass {
}
#pragma warning restore 0169

static Delegate? cb_set_AbstractCount_I;
static Delegate? cb_set_AbstractCount_set_AbstractCount_I_V;
#pragma warning disable 0169
static Delegate Getset_AbstractCount_IHandler ()
{
if (cb_set_AbstractCount_I == null)
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I));
return cb_set_AbstractCount_I;
if (cb_set_AbstractCount_set_AbstractCount_I_V == null)
cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I));
return cb_set_AbstractCount_set_AbstractCount_I_V;
}

static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value)
Expand All @@ -230,13 +230,13 @@ public partial class MyClass {
set;
}

static Delegate? cb_GetCountForKey_Ljava_lang_String_;
static Delegate? cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I;
#pragma warning disable 0169
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
{
if (cb_GetCountForKey_Ljava_lang_String_ == null)
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_));
return cb_GetCountForKey_Ljava_lang_String_;
if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null)
cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_));
return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I;
}

static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key)
Expand Down Expand Up @@ -264,13 +264,13 @@ public partial class MyClass {
}
}

static Delegate? cb_Key;
static Delegate? cb_Key_Key_Ljava_lang_String_;
#pragma warning disable 0169
static Delegate GetKeyHandler ()
{
if (cb_Key == null)
cb_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key));
return cb_Key;
if (cb_Key_Key_Ljava_lang_String_ == null)
cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key));
return cb_Key_Key_Ljava_lang_String_;
}

static IntPtr n_Key (IntPtr jnienv, IntPtr native__this)
Expand Down Expand Up @@ -303,13 +303,13 @@ public partial class MyClass {
}
}

static Delegate? cb_AbstractMethod;
static Delegate? cb_AbstractMethod_AbstractMethod_V;
#pragma warning disable 0169
static Delegate GetAbstractMethodHandler ()
{
if (cb_AbstractMethod == null)
cb_AbstractMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod));
return cb_AbstractMethod;
if (cb_AbstractMethod_AbstractMethod_V == null)
cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod));
return cb_AbstractMethod_AbstractMethod_V;
}

static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this)
Expand Down
72 changes: 36 additions & 36 deletions ...rator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
JNIEnv.DeleteLocalRef (local_ref);
}

static Delegate? cb_get_Count;
static Delegate? cb_get_Count_get_Count_I;
#pragma warning disable 0169
static Delegate Getget_CountHandler ()
{
if (cb_get_Count == null)
cb_get_Count = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count));
return cb_get_Count;
if (cb_get_Count_get_Count_I == null)
cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count));
return cb_get_Count_get_Count_I;
}

static int n_get_Count (IntPtr jnienv, IntPtr native__this)
Expand All @@ -146,13 +146,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}
#pragma warning restore 0169

static Delegate? cb_set_Count_I;
static Delegate? cb_set_Count_set_Count_I_V;
#pragma warning disable 0169
static Delegate Getset_Count_IHandler ()
{
if (cb_set_Count_I == null)
cb_set_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I));
return cb_set_Count_I;
if (cb_set_Count_set_Count_I_V == null)
cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I));
return cb_set_Count_set_Count_I_V;
}

static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value)
Expand All @@ -179,13 +179,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}
}

static Delegate? cb_get_Key;
static Delegate? cb_get_Key_get_Key_Ljava_lang_String_;
#pragma warning disable 0169
static Delegate Getget_KeyHandler ()
{
if (cb_get_Key == null)
cb_get_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key));
return cb_get_Key;
if (cb_get_Key_get_Key_Ljava_lang_String_ == null)
cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key));
return cb_get_Key_get_Key_Ljava_lang_String_;
}

static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this)
Expand All @@ -195,13 +195,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}
#pragma warning restore 0169

static Delegate? cb_set_Key_Ljava_lang_String_;
static Delegate? cb_set_Key_set_Key_Ljava_lang_String__V;
#pragma warning disable 0169
static Delegate Getset_Key_Ljava_lang_String_Handler ()
{
if (cb_set_Key_Ljava_lang_String_ == null)
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_));
return cb_set_Key_Ljava_lang_String_;
if (cb_set_Key_set_Key_Ljava_lang_String__V == null)
cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_));
return cb_set_Key_set_Key_Ljava_lang_String__V;
}

static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value)
Expand Down Expand Up @@ -231,13 +231,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}
}

static Delegate? cb_get_AbstractCount;
static Delegate? cb_get_AbstractCount_get_AbstractCount_I;
#pragma warning disable 0169
static Delegate Getget_AbstractCountHandler ()
{
if (cb_get_AbstractCount == null)
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount));
return cb_get_AbstractCount;
if (cb_get_AbstractCount_get_AbstractCount_I == null)
cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount));
return cb_get_AbstractCount_get_AbstractCount_I;
}

static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this)
Expand All @@ -247,13 +247,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}
#pragma warning restore 0169

static Delegate? cb_set_AbstractCount_I;
static Delegate? cb_set_AbstractCount_set_AbstractCount_I_V;
#pragma warning disable 0169
static Delegate Getset_AbstractCount_IHandler ()
{
if (cb_set_AbstractCount_I == null)
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I));
return cb_set_AbstractCount_I;
if (cb_set_AbstractCount_set_AbstractCount_I_V == null)
cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I));
return cb_set_AbstractCount_set_AbstractCount_I_V;
}

static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value)
Expand All @@ -280,13 +280,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}
}

static Delegate? cb_GetCountForKey_Ljava_lang_String_;
static Delegate? cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I;
#pragma warning disable 0169
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
{
if (cb_GetCountForKey_Ljava_lang_String_ == null)
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_));
return cb_GetCountForKey_Ljava_lang_String_;
if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null)
cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_));
return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I;
}

static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key)
Expand All @@ -311,13 +311,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
return __ret;
}

static Delegate? cb_Key;
static Delegate? cb_Key_Key_Ljava_lang_String_;
#pragma warning disable 0169
static Delegate GetKeyHandler ()
{
if (cb_Key == null)
cb_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key));
return cb_Key;
if (cb_Key_Key_Ljava_lang_String_ == null)
cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key));
return cb_Key_Key_Ljava_lang_String_;
}

static IntPtr n_Key (IntPtr jnienv, IntPtr native__this)
Expand All @@ -335,13 +335,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
return JNIEnv.GetString (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_Key), JniHandleOwnership.TransferLocalRef);
}

static Delegate? cb_AbstractMethod;
static Delegate? cb_AbstractMethod_AbstractMethod_V;
#pragma warning disable 0169
static Delegate GetAbstractMethodHandler ()
{
if (cb_AbstractMethod == null)
cb_AbstractMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod));
return cb_AbstractMethod;
if (cb_AbstractMethod_AbstractMethod_V == null)
cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod));
return cb_AbstractMethod_AbstractMethod_V;
}

static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this)
Expand Down
8 changes: 4 additions & 4 deletions ...sts/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ public partial class MyClass : Java.Lang.Object {
{
}

static Delegate? cb_echo_arrayLjava_lang_CharSequence_;
static Delegate? cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_;
#pragma warning disable 0169
static Delegate GetEcho_arrayLjava_lang_CharSequence_Handler ()
{
if (cb_echo_arrayLjava_lang_CharSequence_ == null)
cb_echo_arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_));
return cb_echo_arrayLjava_lang_CharSequence_;
if (cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ == null)
cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_));
return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_;
}

static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages)
Expand Down
Loading