add license to shell

This commit is contained in:
William Bell
2025-09-12 01:21:08 +01:00
parent 1a5abd9543
commit daa8056b7a
18 changed files with 3031 additions and 102 deletions

View File

@@ -85,15 +85,13 @@ void run_call(ArgonObject *original_object, size_t argc, ArgonObject **argv,
if (object->type != TYPE_FUNCTION && object->type != TYPE_NATIVE_FUNCTION &&
object->type != TYPE_METHOD) {
ArgonObject *call_method = get_builtin_field_for_class(
get_builtin_field(object, __class__), __call__,
original_object);
get_builtin_field(object, __class__), __call__, original_object);
if (call_method) {
object = call_method;
}
}
if (object->type == TYPE_METHOD) {
ArgonObject *binding_object =
get_builtin_field(object, __binding__);
ArgonObject *binding_object = get_builtin_field(object, __binding__);
if (binding_object) {
ArgonObject **new_call_args =
ar_alloc(sizeof(ArgonObject *) * (argc + 1));
@@ -104,16 +102,14 @@ void run_call(ArgonObject *original_object, size_t argc, ArgonObject **argv,
argv = new_call_args;
argc++;
}
ArgonObject *function_object =
get_builtin_field(object, __function__);
ArgonObject *function_object = get_builtin_field(object, __function__);
if (function_object)
object = function_object;
}
if (object->type == TYPE_FUNCTION) {
if (argc != object->value.argon_fn->number_of_parameters) {
ArgonObject *type_object_name = get_builtin_field_for_class(
get_builtin_field(object, __class__), __name__,
original_object);
get_builtin_field(object, __class__), __name__, original_object);
ArgonObject *object_name =
get_builtin_field_for_class(object, __name__, original_object);
*err = create_err(
@@ -122,7 +118,8 @@ void run_call(ArgonObject *original_object, size_t argc, ArgonObject **argv,
"%.*s %.*s takes %" PRIu64 " argument(s) but %" PRIu64 " was given",
(int)type_object_name->value.as_str->length,
type_object_name->value.as_str->data,
(int)object_name->value.as_str->length, object_name->value.as_str->data,
(int)object_name->value.as_str->length,
object_name->value.as_str->data,
object->value.argon_fn->number_of_parameters, argc);
}
Stack *scope = create_scope(object->value.argon_fn->stack, true);
@@ -191,13 +188,12 @@ void run_call(ArgonObject *original_object, size_t argc, ArgonObject **argv,
err->line = state->source_location.line;
err->column = state->source_location.column;
err->length = state->source_location.length;
err->path = state->path;
strcpy(err->path, state->path);
}
return;
}
ArgonObject *type_object_name = get_builtin_field_for_class(
get_builtin_field(original_object, __class__), __name__,
original_object);
get_builtin_field(original_object, __class__), __name__, original_object);
*err = create_err(state->source_location.line, state->source_location.column,
state->source_location.length, state->path, "Type Error",
"'%.*s' object is not callable",

View File

@@ -13,9 +13,8 @@
ArgonObject *ARGON_STRING_TYPE = NULL;
ArgonObject *new_string_object_without_memcpy(char *data, size_t length, uint64_t prehash,
void init_string(ArgonObject*object,char *data, size_t length, uint64_t prehash,
uint64_t hash) {
ArgonObject *object = new_instance(ARGON_STRING_TYPE);
add_builtin_field(object, field_length,
new_number_object_from_int64(length));
object->type = TYPE_STRING;
@@ -26,6 +25,12 @@ ArgonObject *new_string_object_without_memcpy(char *data, size_t length, uint64_
object->value.as_str->hash = hash;
object->value.as_str->length = length;
object->as_bool = length;
}
ArgonObject *new_string_object_without_memcpy(char *data, size_t length, uint64_t prehash,
uint64_t hash) {
ArgonObject *object = new_instance(ARGON_STRING_TYPE);
init_string(object,data,length,prehash,hash);
return object;
}

View File

@@ -10,6 +10,9 @@
extern ArgonObject *ARGON_STRING_TYPE;
void init_string(ArgonObject*object,char *data, size_t length, uint64_t prehash,
uint64_t hash);
ArgonObject *new_string_object_without_memcpy(char *data, size_t length, uint64_t prehash,
uint64_t hash);

View File

@@ -64,23 +64,23 @@ ArgonObject *BASE_CLASS___getattribute__(size_t argc, ArgonObject **argv,
access->value.as_str->hash = hash;
access->value.as_str->hash_computed = true;
}
ArgonObject *value = get_field_l(to_access, access->value.as_str->data, hash,
access->value.as_str->length, true, false);
ArgonObject *value =
get_field_l(to_access, access->value.as_str->data, hash,
access->value.as_str->length, true, false);
if (value)
return value;
ArgonObject *cls__get_attr__ = get_builtin_field_for_class(
get_builtin_field(to_access, __class__), __get_attr__,
to_access);
get_builtin_field(to_access, __class__), __get_attr__, to_access);
if (cls__get_attr__) {
value = argon_call(cls__get_attr__, 1, (ArgonObject *[]){access}, err, state);
value =
argon_call(cls__get_attr__, 1, (ArgonObject *[]){access}, err, state);
if (err->exists) {
return ARGON_NULL;
}
return value;
}
ArgonObject *name = get_builtin_field_for_class(
get_builtin_field(to_access, __class__), __name__,
to_access);
get_builtin_field(to_access, __class__), __name__, to_access);
*err = create_err(
0, 0, 0, "", "Runtime Error", "'%.*s' object has no attribute '%.*s'",
(int)name->value.as_str->length, name->value.as_str->data,
@@ -101,8 +101,7 @@ ArgonObject *ARGON_ADDITION_FUNCTION(size_t argc, ArgonObject **argv,
ArgonObject *object__add__ = get_builtin_field_for_class(
get_builtin_field(output, __class__), __add__, output);
if (!object__add__) {
ArgonObject *cls___name__ =
get_builtin_field(output, __name__);
ArgonObject *cls___name__ = get_builtin_field(output, __name__);
*err = create_err(0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __add__ method",
(int)cls___name__->value.as_str->length,
@@ -126,11 +125,9 @@ ArgonObject *ARGON_SUBTRACTION_FUNCTION(size_t argc, ArgonObject **argv,
ArgonObject *output = argv[0];
for (size_t i = 1; i < argc; i++) {
ArgonObject *function__subtract__ = get_builtin_field_for_class(
get_builtin_field(output, __class__), __subtract__,
output);
get_builtin_field(output, __class__), __subtract__, output);
if (!function__subtract__) {
ArgonObject *cls___name__ =
get_builtin_field(output, __name__);
ArgonObject *cls___name__ = get_builtin_field(output, __name__);
*err = create_err(0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __subtract__ method",
(int)cls___name__->value.as_str->length,
@@ -154,11 +151,9 @@ ArgonObject *ARGON_MULTIPLY_FUNCTION(size_t argc, ArgonObject **argv,
ArgonObject *output = argv[0];
for (size_t i = 1; i < argc; i++) {
ArgonObject *function__multiply__ = get_builtin_field_for_class(
get_builtin_field(output, __class__), __multiply__,
output);
get_builtin_field(output, __class__), __multiply__, output);
if (!function__multiply__) {
ArgonObject *cls___name__ =
get_builtin_field(output, __name__);
ArgonObject *cls___name__ = get_builtin_field(output, __name__);
*err = create_err(0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __multiply__ method",
(int)cls___name__->value.as_str->length,
@@ -182,11 +177,9 @@ ArgonObject *ARGON_DIVISION_FUNCTION(size_t argc, ArgonObject **argv,
ArgonObject *output = argv[0];
for (size_t i = 1; i < argc; i++) {
ArgonObject *function__division__ = get_builtin_field_for_class(
get_builtin_field(output, __class__), __division__,
output);
get_builtin_field(output, __class__), __division__, output);
if (!function__division__) {
ArgonObject *cls___name__ =
get_builtin_field(output, __name__);
ArgonObject *cls___name__ = get_builtin_field(output, __name__);
*err = create_err(0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __division__ method",
(int)cls___name__->value.as_str->length,
@@ -218,8 +211,7 @@ ArgonObject *ARGON_TYPE_TYPE___call__(size_t argc, ArgonObject **argv,
ArgonObject *cls___new__ =
get_builtin_field_for_class(argv[0], __new__, NULL);
if (!cls___new__) {
ArgonObject *cls___name__ =
get_builtin_field(argv[0], __name__);
ArgonObject *cls___name__ = get_builtin_field(argv[0], __name__);
*err = create_err(
0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __new__ method, so cannot be initialised",
@@ -239,8 +231,7 @@ ArgonObject *ARGON_TYPE_TYPE___call__(size_t argc, ArgonObject **argv,
ArgonObject *cls___init__ =
get_builtin_field_for_class(argv[0], __init__, new_object);
if (!cls___init__) {
ArgonObject *cls___name__ =
get_builtin_field(argv[0], __name__);
ArgonObject *cls___name__ = get_builtin_field(argv[0], __name__);
*err = create_err(
0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __init__ method, so cannot be initialised",
@@ -338,10 +329,6 @@ ArgonObject *ARGON_STRING_TYPE___init__(size_t argc, ArgonObject **argv,
}
ArgonObject *self = argv[0];
ArgonObject *object = argv[1];
self->value.as_str->data = NULL;
self->value.as_str->length = 0;
self->type = TYPE_STRING;
ArgonObject *string_convert_method = get_builtin_field_for_class(
get_builtin_field(object, __class__), __string__, object);
if (string_convert_method) {
@@ -349,12 +336,14 @@ ArgonObject *ARGON_STRING_TYPE___init__(size_t argc, ArgonObject **argv,
argon_call(string_convert_method, 0, NULL, err, state);
if (err->exists)
return ARGON_NULL;
self->value.as_str->data =
ar_alloc_atomic(string_object->value.as_str->length);
memcpy(self->value.as_str->data, string_object->value.as_str->data,
string_object->value.as_str->length);
self->value.as_str->length = string_object->value.as_str->length;
init_string(self, string_object->value.as_str->data,
string_object->value.as_str->length,
string_object->value.as_str->prehash,
string_object->value.as_str->hash);
return ARGON_NULL;
}
*err = create_err(0, 0, 0, "", "String Conversion Error",
"cannot convert to string");
return ARGON_NULL;
}
@@ -622,8 +611,8 @@ void bootstrap_types() {
add_builtin_field(
ARGON_BOOL_TYPE, __number__,
create_argon_native_function("__number__", ARGON_BOOL_TYPE___number__));
GETATTRIBUTE_FUNCTION = create_argon_native_function("__get_attr__",
BASE_CLASS___getattribute__);
GETATTRIBUTE_FUNCTION =
create_argon_native_function("__get_attr__", BASE_CLASS___getattribute__);
ADDITION_FUNCTION =
create_argon_native_function("add", ARGON_ADDITION_FUNCTION);
SUBTRACTION_FUNCTION =
@@ -874,8 +863,8 @@ void runtime(Translated _translated, RuntimeState _state, Stack *stack,
continue;
DO_LOAD_GETATTRIBUTE_FUNCTION:
state->registers[0] = get_builtin_field_for_class(
get_builtin_field(state->registers[0], __class__),
__getattribute__, state->registers[0]);
get_builtin_field(state->registers[0], __class__), __getattribute__,
state->registers[0]);
if (!state->registers[0]) {
*err = create_err(
state->source_location.line, state->source_location.column,

View File

@@ -89,6 +89,8 @@ RuntimeState init_runtime_state(Translated translated, char *path);
Stack *create_scope(Stack *prev, bool force);
void add_to_scope(Stack *stack, char *name, ArgonObject *value);
void runtime(Translated translated, RuntimeState state, Stack *stack,
ArErr *err);