Skip to content

Updates name template for compatibility with Cython #38

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

Open
george-kuanli-peng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates name template for compatibility with Cython #38

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
26 changes: 16 additions & 10 deletions walrus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,15 @@ def predicate(filename: str) -> bool:
# Main Conversion Implementation

# walrus wrapper template

# NAME_TEMPLATE = '''\
# if False:
# %(indentation)s%(name_list)s = NotImplemented
# '''.splitlines() # `str.splitlines` will remove trailing newline
# make it Cython compilable
NAME_TEMPLATE = '''\
if False:
%(indentation)s%(name_list)s = NotImplemented
if '%(name)s' not in dir():
%(indentation)s%(name)s = NotImplemented
'''.splitlines() # `str.splitlines` will remove trailing newline
CALL_TEMPLATE = '_walrus_wrapper_%(name)s_%(uuid)s(%(expr)s)'
FUNC_TEMPLATE = '''\
Expand Down Expand Up @@ -1017,10 +1023,10 @@ def _concat(self) -> None:
else:
linesep = ''
if self._vars:
name_list = ' = '.join(sorted(set(self._vars)))
self._buffer += indent + (
'%s%s' % (self._linesep, indent)
).join(NAME_TEMPLATE) % dict(indentation=self._indentation, name_list=name_list) + self._linesep
for name in sorted(set(self._vars)):
self._buffer += indent + (
'%s%s' % (self._linesep, indent)
).join(NAME_TEMPLATE) % dict(indentation=self._indentation, name=name) + self._linesep
for func in sorted(self._func, key=lambda func: func['name']):
if self._buffer:
self._buffer += linesep
Expand Down Expand Up @@ -1205,10 +1211,10 @@ def _concat(self) -> None:
else:
linesep = ''
if self._vars:
name_list = ' = '.join(sorted(set(self._vars)))
self._buffer += indent + (
'%s%s' % (self._linesep, indent)
).join(NAME_TEMPLATE) % dict(indentation=self._indentation, name_list=name_list) + self._linesep
for name in sorted(set(self._vars)):
self._buffer += indent + (
'%s%s' % (self._linesep, indent)
).join(NAME_TEMPLATE) % dict(indentation=self._indentation, name=name) + self._linesep
for func in sorted(self._func, key=lambda func: func['name']):
if self._buffer:
self._buffer += linesep
Expand Down