Skip to content

Don't use short names that the user has reserved #98

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Don't use short names that the user has reserved #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
123f93c
Don't use short names that the user has reserved.
luchak Apr 9, 2022
978f957
Handle no kept names case
luchak Apr 9, 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
6 changes: 3 additions & 3 deletions pico8/lua/lua.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ def __init__(self,
self._next_name_id = 0

self._keep_all_names = keep_all_names
self._names_to_keep = None
self._names_to_keep = set()

if keep_property_names:
# TODO: crawl file for property names, define self._names_to_keep
Expand Down Expand Up @@ -1316,15 +1316,15 @@ def get_short_name(self, name):
return name
if name in MinifyNameFactory.PRESERVED_NAMES:
return name
if self._names_to_keep is not None and name in self._names_to_keep:
if name in self._names_to_keep:
return name

if name not in self._name_map:
new_name = None
while True:
new_name = self._name_for_id(self._next_name_id)
self._next_name_id += 1
if new_name not in MinifyNameFactory.PRESERVED_NAMES:
if (new_name not in MinifyNameFactory.PRESERVED_NAMES) and (new_name not in self._names_to_keep):
break
self._name_map[name] = new_name
util.debug('- minifying name "{}" to "{}"\n'.format(
Expand Down