X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=oberon.c;h=b56a458a6c1e979a743c9d4139b5df3044f1cdc3;hb=89dfaf94ddbbc501020554232ce026b6584e8045;hp=6dd84f16b6b9c3108973c087636865c661735bc3;hpb=1bf625553dc35ac4a5c1afceb6950fd44776a424;p=dsw-obn.git

diff --git a/oberon.c b/oberon.c
index 6dd84f1..b56a458 100644
--- a/oberon.c
+++ b/oberon.c
@@ -52,7 +52,8 @@ enum {
 	POINTER,
 	TO,
 	UPARROW,
-	NIL
+	NIL,
+	IMPORT
 };
 
 // =======================================================================
@@ -108,11 +109,8 @@ oberon_new_type_boolean(int size)
 static oberon_scope_t *
 oberon_open_scope(oberon_context_t * ctx)
 {
-	oberon_scope_t * scope = malloc(sizeof *scope);
-	memset(scope, 0, sizeof *scope);
-
-	oberon_object_t * list = malloc(sizeof *list);
-	memset(list, 0, sizeof *list);
+	oberon_scope_t * scope = calloc(1, sizeof *scope);
+	oberon_object_t * list = calloc(1, sizeof *list);
 
 	scope -> ctx = ctx;
 	scope -> list = list;
@@ -136,7 +134,7 @@ oberon_close_scope(oberon_scope_t * scope)
 }
 
 static oberon_object_t *
-oberon_define_object(oberon_scope_t * scope, char * name, int class)
+oberon_define_object(oberon_scope_t * scope, char * name, int class, int export, int read_only)
 {
 	oberon_object_t * x = scope -> list;
 	while(x -> next && strcmp(x -> next -> name, name) != 0)
@@ -153,42 +151,17 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class)
 	memset(newvar, 0, sizeof *newvar);
 	newvar -> name = name;
 	newvar -> class = class;
+	newvar -> export = export;
+	newvar -> read_only = read_only;
 	newvar -> local = scope -> local;
 	newvar -> parent = scope -> parent;
+	newvar -> module = scope -> ctx -> mod;
 
 	x -> next = newvar;
 
 	return newvar;
 }
 
-static void
-oberon_define_field(oberon_context_t * ctx, oberon_type_t * rec, char *  name, oberon_type_t * type)
-{
-	// TODO check base fields
-
-	oberon_object_t * x = rec -> decl;
-	while(x -> next && strcmp(x -> next -> name, name) != 0)
-	{
-		x = x -> next;
-	}
-
-	if(x -> next)
-	{
-		oberon_error(ctx, "multiple definition");
-	}
-
-	oberon_object_t * field = malloc(sizeof *field);
-	memset(field, 0, sizeof *field);
-	field -> name = name;
-	field -> class = OBERON_CLASS_FIELD;
-	field -> type = type;
-	field -> local = 1;
-	field -> parent = NULL;
-
-	rec -> num_decl += 1;
-	x -> next = field;
-}
-
 static oberon_object_t *
 oberon_find_object_in_list(oberon_object_t * list, char * name)
 {
@@ -239,64 +212,15 @@ oberon_find_field(oberon_context_t * ctx, oberon_type_t * rec, char * name)
 }
 
 static oberon_object_t *
-oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type)
+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);
+	id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, 0);
 	id -> type = type;
 	oberon_generator_init_type(scope -> ctx, type);
 	return id;
 }
 
