X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon.c;h=064cfb10bd0b24955eb0b23655c12ee68d62cf52;hp=e88ff79159e28e93c010a73ebde045ee8a6c9132;hb=879793eaf1d6378593f78a192f2961670f686530;hpb=72048038b5be32cc940c8452541b8bb3e75958a9

diff --git a/src/oberon.c b/src/oberon.c
index e88ff79..064cfb1 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -52,8 +52,8 @@ enum {
 	TYPE,
 	ARRAY,
 	OF,
-	LBRACE,
-	RBRACE,
+	LBRACK,
+	RBRACK,
 	RECORD,
 	POINTER,
 	TO,
@@ -74,7 +74,13 @@ enum {
 	FOR,
 	BY,
 	LOOP,
-	EXIT
+	EXIT,
+	LBRACE,
+	RBRACE,
+	DOTDOT,
+	CASE,
+	BAR,
+	WITH
 };
 
 // =======================================================================
@@ -149,6 +155,15 @@ oberon_new_type_string(int size)
 	return x;
 }
 
+static oberon_type_t *
+oberon_new_type_set(int size)
+{
+	oberon_type_t * x;
+	x = oberon_new_type_ptr(OBERON_TYPE_SET);
+	x -> size = size;
+	return x;
+}
+
 // =======================================================================
 //   TABLE
 // ======================================================================= 
@@ -449,8 +464,19 @@ oberon_read_ident(oberon_context_t * ctx)
 	{
 		ctx -> token = EXIT;
 	}
+	else if(strcmp(ident, "CASE") == 0)
+	{
+		ctx -> token = CASE;
+	}
+	else if(strcmp(ident, "WITH") == 0)
+	{
+		ctx -> token = WITH;
+	}
 }
 
+#define ISHEXDIGIT(x) \
+	(((x) >= '0' && (x) <= '9') || ((x) >= 'A' && (x) <= 'F'))
+
 static void
 oberon_read_number(oberon_context_t * ctx)
 {
@@ -478,10 +504,10 @@ oberon_read_number(oberon_context_t * ctx)
 
 	end_i = ctx -> code_index;
 
-	if(isxdigit(ctx -> c))
+	if(ISHEXDIGIT(ctx -> c))
 	{
 		mode = 1;
-		while(isxdigit(ctx -> c))
+		while(ISHEXDIGIT(ctx -> c))
 		{
 			oberon_get_char(ctx);
 		}
@@ -505,37 +531,43 @@ oberon_read_number(oberon_context_t * ctx)
 	}
 	else if(ctx -> c == '.')
 	{
-		mode = 2;
 		oberon_get_char(ctx);
-
-		while(isdigit(ctx -> c))
+		if(ctx -> c == '.')
 		{
-			oberon_get_char(ctx);
+			/* Чит: избегаем конфликта с DOTDOT */
+			ctx -> code_index -= 1;
 		}
-
-		if(ctx -> c == 'E' || ctx -> c == 'D')
+		else
 		{
-			exp_i = ctx -> code_index;
+			mode = 2;
 
-			if(ctx -> c == 'D')
-			{
-				mode = 3;
-			}
-
-			oberon_get_char(ctx);
-
-			if(ctx -> c == '+' || ctx -> c == '-')
+			while(isdigit(ctx -> c))
 			{
 				oberon_get_char(ctx);
 			}
 
-			while(isdigit(ctx -> c))
+			if(ctx -> c == 'E' || ctx -> c == 'D')
 			{
+				exp_i = ctx -> code_index;
+
+				if(ctx -> c == 'D')
+				{
+					mode = 3;
+				}
+
 				oberon_get_char(ctx);
-			}
 
-		}
+				if(ctx -> c == '+' || ctx -> c == '-')
+				{
+					oberon_get_char(ctx);
+				}
 
+				while(isdigit(ctx -> c))
+				{
+					oberon_get_char(ctx);
+				}	
+			}
+		}
 		end_i = ctx -> code_index;
 	}
 
