X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=a2a567036598a90f005bcc1780531e18e6d54701;hb=d31e6130ac411ef95be71674b2666a1a79a83602;hp=570db39df1417efe4ffde397dc3f600ab2cc9e22;hpb=c055d16f1d6ca38c5c2171dbafd1a25305fb909c;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 570db39..a2a5670 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
+#include <math.h>
 
 #include "../include/oberon.h"
 
@@ -59,7 +60,21 @@ enum {
 	UPARROW,
 	NIL,
 	IMPORT,
-	REAL
+	REAL,
+	CHAR,
+	STRING,
+	IF,
+	THEN,
+	ELSE,
+	ELSIF,
+	WHILE,
+	DO,
+	REPEAT,
+	UNTIL,
+	FOR,
+	BY,
+	LOOP,
+	EXIT
 };
 
 // =======================================================================
@@ -116,6 +131,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
 // ======================================================================= 
@@ -135,6 +168,7 @@ oberon_open_scope(oberon_context_t * ctx)
 		scope -> local = scope -> up -> local;
 		scope -> parent = scope -> up -> parent;
 		scope -> parent_type = scope -> up -> parent_type;
+		scope -> exit_label = scope -> up -> exit_label;
 	}
 
 	ctx -> decl = scope;
@@ -179,6 +213,22 @@ oberon_find_object(oberon_scope_t * scope, char * name, bool check_it)
 	return result;
 }
 
+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);
+	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;
+	return newvar;
+}
+
 static oberon_object_t *
 oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only, bool check_upscope)
 {
@@ -201,17 +251,8 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export
 		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;
-
+	oberon_object_t * newvar;
+	newvar = oberon_create_object(scope, name, class, export, read_only);
 	x -> next = newvar;
 
 	return newvar;
@@ -360,6 +401,54 @@ oberon_read_ident(oberon_context_t * ctx)
 	{
 		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;
+	}
+	else if(strcmp(ident, "WHILE") == 0)
+	{
+		ctx -> token = WHILE;
+	}
+	else if(strcmp(ident, "DO") == 0)
+	{
+		ctx -> token = DO;
+	}
+	else if(strcmp(ident, "REPEAT") == 0)
+	{
+		ctx -> token = REPEAT;
+	}
+	else if(strcmp(ident, "UNTIL") == 0)
+	{
+		ctx -> token = UNTIL;
+	}
+	else if(strcmp(ident, "FOR") == 0)
+	{
+		ctx -> token = FOR;
+	}
+	else if(strcmp(ident, "BY") == 0)
+	{
+		ctx -> token = BY;
+	}
+	else if(strcmp(ident, "LOOP") == 0)
+	{
+		ctx -> token = LOOP;
+	}
+	else if(strcmp(ident, "EXIT") == 0)
+	{
+		ctx -> token = EXIT;
+	}
 }
 
 static void
@@ -377,6 +466,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 +488,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 +539,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 +583,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 +642,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 +785,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 +827,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 +901,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);
@@ -776,8 +938,19 @@ oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * p
 static oberon_expr_t *
 oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * rec)
 {
-	if(expr -> result -> class != OBERON_TYPE_RECORD
-		|| rec -> class != OBERON_TYPE_RECORD)
+	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");
 	}
@@ -813,39 +986,116 @@ 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 void
+oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
+{
+	if(dst -> is_item == false)
+	{
+		oberon_error(ctx, "not variable");
+	}
+
+	switch(dst -> item.mode)
+	{
+		case MODE_VAR:
+		case MODE_CALL:
+		case MODE_INDEX:
+		case MODE_FIELD:
+		case MODE_DEREF:
+		case MODE_NEW:
+			/* accept */
+			break;
+		default:
+			oberon_error(ctx, "not variable");
+			break;
+	}
+}
+
+static void
+oberon_check_src(oberon_context_t * ctx, oberon_expr_t * src)
+{
+	if(src -> is_item)
+	{
+		if(src -> item.mode == MODE_TYPE)
+		{
+			oberon_error(ctx, "not variable");
+		}
+	}
+}
+
 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
+
+	oberon_check_src(ctx, expr);
+
+	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)
-			{
-				// accept
-			}
-			else
+			if(pref -> class != OBERON_TYPE_REAL)
 			{
-				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)
@@ -859,24 +1109,18 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 	}
 	else if(pref -> class == OBERON_TYPE_RECORD)
 	{
-		oberon_type_t * t = expr -> result;
-		while(t != NULL && t != pref)
-		{
-			t = t -> base;
-		}
-		if(t == NULL)
-		{
-			printf("oberon_autocast_to: rec %p != %p\n", expr -> result, pref);
-			oberon_error(ctx, "incompatible record types");
-		}
-		if(expr -> result != pref)
-		{
-			expr = oberno_make_record_cast(ctx, expr, pref);
-		}
+		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)
 			{
@@ -1023,71 +1267,24 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
 	}
 }
 
