sprintf, support 'space' flag and %a/%A

closes #654

Author: porres

cyclone_objects/binaries/control/sprintf.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <string.h>
+//#include <locale.h>
 #include "m_pd.h"
 #include <common/api.h>
 
@@ -386,7 +387,7 @@ static int sprintf_parsepattern(t_sprintf *x, char **patternp)
             type = SPRINTF_INT;
             break;
             }
-        else if (strchr("eEfFgG", *ptr))
+        else if (strchr("aAeEfFgG", *ptr))
             {
 /*            if (modifier)
                 {
@@ -429,6 +430,21 @@ static int sprintf_parsepattern(t_sprintf *x, char **patternp)
                 }
             break;
             }
+        else if (*ptr == '\\'){ // ignore escape character (needed for space flag)
+            if(x){  // buffer-shrinking hack at the 2nd run
+                char *p1 = ptr;       // Points to the backslash
+                char *p2 = ptr + 1;   // Points to the next character (e.g., the space)
+                if(*p2 != '\0') {    // Ensure there's a character after the backslash
+                    // Shift everything left, overwriting the backslash
+                    do {
+                        *p1++ = *p2++;
+                    } while (*p2);
+                    *p1 = '\0';  // Null-terminate the string
+                }
+                // Adjust the pointer so that the current position is correctly processed
+                ptr--;
+            }
+        }
         else if (strchr("CSnm", *ptr))
             {
             if (x) sprintf(errstring, "\'%c\' type not supported", *ptr);
@@ -461,7 +477,7 @@ static int sprintf_parsepattern(t_sprintf *x, char **patternp)
             }
             modifier = *ptr;
         }
-        else if (strchr("aAhjLqtzZ", *ptr))
+        else if (strchr("hjLqtzZ", *ptr))
             {
             if (x) sprintf(errstring, "\'%c\' modifier not supported", *ptr);
                 break;
@@ -650,4 +666,5 @@ CYCLONE_OBJ_API void sprintf_setup(void)
     class_addsymbol(sprintf_proxy_class, sprintf_proxy_symbol);
     class_addlist(sprintf_proxy_class, sprintf_proxy_list);
     class_addanything(sprintf_proxy_class, sprintf_proxy_anything);
+//    setlocale(LC_NUMERIC, "en_US.UTF-8");
 }

documentation/help_files/sprintf-help.pd

@@ -28,44 +28,48 @@
 #X obj 376 128 nbx 3 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10 #dcdcdc #000000 #000000 0 256;
 #X text 172 343 - formats the message with current input, f 59;
 #X obj 75 364 cnv 17 3 27 empty empty 0-n 5 9 0 16 #dcdcdc #9c9c9c 0;
-#N canvas 777 115 489 472 possible-types 0;
-#X text 91 46 %c;
-#X text 112 46 character, f 49;
-#X text 55 59 %d or %i;
-#X text 91 98 %e;
-#X text 91 111 %E;
-#X text 91 150 %o;
-#X text 91 163 %s;
-#X text 91 176 %u;
-#X text 112 176 unsigned integer, f 49;
-#X text 91 189 %x;
-#X text 112 189 unsigned hexadecimal in lowercase, f 49;
-#X text 91 202 %X;
-#X text 112 202 unsigned hexadecimal in CAPS, f 49;
-#X text 112 150 unsigned octal, f 49;
-#X text 112 163 string, f 49;
-#X text 91 124 %g;
-#X text 91 137 %G;
-#X text 91 85 %F;
-#X text 91 72 %f;
-#X obj 72 302 pdcontrol;
-#X msg 72 273 browse https://en.wikipedia.org/wiki/Printf_format_string;
-#X text 57 19 Possible types in [sprintf], f 30;
-#X text 112 59 signed decimal intege, f 49;
-#X text 112 72 float (lowercase for 'nan'/'inf'), f 49;
-#X text 112 85 float (uppercase for 'NAN'/'INF'), f 49;
-#X text 112 98 float in exponential notation using "e" character;
-#X text 112 111 float in exponential notation using "E" character;
-#X text 112 124 float in normal (%f) or exponential (%e), f 49;
-#X text 112 137 float in normal (%F) or exponential (%E), f 49;
-#X text 93 243 For more details on these types \, refer to a standard C library manual. For instance in the link below:, f 52;
-#X obj 72 248 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
-#X text 156 305 The above reference has more information and parameters not really available for [sprintf]. Nonetheless \, the optional fields: "+" \, "#" \, the width and precision field are supported. Only the single modifiers "h" and "l" are allowed., f 46;
-#X text 59 382 Inconsistency: If a format type is not supported or invalid \, [sprintf] doesn't create a corresponding inlet and prints an error isntead. The Max version creates an inlet for whatever inserted type \, invalid or not \, and only prints an error when trying to convert.;
+#N canvas 777 115 489 502 possible-types 0;
+#X text 91 66 %c;
+#X text 112 66 character, f 49;
+#X text 55 79 %d or %i;
+#X text 91 118 %e;
+#X text 91 131 %E;
+#X text 91 170 %o;
+#X text 91 183 %s;
+#X text 91 196 %u;
+#X text 112 196 unsigned integer, f 49;
+#X text 91 209 %x;
+#X text 112 209 unsigned hexadecimal in lowercase, f 49;
+#X text 91 222 %X;
+#X text 112 222 unsigned hexadecimal in CAPS, f 49;
+#X text 112 170 unsigned octal, f 49;
+#X text 112 183 string, f 49;
+#X text 91 144 %g;
+#X text 91 157 %G;
+#X text 91 105 %F;
+#X text 91 92 %f;
+#X obj 72 322 pdcontrol;
+#X msg 72 293 browse https://en.wikipedia.org/wiki/Printf_format_string;
+#X text 57 12 Possible types in [sprintf], f 30;
+#X text 112 79 signed decimal intege, f 49;
+#X text 112 92 float (lowercase for 'nan'/'inf'), f 49;
+#X text 112 105 float (uppercase for 'NAN'/'INF'), f 49;
+#X text 112 118 float in exponential notation using "e" character;
+#X text 112 131 float in exponential notation using "E" character;
+#X text 112 144 float in normal (%f) or exponential (%e), f 49;
+#X text 112 157 float in normal (%F) or exponential (%E), f 49;
+#X text 93 263 For more details on these types \, refer to a standard C library manual. For instance in the link below:, f 52;
+#X obj 72 268 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
+#X text 156 325 The above reference has more information and parameters not really available for [sprintf]. Nonetheless \, the optional fields: "+" \, "#" \, the width and precision field are supported. Only the single modifiers "h" and "l" are allowed., f 46;
+#X text 59 402 Inconsistency: If a format type is not supported or invalid \, [sprintf] doesn't create a corresponding inlet and prints an error isntead. The Max version creates an inlet for whatever inserted type \, invalid or not \, and only prints an error when trying to convert.;
+#X text 91 42 %a;
+#X text 91 54 %A;
+#X text 112 42 float hexadecimal in lowercase, f 49;
+#X text 112 54 float hexadecimal in CAPS, f 49;
 #X connect 20 0 19 0;
 #X connect 30 0 20 0;
 #X restore 326 491 pd possible-types;
-#N canvas 554 133 767 604 examples 0;
+#N canvas 556 80 781 745 examples 0;
 #X obj 61 276 print;
 #X obj 61 181 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10 #dcdcdc #000000 #000000 0 256;
 #X obj 61 458 print;
@@ -104,6 +108,11 @@
 #X obj 340 527 cyclone/sprintf this %s %s %s;
 #X msg 425 500 quite alright;
 #X text 452 241 Nonetheless \, note you can use backslashes to create symbols with special characters such as spaces., f 42;
+#X text 115 630 see the help file of, f 12;
+#X obj 174 650 makefilename;
+#X text 125 679 fpr more details;
+#X text 285 612 Unlike the original in MAX \, the Cyclone version supports the 'space' flag. Unlike [makefilename] (and also the MAX original) \, [sprintf] supports the apostrophe flag and the '%a'/'%A' types., f 64;
+#X text 285 652 The MAX original has issues in dealing with spaces for symbol input that contains spaces and the width field when it adds spaces. What happens is that atoms get split when you don't have the 'symout' argument. The cyclone version also has the same issues., f 64;
 #X connect 1 0 25 0;
 #X connect 3 0 8 0;
 #X connect 4 0 6 0;