Skip to content

Reduce branches in PyUnicode_MAX_CHAR_VALUE #92142

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

Closed
kumaraditya303 wants to merge 3 commits into from
Closed

Reduce branches in PyUnicode_MAX_CHAR_VALUE #92142

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca2513a
reduce branches
kumaraditya303 May 2, 2022
fa06bb0
old style
kumaraditya303 May 2, 2022
2782355
const
kumaraditya303 May 2, 2022
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
Next Next commit
reduce branches
  • Loading branch information
@kumaraditya303
kumaraditya303 authored May 2, 2022
commit ca2513ad149700db62faa17c5a084a946d733ea2
18 changes: 9 additions & 9 deletions Include/cpython/unicodeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,17 +436,17 @@ static inline Py_UCS4 PyUnicode_MAX_CHAR_VALUE(PyObject *op)
if (PyUnicode_IS_ASCII(op)) {
return 0x7fU;
}

static const Py_UCS4 max_char_values[] = {
[PyUnicode_1BYTE_KIND] = 0xffU,

@gvanrossum gvanrossum May 2, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

So just do it the oldfashioned way?

@kumaraditya303 kumaraditya303 May 2, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done but I wanted to use designated initializer, it looks better

[PyUnicode_2BYTE_KIND] = 0xffffU,
[PyUnicode_4BYTE_KIND] = 0x10ffffU,
};

@gvanrossum gvanrossum May 3, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since kind is 3 bits, maybe add extra zero entries for a total of 8?

unsigned int kind = PyUnicode_KIND(op);
if (kind == PyUnicode_1BYTE_KIND) {
return 0xffU;
}
if (kind == PyUnicode_2BYTE_KIND) {
return 0xffffU;
}
assert(kind == PyUnicode_4BYTE_KIND);
return 0x10ffffU;
const Py_UCS4 value = max_char_values[kind];
assert(value);
return value;
}

#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
# define PyUnicode_MAX_CHAR_VALUE(op) \
PyUnicode_MAX_CHAR_VALUE(_PyObject_CAST(op))
Expand Down