Merge branch 'master' of github.com:EliasFleckenstein03/uwulang

diff --git a/api/util.c b/api/util.c
index e6f06502ffdcc0751713b37f5d0f14180eb36820..b6f9b4949906e87f5b86945099cec03a567cb80a 100644 (file)
--- a/api/util.c
+++ b/api/util.c
@@ -4,8 +4,7 @@
 
 UwUVMValue uwuutil_is_type(const char *fnname, UwUVMArgs *args, UwUVMType *type)
 {
-       if (args->num < 1)
-               error("error: %s requires at least one argument\n", fnname);
+       uwuutil_require_min(fnname, args, 1);
 
        for (size_t i = 0; i < args->num; i++)
                if (uwuvm_get_arg(args, i).type != type)
@@ -13,3 +12,35 @@ UwUVMValue uwuutil_is_type(const char *fnname, UwUVMArgs *args, UwUVMType *type)
 
        return uwubool_create(true);
 }
+
+void uwuutil_require_min(const char *fnname, UwUVMArgs *args, size_t n)
+{
+       if (args->num < n) {
+               if (n == 1)
+                       error("type error: %s requires at least one optional argument, but none were given\n", fnname);
+               else
+                       error("type error: %s requires at least %d arguments, but only %d were given\n", fnname, n, args->num);
+       }
+}
+
+void uwuutil_require_max(const char *fnname, UwUVMArgs *args, size_t n)
+{
+       if (args->num > n) {
+               if (n == 1)
+                       error("type error: %s accepts one optional argument, but %d were given\n", fnname, args->num);
+               else
+                       error("type error: %s does not take more than %d arguments, but %d were given\n", fnname, args->num);
+       }
+}
+
+void uwuutil_require_exact(const char *fnname, UwUVMArgs *args, size_t n)
+{
+       if (args->num != n) {
+               if (n == 0)
+                       error("type error: %s does not take any arguments, but %d were given\n", fnname, args->num);
+               else if (n == 1)
+                       error("type error: %s requires exactly one argument, but %d were given\n", fnname, args->num);
+               else
+                       error("type error: %s requires exactly %d arguments, but %d were given\n", fnname, n, args->num);
+       }
+}

diff --git a/api/util.h b/api/util.h
index 259f53abc8f9670e801dd91bf2d74e25e96c4536..d5941078d6a8012e909000f7300c5bb448e41ca6 100644 (file)
--- a/api/util.h
+++ b/api/util.h
@@ -4,5 +4,9 @@
 #include "vm.h"
 
 UwUVMValue uwuutil_is_type(const char *fnname, UwUVMArgs *args, UwUVMType *type);
+void uwuutil_require_min  (const char *fnname, UwUVMArgs *args, size_t n);
+void uwuutil_require_max  (const char *fnname, UwUVMArgs *args, size_t n);
+void uwuutil_require_exact(const char *fnname, UwUVMArgs *args, size_t n);
+void uwuutil_require_none (const char *fnname, UwUVMArgs *args);
 
 #endif

diff --git a/api/vm.c b/api/vm.c
index 8374050b3fbdd9874da14473df20ea48d16192aa..52a003c49f2dbe56fcde337bd9bff185610aca80 100644 (file)
--- a/api/vm.c
+++ b/api/vm.c
@@ -45,7 +45,7 @@ UwUVMValue uwuvm_evaluate_expression(UwUVMExpression *expression, UwUVMArgs *arg
 
                case EX_ARGNUM:
                        if ((size_t) expression->value.int_value >= args->num)
-                               error("error: not enough arguments (accessed argument $%d, but only %lu arguments were passed)\n", expression->value.int_value, args->num);
+                               error("type error: not enough arguments (accessed argument $%d, but only %lu arguments were passed)\n", expression->value.int_value, args->num);
 
                        return uwuvm_clone_value(uwuvm_get_arg(args, expression->value.int_value));
 

diff --git a/common/dl.h b/common/dl.h
new file mode 100644 (file)
index 0000000..143b422
--- /dev/null
+++ b/common/dl.h
@@ -0,0 +1,14 @@
+#ifndef _COMMON_DL_H_
+#define _COMMON_DL_H_
+
+#include <dlfcn.h>
+#include "err.h"
+
+inline static void check_dlerror()
+{
+       char *err = dlerror();
+       if (err)
+               error("library error: %s\n", err);
+}
+
+#endif

diff --git a/common/err.h b/common/err.h
index 1dccbf9b943c0e1e1125985f6875b75652a89c60..b9faf117dc1b81fc799c93fb7277069b96ee3c8b 100644 (file)
--- a/common/err.h
+++ b/common/err.h
@@ -1,5 +1,5 @@
-#ifndef _ERR_H_
-#define _ERR_H_
+#ifndef _COMMON_ERR_H_
+#define _COMMON_ERR_H_
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,4 +14,14 @@ static inline void error(const char *format, ...)
        exit(1);
 }
 