-/*
-static oberon_type_t *
-oberon_find_type(oberon_scope_t * scope, char * name)
-{
-	oberon_object_t * x = oberon_find_object(scope, name);
-	if(x -> class != OBERON_CLASS_TYPE)
-	{
-		oberon_error(scope -> ctx, "%s not a type", name);
-	}
-
-	return x -> type;
-}
-*/
-
-static oberon_object_t *
-oberon_define_var(oberon_scope_t * scope, int class, char * name, oberon_type_t * type)
-{
-	oberon_object_t * var;
-	var = oberon_define_object(scope, name, class);
-	var -> type = type;
-	return var;
-}
-
-/*
-static oberon_object_t *
-oberon_find_var(oberon_scope_t * scope, char * name)
-{
-	oberon_object_t * x = oberon_find_object(scope, name);
-
-	if(x -> class != OBERON_CLASS_VAR)
-	{
-		oberon_error(scope -> ctx, "%s not a var", name);
-	}
-
-	return x;
-}
-*/
-
-/*
-static oberon_object_t *
-oberon_define_proc(oberon_scope_t * scope, char * name, oberon_type_t * signature)
-{
-	oberon_object_t * proc;
-	proc = oberon_define_object(scope, name, OBERON_CLASS_PROC);
-	proc -> type = signature;
-	return proc;
-}
-*/
-
 // =======================================================================
 //   SCANER
 // ======================================================================= 
@@ -415,6 +339,10 @@ oberon_read_ident(oberon_context_t * ctx)
 	{
 		ctx -> token = NIL;
 	}
+	else if(strcmp(ident, "IMPORT") == 0)
+	{
+		ctx -> token = IMPORT;
+	}
 }
 
 static void
@@ -597,6 +525,7 @@ oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon
 
 	operator -> is_item = 0;
 	operator -> result = result;
+	operator -> read_only = 1;
 	operator -> op = op;
 	operator -> left = left;
 	operator -> right = right;
@@ -605,7 +534,7 @@ oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon
 }
 
 static oberon_expr_t *
-oberon_new_item(int mode, oberon_type_t * result)
+oberon_new_item(int mode, oberon_type_t * result, int read_only)
 {
 	oberon_item_t * item;
         item = malloc(sizeof *item);
@@ -613,6 +542,7 @@ oberon_new_item(int mode, oberon_type_t * result)
 
 	item -> is_item = 1;
 	item -> result = result;
+	item -> read_only = read_only;
 	item -> mode = mode;
 
 	return (oberon_expr_t *)item;
@@ -731,7 +661,7 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig)
 		oberon_error(ctx, "expected mode CALL");
 	}
 
-	if(desig -> item.var -> class != OBERON_CLASS_PROC)
+	if(desig -> item.var -> type -> class != OBERON_TYPE_PROCEDURE)
 	{
 		oberon_error(ctx, "only procedures can be called");
 	}
@@ -780,9 +710,25 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig)
 static oberon_expr_t *
 oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
 {
-	if(proc -> class != OBERON_CLASS_PROC)
+	switch(proc -> class)
 	{
-		oberon_error(ctx, "not a procedure");
+		case OBERON_CLASS_PROC:
+			if(proc -> class != OBERON_CLASS_PROC)
+			{
+				oberon_error(ctx, "not a procedure");
+			}
+			break;
+		case OBERON_CLASS_VAR:
+		case OBERON_CLASS_VAR_PARAM:
+		case OBERON_CLASS_PARAM:
+			if(proc -> type -> class != OBERON_TYPE_PROCEDURE)
+			{
+				oberon_error(ctx, "not a procedure");
+			}
+			break;
+		default:
+			oberon_error(ctx, "not a procedure");
+			break;
 	}
 
 	oberon_expr_t * call;
@@ -803,7 +749,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
 			oberon_error(ctx, "attempt to call procedure in expression");
 		}
 
-		call = oberon_new_item(MODE_CALL, proc -> type -> base);
+		call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
 		call -> item.var = proc;
 		call -> item.num_args = num_args;
 		call -> item.args = list_args;