@@ -699,6 +731,11 @@ oberon_read_symbol(oberon_context_t * ctx)
 		case '.':
 			ctx -> token = DOT;
 			oberon_get_char(ctx);
+			if(ctx -> c == '.')
+			{
+				ctx -> token = DOTDOT;
+				oberon_get_char(ctx);
+			}
 			break;
 		case '(':
 			ctx -> token = LPAREN;
@@ -774,11 +811,11 @@ oberon_read_symbol(oberon_context_t * ctx)
 			oberon_get_char(ctx);
 			break;
 		case '[':
-			ctx -> token = LBRACE;
+			ctx -> token = LBRACK;
 			oberon_get_char(ctx);
 			break;
 		case ']':
-			ctx -> token = RBRACE;
+			ctx -> token = RBRACK;
 			oberon_get_char(ctx);
 			break;
 		case '^':
@@ -791,6 +828,18 @@ oberon_read_symbol(oberon_context_t * ctx)
 		case '\'':
 			oberon_read_string(ctx);
 			break;			
+		case '{':
+			ctx -> token = LBRACE;
+			oberon_get_char(ctx);
+			break;
+		case '}':
+			ctx -> token = RBRACE;
+			oberon_get_char(ctx);
+			break;
+		case '|':
+			ctx -> token = BAR;
+			oberon_get_char(ctx);
+			break;
 		default:
 			oberon_error(ctx, "invalid char %c", ctx -> c);
 			break;
@@ -871,12 +920,18 @@ oberon_make_unary_op(oberon_context_t * ctx, int token, oberon_expr_t * a)
 
 	if(token == MINUS)
 	{
-		if(result -> class != OBERON_TYPE_INTEGER)
+		if(result -> class == OBERON_TYPE_SET)
+		{
+			expr = oberon_new_operator(OP_COMPLEMENTATION, result, a, NULL);
+		}
+		else if(result -> class == OBERON_TYPE_INTEGER)
+		{
+			expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+		}
+		else
 		{
 			oberon_error(ctx, "incompatible operator type");
 		}
-
-		expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
 	}
 	else if(token == NOT)
 	{
@@ -1054,6 +1109,7 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 	// Допускается:
 	//  Если классы типов равны
 	//  Если INTEGER переводится в REAL
+	//  Есди STRING переводится в CHAR
 	//  Есди STRING переводится в ARRAY OF CHAR
 
 	oberon_check_src(ctx, expr);
@@ -1066,7 +1122,21 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 
 		if(expr -> result -> class == OBERON_TYPE_STRING)
 		{
-			if(pref -> class == OBERON_TYPE_ARRAY)
+			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)
 				{
@@ -1096,7 +1166,16 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 		oberon_error(ctx, "oberon_autocast_to: incompatible types");
 	}
 
-	if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
+	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)
 		{
@@ -1171,13 +1250,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_error(ctx, "incompatible type");
+			}
 			if(arg -> read_only)
 			{
 				oberon_error(ctx, "assign to read-only var");
 			}
+			casted[i] = arg;
+		}
+		else
+		{
+			casted[i] = oberon_autocast_to(ctx, arg, param -> type);
 		}
 
-		casted[i] = oberon_autocast_to(ctx, arg, param -> type);
 		arg = arg -> next;
 		param = param -> next;
 	}
@@ -1394,7 +1481,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 }
 
 #define ISSELECTOR(x) \
-	(((x) == LBRACE) \
+	(((x) == LBRACK) \
 	|| ((x) == DOT) \
 	|| ((x) == UPARROW) \
 	|| ((x) == LPAREN))
@@ -1453,9 +1540,8 @@ oberon_ident_item(oberon_context_t * ctx, char * name)
 }
 
 static oberon_expr_t *
-oberon_designator(oberon_context_t * ctx)
+oberon_qualident_expr(oberon_context_t * ctx)
 {
-	char * name;
 	oberon_object_t * var;
 	oberon_expr_t * expr;
 
@@ -1491,8 +1577,20 @@ oberon_designator(oberon_context_t * ctx)
 			oberon_error(ctx, "invalid designator");
 			break;
 	}