+static inline void syserror(const char *call, FILE *file)
+{
+       perror(call);
+
+       if (file)
+               fclose(file);
+
+       exit(1);
+}
+
 #endif

diff --git a/common/file.h b/common/file.h
new file mode 100644 (file)
index 0000000..c5e8036
--- /dev/null
+++ b/common/file.h
@@ -0,0 +1,19 @@
+#ifndef _COMMON_FILE_H_
+#define _COMMON_FILE_H_
+
+#include <stdio.h>
+#include <stdbool.h>
+
+inline static bool file_exists(const char *filename)
+{
+       FILE *f = fopen(filename, "r");
+
+       if (f) {
+               fclose(f);
+               return true;
+       }
+
+       return false;
+}
+
+#endif

diff --git a/common/str.h b/common/str.h
index b0baa37e606fac4b59ad29e04186dab100f18ef6..fc5f587d202ba1e6f13a5d5634afad85b0e6f4fa 100644 (file)
--- a/common/str.h
+++ b/common/str.h
@@ -1,5 +1,5 @@
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef _COMMON_STR_H_
+#define _COMMON_STR_H_
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/load.c b/src/load.c
index edeba9759814b3850d0155b0bb5316b8b2eb71ec..f6386d6341a5feeb9737ddf271d2fc39a11de93f 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -6,6 +6,8 @@
 #include <dlfcn.h>
 #include "common/err.h"
 #include "common/str.h"
+#include "common/file.h"
+#include "common/dl.h"
 #include "load.h"
 #include "parse.h"
 
@@ -33,18 +35,6 @@ static char *dirname_wrapper(const char *name)
        return wrap_name_func(name, &dirname);
 }
 
-static bool file_exists(const char *filename)
-{
-       FILE *f = fopen(filename, "r");
-
-       if (f) {
-               fclose(f);
-               return true;
-       }
-
-       return false;
-}
-
 // type definitions
 
 typedef struct
@@ -122,7 +112,7 @@ static Module *require_module(LoadState *state, char *module_path)
        char *filename = get_filename(module_path);
 
        if (! filename)
-               error("error: module %s not found\n", module_path);
+               error("module error: module %s not found\n", module_path);
 
        size_t filename_len = strlen(filename);
        UwUVMModuleType type = (filename_len >= 3 && strcmp(filename + filename_len - 3, ".so") == 0) ? MODULE_NATIVE : MODULE_PLAIN;
@@ -148,9 +138,7 @@ static Module *require_module(LoadState *state, char *module_path)
                state->program.libraries = realloc(state->program.libraries, sizeof(void *) * ++state->program.num_libraries);
                state->program.libraries[state->program.num_libraries - 1] = module->handle.lib = dlopen(filename, RTLD_LAZY);
 
-               char *err = dlerror();
-               if (err)
-                       error("library error: %s\n", err);
+               check_dlerror();
        }
 
        return module;
@@ -192,7 +180,7 @@ static UwUVMFunction *resolve_function(LoadState *state, Module *caller_module,
                fnname++;
 
        if (*fnname == '\0')
-               error("error: empty function name\n");
+               error("module error: empty function name referenced/called by module %s\n", caller_module->filename);
 
        Module *callee_module;
 
@@ -287,16 +275,13 @@ static void load_functions(LoadState *state, Module *module)
 
                                *function = NULL;
                        } else {
-                               error("error: no function %s in module %s\n", link->name, module->filename);
+                               error("module error: no function %s in module %s\n", link->name, module->filename);
                        }
                } else {
                        char *symbol = asprintf_wrapper("uwu_%s", link->name);
                        link->ref->value.native = dlsym(module->handle.lib, symbol);
 
-                       char *err = dlerror();
-                       if (err)
-                               error("library error: %s\n", err);
-
+                       check_dlerror();
                        free(symbol);
                }
        }

