nikto_b/breakshaft
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Releases Wiki Activity

Fix renderer deduplicate_callseq duplicates slips

Browse Source
This commit is contained in:
Артур Шевченко
2025-09-14 01:55:47 +03:00
parent 27939ef3ea
commit dbecef1977
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyproject.toml
View File

@@ -1,6 +1,6 @@
[project] [project]
name = "breakshaft" name = "breakshaft"
version = "0.1.6.post3" version = "0.1.6.post4"
description = "Library for in-time codegen for type conversion" description = "Library for in-time codegen for type conversion"
authors = [ authors = [
{ name = "nikto_b", email = "niktob560@yandex.ru" } { name = "nikto_b", email = "niktob560@yandex.ru" }

5
src/breakshaft/renderer.py
View File

@@ -88,9 +88,11 @@ class ConversionArgRenderData:
def deduplicate_callseq(conversion_models: list[ConversionRenderData]) -> list[ConversionRenderData]: def deduplicate_callseq(conversion_models: list[ConversionRenderData]) -> list[ConversionRenderData]:
deduplicated_conv_models: list[ConversionRenderData] = [] deduplicated_conv_models: list[ConversionRenderData] = []
deduplicated_hashes = set()
for conv_model in conversion_models: for conv_model in conversion_models:
if conv_model not in deduplicated_conv_models: if hash((conv_model.inj_hash, conv_model.funchash)) not in deduplicated_hashes:
deduplicated_conv_models.append(conv_model) deduplicated_conv_models.append(conv_model)
deduplicated_hashes.add(hash((conv_model.inj_hash, conv_model.funchash)))
continue continue
argnames = list(map(lambda x: x[1], conv_model.funcargs)) argnames = list(map(lambda x: x[1], conv_model.funcargs))
@@ -105,6 +107,7 @@ def deduplicate_callseq(conversion_models: list[ConversionRenderData]) -> list[C
break break
if argument_changed: if argument_changed:
deduplicated_conv_models.append(conv_model) deduplicated_conv_models.append(conv_model)
deduplicated_hashes.add(hash((conv_model.inj_hash, conv_model.funchash)))
return deduplicated_conv_models return deduplicated_conv_models

20
src/breakshaft/util.py
View File

@@ -134,9 +134,21 @@ def is_basic_type_annot(type_annot) -> bool:
def universal_qualname(any: Any) -> str: def universal_qualname(any: Any) -> str:
ret = ''
if hasattr(any, '__qualname__'): if hasattr(any, '__qualname__'):
return any.__qualname__ ret = any.__qualname__
if hasattr(any, '__name__'): elif hasattr(any, '__name__'):
return any.__name__ ret = any.__name__
else:
ret = str(any)
return str(any) ret = (ret
.replace('.', '_')
.replace('[', '_of_')
.replace(']', '_of_')
.replace(',', '_and_')
.replace(' ', '_')
.replace('\'', '')
.replace('<', '')
.replace('>', ''))
return ret