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

diff --git a/src/oberon.c b/src/oberon.c
index 53dd33e..29c40cb 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -8,6 +8,8 @@
 #include <math.h>
 #include <float.h>
 
+#include <gc.h>
+
 #include "../include/oberon.h"
 
 #include "oberon-internals.h"
@@ -25,7 +27,7 @@ oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
 static oberon_type_t *
 oberon_new_type_ptr(int class)
 {
-	oberon_type_t * x = malloc(sizeof *x);
+	oberon_type_t * x = GC_MALLOC(sizeof *x);
 	memset(x, 0, sizeof *x);
 	x -> class = class;
 	return x;
@@ -88,7 +90,7 @@ static oberon_expr_t *
 oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right)
 {
 	oberon_oper_t * operator;
-	operator = malloc(sizeof *operator);
+	operator = GC_MALLOC(sizeof *operator);
 	memset(operator, 0, sizeof *operator);
 
 	operator -> is_item = 0;
@@ -105,7 +107,7 @@ static oberon_expr_t *
 oberon_new_item(int mode, oberon_type_t * result, int read_only)
 {
 	oberon_item_t * item;
-        item = malloc(sizeof *item);
+        item = GC_MALLOC(sizeof *item);
         memset(item, 0, sizeof *item);
 
 	item -> is_item = 1;
@@ -149,6 +151,16 @@ oberon_make_integer(oberon_context_t * ctx, int64_t i)
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_system_byte(oberon_context_t * ctx, int64_t i)
+{
+	oberon_expr_t * expr;
+	expr = oberon_new_item(MODE_SYSBYTE, ctx -> system_byte_type, true);
+	expr -> item.integer = i;
+	expr -> item.real = i;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_char(oberon_context_t * ctx, int64_t i)
 {
@@ -159,6 +171,17 @@ oberon_make_char(oberon_context_t * ctx, int64_t i)
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_string(oberon_context_t * ctx, char * str)
+{
+	oberon_expr_t * expr;
+	expr = oberon_new_item(MODE_STRING, ctx -> string_type, true);
+	expr -> item.integer = str[0];
+	expr -> item.real = str[0];
+	expr -> item.string = str;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_real_typed(oberon_context_t * ctx, double r, oberon_type_t * result)
 {
@@ -197,6 +220,16 @@ oberon_make_set(oberon_context_t * ctx, int64_t i)
 	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)
 {
@@ -214,8 +247,11 @@ oberon_make_set_range(oberon_context_t * ctx, int64_t x, int64_t y)
 static oberon_scope_t *
 oberon_open_scope(oberon_context_t * ctx)
 {
-	oberon_scope_t * scope = calloc(1, sizeof *scope);
-	oberon_object_t * list = calloc(1, sizeof *list);
+	oberon_scope_t * scope = GC_MALLOC(sizeof *scope);
+	memset(scope, 0, sizeof *scope);
+
+	oberon_object_t * list = GC_MALLOC(sizeof *list);
+	memset(list, 0, sizeof *list);
 
 	scope -> ctx = ctx;
 	scope -> list = list;
@@ -274,7 +310,7 @@ oberon_find_object(oberon_scope_t * scope, char * name, bool check_it)
 static oberon_object_t *
 oberon_create_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only)
 {
-	oberon_object_t * newvar = malloc(sizeof *newvar);
+	oberon_object_t * newvar = GC_MALLOC(sizeof *newvar);
 	memset(newvar, 0, sizeof *newvar);
 	newvar -> name = name;
 	newvar -> class = class;
@@ -316,16 +352,6 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export
 	return newvar;
 }
 
-static oberon_object_t *
-oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type, int export)
-{
-	oberon_object_t * id;
-	id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, false, false);
-	id -> type = type;
-	oberon_generator_init_type(scope -> ctx, type);
-	return id;
-}
-
 // =======================================================================
 //   SCANER
 // ======================================================================= 
@@ -351,23 +377,20 @@ oberon_init_scaner(oberon_context_t * ctx, const char * code)
 static void
 oberon_read_ident(oberon_context_t * ctx)
 {
-	int len = 0;
-	int i = ctx -> code_index;
+	int start = ctx -> code_index;
 
-	int c = ctx -> code[i];
-	while(isalnum(c))
+	oberon_get_char(ctx);
+	while(isalnum(ctx -> c) || ctx -> c == '_')
 	{
-		i += 1;
-		len += 1;
-		c = ctx -> code[i];
+		oberon_get_char(ctx);
 	}
 
-	char * ident = malloc(len + 1);
-	memcpy(ident, &ctx->code[ctx->code_index], len);
-	ident[len] = 0;
+	int end = ctx -> code_index;
+
+	char * ident = GC_MALLOC(end - start + 1);
+	memcpy(ident, &ctx -> code[start], end - start);
+	ident[end - start] = 0;
 
-	ctx -> code_index = i;
-	ctx -> c = ctx -> code[i];
 	ctx -> string = ident;
 	ctx -> token = IDENT;
 
@@ -621,7 +644,7 @@ oberon_read_number(oberon_context_t * ctx)
 	}
 
 	int len = end_i - start_i;
-	ident = malloc(len + 1);
+	ident = GC_MALLOC(len + 1);
 	memcpy(ident, &ctx -> code[start_i], len);
 	ident[len] = 0;
 
@@ -731,8 +754,9 @@ static void oberon_read_string(oberon_context_t * ctx)
 
 	oberon_get_char(ctx);
 
-	char * string = calloc(1, end - start + 1);
+	char * string = GC_MALLOC(end - start + 1);
 	strncpy(string, &ctx -> code[start], end - start);
+	string[end - start] = 0;
 
 	ctx -> token = STRING;
 	ctx -> string = string;
@@ -887,7 +911,7 @@ oberon_read_token(oberon_context_t * ctx)
 	oberon_skip_space(ctx);
 
 	int c = ctx -> c;
-	if(isalpha(c))
+	if(isalpha(c) || c == '_')
 	{
 		oberon_read_ident(ctx);
 	}
@@ -1031,14 +1055,24 @@ oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * p
 		cast = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
 		cast -> item.integer = expr -> item.string[0];
 	}
-	else
+	else if(!oberon_is_some_types(expr -> result, pref))
 	{
 		cast = oberon_new_operator(OP_CAST, pref, expr, NULL);
 	}
+	else
+	{
+		cast = expr;
+	}
 
 	return cast;
 }
 
+static oberon_expr_t *
+oberon_hard_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
+{
+	return oberon_new_operator(OP_HARDCAST, pref, expr, NULL);
+}
+
 static void
 oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
 {
@@ -1114,7 +1148,8 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 			{
 				oberon_check_compatible_var_param(ctx, param -> type, arg -> result);
 			}
-			casted[i] = oberon_cast_expr(ctx, arg, param -> type);
+			casted[i] = arg;
+			//casted[i] = oberon_cast_expr(ctx, arg, param -> type);
 		}
 		else
 		{
@@ -1238,7 +1273,7 @@ oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
 	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;
@@ -1569,7 +1604,7 @@ oberon_element(oberon_context_t * ctx)
 	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))
 	{
@@ -1642,9 +1677,7 @@ oberon_factor(oberon_context_t * ctx)
 			oberon_assert_token(ctx, CHAR);
 			break;
 		case STRING:
-			result = ctx -> string_type;
-			expr = oberon_new_item(MODE_STRING, result, true);
-			expr -> item.string = ctx -> string;
+			expr = oberon_make_string(ctx, ctx -> string);
 			oberon_assert_token(ctx, STRING);
 			break;
 		case REAL:
@@ -1681,7 +1714,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	oberon_expr_t * expr;
 	oberon_type_t * result;
 
-	oberon_check_compatible_bin_expr_types(ctx, token, a -> result, b -> result);
+	oberon_check_compatible_bin_expr(ctx, token, a, b);
 	oberon_check_src(ctx, a);
 	if(token != IS)
 	{
@@ -1706,7 +1739,22 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	}
 	else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
 	{
-		result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		if(oberon_is_string_of_one(a) && oberon_is_char_type(b -> result))
+		{
+			result = b -> result;
+		}
+		else if(oberon_is_string_of_one(b) && oberon_is_char_type(a -> result))
+		{
+			result = a -> result;
+		}
+		else if(oberon_is_string_of_one(a) && oberon_is_string_of_one(b))
+		{
+			result = ctx -> char_type;
+		}
+		else
+		{
+			result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		}
 
 		if(oberon_is_const(a) && oberon_is_const(b)
 			&& (oberon_is_real_type(result) || oberon_is_integer_type(result)))
@@ -1948,11 +1996,6 @@ oberon_simple_expr(oberon_context_t * ctx)
 
 	expr = oberon_term_expr(ctx);
 
-	if(minus)
-	{
-		expr = oberon_make_unary_op(ctx, MINUS, expr);
-	}
-
 	while(ISADDOP(ctx -> token))
 	{
 		int token = ctx -> token;
@@ -1962,6 +2005,11 @@ oberon_simple_expr(oberon_context_t * ctx)
 		expr = oberon_make_bin_op(ctx, token, expr, inter);
 	}
 
+	if(minus)
+	{
+		expr = oberon_make_unary_op(ctx, MINUS, expr);
+	}
+
 	return expr;
 }
 
@@ -2004,6 +2052,7 @@ oberon_is_const(oberon_expr_t * expr)
 		case MODE_STRING:
 		case MODE_SET:
 		case MODE_TYPE:
+		case MODE_SYSBYTE:
 			return true;
 			break;
 		default:
@@ -2930,9 +2979,10 @@ oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
 		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);
 	}
