mapfile_parser 2.13.0__tar.gz → 2.13.2__tar.gz

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.13.2] - 2026-08-21
+
+### Fixed
+
+- Avoid emitting zero-sized symbols in objdiff reports.
+
+## [2.13.1] - 2026-08-18
+
+### Fixed
+
+- Fix `first_diff` and some lookup functions grabbing the first existing
+  `.NON_MATCHING` marker instead of the actual symbol.
+
 ## [2.13.0] - 2026-06-28
 
 ### Added
@@ -730,9 +743,10 @@ Full changes: <https://github.com/Decompollaborate/mapfile_parser/compare/702a73
 
 [unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/2.13.0...HEAD
 
-[2.13.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.21.2...2.13.0
-[2.12.2]: https://github.com/Decompollaborate/mapfile_parser/compare/2.21.1...2.12.2
-[2.12.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.21.0...2.12.1
+[2.13.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.13.0...2.13.1
+[2.13.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.12.2...2.13.0
+[2.12.2]: https://github.com/Decompollaborate/mapfile_parser/compare/2.12.1...2.12.2
+[2.12.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.12.0...2.12.1
 [2.12.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.11.0...2.12.0
 [2.11.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.10.0...2.11.0
 [2.10.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.9.4...2.10.0

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/Cargo.lock

@@ -171,7 +171,7 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "mapfile_parser"
-version = "2.13.0"
+version = "2.13.2"
 dependencies = [
  "lazy_static",
  "objdiff-core",

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "mapfile_parser"
-version = "2.13.0"
+version = "2.13.2"
 edition = "2021"
 rust-version = "1.74.0"
 authors = ["Anghelo Carvajal <angheloalf95@gmail.com>"]

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapfile_parser
-Version: 2.13.0
+Version: 2.13.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -51,7 +51,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.12,<3.0.0
+mapfile_parser>=2.13,<3.0.0
 ```
 
 #### Development version

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/README.md

@@ -36,7 +36,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.12,<3.0.0
+mapfile_parser>=2.13,<3.0.0
 ```
 
 #### Development version

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "mapfile_parser"
-version = "2.13.0"
+version = "2.13.2"
 description = "Map file parser library focusing decompilation projects"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -33,3 +33,25 @@ mapfile_parser = "mapfile_parser.__main__:mapfileParserMain"
 features = ["pyo3/extension-module", "python_bindings"]
 # https://github.com/PyO3/maturin/blob/0dee40510083c03607834c821eea76964140a126/Readme.md#mixed-rustpython-projects
 python-source = "src"
+
+[tool.ruff.lint]
+# Keep alphabetically sorted
+# TODO: fix
+ignore = [
+    "B006",
+    "B008",
+    "BLE001",
+    "C408",
+    "EXE001",
+    "EXE005",
+    "FLY002",
+    "PERF402",
+    "PLC0414",
+    "PLR1722",
+    "PLW0127",
+    "PLW0128",
+    "PYI015",
+    "RUF012",
+    "SIM102",
+    "UP028",
+]

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/__init__.py

@@ -5,25 +5,22 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 13, 0)
+__version_info__ = (2, 13, 2)
 __version__ = ".".join(map(str, __version_info__))  # + "-dev0"
 __author__ = "Decompollaborate"
 
+from . import frontends as frontends
 from . import utils as utils
-
+from .mapfile import FoundSymbolInfo as FoundSymbolInfo
 from .mapfile import MapFile as MapFile
-from .mapfile import Symbol as Symbol
+from .mapfile import MapsComparisonInfo as MapsComparisonInfo
+from .mapfile import ReportCategories as ReportCategories
 from .mapfile import Section as Section
 from .mapfile import Segment as Segment
-from .mapfile import FoundSymbolInfo as FoundSymbolInfo
+from .mapfile import Symbol as Symbol
 from .mapfile import SymbolComparisonInfo as SymbolComparisonInfo
-from .mapfile import MapsComparisonInfo as MapsComparisonInfo
-from .mapfile import ReportCategories as ReportCategories
-
 from .progress_stats import ProgressStats as ProgressStats
 
-from . import frontends as frontends
-
 # Renamed types.
 # TODO: remove on version 3.0
 File = Section

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/__main__.py

@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 import argparse
+
 import decomp_settings
 
 import mapfile_parser

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/__init__.py

@@ -5,7 +5,6 @@
 
 from __future__ import annotations
 
-
 from . import bss_check as bss_check
 from . import first_diff as first_diff
 from . import jsonify as jsonify

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/bss_check.py

@@ -7,11 +7,11 @@ from __future__ import annotations
 
 import argparse
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
 
-from .. import mapfile
-from .. import utils
+import decomp_settings
+
+from .. import mapfile, utils
 
 
 def getComparison(

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/first_diff.py

@@ -7,12 +7,12 @@ from __future__ import annotations
 
 import argparse
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
 from typing import Literal
 
-from .. import mapfile
-from .. import utils
+import decomp_settings
+
+from .. import mapfile, utils
 
 
 def doFirstDiff(

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/jsonify.py

@@ -6,11 +6,12 @@
 from __future__ import annotations
 
 import argparse
-from collections.abc import Callable
-import decomp_settings
 import json
+from collections.abc import Callable
 from pathlib import Path
 
+import decomp_settings
+
 from .. import mapfile
 
 

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/objdiff_report.py

@@ -6,14 +6,14 @@
 from __future__ import annotations
 
 import argparse
-from collections.abc import Callable
 import dataclasses
-import decomp_settings
-from pathlib import Path
 import os
+from collections.abc import Callable
+from pathlib import Path
+
+import decomp_settings
 
-from .. import mapfile
-from .. import utils
+from .. import mapfile, utils
 from ..internals import objdiff_report as report_internal
 
 

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/pj64_syms.py

@@ -6,11 +6,12 @@
 from __future__ import annotations
 
 import argparse
+import sys
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
 from typing import TextIO
-import sys
+
+import decomp_settings
 
 from .. import mapfile
 

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/progress.py

@@ -6,13 +6,13 @@
 from __future__ import annotations
 
 import argparse
-from collections.abc import Callable
-import decomp_settings
 import json
+from collections.abc import Callable
 from pathlib import Path
 
-from .. import mapfile
-from .. import progress_stats
+import decomp_settings
+
+from .. import mapfile, progress_stats
 
 
 def getProgress(

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/sym_info.py

@@ -7,12 +7,12 @@ from __future__ import annotations
 
 import argparse
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
 from typing import Generator
 
-from .. import mapfile
-from .. import utils
+import decomp_settings
+
+from .. import mapfile, utils
 
 
 def doSymInfo(

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/symbol_sizes_csv.py

@@ -7,9 +7,10 @@ from __future__ import annotations
 
 import argparse
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
 
+import decomp_settings
+
 from .. import mapfile
 
 

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/frontends/upload_frogress.py

@@ -7,12 +7,12 @@ from __future__ import annotations
 
 import argparse
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
+
+import decomp_settings
 import requests  # type: ignore
 
-from .. import utils
-from .. import progress_stats
+from .. import progress_stats, utils
 from . import progress
 
 

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/internals/objdiff_report.py

@@ -6,8 +6,8 @@
 from __future__ import annotations
 
 import dataclasses
-from pathlib import Path
 import json
+from pathlib import Path
 
 
 @dataclasses.dataclass
@@ -42,8 +42,7 @@ class Report:
         # Calculate the size for the first column
         columnSize = 8
         for name, _ in new_cats:
-            if len(name) > columnSize:
-                columnSize = len(name)
+            columnSize = max(columnSize, len(name))
         columnSize += 1
 
         categoryStr = "{0:<{1}}".format("Category", columnSize)

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/mapfile.py

@@ -5,20 +5,19 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 import dataclasses
 import re
-from typing import Any, Generator
+from collections.abc import Callable
 from pathlib import Path
+from typing import Any, Generator
 
-from .progress_stats import ProgressStats
 from . import utils
-
 from .mapfile_rs import MapFile as MapFileRs
-from .mapfile_rs import Segment as SegmentRs
+from .mapfile_rs import ReportCategories as ReportCategories
 from .mapfile_rs import Section as SectionRs
+from .mapfile_rs import Segment as SegmentRs
 from .mapfile_rs import Symbol as SymbolRs
-from .mapfile_rs import ReportCategories as ReportCategories
+from .progress_stats import ProgressStats
 
 regex_fileDataEntry = re.compile(
     r"^\s+(?P<section>\.[^\s]+)\s+(?P<vram>0x[^\s]+)\s+(?P<size>0x[^\s]+)\s+(?P<name>[^\s]+)$"
@@ -318,6 +317,9 @@ class Section:
         return None
 
     def findSymbolByVram(self, address: int) -> tuple[Symbol, int] | None:
+        if not self.containsVram(address):
+            return None
+
         nonMatchingSym: Symbol | None = None
 
         for sym in self._symbols:
@@ -341,7 +343,7 @@ class Section:
                     nonMatchingSym = sym
                 continue
 
-            if sym.vram < address and address < sym.vram + sym.size:
+            if sym.vram < address < sym.vram + sym.size:
                 if sym.isNonmatching:
                     # Try to avoid non matching marker symbols
                     nonMatchingSym = sym
@@ -353,6 +355,9 @@ class Section:
         return None
 
     def findSymbolByVrom(self, address: int) -> tuple[Symbol, int] | None:
+        if not self.containsVrom(address):
+            return None
+
         nonMatchingSym: Symbol | None = None
 
         for sym in self._symbols:
@@ -379,7 +384,7 @@ class Section:
                     nonMatchingSym = sym
                 continue
 
-            if sym.vrom < address and address < sym.vrom + sym.size:
+            if sym.vrom < address < sym.vrom + sym.size:
                 if sym.isNonmatching:
                     # Try to avoid non matching marker symbols
                     nonMatchingSym = sym
@@ -564,12 +569,13 @@ class Segment:
     ) -> tuple[FoundSymbolInfo | None, list[Section]]:
         possibleFiles: list[Section] = []
         for section in self._sectionsList:
+            if not section.containsVram(address):
+                continue
             pair = section.findSymbolByVram(address)
             if pair is not None:
                 sym, offset = pair
                 return FoundSymbolInfo(section, sym, offset), []
-            if section.containsVram(address):
-                possibleFiles.append(section)
+            possibleFiles.append(section)
         return None, possibleFiles
 
     def findSymbolByVrom(
@@ -580,12 +586,13 @@ class Segment:
         for section in self._sectionsList:
             if section.vrom is None:
                 continue
+            if not section.containsVrom(address):
+                continue
             pair = section.findSymbolByVrom(address)
             if pair is not None:
                 sym, offset = pair
                 return FoundSymbolInfo(section, sym, offset), []
-            if section.containsVrom(address):
-                possibleFiles.append(section)
+            possibleFiles.append(section)
         return None, possibleFiles
 
     def findPossibleSymbolByVram(
@@ -981,7 +988,8 @@ class MapFile:
         return None
 
     def findSymbolByVram(
-        self, address: int
+        self,
+        address: int,
     ) -> tuple[FoundSymbolInfo | None, list[Section]]:
         """
         Returns a symbol with the specified VRAM address (or with an addend) if
@@ -994,6 +1002,8 @@ class MapFile:
 
         possibleFiles: list[Section] = []
         for segment in self._segmentsList:
+            if not segment.containsVram(address):
+                continue
             info, possibleFilesAux = segment.findSymbolByVram(address)
             if info is not None:
                 return info, []
@@ -1001,10 +1011,11 @@ class MapFile:
         return None, possibleFiles
 
     def findSymbolByVrom(
-        self, address: int
+        self,
+        address: int,
     ) -> tuple[FoundSymbolInfo | None, list[Section]]:
         """
-        Returns a symbol with the specified VRAM address (or with an addend) if
+        Returns a symbol with the specified VROM address (or with an addend) if
         it exists on the mapfile.
 
         If no symbol if found, then a list of possible files where this symbol
@@ -1014,6 +1025,8 @@ class MapFile:
 
         possibleFiles: list[Section] = []
         for segment in self._segmentsList:
+            if not segment.containsVrom(address):
+                continue
             info, possibleFilesAux = segment.findSymbolByVrom(address)
             if info is not None:
                 return info, []
@@ -1362,7 +1375,6 @@ class MapFile:
                 else:
                     # Keep the original section if there are no maps for this path
                     newSeg._sectionsList.append(sect.clone())
-                pass
 
             resolvedMap._segmentsList.append(newSeg)
         return resolvedMap

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/mapfile_parser.pyi

@@ -3,10 +3,8 @@
 # SPDX-FileCopyrightText: © 2023-2025 Decompollaborate
 # SPDX-License-Identifier: MIT
 
-from __future__ import annotations
-
 from pathlib import Path
-from typing import Any, Generator
+from typing import Any, Iterator
 
 class FoundSymbolInfo:
     section: Section
@@ -154,7 +152,7 @@ class Section:
     def appendSymbol(self, sym: Symbol) -> None:
         """Appends a copy of `sym` into the internal symbol list"""
 
-    def __iter__(self) -> Generator[Symbol, None, None]: ...
+    def __iter__(self) -> Iterator[Symbol]: ...
     def __getitem__(self, index) -> Symbol: ...
     def __setitem__(self, index, sym: Symbol): ...
     def __len__(self) -> int: ...
@@ -221,7 +219,7 @@ class Segment:
     def appendFile(self, section: Section) -> None:
         """Appends a copy of `section` into the internal section list"""
 
-    def __iter__(self) -> Generator[Section, None, None]: ...
+    def __iter__(self) -> Iterator[Section]: ...
     def __getitem__(self, index) -> Section: ...
     def __setitem__(self, index, section: Section): ...
     def __len__(self) -> int: ...
@@ -303,7 +301,7 @@ class MapFile:
     def appendSegment(self, segment: Segment) -> None:
         """Appends a copy of `segment` into the internal segment list"""
 
-    def __iter__(self) -> Generator[Segment, None, None]: ...
+    def __iter__(self) -> Iterator[Segment]: ...
     def __getitem__(self, index) -> Segment: ...
     def __setitem__(self, index, segment: Segment): ...
     def __len__(self) -> int: ...

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/mapfile_rs.py

@@ -7,18 +7,17 @@ from __future__ import annotations
 
 from typing import Any
 
-
 from .mapfile_parser import FoundSymbolInfo as FoundSymbolInfo
-from .mapfile_parser import SymbolComparisonInfo as SymbolComparisonInfo
-from .mapfile_parser import MapsComparisonInfo as MapsComparisonInfo
-from .mapfile_parser import Symbol as Symbol
-from .mapfile_parser import Section as Section
-from .mapfile_parser import Segment as Segment
 from .mapfile_parser import MapFile as MapFile
+from .mapfile_parser import MapsComparisonInfo as MapsComparisonInfo
 from .mapfile_parser import ReportCategories as ReportCategories
 
 # Renamed types
 from .mapfile_parser import Section as File
+from .mapfile_parser import Section as Section
+from .mapfile_parser import Segment as Segment
+from .mapfile_parser import Symbol as Symbol
+from .mapfile_parser import SymbolComparisonInfo as SymbolComparisonInfo
 
 
 def __filers_serializeVram(self: File, humanReadable: bool = True) -> str | int | None:

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/mapfile_parser/utils.py

@@ -5,9 +5,9 @@
 
 from __future__ import annotations
 
-from pathlib import Path
 import subprocess
 import sys
+from pathlib import Path
 
 
 def eprint(*args, **kwargs):
@@ -33,7 +33,7 @@ def hexbytes(bs: bytes, addColons: bool = True) -> str:
     glue = ""
     if addColons:
         glue = ":"
-    return glue.join("{:02X}".format(c) for c in bs)
+    return glue.join(f"{c:02X}" for c in bs)
 
 
 def getGitCommitTimestamp() -> int:

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/rs/mapfile.rs

@@ -513,8 +513,6 @@ impl MapFile {
 #[cfg(feature = "python_bindings")]
 #[allow(non_snake_case)]
 pub(crate) mod python_bindings {
-    use pyo3::prelude::*;
-
     use std::{
         collections::HashMap,
         fs,

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/rs/report.rs

@@ -220,6 +220,13 @@ fn report_from_section(
         | section.section_type.starts_with(".init");
 
     for sym_state in section.symbol_match_state_iter(path_decomp_settings) {
+        if sym_state.size() == 0 {
+            // Avoid zero sized symbols.
+            // These are usually `weak` symbols that only bloat the report and
+            // can produce misreportings and noise
+            continue;
+        }
+
         let mut fuzzy_match_percent = 0.0;
 
         let sym = match sym_state {

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/rs/section.rs

@@ -408,7 +408,7 @@ impl Hash for Section {
 #[cfg(feature = "python_bindings")]
 #[allow(non_snake_case)]
 pub(crate) mod python_bindings {
-    use pyo3::{intern, prelude::*, IntoPyObjectExt};
+    use pyo3::{intern, IntoPyObjectExt};
 
     // Required to call the `.hash` and `.finish` methods, which are defined on traits.
     use std::hash::{Hash, Hasher};

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/src/rs/symbol_decomp_state.rs

@@ -5,6 +5,7 @@ use std::path::PathBuf;
 
 use crate::{section, symbol};
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum SymbolDecompState<'sect> {
     /// The symbol has been decompiled.
     /// In other words it is being handled by a compiler instead of assembled from automatic disassemblies.
@@ -14,6 +15,21 @@ pub enum SymbolDecompState<'sect> {
     Undecomped(&'sect symbol::Symbol),
 }
 
+impl<'sect> SymbolDecompState<'sect> {
+    const fn inner(&self) -> &'sect symbol::Symbol {
+        match self {
+            Self::Decomped(sym) => sym,
+            Self::Undecomped(sym) => sym,
+        }
+    }
+    pub const fn vram(&self) -> u64 {
+        self.inner().vram
+    }
+    pub const fn size(&self) -> u64 {
+        self.inner().size
+    }
+}
+
 pub struct SymbolDecompStateIter<'sect> {
     section: &'sect section::Section,
     whole_file_is_undecomped: bool,

{mapfile_parser-2.13.0 → mapfile_parser-2.13.2}/uv.lock

@@ -219,7 +219,7 @@ wheels = [
 
 [[package]]
 name = "mapfile-parser"
-version = "2.12.2"
+version = "2.13.2"
 source = { editable = "." }
 dependencies = [
     { name = "decomp-settings" },