(capi) - Add more declarative errors

Author: protocolstardust

rayforce/capi/rayforce_c.c

@@ -6,14 +6,14 @@ static unsigned long g_main_thread_id = 0; // main thread ID
 
 int check_main_thread(void) {
   if (g_main_thread_id == 0) {
-    PyErr_SetString(PyExc_RuntimeError, "Runtime not initialized.");
+    PyErr_SetString(PyExc_RuntimeError, "runtime: not initialized");
     return 0;
   }
 
   if ((unsigned long)PyThread_get_thread_ident() != g_main_thread_id) {
-    PyErr_Format(PyExc_RuntimeError,
-                 "Rayforce runtime can not be called from other threads than "
-                 "the one where it was initialized from");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "runtime: cannot be called from threads other than the "
+                    "initialization thread");
     return 0;
   }
 
@@ -26,13 +26,14 @@ PyObject *raypy_init_runtime(PyObject *self, PyObject *args) {
   (void)args;
 
   if (g_runtime != NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Runtime already initialized");
+    PyErr_SetString(PyExc_RuntimeError, "runtime: already initialized");
     return NULL;
   }
 
   char *argv[] = {"py", "-r", "0", NULL};
   if (runtime_create(3, argv) == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Failed to initialize Rayforce");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "runtime: failed to initialize Rayforce");
     return NULL;
   }
 
@@ -41,7 +42,7 @@ PyObject *raypy_init_runtime(PyObject *self, PyObject *args) {
 }
 PyObject *raypy_wrap_ray_object(obj_p ray_obj) {
   if (ray_obj == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Rayforce object can't be null");
+    PyErr_SetString(PyExc_RuntimeError, "runtime: object cannot be null");
     return NULL;
   }
 

rayforce/capi/raypy_binary.c

@@ -12,14 +12,14 @@ PyObject *raypy_binary_set(PyObject *self, PyObject *args) {
 
   if (symbol_or_path->obj->type != -TYPE_SYMBOL &&
       symbol_or_path->obj->type != TYPE_C8) {
-    PyErr_SetString(PyExc_TypeError,
-                    "First argument must be a symbol or string");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "binary: first argument must be a symbol or string");
     return NULL;
   }
 
   obj_p ray_obj = binary_set(symbol_or_path->obj, value->obj);
   if (ray_obj == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Failed to execute set operation");
+    PyErr_SetString(PyExc_RuntimeError, "binary: failed to set value");
     return NULL;
   }
   return raypy_wrap_ray_object(ray_obj);
@@ -46,7 +46,7 @@ PyObject *raypy_quote(PyObject *self, PyObject *args) {
 
   obj_p ray_obj = ray_quote(item->obj);
   if (ray_obj == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Failed to execute quote operation");
+    PyErr_SetString(PyExc_RuntimeError, "binary: failed to quote object");
     return NULL;
   }
   return raypy_wrap_ray_object(ray_obj);

rayforce/capi/raypy_dynlib.c

@@ -14,15 +14,17 @@ PyObject *raypy_loadfn(PyObject *self, PyObject *args) {
 
   obj_p path_obj = vector(TYPE_C8, path_len);
   if (path_obj == NULL) {
-    PyErr_SetString(PyExc_MemoryError, "Failed to allocate path object");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "dynlib: failed to allocate path object");
     return NULL;
   }
   memcpy(AS_C8(path_obj), path, path_len);
 
   obj_p func_obj = vector(TYPE_C8, func_len);
   if (func_obj == NULL) {
     drop_obj(path_obj);
-    PyErr_SetString(PyExc_MemoryError, "Failed to allocate fn name object");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "dynlib: failed to allocate function name object");
     return NULL;
   }
   memcpy(AS_C8(func_obj), func_name, func_len);
@@ -31,7 +33,8 @@ PyObject *raypy_loadfn(PyObject *self, PyObject *args) {
   if (nargs_obj == NULL) {
     drop_obj(path_obj);
     drop_obj(func_obj);
-    PyErr_SetString(PyExc_MemoryError, "Failed to allocate nargs object");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "dynlib: failed to allocate nargs object");
     return NULL;
   }
 
@@ -41,7 +44,8 @@ PyObject *raypy_loadfn(PyObject *self, PyObject *args) {
   drop_obj(nargs_obj);
 
   if (ray_obj == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Failed load fn from shared library");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "dynlib: failed to load function from shared library");
     return NULL;
   }
   return raypy_wrap_ray_object(ray_obj);

rayforce/capi/raypy_eval.c

@@ -10,7 +10,8 @@ PyObject *raypy_eval_str(PyObject *self, PyObject *args) {
 
   obj_p ray_obj = ray_eval_str(item->obj, NULL_OBJ);
   if (ray_obj == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Failed to evaluate expression");
+    PyErr_SetString(PyExc_RuntimeError,
+                    "eval: failed to evaluate string expression");
     return NULL;
   }
   return raypy_wrap_ray_object(ray_obj);
@@ -25,7 +26,7 @@ PyObject *raypy_eval_obj(PyObject *self, PyObject *args) {
 
   obj_p ray_obj = eval_obj(item->obj);
   if (ray_obj == NULL) {
-    PyErr_SetString(PyExc_RuntimeError, "Failed to evaluate expression");
+    PyErr_SetString(PyExc_RuntimeError, "eval: failed to evaluate object");
     return NULL;
   }
   return raypy_wrap_ray_object(ray_obj);