+
 	expr -> item.var = var;
 
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_designator(oberon_context_t * ctx)
+{
+	char * name;
+	oberon_expr_t * expr;
+
+	expr = oberon_qualident_expr(ctx);
+
 	while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
 	{
 		switch(ctx -> token)
@@ -1502,12 +1600,12 @@ oberon_designator(oberon_context_t * ctx)
 				name = oberon_assert_ident(ctx);
 				expr = oberon_make_record_selector(ctx, expr, name);
 				break;
-			case LBRACE:
-				oberon_assert_token(ctx, LBRACE);
+			case LBRACK:
+				oberon_assert_token(ctx, LBRACK);
 				int num_indexes = 0;
 				oberon_expr_t * indexes = NULL;
 				oberon_expr_list(ctx, &num_indexes, &indexes, 0);
-				oberon_assert_token(ctx, RBRACE);
+				oberon_assert_token(ctx, RBRACK);
 
 				for(int i = 0; i < num_indexes; i++)
 				{
@@ -1619,6 +1717,59 @@ oberon_integer_item(oberon_context_t * ctx, int64_t i)
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_element(oberon_context_t * ctx)
+{
+	oberon_expr_t * e1;
+	oberon_expr_t * e2;
+
+	e1 = oberon_expr(ctx);
+	if(e1 -> result -> class != OBERON_TYPE_INTEGER)
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	e2 = NULL;
+	if(ctx -> token == DOTDOT)
+	{
+		oberon_assert_token(ctx, DOTDOT);
+		e2 = oberon_expr(ctx);
+		if(e2 -> result -> class != OBERON_TYPE_INTEGER)
+		{
+			oberon_error(ctx, "expected integer");
+		}
+	}
+
+	oberon_expr_t * set;
+	set = oberon_new_operator(OP_RANGE, ctx -> set_type, e1, e2);
+	return set;
+}
+
+static oberon_expr_t *
+oberon_set(oberon_context_t * ctx)
+{
+	oberon_expr_t * set;
+	oberon_expr_t * elements;
+	set = oberon_new_item(MODE_SET, ctx -> set_type, true);
+	set -> item.integer = 0;
+
+	oberon_assert_token(ctx, LBRACE);
+	if(ISEXPR(ctx -> token))
+	{
+		elements = oberon_element(ctx);
+		set = oberon_new_operator(OP_UNION, ctx -> set_type, set, elements);
+		while(ctx -> token == COMMA)
+		{
+			oberon_assert_token(ctx, COMMA);
+			elements = oberon_element(ctx);
+			set = oberon_new_operator(OP_UNION, ctx -> set_type, set, elements);
+		}
+	}
+	oberon_assert_token(ctx, RBRACE);
+
+	return set;
+}
+
 static oberon_expr_t *
 oberon_factor(oberon_context_t * ctx)
 {
@@ -1663,6 +1814,9 @@ oberon_factor(oberon_context_t * ctx)
 			expr -> item.boolean = false;
 			oberon_assert_token(ctx, FALSE);
 			break;
+		case LBRACE:
+			expr = oberon_set(ctx);
+			break;
 		case LPAREN:
 			oberon_assert_token(ctx, LPAREN);
 			expr = oberon_expr(ctx);
@@ -1720,7 +1874,23 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	oberon_expr_t * expr;
 	oberon_type_t * result;
 
-	if(token == IS)
+	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);
+	}
+	else if(token == IS)
 	{
 		oberon_type_t * v = a -> result;
 		if(v -> class == OBERON_TYPE_POINTER)
@@ -1825,10 +1995,21 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	}
 	else if(token == SLASH)
 	{
-		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);
+		if(a -> result -> class == OBERON_TYPE_SET
+			|| b -> result -> class == OBERON_TYPE_SET)
+		{
+			oberon_autocast_binary_op(ctx, &a, &b);
+			result = a -> 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;
+			expr = oberon_new_operator(OP_DIV, result, a, b);
+		}
 	}
 	else if(token == DIV)
 	{
@@ -1844,29 +2025,58 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	else
 	{
 		oberon_autocast_binary_op(ctx, &a, &b);
-
-		if(token == PLUS)
+		result = a -> result;
+		if(result -> class == OBERON_TYPE_SET)
 		{
-			expr = oberon_new_operator(OP_ADD, a -> result, a, b);
-		}
-		else if(token == MINUS)
-		{
-			expr = oberon_new_operator(OP_SUB, a -> result, a, b);
-		}
-		else if(token == STAR)
-		{
-			expr = oberon_new_operator(OP_MUL, a -> result, a, b);
+			switch(token)
+			{
+				case PLUS:
+					expr = oberon_new_operator(OP_UNION, result, a, b);
+					break;
+				case MINUS:
+					expr = oberon_new_operator(OP_DIFFERENCE, result, a, b);
+					break;
+				case STAR:
+					expr = oberon_new_operator(OP_INTERSECTION, result, a, b);
+					break;
+				default:
+					error = true;
+					break;
+			}
 		}
-		else if(token == MOD)
+		else if(result -> class == OBERON_TYPE_INTEGER
+			|| result -> class == OBERON_TYPE_REAL)
 		{
-			expr = oberon_new_operator(OP_MOD, a -> result, a, b);
+			switch(token)
+			{
+				case PLUS:
+					expr = oberon_new_operator(OP_ADD, result, a, b);
+					break;
+				case MINUS:
+					expr = oberon_new_operator(OP_SUB, result, a, b);
+					break;
+				case STAR:
+					expr = oberon_new_operator(OP_MUL, result, a, b);
+					break;
+				case MOD:
+					expr = oberon_new_operator(OP_MOD, result, a, b);
+					break;
+				default:
+					error = true;
+					break;
+			}
 		}
 		else
 		{
-			oberon_error(ctx, "oberon_make_bin_op: bin wat");
+			error = true;
 		}
 	}
 
+	if(error)
+	{
+		oberon_error(ctx, "invalid operation");
+	}
+
 	return expr;
 }
 
@@ -1951,12 +2161,9 @@ oberon_expr(oberon_context_t * ctx)
 	return expr;
 }
 