@@ -816,9 +762,25 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
 static void
 oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
 {
-	if(proc -> class != OBERON_CLASS_PROC)
+	switch(proc -> class)
 	{
-		oberon_error(ctx, "not a procedure");
+		case OBERON_CLASS_PROC:
+			if(proc -> class != OBERON_CLASS_PROC)
+			{
+				oberon_error(ctx, "not a procedure");
+			}
+			break;
+		case OBERON_CLASS_VAR:
+		case OBERON_CLASS_VAR_PARAM:
+		case OBERON_CLASS_PARAM:
+			if(proc -> type -> class != OBERON_TYPE_PROCEDURE)
+			{
+				oberon_error(ctx, "not a procedure");
+			}
+			break;
+		default:
+			oberon_error(ctx, "not a procedure");
+			break;
 	}
 
 	if(proc -> sysproc)
@@ -838,7 +800,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
 		}
 
 		oberon_expr_t * call;
-		call = oberon_new_item(MODE_CALL, proc -> type -> base);
+		call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
 		call -> item.var = proc;
 		call -> item.num_args = num_args;
 		call -> item.args = list_args;
@@ -868,7 +830,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);
+	selector = oberon_new_item(MODE_DEREF, expr -> result -> base, expr -> read_only);
 	selector -> item.parent = (oberon_item_t *) expr;
 
 	return selector;
@@ -912,7 +874,7 @@ oberon_make_array_selector(oberon_context_t * ctx, oberon_expr_t * desig, oberon
 	}
 
 	oberon_expr_t * selector;
-	selector = oberon_new_item(MODE_INDEX, base);
+	selector = oberon_new_item(MODE_INDEX, base, desig -> read_only);
 	selector -> item.parent = (oberon_item_t *) desig;
 	selector -> item.num_args = 1;
 	selector -> item.args = index;
@@ -940,8 +902,25 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 	oberon_object_t * field;
 	field = oberon_find_field(ctx, rec, name);
 
+	if(field -> export == 0)
+	{
+		if(field -> module != ctx -> mod)
+		{
+			oberon_error(ctx, "field not exported");
+		}
+	}
+
+	int read_only = 0;
+	if(field -> read_only)
+	{
+		if(field -> module != ctx -> mod)
+		{
+			read_only = 1;
+		}
+	}
+
 	oberon_expr_t * selector;
-	selector = oberon_new_item(MODE_FIELD, field -> type);
+	selector = oberon_new_item(MODE_FIELD, field -> type, read_only);
 	selector -> item.var = field;
 	selector -> item.parent = (oberon_item_t *) expr;
 
@@ -953,6 +932,39 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 	|| ((x) == DOT) \
 	|| ((x) == UPARROW))
 
