map errno to ps_error

Author: CHiPs44

examples/450-enum.pas

@@ -19,8 +19,8 @@
 Procedure TestLowHighPredSucc();
 Begin
   // should not work! (and does not with FPC) because enumeration values are not implicitly convertible to integer/unsigned
-  // I := Female;
-  // WriteLn('I = ', I);
+  I := Female;
+  WriteLn('I = ', I, ' (SHOULD NOT WORK!');
   // should work! and does with FPC because Ord() is used to explicitly convert the enumeration value to an integer/unsigned
   I := Ord('A');
   WriteLn('I = ', I, ' (=', 65, ')');

include/ps_error.h

@@ -88,6 +88,8 @@ extern "C"
     int ps_error_sprintf(char *buffer, size_t len, ps_error error, const char *format, ...);
     int ps_error_fprintf(FILE *output, ps_error error, const char *format, ...);
 
+    ps_error ps_error_map_errno();
+
 #ifdef __cplusplus
 }
 #endif

src/ps_error.c

@@ -5,12 +5,7 @@
 */
 
 #include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "ps_error.h"
-
-#include <assert.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -129,4 +124,25 @@ int ps_error_fprintf(FILE *output, ps_error error, const char *format, ...) // N
     return n;
 }
 
+ps_error ps_error_map_errno()
+{
+    switch (errno)
+    {
+    case 0:
+        return PS_ERROR_NONE;
+    case ENOMEM:
+        return PS_ERROR_OUT_OF_MEMORY;
+    case EOVERFLOW:
+        return PS_ERROR_OVERFLOW;
+    case EINVAL:
+        return PS_ERROR_INVALID_PARAMETERS;
+    case ERANGE:
+        return PS_ERROR_OUT_OF_RANGE;
+    case EDOM:
+        return PS_ERROR_MATH_NAN_INF;
+    default:
+        return PS_ERROR_GENERIC;
+    }
+}
+
 /* EOF */

src/ps_string_heap.c

@@ -84,7 +84,10 @@ unsigned int ps_string_heap_get_hash_key(const char *z)
 ps_string *ps_string_heap_create(ps_string_heap *heap, const char *z)
 {
     if (z == NULL)
+    {
+        errno = EINVAL;
         return NULL;
+    }
     size_t len = strlen(z);
     if (len > PS_STRING_MAX_LEN)
     {

src/ps_visit_expression.c

@@ -134,7 +134,12 @@ bool ps_visit_relational_expression(ps_interpreter *interpreter, ps_interpreter_
 
     static ps_token_type relational_operators[] = {
         // <            <=            >           >=           =               <>
-        PS_TOKEN_LT, PS_TOKEN_LE, PS_TOKEN_GT, PS_TOKEN_GE, PS_TOKEN_EQ, PS_TOKEN_NE,
+        PS_TOKEN_LT,
+        PS_TOKEN_LE,
+        PS_TOKEN_GT,
+        PS_TOKEN_GE,
+        PS_TOKEN_EQ,
+        PS_TOKEN_NE,
     };
     ps_value left = {.type = &ps_system_none, .data.v = NULL};
     ps_value right = {.type = &ps_system_none, .data.v = NULL};
@@ -436,12 +441,8 @@ bool ps_visit_factor(ps_interpreter *interpreter, ps_interpreter_mode mode, ps_v
             result->data.s = ps_string_heap_create(interpreter->string_heap, lexer->current_token.value.s);
             if (result->data.s == NULL)
             {
-                if (errno == ENOMEM)
-                    interpreter->error = PS_ERROR_OUT_OF_MEMORY;
-                else if (errno == EOVERFLOW)
-                    interpreter->error = PS_ERROR_OVERFLOW;
-                else if (errno == EINVAL)
-                    interpreter->error = PS_ERROR_STRING_TOO_LONG;
+                ps_interpreter_set_message(interpreter, "Failed to create string value: %s", strerror(errno));
+                interpreter->error = ps_error_map_errno();
                 TRACE_ERROR("STRING_VALUE")
             }
         }