-static oberon_item_t *
-oberon_const_expr(oberon_context_t * ctx)
+static void
+oberon_check_const(oberon_context_t * ctx, oberon_expr_t * expr)
 {
-	oberon_expr_t * expr;
-	expr = oberon_expr(ctx);
-
 	if(expr -> is_item == 0)
 	{
 		oberon_error(ctx, "const expression are required");
@@ -1977,7 +2184,14 @@ oberon_const_expr(oberon_context_t * ctx)
 			oberon_error(ctx, "const expression are required");
 			break;
 	}
+}
 
+static oberon_item_t *
+oberon_const_expr(oberon_context_t * ctx)
+{
+	oberon_expr_t * expr;
+	expr = oberon_expr(ctx);
+	oberon_check_const(ctx, expr);
 	return (oberon_item_t *) expr;
 }
 
@@ -2286,13 +2500,20 @@ oberon_proc_decl(oberon_context_t * ctx)
 	signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
 	oberon_opt_formal_pars(ctx, &signature);	
 
-	oberon_initialize_decl(ctx);
+	//oberon_initialize_decl(ctx);
 	oberon_generator_init_type(ctx, signature);
 	oberon_close_scope(ctx -> decl);
 
 	oberon_object_t * proc;
 	proc = oberon_find_object(ctx -> decl, name, 0);
