From bb93e655ad4a387ea893be1ee9d52fe5a45357c8 Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 4 Feb 2024 00:14:58 -0300 Subject: [PATCH 1/2] Fix `MapFile.compareFilesAndSymbols` reporting the wrong address as the expected address. --- CHANGELOG.md | 5 +++++ Cargo.toml | 2 +- pyproject.toml | 2 +- src/mapfile_parser/__init__.py | 2 +- src/mapfile_parser/mapfile.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b75340a..d262fed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Fix `MapFile.compareFilesAndSymbols` reporting the wrong address as the + expected address. + ## [2.3.4] - 2024-01-26 ### Changed diff --git a/Cargo.toml b/Cargo.toml index 5f39bc0..8a1698b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "mapfile_parser" -version = "2.3.4" +version = "2.3.5" edition = "2021" authors = ["Anghelo Carvajal "] description = "Map file parser library focusing decompilation projects" diff --git a/pyproject.toml b/pyproject.toml index c2d52ab..3ac2e05 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ [project] name = "mapfile_parser" -version = "2.3.4" +version = "2.3.5" description = "Map file parser library focusing decompilation projects" readme = "README.md" requires-python = ">=3.7" diff --git a/src/mapfile_parser/__init__.py b/src/mapfile_parser/__init__.py index a2028d4..44a92b8 100644 --- a/src/mapfile_parser/__init__.py +++ b/src/mapfile_parser/__init__.py @@ -5,7 +5,7 @@ from __future__ import annotations -__version_info__ = (2, 3, 3) +__version_info__ = (2, 3, 5) __version__ = ".".join(map(str, __version_info__)) __author__ = "Decompollaborate" diff --git a/src/mapfile_parser/mapfile.py b/src/mapfile_parser/mapfile.py index 8109dd2..b9aa284 100644 --- a/src/mapfile_parser/mapfile.py +++ b/src/mapfile_parser/mapfile.py @@ -695,7 +695,7 @@ def compareFilesAndSymbols(self, otherMapFile: MapFile, *, checkOtherOnSelf: boo for symbol in file: foundSymInfo = otherMapFile.findSymbolByName(symbol.name) if foundSymInfo is not None: - comp = SymbolComparisonInfo(symbol, symbol.vram, file, symbol.vram, foundSymInfo.file, symbol.vram - foundSymInfo.symbol.vram) + comp = SymbolComparisonInfo(symbol, symbol.vram, file, foundSymInfo.symbol.vram, foundSymInfo.file, symbol.vram - foundSymInfo.symbol.vram) compInfo.comparedList.append(comp) if comp.diff != 0: compInfo.badFiles.add(file) From 91cf91e8622ee5a10c1bf50b3c07cb289105ad15 Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 4 Feb 2024 00:16:51 -0300 Subject: [PATCH 2/2] version bump --- CHANGELOG.md | 3 +++ README.md | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d262fed..c4db657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.3.5] - 2024-02-04 + ### Fixed - Fix `MapFile.compareFilesAndSymbols` reporting the wrong address as the @@ -312,6 +314,7 @@ Full changes: =2.3.4,<3.0.0 +mapfile_parser>=2.3.5,<3.0.0 ``` #### Development version @@ -74,7 +74,7 @@ cargo add mapfile_parser Or add the following line manually to your `Cargo.toml` file: ```toml -mapfile_parser = "2.3.4" +mapfile_parser = "2.3.5" ``` ## Versioning and changelog