X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=b428ecf73f6bda15c85365a8d49a5dd6aafb45ad;hb=e9b64944925eadc5022edfee26281a4814fd9124;hp=8de42d912fbb0ed03442b54072db6e353316d594;hpb=25b73915e7fe0ae7dc51cf6f4a012f021257a35d;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 8de42d9..b428ecf 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -33,6 +33,8 @@ enum {
 	LEQ,
 	GREAT,
 	GEQ,
+	IN,
+	IS,
 	PLUS,
 	MINUS,
 	OR,
@@ -57,7 +59,13 @@ enum {
 	UPARROW,
 	NIL,
 	IMPORT,
-	REAL
+	REAL,
+	CHAR,
+	STRING,
+	IF,
+	THEN,
+	ELSE,
+	ELSIF
 };
 
 // =======================================================================
@@ -114,6 +122,24 @@ oberon_new_type_real(int size)
 	return x;
 }
 
+static oberon_type_t *
+oberon_new_type_char(int size)
+{
+	oberon_type_t * x;
+	x = oberon_new_type_ptr(OBERON_TYPE_CHAR);
+	x -> size = size;
+	return x;
+}
+
+static oberon_type_t *
+oberon_new_type_string(int size)
+{
+	oberon_type_t * x;
+	x = oberon_new_type_ptr(OBERON_TYPE_STRING);
+	x -> size = size;
+	return x;
+}
+
 // =======================================================================
 //   TABLE
 // ======================================================================= 
@@ -146,36 +172,6 @@ oberon_close_scope(oberon_scope_t * scope)
 	ctx -> decl = scope -> up;
 }
 
-static oberon_object_t *
-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)
-	{
-		x = x -> next;
-	}
-
-	if(x -> next)
-	{
-		oberon_error(scope -> ctx, "already defined");
-	}
-
-	oberon_object_t * newvar = malloc(sizeof *newvar);
-	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 -> parent_type = scope -> parent_type;
-	newvar -> module = scope -> ctx -> mod;
-
-	x -> next = newvar;
-
-	return newvar;
-}
-
 static oberon_object_t *
 oberon_find_object_in_list(oberon_object_t * list, char * name)
 {
@@ -188,7 +184,7 @@ oberon_find_object_in_list(oberon_object_t * list, char * name)
 }
 
 static oberon_object_t *
-oberon_find_object(oberon_scope_t * scope, char * name, int check_it)
+oberon_find_object(oberon_scope_t * scope, char * name, bool check_it)
 {
 	oberon_object_t * result = NULL;
 
@@ -208,28 +204,48 @@ oberon_find_object(oberon_scope_t * scope, char * name, int check_it)
 }
 
 static oberon_object_t *
-oberon_find_field(oberon_context_t * ctx, oberon_type_t * rec, char * name)
+oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only, bool check_upscope)
 {
-	oberon_object_t * x = rec -> decl;
-	for(int i = 0; i < rec -> num_decl; i++)
+	if(check_upscope)
 	{
-		if(strcmp(x -> name, name) == 0)
+		if(oberon_find_object(scope -> up, name, false))
 		{
-			return x;
+			oberon_error(scope -> ctx, "already defined");
 		}
+	}
+
+	oberon_object_t * x = scope -> list;
+	while(x -> next && strcmp(x -> next -> name, name) != 0)
+	{
 		x = x -> next;
 	}
 
-	oberon_error(ctx, "field not defined");
+	if(x -> next)
+	{
+		oberon_error(scope -> ctx, "already defined");
+	}
 
-	return NULL;
+	oberon_object_t * newvar = malloc(sizeof *newvar);
+	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 -> parent_type = scope -> parent_type;
+	newvar -> module = scope -> ctx -> mod;
+
+	x -> next = newvar;
+
+	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, 0);
+	id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, false, false);
 	id -> type = type;
 	oberon_generator_init_type(scope -> ctx, type);
 	return id;
@@ -360,6 +376,30 @@ oberon_read_ident(oberon_context_t * ctx)
 	{
 		ctx -> token = IMPORT;
 	}