diff --git a/src/parse.c b/src/parse.c
index ed09de9c00a3927608bd46afd7e5be9960772f4a..e8f1d381ee92ac7f2fb0ac9b4be224b8fe99ecb6 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -285,7 +285,7 @@ AbstractSyntaxTree parse_file(const char *filename)
        FILE *f = fopen(filename, "r");
 
        if (! f)
-               error("%s: unable to open\n", filename);
+               syserror("fopen", f);
 
 #if DEBUG
        printf("[File %s]\n[Line %d]\n", filename, lines);
@@ -298,7 +298,7 @@ AbstractSyntaxTree parse_file(const char *filename)
                        break;
 
                if (ferror(f))
-                       error("%s: I/O error\n", filename);
+                       syserror("getc", f);
 
                if (c == '\n')
                        ++lines;
@@ -309,11 +309,11 @@ AbstractSyntaxTree parse_file(const char *filename)
 #endif
 
                if (! parse_character(&state, c))
-                       error("%s: syntax error in line %d\n", filename, lines);
+                       error("syntax error: in file %s, line %d\n", filename, lines);
        }
 
        if (state.buffer || state.expression)
-               error("%s: syntax error at end of file\n", filename);
+               error("syntax error: at end of file %s\n", filename);
 
        fclose(f);
 

diff --git a/src/run.c b/src/run.c
index 7733c8da5a5db1bf8adaf29606fd3a725fa4c42d..36133fce7cf4ae6837681e0db7b063eb17596bb1 100644 (file)
--- a/src/run.c
+++ b/src/run.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "common/err.h"
+#include "common/dl.h"
 #include "load.h"
 #include "run.h"
 