-	if(proc != NULL)
+	if(proc == NULL)
+	{
+		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);
+	}
+	else
 	{
 		if(proc -> class != OBERON_CLASS_PROC)
 		{
@@ -2314,16 +2535,15 @@ oberon_proc_decl(oberon_context_t * ctx)
 
 		oberon_compare_signatures(ctx, proc -> type, signature);
 	}
-	else
+
+	proc_scope -> parent = proc;
+	oberon_object_t * param = proc_scope -> list -> next;
+	while(param)
 	{
-		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);
+		param -> parent = proc;
+		param = param -> next;
 	}
 
-	proc -> scope -> parent = proc;
-
 	if(forward == 0)
 	{
 		proc -> linked = 1;
@@ -3022,6 +3242,167 @@ oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 	oberon_generate_assign(ctx, src, dst);
 }
 
+static oberon_expr_t *
+oberon_case_labels(oberon_context_t * ctx, oberon_expr_t * val)
+{
+	oberon_expr_t * e1;
+	oberon_expr_t * e2;
+	oberon_expr_t * cond;
+	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)
+	{
+		/* val == e1 */
+		cond = oberon_make_bin_op(ctx, EQUAL, val, e1);
+	}
+	else
+	{
+		/* val >= e1 && val <= e2 */
+		cond = oberon_make_bin_op(ctx, GEQ, val, e1);
+		cond2 = oberon_make_bin_op(ctx, LEQ, val, e2);
+		cond = oberon_make_bin_op(ctx, AND, cond, cond2);
+	}
+
+	return cond;
+}
+
+static void
+oberon_case(oberon_context_t * ctx, oberon_expr_t * val, gen_label_t * end)
+{
+	oberon_expr_t * cond;
+	oberon_expr_t * cond2;
+	gen_label_t * this_end;
+
+	if(ISEXPR(ctx -> token))
+	{
+		this_end = oberon_generator_reserve_label(ctx);
+
+		cond = oberon_case_labels(ctx, val);
+		while(ctx -> token == COMMA)
+		{
+			oberon_assert_token(ctx, COMMA);
+			/* cond || cond2 */
+			cond2 = oberon_case_labels(ctx, val);
+			cond = oberon_make_bin_op(ctx, OR, cond, cond2);
+		}
+		oberon_assert_token(ctx, COLON);
+
+		oberon_generate_branch(ctx, cond, false, this_end);
+		oberon_statement_seq(ctx);
+		oberon_generate_goto(ctx, end);
+
+		oberon_generate_label(ctx, this_end);
+	}
+}
+
+static void
+oberon_case_statement(oberon_context_t * ctx)
+{
+	oberon_expr_t * val;
+	oberon_expr_t * expr;
+	gen_label_t * end;
+
+	end = oberon_generator_reserve_label(ctx);
+
+	oberon_assert_token(ctx, CASE);
+	expr = oberon_expr(ctx);
+	val = oberon_make_temp_var_item(ctx, expr -> result);
+	oberon_assign(ctx, expr, val);
+	oberon_assert_token(ctx, OF);
+	oberon_case(ctx, val, end);
+	while(ctx -> token == BAR)
+	{
+		oberon_assert_token(ctx, BAR);
+		oberon_case(ctx, val, end);
+	}
+
+	if(ctx -> token == ELSE)
+	{
+		oberon_assert_token(ctx, ELSE);
+		oberon_statement_seq(ctx);
+	}
+
+	oberon_generate_label(ctx, end);
+	oberon_assert_token(ctx, END);
+}
+
+static void
+oberon_with_guard_do(oberon_context_t * ctx, gen_label_t * end)
+{
+	oberon_expr_t * val;
+	oberon_expr_t * var;
+	oberon_expr_t * type;
+	oberon_expr_t * cond;
+	oberon_expr_t * cast;
+	oberon_type_t * old_type;
+	gen_var_t * old_var;
+	gen_label_t * this_end;
+
+	this_end = oberon_generator_reserve_label(ctx);
+
+	var = oberon_qualident_expr(ctx);
+	oberon_assert_token(ctx, COLON);
+	type = oberon_qualident_expr(ctx);
+	cond = oberon_make_bin_op(ctx, IS, var, type);
+
+	oberon_assert_token(ctx, DO);
+	oberon_generate_branch(ctx, cond, false, this_end);
+
+	/* Сохраняем ссылку во временной переменной */
+	val = oberon_make_temp_var_item(ctx, type -> result);
+	cast = oberno_make_record_cast(ctx, var, type -> result);
+	oberon_assign(ctx, cast, val);
+	/* Подменяем тип у оригинальной переменной */
+	old_type = var -> item.var -> type;
+	var -> item.var -> type = type -> result;
+	/* Подменяем ссылку на переменную */
+	old_var = var -> item.var -> gen_var;
+	var -> item.var -> gen_var = val -> item.var -> gen_var;
+
+	oberon_statement_seq(ctx);
+	oberon_generate_goto(ctx, end);
+	oberon_generate_label(ctx, this_end);
+
+	/* Возвращаем исходное состояние */
+	var -> item.var -> gen_var = old_var;
+	var -> item.var -> type = old_type;
+}
+
+static void
+oberon_with_statement(oberon_context_t * ctx)
+{
+	gen_label_t * end;
+	end = oberon_generator_reserve_label(ctx);
+
+	oberon_assert_token(ctx, WITH);
+	oberon_with_guard_do(ctx, end);
+	while(ctx -> token == BAR)
+	{
+		oberon_assert_token(ctx, BAR);
+		oberon_with_guard_do(ctx, end);
+	}
+
+	if(ctx -> token == ELSE)
+	{
+		oberon_assert_token(ctx, ELSE);
+		oberon_statement_seq(ctx);
+	}
+
+	oberon_generate_label(ctx, end);
+	oberon_assert_token(ctx, END);
+}
+
 static void
 oberon_statement(oberon_context_t * ctx)
 {
@@ -3228,6 +3609,14 @@ oberon_statement(oberon_context_t * ctx)
 		}
 		oberon_generate_goto(ctx, ctx -> decl -> exit_label);
 	}
