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

diff --git a/src/oberon.c b/src/oberon.c
index 8de42d9..cefd469 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -146,36 +146,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 +158,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 +178,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");
+	}
+
+	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 NULL;
+	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;
@@ -770,14 +760,25 @@ 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 -> item.parent = expr;
 	cast -> next = expr -> next;
 	return cast;
 }
 
+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_error(ctx, "must be record type");
+	}
+
+	return oberon_cast_expr(ctx, expr, rec);
+}
+
 static oberon_type_t *
 oberon_get_equal_expr_type(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t * b)
 {
@@ -852,11 +853,20 @@ 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)
+		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);
+		}
 	}
 	else if(pref -> class == OBERON_TYPE_POINTER)
 	{
@@ -1068,7 +1078,7 @@ oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
 
 	oberon_expr_t * selector;
 	selector = oberon_new_item(MODE_DEREF, expr -> result -> base, expr -> read_only);
-	selector -> item.parent = (oberon_item_t *) expr;
+	selector -> item.parent = expr;
 
 	return selector;
 }
@@ -1115,7 +1125,7 @@ oberon_make_array_selector(oberon_context_t * ctx, oberon_expr_t * desig, oberon
 
 	oberon_expr_t * selector;
 	selector = oberon_new_item(MODE_INDEX, base, desig -> read_only);
-	selector -> item.parent = (oberon_item_t *) desig;
+	selector -> item.parent = desig;
 	selector -> item.num_args = 1;
 	selector -> item.args = index;
 
@@ -1140,7 +1150,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)
 	{
@@ -1162,7 +1172,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 	oberon_expr_t * selector;
 	selector = oberon_new_item(MODE_FIELD, field -> type, read_only);
 	selector -> item.var = field;
-	selector -> item.parent = (oberon_item_t *) expr;
+	selector -> item.parent = expr;
 
 	return selector;
 }
@@ -1170,7 +1180,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)
@@ -1269,6 +1280,16 @@ 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;
@@ -1412,6 +1433,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 +1464,12 @@ 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");
+				oberon_error(ctx, "used only with numeric types");
 			}
 		}
 		else if(ITUSEONLYBOOLEAN(token))
@@ -1437,6 +1481,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 +1523,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);
 	}
@@ -1696,7 +1719,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 +1729,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 +1754,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 +1778,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 +1998,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 +2019,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 +2045,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 +2065,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 +2103,87 @@ 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");
+		}
+
+		if(typeobj -> type -> class != OBERON_TYPE_RECORD)
+		{
+			oberon_error(ctx, "base must be record type");
+		}
+
+		rec -> base = typeobj -> type;
+		ctx -> decl = rec -> 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 +2225,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 +2273,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);
 	}
@@ -2688,7 +2753,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;
 }
 
@@ -2804,7 +2869,7 @@ 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 = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, true, false, false);
 	proc -> sysproc = 1;
 	proc -> genfunc = f;
 	proc -> genproc = p;