Fixed error in strcasecompu

Author: BartJongejan

Changelog

@@ -1,3 +1,6 @@
+12 September 2025
+Fixed error in strcasecompu. (Case insensitive string compare)
+
 4 April 2025
 VIS option on call to lst$ affixes all unvisited binary nodes with {}.
 (Compile with -DUNVISITED.)

WebAssembly/emscriptenHowToHTML.sh

@@ -1,9 +1,9 @@
 #emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.9
 # Without WebAssembly:
 ##emcc ../src/*.c --pre-js pre.js -s EXPORTED_RUNTIME_METHODS='["cwrap", "intArrayFromString"]' -s "EXPORTED_FUNCTIONS=['_main','_oneShot','_malloc']" -s "MODULARIZE=0" -O0 -o potuC.html -s "WASM=0"
- emcc ../src/*.c --pre-js pre.js -s EXPORTED_RUNTIME_METHODS='["stringToNewUTF8", "cwrap", "intArrayFromString","stackAlloc"]' -s "EXPORTED_FUNCTIONS=['_main','_oneShot','_malloc']" -s "MODULARIZE=0" -O0 -o potuC.html -s "WASM=0"
+# emcc ../src/*.c --pre-js pre.js -s EXPORTED_RUNTIME_METHODS='["stringToNewUTF8", "cwrap", "intArrayFromString","stackAlloc"]' -s "EXPORTED_FUNCTIONS=['_main','_oneShot','_malloc']" -s "MODULARIZE=0" -O0 -o potuC.html -s "WASM=0"
 # With WebAssembly
 # Note that you probably need to run from a web server. You can do `python3 -m http.server' and then load http://localhost:8000/bracmatJS.html in your browser.
 # See https://emscripten.org/docs/getting_started/FAQ.html#how-do-i-run-a-local-webserver-for-testing-why-does-my-program-stall-in-downloading-or-preparing
-#emcc ../src/*.c --pre-js pre.js -s EXPORTED_RUNTIME_METHODS='["stringToNewUTF8", "cwrap", "intArrayFromString","stackAlloc"]' -s "EXPORTED_FUNCTIONS=['_main','_oneShot','_malloc']" -s "MODULARIZE=0" -O0 -o potuC.html
+emcc ../src/*.c --pre-js pre.js -s EXPORTED_RUNTIME_METHODS='["stringToNewUTF8", "cwrap", "intArrayFromString","stackAlloc"]' -s "EXPORTED_FUNCTIONS=['_main','_oneShot','_malloc']" -s "MODULARIZE=0" -O0 -o potuC.html
 bracmat "get'\"edit-potuC.html.bra\""

src/encoding.c

@@ -302,34 +302,37 @@ int hasUTF8MultiByteCharacters(const char* s)
     return ret == 0 ? multiByteCharSeen : 0;
     }
 
-int strcasecompu(char** S, char** P, char* cutoff)
+int strcasecompu(const char* s, const char* p, const char* cutoff)
 /* Additional argument cutoff */
     {
     int sutf = 1;
     int putf = 1;
-    char* s = *S;
-    char* p = *P;
     while(s < cutoff && *s && *p)
         {
         int diff;
-        char* ns = s;
-        char* np = p;
+        const char* ns = s;
+        const char* np = p;
         int ks = getCodePoint2((const char**)&ns, &sutf);
         int kp = getCodePoint2((const char**)&np, &putf);
         assert(ks >= 0 && kp >= 0);
         diff = toLowerUnicode(ks) - toLowerUnicode(kp);
         if(diff)
             {
-            *S = s;
-            *P = p;
-            return diff;
+            return ONCE;
             }
         s = ns;
         p = np;
         }
-    *S = s;
-    *P = p;
-    return (s < cutoff ? (int)(unsigned char)*s : 0) - (int)(unsigned char)*p;
+    if(*p == 0)
+        if(s == cutoff)
+            return TRUE | ONCE;
+        else
+            return FALSE;
+    else
+        if(*s == 0)
+            return ONCE;
+        else
+            return FALSE;
     }
 
 int strcasecomp(const char* s, const char* p)

src/encoding.h

@@ -19,7 +19,7 @@ unsigned char* putCodePoint(ULONG val, unsigned char* s);
 int getCodePoint(const char** ps);
 int hasUTF8MultiByteCharacters(const char* s);
 int getCodePoint2(const char** ps, int* isutf);
-int strcasecompu(char** S, char** P, char* cutoff);
+int strcasecompu(const char* S, const char* P, const char* cutoff);
 int strcasecomp(const char* s, const char* p);
 
 #endif

src/equal.c

@@ -548,7 +548,7 @@ int scompare(char* s, char* cutoff, psk p
 
     if((Flgs & (NOT | FRACTION | NUMBER | GREATER_THAN | SMALLER_THAN)) == (NOT | GREATER_THAN | SMALLER_THAN))
         { /* Case insensitive match: ~<> means "not different" */
-        Sign = strcasecompu(&s, &P, cutoff); /* Additional argument cutoff */
+        return strcasecompu(s, P, cutoff); /* Additional argument cutoff */
         }
     else
         {

src/potu.c

@@ -20,9 +20,9 @@
 email: bartj@hum.ku.dk
 */
 
-#define DATUM "4 April 2025"
-#define VERSION "6.29.0"
-#define BUILD "316"
+#define DATUM "12 September 2025"
+#define VERSION "6.30.0"
+#define BUILD "317"
 /*
 COMPILATION
 -----------

valid.bra

@@ -8117,6 +8117,9 @@ string line 2\"
           |   Out
             $ "Error: number containing a dot is not properly string matched."
           )
+          ( @(👨:~<>👨 ?c)&!c:
+          | Out$"Error in case-insensitive matching of UTF8"
+          )
       &   out
         $ ( str
           $ ( "Done. "