+	else if(strcmp(ident, "IN") == 0)
+	{
+		ctx -> token = IN;
+	}
+	else if(strcmp(ident, "IS") == 0)
+	{
+		ctx -> token = IS;
+	}
+	else if(strcmp(ident, "IF") == 0)
+	{
+		ctx -> token = IF;
+	}
+	else if(strcmp(ident, "THEN") == 0)
+	{
+		ctx -> token = THEN;
+	}
+	else if(strcmp(ident, "ELSE") == 0)
+	{
+		ctx -> token = ELSE;
+	}
+	else if(strcmp(ident, "ELSIF") == 0)
+	{
+		ctx -> token = ELSIF;
+	}
 }
 
 static void
@@ -377,6 +417,7 @@ oberon_read_number(oberon_context_t * ctx)
 	 * mode = 1 == HEX
 	 * mode = 2 == REAL
 	 * mode = 3 == LONGREAL
+	 * mode = 4 == CHAR
 	 */
 	int mode = 0;
 	start_i = ctx -> code_index;
@@ -398,11 +439,20 @@ oberon_read_number(oberon_context_t * ctx)
 
 		end_i = ctx -> code_index;
 
-		if(ctx -> c != 'H')
+		if(ctx -> c == 'H')
+		{
+			mode = 1;
+			oberon_get_char(ctx);
+		}
+		else if(ctx -> c == 'X')
+		{
+			mode = 4;
+			oberon_get_char(ctx);
+		}
+		else
 		{
 			oberon_error(ctx, "invalid hex number");
 		}
-		oberon_get_char(ctx);
 	}
 	else if(ctx -> c == '.')
 	{
@@ -440,6 +490,20 @@ oberon_read_number(oberon_context_t * ctx)
 		end_i = ctx -> code_index;
 	}
 
+	if(mode == 0)
+	{
+		if(ctx -> c == 'H')
+		{
+			mode = 1;
+			oberon_get_char(ctx);
+		}
+		else if(ctx -> c == 'X')
+		{
+			mode = 4;
+			oberon_get_char(ctx);
+		}
+	}
+
 	int len = end_i - start_i;
 	ident = malloc(len + 1);
 	memcpy(ident, &ctx -> code[start_i], len);
@@ -470,6 +534,11 @@ oberon_read_number(oberon_context_t * ctx)
 			sscanf(ident, "%lf", &real);
 			ctx -> token = REAL;
 			break;
+		case 4:
+			sscanf(ident, "%lx", &integer);
+			real = integer;
+			ctx -> token = CHAR;
+			break;
 		default:
 			oberon_error(ctx, "oberon_read_number: wat");
 			break;
@@ -524,6 +593,36 @@ oberon_read_comment(oberon_context_t * ctx)
 	}
 }
 
+static void oberon_read_string(oberon_context_t * ctx)
+{
+	int c = ctx -> c;
+	oberon_get_char(ctx);
+
+	int start = ctx -> code_index;
+
+	while(ctx -> c != 0 && ctx -> c != c)
+	{
+		oberon_get_char(ctx);
+	}
+
+	if(ctx -> c == 0)
+	{
+		oberon_error(ctx, "unterminated string");
+	}
+
+	int end = ctx -> code_index;
+
+	oberon_get_char(ctx);
+
+	char * string = calloc(1, end - start + 1);
+	strncpy(string, &ctx -> code[start], end - start);
+
+	ctx -> token = STRING;
+	ctx -> string = string;
+
+	printf("oberon_read_string: string ((%s))\n", string);
+}
+
 static void oberon_read_token(oberon_context_t * ctx);
 
 static void
@@ -637,6 +736,12 @@ oberon_read_symbol(oberon_context_t * ctx)
 			ctx -> token = UPARROW;
 			oberon_get_char(ctx);
 			break;
+		case '"':
+			oberon_read_string(ctx);
+			break;
+		case '\'':
+			oberon_read_string(ctx);
+			break;			
 		default:
 			oberon_error(ctx, "invalid char %c", ctx -> c);
 			break;
@@ -673,6 +778,7 @@ static void oberon_assert_token(oberon_context_t * ctx, int token);
 static char * oberon_assert_ident(oberon_context_t * ctx);
 static void oberon_type(oberon_context_t * ctx, oberon_type_t ** type);
 static oberon_item_t * oberon_const_expr(oberon_context_t * ctx);
+static oberon_expr_t * oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr);
 
 static oberon_expr_t *
 oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right)
@@ -746,7 +852,14 @@ oberon_expr_list(oberon_context_t * ctx, int * num_expr, oberon_expr_t ** first,
 	oberon_expr_t * last;
 
 	*num_expr = 1;
-	*first = last = oberon_expr(ctx);
+	if(const_expr)
+	{
+		*first = last = (oberon_expr_t *) oberon_const_expr(ctx);
+	}
+	else
+	{
+		*first = last = oberon_expr(ctx);
+	}
 	while(ctx -> token == COMMA)
 	{
 		oberon_assert_token(ctx, COMMA);
@@ -770,12 +883,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)
 {
-	assert(expr -> is_item);
-	oberon_expr_t * cast;
-	cast = oberon_new_item(MODE_CAST, pref, expr -> read_only);
-	cast -> item.parent = (oberon_item_t *) expr;
-	cast -> next = expr -> next;
-	return cast;
+	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;
+	}
+
+	if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
+	{
+		oberon_error(ctx, "must be record type");
+	}
+
+	return oberon_cast_expr(ctx, expr, rec);
 }
 
 static oberon_type_t *
@@ -806,39 +937,78 @@ oberon_get_equal_expr_type(oberon_context_t * ctx, oberon_type_t * a, oberon_typ
 	return result;
 }
 
+static void
+oberon_check_record_compatibility(oberon_context_t * ctx, oberon_type_t * from, oberon_type_t * to)
+{
+	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)
+	{
+		t = t -> base;
+	}
+
+	if(t == NULL)
+	{
+		oberon_error(ctx, "incompatible record types");
+	}
+}
+
 static oberon_expr_t *
 oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
 {
+	// Допускается:
+	//  Если классы типов равны
+	//  Если INTEGER переводится в REAL
+	//  Есди STRING переводится в ARRAY OF CHAR
+
+	bool error = false;
 	if(pref -> class != expr -> result -> class)
 	{
-		if(pref -> class == OBERON_TYPE_POINTER)
+		printf("expr class %i\n", expr -> result -> class);
+		printf("pref class %i\n", pref -> class);
+
+		if(expr -> result -> class == OBERON_TYPE_STRING)
 		{
-			if(expr -> result -> class == OBERON_TYPE_POINTER)
+			if(pref -> class == OBERON_TYPE_ARRAY)
 			{
-				// accept
+				if(pref -> base -> class != OBERON_TYPE_CHAR)
+				{
+					error = true;
+				}
 			}
 			else
 			{
-				oberon_error(ctx, "incompatible types");
+				error = true;
 			}
 		}
-		else if(pref -> class == OBERON_TYPE_REAL)
+		else if(expr -> result -> class == OBERON_TYPE_INTEGER)
 		{
-			if(expr -> result -> class == OBERON_TYPE_INTEGER)
+			if(pref -> class != OBERON_TYPE_REAL)
 			{
-				// accept
-			}
-			else
-			{
-				oberon_error(ctx, "incompatible types");
+				error = true;
 			}
 		}
 		else
 		{
-			oberon_error(ctx, "incompatible types");
+			error = true;
 		}
 	}
 
+	if(error)
+	{
+		oberon_error(ctx, "oberon_autocast_to: incompatible types");
+	}
+
 	if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
 	{
 		if(expr -> result -> size > pref -> size)
@@ -852,15 +1022,18 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 	}
 	else if(pref -> class == OBERON_TYPE_RECORD)
 	{
-		if(expr -> result != pref)
-		{
-			printf("oberon_autocast_to: rec %p != %p\n", expr -> result, pref);
-			oberon_error(ctx, "incompatible record types");
-		}
+		oberon_check_record_compatibility(ctx, expr -> result, pref);
+		expr = oberno_make_record_cast(ctx, expr, pref);
 	}
 	else if(pref -> class == OBERON_TYPE_POINTER)
 	{
-		if(expr -> result -> base != pref -> base)
+		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)
 			{
@@ -883,25 +1056,15 @@ oberon_autocast_binary_op(oberon_context_t * ctx, oberon_expr_t ** ea, oberon_ex
 }
 
 static void
-oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig)
+oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 {
-	if(desig -> is_item == 0)
-	{
-		oberon_error(ctx, "expected item");
-	}
-
-	if(desig -> item.mode != MODE_CALL)
+	if(desig -> mode != MODE_CALL)
 	{
 		oberon_error(ctx, "expected mode CALL");
 	}
 
-	if(desig -> item.var -> type -> class != OBERON_TYPE_PROCEDURE)
-	{
-		oberon_error(ctx, "only procedures can be called");
-	}
-
-	oberon_type_t * fn = desig -> item.var -> type;
-	int num_args = desig -> item.num_args;
+	oberon_type_t * fn = desig -> parent -> result;
+	int num_args = desig -> num_args;
 	int num_decl = fn -> num_decl;
 
 	if(num_args < num_decl)
@@ -915,7 +1078,7 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig)
 
 	/* Делаем проверку на запись и делаем автокаст */
 	oberon_expr_t * casted[num_args];
-	oberon_expr_t * arg = desig -> item.args;
+	oberon_expr_t * arg = desig -> args;
 	oberon_object_t * param = fn -> decl;
 	for(int i = 0; i < num_args; i++)
 	{
@@ -940,62 +1103,84 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig)
 		{
 			casted[i] -> next = casted[i + 1];
 		}
-		desig -> item.args = arg;
+		desig -> args = arg;
 	}
 }
 
 static oberon_expr_t *
-oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
+oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args, oberon_expr_t * list_args)
 {
-	switch(proc -> class)
+	oberon_type_t * signature = item -> result;
+	if(signature -> class != OBERON_TYPE_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_error(ctx, "not a procedure");
 	}
 
 	oberon_expr_t * call;
 
-	if(proc -> sysproc)
+	if(signature -> sysproc)
 	{
-		if(proc -> genfunc == NULL)
+		if(signature -> genfunc == NULL)
 		{
 			oberon_error(ctx, "not a function-procedure");
 		}
 
-		call = proc -> genfunc(ctx, num_args, list_args);
+		call = signature -> genfunc(ctx, num_args, list_args);
 	}
 	else
 	{
-		if(proc -> type -> base -> class == OBERON_TYPE_VOID)
+		if(signature -> base -> class == OBERON_TYPE_VOID)
 		{
 			oberon_error(ctx, "attempt to call procedure in expression");
 		}
 
-		call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
-		call -> item.var = proc;
+		call = oberon_new_item(MODE_CALL, signature -> base, true);
+		call -> item.parent = item;
 		call -> item.num_args = num_args;
 		call -> item.args = list_args;
-		oberon_autocast_call(ctx, call);
+		oberon_autocast_call(ctx, (oberon_item_t *) call);
 	}
 
 	return call;
 }
 
+static void
+oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args, oberon_expr_t * list_args)
+{
+	oberon_type_t * signature = item -> result;
+	if(signature -> class != OBERON_TYPE_PROCEDURE)
+	{
+		oberon_error(ctx, "not a procedure");
+	}
+
+	oberon_expr_t * call;
+
+	if(signature -> sysproc)
+	{
+		if(signature -> genproc == NULL)
+		{
+			oberon_error(ctx, "not a procedure");
+		}
+
+		signature -> genproc(ctx, num_args, list_args);
+	}
+	else
+	{
+		if(signature -> base -> class != OBERON_TYPE_VOID)
+		{
+			oberon_error(ctx, "attempt to call function as non-typed procedure");
+		}
+
+		call = oberon_new_item(MODE_CALL, signature -> base, true);
+		call -> item.parent = item;
+		call -> item.num_args = num_args;
+		call -> item.args = list_args;
+		oberon_autocast_call(ctx, (oberon_item_t *) call);
+		oberon_generate_call_proc(ctx, call);
+	}
+}
+
+/*
 static void
 oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
 {
@@ -1045,20 +1230,26 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
 		oberon_generate_call_proc(ctx, call);
 	}
 }
+*/
 
 #define ISEXPR(x) \
 	(((x) == PLUS) \
 	|| ((x) == MINUS) \
 	|| ((x) == IDENT) \
 	|| ((x) == INTEGER) \
+	|| ((x) == REAL) \
+	|| ((x) == CHAR) \
+	|| ((x) == STRING) \
+	|| ((x) == NIL) \
 	|| ((x) == LPAREN) \
 	|| ((x) == NOT) \
 	|| ((x) == TRUE) \
-	|| ((x) == FALSE))
+	|| ((x) == FALSE)) 
 
 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");
@@ -1130,7 +1321,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 		expr = oberno_make_dereferencing(ctx, expr);
 	}
 
