feat: Add VS Code extension, benchmarking tools, and comprehensive documentation, updating core project configurations.

Author: ProgrammerKR

.gitignore

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

CHANGELOG.md

@@ -6,7 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
-<<<<<<< HEAD
 ## [1.0.0] - 2026-01-06
 
 ### Added
@@ -67,11 +66,6 @@ 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
@@ -98,11 +92,8 @@ 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
@@ -123,11 +114,7 @@ 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
 
@@ -224,11 +211,7 @@ 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)
@@ -261,23 +244,15 @@ 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
 
 ---
@@ -378,12 +353,6 @@ This project is licensed under the MIT License.
 
 ---
 
-<<<<<<< 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,9 +1,5 @@
 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)
@@ -19,7 +15,6 @@ else()
 endif()
 
 # --- LLVM Configuration ---
-<<<<<<< HEAD
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 # --- LLVM Configuration ---
@@ -49,22 +44,14 @@ 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 "")
@@ -87,17 +74,13 @@ 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 ---
@@ -136,36 +119,17 @@ 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})
@@ -184,14 +148,10 @@ 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)
@@ -206,19 +166,13 @@ 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,11 +2,7 @@
 # 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           = 
 

LICENSE

@@ -126,8 +126,4 @@ term sustainability of the ProX ecosystem.
 
 ────────────────────────────────────────────────────────
 END OF PROX PROFESSIONAL LICENSE (PPL)
-<<<<<<< HEAD
 ────────────────────────────────────────────────────────
-=======
-────────────────────────────────────────────────────────
->>>>>>> fix-ci-build