Refactor headers

Author: ChaseSunstrom

CMakeLists.txt

@@ -89,6 +89,7 @@ FetchContent_Declare(
     GIT_SHALLOW TRUE
 )
 
+# Fetch packages without setup commands
 FetchContent_MakeAvailable(fmt tomlplusplus)
 
 # Add source files

README.md

@@ -117,6 +117,7 @@ spdlog = "1.12.0"
 | `cforge run` | Build and run the project |
 | `cforge clean` | Clean build artifacts |
 | `cforge install` | Install project to system |
+| `cforge circular` | Check for circular dependencies | 
 
 ### Dependencies
 

include/cforge/log.hpp

@@ -2,7 +2,7 @@
  * @file log.hpp
  * @brief Cargo-style logging utilities for cforge
  *
- * Output format matches Rust's Cargo:
+ * Output format matches Rust's CARGO:
  *   - 12-character right-aligned status word (colored)
  *   - Message follows in default color
  *   - No emojis, no brackets
@@ -62,16 +62,16 @@ enum class log_verbosity {
  * @class logger
  * @brief Static class providing Cargo-style logging functionality
  *
- * All output follows Cargo's format:
+ * All output follows CARGO's format:
  *   {status:>12} {message}
  *
  * Where status is a colored action word like "Compiling", "Building", etc.
  */
 class logger {
 public:
-  // ============================================================
+
   // Configuration
-  // ============================================================
+
 
   /**
    * @brief Sets the global verbosity level for logging
@@ -85,9 +85,8 @@ class logger {
    */
   static log_verbosity get_verbosity();
 
-  // ============================================================
-  // Cargo-style status messages (right-aligned status word)
-  // ============================================================
+  // CARGO-style status messages (right-aligned status word)
+
 
   /**
    * @brief Print a status message with custom action word
@@ -104,7 +103,7 @@ class logger {
   /**
    * @brief Print a cyan status message (info/progress)
    *
-   * Common actions: "Checking", "Fetching", "Updating", "Running"
+   * Common actions: "Checking", "Fetching", "Updating", "RUNNING"
    */
   static void print_status(const std::string &message);
 
@@ -130,9 +129,7 @@ class logger {
    */
   static void print_verbose(const std::string &message);
 
-  // ============================================================
-  // Specific action helpers (Cargo-style)
-  // ============================================================
+  // Specific action helpers (CARGO-style)
 
   /**
    * @brief Print "Compiling {target}"
@@ -145,7 +142,7 @@ class logger {
   static void building(const std::string &target);
 
   /**
-   * @brief Print "Running {command}"
+   * @brief Print "RUNNING {command}"
    */
   static void running(const std::string &command);
 
@@ -214,17 +211,17 @@ class logger {
    */
   static void cleaning(const std::string &target);
 
-  // ============================================================
+
   // Build progress display (Rust-style)
-  // ============================================================
+
 
   /**
    * @brief Print "Compiling {file}" with optional timing
    * @param file The file being compiled
    * @param duration_secs Optional duration in seconds (for completed files)
    */
   static void compiling_file(const std::string &file,
-                             double duration_secs = -1.0);
+                             cforge_double_t duration_secs = -1.0);
 
   /**
    * @brief Display a progress bar
@@ -245,12 +242,12 @@ class logger {
    * @param slowest_files Vector of (filename, duration) pairs for slowest files
    */
   static void print_timing_summary(
-      double total_duration,
-      const std::vector<std::pair<std::string, double>> &slowest_files);
+      cforge_double_t total_duration,
+      const std::vector<std::pair<std::string, cforge_double_t>> &slowest_files);
+
 
-  // ============================================================
   // Legacy compatibility (maps to new style)
-  // ============================================================
+
 
   /**
    * @brief Print a header/banner (simplified, no box drawing)
@@ -275,7 +272,7 @@ class logger {
 private:
   static log_verbosity s_verbosity;
 
-  // Status width for right-alignment (Cargo uses 12)
+  // Status width for right-alignment (CARGO uses 12)
   static constexpr int STATUS_WIDTH = 12;
 
   /**

include/core/build_progress.hpp

@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "types.h"
+
 #include <chrono>
 #include <functional>
 #include <mutex>
@@ -20,7 +22,7 @@ struct file_timing {
   std::string filename;
   std::chrono::steady_clock::time_point start_time;
   std::chrono::steady_clock::time_point end_time;
-  double duration_seconds = 0.0;
+  cforge_double_t duration_seconds = 0.0;
 };
 
 /**
@@ -50,17 +52,17 @@ class build_progress {
   /**
    * @brief Get the current progress as a fraction (0.0 to 1.0)
    */
-  double get_progress() const;
+  cforge_double_t get_progress() const;
 
   /**
    * @brief Get current step number
    */
-  int get_current_step() const;
+  cforge_int_t get_current_step() const;
 
   /**
    * @brief Get total steps
    */
-  int get_total_steps() const;
+  cforge_int_t get_total_steps() const;
 
   /**
    * @brief Check if progress information is available
@@ -76,7 +78,7 @@ class build_progress {
    * @brief Get the slowest files (sorted by duration, descending)
    * @param count Maximum number of files to return
    */
-  std::vector<file_timing> get_slowest_files(size_t count = 5) const;
+  std::vector<file_timing> get_slowest_files(cforge_size_t count = 5) const;
 
   /**
    * @brief Called when a file starts compiling
@@ -91,8 +93,8 @@ class build_progress {
 private:
   mutable std::mutex mutex_;
   std::string current_file_;
-  int current_step_ = 0;
-  int total_steps_ = 0;
+  cforge_int_t current_step_ = 0;
+  cforge_int_t total_steps_ = 0;
   bool has_progress_ = false;
 
   std::vector<file_timing> timings_;
@@ -126,7 +128,7 @@ class build_progress {
  * @param width Width of the progress bar in characters
  * @param show_percentage Whether to show percentage
  */
-void display_progress_bar(int current, int total, int width = 20,
+void display_progress_bar(cforge_int_t current, cforge_int_t total, cforge_int_t width = 20,
                           bool show_percentage = true);
 
 /**

include/core/build_utils.hpp

@@ -136,9 +136,9 @@ bool run_cmake_build(const std::filesystem::path &build_dir,
                      const std::string &target = "", cforge_int_t num_jobs = 0,
                      bool verbose = false);
 
-// =============================================================================
+
 // Smart Rebuild Utilities
-// =============================================================================
+
 
 /**
  * @brief Check if a file is newer than another file

include/core/config_resolver.hpp

@@ -22,23 +22,23 @@ namespace cforge {
 /**
  * @brief Enumeration of supported platforms
  */
-enum class Platform {
-  Windows,
-  Linux,
-  MacOS,
-  Unknown
+enum class platform {
+  WINDOWS,
+  LINUX,
+  MACOS,
+  UNKNOWN
 };
 
 /**
  * @brief Enumeration of supported compilers
  */
-enum class Compiler {
+enum class compiler {
   MSVC,
   GCC,
-  Clang,
-  AppleClang,
-  MinGW,
-  Unknown
+  CLANG,
+  APPLE_CLANG,
+  MINGW,
+  UNKNOWN
 };
 
 /**
@@ -57,41 +57,41 @@ struct resolved_config {
  * @brief Get the current platform
  * @return The detected platform
  */
-Platform get_current_platform();
+platform get_current_platform();
 
 /**
  * @brief Get the platform name as a string
  * @param platform The platform enum value
  * @return The platform name (lowercase)
  */
-std::string platform_to_string(Platform platform);
+std::string platform_to_string(platform platform);
 
 /**
  * @brief Parse a platform string to enum
  * @param str The platform string (case-insensitive)
  * @return The platform enum value
  */
-Platform string_to_platform(const std::string &str);
+platform string_to_platform(const std::string &str);
 
 /**
  * @brief Get the current compiler based on environment/detection
  * @return The detected compiler
  */
-Compiler detect_compiler();
+compiler detect_compiler();
 
 /**
  * @brief Get the compiler name as a string
  * @param compiler The compiler enum value
  * @return The compiler name (lowercase with underscores)
  */
-std::string compiler_to_string(Compiler compiler);
+std::string compiler_to_string(compiler compiler);
 
 /**
  * @brief Parse a compiler string to enum
  * @param str The compiler string (case-insensitive)
  * @return The compiler enum value
  */
-Compiler string_to_compiler(const std::string &str);
+compiler string_to_compiler(const std::string &str);
 
 /**
  * @brief Check if a platform list contains the current platform
@@ -125,13 +125,13 @@ class config_resolver {
    * @brief Set the target platform (defaults to current platform)
    * @param platform The target platform
    */
-  void set_platform(Platform platform);
+  void set_platform(platform platform);
 
   /**
    * @brief Set the target compiler (defaults to detected compiler)
    * @param compiler The target compiler
    */
-  void set_compiler(Compiler compiler);
+  void set_compiler(compiler compiler);
 
   /**
    * @brief Resolve defines for a given build configuration
@@ -183,17 +183,17 @@ class config_resolver {
   /**
    * @brief Get the current platform
    */
-  Platform get_platform() const { return platform_; }
+  platform get_platform() const { return platform_; }
 
   /**
    * @brief Get the current compiler
    */
-  Compiler get_compiler() const { return compiler_; }
+  compiler get_compiler() const { return compiler_; }
 
 private:
   const toml_reader &config_;
-  Platform platform_;
-  Compiler compiler_;
+  platform platform_;
+  compiler compiler_;
 
   /**
    * @brief Merge string arrays (append unique values)

include/core/constants.h

@@ -21,7 +21,7 @@
 #define DEFAULT_OBJ_DIR "obj"
 #define VCPKG_DEFAULT_DIR "~/.vcpkg"
 #define CMAKE_MIN_VERSION "3.15"
-#define WORKSPACE_FILE "cforge.workspace.toml"
+#define WORKSPACE_FILE "cforge.workspace.toml" // <-- Deprecated
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4996)

include/core/dependency_hash.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 #include <chrono>
 #include <cstdint>
 #include <filesystem>
@@ -119,7 +121,7 @@ class dependency_hash {
    * @param size Size of data in bytes
    * @return 64-bit hash value
    */
-  static uint64_t fnv1a_hash(const void *data, size_t size);
+  static uint64_t fnv1a_hash(const void *data, cforge_size_t size);
 
   /**
    * @brief Convert 64-bit hash to hex string
@@ -143,10 +145,10 @@ class dependency_hash {
    * @brief Trim whitespace from string
    */
   static std::string trim(const std::string &str) {
-    size_t start = str.find_first_not_of(" \t\r\n");
+    cforge_size_t start = str.find_first_not_of(" \t\r\n");
     if (start == std::string::npos)
       return "";
-    size_t end = str.find_last_not_of(" \t\r\n");
+    cforge_size_t end = str.find_last_not_of(" \t\r\n");
     return str.substr(start, end - start + 1);
   }
 };