api: all nullptr compatible types (except slice) writes <nil> to std:…

…:ostream if it is nil
julelang · Mar 27, 2024 · f5986ef · f5986ef
1 parent 1d5430e
commit f5986ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/api/any.hpp b/api/any.hpp
@@ -288,7 +288,7 @@ namespace jule
             if (src.operator!=(nullptr))
                 stream << src.type->to_str(src.data);
             else
-                stream << 0;
+                stream << "<nil>";
             return stream;
         }
     };

diff --git a/api/fn.hpp b/api/fn.hpp
@@ -89,19 +89,19 @@ namespace jule
             return this->_addr;
         }
 
-        inline Fn<Function>& operator=(std::nullptr_t) noexcept
+        inline Fn<Function> &operator=(std::nullptr_t) noexcept
         {
             this->buffer = nullptr;
             return *this;
         }
 
-        inline Fn<Function>& operator=(const std::function<Function> &function)
+        inline Fn<Function> &operator=(const std::function<Function> &function)
         {
             this->buffer = function;
             return *this;
         }
 
-        inline Fn<Function>& operator=(const Function &function)
+        inline Fn<Function> &operator=(const Function &function)
         {
             this->buffer = function;
             return *this;
@@ -130,6 +130,8 @@ namespace jule
         friend std::ostream &operator<<(std::ostream &stream,
                                         const Fn<Function> &src) noexcept
         {
+            if (src == nullptr)
+                return (stream << "<nil>");
             return (stream << (void *)src._addr);
         }
     };

diff --git a/api/ptr.hpp b/api/ptr.hpp
@@ -320,7 +320,7 @@ namespace jule
                                                const jule::Ptr<T> &ref) noexcept
         {
             if (ref == nullptr)
-                stream << "nil";
+                stream << "<nil>";
             else
                 stream << ref.alloc;
             return stream;

diff --git a/api/trait.hpp b/api/trait.hpp
@@ -276,6 +276,8 @@ namespace jule
         friend inline std::ostream &operator<<(std::ostream &stream,
                                                const jule::Trait<Mask> &src) noexcept
         {
+            if (src == nullptr)
+                return stream << "<nil>";
             return stream << (void *)src.data.alloc;
         }
     };