IncludeCPP 3.3.20__py3-none-any.whl → 3.4.8__py3-none-any.whl

includecpp/__init__.py

@@ -1,58 +1,59 @@
-from .core.cpp_api import CppApi
-import warnings
-
-__version__ = "3.3.20"
-__all__ = ["CppApi"]
-
-# Module-level cache for C++ modules
-_api_instance = None
-_loaded_modules = {}
-
-def _get_api():
-    """Get or create singleton CppApi instance."""
-    global _api_instance
-    if _api_instance is None:
-        _api_instance = CppApi()
-    return _api_instance
-
-def __getattr__(name: str):
-    """Enable: from includecpp import fast_list
-
-    This hook is called when Python cannot find an attribute in this module.
-    It allows dynamic C++ module loading via the import system.
-    """
-    if name.startswith('_'):
-        raise AttributeError(f"module 'includecpp' has no attribute '{name}'")
-
-    if name in _loaded_modules:
-        return _loaded_modules[name]
-
-    api = _get_api()
-
-    if name not in api.registry:
-        available = list(api.registry.keys())
-        raise AttributeError(
-            f"Module '{name}' not found. "
-            f"Available: {available}. "
-            f"Run 'includecpp rebuild' first."
-        )
-
-    if api.need_update(name):
-        warnings.warn(
-            f"Module '{name}' source files changed. "
-            f"Run 'includecpp rebuild' to update.",
-            UserWarning
-        )
-
-    module = api.include(name)
-    _loaded_modules[name] = module
-    return module
-
-def __dir__():
-    """List available attributes including C++ modules."""
-    base = ['CppApi', '__version__']
-    try:
-        api = _get_api()
-        return sorted(set(base + list(api.registry.keys())))
-    except Exception:
-        return base
+from .core.cpp_api import CppApi
+from .core import cssl_bridge as CSSL
+import warnings
+
+__version__ = "3.4.8"
+__all__ = ["CppApi", "CSSL"]
+
+# Module-level cache for C++ modules
+_api_instance = None
+_loaded_modules = {}
+
+def _get_api():
+    """Get or create singleton CppApi instance."""
+    global _api_instance
+    if _api_instance is None:
+        _api_instance = CppApi()
+    return _api_instance
+
+def __getattr__(name: str):
+    """Enable: from includecpp import fast_list
+
+    This hook is called when Python cannot find an attribute in this module.
+    It allows dynamic C++ module loading via the import system.
+    """
+    if name.startswith('_'):
+        raise AttributeError(f"module 'includecpp' has no attribute '{name}'")
+
+    if name in _loaded_modules:
+        return _loaded_modules[name]
+
+    api = _get_api()
+
+    if name not in api.registry:
+        available = list(api.registry.keys())
+        raise AttributeError(
+            f"Module '{name}' not found. "
+            f"Available: {available}. "
+            f"Run 'includecpp rebuild' first."
+        )
+
+    if api.need_update(name):
+        warnings.warn(
+            f"Module '{name}' source files changed. "
+            f"Run 'includecpp rebuild' to update.",
+            UserWarning
+        )
+
+    module = api.include(name)
+    _loaded_modules[name] = module
+    return module
+
+def __dir__():
+    """List available attributes including C++ modules."""
+    base = ['CppApi', 'CSSL', '__version__']
+    try:
+        api = _get_api()
+        return sorted(set(base + list(api.registry.keys())))
+    except Exception:
+        return base

includecpp/cli/commands.py

@@ -65,7 +65,7 @@ def _safe_echo(text, **kwargs):
             ('╔', '+'), ('╗', '+'), ('╚', '+'), ('╝', '+'),
             ('┌', '+'), ('┐', '+'), ('└', '+'), ('┘', '+'),
             ('═', '-'), ('─', '-'), ('║', '|'), ('│', '|'),