@@ -29,9 +30,7 @@ void run_module(const char *progname, const char *modname, size_t num_args, char
        char      *(*uwuvm_print_value  )(UwUVMValue                                             ) = dlsym(program.api_library, "uwuvm_print_value"  );
        void       (*uwuvm_delet_value  )(UwUVMValue                                             ) = dlsym(program.api_library, "uwuvm_delet_value"  );
 
-       char *err = dlerror();
-       if (err)
-               error("library error: %s\n", err);
+       check_dlerror();
 
        UwUVMExpression arg_expressions[num_args];
 

diff --git a/std/bool.c b/std/bool.c
index 349e1c9fcc76d9c8093f34c874fa1746c884f5a8..8c8df7d3062a3c169fff79f5d0b94df4d87811a4 100644 (file)
--- a/std/bool.c
+++ b/std/bool.c
@@ -12,8 +12,7 @@ static inline bool get_bool_arg(UwUVMArgs *args, size_t i)
 
 UwUVMValue uwu_if(UwUVMArgs *args)
 {
-       if (args->num != 3)
-               error("error: :bool:if requires exactly 3 arguments\n");
+       uwuutil_require_exact(":bool:if", args, 3);
 
        return uwuvm_clone_value(get_bool_arg(args, 0)
                ? uwuvm_get_arg(args, 1)
@@ -23,8 +22,7 @@ UwUVMValue uwu_if(UwUVMArgs *args)
 
 UwUVMValue uwu_and(UwUVMArgs *args)
 {
-       if (args->num < 1)
-               error("error: :bool:and requires at least one argument\n");
+       uwuutil_require_min(":bool:and", args, 1);
 
        for (size_t i = 0; i < args->num; i++)
                if (! get_bool_arg(args, i))
@@ -35,8 +33,7 @@ UwUVMValue uwu_and(UwUVMArgs *args)
 
 UwUVMValue uwu_or(UwUVMArgs *args)
 {
-       if (args->num < 1)
-               error("error: :bool:or requires at least one argument\n");
+       uwuutil_require_min(":bool:or", args, 1);
 
        for (size_t i = 0; i < args->num; i++)
                if (get_bool_arg(args, i))
@@ -47,8 +44,7 @@ UwUVMValue uwu_or(UwUVMArgs *args)
 
 UwUVMValue uwu_equal(UwUVMArgs *args)
 {
-       if (args->num < 2)
-               error("error: :bool:equal requires at least 2 arguments\n");
+       uwuutil_require_min(":bool:equal", args, 2);
 
        bool value = get_bool_arg(args, 0);
 
@@ -61,25 +57,19 @@ UwUVMValue uwu_equal(UwUVMArgs *args)
 
 UwUVMValue uwu_not(UwUVMArgs *args)
 {
-       if (args->num != 1)
-               error("error: :bool:not requires exactly 1 argument\n");
-
+       uwuutil_require_exact(":bool:not", args, 1);
        return uwubool_create(! get_bool_arg(args, 0));
 }
 
 UwUVMValue uwu_true(UwUVMArgs *args)
 {
-       if (args->num != 0)
-               error("error: :bool:true does not take any arguments\n");
-
+       uwuutil_require_exact(":bool:true", args, 0);
        return uwubool_create(true);
 }
 
 UwUVMValue uwu_false(UwUVMArgs *args)
 {
-       if (args->num != 0)
-               error("error: :bool:false does not take any arguments\n");
-
+       uwuutil_require_exact(":bool:false", args, 0);
        return uwubool_create(false);
 }
 

diff --git a/std/int.c b/std/int.c
index 22af320ee93e760a961b2ce2dcc32c4ee8a55737..300737b84b6207b61538156454e644b788ac99ea 100644 (file)
--- a/std/int.c
+++ b/std/int.c
@@ -18,18 +18,17 @@ typedef enum
 
 static int binary(const char *fnname, UwUVMArgs *args, BinaryOP op)
 {
-       if (args->num != 2)
-               error("error: %s requires exactly 2 arguments\n", fnname);
+       uwuutil_require_exact(fnname, args, 2);
 
        UwUVMValue value0 = uwuvm_get_arg(args, 0);
 
        if (value0.type != &uwuint_type)
-               error("error: %s requires an integer as $0\n", fnname);
+               error("type error: %s requires an integer as $0\n", fnname);
 
        UwUVMValue value1 = uwuvm_get_arg(args, 1);
 
        if (value1.type != &uwuint_type)
-               error("error: %s requires an integer as $1\n", fnname);
+               error("type error: %s requires an integer as $1\n", fnname);
 
        int a = uwuint_get(value0);
        int b = uwuint_get(value1);
@@ -59,7 +58,7 @@ static int reduce(const char *fnname, UwUVMArgs *args, ReduceOP op, int result)
                UwUVMValue value = uwuvm_get_arg(args, i);
 
                if (value.type != &uwuint_type)
-                       error("error: %s only accepts integers as arguments (invalid argument: $%lu)\n", fnname, i);
+                       error("type error: %s only accepts integers as arguments (invalid argument: $%lu)\n", fnname, i);
 
                int this = uwuint_get(value);
 
@@ -116,9 +115,7 @@ UwUVMValue uwu_greater(UwUVMArgs *args)
 
 UwUVMValue uwu_equal(UwUVMArgs *args)
 {
-       if (args->num < 2)
-               error("error: :int:equal requires at least 2 arguments\n");
-
+       uwuutil_require_min(":int:equal", args, 2);
        return uwubool_create(reduce(":int:equal", args, ROP_EQU, 1) == 1);
 }
 

diff --git a/std/nil.c b/std/nil.c
index 93172eb7c8de66d92a2e0ee120d988d5f5fd151e..52a2872337dea0da7494b72dbba8bc70d3ed45bc 100644 (file)
--- a/std/nil.c
+++ b/std/nil.c
@@ -4,9 +4,7 @@
 
 UwUVMValue uwu_nil(UwUVMArgs *args)
 {
-       if (args->num != 0)
-               error(":nil:nil does not accept any arguments\n");
-
+       uwuutil_require_exact(":nil:nil", args, 0);
        return uwunil_create();
 }
 

diff --git a/std/ref.c b/std/ref.c
index 62c0a5289bfd9207753d2302eb10f9e76e5db5fc..f92e4b0c3933f385ca344ff97e71e9a6728a3cba 100644 (file)
--- a/std/ref.c
+++ b/std/ref.c
@@ -4,8 +4,7 @@
 
 UwUVMValue uwu_call(UwUVMArgs *args)
 {
-       if (args->num < 1)
-               error(":ref:call requires at least one argument\n");
+       uwuutil_require_min(":ref:call", args, 1);
 
        UwUVMValue value = uwuvm_get_arg(args, 0);