+static oberon_object_t *
+oberon_qualident(oberon_context_t * ctx, char ** xname, int check)
+{
+	char * name;
+	oberon_object_t * x;
+
+	name = oberon_assert_ident(ctx);
+	x = oberon_find_object(ctx -> decl, name, check);
+
+	if(x != NULL)
+	{
+		if(x -> class == OBERON_CLASS_MODULE)
+		{
+			oberon_assert_token(ctx, DOT);
+			name = oberon_assert_ident(ctx);
+			/* Наличие объектов в левых модулях всегда проверяется */
+			x = oberon_find_object(x -> module -> decl, name, 1);
+
+			if(x -> export == 0)
+			{
+				oberon_error(ctx, "not exported");
+			}
+		}
+	}
+
+	if(xname)
+	{
+		*xname = name;
+	}
+
+	return x;
+}
+
 static oberon_expr_t *
 oberon_designator(oberon_context_t * ctx)
 {
@@ -960,8 +972,16 @@ oberon_designator(oberon_context_t * ctx)
 	oberon_object_t * var;
 	oberon_expr_t * expr;
 
-	name = oberon_assert_ident(ctx);
-	var = oberon_find_object(ctx -> decl, name, 1);
+	var = oberon_qualident(ctx, NULL, 1);
+
+	int read_only = 0;
+	if(var -> read_only)
+	{
+		if(var -> module != ctx -> mod)
+		{
+			read_only = 1;
+		}
+	}
 
 	switch(var -> class)
 	{
@@ -972,11 +992,10 @@ oberon_designator(oberon_context_t * ctx)
 		case OBERON_CLASS_VAR:
 		case OBERON_CLASS_VAR_PARAM:
 		case OBERON_CLASS_PARAM:
-			expr = oberon_new_item(MODE_VAR, var -> type);
+			expr = oberon_new_item(MODE_VAR, var -> type, read_only);
 			break;
 		case OBERON_CLASS_PROC:
-			//expr = oberon_make_call_expr(var, 0, NULL);
-			expr = oberon_new_item(MODE_CALL, var -> type);
+			expr = oberon_new_item(MODE_VAR, var -> type, 1);
 			break;
 		default:
 			oberon_error(ctx, "invalid designator");
@@ -1023,6 +1042,7 @@ oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 {
 	assert(expr -> is_item == 1);
 
+	/* Если есть скобки - значит вызов. Если нет, то передаём указатель. */
 	if(ctx -> token == LPAREN)
 	{
 		oberon_assert_token(ctx, LPAREN);
@@ -1048,22 +1068,23 @@ oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 {
 	assert(expr -> is_item == 1);
 
+	int num_args = 0;
+	oberon_expr_t * arguments = NULL;
+
 	if(ctx -> token == LPAREN)
 	{
 		oberon_assert_token(ctx, LPAREN);
 
-		int num_args = 0;
-		oberon_expr_t * arguments = NULL;
-
 		if(ISEXPR(ctx -> token))
 		{
 			oberon_expr_list(ctx, &num_args, &arguments, 0);
 		}
 
-		oberon_make_call_proc(ctx, expr -> item.var, num_args, arguments);
-
 		oberon_assert_token(ctx, RPAREN);
 	}
+
+	/* Вызов происходит даже без скобок */
+	oberon_make_call_proc(ctx, expr -> item.var, num_args, arguments);
 }
 
 static oberon_expr_t *
@@ -1078,17 +1099,17 @@ oberon_factor(oberon_context_t * ctx)
 			expr = oberon_opt_func_parens(ctx, expr);
 			break;
 		case INTEGER:
-			expr = oberon_new_item(MODE_INTEGER, ctx -> int_type);
+			expr = oberon_new_item(MODE_INTEGER, ctx -> int_type, 1);
 			expr -> item.integer = ctx -> integer;
 			oberon_assert_token(ctx, INTEGER);
 			break;
 		case TRUE:
-			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type);
+			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
 			expr -> item.boolean = 1;
 			oberon_assert_token(ctx, TRUE);
 			break;
 		case FALSE:
-			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type);
+			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
 			expr -> item.boolean = 0;
 			oberon_assert_token(ctx, FALSE);
 			break;
@@ -1104,7 +1125,7 @@ oberon_factor(oberon_context_t * ctx)
 			break;
 		case NIL:
 			oberon_assert_token(ctx, NIL);
-			expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type);
+			expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, 1);
 			break;
 		default:
 			oberon_error(ctx, "invalid expression");
@@ -1386,50 +1407,88 @@ oberon_assert_ident(oberon_context_t * ctx)
 }
 
 static void
-oberon_var_decl(oberon_context_t * ctx)
+oberon_def(oberon_context_t * ctx, int * export, int * read_only)
+{
+	switch(ctx -> token)
+	{
+		case STAR:
+			oberon_assert_token(ctx, STAR);
+			*export = 1;
+			*read_only = 0;
+			break;
+		case MINUS:
+			oberon_assert_token(ctx, MINUS);
+			*export = 1;
+			*read_only = 1;
+			break;
+		default:
+			*export = 0;
+			*read_only = 0;
+			break;
+	}
+}
+
+static oberon_object_t *
+oberon_ident_def(oberon_context_t * ctx, int class)
 {
 	char * name;
-	oberon_type_t * type;
-	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	int export;
+	int read_only;
+	oberon_object_t * x;
 
 	name = oberon_assert_ident(ctx);
-	oberon_assert_token(ctx, COLON);
-	oberon_type(ctx, &type);
-	oberon_define_var(ctx -> decl, OBERON_CLASS_VAR, name, type);
+	oberon_def(ctx, &export, &read_only);
+
+	x = oberon_define_object(ctx -> decl, name, class, export, read_only);
+	return x;
 }
 
