From 123f93cb3ee482caca775482ccff823d1c1c4984 Mon Sep 17 00:00:00 2001 From: Matt Stanton Date: Fri, 8 Apr 2022 21:43:25 -0700 Subject: [PATCH 1/2] Don't use short names that the user has reserved. --- pico8/lua/lua.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico8/lua/lua.py b/pico8/lua/lua.py index cd10be5..81dd3ae 100644 --- a/pico8/lua/lua.py +++ b/pico8/lua/lua.py @@ -1324,7 +1324,7 @@ def get_short_name(self, name): 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( From 978f9577cef8d90ed045d3e500129d91f3c2ac4f Mon Sep 17 00:00:00 2001 From: Matt Stanton Date: Fri, 8 Apr 2022 21:57:14 -0700 Subject: [PATCH 2/2] Handle no kept names case --- pico8/lua/lua.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pico8/lua/lua.py b/pico8/lua/lua.py index 81dd3ae..5efda11 100644 --- a/pico8/lua/lua.py +++ b/pico8/lua/lua.py @@ -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 @@ -1316,7 +1316,7 @@ 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: