X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=6f9395ca71b81e1f8bf1254f9715a9568bf79610;hb=d25fb653bfe19a696d3f53abd784d32ba2d3ee03;hp=f1fe4518a135c6e9369e877ac2c08d13575fb12a;hpb=844ae6c007ac4606ad4ac3938876b67c014bb5eb;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index f1fe451..6f9395c 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -10,95 +10,16 @@
 #include "../include/oberon.h"
 
 #include "oberon-internals.h"
+#include "oberon-type-compat.h"
+#include "oberon-common.h"
 #include "generator.h"
 
-enum {
-	EOF_ = 0,
-	IDENT,
-	MODULE,
-	SEMICOLON,
-	END,
-	DOT,
-	VAR,
-	COLON,
-	BEGIN,
-	ASSIGN,
-	INTEGER,
-	LPAREN,
-	RPAREN,
-	EQUAL,
-	NEQ,
-	LESS,
-	LEQ,
-	GREAT,
-	GEQ,
-	IN,
-	IS,
-	PLUS,
-	MINUS,
-	OR,
-	STAR,
-	SLASH,
-	DIV,
-	MOD,
-	AND,
-	NOT,
-	PROCEDURE,
-	COMMA,
-	RETURN,
-	CONST,
-	TYPE,
-	ARRAY,
-	OF,
-	LBRACK,
-	RBRACK,
-	RECORD,
-	POINTER,
-	TO,
-	UPARROW,
-	NIL,
-	IMPORT,
-	REAL,
-	CHAR,
-	STRING,
-	IF,
-	THEN,
-	ELSE,
-	ELSIF,
-	WHILE,
-	DO,
-	REPEAT,
-	UNTIL,
-	FOR,
-	BY,
-	LOOP,
-	EXIT,
-	LBRACE,
-	RBRACE,
-	DOTDOT,
-	CASE,
-	BAR,
-	WITH
-};
-
 // =======================================================================
 //   UTILS
 // ======================================================================= 
 
 static void
-oberon_error(oberon_context_t * ctx, const char * fmt, ...)
-{
-	va_list ptr;
-	va_start(ptr, fmt);
-	fprintf(stderr, "error: ");
-	vfprintf(stderr, fmt, ptr);
-	fprintf(stderr, "\n");
-	fprintf(stderr, "  code_index = %i\n", ctx -> code_index);
-	fprintf(stderr, "  c          = %c\n", ctx -> c);
-	fprintf(stderr, "  token      = %i\n", ctx -> token);
-	va_end(ptr);
-	exit(1);
-}
+oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args);
 
 static oberon_type_t *
 oberon_new_type_ptr(int class)
@@ -690,8 +611,7 @@ static void oberon_read_string(oberon_context_t * ctx)
 
 	ctx -> token = STRING;
 	ctx -> string = string;
-
-	printf("oberon_read_string: string ((%s))\n", string);
+	ctx -> integer = string[0];
 }
 
 static void oberon_read_token(oberon_context_t * ctx);
@@ -977,89 +897,30 @@ oberon_expr_list(oberon_context_t * ctx, int * num_expr, oberon_expr_t ** first,
 static oberon_expr_t *
 oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
 {
-	return oberon_new_operator(OP_CAST, pref, expr, NULL);
-}
-
-static oberon_expr_t *
-oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * rec)
-{
-	oberon_type_t * from = expr -> result;
-	oberon_type_t * to = rec;
-
-	printf("oberno_make_record_cast: from class %i to class %i\n", from -> class, to -> class);
-
-	if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
-	{
-		printf("oberno_make_record_cast: pointers\n");
-		from = from -> base;
-		to = to -> base;
-	}
+	oberon_expr_t * cast;
 
-	if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
+	if((oberon_is_char_type(pref) && oberon_is_const_string(expr) && strlen(expr -> item.string) == 1))
 	{
-		oberon_error(ctx, "must be record type");
-	}
-
-	return oberon_cast_expr(ctx, expr, rec);
-}
-
-static oberon_type_t *
-oberon_get_equal_expr_type(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t * b)
-{
-	oberon_type_t * result;
-	if(a -> class == OBERON_TYPE_REAL && b -> class == OBERON_TYPE_INTEGER)
-	{
-		result = a;
-	}
-	else if(b -> class == OBERON_TYPE_REAL && a -> class == OBERON_TYPE_INTEGER)
-	{
-		result = b;
-	}
-	else if(a -> class != b -> class)
-	{
-		oberon_error(ctx, "oberon_get_equal_expr_type: incompatible types");
-	}
-	else if(a -> size > b -> size)
-	{
-		result = a;
+		/* Автоматически преобразуем строку единичного размера в символ */
+		cast = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
+		cast -> item.integer = expr -> item.string[0];
 	}
 	else
 	{
-		result = b;
+		cast = oberon_new_operator(OP_CAST, pref, expr, NULL);
 	}
 
-	return result;
+	return cast;
 }
 
 static void