-	assert(expr -> is_item == 1);
+	assert(expr -> is_item);
 
 	if(expr -> result -> class != OBERON_TYPE_RECORD)
 	{
@@ -1140,7 +1331,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 	oberon_type_t * rec = expr -> result;
 
 	oberon_object_t * field;
-	field = oberon_find_field(ctx, rec, name);
+	field = oberon_find_object(rec -> scope, name, true);
 
 	if(field -> export == 0)
 	{
@@ -1170,7 +1361,8 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 #define ISSELECTOR(x) \
 	(((x) == LBRACE) \
 	|| ((x) == DOT) \
-	|| ((x) == UPARROW))
+	|| ((x) == UPARROW) \
+	|| ((x) == LPAREN))
 
 static oberon_object_t *
 oberon_qualident(oberon_context_t * ctx, char ** xname, int check)
@@ -1243,7 +1435,7 @@ oberon_designator(oberon_context_t * ctx)
 	}
 	expr -> item.var = var;
 
-	while(ISSELECTOR(ctx -> token))
+	while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
 	{
 		switch(ctx -> token)
 		{
@@ -1269,19 +1461,28 @@ oberon_designator(oberon_context_t * ctx)
 				oberon_assert_token(ctx, UPARROW);
 				expr = oberno_make_dereferencing(ctx, expr);
 				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");
+				}
+				oberon_assert_token(ctx, RPAREN);
+				expr = oberno_make_record_cast(ctx, expr, objtype -> type);
+				break;
 			default:
 				oberon_error(ctx, "oberon_designator: wat");
 				break;
 		}
 	}
+
 	return expr;
 }
 
 static oberon_expr_t *
 oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 {
-	assert(expr -> is_item == 1);
-
 	/* Если есть скобки - значит вызов. Если нет, то передаём указатель. */
 	if(ctx -> token == LPAREN)
 	{
@@ -1295,7 +1496,8 @@ oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 			oberon_expr_list(ctx, &num_args, &arguments, 0);
 		}
 
-		expr = oberon_make_call_func(ctx, expr -> item.var, num_args, arguments);
+		assert(expr -> is_item == 1);
+		expr = oberon_make_call_func(ctx, (oberon_item_t *) expr, num_args, arguments);
 
 		oberon_assert_token(ctx, RPAREN);
 	}
@@ -1306,7 +1508,7 @@ oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 static void
 oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 {
-	assert(expr -> is_item == 1);
+	assert(expr -> is_item);
 
 	int num_args = 0;
 	oberon_expr_t * arguments = NULL;
@@ -1324,7 +1526,7 @@ oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 	}
 
 	/* Вызов происходит даже без скобок */
-	oberon_make_call_proc(ctx, expr -> item.var, num_args, arguments);
+	oberon_make_call_proc(ctx, (oberon_item_t *) expr, num_args, arguments);
 }
 
 static oberon_type_t *
@@ -1362,10 +1564,22 @@ oberon_factor(oberon_context_t * ctx)
 			break;
 		case INTEGER:
 			result = oberon_get_type_of_int_value(ctx, ctx -> integer);
-			expr = oberon_new_item(MODE_INTEGER, result, 1);
+			expr = oberon_new_item(MODE_INTEGER, result, true);
 			expr -> item.integer = ctx -> integer;
 			oberon_assert_token(ctx, INTEGER);
 			break;
+		case CHAR:
+			result = ctx -> char_type;
+			expr = oberon_new_item(MODE_CHAR, result, true);
+			expr -> item.integer = ctx -> integer;
+			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;
+			oberon_assert_token(ctx, STRING);
+			break;
 		case REAL:
 			result = (ctx -> longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
 			expr = oberon_new_item(MODE_REAL, result, 1);
@@ -1373,12 +1587,12 @@ oberon_factor(oberon_context_t * ctx)
 			oberon_assert_token(ctx, REAL);
 			break;
 		case TRUE:
-			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
+			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
 			expr -> item.boolean = true;
 			oberon_assert_token(ctx, TRUE);
 			break;
 		case FALSE:
-			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
+			expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
 			expr -> item.boolean = false;
 			oberon_assert_token(ctx, FALSE);
 			break;
@@ -1394,7 +1608,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, 1);
+			expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, true);
 			break;
 		default:
 			oberon_error(ctx, "invalid expression");
