mapfile_parser 2.12.2__tar.gz → 2.13.1__tar.gz

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+
+- `findPossibleSymbolsByVram`, `findPossibleSymbolsByVrom`, and
+  `findPossibleSymbolsByName` for `MapFile` and `findPossibleSymbolByVram`,
+  `findPossibleSymbolByVrom`, and `findPossibleSymbolsByName` for `Segment`.
+  - Allow iterating over the mapfile looking for multiple symbols that could
+    match either the vram, vrom or name given instead of stopping at the first
+    one that matches the criteria.
+- `Symbol::isNonmatching`: If true, the current symbol is a `.NON_MATCHING`
+  marker symbol.
+- `Section::containsVram`, `Section::containsVrom`, `Segment::containsVram`,
+  `Segment::containsVrom`.
+
+### Changed
+
+- `sym_info` now iterates over every possible vram/vrom address for every
+  segment instead of only printing the first found one.
+
 ## [2.12.2] - 2026-05-30
 
 ### Fixed
@@ -708,10 +735,12 @@ Full changes: <https://github.com/Decompollaborate/mapfile_parser/compare/702a73
 
 - Initial release
 
-[unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/2.12.2...HEAD
+[unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/2.13.0...HEAD
 
-[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.12.2 → mapfile_parser-2.13.1}/Cargo.lock

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

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/Cargo.toml

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

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapfile_parser
-Version: 2.12.2
+Version: 2.13.1
 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
@@ -90,7 +90,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.12"
+mapfile_parser = "2.13"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/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
@@ -75,7 +75,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.12"
+mapfile_parser = "2.13"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "mapfile_parser"
-version = "2.12.2"
+version = "2.13.1"
 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.12.2 → mapfile_parser-2.13.1}/src/mapfile_parser/__init__.py

@@ -5,25 +5,22 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 12, 2)
+__version_info__ = (2, 13, 1)
 __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.12.2 → mapfile_parser-2.13.1}/src/mapfile_parser/__main__.py

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

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/src/mapfile_parser/frontends/sym_info.py

@@ -7,11 +7,12 @@ from __future__ import annotations
 
 import argparse
 from collections.abc import Callable
-import decomp_settings
 from pathlib import Path
+from typing import Generator
+
+import decomp_settings
 
-from .. import mapfile
-from .. import utils
+from .. import mapfile, utils
 
 
 def doSymInfo(
@@ -31,36 +32,52 @@ def doSymInfo(
     if plfResolver is not None:
         mapFile = mapFile.resolvePartiallyLinkedFiles(plfResolver)
 
-    possibleFiles: list[mapfile.Section] = []
+    count = 0
+    for info in iterateSymbols(
+        mapFile,
+        symName,
+        as_vram,
+        as_vrom,
+        as_name,
+    ):
+        print(info.getAsStrPlusOffset(symName))
+        count += 1
+
+    if count == 0:
+        print(f"'{symName}' not found in map file '{mapPath}'")
+        return 1
+    return 0
+
 
+def iterateSymbols(
+    mapFile: mapfile.MapFile,
+    symName: str,
+    as_vram: bool,
+    as_vrom: bool,
+    as_name: bool,
+) -> Generator[mapfile.MaybeFoundSymbolInfo]:
     if as_vram:
         address = int(symName, 0)
-        info, possibleFiles = mapFile.findSymbolByVram(address)
+        for info in mapFile.findPossibleSymbolsByVram(address):
+            yield info
     elif as_vrom:
         address = int(symName, 0)
-        info, possibleFiles = mapFile.findSymbolByVrom(address)
+        for info in mapFile.findPossibleSymbolsByVrom(address):
+            yield info
     elif as_name:
-        info = mapFile.findSymbolByName(symName)
+        for info in mapFile.findPossibleSymbolsByName(symName):
+            yield info
 
     # Start the guessing game
     elif utils.convertibleToInt(symName, 0):
         address = int(symName, 0)
-        info, possibleFiles = mapFile.findSymbolByVram(address)
-        if info is None:
-            info, possibleFiles2 = mapFile.findSymbolByVrom(address)
-            possibleFiles.extend(possibleFiles2)
+        for info in mapFile.findPossibleSymbolsByVram(address):
+            yield info
+        for info in mapFile.findPossibleSymbolsByVrom(address):
+            yield info
     else:
-        info = mapFile.findSymbolByName(symName)
-
-    if info is not None:
-        print(info.getAsStrPlusOffset(symName))
-        return 0
-    print(f"'{symName}' not found in map file '{mapPath}'")
-    if len(possibleFiles) > 0:
-        print("But it may be a local symbol of either of the following files:")
-        for f in possibleFiles:
-            print(f"    {f.asStr()})")
-    return 1
+        for info in mapFile.findPossibleSymbolsByName(symName):
+            yield info
 
 
 def processArguments(

{mapfile_parser-2.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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.12.2 → mapfile_parser-2.13.1}/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)