-/*
-static void
-oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
-{
-	switch(proc -> class)
-	{
-		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)
-	{
-		if(proc -> genproc == NULL)
-		{
-			oberon_error(ctx, "requres non-typed procedure");
-		}
-
-		proc -> genproc(ctx, num_args, list_args);
-	}
-	else
-	{
-		if(proc -> type -> base -> class != OBERON_TYPE_VOID)
-		{
-			oberon_error(ctx, "attempt to call function as non-typed procedure");
-		}
-
-		oberon_expr_t * call;
-		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;
-		oberon_autocast_call(ctx, call);
-		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");
@@ -1235,6 +1432,26 @@ oberon_qualident(oberon_context_t * ctx, char ** xname, int check)
 	return x;
 }
 
+static oberon_expr_t *
+oberon_ident_item(oberon_context_t * ctx, char * name)
+{
+	bool read_only;
+	oberon_object_t * x;
+	oberon_expr_t * expr;
+
+	x = oberon_find_object(ctx -> decl, name, true);
+
+	read_only = false;
+	if(x -> class == OBERON_CLASS_CONST || x -> class == OBERON_CLASS_PROC)
+	{
+		read_only = true;
+	}
+
+	expr = oberon_new_item(MODE_VAR, x -> type, read_only);
+	expr -> item.var = x;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_designator(oberon_context_t * ctx)
 {
@@ -1259,13 +1476,16 @@ oberon_designator(oberon_context_t * ctx)
 			// TODO copy value
 			expr = (oberon_expr_t *) var -> value;
 			break;
+		case OBERON_CLASS_TYPE:
+			expr = oberon_new_item(MODE_TYPE, var -> type, read_only);
+			break;
 		case OBERON_CLASS_VAR:
 		case OBERON_CLASS_VAR_PARAM:
 		case OBERON_CLASS_PARAM:
 			expr = oberon_new_item(MODE_VAR, var -> type, read_only);
 			break;
 		case OBERON_CLASS_PROC:
-			expr = oberon_new_item(MODE_VAR, var -> type, 1);
+			expr = oberon_new_item(MODE_VAR, var -> type, true);
 			break;
 		default:
 			oberon_error(ctx, "invalid designator");
@@ -1273,8 +1493,7 @@ oberon_designator(oberon_context_t * ctx)
 	}
 	expr -> item.var = var;
 
-	bool brk = false;
-	while(brk == false && ISSELECTOR(ctx -> token))
+	while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
 	{
 		switch(ctx -> token)
 		{
@@ -1301,11 +1520,6 @@ oberon_designator(oberon_context_t * ctx)
 				expr = oberno_make_dereferencing(ctx, expr);
 				break;
 			case LPAREN:
-				if(expr -> result -> class == OBERON_TYPE_PROCEDURE)
-				{
-					brk = true;
-					break;
-				}
 				oberon_assert_token(ctx, LPAREN);
 				oberon_object_t * objtype = oberon_qualident(ctx, NULL, 1);
 				if(objtype -> class != OBERON_CLASS_TYPE)
@@ -1320,14 +1534,13 @@ oberon_designator(oberon_context_t * ctx)
 				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)
 	{
@@ -1341,6 +1554,7 @@ oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
 			oberon_expr_list(ctx, &num_args, &arguments, 0);
 		}
 
+		assert(expr -> is_item == 1);
 		expr = oberon_make_call_func(ctx, (oberon_item_t *) expr, num_args, arguments);
 
 		oberon_assert_token(ctx, RPAREN);
@@ -1352,7 +1566,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;
@@ -1394,6 +1608,17 @@ oberon_get_type_of_int_value(oberon_context_t * ctx, int64_t i)
 	}
 }
 
+static oberon_expr_t *
+oberon_integer_item(oberon_context_t * ctx, int64_t i)
+{
+	oberon_expr_t * expr;
+	oberon_type_t * result;
+	result = oberon_get_type_of_int_value(ctx, i);
+	expr = oberon_new_item(MODE_INTEGER, result, true);
+	expr -> item.integer = i;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_factor(oberon_context_t * ctx)
 {
@@ -1407,11 +1632,21 @@ oberon_factor(oberon_context_t * ctx)
 			expr = oberon_opt_func_parens(ctx, expr);
 			break;
 		case INTEGER:
-			result = oberon_get_type_of_int_value(ctx, ctx -> integer);
-			expr = oberon_new_item(MODE_INTEGER, result, 1);
-			expr -> item.integer = ctx -> integer;
+			expr = oberon_integer_item(ctx, 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);
@@ -1419,12 +1654,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;
@@ -1440,7 +1675,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");
@@ -1493,6 +1728,10 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 				|| 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");
 			}
@@ -1685,6 +1924,22 @@ oberon_const_expr(oberon_context_t * ctx)
 		oberon_error(ctx, "const expression are required");
 	}
 
+	switch(expr -> item.mode)
+	{
+		case MODE_INTEGER:
+		case MODE_BOOLEAN:
+		case MODE_NIL:
+		case MODE_REAL:
+		case MODE_CHAR:
+		case MODE_STRING:
+		case MODE_TYPE:
+			/* accept */
+			break;
+		default:
+			oberon_error(ctx, "const expression are required");
+			break;
+	}
+
 	return (oberon_item_t *) expr;
 }
 