@@ -3106,7 +3156,7 @@ oberon_case_labels(oberon_context_t * ctx, oberon_expr_t * val)
 	oberon_expr_t * cond2;
 
 	e1 = (oberon_expr_t *) oberon_const_expr(ctx);
-	
+
 	e2 = NULL;
 	if(ctx -> token == DOTDOT)
 	{
@@ -3614,57 +3664,6 @@ oberon_parse_module(oberon_context_t * ctx)
 //   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 +3844,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)
 {
@@ -4066,7 +4191,8 @@ oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	{
 		int64_t x = arg1 -> item.integer;
 		int64_t y = arg2 -> item.integer;
-		expr = oberon_make_integer(ctx, x * powl(2, y));
+		int64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+		expr = oberon_make_integer(ctx, v);
 	}
 	else
 	{
@@ -4076,6 +4202,140 @@ oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_lsh_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 * arg1;
+	arg1 = list_args;
+	oberon_check_src(ctx, arg1);
+
+	oberon_type_t * t = arg1 -> result;
+	if(!oberon_is_integer_type(t)
+		&& !oberon_is_char_type(t) 
+		&& !oberon_is_system_byte_type(t))
+	{
+		oberon_error(ctx, "expected integer, char, or SYSTEM.BYTE");
+	}
+
+	oberon_expr_t * arg2;
+	arg2 = list_args -> next;
+	oberon_check_src(ctx, arg2);
+	if(arg2 -> result -> class != OBERON_TYPE_INTEGER)
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg1) && oberon_is_const(arg2))
+	{
+		uint64_t x = arg1 -> item.integer;
+		int64_t y = arg2 -> item.integer;
+		uint64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+
+		if(oberon_is_integer_type(t))
+		{
+			expr = oberon_make_integer(ctx, v);
+		}
+		else if(oberon_is_char_type(t))
+		{
+			expr = oberon_make_char(ctx, v);
+		}
+		else
+		{
+			expr = oberon_make_system_byte(ctx, v);
+		}
+	}
+	else
+	{
+		expr = oberon_new_operator(OP_LSH, arg1 -> result, arg1, arg2);
+		expr = oberon_cast_expr(ctx, expr, t);
+	}
+
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_make_rot_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 * arg1;
+	arg1 = list_args;
+	oberon_check_src(ctx, arg1);
+
+	oberon_type_t * t = arg1 -> result;
+	if(!oberon_is_integer_type(t)
+		&& !oberon_is_char_type(t) 
+		&& !oberon_is_system_byte_type(t))
+	{
+		oberon_error(ctx, "expected integer, char, or SYSTEM.BYTE");
+	}
+
+	oberon_expr_t * arg2;
+	arg2 = list_args -> next;
+	oberon_check_src(ctx, arg2);
+	if(arg2 -> result -> class != OBERON_TYPE_INTEGER)
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg1) && oberon_is_const(arg2))
+	{
+		uint64_t x = arg1 -> item.integer;
+		int64_t y = arg2 -> item.integer;
+
+		uint64_t v = 0;
+		if(y > 0)
+		{
+			v = (x << y) | (x >> (64 - y));
+		}
+		else
+		{
+			y = labs(y);
+			v = (x >> y) | (x << (64 - y));
+		}
+
+		if(oberon_is_integer_type(t))
+		{
+			expr = oberon_make_integer(ctx, v);
+		}
+		else if(oberon_is_char_type(t))
+		{
+			expr = oberon_make_char(ctx, v);
+		}
+		else
+		{
+			expr = oberon_make_system_byte(ctx, v);
+		}
+	}
+	else
+	{
+		expr = oberon_new_operator(OP_ROT, arg1 -> result, arg1, arg2);
+		expr = oberon_cast_expr(ctx, expr, t);
+	}
+
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_cap_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4162,7 +4422,7 @@ oberon_make_ord_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	arg = list_args;
 	oberon_check_src(ctx, arg);
 
