enhance code

Author: mr-tz

floss/qs/main.py

@@ -483,18 +483,18 @@ def check_is_xor(xor_key: int | None):
 
 
 class OffsetRanges:
-    def __init__(self, offsets: Set[int]):
+    def __init__(self, offsets: Optional[Set[int]] = None, *, _merged_ranges: Optional[List[Tuple[int, int]]] = None):
+        if _merged_ranges is not None:
+            self._ranges = _merged_ranges
+            return
+
         if not offsets:
             self._ranges: List[Tuple[int, int]] = []
             return
 
         sorted_offsets = sorted(list(offsets))
 
         ranges: List[Tuple[int, int]] = []
-        if not sorted_offsets:
-            self._ranges = ranges
-            return
-
         start = sorted_offsets[0]
         end = start
         for offset in sorted_offsets[1:]:
@@ -553,9 +553,8 @@ def overlaps(self, start: int, end: int) -> bool:
 
     @classmethod
     def from_merged_ranges(cls, merged_ranges: List[Tuple[int, int]]):
-        instance = cls.__new__(cls)
-        instance._ranges = merged_ranges
-        return instance
+        return cls(_merged_ranges=merged_ranges)
+
 
 def check_is_reloc(reloc_offsets: OffsetRanges, string: ExtractedString):
     if reloc_offsets.overlaps(string.slice.range.offset, string.slice.range.end - 1):

tests/test_qs_pma0101.py

@@ -84,11 +84,9 @@ def test_data_strings(pma0101_layout):
 
 def test_strings(pma0101_layout):
     all_strings = collect_strings(pma0101_layout)
-    import json
 
-    print(all_strings)
     assert len(all_strings) == 21
 
-    # Assert that there are 24 strings that are not tagged as #code or #reloc
+    # assert count of expected strings not tagged as #code or #reloc
     filtered_strings = [s for s in all_strings if not s.tags.intersection({"#code", "#reloc"})]
     assert len(filtered_strings) == 17