@@ -2176,13 +2431,19 @@ oberon_type_record_body(oberon_context_t * ctx, oberon_type_t * rec)
 			oberon_error(ctx, "base must be type");
 		}
 
-		if(typeobj -> type -> class != OBERON_TYPE_RECORD)
+		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 = typeobj -> type;
-		ctx -> decl = rec -> base -> scope;
+		rec -> base = base;
+		ctx -> decl = base -> scope;
 
 		oberon_assert_token(ctx, RPAREN);
 	}
@@ -2691,6 +2952,25 @@ oberon_decl_seq(oberon_context_t * ctx)
 	oberon_prevent_undeclarated_procedures(ctx);
 }
 
+static oberon_expr_t *
+oberon_make_temp_var_item(oberon_context_t * ctx, oberon_type_t * type)
+{
+	oberon_object_t * x;
+	oberon_expr_t * expr;
+
+	x = oberon_create_object(ctx -> decl, "TEMP", OBERON_CLASS_VAR, false, false);
+	x -> local = true;
+	x -> type = type;
+	oberon_generator_init_temp_var(ctx, x);
+
+	expr = oberon_new_item(MODE_VAR, type, false);
+	expr -> item.var = x;
+	return expr;
+}
+
+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)
 {
@@ -2699,6 +2979,7 @@ oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 		oberon_error(ctx, "read-only destination");
 	}
 
+	oberon_check_dst(ctx, dst);
 	src = oberon_autocast_to(ctx, src, dst -> result);
 	oberon_generate_assign(ctx, src, dst);
 }