-static oberon_object_t *
-oberon_make_param(oberon_context_t * ctx, int token, char * name, oberon_type_t * type)
+static void
+oberon_ident_list(oberon_context_t * ctx, int class, int * num, oberon_object_t ** list)
 {
-	oberon_object_t * param;
-
-	if(token == VAR)
-	{
-		param = oberon_define_var(ctx -> decl, OBERON_CLASS_VAR_PARAM, name, type);
-	}
-	else if(token == IDENT)
+	*num = 1;
+	*list = oberon_ident_def(ctx, class);
+	while(ctx -> token == COMMA)
 	{
-		param = oberon_define_var(ctx -> decl, OBERON_CLASS_PARAM, name, type);
+		oberon_assert_token(ctx, COMMA);
+		oberon_ident_def(ctx, class);
+		*num += 1;
 	}
-	else
+}
+
+static void
+oberon_var_decl(oberon_context_t * ctx)
+{
+	int num;
+	oberon_object_t * list;
+	oberon_type_t * type;
+	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+
+	oberon_ident_list(ctx, OBERON_CLASS_VAR, &num, &list);
+	oberon_assert_token(ctx, COLON);
+	oberon_type(ctx, &type);
+
+	oberon_object_t * var = list;
+	for(int i = 0; i < num; i++)
 	{
-		oberon_error(ctx, "oberon_make_param: wat");
+		var -> type = type;
+		var = var -> next;
 	}
-
-	return param;
 }
 
 static oberon_object_t *
 oberon_fp_section(oberon_context_t * ctx, int * num_decl)
 {
-	int modifer_token = ctx -> token;
+	int class = OBERON_CLASS_PARAM;
 	if(ctx -> token == VAR)
 	{
 		oberon_read_token(ctx);
+		class = OBERON_CLASS_VAR_PARAM;
 	}
 
-	char * name;
-	name = oberon_assert_ident(ctx);
+	int num;
+	oberon_object_t * list;
+	oberon_ident_list(ctx, class, &num, &list);
 
 	oberon_assert_token(ctx, COLON);
 
@@ -1437,11 +1496,15 @@ oberon_fp_section(oberon_context_t * ctx, int * num_decl)
 	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 	oberon_type(ctx, &type);
 
-	oberon_object_t * first;
-	first = oberon_make_param(ctx, modifer_token, name, type);
+	oberon_object_t * param = list;
+	for(int i = 0; i < num; i++)
+	{
+		param -> type = type;
+		param = param -> next;
+	}
 
-	*num_decl += 1;
-	return first;
+	*num_decl += num;
+	return list;
 }
 
 #define ISFPSECTION \
@@ -1467,8 +1530,14 @@ oberon_formal_pars(oberon_context_t * ctx, oberon_type_t * signature)
 	if(ctx -> token == COLON)
 	{
 		oberon_assert_token(ctx, COLON);
-		// TODO get by qualident
-		oberon_type(ctx, &signature -> base);
+
+		oberon_object_t * typeobj;
+		typeobj = oberon_qualident(ctx, NULL, 1);
+		if(typeobj -> class != OBERON_CLASS_TYPE)
+		{
+			oberon_error(ctx, "function result is not type");
+		}
+		signature -> base = typeobj -> type;
 	}
 }
 
@@ -1596,7 +1665,10 @@ oberon_proc_decl(oberon_context_t * ctx)
 	}
 
 	char * name;
+	int export;
+	int read_only;
 	name = oberon_assert_ident(ctx);
+	oberon_def(ctx, &export, &read_only);
 
 	oberon_scope_t * proc_scope;
 	proc_scope = oberon_open_scope(ctx);
@@ -1627,11 +1699,16 @@ oberon_proc_decl(oberon_context_t * ctx)
 			}
 		}
 
