X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon.c;h=53dd33eec2a711792adf5f3a0e9ed9b982fa5c74;hp=08543355c92b9e421854e751081df3e6827c8d17;hb=b09b4829b70cf34a470003286ea100663d7fe442;hpb=95acec6c3ae8d3c324c84b001a680aa49320790b

diff --git a/src/oberon.c b/src/oberon.c
index 0854335..53dd33e 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -4111,6 +4111,108 @@ oberon_make_cap_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_chr_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(!oberon_is_integer_type(arg -> result))
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg))
+	{
+		expr = oberon_make_char(ctx, arg -> item.integer);
+	}
+	else
+	{
+		expr = oberon_cast_expr(ctx, arg, ctx -> char_type);
+	}
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_make_ord_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(!oberon_is_char_type(arg -> result))
+	{
+		oberon_error(ctx, "expected char");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg))
+	{
+		expr = oberon_make_integer(ctx, arg -> item.integer);
+	}
+	else
+	{
+		expr = oberon_cast_expr(ctx, arg, ctx -> int_type);
+	}
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_make_entier_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(!oberon_is_real_type(arg -> result))
+	{
+		oberon_error(ctx, "expected real");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg))
+	{
+		expr = oberon_make_integer(ctx, floor(arg -> item.real));
+	}
+	else
+	{
+		expr = oberon_new_operator(OP_ENTIER, ctx -> int_type, arg, NULL);
+	}
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_odd_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4139,6 +4241,66 @@ oberon_make_odd_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_len_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 > 2)
+	{
+		oberon_error(ctx, "too mach arguments");
+	}
+
+	oberon_expr_t * v;
+	v = list_args;
+	oberon_check_src(ctx, v);
+
+	if(!oberon_is_array_type(v -> result))
+	{
+		oberon_error(ctx, "expected array");
+	}
+
+	int n = 0;
+	if(num_args == 2)
+	{
+		oberon_expr_t * num;
+		num = list_args -> next;
+		oberon_check_src(ctx, num);
+
+		if(!oberon_is_integer_type(num -> result))
+		{
+			oberon_error(ctx, "expected integer");
+		}
+		oberon_check_const(ctx, num);
+
+		n = num -> item.integer;
+	}
+
+	int dim = 0;
+	oberon_type_t * arr = v -> result;
+	while(arr -> class == OBERON_TYPE_ARRAY)
+	{
+		dim += 1;
+		arr = arr -> base;
+	}
+
+	if(n < 0 || n > dim)
+	{
+		oberon_error(ctx, "not in range 0..%i", dim - 1);
+	}
+
+	assert(v -> is_item);
+
+	oberon_expr_t * expr;
+	expr = oberon_new_item(MODE_LEN, ctx -> int_type, true);
+	expr -> item.parent = (oberon_item_t *) v;
+	expr -> item.integer = n;
+	return expr;	
+}
+
 static void
 oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
 {
@@ -4171,9 +4333,13 @@ oberon_create_context(ModuleImportCallback import_module)
 	oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
 	oberon_new_intrinsic(ctx, "ASH", oberon_make_ash_call, NULL);
 	oberon_new_intrinsic(ctx, "CAP", oberon_make_cap_call, NULL);
+	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, "MAX", oberon_make_max_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, "SIZE", oberon_make_size_call, NULL);
 
 	/* Procedures */