-	if(!oberon_is_char_type(arg -> result))
+	if(!oberon_is_char_type(arg -> result) && !oberon_is_string_of_one(arg))
 	{
 		oberon_error(ctx, "expected char");
 	}
@@ -4241,6 +4501,121 @@ oberon_make_odd_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_cc_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);
+	oberon_check_const(ctx, arg);
+
+	if(!oberon_is_integer_type(arg -> result))
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	/* n >= 0 && n <= 15 */
+
+	oberon_expr_t * cond1;
+	oberon_expr_t * cond2;
+	cond1 = oberon_make_bin_op(ctx, GEQ, arg, oberon_make_integer(ctx, 0));
+	cond2 = oberon_make_bin_op(ctx, LEQ, arg, oberon_make_integer(ctx, 15));
+	return oberon_make_bin_op(ctx, AND, cond1, cond2);
+}
+
+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_val_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 * typ;
+	typ = list_args;
+	if(!oberon_is_type_expr(typ))
+	{
+		oberon_error(ctx, "requires type");
+	}
+
+	oberon_expr_t * arg;
+	arg = list_args -> next;
+	oberon_check_src(ctx, arg);
+
+	oberon_expr_t * expr;
+	expr = oberon_hard_cast_expr(ctx, arg, typ -> result);
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_len_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4310,10 +4685,122 @@ oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
 	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_generator_init_type(ctx, ctx -> bool_type);