-oberon_check_record_compatibility(oberon_context_t * ctx, oberon_type_t * from, oberon_type_t * to)
+oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
 {
-	if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
-	{
-		from = from -> base;
-		to = to -> base;
-	}
-
-	if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
-	{
-		oberon_error(ctx, "not a record");
-	}
-
-	oberon_type_t * t = from;
-	while(t != NULL && t != to)
+	if(dst -> read_only)
 	{
-		t = t -> base;
+		oberon_error(ctx, "read-only destination");
 	}
 
-	if(t == NULL)
-	{
-		oberon_error(ctx, "incompatible record types");
-	}
-}
-
-static void
-oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
-{
 	if(dst -> is_item == false)
 	{
 		oberon_error(ctx, "not variable");
@@ -1093,124 +954,6 @@ oberon_check_src(oberon_context_t * ctx, oberon_expr_t * src)
 	}
 }
 
-static oberon_expr_t *
-oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
-{
-	// Допускается:
-	//  Если классы типов равны
-	//  Если INTEGER переводится в REAL
-	//  Есди STRING переводится в CHAR
-	//  Есди STRING переводится в ARRAY OF CHAR
-
-	oberon_check_src(ctx, expr);
-
-	bool error = false;
-	if(pref -> class != expr -> result -> class)
-	{
-		printf("expr class %i\n", expr -> result -> class);
-		printf("pref class %i\n", pref -> class);
-
-		if(expr -> result -> class == OBERON_TYPE_STRING)
-		{
-			if(pref -> class == OBERON_TYPE_CHAR)
-			{
-				if(expr -> is_item && expr -> item.mode == MODE_STRING)
-				{
-					if(strlen(expr -> item.string) != 1)
-					{
-						error = true;
-					}
-				}
-				else
-				{
-					error = true;
-				}
-			}
-			else if(pref -> class == OBERON_TYPE_ARRAY)
-			{
-				if(pref -> base -> class != OBERON_TYPE_CHAR)
-				{
-					error = true;
-				}
-			}
-			else
-			{
-				error = true;
-			}
-		}
-		else if(expr -> result -> class == OBERON_TYPE_INTEGER)
-		{
-			if(pref -> class != OBERON_TYPE_REAL)
-			{
-				error = true;
-			}
-		}
-		else
-		{
-			error = true;
-		}
-	}
-
-	if(error)
-	{
-		oberon_error(ctx, "oberon_autocast_to: incompatible types");
-	}
-
-	if(pref -> class == OBERON_TYPE_CHAR)
-	{
-		if(expr -> result -> class == OBERON_TYPE_STRING)
-		{
-			int c = expr -> item.string[0];
-			expr = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
-			expr -> item.integer = c;
-		}
-	}
-	else if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
-	{
-		if(expr -> result -> size > pref -> size)
-		{
-			oberon_error(ctx, "incompatible size");
-		}
-		else
-		{
-			expr = oberon_cast_expr(ctx, expr, pref);
-		}
-	}
-	else if(pref -> class == OBERON_TYPE_RECORD)
-	{
-		oberon_check_record_compatibility(ctx, expr -> result, pref);
-		expr = oberno_make_record_cast(ctx, expr, pref);
-	}
-	else if(pref -> class == OBERON_TYPE_POINTER)
-	{
-		assert(pref -> base);
-		if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
-		{
-			oberon_check_record_compatibility(ctx, expr -> result, pref);
-			expr = oberno_make_record_cast(ctx, expr, pref);
-		}
-		else if(expr -> result -> base != pref -> base)
-		{
-			if(expr -> result -> base -> class != OBERON_TYPE_VOID)
-			{
-				oberon_error(ctx, "incompatible pointer types");
-			}
-		}
-	}
-
-	return expr;
-}
-
-static void
-oberon_autocast_binary_op(oberon_context_t * ctx, oberon_expr_t ** ea, oberon_expr_t ** eb)
-{
-	oberon_type_t * a = (*ea) -> result;
-	oberon_type_t * b = (*eb) -> result;
-	oberon_type_t * preq = oberon_get_equal_expr_type(ctx, a, b);
-	*ea = oberon_autocast_to(ctx, *ea, preq);
-	*eb = oberon_autocast_to(ctx, *eb, preq);
-}
-
 static void
 oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 {
@@ -1240,19 +983,21 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 	{
 		if(param -> class == OBERON_CLASS_VAR_PARAM)
 		{
-			if(arg -> result != param -> type)
+			oberon_check_dst(ctx, arg);
+			if(!oberon_is_compatible_arrays(param, arg))
 			{
-				oberon_error(ctx, "incompatible type");
+				oberon_check_compatible_var_param(ctx, param -> type, arg -> result);
 			}
-			if(arg -> read_only)
-			{
-				oberon_error(ctx, "assign to read-only var");
-			}
-			casted[i] = arg;
+			casted[i] = oberon_cast_expr(ctx, arg, param -> type);
 		}
 		else
 		{
-			casted[i] = oberon_autocast_to(ctx, arg, param -> type);
+			oberon_check_src(ctx, arg);
+			if(!oberon_is_compatible_arrays(param, arg))
+			{
+				oberon_check_assignment_compatible(ctx, arg, param -> type);
+			}
+			casted[i] = oberon_cast_expr(ctx, arg, param -> type);
 		}
 
 		arg = arg -> next;
@@ -1293,7 +1038,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args
 	}
 	else
 	{
-		if(signature -> base -> class == OBERON_TYPE_VOID)
+		if(signature -> base -> class == OBERON_TYPE_NOTYPE)
 		{
 			oberon_error(ctx, "attempt to call procedure in expression");
 		}
@@ -1330,7 +1075,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
 	}
 	else
 	{
-		if(signature -> base -> class != OBERON_TYPE_VOID)
+		if(signature -> base -> class != OBERON_TYPE_NOTYPE)
 		{
 			oberon_error(ctx, "attempt to call function as non-typed procedure");
 		}
@@ -1359,7 +1104,6 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
 static oberon_expr_t *
 oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
 {
-	printf("oberno_make_dereferencing\n");
 	if(expr -> result -> class != OBERON_TYPE_POINTER)
 	{
 		oberon_error(ctx, "not a pointer");
@@ -1451,7 +1195,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 		}
 	}
 
-	int read_only = 0;
+	int read_only = expr -> read_only;
 	if(field -> read_only)
 	{
 		if(field -> module != ctx -> mod)
@@ -1576,6 +1320,7 @@ oberon_designator(oberon_context_t * ctx)
 {
 	char * name;
 	oberon_expr_t * expr;
+	oberon_object_t * objtype;
 
 	expr = oberon_qualident_expr(ctx);
 
@@ -1607,13 +1352,10 @@ oberon_designator(oberon_context_t * ctx)
 				break;
 			case LPAREN:
 				oberon_assert_token(ctx, LPAREN);
-				oberon_object_t * objtype = oberon_qualident(ctx, NULL, 1);
-				if(objtype -> class != OBERON_CLASS_TYPE)
-				{
-					oberon_error(ctx, "must be type");
-				}
+				objtype = oberon_qualident(ctx, NULL, true);
 				oberon_assert_token(ctx, RPAREN);
-				expr = oberno_make_record_cast(ctx, expr, objtype -> type);
+				oberon_check_extension_of(ctx, expr -> result, objtype -> type);
+				expr = oberon_cast_expr(ctx, expr, objtype -> type);
 				break;
 			default:
 				oberon_error(ctx, "oberon_designator: wat");
@@ -1712,6 +1454,7 @@ oberon_element(oberon_context_t * ctx)
 	oberon_expr_t * e2;
 
 	e1 = oberon_expr(ctx);
+	oberon_check_src(ctx, e1);
 	if(e1 -> result -> class != OBERON_TYPE_INTEGER)
 	{
 		oberon_error(ctx, "expected integer");
@@ -1722,6 +1465,7 @@ oberon_element(oberon_context_t * ctx)
 	{
 		oberon_assert_token(ctx, DOTDOT);
 		e2 = oberon_expr(ctx);
+		oberon_check_src(ctx, e2);
 		if(e2 -> result -> class != OBERON_TYPE_INTEGER)
 		{
 			oberon_error(ctx, "expected integer");
@@ -1816,7 +1560,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, true);
+			expr = oberon_new_item(MODE_NIL, ctx -> nil_type, true);
 			break;
 		default:
 			oberon_error(ctx, "invalid expression");
@@ -1825,122 +1569,34 @@ oberon_factor(oberon_context_t * ctx)
 	return expr;
 }
 
-#define ITMAKESBOOLEAN(x) \
-	(((x) >= EQUAL && (x) <= GEQ) || ((x) == OR) || ((x) == AND))
-
-#define ITUSEONLYINTEGER(x) \
-	((x) >= LESS && (x) <= GEQ)
-
-#define ITUSEONLYBOOLEAN(x) \
-	(((x) == OR) || ((x) == AND))
-
-static void
-oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
-{
-	oberon_expr_t * expr = *e;
-	if(expr -> result -> class == OBERON_TYPE_INTEGER)
-	{
-		if(expr -> result -> size <= ctx -> real_type -> size)
-		{
-			*e = oberon_cast_expr(ctx, expr, ctx -> real_type);
-		}
-		else
-		{
-			*e = oberon_cast_expr(ctx, expr, ctx -> longreal_type);
-		}
-	}
-	else if(expr -> result -> class != OBERON_TYPE_REAL)
-	{
-		oberon_error(ctx, "required numeric type");
-	}
-}
-
 static oberon_expr_t *
 oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
 {
 	oberon_expr_t * expr;
 	oberon_type_t * result;
 
+	oberon_check_compatible_bin_expr_types(ctx, token, a -> result, b -> result);
+	oberon_check_src(ctx, a);
+	if(token != IS)
+	{
+		oberon_check_src(ctx, b);
+	}
+
 	bool error = false;
 	if(token == IN)
 	{
-		if(a -> result -> class != OBERON_TYPE_INTEGER)
-		{
-			oberon_error(ctx, "must be integer");
-		}
-
-		if(b -> result -> class != OBERON_TYPE_SET)
-		{
-			oberon_error(ctx, "must be set");
-		}
-
-		result = ctx -> bool_type;
-		expr = oberon_new_operator(OP_IN, result, a, b);
+		expr = oberon_new_operator(OP_IN, ctx -> bool_type, a, b);
 	}
 	else if(token == IS)
 	{
-		oberon_type_t * v = a -> result;
-		if(v -> class == OBERON_TYPE_POINTER)
-		{
-			v = v -> base;
-			if(v -> class != OBERON_TYPE_RECORD)
-			{
-				oberon_error(ctx, "must be record");
-			}
-		}
-		else if(v -> class != OBERON_TYPE_RECORD)
-		{
-			oberon_error(ctx, "must be record");
-		}		
-
-		if(b -> is_item == false || b -> item.mode != MODE_TYPE)
-		{
-			oberon_error(ctx, "requires type");
-		}
-
-		oberon_type_t * t = b -> result;
-		if(t -> class == OBERON_TYPE_POINTER)
-		{
-			t = t -> base;
-			if(t -> class != OBERON_TYPE_RECORD)
-			{
-				oberon_error(ctx, "must be record");
-			}
-		}
-		else if(t -> class != OBERON_TYPE_RECORD)
-		{
-			oberon_error(ctx, "must be record");
-		}
-
-		result = ctx -> bool_type;
-		expr = oberon_new_operator(OP_IS, result, a, b);
+		oberon_check_type_expr(ctx, b);
+		expr = oberon_new_operator(OP_IS, ctx -> bool_type, a, b);
 	}
-	else if(ITMAKESBOOLEAN(token))
+	else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
 	{
-		if(ITUSEONLYINTEGER(token))
-		{
-			if(a -> result -> class == OBERON_TYPE_INTEGER
-				|| b -> result -> class == OBERON_TYPE_INTEGER
-				|| a -> result -> class == OBERON_TYPE_REAL
-				|| b -> result -> class == OBERON_TYPE_REAL)
-			{
-				// accept
-			}
-			else
-			{
-				oberon_error(ctx, "used only with numeric types");
-			}
-		}
-		else if(ITUSEONLYBOOLEAN(token))
-		{
-			if(a -> result -> class != OBERON_TYPE_BOOLEAN
-				|| b -> result -> class != OBERON_TYPE_BOOLEAN)
-			{
-				oberon_error(ctx, "used only with boolean type");
-			}
-		}
-
-		oberon_autocast_binary_op(ctx, &a, &b);
+		result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		a = oberon_cast_expr(ctx, a, result);
+		b = oberon_cast_expr(ctx, b, result);
 		result = ctx -> bool_type;
 
 		if(token == EQUAL)
@@ -1982,38 +1638,34 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	}
 	else if(token == SLASH)
 	{
-		if(a -> result -> class == OBERON_TYPE_SET
-			|| b -> result -> class == OBERON_TYPE_SET)
+		if(oberon_is_set_type(a -> result) && oberon_is_set_type(b -> result))
 		{
-			oberon_autocast_binary_op(ctx, &a, &b);
-			result = a -> result;
+			result = oberon_get_longer_type(ctx, a -> result, b -> result);
+			a = oberon_cast_expr(ctx, a, result);
+			b = oberon_cast_expr(ctx, b, result);
 			expr = oberon_new_operator(OP_SYM_DIFFERENCE, result, a, b);
 		}
 		else
 		{
-			oberon_autocast_to_real(ctx, &a);
-			oberon_autocast_to_real(ctx, &b);
-			oberon_autocast_binary_op(ctx, &a, &b);
-			result = a -> result;
+			result = oberon_get_longer_real_type(ctx, a -> result, b -> result);
+			a = oberon_cast_expr(ctx, a, result);
+			b = oberon_cast_expr(ctx, b, result);
 			expr = oberon_new_operator(OP_DIV, result, a, b);
 		}
 	}
 	else if(token == DIV)
 	{
-		if(a -> result -> class != OBERON_TYPE_INTEGER
-			|| b -> result -> class != OBERON_TYPE_INTEGER)
-		{
-			oberon_error(ctx, "operator DIV requires integer type");
-		}
-
-		oberon_autocast_binary_op(ctx, &a, &b);
-		expr = oberon_new_operator(OP_DIV, a -> result, a, b);
+		result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		a = oberon_cast_expr(ctx, a, result);
+		b = oberon_cast_expr(ctx, b, result);
+		expr = oberon_new_operator(OP_DIV, result, a, b);
 	}
 	else
 	{
-		oberon_autocast_binary_op(ctx, &a, &b);
-		result = a -> result;
-		if(result -> class == OBERON_TYPE_SET)
+		result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		a = oberon_cast_expr(ctx, a, result);
+		b = oberon_cast_expr(ctx, b, result);
+		if(oberon_is_set_type(result))
 		{
 			switch(token)
 			{
@@ -2031,8 +1683,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 					break;
 			}
 		}
-		else if(result -> class == OBERON_TYPE_INTEGER
-			|| result -> class == OBERON_TYPE_REAL)
+		else if(oberon_is_number_type(result))
 		{
 			switch(token)
 			{
@@ -2271,7 +1922,7 @@ 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);
+	type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 
 	oberon_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
 	oberon_assert_token(ctx, COLON);
@@ -2302,7 +1953,7 @@ oberon_fp_section(oberon_context_t * ctx, int * num_decl)
 	oberon_assert_token(ctx, COLON);
 
 	oberon_type_t * type;
-	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 	oberon_type(ctx, &type);
 
 	oberon_object_t * param = list;
@@ -2346,6 +1997,11 @@ oberon_formal_pars(oberon_context_t * ctx, oberon_type_t * signature)
 		{
 			oberon_error(ctx, "function result is not type");
 		}
+		if(typeobj -> type -> class == OBERON_TYPE_RECORD
+			|| typeobj -> type -> class == OBERON_TYPE_ARRAY)
+		{
+			oberon_error(ctx, "records or arrays could not be result of function");
+		}
 		signature -> base = typeobj -> type;
 	}
 }
@@ -2357,7 +2013,7 @@ oberon_opt_formal_pars(oberon_context_t * ctx, oberon_type_t ** type)
 	signature = *type;
 	signature -> class = OBERON_TYPE_PROCEDURE;
 	signature -> num_decl = 0;
-	signature -> base = ctx -> void_type;
+	signature -> base = ctx -> notype_type;
 	signature -> decl = NULL;
 
 	if(ctx -> token == LPAREN)
@@ -2400,7 +2056,7 @@ oberon_make_return(oberon_context_t * ctx, oberon_expr_t * expr)
 	oberon_object_t * proc = ctx -> decl -> parent;
 	oberon_type_t * result_type = proc -> type -> base;
 
-	if(result_type -> class == OBERON_TYPE_VOID)
+	if(result_type -> class == OBERON_TYPE_NOTYPE)
 	{
 		if(expr != NULL)
 		{
@@ -2414,7 +2070,9 @@ oberon_make_return(oberon_context_t * ctx, oberon_expr_t * expr)
 			oberon_error(ctx, "procedure requires expression on result");
 		}
 
-		expr = oberon_autocast_to(ctx, expr, result_type);
+		oberon_check_src(ctx, expr);
+		oberon_check_assignment_compatible(ctx, expr, result_type);
+		expr = oberon_cast_expr(ctx, expr, result_type);
 	}
 
 	proc -> has_return = 1;
@@ -2446,7 +2104,7 @@ oberon_proc_decl_body(oberon_context_t * ctx, oberon_object_t * proc)
 		oberon_error(ctx, "procedure name not matched");
 	}
 
-	if(proc -> type -> base -> class == OBERON_TYPE_VOID
+	if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE
 		&& proc -> has_return == 0)
 	{
 		oberon_make_return(ctx, NULL);
@@ -2484,7 +2142,7 @@ oberon_proc_decl(oberon_context_t * ctx)
 	ctx -> decl -> local = 1;
 
 	oberon_type_t * signature;
-	signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	signature = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 	oberon_opt_formal_pars(ctx, &signature);	
 
 	//oberon_initialize_decl(ctx);
@@ -2591,7 +2249,7 @@ oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type)
 	else
 	{
 		to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
-		to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		to -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 	}
 
 	*type = to -> type;
@@ -2613,7 +2271,7 @@ oberon_make_multiarray(oberon_context_t * ctx, oberon_expr_t * sizes, oberon_typ
 	}
 
 	oberon_type_t * dim;
-	dim = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	dim = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 
 	oberon_make_multiarray(ctx, sizes -> next, base, &dim);
 
@@ -2636,7 +2294,7 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t *
 		int num;
 		oberon_object_t * list;
 		oberon_type_t * type;
-		type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 
 		oberon_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
 		oberon_assert_token(ctx, COLON);
@@ -2737,7 +2395,7 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		oberon_assert_token(ctx, OF);
 
 		oberon_type_t * base;
-		base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 		oberon_type(ctx, &base);
 
 		if(num_sizes == 0)
@@ -2768,7 +2426,7 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		oberon_assert_token(ctx, TO);
 
 		oberon_type_t * base;
-		base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 		oberon_type(ctx, &base);
 
 		oberon_type_t * ptr;
@@ -2805,7 +2463,7 @@ oberon_type_decl(oberon_context_t * ctx)
 	if(newtype == NULL)
 	{
 		newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only, false);
-		newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		newtype -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 		assert(newtype -> type);
 	}
 	else
@@ -2829,7 +2487,7 @@ oberon_type_decl(oberon_context_t * ctx)
 	type = newtype -> type;
 	oberon_type(ctx, &type);
 
-	if(type -> class == OBERON_TYPE_VOID)
+	if(type -> class == OBERON_TYPE_NOTYPE)
 	{
 		oberon_error(ctx, "recursive alias declaration");
 	}
@@ -2883,6 +2541,11 @@ oberon_prevent_recursive_record(oberon_context_t * ctx, oberon_type_t * type)
 
 	type -> recursive = 1;
 
+	if(type -> base)
+	{
+		oberon_prevent_recursive_record(ctx, type -> base);
+	}
+
 	int num_fields = type -> num_decl;
 	oberon_object_t * field = type -> decl;
 	for(int i = 0; i < num_fields; i++)
@@ -3024,7 +2687,7 @@ oberon_initialize_record_fields(oberon_context_t * ctx, oberon_type_t * type)
 static void
 oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
 {
-	if(type -> class == OBERON_TYPE_VOID)
+	if(type -> class == OBERON_TYPE_NOTYPE)
 	{
 		oberon_error(ctx, "undeclarated type");
 	}
@@ -3219,14 +2882,19 @@ oberon_statement_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_check_dst(ctx, dst);
+	oberon_check_assignment_compatible(ctx, src, dst -> result);
+
+	if(oberon_is_string_type(src -> result))
 	{
-		oberon_error(ctx, "read-only destination");
+		src -> next = dst;
+		oberon_make_copy_call(ctx, 2, src);
+	}
+	else
+	{
+		src = oberon_cast_expr(ctx, src, dst -> result);
+		oberon_generate_assign(ctx, src, dst);
 	}
-
-	oberon_check_dst(ctx, dst);
-	src = oberon_autocast_to(ctx, src, dst -> result);
-	oberon_generate_assign(ctx, src, dst);
 }
 
 static oberon_expr_t *
@@ -3238,14 +2906,12 @@ oberon_case_labels(oberon_context_t * ctx, oberon_expr_t * val)
 	oberon_expr_t * cond2;
 
 	e1 = (oberon_expr_t *) oberon_const_expr(ctx);
-	oberon_autocast_to(ctx, e1, val -> result);
 	
 	e2 = NULL;
 	if(ctx -> token == DOTDOT)
 	{
 		oberon_assert_token(ctx, DOTDOT);
 		e2 = (oberon_expr_t *) oberon_const_expr(ctx);
-		oberon_autocast_to(ctx, e2, val -> result);
 	}
 
 	if(e2 == NULL)
@@ -3319,6 +2985,10 @@ oberon_case_statement(oberon_context_t * ctx)
 		oberon_assert_token(ctx, ELSE);
 		oberon_statement_seq(ctx);
 	}
+	else
+	{
+		oberon_generate_trap(ctx, -1);
+	}
 
 	oberon_generate_label(ctx, end);
 	oberon_assert_token(ctx, END);
@@ -3348,7 +3018,8 @@ oberon_with_guard_do(oberon_context_t * ctx, gen_label_t * end)
 
 	/* Сохраняем ссылку во временной переменной */
 	val = oberon_make_temp_var_item(ctx, type -> result);
-	cast = oberno_make_record_cast(ctx, var, type -> result);
+	//cast = oberno_make_record_cast(ctx, var, type -> result);
+	cast = oberon_cast_expr(ctx, var, type -> result);
 	oberon_assign(ctx, cast, val);
 	/* Подменяем тип у оригинальной переменной */
 	old_type = var -> item.var -> type;
@@ -3385,6 +3056,10 @@ oberon_with_statement(oberon_context_t * ctx)
 		oberon_assert_token(ctx, ELSE);
 		oberon_statement_seq(ctx);
 	}
+	else
+	{
+		oberon_generate_trap(ctx, -2);
+	}
 
 	oberon_generate_label(ctx, end);
 	oberon_assert_token(ctx, END);
@@ -3525,11 +3200,11 @@ oberon_statement(oberon_context_t * ctx)
 		index = oberon_ident_item(ctx, iname);
 		oberon_assert_token(ctx, ASSIGN);
 		from = oberon_expr(ctx);
-		oberon_assign(ctx, from, index);
 		oberon_assert_token(ctx, TO);
 		bound = oberon_make_temp_var_item(ctx, index -> result);
 		to = oberon_expr(ctx);
-		oberon_assign(ctx, to, bound);
+		oberon_assign(ctx, to, bound); // сначала temp
+		oberon_assign(ctx, from, index); // потом i
 		if(ctx -> token == BY)
 		{
 			oberon_assert_token(ctx, BY);
@@ -3742,12 +3417,11 @@ oberon_parse_module(oberon_context_t * ctx)
 static void
 register_default_types(oberon_context_t * ctx)
 {
-	ctx -> void_type = oberon_new_type_ptr(OBERON_TYPE_VOID);
-	oberon_generator_init_type(ctx, ctx -> void_type);
+	ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
+	oberon_generator_init_type(ctx, ctx -> notype_type);
 
-	ctx -> void_ptr_type = oberon_new_type_ptr(OBERON_TYPE_POINTER);
-	ctx -> void_ptr_type -> base = ctx -> void_type;
-	oberon_generator_init_type(ctx, ctx -> void_ptr_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);
@@ -3755,17 +3429,20 @@ register_default_types(oberon_context_t * ctx)
 	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, "BYTE", ctx -> byte_type, 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, "SHORTINT", ctx -> shortint_type, 1);
+	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, "INTEGER", ctx -> int_type, 1);
+	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, "LONGINT", ctx -> longint_type, 1);
+	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);
@@ -3773,9 +3450,6 @@ register_default_types(oberon_context_t * ctx)
 	ctx -> longreal_type = oberon_new_type_real(8);
 	oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
 
