X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon.c;h=cf1a570f8084f96c21234f7de51ad5e1c4406676;hp=50429645b22a713480253b1fb262128dc1b97af6;hb=bc1691627adee054210acf7e801361fa574f8086;hpb=9bcd389a97869b2ab6b1c6fdc35c0f09beab66c5

diff --git a/src/oberon.c b/src/oberon.c
index 5042964..cf1a570 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -24,8 +24,6 @@ enum {
 	BEGIN,
 	ASSIGN,
 	INTEGER,
-	TRUE,
-	FALSE,
 	LPAREN,
 	RPAREN,
 	EQUAL,
@@ -77,7 +75,10 @@ enum {
 	EXIT,
 	LBRACE,
 	RBRACE,
-	DOTDOT
+	DOTDOT,
+	CASE,
+	BAR,
+	WITH
 };
 
 // =======================================================================
@@ -341,14 +342,6 @@ oberon_read_ident(oberon_context_t * ctx)
 	{
 		ctx -> token = BEGIN;
 	}
-	else if(strcmp(ident, "TRUE") == 0)
-	{
-		ctx -> token = TRUE;
-	}
-	else if(strcmp(ident, "FALSE") == 0)
-	{
-		ctx -> token = FALSE;
-	}
 	else if(strcmp(ident, "OR") == 0)
 	{
 		ctx -> token = OR;
@@ -461,8 +454,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)
 {
@@ -490,10 +494,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);
 		}
@@ -686,8 +690,6 @@ static void oberon_read_string(oberon_context_t * ctx)
 
 	ctx -> token = STRING;
 	ctx -> string = string;
-
-	printf("oberon_read_string: string ((%s))\n", string);
 }
 
 static void oberon_read_token(oberon_context_t * ctx);
@@ -822,6 +824,10 @@ oberon_read_symbol(oberon_context_t * ctx)
 			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;
@@ -978,11 +984,8 @@ oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_typ
 	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;
 	}
@@ -1091,6 +1094,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);
@@ -1098,12 +1102,23 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 	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_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)
 				{
@@ -1133,7 +1148,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)
 		{
@@ -1208,13 +1232,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;
 	}
@@ -1314,14 +1346,11 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
 	|| ((x) == STRING) \
 	|| ((x) == NIL) \
 	|| ((x) == LPAREN) \
-	|| ((x) == NOT) \
-	|| ((x) == TRUE) \
-	|| ((x) == FALSE)) 
+	|| ((x) == NOT))
 
 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");
@@ -1490,9 +1519,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;
 
@@ -1528,8 +1556,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)
@@ -1709,6 +1749,15 @@ oberon_set(oberon_context_t * ctx)
 	return set;
 }
 
+static oberon_expr_t *
+oberon_make_boolean(oberon_context_t * ctx, bool cond)
+{
+	oberon_expr_t * expr;
+	expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
+	expr -> item.integer = cond;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_factor(oberon_context_t * ctx)
 {
@@ -1743,16 +1792,6 @@ oberon_factor(oberon_context_t * ctx)
 			expr -> item.real = ctx -> real;
 			oberon_assert_token(ctx, REAL);
 			break;
-		case TRUE:
-			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, true);
-			expr -> item.boolean = false;
-			oberon_assert_token(ctx, FALSE);
-			break;
 		case LBRACE:
 			expr = oberon_set(ctx);
 			break;
@@ -1814,7 +1853,22 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	oberon_type_t * result;
 
 	bool error = false;
-	if(token == IS)
+	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)
@@ -2085,12 +2139,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");
@@ -2111,7 +2162,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;
 }
 
@@ -2420,13 +2478,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)
 		{
@@ -2448,16 +2513,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;
@@ -2810,6 +2874,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++)
@@ -3156,6 +3225,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)
 {
@@ -3362,6 +3592,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);
@@ -3483,7 +3721,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)
 	{
@@ -3783,6 +4021,15 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	oberon_assign(ctx, src, dst);
 }
 
+static void
+oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
+{
+	oberon_object_t * constant;
+	constant = oberon_define_object(ctx -> decl, name, OBERON_CLASS_CONST, true, false, false);
+	oberon_check_const(ctx, expr);
+	constant -> value = (oberon_item_t *) expr;
+}
+
 oberon_context_t *
 oberon_create_context(ModuleImportCallback import_module)
 {
@@ -3798,6 +4045,10 @@ oberon_create_context(ModuleImportCallback import_module)
 
 	register_default_types(ctx);
 
+	/* Constants */
+	oberon_new_const(ctx, "TRUE", oberon_make_boolean(ctx, true));
+	oberon_new_const(ctx, "FALSE", oberon_make_boolean(ctx, false));
+
 	/* Functions */
 	oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
 	oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);