@@ -1412,6 +1626,27 @@ oberon_factor(oberon_context_t * ctx)
 #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)
 {
@@ -1422,10 +1657,16 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	{
 		if(ITUSEONLYINTEGER(token))
 		{
-			if(a -> result -> class != OBERON_TYPE_INTEGER
-				|| b -> result -> class != OBERON_TYPE_INTEGER)
+			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)
 			{
-				oberon_error(ctx, "used only with integer types");
+				// accept
+			}
+			else
+			{
+				oberon_error(ctx, "used only with numeric types");
 			}
 		}
 		else if(ITUSEONLYBOOLEAN(token))
@@ -1437,6 +1678,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 			}
 		}
 
+		oberon_autocast_binary_op(ctx, &a, &b);
 		result = ctx -> bool_type;
 
 		if(token == EQUAL)
@@ -1478,30 +1720,8 @@ 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_REAL)
-		{
-			if(a -> result -> class == OBERON_TYPE_INTEGER)
-			{
-				oberon_error(ctx, "TODO cast int -> real");
-			}
-			else
-			{
-				oberon_error(ctx, "operator / requires numeric type");
-			}
-		}
-
-		if(b -> result -> class != OBERON_TYPE_REAL)
-		{
-			if(b -> result -> class == OBERON_TYPE_INTEGER)
-			{
-				oberon_error(ctx, "TODO cast int -> real");
-			}
-			else
-			{
-				oberon_error(ctx, "operator / requires numeric type");
-			}
-		}
-
+		oberon_autocast_to_real(ctx, &a);
+		oberon_autocast_to_real(ctx, &b);
 		oberon_autocast_binary_op(ctx, &a, &b);
 		expr = oberon_new_operator(OP_DIV, a -> result, a, b);
 	}
@@ -1606,7 +1826,7 @@ oberon_simple_expr(oberon_context_t * ctx)
 }
 
 #define ISRELATION(x) \
-	((x) >= EQUAL && (x) <= GEQ)
+	((x) >= EQUAL && (x) <= IS)
 
 static oberon_expr_t *
 oberon_expr(oberon_context_t * ctx)
@@ -1696,7 +1916,7 @@ oberon_def(oberon_context_t * ctx, int * export, int * read_only)
 }
 
 static oberon_object_t *
-oberon_ident_def(oberon_context_t * ctx, int class)
+oberon_ident_def(oberon_context_t * ctx, int class, bool check_upscope)
 {
 	char * name;
 	int export;
@@ -1706,19 +1926,19 @@ oberon_ident_def(oberon_context_t * ctx, int class)
 	name = oberon_assert_ident(ctx);
 	oberon_def(ctx, &export, &read_only);
 
-	x = oberon_define_object(ctx -> decl, name, class, export, read_only);
+	x = oberon_define_object(ctx -> decl, name, class, export, read_only, check_upscope);
 	return x;
 }
 
 static void
-oberon_ident_list(oberon_context_t * ctx, int class, int * num, oberon_object_t ** list)
+oberon_ident_list(oberon_context_t * ctx, int class, bool check_upscope, int * num, oberon_object_t ** list)
 {
 	*num = 1;
-	*list = oberon_ident_def(ctx, class);
+	*list = oberon_ident_def(ctx, class, check_upscope);
 	while(ctx -> token == COMMA)
 	{
 		oberon_assert_token(ctx, COMMA);
-		oberon_ident_def(ctx, class);
+		oberon_ident_def(ctx, class, check_upscope);
 		*num += 1;
 	}
 }
@@ -1731,7 +1951,7 @@ oberon_var_decl(oberon_context_t * ctx)
 	oberon_type_t * type;
 	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 
-	oberon_ident_list(ctx, OBERON_CLASS_VAR, &num, &list);
+	oberon_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
 	oberon_assert_token(ctx, COLON);
 	oberon_type(ctx, &type);
 
@@ -1755,7 +1975,7 @@ oberon_fp_section(oberon_context_t * ctx, int * num_decl)
 
 	int num;
 	oberon_object_t * list;
-	oberon_ident_list(ctx, class, &num, &list);
+	oberon_ident_list(ctx, class, false, &num, &list);
 
 	oberon_assert_token(ctx, COLON);
 