-	ctx -> char_type = oberon_new_type_char(1);
-	oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
-
 	ctx -> set_type = oberon_new_type_set(4);
 	oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
 }
@@ -3949,7 +3623,6 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		oberon_error(ctx, "too few arguments");
 	}
 
-
 	oberon_expr_t * dst;
 	dst = list_args;
 	oberon_check_dst(ctx, dst);
@@ -4025,6 +3698,110 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	oberon_assign(ctx, src, dst);
 }
 
+static void
+oberon_make_copy_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 * src;
+	src = list_args;
+	oberon_check_src(ctx, src);
+
+	oberon_expr_t * dst;
+	dst = list_args -> next;
+	oberon_check_dst(ctx, dst);
+
+	if(!oberon_is_string_type(src -> result) && !oberon_is_array_of_char_type(src -> result))
+	{
+		oberon_error(ctx, "source must be string or array of char");
+	}
+
+	if(!oberon_is_array_of_char_type(dst -> result))
+	{
+		oberon_error(ctx, "dst must be array of char");
+	}
+
+	oberon_generate_copy(ctx, src, dst);
+}
+
+static void
+oberon_make_assert_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 * cond;
+	cond = list_args;
+	oberon_check_src(ctx, cond);
+
+	if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+	{
+		oberon_error(ctx, "expected boolean");
+	}
+
+	if(num_args == 1)
+	{
+		oberon_generate_assert(ctx, cond);
+	}
+	else
+	{
+		oberon_expr_t * num;
+		num = list_args -> next;
+		oberon_check_src(ctx, num);
+
+		if(num -> result -> class != OBERON_TYPE_INTEGER)
+		{
+			oberon_error(ctx, "expected integer");
+		}
+
+		oberon_check_const(ctx, num);
+
+		oberon_generate_assert_n(ctx, cond, num -> item.integer);
+	}
+}
+
+static void
+oberon_make_halt_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 * num;
+	num = list_args;
+	oberon_check_src(ctx, num);
+
+	if(num -> result -> class != OBERON_TYPE_INTEGER)
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	oberon_check_const(ctx, num);
+
+	oberon_generate_halt(ctx, num -> item.integer);
+}
+
 static void
 oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
 {
@@ -4061,6 +3838,9 @@ oberon_create_context(ModuleImportCallback import_module)
 
 	/* 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, "HALT", NULL, oberon_make_halt_call);
 
 	return ctx;
 }