+	else if(ctx -> token == CASE)
+	{
+		oberon_case_statement(ctx);
+	}
+	else if(ctx -> token == WITH)
+	{
+		oberon_with_statement(ctx);
+	}
 	else if(ctx -> token == RETURN)
 	{
 		oberon_assert_token(ctx, RETURN);
@@ -3349,7 +3738,7 @@ oberon_parse_module(oberon_context_t * ctx)
 
 	oberon_assert_token(ctx, END);
 	name2 = oberon_assert_ident(ctx);
-	oberon_assert_token(ctx, DOT);
+	oberon_expect_token(ctx, DOT);
 
 	if(strcmp(name1, name2) != 0)
 	{
@@ -3399,6 +3788,9 @@ register_default_types(oberon_context_t * ctx)
 
 	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);
 }
 
 static void
@@ -3440,6 +3832,9 @@ oberon_make_min_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		case OBERON_TYPE_INTEGER:
 			expr = oberon_integer_item(ctx, -powl(2, bits - 1));
 			break;
+		case OBERON_TYPE_SET:
+			expr = oberon_integer_item(ctx, 0);
+			break;
 		default:
 			oberon_error(ctx, "allowed only basic types");
 			break;
@@ -3476,6 +3871,9 @@ oberon_make_max_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		case OBERON_TYPE_INTEGER:
 			expr = oberon_integer_item(ctx, powl(2, bits - 1) - 1);
 			break;
+		case OBERON_TYPE_SET:
+			expr = oberon_integer_item(ctx, bits);
+			break;
 		default:
 			oberon_error(ctx, "allowed only basic types");
 			break;
@@ -3513,6 +3911,8 @@ oberon_make_size_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
 		case OBERON_TYPE_INTEGER:
 		case OBERON_TYPE_BOOLEAN:
 		case OBERON_TYPE_REAL:
+		case OBERON_TYPE_CHAR:
+		case OBERON_TYPE_SET:
 			size = type -> size;
 			break;
 		default: