autosar-calltree 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

autosar_calltree/cli/main.py

@@ -152,12 +152,10 @@ def cli(
             SpinnerColumn(),
             TextColumn("[progress.description]{task.description}"),
             console=console,
-            transient=True,
+            transient=False,
         ) as progress:
             # Build database
-            task = progress.add_task(
-                f"Building function database from {source_dir}...", total=None
-            )
+            task = progress.add_task("", total=None)
 
             db = FunctionDatabase(source_dir, cache_dir=cache_dir, module_config=config)
             db.build_database(
@@ -199,6 +197,7 @@ def cli(
 
         # Handle search
         if search:
+            console.print()
             console.print(f"[bold]Search Results for '{search}':[/bold]\n")
             results = db.search_functions(search)
             if results:

autosar_calltree/database/function_database.py

@@ -25,6 +25,16 @@ from ..parsers.c_parser import CParser
 from .models import FunctionInfo
 
 
+def _format_file_size(size_bytes: int) -> str:
+    """Format file size in human-readable format."""
+    if size_bytes >= 1024 * 1024:
+        return f"{size_bytes / (1024 * 1024):.2f}M"
+    elif size_bytes >= 1024:
+        return f"{size_bytes / 1024:.2f}K"
+    else:
+        return str(size_bytes)
+
+
 @dataclass
 class CacheMetadata:
     """Metadata for cache validation."""
@@ -127,10 +137,12 @@ class FunctionDatabase:
         if verbose:
             print(f"Found {len(c_files)} C source files")
 
+        # Print build progress message before processing files
+        print(f"Building function database from {self.source_dir}...")
+
         # Parse each file
         for idx, file_path in enumerate(c_files, 1):
-            if verbose and idx % 100 == 0:
-                print(f"Processing file {idx}/{len(c_files)}: {file_path.name}")
+            print(f"Processing: [{idx}/{len(c_files)}] {file_path.name} (Size: {_format_file_size(file_path.stat().st_size)})")
 
             try:
                 self._parse_file(file_path)

autosar_calltree/parsers/c_parser.py

@@ -85,13 +85,14 @@ class CParser:
 
         # Pattern for traditional C function declarations/definitions
         # Matches: [static] [inline] return_type function_name(params)
+        # Optimized to avoid catastrophic backtracking with length limits
         self.function_pattern = re.compile(
             r"^\s*"  # Start of line with optional whitespace
             r"(?P<static>static\s+)?"  # Optional static keyword
             r"(?P<inline>inline|__inline__|__inline\s+)?"  # Optional inline
-            r"(?P<return_type>[\w\s\*]+?)\s+"  # Return type (can include spaces, pointers)
-            r"(?P<function_name>[a-zA-Z_][a-zA-Z0-9_]*)\s*"  # Function name
-            r"\((?P<params>[^)]*)\)",  # Parameters in parentheses
+            r"(?P<return_type>[\w\s\*]{1,101}?)\s+"  # Return type (1-101 chars, non-greedy)
+            r"(?P<function_name>[a-zA-Z_][a-zA-Z0-9_]{1,50})\s*"  # Function name (1-50 chars)
+            r"\((?P<params>[^()]{0,500}(?:\([^()]{0,100}\)[^()]{0,500})*)\)",  # Parameters (limited length)
             re.MULTILINE,
         )
 
@@ -156,16 +157,46 @@ class CParser:
                         functions.append(autosar_func)
 
         # Then, parse traditional C functions
-        for match in self.function_pattern.finditer(content):
-            func_info = self._parse_function_match(match, content, file_path)
-            if func_info:
-                # Check if this function was already found as AUTOSAR
-                is_duplicate = any(
-                    f.name == func_info.name and f.line_number == func_info.line_number
-                    for f in functions
-                )
-                if not is_duplicate:
-                    functions.append(func_info)
+        # Use line-by-line matching to avoid catastrophic backtracking on large files
+        lines = content.split("\n")
+        current_pos = 0
+        for line_num, line in enumerate(lines, 1):
+            line_length = len(line) + 1  # +1 for newline
+            # Skip empty lines and lines that don't look like function declarations
+            if not line or "(" not in line or ";" in line:
+                current_pos += line_length
+                continue
+
+            # Check if line matches function pattern
+            match = self.function_pattern.match(line)
+            if match:
+                # Adjust match positions to be relative to full content
+                class AdjustedMatch:
+                    def __init__(self, original_match, offset):
+                        self._match = original_match
+                        self._offset = offset
+
+                    def group(self, name):
+                        return self._match.group(name)
+
+                    def start(self):
+                        return self._offset + self._match.start()
+
+                    def end(self):
+                        return self._offset + self._match.end()
+
+                adjusted_match = AdjustedMatch(match, current_pos)
+                func_info = self._parse_function_match(adjusted_match, content, file_path)  # type: ignore[arg-type]
+                if func_info:
+                    # Check if this function was already found as AUTOSAR
+                    is_duplicate = any(
+                        f.name == func_info.name and f.line_number == func_info.line_number
+                        for f in functions
+                    )
+                    if not is_duplicate:
+                        functions.append(func_info)
+
+            current_pos += line_length
 
         return functions
 

autosar_calltree/version.py

@@ -1,5 +1,5 @@
 """Version information for autosar-calltree package."""
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __author__ = "melodypapa"
 __email__ = "melodypapa@outlook.com"

{autosar_calltree-0.3.0.dist-info → autosar_calltree-0.3.2.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: autosar-calltree
-Version: 0.3.0
+Version: 0.3.2
 Summary: A Python tool to analyze C/AUTOSAR codebases and generate function call trees with Mermaid and XMI output
 Author-email: melodypapa <melodypapa@outlook.com>
 Maintainer-email: melodypapa <melodypapa@outlook.com>
 License: MIT
-Project-URL: Homepage, https://github.com/yourusername/autosar-calltree
+Project-URL: Homepage, https://github.com/melodypapa/autosar-calltree
 Project-URL: Documentation, https://autosar-calltree.readthedocs.io
-Project-URL: Repository, https://github.com/yourusername/autosar-calltree
-Project-URL: Bug Tracker, https://github.com/yourusername/autosar-calltree/issues
+Project-URL: Repository, https://github.com/melodypapa/autosar-calltree
+Project-URL: Bug Tracker, https://github.com/melodypapa/autosar-calltree/issues
 Keywords: autosar,c,call-tree,static-analysis,code-analysis,mermaid,xmi,uml,embedded,automotive
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -78,7 +78,7 @@ pip install autosar-calltree
 For development:
 
 ```bash
-git clone https://github.com/yourusername/autosar-calltree.git
+git clone https://github.com/melodypapa/autosar-calltree.git
 cd autosar-calltree
 pip install -e ".[dev]"
 ```
@@ -473,9 +473,9 @@ MIT License - see [LICENSE](LICENSE) file for details.
 
 ## Support
 
-- **Issues**: [GitHub Issues](https://github.com/yourusername/autosar-calltree/issues)
+- **Issues**: [GitHub Issues](https://github.com/melodypapa/autosar-calltree/issues)
 - **Documentation**: [Read the Docs](https://autosar-calltree.readthedocs.io)
-- **Discussions**: [GitHub Discussions](https://github.com/yourusername/autosar-calltree/discussions)
+- **Discussions**: [GitHub Discussions](https://github.com/melodypapa/autosar-calltree/discussions)
 
 ---
 

{autosar_calltree-0.3.0.dist-info → autosar_calltree-0.3.2.dist-info}/RECORD

@@ -1,22 +1,22 @@
 autosar_calltree/__init__.py,sha256=WiP2aFfs0H3ze4X8tQg6ZiStdzgrp6uC8DPRUyGm_zg,660
-autosar_calltree/version.py,sha256=IDF1Q30Mj9V4zneGjixq2AvsvYMbGxYZQPUi5JF7Pbo,142
+autosar_calltree/version.py,sha256=zDB6LGdYGRR-wdfWuRQEezaGHN9pJEeYwqXX2LokRZI,142
 autosar_calltree/analyzers/__init__.py,sha256=qUvB7CAa5xNcUYkhD7Rha-9quPG8yQJqg-GikHD41U0,119
 autosar_calltree/analyzers/call_tree_builder.py,sha256=tSsIj_BHzT4XQ-XsXXfyU-KyGK61p6O7nLBx1AiwxCA,11627
 autosar_calltree/cli/__init__.py,sha256=qwsSUuDyV6i1PYS7Mf6JBkBJKtcldxiIh5S0wOucWVY,76
-autosar_calltree/cli/main.py,sha256=cNrkRDUGebYjmTgWSEEI_lx-BQvWLbhqjNBhmUgM_pg,11383
+autosar_calltree/cli/main.py,sha256=5svIu95DykrQBtjmhQTOTe-RdM9LkIgnnUnvfvivMM8,11334
 autosar_calltree/config/__init__.py,sha256=mSrB2uvrax_MTgGynfPObXYUh6eCe5BZD21_cebfMQM,258
 autosar_calltree/config/module_config.py,sha256=--ptsY6drvVKn_HD5_JDEpCv9D1xI8kiJXi8bwrSFBI,6329
 autosar_calltree/database/__init__.py,sha256=qg0IfUGgkecJQXqe9lPrU0Xbu-hBZa8NOe8E8UZqC_s,405
-autosar_calltree/database/function_database.py,sha256=bXVKOs4B5F4vS3I-RkvGwYtVv7vCciODgcDrV0HJ4lw,17121
+autosar_calltree/database/function_database.py,sha256=PJghwv2Duxx7vSIvApyVwg4N_bCTfnk85mtA89BpIuA,17561
 autosar_calltree/database/models.py,sha256=xo85zao2LDHJMR6FeMVxopPyXxEv7jQUzeh4fzHwNKo,6265
 autosar_calltree/generators/__init__.py,sha256=wlSAuykXkxIjwP9H1C2iY99nbyt14Kp1Y6GxmDEDmDk,122
 autosar_calltree/generators/mermaid_generator.py,sha256=LcmWOACLAw3r7UQlnSlTM-_kpKQ6RGdgc6aNqXeMF7A,16191
 autosar_calltree/parsers/__init__.py,sha256=O0NTHrZqe6GXvU9_bLuAoAV_hxv7gHOgkH8KWSBmX1Y,151
 autosar_calltree/parsers/autosar_parser.py,sha256=iwF1VR4NceEfmc3gPP31CcVNPfRRVTj_aA6N94saXDA,10750
-autosar_calltree/parsers/c_parser.py,sha256=ubfrYT-8bjbrU3pcAsSXYEDLqSY7N-X2SebwsVnd7sg,13321
-autosar_calltree-0.3.0.dist-info/licenses/LICENSE,sha256=Xy30Wm38nOLXLZZFgn9oD_3UcayYkm81xtn8IByrBlk,1067
-autosar_calltree-0.3.0.dist-info/METADATA,sha256=jNxgruUEO1sDZgG1uGENJOQgoGHYWQG8DKnMot84cZA,15542
-autosar_calltree-0.3.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-autosar_calltree-0.3.0.dist-info/entry_points.txt,sha256=HfntIC1V_COOhGJ-OhtLKH_2vJ1jQy5Hlz8NmcJg4TQ,54
-autosar_calltree-0.3.0.dist-info/top_level.txt,sha256=eusKGYzQfbhwIFDsUYTby40SdMpe95Y9GtR0l1GVIDQ,17
-autosar_calltree-0.3.0.dist-info/RECORD,,
+autosar_calltree/parsers/c_parser.py,sha256=OQ0HklIV1aSWvxe6qjj5bwP5Drz4cmxhFrdrOBpZdFU,14744
+autosar_calltree-0.3.2.dist-info/licenses/LICENSE,sha256=Xy30Wm38nOLXLZZFgn9oD_3UcayYkm81xtn8IByrBlk,1067
+autosar_calltree-0.3.2.dist-info/METADATA,sha256=oLQzj1T0HauxX38XVi7tHunMvO20raEydsGHKDfnFRY,15530
+autosar_calltree-0.3.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+autosar_calltree-0.3.2.dist-info/entry_points.txt,sha256=HfntIC1V_COOhGJ-OhtLKH_2vJ1jQy5Hlz8NmcJg4TQ,54
+autosar_calltree-0.3.2.dist-info/top_level.txt,sha256=eusKGYzQfbhwIFDsUYTby40SdMpe95Y9GtR0l1GVIDQ,17
+autosar_calltree-0.3.2.dist-info/RECORD,,