-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
refactor: squash modules into one to enable optimizations #16
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,87 @@ | ||
from __future__ import annotations | ||
|
||
from .patterns import NoMatch, Pattern | ||
from .sugar import match, var | ||
import sys | ||
|
||
__all__ = ["NoMatch", "Pattern", "match", "var"] | ||
from ._internal import * | ||
|
||
|
||
class _Variable(Deferred): | ||
def __init__(self, name: str): | ||
builder = Var(name) | ||
super().__init__(builder) | ||
|
||
def __invert__(self): | ||
return Capture(self) | ||
|
||
|
||
class _Namespace: | ||
"""Convenience class for creating patterns for various types from a module. | ||
|
||
Useful to reduce boilerplate when creating patterns for various types from | ||
a module. | ||
|
||
Parameters | ||
---------- | ||
factory | ||
The pattern to construct with the looked up types. | ||
module | ||
The module object or name to look up the types. | ||
|
||
""" | ||
|
||
__slots__ = ("_factory", "_module") | ||
|
||
def __init__(self, factory, module): | ||
if isinstance(module, str): | ||
module = sys.modules[module] | ||
self._module = module | ||
self._factory = factory | ||
|
||
def __getattr__(self, name: str): | ||
obj = getattr(self._module, name) | ||
return self._factory(obj) | ||
|
||
|
||
def var(name): | ||
return _Variable(name) | ||
|
||
|
||
def match(pat: Pattern, value: Any, context: Context = None) -> Any: | ||
"""Match a value against a pattern. | ||
|
||
Parameters | ||
---------- | ||
pat | ||
The pattern to match against. | ||
value | ||
The value to match. | ||
context | ||
Arbitrary mapping of values to be used while matching. | ||
|
||
Returns | ||
------- | ||
The matched value if the pattern matches, otherwise :obj:`NoMatch`. | ||
|
||
Examples | ||
-------- | ||
>>> assert match(Any(), 1) == 1 | ||
>>> assert match(1, 1) == 1 | ||
>>> assert match(1, 2) is NoMatch | ||
>>> assert match(1, 1, context={"x": 1}) == 1 | ||
>>> assert match(1, 2, context={"x": 1}) is NoMatch | ||
>>> assert match([1, int], [1, 2]) == [1, 2] | ||
>>> assert match([1, int, "a" @ InstanceOf(str)], [1, 2, "three"]) == [ | ||
... 1, | ||
... 2, | ||
... "three", | ||
... ] | ||
|
||
""" | ||
pat = pattern(pat) | ||
return pat.apply(value, context) | ||
|
||
|
||
_ = var("_") | ||
|
||
|
||
# define __all__ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
from __future__ import annotations | ||
|
||
from .annots import * | ||
from .builders import * | ||
from .patterns import * | ||
|
||
compiled = False |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't able to cimport from pure python cythonized modules even with agumenting pxd files, so I started to move over to pure cython syntax, but the development time has increased which made me value fast iterations during development even more.
So I had to come up with a solution so that the implementation is being split into modules (easier maintanence) but still profit from the timing. The solution was to squash all the python files into a single one before cythonizing, in order to make it work the internal imports must be removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we'll see whether this becomes a burden long term. For now, the solution seems good!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is already a feature request on cython's side, hopefully this will be fixed in the meantime cython/cython#4892