wip: gl::io refactor

Author: SpectraL519

include/gl/edge_descriptor.hpp

@@ -7,6 +7,7 @@
 #include "gl/constants.hpp"
 #include "gl/directional_tags.hpp"
 #include "gl/io/format.hpp"
+#include "gl/io/options.hpp"
 #include "gl/types/core.hpp"
 #include "gl/vertex_descriptor.hpp"
 
@@ -166,29 +167,33 @@ class edge_descriptor final {
 
 private:
     void _write(std::ostream& os) const {
+        using io::detail::option_bit;
+
         if constexpr (not traits::c_writable<properties_type>) {
             this->_write_no_properties(os);
             return;
         }
         else {
-            if (not io::is_option_set(os, io::graph_option::with_edge_properties)) {
+            if (not io::is_option_set(os, option_bit::with_connection_properties)) {
                 this->_write_no_properties(os);
                 return;
             }
 
-            if (io::is_option_set(os, io::graph_option::verbose)) {
+            // TODO: print ID
+            if (io::is_option_set(os, option_bit::verbose))
                 os << "[source: " << this->_vertices.first << ", target: " << this->_vertices.second
                    << " | properties: " << this->_properties.get() << "]";
-            }
-            else {
+            else
                 os << "[" << this->_vertices.first << ", " << this->_vertices.second << " | "
                    << this->_properties.get() << "]";
-            }
         }
     }
 
     void _write_no_properties(std::ostream& os) const {
-        if (io::is_option_set(os, io::graph_option::verbose))
+        using io::detail::option_bit;
+
+        // TODO: print ID
+        if (io::is_option_set(os, option_bit::verbose))
             os << "[source: " << this->_vertices.first << ", target: " << this->_vertices.first
                << "]";
         else

include/gl/graph.hpp

@@ -7,6 +7,7 @@
 #include "gl/constants.hpp"
 #include "gl/graph_traits.hpp"
 #include "gl/impl/impl_tags.hpp"
+#include "gl/io/options.hpp"
 #include "gl/io/stream_options_manipulator.hpp"
 #include "gl/util/ranges.hpp"
 
@@ -630,12 +631,14 @@ class graph final {
     // --- stream operators ---
 
     friend std::ostream& operator<<(std::ostream& os, const graph& g) {
-        if (io::is_option_set(os, io::graph_option::gsf)) {
+        using io::detail::option_bit;
+
+        if (io::is_option_set(os, option_bit::specification_fmt)) {
             g._gsf_write(os);
             return os;
         }
 
-        if (io::is_option_set(os, io::graph_option::verbose))
+        if (io::is_option_set(os, option_bit::verbose))
             g._verbose_write(os);
         else
             g._concise_write(os);
@@ -747,10 +750,12 @@ class graph final {
     }
 
     void _gsf_write(std::ostream& os) const {
+        using io::detail::option_bit;
+
         const bool with_vertex_properties =
-            io::is_option_set(os, io::graph_option::with_vertex_properties);
+            io::is_option_set(os, option_bit::with_vertex_properties);
         const bool with_edge_properties =
-            io::is_option_set(os, io::graph_option::with_edge_properties);
+            io::is_option_set(os, option_bit::with_connection_properties);
 
         // print graph size
         os << std::format(

include/gl/io.hpp

@@ -9,7 +9,7 @@
 #include "gl/io/format.hpp"
 #include "gl/io/stream_options_manipulator.hpp"
 
-#include "gl/io/graph_options.hpp"
+#include "gl/io/options.hpp"
 #include "gl/io/graph_fio.hpp"
 
 // clang-format on

include/gl/io/graph_options.hpp

@@ -0,0 +1,50 @@
+// Copyright (c) 2024-2026 Jakub Musiał
+// This file is part of the CPP-GL project (https://github.com/SpectraL519/cpp-gl).
+// Licensed under the MIT License. See the LICENSE file in the project root for full license information.
+
+#pragma once
+
+#include "gl/io/stream_options_manipulator.hpp"
+
+namespace gl::io {
+
+namespace detail {
+
+enum class option_bit : bit_position_type {
+    verbose = 0ul,
+    with_vertex_properties = 1ul,
+    with_connection_properties = 2ul,
+    specification_fmt = 3ul
+};
+
+} // namespace detail
+
+inline const stream_options_manipulator verbose = set_option(detail::option_bit::verbose);
+inline const stream_options_manipulator concise = unset_option(detail::option_bit::verbose);
+
+inline const stream_options_manipulator with_vertex_properties =
+    set_option(detail::option_bit::with_vertex_properties);
+inline const stream_options_manipulator without_vertex_properties =
+    unset_option(detail::option_bit::with_vertex_properties);
+
+inline const stream_options_manipulator with_edge_properties =
+    set_option(detail::option_bit::with_connection_properties);
+inline const stream_options_manipulator without_edge_properties =
+    unset_option(detail::option_bit::with_connection_properties);
+
+inline const stream_options_manipulator with_properties = set_options(
+    {detail::option_bit::with_vertex_properties, detail::option_bit::with_connection_properties}
+);
+inline const stream_options_manipulator without_properties = unset_options(
+    {detail::option_bit::with_vertex_properties, detail::option_bit::with_connection_properties}
+);
+
+inline const stream_options_manipulator enable_gsf =
+    set_option(detail::option_bit::specification_fmt);
+inline const stream_options_manipulator disable_gsf =
+    unset_option(detail::option_bit::specification_fmt);
+
+inline const stream_options_manipulator default_options =
+    unset_options(~static_cast<iword_type>(0));
+
+} // namespace gl::io

include/gl/io/options.hpp

@@ -6,7 +6,7 @@
 
 #include "gl/constants.hpp"
 #include "gl/decl/graph_traits.hpp"
-#include "gl/io/graph_options.hpp"
+#include "gl/io/options.hpp"
 #include "gl/traits.hpp"
 #include "gl/types/core.hpp"
 #include "gl/types/properties.hpp"
@@ -99,32 +99,32 @@ class vertex_descriptor final {
 
 private:
     void _write(std::ostream& os) const {
+        using io::detail::option_bit;
+
         if constexpr (not traits::c_writable<properties_type>) {
             this->_write_no_properties(os);
             return;
         }
         else {
-            if (not io::is_option_set(os, io::graph_option::with_vertex_properties)) {
+            if (not io::is_option_set(os, option_bit::with_vertex_properties)) {
                 this->_write_no_properties(os);
                 return;
             }
 
-            if (io::is_option_set(os, io::graph_option::verbose)) {
+            if (io::is_option_set(os, option_bit::verbose))
                 os << "[id: " << this->_id << " | properties: " << this->_properties.get() << "]";
-            }
-            else {
+            else
                 os << "[" << this->_id << " | " << this->_properties.get() << "]";
-            }
         }
     }
 
     void _write_no_properties(std::ostream& os) const {
-        if (io::is_option_set(os, io::graph_option::verbose)) {
+        using io::detail::option_bit;
+
+        if (io::is_option_set(os, option_bit::verbose))
             os << std::format("[id: {}]", this->_id);
-        }
-        else {
+        else
             os << this->_id;
-        }
     }
 
     id_type _id;