Merge pull request #16 from ProgrammerKR/master

Master

Author: ProgrammerKR

.github/workflows/benchmarks.yml

@@ -0,0 +1,104 @@
+
+name: Comprehensive Benchmarks
+
+on:
+  push:
+    paths:
+      - 'benchmarks/**'
+      - 'src/**'
+      - 'include/**'
+      - 'CMakeLists.txt'
+  pull_request:
+    paths:
+      - 'benchmarks/**'
+      - 'src/**'
+  workflow_dispatch:
+
+jobs:
+  benchmark:
+    name: Benchmark on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+    - name: Checkout source
+      uses: actions/checkout@v4
+
+    # --- Language Setups ---
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'
+
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '21'
+
+    # --- Build Dependencies (LLVM) ---
+    - name: Install LLVM (Ubuntu)
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y llvm-dev libclang-dev clang build-essential
+
+    - name: Install LLVM (macOS)
+      if: matrix.os == 'macos-latest'
+      run: |
+        brew update
+        brew install llvm
+        echo "LLVM_DIR=$(brew --prefix llvm)/lib/cmake/llvm" >> $GITHUB_ENV
+        echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
+
+    - name: Setup LLVM (Windows)
+      if: matrix.os == 'windows-latest'
+      shell: pwsh
+      run: |
+        choco install llvm --version 17.0.6 -y --force
+        $llvmRoot = "C:\Program Files\LLVM"
+        if (-not (Test-Path $llvmRoot)) { $llvmRoot = "C:\Program Files (x86)\LLVM" }
+        Add-Content $env:GITHUB_PATH "$llvmRoot/bin"
+        Add-Content $env:GITHUB_ENV "LLVM_ROOT=$llvmRoot"
+        # Helper for CMake to find LLVM
+        Add-Content $env:GITHUB_ENV "LLVM_DIR=$llvmRoot/lib/cmake/llvm"
+
+    # --- Build ProXPL ---
+    - name: Configure CMake
+      shell: bash
+      run: |
+        cmake -S . -B build \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_BENCH=OFF
+
+    - name: Build ProXPL
+      shell: bash
+      run: cmake --build build --config Release
+
+    # --- Run Benchmarks ---
+    - name: Run Comparison Benchmarks
+      shell: bash
+      run: |
+        if [ "${{ matrix.os }}" == "windows-latest" ]; then
+          EXE_PATH="build/Release/proxpl.exe"
+        else
+          EXE_PATH="build/proxpl"
+        fi
+        
+        echo "Running benchmarks with $EXE_PATH"
+        # Run with buffered output explanation or simple run
+        python benchmarks/run_benchmarks.py --executable "$EXE_PATH"

.gitignore

@@ -13,6 +13,14 @@
 *.exe
 *.out
 *.app
+<<<<<<< HEAD
+*.obj
+*.lib
+*.exp
+*.pdb
+*.ilk
+=======
+>>>>>>> fix-ci-build
 build/
 cmake-build-debug/
 cmake-build-release/
@@ -114,6 +122,18 @@ htmlcov/
 *.cover
 
 # ============================================
+<<<<<<< HEAD
+# Node.js
+# ============================================
+node_modules/
+extension/node_modules/
+npm-debug.log
+yarn-error.log
+package-lock.json
+
+# ============================================
+=======
+>>>>>>> fix-ci-build
 # Project-Specific
 # ============================================
 .internal_ignore

CHANGELOG.md

@@ -6,6 +6,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+<<<<<<< HEAD
+## [1.0.0] - 2026-01-06
+
+### Added
+- **Object-Oriented Programming**: First-class support for Classes, Objects, Single Inheritance (`extends`), and Interfaces.
+- **Keywords**: `class`, `new`, `this`, `extends`, `interface`, `static`.
+- **Runtime**:
+  - `ObjClass`, `ObjInstance`, `ObjBoundMethod` structures.
+  - Opcodes: `OP_CLASS`, `OP_METHOD`, `OP_INHERIT`, `OP_GET_PROPERTY`, `OP_SET_PROPERTY`, `OP_GET_SUPER`.
+- **Stability**: Finalized v1.0.0 release.
+
+### Fixed
+- **Build**: Resolved CMake configuration issues and compilation errors.
+- **VM**: Fixed object instantiation and method binding logic.
+
 ## [0.8.0] - 2026-01-04
 
 ### Added
