diff --git a/src/oberon.c b/src/oberon.c
index 53dd33eec2a711792adf5f3a0e9ed9b982fa5c74..3b8a6b14846e593d9bbaf7b31385993475362a8c 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
return expr;
}
+static oberon_expr_t *
+oberon_make_set_index(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SET, ctx -> set_type, true);
+ expr -> item.integer = 1 << i;
+ expr -> item.real = 1 << i;
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_set_range(oberon_context_t * ctx, int64_t x, int64_t y)
{
assert(expr -> is_item);
oberon_expr_t * selector;
- selector = oberon_new_item(MODE_DEREF, expr -> result -> base, expr -> read_only);
+ selector = oberon_new_item(MODE_DEREF, expr -> result -> base, false);
selector -> item.parent = (oberon_item_t *) expr;
return selector;
oberon_expr_t * set;
if(e2 == NULL && oberon_is_const(e1))
{
- set = oberon_make_set(ctx, e1 -> item.integer);
+ set = oberon_make_set_index(ctx, e1 -> item.integer);
}
else if(e2 != NULL && oberon_is_const(e1) && oberon_is_const(e2))
{
expr = oberon_term_expr(ctx);
- if(minus)
- {
- expr = oberon_make_unary_op(ctx, MINUS, expr);
- }
-
while(ISADDOP(ctx -> token))
{
int token = ctx -> token;
expr = oberon_make_bin_op(ctx, token, expr, inter);
}
+ if(minus)
+ {
+ expr = oberon_make_unary_op(ctx, MINUS, expr);
+ }
+
return expr;
}
oberon_object_t * field = type -> decl;
for(int i = 0; i < num_fields; i++)
{
- oberon_initialize_object(ctx, field);
+ //oberon_initialize_object(ctx, field);
+ oberon_initialize_type(ctx, field -> type);
field = field -> next;
- }
+ }
oberon_generator_init_type(ctx, type);
}
// LIBRARY
// =======================================================================
-static void
-register_default_types(oberon_context_t * ctx)
-{
- ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
- oberon_generator_init_type(ctx, ctx -> notype_type);
-
- ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
- oberon_generator_init_type(ctx, ctx -> nil_type);
-
- ctx -> string_type = oberon_new_type_string(1);
- oberon_generator_init_type(ctx, ctx -> string_type);
-
- ctx -> bool_type = oberon_new_type_boolean();
- oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
-
- ctx -> char_type = oberon_new_type_char(1);
- oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
-
- ctx -> byte_type = oberon_new_type_integer(1);
- oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
-
- ctx -> shortint_type = oberon_new_type_integer(2);
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
-
- ctx -> int_type = oberon_new_type_integer(4);
- oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
-
- ctx -> longint_type = oberon_new_type_integer(8);
- oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
-
- ctx -> real_type = oberon_new_type_real(4);
- oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
-
- ctx -> longreal_type = oberon_new_type_real(8);
- oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
-
- ctx -> set_type = oberon_new_type_set(4);
- oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
-}
-
-static void
-oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f, GenerateProcCallback p)
-{
- oberon_object_t * proc;
- proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, true, false, false);
- proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
- proc -> type -> sysproc = true;
- proc -> type -> genfunc = f;
- proc -> type -> genproc = p;
-}
-
static oberon_expr_t *
oberon_make_min_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
@@ -3845,6 +3805,132 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
return expr;
}
+static void
+oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 1)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_integer_type(dst -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, PLUS, dst, oberon_make_integer(ctx, 1));
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_incl_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 2)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_set_type(dst -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * x;
+ x = list_args -> next;
+ oberon_check_src(ctx, x);
+
+ if(!oberon_is_integer_type(x -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, PLUS, dst, oberon_new_operator(OP_RANGE, dst -> result, x, NULL));
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_excl_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 2)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_set_type(dst -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * x;
+ x = list_args -> next;
+ oberon_check_src(ctx, x);
+
+ if(!oberon_is_integer_type(x -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, MINUS, dst, oberon_new_operator(OP_RANGE, dst -> result, x, NULL));
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 1)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_integer_type(dst -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, MINUS, dst, oberon_make_integer(ctx, 1));
+ oberon_assign(ctx, expr, dst);
+}
+
static void
oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
@@ -4241,6 +4327,60 @@ oberon_make_odd_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
return expr;
}
+static oberon_expr_t *
+oberon_make_short_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 1)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * arg;
+ arg = list_args;
+ oberon_check_src(ctx, arg);
+
+ if(arg -> result -> shorter == NULL)
+ {
+ oberon_error(ctx, "already shorter");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_cast_expr(ctx, arg, arg -> result -> shorter);
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_long_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 1)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * arg;
+ arg = list_args;
+ oberon_check_src(ctx, arg);
+
+ if(arg -> result -> longer == NULL)
+ {
+ oberon_error(ctx, "already longer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_cast_expr(ctx, arg, arg -> result -> longer);
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_len_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
constant -> value = (oberon_item_t *) expr;
}
+static void
+register_default_types(oberon_context_t * ctx)
+{
+ ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
+ oberon_generator_init_type(ctx, ctx -> notype_type);
+
+ ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
+ oberon_generator_init_type(ctx, ctx -> nil_type);
+
+ ctx -> string_type = oberon_new_type_string(1);
+ oberon_generator_init_type(ctx, ctx -> string_type);
+
+ ctx -> bool_type = oberon_new_type_boolean();
+ oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
+
+ ctx -> char_type = oberon_new_type_char(1);
+ oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+
+ ctx -> byte_type = oberon_new_type_integer(1);
+ oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
+
+ ctx -> shortint_type = oberon_new_type_integer(2);
+ oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
+
+ ctx -> int_type = oberon_new_type_integer(4);
+ oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
+
+ ctx -> longint_type = oberon_new_type_integer(8);
+ oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
+
+ ctx -> real_type = oberon_new_type_real(4);
+ oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
+
+ ctx -> longreal_type = oberon_new_type_real(8);
+ oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
+
+ ctx -> set_type = oberon_new_type_set(4);
+ oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
+
+
+
+ ctx -> byte_type -> shorter = NULL;
+ ctx -> byte_type -> longer = ctx -> shortint_type;
+
+ ctx -> shortint_type -> shorter = ctx -> byte_type;
+ ctx -> shortint_type -> longer = ctx -> int_type;
+
+ ctx -> int_type -> shorter = ctx -> shortint_type;
+ ctx -> int_type -> longer = ctx -> longint_type;
+
+ ctx -> longint_type -> shorter = ctx -> int_type;
+ ctx -> longint_type -> longer = NULL;
+
+ ctx -> real_type -> shorter = NULL;
+ ctx -> real_type -> longer = ctx -> longreal_type;
+
+ ctx -> longreal_type -> shorter = ctx -> real_type;
+ ctx -> longreal_type -> longer = NULL;
+}
+
+static void
+oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f, GenerateProcCallback p)
+{
+ oberon_object_t * proc;
+ proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, true, false, false);
+ proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
+ proc -> type -> sysproc = true;
+ proc -> type -> genfunc = f;
+ proc -> type -> genproc = p;
+}
+
oberon_context_t *
oberon_create_context(ModuleImportCallback import_module)
{
oberon_new_intrinsic(ctx, "CHR", oberon_make_chr_call, NULL);
oberon_new_intrinsic(ctx, "ENTIER", oberon_make_entier_call, NULL);
oberon_new_intrinsic(ctx, "LEN", oberon_make_len_call, NULL);
- oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);
+ oberon_new_intrinsic(ctx, "LONG", oberon_make_long_call, NULL);
oberon_new_intrinsic(ctx, "MAX", oberon_make_max_call, NULL);
+ oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);
oberon_new_intrinsic(ctx, "ODD", oberon_make_odd_call, NULL);
oberon_new_intrinsic(ctx, "ORD", oberon_make_ord_call, NULL);
+ oberon_new_intrinsic(ctx, "SHORT", oberon_make_short_call, NULL);
oberon_new_intrinsic(ctx, "SIZE", oberon_make_size_call, NULL);
/* Procedures */
- oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
- oberon_new_intrinsic(ctx, "COPY", NULL, oberon_make_copy_call);
oberon_new_intrinsic(ctx, "ASSERT", NULL, oberon_make_assert_call);
+ oberon_new_intrinsic(ctx, "COPY", NULL, oberon_make_copy_call);
+ oberon_new_intrinsic(ctx, "DEC", NULL, oberon_make_dec_call);
+ oberon_new_intrinsic(ctx, "EXCL", NULL, oberon_make_excl_call);
oberon_new_intrinsic(ctx, "HALT", NULL, oberon_make_halt_call);
+ oberon_new_intrinsic(ctx, "INC", NULL, oberon_make_inc_call);
+ oberon_new_intrinsic(ctx, "INCL", NULL, oberon_make_incl_call);
+ oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
return ctx;
}