Skip to content
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

Compare scripts via object_id #1036

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compare scripts via object_id #1036

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
10 changes: 7 additions & 3 deletions godot-core/src/obj/script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,11 @@ where
return false;
}

let object_script: Gd<Script> = object_script_variant.to();

if object_script.upcast_ref::<Script>().__object_ptr() != script.upcast_ref().__object_ptr() {
if object_script_variant
.object_id()
.map(|instance_id| instance_id != script.instance_id())
.unwrap_or(true)
{
Comment on lines +363 to +367
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this changes behavior:

previous condition was a != b
so if a is null, the overall condition is only true if b is not null.

now it's a.map(|a| a != b).unwrap_or(true)
meaning if a is null, the whole condition is always true.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, this could be Option::map_or(), no?

return false;
}

Expand All @@ -371,6 +373,8 @@ where
};

let get_instance_fn = sys::interface_fn!(object_get_script_instance);

// SAFETY: object and language are alive and their sys pointers are valid
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// SAFETY: object and language are alive and their sys pointers are valid
// SAFETY: object and language are alive and their sys pointers are valid.

let instance = unsafe { get_instance_fn(object.obj_sys(), language.obj_sys()) };

!instance.is_null()
Expand Down
Loading