@@ -52,6 +67,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - **Runtime**:
   - Implemented `OP_USE` opcode for dynamic module loading.
   - Added `std.io` and standard library module resolution fixes.
+=======
+## [Unreleased]
+
+### Added
+>>>>>>> fix-ci-build
 - Comprehensive documentation suite (400+ pages)
   - Professional README with architecture diagrams
   - Complete ARCHITECTURE.md with compiler pipeline details
@@ -78,8 +98,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Refactor report documenting all changes
 
 ### Changed
+<<<<<<< HEAD
 - **CLI**: Updated CLI version to match project version.
 - **Build**: Fixed CMake finding LLVM and compiler paths on Windows.
+=======
+>>>>>>> fix-ci-build
 - Reorganized repository structure for clarity and scalability
 - Upgraded CMakeLists.txt to modern best practices
 - Improved Makefile with multiple build targets
@@ -100,7 +123,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+<<<<<<< HEAD
 ## [0.1.0] - 2024-12-11
+=======
+## [0.9.0] - 2024-12-11
+>>>>>>> fix-ci-build
 
 ### Initial C-Based Release
 
@@ -197,7 +224,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Async/await implementation
 - Pattern matching
 - Generic types
+<<<<<<< HEAD
 - Module system (Initial support in v0.5.0)
+=======
+- Module system
+>>>>>>> fix-ci-build
 - Debugger integration
 
 ### Phase 4: Ecosystem (Q3 2025)
@@ -230,15 +261,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 1. **Type Checker**: Partial implementation, needs refinement for complex types
 2. **Object System**: Basic inheritance, needs method binding optimization
 3. **Memory Management**: Mark-and-sweep GC not yet implemented
+<<<<<<< HEAD
 4. **Module System**: Partial implementation (`use` keyword support added, std lib in progress)
+=======
+4. **Module System**: Not yet implemented
+>>>>>>> fix-ci-build
 5. **Standard Library**: 44/75 functions (58% complete)
 6. **Error Messages**: Could be more detailed with suggestions
 7. **REPL**: Basic implementation, no history or autocompletion
 
 ### Workarounds
 
 - For GC: Short-lived programs work fine with basic allocation
+<<<<<<< HEAD
 - For modules: Use the new `use` keyword or compile with single-file strategy
+=======
+- For modules: Use single-file programs or compile with preprocessor
+>>>>>>> fix-ci-build
 - For missing functions: Implement in ProXPL or use system() calls
 
 ---
@@ -339,6 +378,12 @@ This project is licensed under the MIT License.
 
 ---
 
-**Current Version**: 0.8.0
-**Last Updated**: January 04, 2026
+<<<<<<< HEAD
+**Current Version**: 1.0.0
+**Last Updated**: January 06, 2026
 **Next Release**: 1.1.0 (Q1 2026)
+=======
+**Current Version**: 0.9.0 (Development)  
+**Last Updated**: December 11, 2024  
+**Next Release**: 1.0.0 (Q2 2025)
+>>>>>>> fix-ci-build

CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.15)
+<<<<<<< HEAD
 project(ProXPL VERSION 1.0.0 LANGUAGES C CXX)
+=======
+project(ProXPL)
+>>>>>>> fix-ci-build
 
 # Enable C and C++
 enable_language(C CXX)
@@ -15,6 +19,7 @@ else()
 endif()
 
 # --- LLVM Configuration ---
+<<<<<<< HEAD
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 # --- LLVM Configuration ---
@@ -44,14 +49,22 @@ else()
     message(WARNING "LibFFI not found. FFI features will be disabled.")
 endif()
 
+=======
+find_package(LLVM CONFIG)
+
+>>>>>>> fix-ci-build
 if (LLVM_FOUND)
     message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
     include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
     add_definitions(${LLVM_DEFINITIONS})
     link_directories(${LLVM_LIBRARY_DIRS})
 
     # Map generic components to specific libs
+<<<<<<< HEAD
     llvm_map_components_to_libnames(llvm_libs core support executionengine native ipo analysis transformutils bitwriter)
+=======
+    llvm_map_components_to_libnames(llvm_libs core support executionengine native ipo)
+>>>>>>> fix-ci-build
 else()
     message(WARNING "LLVM not found. Building without LLVM backend.")
     set(llvm_libs "")
