Merge pull request #7 from Decompollaborate/develop

2.0.1

Author: AngheloAlf

pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "mapfile_parser"
-version = "2.0.0"
+version = "2.0.1"
 description = "Map file parser library focusing decompilation projects"
 readme = "README.md"
 requires-python = ">=3.7"

src/mapfile_parser/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 0, 0)
+__version_info__ = (2, 0, 1)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "Decompollaborate"
 

src/mapfile_parser/mapfile.py

@@ -7,7 +7,7 @@
 
 import dataclasses
 import re
-from typing import Generator
+from typing import Any, Generator
 from pathlib import Path
 
 from .progress_stats import ProgressStats
@@ -75,8 +75,8 @@ def printAsCsv(self):
         print(f"{self.name},{self.vram:08X},{self.size}")
 
 
-    def toJson(self) -> dict:
-        result = {
+    def toJson(self) -> dict[str, Any]:
+        result: dict[str, Any] = {
             "name": self.name,
             "vram": self.getVramStr(),
             "size": self.serializeSize(),
@@ -86,6 +86,16 @@ def toJson(self) -> dict:
         return result
 
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Symbol):
+            return False
+        return self.name == other.name and self.vram == other.vram
+
+    # https://stackoverflow.com/a/56915493/6292472
+    def __hash__(self):
+        return hash((self.name, self.vram))
+
+
 @dataclasses.dataclass
 class File:
     filepath: Path
@@ -182,8 +192,8 @@ def printAsCsv(self, printVram: bool=True):
         print(f"{self.filepath},{self.sectionType},{symCount},{maxSize},{self.size},{averageSize:0.2f}")
 
 
-    def toJson(self) -> dict:
-        fileDict: dict = {
+    def toJson(self) -> dict[str, Any]:
+        fileDict: dict[str, Any] = {
             "filepath": str(self.filepath),
             "sectionType": self.sectionType,
             "vram": self.serializeVram(),
@@ -212,6 +222,15 @@ def __setitem__(self, index, sym: Symbol):
     def __len__(self) -> int:
         return len(self._symbols)
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, File):
+            return False
+        return self.filepath == other.filepath
+
+    # https://stackoverflow.com/a/56915493/6292472
+    def __hash__(self):
+        return hash((self.filepath,))
+
 
 @dataclasses.dataclass
 class Segment:
@@ -314,8 +333,8 @@ def printSymbolsCsv(self):
         return
 
 
-    def toJson(self) -> dict:
-        segmentDict: dict = {
+    def toJson(self) -> dict[str, Any]:
+        segmentDict: dict[str, Any] = {
             "name": self.name,
             "vram": self.serializeVram(),
             "size": self.serializeSize(),
@@ -341,6 +360,15 @@ def __getitem__(self, index) -> File:
     def __len__(self) -> int:
         return len(self._filesList)
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Segment):
+            return False
+        return self.name == other.name and self.vram == other.vram and self.size == other.size and self.vrom == other.vrom
+
+    # https://stackoverflow.com/a/56915493/6292472
+    def __hash__(self):
+        return hash((self.name, self.vram, self.size, self.vrom))
+
 
 class MapFile:
     def __init__(self):
@@ -623,12 +651,12 @@ def printSymbolsCsv(self):
         return
 
 
-    def toJson(self) -> dict:
+    def toJson(self) -> dict[str, Any]:
         segmentsList = []
         for segment in self._segmentsList:
             segmentsList.append(segment.toJson())
 
-        result = {
+        result: dict[str, Any] = {
             "segments": segmentsList
         }
         return result