-            ('✗', '[X]'), ('•', '*'),
+            ('✗', '[X]'), ('✓', '[OK]'), ('❌', '[X]'), ('•', '*'),
             ('→', '->'), ('▶', '>'), ('◆', '*'),
             ('\u2011', '-'), ('\u2010', '-'),
             ('\u2013', '-'), ('\u2014', '--'),
@@ -149,13 +149,13 @@ def _render_readme_with_colors(readme_text):
 
 def _show_changelog():
     """Extract and display changelog from README."""
-    click.echo("=" * 70)
-    click.secho("IncludeCPP Changelog", fg='cyan', bold=True)
-    click.echo("=" * 70)
-    click.echo()
+    _safe_echo("=" * 70)
+    _safe_echo("IncludeCPP Changelog", fg='cyan', bold=True)
+    _safe_echo("=" * 70)
+    _safe_echo("")
 
     try:
-        click.echo("  Fetching changelog from PyPI...", nl=False)
+        _safe_echo("  Fetching changelog from PyPI...", nl=False)
         req = urllib.request.Request(
             "https://pypi.org/pypi/IncludeCPP/json",
             headers={"User-Agent": "IncludeCPP-CLI"}
@@ -166,12 +166,12 @@ def _show_changelog():
         data = json.loads(raw_data)
         description = data.get('info', {}).get('description', '')
         version = data.get('info', {}).get('version', 'unknown')
-        click.secho(" OK", fg='green')
-        click.echo()
+        _safe_echo(" OK", fg='green')
+        _safe_echo("")
 
         if description:
-            click.secho(f"Current Version: {version}", fg='green', bold=True)
-            click.echo()
+            _safe_echo(f"Current Version: {version}", fg='green', bold=True)
+            _safe_echo("")
 
             lines = description.split('\n')
             in_changelog = False
@@ -190,23 +190,23 @@ def _show_changelog():
                 for line in changelog_lines:
                     stripped = line.strip()
                     if stripped.startswith('## '):
-                        click.secho(stripped[3:], fg='yellow', bold=True)
+                        _safe_echo(stripped[3:], fg='yellow', bold=True)
                     elif stripped.startswith('- '):
-                        click.echo("  " + stripped)
+                        _safe_echo("  " + stripped)
                     elif stripped:
-                        click.echo("  " + stripped)
+                        _safe_echo("  " + stripped)
             else:
-                click.secho("No changelog found in README.", fg='yellow')
+                _safe_echo("No changelog found in README.", fg='yellow')
         else:
-            click.secho("No documentation available.", fg='yellow')
+            _safe_echo("No documentation available.", fg='yellow')
 
     except Exception as e:
-        click.secho(" FAILED", fg='red')
-        click.echo()
-        click.secho("Could not fetch changelog: " + str(e), fg='red', err=True)
+        _safe_echo(" FAILED", fg='red')
+        _safe_echo("")
+        _safe_echo("Could not fetch changelog: " + str(e), fg='red', err=True)
 
-    click.echo()
-    click.echo("=" * 70)
+    _safe_echo("")
+    _safe_echo("=" * 70)
 
 
 @click.group(invoke_without_command=True)
@@ -4436,8 +4436,10 @@ def fix(module_name, all_modules, exclude, undo, auto_fix, verbose, use_ai):
             if var_decl:
                 var_name = var_decl.group(1)
                 # Check if variable appears again in rest of content
+                # v3.4.1: Use word boundaries to avoid false positives from substring matches
                 rest_content = '\n'.join(lines[i:])
-                if rest_content.count(var_name) <= 1:
+                uses = len(re.findall(rf'\b{re.escape(var_name)}\b', rest_content))
+                if uses <= 1:
                     add_issue('info', 'Mistake', file_path, i, 'C003',
                               f"Variable '{var_name}' may be unused",
                               "Remove unused variable or mark as [[maybe_unused]]")
@@ -7133,6 +7135,383 @@ def cppy_types():
     click.echo("=" * 60)
 
 
+# ============================================================================
+# EXEC - Interactive Code Execution
+# ============================================================================
+
+@cli.command()
+@click.argument('lang', type=click.Choice(['py', 'cpp', 'python', 'c++']))
+@click.argument('path', required=False, type=click.Path())
+@click.option('--all', 'import_all', is_flag=True, help='Import all available modules')
+def exec(lang, path, import_all):
+    """Execute code interactively for quick testing.
+
+    Run Python or C++ code snippets without creating files.
+    Perfect for testing your IncludeCPP modules quickly.
+
+    \b
+    Usage:
+      includecpp exec py              # Interactive Python
+      includecpp exec cpp             # Interactive C++
+      includecpp exec py mymodule     # Auto-import mymodule
+      includecpp exec py plugins/x.cp # Auto-import from plugin
+      includecpp exec py --all        # Import all modules
+
+    \b
+    Controls:
+      ENTER       = Add new line
+      Empty line  = Execute code (press ENTER twice)
+      CTRL+C      = Cancel
+
+    \b
+    Examples:
+      $ includecpp exec py fast_math
+      >>> x = fast_math.add(1, 2)
+      >>> print(x)
+      >>>
+      3
+    """
+    import sys
+    import subprocess
+    import tempfile
+    from pathlib import Path as PathLib
+
+    # Normalize language
+    is_python = lang in ('py', 'python')
+    lang_name = 'Python' if is_python else 'C++'
+
+    # Build imports/includes
+    imports = []
+    includes = []
+
+    if import_all:
+        # Import all available modules
+        try:
+            from ..core.cpp_api import CppApi
+            api = CppApi()
+            modules = list(api.registry.keys())
+            if is_python:
+                for mod in modules:
+                    imports.append(f'from includecpp import {mod}')
+                if modules:
+                    click.secho(f"Auto-importing {len(modules)} modules: {', '.join(modules)}", fg='cyan')
+            else:
+                for mod in modules:
+                    includes.append(f'#include "{mod}.h"')
+                if modules:
+                    click.secho(f"Auto-including {len(modules)} headers", fg='cyan')
+        except Exception:
+            click.secho("Warning: Could not load module registry", fg='yellow')
+
+    elif path:
+        path_obj = PathLib(path)
+        module_name = None
+
+        # Check if it's a .cp plugin file
+        if path.endswith('.cp') or '/plugins/' in path or '\\plugins\\' in path:
+            # Extract module name from plugin path
+            module_name = path_obj.stem
+        elif path_obj.exists():
+            # It's a file path
+            module_name = path_obj.stem
+        else:
+            # Assume it's a module name directly
+            module_name = path
+
+        if module_name:
+            if is_python:
+                imports.append(f'from includecpp import {module_name}')
+                click.secho(f"Auto-importing: {module_name}", fg='cyan')
+            else:
+                includes.append(f'#include "{module_name}.h"')
+                click.secho(f"Auto-including: {module_name}.h", fg='cyan')
+
+    # Show header
+    click.echo()
+    click.secho(f"=== IncludeCPP {lang_name} REPL ===", fg='cyan', bold=True)
+    click.echo("Enter code line by line. Press ENTER on empty line to execute.")
+    click.echo("Press CTRL+C to cancel.")
+    click.echo()
+
+    # Show pre-loaded imports
+    if imports:
+        click.secho("Pre-loaded:", fg='green')
+        for imp in imports:
+            click.echo(f"  {imp}")
+        click.echo()
+
+    if includes:
+        click.secho("Pre-loaded:", fg='green')
+        for inc in includes:
+            click.echo(f"  {inc}")
+        click.echo()
+
+    # Collect code lines
+    lines = []
+    prompt = '>>> ' if is_python else 'cpp> '
+    continuation = '... ' if is_python else '   > '
+
+    try:
+        while True:
+            try:
+                # Determine prompt
+                current_prompt = prompt if not lines else continuation
+                line = input(current_prompt)
+
+                # Empty line = execute
+                if not line.strip():
+                    if lines:
+                        break
+                    continue
+
+                lines.append(line)
+
+            except EOFError:
+                break
+
+    except KeyboardInterrupt:
+        click.echo()
+        click.secho("Cancelled.", fg='yellow')
+        return
+
+    if not lines:
+        click.secho("No code entered.", fg='yellow')
+        return
+
+    # Build full code
+    code_lines = imports + [''] + lines if imports else lines
+
+    click.echo()
+    click.secho("--- Output ---", fg='green')
+
+    if is_python:
+        # Execute Python code
+        full_code = '\n'.join(code_lines)
+        try:
+            # Use exec with captured output
+            import io
+            from contextlib import redirect_stdout, redirect_stderr
+
+            stdout_capture = io.StringIO()
+            stderr_capture = io.StringIO()
+
+            # Create execution context
+            exec_globals = {'__name__': '__main__'}
+
+            with redirect_stdout(stdout_capture), redirect_stderr(stderr_capture):
+                exec(full_code, exec_globals)
+
+            stdout_val = stdout_capture.getvalue()
+            stderr_val = stderr_capture.getvalue()
+
+            if stdout_val:
+                click.echo(stdout_val, nl=False)
+            if stderr_val:
+                click.secho(stderr_val, fg='red', nl=False)
+
+            if not stdout_val and not stderr_val:
+                click.secho("(no output)", fg='bright_black')
+
+        except Exception as e:
+            click.secho(f"Error: {e}", fg='red')
+
+    else:
+        # Execute C++ code
+        # Build a complete C++ program
+        cpp_code_lines = [
+            '#include <iostream>',
+            '#include <vector>',
+            '#include <string>',
+            '#include <algorithm>',
+            '#include <cmath>',
+            'using namespace std;',
+            ''
+        ]
+        cpp_code_lines.extend(includes)
+        cpp_code_lines.append('')
+        cpp_code_lines.append('int main() {')
+
+        # Indent user code
+        for line in lines:
+            cpp_code_lines.append('    ' + line)
+
+        cpp_code_lines.append('    return 0;')
+        cpp_code_lines.append('}')
+
+        full_code = '\n'.join(cpp_code_lines)
+
+        # Write to temp file and compile
+        with tempfile.NamedTemporaryFile(mode='w', suffix='.cpp', delete=False, encoding='utf-8') as f:
+            f.write(full_code)
+            cpp_file = f.name
+
+        exe_file = cpp_file.replace('.cpp', '.exe' if sys.platform == 'win32' else '')
+
+        try:
+            # Compile
+            compile_cmd = ['g++', '-std=c++17', '-o', exe_file, cpp_file]
+            result = subprocess.run(compile_cmd, capture_output=True, text=True)
+
+            if result.returncode != 0:
+                click.secho("Compilation Error:", fg='red')
+                click.echo(result.stderr)
+            else:
+                # Run
+                run_result = subprocess.run([exe_file], capture_output=True, text=True, timeout=10)
+                if run_result.stdout:
+                    click.echo(run_result.stdout, nl=False)
+                if run_result.stderr:
+                    click.secho(run_result.stderr, fg='red', nl=False)
+                if not run_result.stdout and not run_result.stderr:
+                    click.secho("(no output)", fg='bright_black')
+
+        except subprocess.TimeoutExpired:
+            click.secho("Execution timed out (10s limit)", fg='red')
+        except FileNotFoundError:
+            click.secho("Error: g++ not found. Install a C++ compiler.", fg='red')
+        except Exception as e:
+            click.secho(f"Error: {e}", fg='red')
+        finally:
+            # Cleanup temp files
+            import os
+            try:
+                os.unlink(cpp_file)
+                if os.path.exists(exe_file):
+                    os.unlink(exe_file)
+            except Exception:
+                pass
+
+    click.echo()
+    click.secho("--------------", fg='green')
+
+
+# ============================================================================
+# CSSL - Hidden Command Group
+# ============================================================================
+
+@click.group(hidden=True)
+def cssl():
+    """CSSL scripting commands."""
+    pass
+
+
+@cssl.command(name='exec')
+@click.argument('path', required=False, type=click.Path())
+@click.option('--code', '-c', type=str, help='Execute code directly')
+def cssl_exec(path, code):
+    """Execute CSSL code or file."""
+    from pathlib import Path as PathLib
+
+    try:
+        from ..core.cssl_bridge import CsslLang
+    except ImportError as e:
+        click.secho(f"CSSL runtime not available: {e}", fg='red')
+        return
+
+    cssl_lang = CsslLang()
+
+    # Determine source
+    if code:
+        source = code
+    elif path:
+        path_obj = PathLib(path)
+        if not path_obj.exists():
+            click.secho(f"File not found: {path}", fg='red')
+            return
+        source = path_obj.read_text(encoding='utf-8')
+    else:
+        # Interactive mode
+        click.secho("=== CSSL REPL ===", fg='magenta', bold=True)
+        click.echo("Enter CSSL code. Empty line to execute. CTRL+C to cancel.")
+        click.echo()
+
+        lines = []
+        prompt = 'cssl> '
+
+        try:
+            while True:
+                try:
+                    line = input(prompt)
+                    if not line.strip():
+                        if lines:
+                            break
+                        continue
+                    lines.append(line)
+                except EOFError:
+                    break
+        except KeyboardInterrupt:
+            click.echo()
+            click.secho("Cancelled.", fg='yellow')
+            return
+
+        if not lines:
+            click.secho("No code entered.", fg='yellow')
+            return
+
+        source = '\n'.join(lines)
+
+    # Execute
+    click.secho("--- Output ---", fg='green')
+    try:
+        result = cssl_lang.exec(source)
+
+        # Print output buffer
+        for line in cssl_lang.get_output():
+            click.echo(line)
+
+        if result is not None:
+            click.echo(f"Result: {result}")
+
+    except Exception as e:
+        click.secho(f"CSSL Error: {e}", fg='red')
+
+    click.secho("--------------", fg='green')
+
+
+@cssl.command(name='makemodule')
+@click.argument('path', type=click.Path(exists=True))
+@click.option('--output', '-o', type=click.Path(), help='Output path for .cssl-mod')
+def cssl_makemodule(path, output):
+    """Create a .cssl-mod module from Python/C++ file."""
+    from pathlib import Path as PathLib
+    import pickle
+    import base64
+
+    path_obj = PathLib(path)
+    suffix = path_obj.suffix.lower()
+
+    if suffix not in ('.py', '.cpp', '.cp', '.h'):
+        click.secho(f"Unsupported file type: {suffix}", fg='red')
+        click.echo("Supported: .py, .cpp, .cp, .h")
+        return
+
+    # Read source
+    source = path_obj.read_text(encoding='utf-8')
+
+    # Create module data
+    module_data = {
+        'name': path_obj.stem,
+        'type': 'python' if suffix == '.py' else 'cpp',
+        'source': source,
+        'version': '1.0',
+    }
+
+    # Encode as base64 pickle
+    encoded = base64.b64encode(pickle.dumps(module_data)).decode('utf-8')
+
+    # Write .cssl-mod file
+    out_path = PathLib(output) if output else path_obj.with_suffix('.cssl-mod')
+    out_path.write_text(f"CSSLMOD1\n{encoded}", encoding='utf-8')
+
+    click.secho(f"Created: {out_path}", fg='green')
+    click.echo(f"  Name: {module_data['name']}")
+    click.echo(f"  Type: {module_data['type']}")
+
+
+# Register hidden cssl command group
+cli.add_command(cssl)
+
+
 # ============================================================================
 # Conditional Registration of Experimental Commands
 # ============================================================================