@@ -74,13 +87,17 @@ list(FILTER LIB_SOURCES EXCLUDE REGEX ".*main\\.c$")
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*vm_v2\\.c$")
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*vm_dispatch\\.c$")
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*instr_handlers_template\\.c$")
+<<<<<<< HEAD
 # Exclude prototype VM register which has its own main
 list(FILTER LIB_SOURCES EXCLUDE REGEX ".*vm_register\\.c$")
+=======
+>>>>>>> fix-ci-build
 
 if (NOT LLVM_FOUND)
     list(FILTER LIB_SOURCES EXCLUDE REGEX ".*backend_llvm\\.cpp$")
 endif()
 
+<<<<<<< HEAD
 
 # --- Build Configuration ---
 # --- Build Configuration ---
@@ -119,17 +136,36 @@ endif()
 if (LIBFFI_FOUND)
     target_link_libraries(proxpl PRIVATE ${LIBFFI_LIBRARIES})
 endif()
+=======
+# --- Core Library ---
+add_library(proxpl_lib SHARED ${LIB_SOURCES})
+if (LLVM_FOUND)
+    target_link_libraries(proxpl_lib PRIVATE ${llvm_libs})
+endif()
+
+# --- Main Executable ---
+add_executable(proxpl src/main.c)
+target_link_libraries(proxpl PRIVATE proxpl_lib ${llvm_libs})
+>>>>>>> fix-ci-build
 
 if(UNIX)
     if(APPLE)
         target_link_libraries(proxpl PRIVATE pthread dl z)
+<<<<<<< HEAD
+    else()
+        target_link_libraries(proxpl PRIVATE pthread dl z tinfo)
+=======
+        target_link_libraries(proxpl_lib PRIVATE pthread dl z)
     else()
         target_link_libraries(proxpl PRIVATE pthread dl z tinfo)
+        target_link_libraries(proxpl_lib PRIVATE pthread dl z tinfo)
+>>>>>>> fix-ci-build
     endif()
 endif()
 
 # --- IR Test Executable ---
 add_executable(ir_gen_test tools/ir_gen_test.c)
+<<<<<<< HEAD
 if(PROX_STATIC_BUILD)
     # Link directly to sources for static build since proxpl_lib doesn't exist
     target_sources(ir_gen_test PRIVATE ${LIB_SOURCES})
@@ -148,10 +184,14 @@ else()
         target_link_libraries(ir_gen_test PRIVATE ${LIBFFI_LIBRARIES})
     endif()
 endif()
+=======
+target_link_libraries(ir_gen_test PRIVATE proxpl_lib)
+>>>>>>> fix-ci-build
 
 # --- LLVM Gen Test Executable ---
 add_executable(llvm_gen_test tools/llvm_gen_test.c)
 
+<<<<<<< HEAD
 if(PROX_STATIC_BUILD)
     target_sources(llvm_gen_test PRIVATE ${LIB_SOURCES})
     if (LLVM_FOUND)
@@ -166,13 +206,19 @@ else()
         target_link_libraries(llvm_gen_test PRIVATE ${LIBFFI_LIBRARIES})
     endif()
 endif()
+=======
+target_link_libraries(llvm_gen_test PRIVATE proxpl_lib ${llvm_libs})
+>>>>>>> fix-ci-build
 
 # --- PRM Executable ---
 add_executable(prm 
     tools/prm_main.c 
     src/prm/manifest.c 
     src/prm/builder.c
+<<<<<<< HEAD
     src/prm/commands/cmd_core.c
+=======
+>>>>>>> fix-ci-build
 )
 # PRM doesn't strictly need proxpl_lib unless it uses core types?
 # For now, it's standalone, but let's link it if needed later.

Doxyfile

@@ -2,7 +2,11 @@
 # Generated documentation will be in build/docs/
 
 PROJECT_NAME           = ProXPL
+<<<<<<< HEAD
 PROJECT_NUMBER         = 0.7.0-pre
+=======
+PROJECT_NUMBER         = 0.1.0
+>>>>>>> fix-ci-build
 PROJECT_BRIEF          = "A Modern Programming Language Compiler"
 PROJECT_LOGO           =