Skip to content

Fix expander #24

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
not522 merged 1 commit into from
Sep 20, 2020
Merged

Fix expander #24

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
32 changes: 16 additions & 16 deletions atcoder/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def import_module(self, import_from: Optional[str], name: str,
imports = iter_child_nodes(ast.parse(source))

import_lines = []
import_list = []
for import_info in imports:
result += self.import_module(
import_info.import_from, import_info.name,
Expand All @@ -78,11 +77,6 @@ def import_module(self, import_from: Optional[str], name: str,
import_info.end_lineno):
import_lines.append(line)

if import_info.import_from is None:
import_list.append(import_info.name)
else:
import_list.append(import_info.import_from)

for lineno, line in enumerate(lines):
if lineno not in import_lines:
continue
Expand All @@ -97,18 +91,24 @@ def import_module(self, import_from: Optional[str], name: str,
result += '\n'.join(lines)
result += '"""\n\n'
result += f"{module_name} = types.ModuleType('{module_name}')\n"
result += f'exec({code}, {module_name}.__dict__)\n'

# TODO(not): asname
imported = []
for import_ in import_list:
modules = import_.split('.')
for i in range(len(modules)):
import_name = '.'.join(modules[:i + 1])
if import_name in imported:
continue
imported.append(import_name)
result += f"{module_name}.__dict__['{import_name}']" \
f" = {import_name}\n"
for import_info in imports:
if import_info.import_from is None:
modules = import_info.name.split('.')
for i in range(len(modules)):
import_name = '.'.join(modules[:i + 1])
if import_name in imported:
continue
imported.append(import_name)
result += f"{module_name}.__dict__['{import_name}']" \
f" = {import_name}\n"
else:
result += f"{module_name}.__dict__['{import_info.name}']" \
f" = {import_info.import_from}.{import_info.name}\n"

result += f'exec({code}, {module_name}.__dict__)\n'

if import_from is None:
if asname is None:
Expand Down