v2.1 release

Author: Moe-hacker

README.md

@@ -1,5 +1,10 @@
 # Full specification:
 [SPECIFICATION](SPEC.md)
+# New in v2.1:
+Note that this is not a stable implementation.
+```c
+bool cp_xterm_is_dark_mode();
+```
 # New in v2.0:
 Say hello to `T()` `F()` macro with _Generic() support!      
 Usage:
@@ -19,7 +24,6 @@ cprintf("{}{}{}{}","xxxxx"); // Also boom!!!!!!
 printf("%s","xxxxx"); // Good!
 cprintf("{}","xxxxxx"); // Also good :)
 ```
-Update: cprintf can now recognise extra {} when running program when args of cprintf <= 15.      
 # About GNU C:
 cprintf uses GNU C11, port/cprintf.c is in pure C std.     
 # Let's make a colorful world!

cprintf.c

@@ -57,7 +57,7 @@ void cprintf_free_buf__(void)
 	cprintf_buffer = NULL;
 	cprintf_buf_count = 0;
 }
-char *cprintf_regen_format__(const char *f, int limit)
+char *cprintf_regen_format__(const char *f)
 {
 	/*
 	 * This function will regenerate the format string
@@ -66,32 +66,19 @@ char *cprintf_regen_format__(const char *f, int limit)
 	 */
 	char *ret = strdup(cprintf_avoid_null__(f));
 	int j = 0;
-	// For the case that limit is 0, that means no limit.
-	// This is caused when args > 15, and we can't count it with CPRINTF_COUNT_ARGS.
-	if (limit == 0) {
-		limit = INT16_MAX;
-	}
 	int count = 0;
 	size_t len = cprintf_strlen__(f);
-	if (len == 0 || limit == 1) {
+	if (len == 0) {
 		cprintf_mark_buf__(ret);
 		return ret;
 	}
-	limit = limit - 1;
 	for (size_t i = 0; i < len - 1; i++) {
 		if (f[i] == '{' && f[i + 1] == '}') {
 			ret[j] = '%';
 			ret[j + 1] = 's';
 			j += 2;
 			i++;
 			count++;
-			if (count == limit) {
-				for (size_t k = i + 1; k < len - 1; k++) {
-					ret[j] = f[k];
-					j++;
-				}
-				break;
-			}
 		} else {
 			ret[j] = f[i];
 			j++;

include/cprintf.h

@@ -56,7 +56,7 @@
 #define false ((_Bool) + 0u)
 #endif
 #define CPRINTF_MAJOR 2
-#define CPRINTF_MINOR 0
+#define CPRINTF_MINOR 1
 bool cp_xterm_is_dark_mode(void);
 int cprintf__(const char *_Nonnull buf);
 int cfprintf__(FILE *_Nonnull stream, const char *_Nonnull buf);
@@ -129,30 +129,19 @@ extern bool cprintf_print_color_only_tty;
 #define F(cp_f_data__, cp_f_format__) \
 	cprintf_to_char__(cp_f_data__, cprintf_get_fmt__(cp_f_data__, cp_f_format__))
 #define T(cp_t_data__) F(cp_t_data__, NULL)
-#define cprintf_len__(cpl_format__, ...)                                                                 \
-	(snprintf(NULL, 0,                                                                               \
-		  cprintf_regen_format__(cpl_format__, CPRINTF_COUNT_ARGS(cpl_format__, ##__VA_ARGS__)), \
-		  ##__VA_ARGS__) +                                                                       \
-	 8)
-// Count the number of arguments passed to the csprintf().
-#define CPRINTF_COUNT_ARGS_IMPL(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, COUNT, ...) \
-	_Generic((COUNT), int: COUNT, default: 0)
-#define CPRINTF_COUNT_ARGS(...)                                                                                 \
-	CPRINTF_COUNT_ARGS_IMPL(__VA_ARGS__, ((int)15), ((int)14), ((int)13), ((int)12), ((int)11), ((int)10),  \
-				((int)9), ((int)8), ((int)7), ((int)6), ((int)5), ((int)4), ((int)3), ((int)2), \
-				((int)1), ((int)0))
-#define csprintf(string, format, ...)                                                                      \
-	({                                                                                                 \
-		int csp_ret__ = 0;                                                                         \
-		if (format == NULL) {                                                                      \
-			csp_ret__ = sprintf(string, "%s", "(null)");                                       \
-		} else {                                                                                   \
-			char *csp_fmt__ =                                                                  \
-				cprintf_regen_format__(format, CPRINTF_COUNT_ARGS(format, ##__VA_ARGS__)); \
-			csp_ret__ = sprintf(string, csp_fmt__, ##__VA_ARGS__);                             \
-			cprintf_free_buf__();                                                              \
-		}                                                                                          \
-		csp_ret__;                                                                                 \
+#define cprintf_len__(cpl_format__, ...) \
+	(snprintf(NULL, 0, cprintf_regen_format__(cpl_format__), ##__VA_ARGS__) + 8)
+#define csprintf(string, format, ...)                                          \
+	({                                                                     \
+		int csp_ret__ = 0;                                             \
+		if (format == NULL) {                                          \
+			csp_ret__ = sprintf(string, "%s", "(null)");           \
+		} else {                                                       \
+			char *csp_fmt__ = cprintf_regen_format__(format);      \
+			csp_ret__ = sprintf(string, csp_fmt__, ##__VA_ARGS__); \
+			cprintf_free_buf__();                                  \
+		}                                                              \
+		csp_ret__;                                                     \
 	})
 #define cprintf(format, ...)                                                   \
 	({                                                                     \
@@ -187,7 +176,7 @@ extern bool cprintf_print_color_only_tty;
 		free(cfp_buf__);                                                                \
 	}
 // For generic support.
-char *cprintf_regen_format__(const char *f, int limit);
+char *cprintf_regen_format__(const char *f);
 void cprintf_free_buf__(void);
 void cprintf_mark_buf__(char *b);
 // NOLINTEND

test.c

@@ -30,7 +30,6 @@
 #include "include/cprintf.h"
 int main(void)
 {
-	/*
 	cprintf("%s %s %d %s %d{clear}\n\n\n",
 		"{black}ehi{114;5;14}bfwvjbkuiew{red}fgLCUEUIGvli{white}uEGFVLI{green}ILWR{yellow}Hvbi{blue}HVIBU{purple}WBHC{cyan}wvlrjvkjnvkjdcbvljb{clear}cjbskdjlvbjasf",
 		"xxxxxxxxxxxxxxxxxxx[underline]xxxxxxxxx[clear]xx{cyan}xxxxx[highlight]xx{cyan}xxxx{base}xxxxxxxxxxxxx",
@@ -100,15 +99,12 @@ int main(void)
 	cprintf("{}\n", T(i));
 	cprintf("{}\n", "{}{}{}{}");
 	cprintf("END\n");
-	cprintf("{}{}{}\n");
-	cprintf("{}{}{}{}{}{}{}\n", "x", T(1));
 	cprintf("{red}red{green}green{blue}blue{yellow}yellow{purple}purple{cyan}cyan{white}white{black}black{clear}\n");
 	cprintf("[red]red[green]green[blue]blue[yellow]yellow[purple]purple[cyan]cyan[white]white[black]black[clear]\n");
-	*/
 	if (cp_xterm_is_dark_mode()) {
 		cprintf("{green}Dark mode is enabled\n");
 	} else {
 		cprintf("{red}Dark mode is not enabled{clear}\n");
 	}
-	// cprintf("cprintf version: %d.%d\n", CPRINTF_MAJOR, CPRINTF_MINOR);
+	cprintf("cprintf version: %d.%d\n", CPRINTF_MAJOR, CPRINTF_MINOR);
 }