+		if(proc -> export != export || proc -> read_only != read_only)
+		{
+			oberon_error(ctx, "export type not matched");
+		}
+
 		oberon_compare_signatures(ctx, proc -> type, signature);
 	}
 	else
 	{
-		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC);
+		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only);
 		proc -> type = signature;
 		proc -> scope = proc_scope;
 		oberon_generator_init_proc(ctx, proc);
@@ -1649,15 +1726,12 @@ oberon_proc_decl(oberon_context_t * ctx)
 static void
 oberon_const_decl(oberon_context_t * ctx)
 {
-	char * name;
 	oberon_item_t * value;
 	oberon_object_t * constant;
 
-	name = oberon_assert_ident(ctx);
+	constant = oberon_ident_def(ctx, OBERON_CLASS_CONST);
 	oberon_assert_token(ctx, EQUAL);
 	value = oberon_const_expr(ctx);
-
-	constant = oberon_define_object(ctx -> decl, name, OBERON_CLASS_CONST);
 	constant -> value = value;
 }
 
@@ -1686,14 +1760,23 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec)
 {
 	if(ctx -> token == IDENT)
 	{
-		char * name;
+		int num;
+		oberon_object_t * list;
 		oberon_type_t * type;
 		type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 
-		name = oberon_assert_ident(ctx);
+		oberon_ident_list(ctx, OBERON_CLASS_FIELD, &num, &list);
 		oberon_assert_token(ctx, COLON);
 		oberon_type(ctx, &type);
-		oberon_define_field(ctx, rec, name, type);
+
+		oberon_object_t * field = list;
+		for(int i = 0; i < num; i++)
+		{
+			field -> type = type;
+			field = field -> next;
+		}
+
+		rec -> num_decl += num;
 	}
 }
 
@@ -1703,8 +1786,10 @@ oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type)
 	char * name;
 	oberon_object_t * to;
 
-	name = oberon_assert_ident(ctx);
-	to = oberon_find_object(ctx -> decl, name, 0);
+	to = oberon_qualident(ctx, &name, 0);
+
+	//name = oberon_assert_ident(ctx);
+	//to = oberon_find_object(ctx -> decl, name, 0);
 
 	if(to != NULL)
 	{
@@ -1715,7 +1800,7 @@ oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type)
 	}
 	else
 	{
-		to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE);
+		to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, 0, 0);
 		to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 	}
 
@@ -1773,11 +1858,12 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		oberon_type_t * rec;
 		rec = *type;
 		rec -> class = OBERON_TYPE_RECORD;
-		oberon_object_t * list = malloc(sizeof *list);
-	        memset(list, 0, sizeof *list);
-		rec -> num_decl = 0;
-		rec -> base = NULL;
-		rec -> decl = list;
+
+		oberon_scope_t * record_scope;
+		record_scope = oberon_open_scope(ctx);
+		// TODO parent object
+		//record_scope -> parent = NULL;
+		record_scope -> local = 1;
 
 		oberon_assert_token(ctx, RECORD);
 		oberon_field_list(ctx, rec);
@@ -1788,7 +1874,9 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		}
 		oberon_assert_token(ctx, END);
 
-		rec -> decl = rec -> decl -> next;
+		rec -> decl = record_scope -> list -> next;
+		oberon_close_scope(record_scope);
+
 		*type = rec;
 	}
 	else if(ctx -> token == POINTER)
@@ -1824,13 +1912,16 @@ oberon_type_decl(oberon_context_t * ctx)
 	char * name;
 	oberon_object_t * newtype;
 	oberon_type_t * type;
+	int export;
+	int read_only;
 
 	name = oberon_assert_ident(ctx);
+	oberon_def(ctx, &export, &read_only);
 
 	newtype = oberon_find_object(ctx -> decl, name, 0);
 	if(newtype == NULL)
 	{
-		newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE);
+		newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only);
 		newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 		assert(newtype -> type);
 	}
@@ -1845,6 +1936,9 @@ oberon_type_decl(oberon_context_t * ctx)
 		{
 			oberon_error(ctx, "mult definition - already linked");
 		}