+
+	ctx -> char_type = oberon_new_type_char(1);
+	oberon_generator_init_type(ctx, ctx -> char_type);
+
+	ctx -> byte_type = oberon_new_type_integer(1);
+	oberon_generator_init_type(ctx, ctx -> byte_type);
+
+	ctx -> shortint_type = oberon_new_type_integer(2);
+	oberon_generator_init_type(ctx, ctx -> shortint_type);
+
+	ctx -> int_type = oberon_new_type_integer(4);
+	oberon_generator_init_type(ctx, ctx -> int_type);
+
+	ctx -> longint_type = oberon_new_type_integer(8);
+	oberon_generator_init_type(ctx, ctx -> longint_type);
+
+	ctx -> real_type = oberon_new_type_real(4);
+	oberon_generator_init_type(ctx, ctx -> real_type);
+
+	ctx -> longreal_type = oberon_new_type_real(8);
+	oberon_generator_init_type(ctx, ctx -> longreal_type);
+
+	ctx -> set_type = oberon_new_type_set(4);
+	oberon_generator_init_type(ctx, ctx -> set_type);
+
+	ctx -> system_byte_type = oberon_new_type_ptr(OBERON_TYPE_SYSTEM_BYTE);
+	oberon_generator_init_type(ctx, ctx -> system_byte_type);
+
+	ctx -> system_ptr_type = oberon_new_type_ptr(OBERON_TYPE_SYSTEM_PTR);
+	oberon_generator_init_type(ctx, ctx -> system_ptr_type);
+
+	/* LONG / SHORT support */
+	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;
+}
+
+static void oberon_new_intrinsic_type(oberon_context_t * ctx, char * name, oberon_type_t * type)
+{
+	oberon_object_t * id;
+	id = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, true, false, false);
+	id -> type = type;
+}
+
+static void
+oberon_begin_intrinsic_module(oberon_context_t * ctx, char * name, oberon_module_t ** m)
+{
+	oberon_scope_t * module_scope;
+	module_scope = oberon_open_scope(ctx);
+
+	oberon_module_t * module;
+	module = GC_MALLOC(sizeof *module);
+	memset(module, 0, sizeof *module);
+	module -> name = name;
+	module -> intrinsic = true;
+	module -> decl = module_scope;
+	module -> next = ctx -> module_list;
+
+	ctx -> mod = module;
+	ctx -> module_list = module;
+
+	*m = module;
+}
+
+static void
+oberon_end_intrinsic_module(oberon_context_t * ctx, oberon_module_t * m)
+{
+	oberon_close_scope(m -> decl);
+	m -> ready = true;
+	ctx -> mod = NULL;
+}
+
 oberon_context_t *
 oberon_create_context(ModuleImportCallback import_module)
 {
-	oberon_context_t * ctx = calloc(1, sizeof *ctx);
+	oberon_context_t * ctx = GC_MALLOC(sizeof *ctx);
+	memset(ctx, 0, sizeof *ctx);
 
 	oberon_scope_t * world_scope;
 	world_scope = oberon_open_scope(ctx);
@@ -4323,12 +4810,24 @@ oberon_create_context(ModuleImportCallback import_module)
 
 	oberon_generator_init_context(ctx);
 
+	/* Types */
 	register_default_types(ctx);
 
 	/* Constants */
 	oberon_new_const(ctx, "TRUE", oberon_make_boolean(ctx, true));
 	oberon_new_const(ctx, "FALSE", oberon_make_boolean(ctx, false));
 
+	/* Types */
+	oberon_new_intrinsic_type(ctx, "BOOLEAN", ctx -> bool_type);
+	oberon_new_intrinsic_type(ctx, "CHAR", ctx -> char_type);
+	oberon_new_intrinsic_type(ctx, "SHORTINT", ctx -> byte_type);
+	oberon_new_intrinsic_type(ctx, "INTEGER", ctx -> shortint_type);
+	oberon_new_intrinsic_type(ctx, "LONGINT", ctx -> int_type);
+	oberon_new_intrinsic_type(ctx, "HUGEINT", ctx -> longint_type);
+	oberon_new_intrinsic_type(ctx, "REAL", ctx -> real_type);
+	oberon_new_intrinsic_type(ctx, "LONGREAL", ctx -> longreal_type);
+	oberon_new_intrinsic_type(ctx, "SET", ctx -> set_type);
+
 	/* Functions */
 	oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
 	oberon_new_intrinsic(ctx, "ASH", oberon_make_ash_call, NULL);
@@ -4336,17 +4835,38 @@ 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);
+
+	/* MODULE SYSTEM */
+	oberon_begin_intrinsic_module(ctx, "SYSTEM", &ctx -> system_module);
+
+		/* Types */
+		oberon_new_intrinsic_type(ctx, "BYTE", ctx -> system_byte_type);
+		oberon_new_intrinsic_type(ctx, "PTR", ctx -> system_ptr_type);
+
+		/* Functions */
+		oberon_new_intrinsic(ctx, "CC", oberon_make_cc_call, NULL);
+		oberon_new_intrinsic(ctx, "LSH", oberon_make_lsh_call, NULL);
+		oberon_new_intrinsic(ctx, "ROT", oberon_make_rot_call, NULL);
+		oberon_new_intrinsic(ctx, "VAL", oberon_make_val_call, NULL);
+
+	oberon_end_intrinsic_module(ctx, ctx -> system_module);
 
 	return ctx;
 }
@@ -4355,7 +4875,6 @@ void
 oberon_destroy_context(oberon_context_t * ctx)
 {
 	oberon_generator_destroy_context(ctx);
-	free(ctx);
 }
 
 oberon_module_t *
@@ -4376,7 +4895,8 @@ oberon_compile_module(oberon_context_t * ctx, const char * newcode)
 	module_scope = oberon_open_scope(ctx);
 
 	oberon_module_t * module;
-	module = calloc(1, sizeof *module);
+	module = GC_MALLOC(sizeof *module);
+	memset(module, 0, sizeof *module);
 	module -> decl = module_scope;
 	module -> next = ctx -> module_list;