@@ -1975,7 +2195,7 @@ oberon_proc_decl(oberon_context_t * ctx)
 	}
 	else
 	{
-		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only);
+		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
 		proc -> type = signature;
 		proc -> scope = proc_scope;
 		oberon_generator_init_proc(ctx, proc);
@@ -1996,7 +2216,7 @@ oberon_const_decl(oberon_context_t * ctx)
 	oberon_item_t * value;
 	oberon_object_t * constant;
 
-	constant = oberon_ident_def(ctx, OBERON_CLASS_CONST);
+	constant = oberon_ident_def(ctx, OBERON_CLASS_CONST, false);
 	oberon_assert_token(ctx, EQUAL);
 	value = oberon_const_expr(ctx);
 	constant -> value = value;
@@ -2022,31 +2242,6 @@ oberon_make_array_type(oberon_context_t * ctx, oberon_expr_t * size, oberon_type
 	arr -> base = base;
 }
 
-static void
-oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec)
-{
-	if(ctx -> token == IDENT)
-	{
-		int num;
-		oberon_object_t * list;
-		oberon_type_t * type;
-		type = oberon_new_type_ptr(OBERON_TYPE_VOID);
-
-		oberon_ident_list(ctx, OBERON_CLASS_FIELD, &num, &list);
-		oberon_assert_token(ctx, COLON);
-		oberon_type(ctx, &type);
-
-		oberon_object_t * field = list;
-		for(int i = 0; i < num; i++)
-		{
-			field -> type = type;
-			field = field -> next;
-		}
-
-		rec -> num_decl += num;
-	}
-}
-
 static void
 oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type)
 {
@@ -2067,7 +2262,7 @@ oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type)
 	}
 	else
 	{
-		to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, 0, 0);
+		to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
 		to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 	}
 
@@ -2105,6 +2300,93 @@ oberon_make_open_array(oberon_context_t * ctx, oberon_type_t * base, oberon_type
 	type -> base = base;
 }
 
+static void
+oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t * modscope)
+{
+	if(ctx -> token == IDENT)
+	{
+		int num;
+		oberon_object_t * list;
+		oberon_type_t * type;
+		type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+
+		oberon_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
+		oberon_assert_token(ctx, COLON);
+
+		oberon_scope_t * current = ctx -> decl;
+		ctx -> decl = modscope;
+		oberon_type(ctx, &type);
+		ctx -> decl = current;
+
+		oberon_object_t * field = list;
+		for(int i = 0; i < num; i++)
+		{
+			field -> type = type;
+			field = field -> next;
+		}
+
+		rec -> num_decl += num;
+	}
+}
+
+static void
+oberon_type_record_body(oberon_context_t * ctx, oberon_type_t * rec)
+{
+	oberon_scope_t * modscope = ctx -> mod -> decl; 
+	oberon_scope_t * oldscope = ctx -> decl;
+	ctx -> decl = modscope;
+
+	if(ctx -> token == LPAREN)
+	{
+		oberon_assert_token(ctx, LPAREN);
+
+		oberon_object_t * typeobj;
+		typeobj = oberon_qualident(ctx, NULL, true);
+
+		if(typeobj -> class != OBERON_CLASS_TYPE)
+		{
+			oberon_error(ctx, "base must be type");
+		}
+
+		oberon_type_t * base = typeobj -> type;
+		if(base -> class == OBERON_TYPE_POINTER)
+		{
+			base = base -> base;
+		}
+
+		if(base -> class != OBERON_TYPE_RECORD)
+		{
+			oberon_error(ctx, "base must be record type");
+		}
+
+		rec -> base = base;
+		ctx -> decl = base -> scope;
+
+		oberon_assert_token(ctx, RPAREN);
+	}
+	else
+	{
+		ctx -> decl = NULL;
+	}
+
+	oberon_scope_t * this_scope;
+	this_scope = oberon_open_scope(ctx);
+	this_scope -> local = true;
+	this_scope -> parent = NULL;
+	this_scope -> parent_type = rec;
+
+	oberon_field_list(ctx, rec, modscope);
+	while(ctx -> token == SEMICOLON)
+	{
+		oberon_assert_token(ctx, SEMICOLON);
+		oberon_field_list(ctx, rec, modscope);
+	}
+
+	rec -> scope = this_scope;
+	rec -> decl = this_scope -> list -> next;
+	ctx -> decl = oldscope;
+}
+
 static void
 oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 {
@@ -2146,24 +2428,10 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		rec -> class = OBERON_TYPE_RECORD;
 		rec -> module = ctx -> mod;
 
-		oberon_scope_t * record_scope;
-		record_scope = oberon_open_scope(ctx);
-		record_scope -> local = 1;
-		record_scope -> parent = NULL;
-		record_scope -> parent_type = rec;
-
 		oberon_assert_token(ctx, RECORD);
-		oberon_field_list(ctx, rec);
-		while(ctx -> token == SEMICOLON)
-		{
-			oberon_assert_token(ctx, SEMICOLON);
-			oberon_field_list(ctx, rec);
-		}
+		oberon_type_record_body(ctx, rec);
 		oberon_assert_token(ctx, END);
 
-		rec -> decl = record_scope -> list -> next;
-		oberon_close_scope(record_scope);
-
 		*type = rec;
 	}
 	else if(ctx -> token == POINTER)