+
+		newtype -> export = export;
+		newtype -> read_only = read_only;
 	}
 
 	oberon_assert_token(ctx, EQUAL);
@@ -1996,6 +2090,7 @@ oberon_prevent_recursive_object(oberon_context_t * ctx, oberon_object_t * x)
 			break;
 		case OBERON_CLASS_CONST:
 		case OBERON_CLASS_PROC:
+		case OBERON_CLASS_MODULE:
 			break;
 		default:
 			oberon_error(ctx, "oberon_prevent_recursive_object: wat");
@@ -2114,9 +2209,10 @@ oberon_initialize_object(oberon_context_t * ctx, oberon_object_t * x)
 			break;
 		case OBERON_CLASS_CONST:
 		case OBERON_CLASS_PROC:
+		case OBERON_CLASS_MODULE:
 			break;
 		default:
-			oberon_error(ctx, "oberon_prevent_recursive_object: wat");
+			oberon_error(ctx, "oberon_initialize_object: wat");
 			break;
 	}
 }
@@ -2199,6 +2295,11 @@ oberon_decl_seq(oberon_context_t * ctx)
 static void
 oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 {
+	if(dst -> read_only)
+	{
+		oberon_error(ctx, "read-only destination");
+	}
+
 	oberon_autocast_to(ctx, src, dst -> result);
 	oberon_generate_assign(ctx, src, dst);
 }
@@ -2250,10 +2351,74 @@ oberon_statement_seq(oberon_context_t * ctx)
 	}
 }
 
+static void
+oberon_import_module(oberon_context_t * ctx, char * alias, char * name)
+{
+	oberon_module_t * m = ctx -> module_list;
+	while(m && strcmp(m -> name, name) != 0)
+	{
+		m = m -> next;
+	}
+
+	if(m == NULL)
+	{
+		const char * code;
+		code = ctx -> import_module(name);
+		if(code == NULL)
+		{
+			oberon_error(ctx, "no such module");
+		}
+
+		m = oberon_compile_module(ctx, code);
+		assert(m);
+	}
+
+	if(m -> ready == 0)
+	{
+		oberon_error(ctx, "cyclic module import");
+	}
+
+	oberon_object_t * ident;
+	ident = oberon_define_object(ctx -> decl, alias, OBERON_CLASS_MODULE, 0, 0);
+	ident -> module = m;
+}
+
+static void
+oberon_import_decl(oberon_context_t * ctx)
+{
+	char * alias;
+	char * name;
+
+	alias = name = oberon_assert_ident(ctx);
+	if(ctx -> token == ASSIGN)
+	{
+		oberon_assert_token(ctx, ASSIGN);
+		name = oberon_assert_ident(ctx);
+	}
+
+	oberon_import_module(ctx, alias, name);
+}
+
+static void
+oberon_import_list(oberon_context_t * ctx)
+{
+	oberon_assert_token(ctx, IMPORT);
+
+	oberon_import_decl(ctx);
+	while(ctx -> token == COMMA)
+	{
+		oberon_assert_token(ctx, COMMA);
+		oberon_import_decl(ctx);
+	}
+
+	oberon_assert_token(ctx, SEMICOLON);
+}
+
 static void
 oberon_parse_module(oberon_context_t * ctx)
 {
-	char *name1, *name2;
+	char * name1;
+	char * name2;
 	oberon_read_token(ctx);
 
 	oberon_assert_token(ctx, MODULE);
@@ -2261,15 +2426,20 @@ oberon_parse_module(oberon_context_t * ctx)
 	oberon_assert_token(ctx, SEMICOLON);
 	ctx -> mod -> name = name1;
 
+	if(ctx -> token == IMPORT)
+	{
+		oberon_import_list(ctx);
+	}
+
 	oberon_decl_seq(ctx);
 
+	oberon_generate_begin_module(ctx);
 	if(ctx -> token == BEGIN)
 	{
 		oberon_assert_token(ctx, BEGIN);
-		oberon_generate_begin_module(ctx);
 		oberon_statement_seq(ctx);
-		oberon_generate_end_module(ctx);
 	}
+	oberon_generate_end_module(ctx);
 
 	oberon_assert_token(ctx, END);
 	name2 = oberon_assert_ident(ctx);
@@ -2296,34 +2466,23 @@ register_default_types(oberon_context_t * ctx)
 	oberon_generator_init_type(ctx, ctx -> void_ptr_type);
 
 	ctx -> int_type = oberon_new_type_integer(sizeof(int));
-	oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type);
+	oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
 
 	ctx -> bool_type = oberon_new_type_boolean(sizeof(int));