@@ -2723,6 +3004,192 @@ 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 == WHILE)
+	{
+		gen_label_t * begin;
+		gen_label_t * end;
+		oberon_expr_t * cond;
+
+		begin = oberon_generator_reserve_label(ctx);
+		end = oberon_generator_reserve_label(ctx);
+
+		oberon_assert_token(ctx, WHILE);
+		oberon_generate_label(ctx, begin);
+		cond = oberon_expr(ctx);
+		if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+		{
+			oberon_error(ctx, "condition must be boolean");
+		}
+		oberon_generate_branch(ctx, cond, false, end);
+
+		oberon_assert_token(ctx, DO);
+		oberon_statement_seq(ctx);
+		oberon_generate_goto(ctx, begin);
+
+		oberon_assert_token(ctx, END);
+		oberon_generate_label(ctx, end);
+	}
+	else if(ctx -> token == REPEAT)
+	{
+		gen_label_t * begin;
+		oberon_expr_t * cond;
+
+		begin = oberon_generator_reserve_label(ctx);
+		oberon_generate_label(ctx, begin);
+		oberon_assert_token(ctx, REPEAT);
+
+		oberon_statement_seq(ctx);
+
+		oberon_assert_token(ctx, UNTIL);
+
+		cond = oberon_expr(ctx);
+		if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+		{
+			oberon_error(ctx, "condition must be boolean");
+		}
+
+		oberon_generate_branch(ctx, cond, true, begin);
+	}
+	else if(ctx -> token == FOR)
+	{
+		oberon_expr_t * from;
+		oberon_expr_t * index;
+		oberon_expr_t * to;
+		oberon_expr_t * bound;
+		oberon_expr_t * by;
+		oberon_expr_t * cond;
+		oberon_expr_t * count;
+		gen_label_t * begin;
+		gen_label_t * end;
+		char * iname;
+		int op;
+
+		begin = oberon_generator_reserve_label(ctx);
+		end = oberon_generator_reserve_label(ctx);
+
+		oberon_assert_token(ctx, FOR);
+		iname = oberon_assert_ident(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);
+		if(ctx -> token == BY)
+		{
+			oberon_assert_token(ctx, BY);
+			by = (oberon_expr_t *) oberon_const_expr(ctx);
+		}
+		else
+		{
+			by = oberon_integer_item(ctx, 1);
+		}
+
+		if(by -> result -> class != OBERON_TYPE_INTEGER)
+		{
+			oberon_error(ctx, "must be integer");
+		}
+
+		if(by -> item.integer > 0)
+		{
+			op = LEQ;
+		}
+		else if(by -> item.integer < 0)
+		{
+			op = GEQ;
+		}
+		else
+		{
+			oberon_error(ctx, "zero step not allowed");
+		}
+
+		oberon_assert_token(ctx, DO);
+		oberon_generate_label(ctx, begin);
+		cond = oberon_make_bin_op(ctx, op, index, bound);
+		oberon_generate_branch(ctx, cond, false, end);
+		oberon_statement_seq(ctx);
+		count = oberon_make_bin_op(ctx, PLUS, index, by);
+		oberon_assign(ctx, count, index);
+		oberon_generate_goto(ctx, begin);
+		oberon_generate_label(ctx, end);
+		oberon_assert_token(ctx, END);
+	}
+	else if(ctx -> token == LOOP)
+	{
+		gen_label_t * begin;
+		gen_label_t * end;
+
+		begin = oberon_generator_reserve_label(ctx);
+		end = oberon_generator_reserve_label(ctx);
+
+		oberon_open_scope(ctx);
+		oberon_assert_token(ctx, LOOP);
+		oberon_generate_label(ctx, begin);
+		ctx -> decl -> exit_label = end;
+		oberon_statement_seq(ctx);
+		oberon_generate_goto(ctx, begin);
+		oberon_generate_label(ctx, end);
+		oberon_assert_token(ctx, END);
+		oberon_close_scope(ctx -> decl);
+	}
+	else if(ctx -> token == EXIT)
+	{
+		oberon_assert_token(ctx, EXIT);
+		if(ctx -> decl -> exit_label == NULL)
+		{
+			oberon_error(ctx, "not in LOOP-END");
+		}
+		oberon_generate_goto(ctx, ctx -> decl -> exit_label);
+	}
 	else if(ctx -> token == RETURN)
 	{
 		oberon_assert_token(ctx, RETURN);
@@ -2868,6 +3335,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);
 
@@ -2888,6 +3358,9 @@ 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
@@ -2901,6 +3374,118 @@ oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback 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)
+{
+	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;
+
+	if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+	{
+		oberon_error(ctx, "MIN accept only type");
+	}
+
+	oberon_expr_t * expr;
+	int bits = arg -> result -> size * 8;
+	switch(arg -> result -> class)
+	{
+		case OBERON_TYPE_INTEGER:
+			expr = oberon_integer_item(ctx, -powl(2, bits - 1));
+			break;
+		default:
+			oberon_error(ctx, "allowed only basic types");
+			break;
+	}
+
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_make_max_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;
+
+	if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+	{
+		oberon_error(ctx, "MAX accept only type");
+	}
+
+	oberon_expr_t * expr;
+	int bits = arg -> result -> size * 8;
+	switch(arg -> result -> class)
+	{
+		case OBERON_TYPE_INTEGER:
+			expr = oberon_integer_item(ctx, powl(2, bits - 1) - 1);
+			break;
+		default:
+			oberon_error(ctx, "allowed only basic types");
+			break;
+	}
+
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_make_size_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;
+
+	if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+	{
+		oberon_error(ctx, "SIZE accept only type");
+	}
+
+	int size;
+	oberon_expr_t * expr;
+	oberon_type_t * type = arg -> result;
+	switch(type -> class)
+	{
+		case OBERON_TYPE_INTEGER:
+		case OBERON_TYPE_BOOLEAN:
+		case OBERON_TYPE_REAL:
+			size = type -> size;
+			break;
+		default:
+			oberon_error(ctx, "TODO SIZE");
+			break;
+	}
+
+	expr = oberon_integer_item(ctx, size);
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -2925,7 +3510,6 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		oberon_error(ctx, "ABS accepts only integers");
 	}
 
-
 	oberon_expr_t * expr;
 	expr = oberon_new_operator(OP_ABS, result_type, arg, NULL);
 	return expr;
@@ -3026,7 +3610,14 @@ oberon_create_context(ModuleImportCallback import_module)
 	oberon_generator_init_context(ctx);
 
 	register_default_types(ctx);
+
+	/* Functions */
 	oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
+	oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);
+	oberon_new_intrinsic(ctx, "MAX", oberon_make_max_call, NULL);
+	oberon_new_intrinsic(ctx, "SIZE", oberon_make_size_call, NULL);
+
+	/* Procedures */
 	oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
 
 	return ctx;