osh.h

commit 6edb8e4f9aeffe1cb6ff1e2f28faa3124178aa94
parent 5234e120f1572ced4d5097f67db119419b07696e
Author: Oshgnacknak <osh@oshgnacknak.de>
Date:   Mon,  3 Jan 2022 14:21:56 +0100

Add support for printing unsigned stuff

Diffstat:
M
examples/print.cpp
 | 
47
++++++++++++++++++++++++++++++++---------------
M
osh.h
 | 
27
++++++++++++++++++++++++++-

2 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/examples/print.cpp b/examples/print.cpp
@@ -1,44 +1,61 @@
 #define OSH_H_IMPLEMENTATION
 #include "osh.h"
 
+using namespace osh;
+
 struct Vector2 {
     double x, y;
 };
 
 template<typename P>
 void print1(P p, Vector2& v) {
-    osh::printp(p, "Vector2(", v.x, ", ", v.y, ')');
+    printp(p, "Vector2(", v.x, ", ", v.y, ')');
 }
 
 int main() {
-    osh::println("Concatinating different data types:",
+    println("Concatinating different data types:",
         '-', 5, 6.0d, 9, '+', 'L');
 
     char c = 'A';
-    osh::println("Printing char: ", c);
+    println("Printing char: ", c);
 
     int i = 69;
-    osh::println("Printing int: ", i);
+    println("Printing int: ", i);
         
     short int si = 420;
-    osh::println("Printing short int: ", si);
+    println("Printing short int: ", si);
         
     long int li = 666;
-    osh::println("Printing long int: ", li);
+    println("Printing long int: ", li);
         
     long long int lli = 0xdeadbeef;
-    osh::println("Printing long long int: ", lli);
+    println("Printing long long int: ", lli);
+
+    unsigned char uc = 'E';
+    println("Printing unsigned char: ", uc);
+    
+    unsigned int ui = 1337;
+    println("Printing unsigned int: ", ui);
+    
+    unsigned short int usi = 25565;
+    println("Printing unsigned short int: ", usi);
+    
+    unsigned long int uli = 0xadbdef;
+    println("Printing unsigned long int: ", uli);
+    
+    unsigned long long int ulli = 987665543210;
+    println("Printing unsigned long long int: ", ulli);
         
     float f = 3.141592653589793;
-    osh::println("Printing float: ", f);
+    println("Printing float: ", f);
         
     double d = 2.71828;
-    osh::println("Printing double: ", d);
+    println("Printing double: ", d);
 
     long double ld = 1.141592653589793;
-    osh::println("Printing long double: ", ld);
+    println("Printing long double: ", ld);
 
-    osh::println("Printing a pointer to anythink (excluding char*): ",
+    println("Printing a pointer to anythink (excluding char*): ",
         &i, ", ",
         &si, ", ",
         &li, ", ",
@@ -55,13 +72,13 @@ int main() {
     buf[4] = 'e';
     buf[5] = 'r';
     buf[6] = '\0';
-    osh::println("Printing char buffers: ", buf);
+    println("Printing char buffers: ", buf);
 
     Vector2 v = { 69, 420 };
-    osh::println("Printing costume types (see print1 above): ", v);
-    osh::println("^ Comment it out, error message is ACTUALLY readable");
+    println("Printing costume types (see print1 above): ", v);
+    println("^ Comment it out, error message is ACTUALLY readable");
 
-    osh::printp(stderr, "Printing to any FILE* other than stdout: ", buf, " - ", v, '\n');
+    printp(stderr, "Printing to any FILE* other than stdout: ", buf, " - ", v, '\n');
 
     return 0;
 }
diff --git a/osh.h b/osh.h
@@ -10,7 +10,7 @@ namespace osh {
     
     template<typename T>
     T max(T a, T b);
-    
+
     template<typename P, typename T>
     concept PrintableTo = requires(P p, T t) {
         print1(p, t);
@@ -50,6 +50,11 @@ namespace osh {
     void print1(Formatter auto&, const short int&);
     void print1(Formatter auto&, const long int&);
     void print1(Formatter auto&, const long long int&);
+    void print1(Formatter auto&, const unsigned char&);
+    void print1(Formatter auto&, const unsigned int&);
+    void print1(Formatter auto&, const unsigned short int&);
+    void print1(Formatter auto&, const unsigned long int&);
+    void print1(Formatter auto&, const unsigned long long int&);
     void print1(Formatter auto&, const float&);
     void print1(Formatter auto&, const double&);
     void print1(Formatter auto&, const long double&);
@@ -112,6 +117,26 @@ namespace osh {
         fmt.format("%lld", n);
     }
 
+    void print1(Formatter auto& fmt, const unsigned char& c) {
+        printp(fmt, (char) c);
+    }
+
+    void print1(Formatter auto& fmt, const unsigned int& n) {
+        fmt.format("%u", n);
+    }
+
+    void print1(Formatter auto& fmt, const unsigned short int& n) {
+        fmt.format("%u", n);
+    }
+
+    void print1(Formatter auto& fmt, const unsigned long int& n) {
+        fmt.format("%lu", n);
+    }
+
+    void print1(Formatter auto& fmt, const unsigned long long int& n) {
+        fmt.format("%llu", n);
+    }
+
     void print1(Formatter auto& fmt, const float& f) {
         fmt.format("%f", f);
     }