-	oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type);
+	oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
 }
 
 static void
-oberon_new_intrinsic_function(oberon_context_t * ctx, char * name, GenerateFuncCallback generate)
+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);
+	proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, 1, 0);
 	proc -> sysproc = 1;
-	proc -> genfunc = generate;
+	proc -> genfunc = f;
+	proc -> genproc = p;
 	proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
 }
 
-/*
-static void
-oberon_new_intrinsic_procedure(oberon_context_t * ctx, char * name, GenerateProcCallback generate)
-{
-	oberon_object_t * proc;
-	proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC);
-	proc -> sysproc = 1;
-	proc -> genproc = generate;
-	proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
-}
-*/
-
 static oberon_expr_t *
 oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -2355,19 +2514,20 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 }
 
 oberon_context_t *
-oberon_create_context()
+oberon_create_context(ModuleImportCallback import_module)
 {
-	oberon_context_t * ctx = malloc(sizeof *ctx);
-	memset(ctx, 0, sizeof *ctx);
+	oberon_context_t * ctx = calloc(1, sizeof *ctx);
 
 	oberon_scope_t * world_scope;
 	world_scope = oberon_open_scope(ctx);
 	ctx -> world_scope = world_scope;
 
+	ctx -> import_module = import_module;
+
 	oberon_generator_init_context(ctx);
 
 	register_default_types(ctx);
-	oberon_new_intrinsic_function(ctx, "ABS", oberon_make_abs_call);
+	oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
 
 	return ctx;
 }
@@ -2380,21 +2540,41 @@ oberon_destroy_context(oberon_context_t * ctx)
 }
 
 oberon_module_t *
-oberon_compile_module(oberon_context_t * ctx, const char * code)
+oberon_compile_module(oberon_context_t * ctx, const char * newcode)
 {
-	oberon_module_t * mod = malloc(sizeof *mod);
-	memset(mod, 0, sizeof *mod);
-	ctx -> mod = mod;
+	const char * code = ctx -> code;
+	int code_index = ctx -> code_index;
+	char c = ctx -> c;
+	int token = ctx -> token;
+	char * string = ctx -> string;
+	int integer = ctx -> integer;
+	oberon_scope_t * decl = ctx -> decl;
+	oberon_module_t * mod = ctx -> mod;
 
 	oberon_scope_t * module_scope;
 	module_scope = oberon_open_scope(ctx);
-	mod -> decl = module_scope;
 
-	oberon_init_scaner(ctx, code);
+	oberon_module_t * module;
+	module = calloc(1, sizeof *module);
+	module -> decl = module_scope;
+	module -> next = ctx -> module_list;
+
+	ctx -> mod = module;
+	ctx -> module_list = module;
+
+	oberon_init_scaner(ctx, newcode);
 	oberon_parse_module(ctx);
 
-	oberon_generate_code(ctx);
+	module -> ready = 1;
+
+	ctx -> code = code;
+	ctx -> code_index = code_index;
+	ctx -> c = c;
+	ctx -> token = token;
+	ctx -> string = string;
+	ctx -> integer = integer;
+	ctx -> decl = decl;
+	ctx -> mod = mod;
 
-	ctx -> mod = NULL;
-	return mod;
+	return module;
 }