Make more compact float literals

dflook · dflook · commit 6065c1a70f4f · 2023-04-07T21:56:20.000+01:00
diff --git a/corpus_test/generate_report.py b/corpus_test/generate_report.py
@@ -2,10 +2,12 @@
 import os
 import sys
 from dataclasses import dataclass, field
-from typing import Iterable, Callable
+from typing import Iterable
 
 from result import Result, ResultReader
 
+ENHANCED_REPORT = False
+
 @dataclass
 class ResultSet:
     python_version: str
@@ -194,6 +196,40 @@ def format_size_change_detail() -> str:
             f'| {format_difference(summary.exception(), base_summary.exception())} '
         )
 
+    if ENHANCED_REPORT:
+        yield '''
+## Larger than original
+
+| Corpus Entry | Original Size | Minified Size |
+|--------------|--------------:|--------------:|'''
+
+        for python_version in ['3.11']:
+            summary = result_summary(results_dir, python_version, minifier_sha)
+            larger_than_original = sorted(summary.larger_than_original(), key=lambda result: result.original_size)
+
+            for entry in larger_than_original:
+                yield f'| {entry.corpus_entry} | {entry.original_size} | {entry.minified_size} ({entry.minified_size - entry.original_size:+}) |'
+
+        yield '''
+## Top 10 Larger than base
+
+| Corpus Entry | Original Size | Minified Size |
+|--------------|--------------:|--------------:|'''
+
+        there_are_some_larger_than_base = False
+
+        for python_version in ['3.11']:
+            summary = result_summary(results_dir, python_version, minifier_sha)
+            base_summary = result_summary(results_dir, python_version, base_sha)
+            larger_than_original = sorted(summary.compare_size_increase(base_summary), key=lambda result: result.original_size)[:10]
+
+            for entry in larger_than_original:
+                there_are_some_larger_than_base = True
+                yield f'| {entry.corpus_entry} | {entry.original_size} | {entry.minified_size} ({entry.minified_size - base_summary.entries[entry.corpus_entry].minified_size:+}) |'
+
+        if not there_are_some_larger_than_base:
+            yield '| N/A | N/A | N/A |'
+
 def main():
     parser = argparse.ArgumentParser(description='Generate a test report for a given python-minifier ref')
     parser.add_argument('results_dir', type=str, help='Path to results directory', default='results')
diff --git a/src/python_minifier/expression_printer.py b/src/python_minifier/expression_printer.py
@@ -1,4 +1,5 @@
 import ast
+import re
 import sys
 
 from python_minifier.util import is_ast_node
@@ -98,7 +99,7 @@ def visit_Unknown(self, node):
     # region Literals
 
     def visit_Constant(self, node):
-        if node.value in [None, True, False]:
+        if node.value is None or node.value is True or node.value is False:
             return self.visit_NameConstant(node)
         elif isinstance(node.value, (int, float, complex)):
             return self.visit_Num(node)
@@ -133,8 +134,19 @@ def visit_Num(self, node):
                 if len(h) < len(v):
                     v = h
 
-            if v.startswith('0.'):
-                v = v[1:]
+            # Python doesn't print very compact float literals,
+            # so we'll try to make them a bit more compact
+            if isinstance(node.n, float):
+                v = v.replace('e+', 'e')
+
+                add_e = re.match(r'^(\d+?)(0+).0$', v)
+                if add_e:
+                    v = add_e.group(1) + 'e' + str(len(add_e.group(2)))
+
+                if v.startswith('0.'):
+                    v = v[1:]
+                elif v.endswith('.0'):
+                    v = v[:-1]
 
             self.code += v
 