@@ -2208,7 +2476,7 @@ oberon_type_decl(oberon_context_t * ctx)
 	newtype = oberon_find_object(ctx -> decl, name, 0);
 	if(newtype == NULL)
 	{
-		newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only);
+		newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only, false);
 		newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
 		assert(newtype -> type);
 	}
@@ -2601,6 +2869,9 @@ oberon_decl_seq(oberon_context_t * ctx)
 	oberon_prevent_undeclarated_procedures(ctx);
 }
 
+static void
+oberon_statement_seq(oberon_context_t * ctx);
+
 static void
 oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 {
@@ -2633,6 +2904,53 @@ oberon_statement(oberon_context_t * ctx)
 			oberon_opt_proc_parens(ctx, item1);
 		}
 	}
+	else if(ctx -> token == IF)
+	{
+		gen_label_t * end;
+		gen_label_t * els;
+		oberon_expr_t * cond;
+
+		els = oberon_generator_reserve_label(ctx);
+		end = oberon_generator_reserve_label(ctx);
+
+		oberon_assert_token(ctx, IF);
+		cond = oberon_expr(ctx);
+		if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+		{
+			oberon_error(ctx, "condition must be boolean");
+		}
+		oberon_assert_token(ctx, THEN);
+		oberon_generate_branch(ctx, cond, false, els);
+		oberon_statement_seq(ctx);
+		oberon_generate_goto(ctx, end);
+		oberon_generate_label(ctx, els);
+
+		while(ctx -> token == ELSIF)
+		{
+			els = oberon_generator_reserve_label(ctx);
+
+			oberon_assert_token(ctx, ELSIF);
+			cond = oberon_expr(ctx);
+			if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+			{
+				oberon_error(ctx, "condition must be boolean");
+			}
+			oberon_assert_token(ctx, THEN);
+			oberon_generate_branch(ctx, cond, false, els);
+			oberon_statement_seq(ctx);
+			oberon_generate_goto(ctx, end);
+			oberon_generate_label(ctx, els);
+		}
+
+		if(ctx -> token == ELSE)
+		{
+			oberon_assert_token(ctx, ELSE);
+			oberon_statement_seq(ctx);
+		}
+
+		oberon_generate_label(ctx, end);
+		oberon_assert_token(ctx, END);		
+	}
 	else if(ctx -> token == RETURN)
 	{
 		oberon_assert_token(ctx, RETURN);
@@ -2688,7 +3006,7 @@ oberon_import_module(oberon_context_t * ctx, char * alias, char * name)
 	}
 
 	oberon_object_t * ident;
-	ident = oberon_define_object(ctx -> decl, alias, OBERON_CLASS_MODULE, 0, 0);
+	ident = oberon_define_object(ctx -> decl, alias, OBERON_CLASS_MODULE, false, false, false);
 	ident -> module = m;
 }
 
@@ -2778,6 +3096,9 @@ register_default_types(oberon_context_t * ctx)
 	ctx -> void_ptr_type -> base = ctx -> void_type;
 	oberon_generator_init_type(ctx, ctx -> void_ptr_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);
 
@@ -2798,17 +3119,20 @@ 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);
 }
 
 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, 1, 0);
-	proc -> sysproc = 1;
-	proc -> genfunc = f;
-	proc -> genproc = p;
+	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 *