Open-Argon/Chloride
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add multiplication and division

Browse Source
This commit is contained in:
William Bell
2025-08-19 02:36:09 +01:00
parent a96023ced1
commit c856e7d654
8 changed files with 178 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/runtime/access/access.c
View File

@@ -15,19 +15,19 @@ ArgonObject *ARGON_TYPE_TYPE___get_attr__(size_t argc, ArgonObject **argv,
return ARGON_NULL;
}
ArgonObject *to_access = argv[0];
ArgonObject *access = argv[1];
bool check_field = argv[2] == ARGON_TRUE;
bool check_field = argv[1] == ARGON_TRUE;
if (check_field) {
ArgonObject *access = argv[2];
ArgonObject *value = get_field_l(to_access, access->value.as_str.data,
access->value.as_str.length, true, false);
if (value)
return value;
ArgonObject *name = get_field_for_class(
get_field(to_access, "__class__", false, false), "__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,
(int)access->value.as_str.length, access->value.as_str.data);
}
ArgonObject *name = get_field_for_class(
get_field(to_access, "__class__", false, false), "__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,
(int)access->value.as_str.length, access->value.as_str.data);
return ARGON_NULL;
}

57
src/runtime/objects/number/number.c
View File

@@ -7,6 +7,7 @@
#include "number.h"
#include "../functions/functions.h"
#include "../string/string.h"
#include <gmp-x86_64.h>
#include <gmp.h>
#include <inttypes.h>
#include <stdio.h>
@@ -126,6 +127,56 @@ ArgonObject *ARGON_NUMBER_TYPE___subtract__(size_t argc, ArgonObject **argv,
return result;
}
ArgonObject *ARGON_NUMBER_TYPE___multiply__(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
(void)state;
if (argc != 2) {
*err = create_err(0, 0, 0, "", "Runtime Error",
"__multiply__ expects 2 arguments, got %" PRIu64, argc);
return ARGON_NULL;
}
mpq_t r;
mpq_init(r);
if (argv[1]->type != TYPE_NUMBER) {
ArgonObject *type_name = get_field_for_class(
get_field(argv[1], "__class__", false, false), "__name__", argv[1]);
*err = create_err(0, 0, 0, "", "Runtime Error",
"__multiply__ cannot perform multiplication between number and %.*s",
type_name->value.as_str.length,
type_name->value.as_str.data);
return ARGON_NULL;
}
mpq_mul(r, *argv[0]->value.as_number, *argv[1]->value.as_number);
ArgonObject *result = new_number_object(r);
mpq_clear(r);
return result;
}
ArgonObject *ARGON_NUMBER_TYPE___division__(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
(void)state;
if (argc != 2) {
*err = create_err(0, 0, 0, "", "Runtime Error",
"__division__ expects 2 arguments, got %" PRIu64, argc);
return ARGON_NULL;
}
mpq_t r;
mpq_init(r);
if (argv[1]->type != TYPE_NUMBER) {
ArgonObject *type_name = get_field_for_class(
get_field(argv[1], "__class__", false, false), "__name__", argv[1]);
*err = create_err(0, 0, 0, "", "Runtime Error",
"__division__ cannot perform division between number and %.*s",
type_name->value.as_str.length,
type_name->value.as_str.data);
return ARGON_NULL;
}
mpq_div(r, *argv[0]->value.as_number, *argv[1]->value.as_number);
ArgonObject *result = new_number_object(r);
mpq_clear(r);
return result;
}
ArgonObject *ARGON_NUMBER_TYPE___string__(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
(void)state;
@@ -298,6 +349,12 @@ void create_ARGON_NUMBER_TYPE() {
add_field(ARGON_NUMBER_TYPE, "__subtract__",
create_argon_native_function("__subtract__",
ARGON_NUMBER_TYPE___subtract__));
add_field(ARGON_NUMBER_TYPE, "__multiply__",
create_argon_native_function("__multiply__",
ARGON_NUMBER_TYPE___multiply__));
add_field(ARGON_NUMBER_TYPE, "__division__",
create_argon_native_function("__division__",
ARGON_NUMBER_TYPE___division__));
}
void mpz_init_gc_managed(mpz_t z, size_t limbs_count) {

68
src/runtime/runtime.c
View File

@@ -37,10 +37,10 @@ ArgonObject *ACCESS_FUNCTION;
ArgonObject *ADDITION_FUNCTION;
ArgonObject *SUBTRACTION_FUNCTION;
ArgonObject *MULTIPLY_FUNCTION;
ArgonObject *DIVIDE_FUNCTION;
ArgonObject *DIVISION_FUNCTION;
ArgonObject *POWER_FUNCTION;
ArgonObject *MODULO_FUNCTION;
ArgonObject *FLOORDIV_FUNCTION;
ArgonObject *FLOORDIVISION_FUNCTION;
ArgonObject *ARGON_ADDITION_FUNCTION(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
@@ -70,7 +70,7 @@ ArgonObject *ARGON_SUBTRACTION_FUNCTION(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
if (argc < 1) {
*err = create_err(0, 0, 0, "", "Runtime Error",
"add expects at least 1 argument, got %" PRIu64, argc);
"subtract expects at least 1 argument, got %" PRIu64, argc);
return ARGON_NULL;
}
ArgonObject *output = argv[0];
@@ -91,6 +91,56 @@ ArgonObject *ARGON_SUBTRACTION_FUNCTION(size_t argc, ArgonObject **argv,
return output;
}
ArgonObject *ARGON_MULTIPLY_FUNCTION(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
if (argc < 1) {
*err = create_err(0, 0, 0, "", "Runtime Error",
"multiply expects at least 1 argument, got %" PRIu64, argc);
return ARGON_NULL;
}
ArgonObject *output = argv[0];
for (size_t i = 1; i < argc; i++) {
ArgonObject *__multiply__ = get_field_for_class(
get_field(output, "__class__", false, false), "__multiply__", output);
if (!__multiply__) {
ArgonObject *cls___name__ = get_field(output, "__name__", true, false);
*err = create_err(0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __multiply__ method",
(int)cls___name__->value.as_str.length,
cls___name__->value.as_str.data);
return ARGON_NULL;
}
output =
argon_call(__multiply__, 1, (ArgonObject *[]){argv[i]}, err, state);
}
return output;
}
ArgonObject *ARGON_DIVISION_FUNCTION(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
if (argc < 1) {
*err = create_err(0, 0, 0, "", "Runtime Error",
"division expects at least 1 argument, got %" PRIu64, argc);
return ARGON_NULL;
}
ArgonObject *output = argv[0];
for (size_t i = 1; i < argc; i++) {
ArgonObject *__multiply__ = get_field_for_class(
get_field(output, "__class__", false, false), "__division__", output);
if (!__multiply__) {
ArgonObject *cls___name__ = get_field(output, "__name__", true, false);
*err = create_err(0, 0, 0, "", "Runtime Error",
"Object '%.*s' is missing __division__ method",
(int)cls___name__->value.as_str.length,
cls___name__->value.as_str.data);
return ARGON_NULL;
}
output =
argon_call(__multiply__, 1, (ArgonObject *[]){argv[i]}, err, state);
}
return output;
}
ArgonObject *ARGON_TYPE_TYPE___call__(size_t argc, ArgonObject **argv,
ArErr *err, RuntimeState *state) {
(void)state;
@@ -509,6 +559,10 @@ void bootstrap_types() {
create_argon_native_function("add", ARGON_ADDITION_FUNCTION);
SUBTRACTION_FUNCTION =
create_argon_native_function("subtract", ARGON_SUBTRACTION_FUNCTION);
MULTIPLY_FUNCTION =
create_argon_native_function("multiply", ARGON_MULTIPLY_FUNCTION);
DIVISION_FUNCTION =
create_argon_native_function("division", ARGON_DIVISION_FUNCTION);
add_field(BASE_CLASS, "__get_attr__", ACCESS_FUNCTION);
}
@@ -527,6 +581,8 @@ void bootstrap_globals() {
add_to_scope(Global_Scope, "number", ARGON_NUMBER_TYPE);
add_to_scope(Global_Scope, "add", ADDITION_FUNCTION);
add_to_scope(Global_Scope, "subtract", SUBTRACTION_FUNCTION);
add_to_scope(Global_Scope, "multiply", MULTIPLY_FUNCTION);
add_to_scope(Global_Scope, "division", DIVISION_FUNCTION);
ArgonObject *argon_term = new_object();
add_field(argon_term, "__init__", ARGON_NULL);
@@ -722,6 +778,12 @@ ArErr run_instruction(Translated *translated, RuntimeState *state,
case OP_LOAD_SUBTRACTION_FUNCTION:
state->registers[0] = SUBTRACTION_FUNCTION;
break;
case OP_LOAD_MULTIPLY_FUNCTION:
state->registers[0] = MULTIPLY_FUNCTION;
break;
case OP_LOAD_DIVISION_FUNCTION:
state->registers[0] = DIVISION_FUNCTION;
break;
default:
return create_err(0, 0, 0, NULL, "Runtime Error", "Invalid Opcode %#x",
opcode);