Deploy the new <ctype.h> and `foocmp' macros from mLib.

[catacomb] / math / qdparse.c

diff --git a/math/qdparse.c b/math/qdparse.c
index 217cc62..9be9742 100644 (file)
--- a/math/qdparse.c
+++ b/math/qdparse.c
@@ -30,6 +30,8 @@
 #include <ctype.h>
 #include <string.h>
 
+#include <mLib/macros.h>
+
 #include "qdparse.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -45,7 +47,7 @@
 
 void qd_skipspc(qd_parse *qd)
 {
-  while (isspace((unsigned char)*qd->p))
+  while (ISSPACE(*qd->p))
     qd->p++;
 }
 
@@ -90,7 +92,7 @@ int qd_enum(qd_parse *qd, const char *e)
     e += strspn(e, ", ");
     if (!*e) break;
     n = strcspn(e, ", ");
-    if (strncmp(qd->p, e, n) == 0 && !isalnum((unsigned char)qd->p[n])) {
+    if (STRNCMP(qd->p, ==, e, n) && !ISALNUM(qd->p[n])) {
       qd->p += n;
       return (i);
     }
@@ -116,7 +118,7 @@ mp *qd_getmp(qd_parse *qd)
 
   qd_skipspc(qd);
   m = mp_readstring(MP_NEW, qd->p, &q, 0);
-  if (m && !isalnum((unsigned char)*q))
+  if (m && !ISALNUM(*q))
     qd->p = q;
   else {
     mp_drop(m);