Merge pull request #26 from Decompollaborate/develop

2.3.6

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature_suggestion.yml

@@ -0,0 +1,45 @@
+name: Feature suggestion
+description: Suggest a new feature
+title: "[Suggestion]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for suggesting a new feature!
+  - type: textarea
+    id: the-feature
+    attributes:
+      label: Explain the feature
+      description: What does this new feature do? How it would be done?
+      placeholder: |
+        - Print capybara ascii art on each run
+        - Introduce achievements
+        - Play the Oof sound on errors
+    validations:
+      required: true
+  - type: textarea
+    id: advantage
+    attributes:
+      label: Advantage
+      description: What are the pros of this new feature?
+      placeholder: |
+        - XYZ is a common case.
+        - The parsing would be more correct because...
+        - Would fix Windows builds.
+  - type: textarea
+    id: disadvantage
+    attributes:
+      label: Disadvantage
+      description: What could be any drawback of the new feature?
+      placeholder: |
+        - Slower runtime.
+        - Harder to debug.
+        - Would fix Windows builds.
+  - type: textarea
+    id: example
+    attributes:
+      label: Example(s)
+      description: Include examples on how this feature would look like or related info
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/frug_report.yml

@@ -0,0 +1,59 @@
+name: Frug Report
+description: File a frug report
+title: "[Frug]: "
+labels: ["frug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filing a frug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Explain the problem.
+      description: What happened? What did you expect to happen?
+      placeholder: What went wrong?
+    validations:
+      required: true
+  - type: textarea
+    id: reproducer
+    attributes:
+      label: Reproducer
+      description: Please provide instructions to reproduce the problem.
+      placeholder: |
+        Use the following file (attach it please) and run IJK with parameters ABC.
+        Clone the repo github.com/example/example and do XYZ
+    validations:
+      required: true
+  - type: textarea
+    id: mapfile_parser-flavour
+    attributes:
+      label: mapfile_parser flavour
+      description: Which flavour of mapfile_parser were you using?
+      placeholder: |
+        - The Python cli?
+        - As a Python library?
+        - As a Rust library?
+        - Etc
+    validations:
+      required: true
+  - type: input
+    id: mapfile_parser-version
+    attributes:
+      label: mapfile_parser version
+      description: What version of mapfile_parser are you running? (i.e. `python3 -m mapfile_parser --version`)
+    validations:
+      required: true
+  - type: textarea
+    id: other-version
+    attributes:
+      label: "Optional: Version of other stuff"
+      description: Here you can put the version of whatever other software you think may be relevant, like Rust, rabbitizer, binutils, OS, etc.
+      placeholder: |
+        - Python: 4.18
+        - Rust: 72.½
+        - binutils: 2.π
+        - Wine on WSL2 on Windows 11 on VirtualBox on OpenBSD on Minecraft command blocks.
+        - Etc
+    validations:
+      required: false

CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.3.6] - 2024-02-23
+
+### Added
+
+- Add issue templates for bug reports and feature suggestions.
+
+### Fixed
+
+- Fix not recognizing sections that don't start with dots (`.`).
+
 ## [2.3.5] - 2024-02-04
 
 ### Fixed
@@ -314,6 +324,7 @@ Full changes: <https://github.com/Decompollaborate/mapfile_parser/compare/702a73
 - Initial release
 
 [unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/master...develop
+[2.3.6]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.5...2.3.6
 [2.3.5]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.4...2.3.5
 [2.3.4]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.2...2.3.4
 [2.3.2]: https://github.com/Decompollaborate/mapfile_parser/compare/2.3.1...2.3.2

Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "mapfile_parser"
-version = "2.3.5"
+version = "2.3.6"
 edition = "2021"
 authors = ["Anghelo Carvajal <[email protected]>"]
 description = "Map file parser library focusing decompilation projects"
@@ -23,7 +23,7 @@ crate-type = ["cdylib", "staticlib", "rlib"]
 
 [dependencies]
 regex = "1.10.2"
-pyo3 = { version = "0.20.0", optional = true }
+pyo3 = { version = "0.20.0", optional = true, features = ["abi3", "abi3-py37"]}
 lazy_static = "1.4.0"
 
 [features]

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.3.5,<3.0.0
+mapfile_parser>=2.3.6,<3.0.0
 ```
 
 #### Development version

pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "mapfile_parser"
-version = "2.3.5"
+version = "2.3.6"
 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, 3, 5)
+__version_info__ = (2, 3, 6)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "Decompollaborate"
 

src/rs/mapfile.rs

@@ -90,7 +90,7 @@ impl MapFile {
      */
     pub fn parse_map_contents_gnu(&mut self, map_contents: String) {
         // TODO: maybe move somewhere else?
-        let regex_file_data_entry = Regex::new(r"^\s+(?P<section>\.[^\s]+)\s+(?P<vram>0x[^\s]+)\s+(?P<size>0x[^\s]+)\s+(?P<name>[^\s]+)$").unwrap();
+        let regex_file_data_entry = Regex::new(r"^\s+(?P<section>[^*][^\s]+)\s+(?P<vram>0x[^\s]+)\s+(?P<size>0x[^\s]+)\s+(?P<name>[^\s]+)$").unwrap();
         let regex_function_entry =
             Regex::new(r"^\s+(?P<vram>0x[^\s]+)\s+(?P<name>[^\s]+)$").unwrap();
         // regex_function_entry = re.compile(r"^\s+(?P<vram>0x[^\s]+)\s+(?P<name>[^\s]+)((\s*=\s*(?P<expression>.+))?)$")