error handling

Author: SwayamInSync

quaddtype/numpy_quaddtype/src/dtype.c

@@ -356,8 +356,8 @@ quadprec_scanfunc(FILE *fp, void *dptr, char *ignore, PyArray_Descr *descr_gener
     /* Convert string to quad precision */
     char *endptr;
     quad_value val;
-    cstring_to_quad(buffer, descr->backend, &val, &endptr);
-    if (endptr == buffer) {
+    int err = cstring_to_quad(buffer, descr->backend, &val, &endptr, true);
+    if (err < 0) {
         return 0;  /* Return 0 on parse error (no items read) */
     }
     if (descr->backend == BACKEND_SLEEF) {
@@ -375,8 +375,8 @@ quadprec_fromstr(char *s, void *dptr, char **endptr, PyArray_Descr *descr_generi
 {
     QuadPrecDTypeObject *descr = (QuadPrecDTypeObject *)descr_generic;
     quad_value val;
-    cstring_to_quad(s, descr->backend, &val, endptr);
-    if (*endptr == s) {
+    int err = cstring_to_quad(s, descr->backend, &val, endptr, false);
+    if (err < 0) {
         return -1;
     }
     if(descr->backend == BACKEND_SLEEF) {

quaddtype/numpy_quaddtype/src/scalar.c

@@ -197,8 +197,8 @@ QuadPrecision_from_object(PyObject *value, QuadBackendType backend)
     else if (PyUnicode_Check(value)) {
         const char *s = PyUnicode_AsUTF8(value);
         char *endptr = NULL;
-        cstring_to_quad(s, backend, &self->value, &endptr);
-        if (*endptr != '\0' || endptr == s) {
+        int err = cstring_to_quad(s, backend, &self->value, &endptr, true);
+        if (err < 0) {
             PyErr_SetString(PyExc_ValueError, "Unable to parse string to QuadPrecision");
             Py_DECREF(self);
             return NULL;
@@ -211,8 +211,8 @@ QuadPrecision_from_object(PyObject *value, QuadBackendType backend)
             return NULL;
         }
         char *endptr = NULL;
-        cstring_to_quad(s, backend, &self->value, &endptr);
-        if (*endptr != '\0' || endptr == s) {
+        int err = cstring_to_quad(s, backend, &self->value, &endptr, true);
+        if (err < 0) {
             PyErr_SetString(PyExc_ValueError, "Unable to parse bytes to QuadPrecision");
             Py_DECREF(self);
             return NULL;

quaddtype/numpy_quaddtype/src/utilities.c

@@ -1,14 +1,20 @@
 #include "utilities.h"
 #include <stdlib.h>
 
-void cstring_to_quad(const char *str, QuadBackendType backend, quad_value *out_value, char **endptr)
+int cstring_to_quad(const char *str, QuadBackendType backend, quad_value *out_value, 
+char **endptr, bool require_full_parse)
 {
-  if(backend == BACKEND_SLEEF)
-  {
+  if(backend == BACKEND_SLEEF) {
     out_value->sleef_value = Sleef_strtoq(str, endptr);
-  }
-  else
-  {
+  } else {
     out_value->longdouble_value = strtold(str, endptr);
   }
+  if(*endptr == str) 
+    return -1; // parse error - nothing was parsed
+  
+  // If full parse is required
+  if(require_full_parse && **endptr != '\0')
+    return -1; // parse error - characters remain to be converted
+  
+  return 0; // success
 }

quaddtype/numpy_quaddtype/src/utilities.h

@@ -4,7 +4,8 @@
 #include "quad_common.h"
 #include <sleef.h>
 #include <sleefquad.h>
+#include <stdbool.h>
 
-void cstring_to_quad(const char *str, QuadBackendType backend, quad_value *out_value, char **endptr);
+int cstring_to_quad(const char *str, QuadBackendType backend, quad_value *out_value, char **endptr, bool require_full_parse);
 
 #endif