mapfile-parser 2.4.0__tar.gz → 2.5.1__tar.gz

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/.gitignore

@@ -170,4 +170,3 @@ cython_debug/
 # Added by cargo
 
 /target
-/Cargo.lock

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/CHANGELOG.md

@@ -7,6 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.5.1] - 2024-08-09
+
+### Fixed
+
+- Fix Github Action file.
+
+## [2.5.0] - 2024-08-09
+
+### Added
+
+- Add Minimal Supported Rust Version (MSRV) to Cargo.toml.
+- Add `MapFile::new_from_map_file` function to simplify `MapFile` creation.
+- Add `serde` feature to the Rust crate.
+  - Allows serializing and deserializing a `MapFile` object using serde.
+
+### Changed
+
+- Tweak symbol comparison logic a bit.
+  - Symbol shifting (due to different sizes or extra/missing symbols) should
+    not affect comparing non shifted files.
+- `Cargo.lock` file is now committed to the repo.
+- Change Rust functions to properly take references instead of consuming the
+  argument.
+
+### Fixed
+
+- Fix `MapFile::find_lowest_differing_symbol` not returning a previous symbol
+  from a previous file if the symbol found is the first symbol from the file.
+
 ## [2.4.0] - 2024-03-25
 
 ### Added
@@ -343,6 +372,8 @@ Full changes: <https://github.com/Decompollaborate/mapfile_parser/compare/702a73
 - Initial release
 
 [unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/master...develop
+[2.5.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.5.0...2.5.1
+[2.5.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.4.0...2.5.0
 [2.4.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.7...2.4.0
 [2.3.7]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.6...2.3.7
 [2.3.6]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.5...2.3.6

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/Cargo.lock

@@ -13,15 +13,15 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "cfg-if"
@@ -43,21 +43,21 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -65,24 +65,25 @@ dependencies = [
 
 [[package]]
 name = "mapfile_parser"
-version = "2.4.0"
+version = "2.5.1"
 dependencies = [
  "lazy_static",
  "pyo3",
  "regex",
+ "serde",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
@@ -95,9 +96,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -105,9 +106,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
@@ -118,15 +119,15 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -196,27 +197,27 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -226,9 +227,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -237,9 +238,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "scopeguard"
@@ -247,6 +248,26 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "serde"
+version = "1.0.205"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.205"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -255,9 +276,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.55"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -266,9 +287,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "unicode-ident"
@@ -284,13 +305,14 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
 
 [[package]]
 name = "windows-targets"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
+ "windows_i686_gnullvm",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
@@ -299,42 +321,48 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/Cargo.toml

@@ -3,12 +3,12 @@
 
 [package]
 name = "mapfile_parser"
-version = "2.4.0"
+version = "2.5.1"
 edition = "2021"
+rust-version = "1.65.0"
 authors = ["Anghelo Carvajal <angheloalf95@gmail.com>"]
 description = "Map file parser library focusing decompilation projects"
 readme = "README.md"
-homepage = "https://github.com/Decompollaborate/mapfile_parser"
 repository = "https://github.com/Decompollaborate/mapfile_parser"
 license = "MIT"
 keywords = ["mapfile", "parser", "decomp", "decompilation"]
@@ -25,6 +25,8 @@ crate-type = ["cdylib", "staticlib", "rlib"]
 regex = "1.10.2"
 pyo3 = { version = "0.20.0", optional = true, features = ["abi3", "abi3-py37"]}
 lazy_static = "1.4.0"
+serde = { version = "1.0", features = ["derive"], optional = true }
 
 [features]
 python_bindings = ["dep:pyo3"]
+serde = ["dep:serde"]

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mapfile_parser
-Version: 2.4.0
+Version: 2.5.1
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -8,7 +8,6 @@ Requires-Dist: requests
 License-File: LICENSE
 Summary: Map file parser library focusing decompilation projects
 Keywords: mapfile,parser,decomp,decompilation
-Home-Page: https://github.com/Decompollaborate/mapfile_parser
 Author: Anghelo Carvajal <angheloalf95@gmail.com>
 Author-email: Anghelo Carvajal <angheloalf95@gmail.com>
 License: MIT
@@ -54,7 +53,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-mapfile_parser>=2.4.0,<3.0.0
+mapfile_parser>=2.5.1,<3.0.0
 ```
 
 #### Development version
@@ -93,7 +92,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.4.0"
+mapfile_parser = "2.5.1"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/README.md

@@ -35,7 +35,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-mapfile_parser>=2.4.0,<3.0.0
+mapfile_parser>=2.5.1,<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.4.0"
+mapfile_parser = "2.5.1"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/pyproject.toml

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

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/src/mapfile_parser/__init__.py

@@ -5,8 +5,8 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 4, 0)
-__version__ = ".".join(map(str, __version_info__))
+__version_info__ = (2, 5, 1)
+__version__ = ".".join(map(str, __version_info__))# + "-dev0"
 __author__ = "Decompollaborate"
 
 from . import utils as utils

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/src/mapfile_parser/mapfile.py

@@ -50,7 +50,28 @@ class SymbolComparisonInfo:
     buildFile: File|None
     expectedAddress: int
     expectedFile: File|None
-    diff: int|None
+
+    @property
+    def diff(self) -> int|None:
+        if self.buildAddress < 0:
+            return None
+        if self.expectedAddress < 0:
+            return None
+
+        buildAddress = self.buildAddress
+        expectedAddress = self.expectedAddress
+
+        # If both symbols are present in the same file then we do a diff
+        # between their offsets into their respectives file.
+        # This is done as a way to avoid too much noise in case an earlier file
+        # did shift.
+        if self.buildFile is not None and self.expectedFile is not None:
+            if self.buildFile.filepath == self.expectedFile.filepath:
+                buildAddress -= self.buildFile.vram
+                expectedAddress -= self.expectedFile.vram
+
+        return buildAddress - expectedAddress
+
 
 class MapsComparisonInfo:
     def __init__(self):
@@ -593,9 +614,10 @@ class MapFile:
     def findLowestDifferingSymbol(self, otherMapFile: MapFile) -> tuple[Symbol, File, Symbol|None]|None:
         minVram = None
         found = None
-        for builtSegement in self._segmentsList:
-            for builtFile in builtSegement:
-                for i, builtSym in enumerate(builtFile):
+        foundIndices = (0, 0)
+        for i, builtSegement in enumerate(self._segmentsList):
+            for j, builtFile in enumerate(builtSegement):
+                for k, builtSym in enumerate(builtFile):
                     expectedSymInfo = otherMapFile.findSymbolByName(builtSym.name)
                     if expectedSymInfo is None:
                         continue
@@ -605,9 +627,38 @@ class MapFile:
                         if minVram is None or builtSym.vram < minVram:
                             minVram = builtSym.vram
                             prevSym = None
-                            if i > 0:
-                                prevSym = builtFile[i-1]
+                            if k > 0:
+                                prevSym = builtFile[k-1]
                             found = (builtSym, builtFile, prevSym)
+                            foundIndices = (i, j)
+
+        if found is not None and found[2] is None:
+            # Previous symbol was not in the same section of the given
+            # file, so we try to backtrack until we find any symbol.
+
+            foundBuiltSym, foundBuiltFile, _ = found
+            i, j = foundIndices
+
+            # We want to check the previous file, not the current one,
+            # since we already know the current one doesn't have a symbol
+            # preceding the one we found.
+            j -= 1;
+
+            while i >= 0:
+                builtSegment = self[i]
+                while j >= 0:
+                    builtFile = builtSegment[j]
+
+                    if len(builtFile) > 0:
+                        found = (foundBuiltSym, foundBuiltFile, builtFile[-1])
+                        i = -1
+                        j = -1
+                        break
+                    j -= 1
+                i -= 1
+                if i >= 0:
+                    j = len(self[i]) - 1
+
         return found
 
 
@@ -695,13 +746,13 @@ class MapFile:
                 for symbol in file:
                     foundSymInfo = otherMapFile.findSymbolByName(symbol.name)
                     if foundSymInfo is not None:
-                        comp = SymbolComparisonInfo(symbol, symbol.vram, file, foundSymInfo.symbol.vram, foundSymInfo.file, symbol.vram - foundSymInfo.symbol.vram)
+                        comp = SymbolComparisonInfo(symbol, symbol.vram, file, foundSymInfo.symbol.vram, foundSymInfo.file)
                         compInfo.comparedList.append(comp)
                         if comp.diff != 0:
                             compInfo.badFiles.add(file)
                     else:
                         compInfo.missingFiles.add(file)
-                        compInfo.comparedList.append(SymbolComparisonInfo(symbol, symbol.vram, file, -1, None, None))
+                        compInfo.comparedList.append(SymbolComparisonInfo(symbol, symbol.vram, file, -1, None))
 
         if checkOtherOnSelf:
             for segment in otherMapFile:
@@ -710,7 +761,7 @@ class MapFile:
                         foundSymInfo = self.findSymbolByName(symbol.name)
                         if foundSymInfo is None:
                             compInfo.missingFiles.add(file)
-                            compInfo.comparedList.append(SymbolComparisonInfo(symbol, -1, None, symbol.vram, file, None))
+                            compInfo.comparedList.append(SymbolComparisonInfo(symbol, -1, None, symbol.vram, file))
 
         return compInfo
 

{mapfile_parser-2.4.0 → mapfile_parser-2.5.1}/src/mapfile_parser/mapfile_parser.pyi

@@ -26,9 +26,10 @@ class SymbolComparisonInfo:
     buildFile: File|None
     expectedAddress: int
     expectedFile: File|None
-    diff: int|None
 
-    def __init__(self, symbol: Symbol, buildAddress: int, buildFile: File|None, expectedAddress: int, expectedFile: File|None, diff: int|None): ...
+    def __init__(self, symbol: Symbol, buildAddress: int, buildFile: File|None, expectedAddress: int, expectedFile: File|None): ...
+
+    def diff(self) -> int|None: ...
 
 class MapsComparisonInfo:
     badFiles: set[File] = set()
@@ -210,6 +211,9 @@ class Segment:
 class MapFile:
     def __init__(self) -> None: ...
 
+    @staticmethod
+    def newFromMapFile(mapPath: Path) -> MapFile: ...
+
     def readMapFile(self, mapPath: Path) -> None: ...
     def parseMapContents(self, mapContents: str) -> None: ...
     def parseMapContentsGNU(self, mapContents: str) -> None: ...