Skip to content

Add contains method to BytesType #126

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
merged 4 commits into from
Sep 2, 2025
Merged

Add contains method to BytesType #126

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
790b1a7
Add contains method to BytesType
stefanvanburen Jul 25, 2025
b6062e8
Merge remote-tracking branch 'upstream/main' into svanburen/contains-…
hudlow Sep 2, 2025
a4a87c4
Fix cast and test
stefanvanburen Sep 2, 2025
c66378c
Use single quotes
stefanvanburen Sep 2, 2025
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
3 changes: 3 additions & 0 deletions src/celpy/celtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,9 @@ def __new__(
def __repr__(self) -> str:
return f"{self.__class__.__name__}({super().__repr__()})"

def contains(self, item: Value) -> BoolType:
return BoolType(cast(StringType, item) in self)
Copy link
Collaborator

@hudlow hudlow Sep 2, 2025

Choose a reason for hiding this comment

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

This isn't passing tests (for me, or in CI) Perhaps we should do this instead?

Suggested change
return BoolType(cast(StringType, item) in self)
return BoolType(BytesType(item) in self)

Copy link
Collaborator

@hudlow hudlow Sep 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Or maybe you meant for this to be cast(BytesType, item) but if so you'd want to do assert b_0.contains(b"byte") below...

Copy link
Collaborator

@hudlow hudlow Sep 2, 2025

Choose a reason for hiding this comment

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

Okay, did a bit more testing, and it seems like this is what's necessary to appease the type checker (and what's consistent with other examples of contains()):

Suggested change
return BoolType(cast(StringType, item) in self)
return BoolType(cast(bytes, item) in cast(bytes, self))

Copy link
Contributor Author

@stefanvanburen stefanvanburen Sep 2, 2025

Choose a reason for hiding this comment

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

hm, I'm mostly basing this on the StringType impl; why do we need to cast to bytes instead?

Copy link
Collaborator

@hudlow hudlow Sep 2, 2025

Choose a reason for hiding this comment

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

@stefanvanburen logically, a string is a sequence of Unicode code points and there is always an encoding choice to be made to represent it as bytes.



class DoubleType(float):
"""
Expand Down
1 change: 1 addition & 0 deletions tests/test_celtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def test_bytes_type():
assert repr(b_0) == "BytesType(b'bytes')"
assert BytesType(None) == BytesType(b'')
assert BytesType(MessageType({"value": BytesType(b'42')})) == BytesType(b'42')
assert b_0.contains("byte")


def test_double_type():
Expand Down
Loading