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

diff --git a/src/oberon.c b/src/oberon.c
index cf1a570..9738056 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -1094,15 +1094,25 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 	// Допускается:
 	//  Если классы типов равны
 	//  Если INTEGER переводится в REAL
-	//  Есди STRING переводится в CHAR
-	//  Есди STRING переводится в ARRAY OF CHAR
+	//  Если STRING переводится в CHAR
+	//  Если STRING переводится в ARRAY OF CHAR
+	//  Если NIL переводится в POINTER
+	//  Если NIL переводится в PROCEDURE
 
 	oberon_check_src(ctx, expr);
 
 	bool error = false;
 	if(pref -> class != expr -> result -> class)
 	{
-		if(expr -> result -> class == OBERON_TYPE_STRING)
+		if(expr -> result -> class == OBERON_TYPE_NIL)
+		{
+			if(pref -> class != OBERON_TYPE_POINTER
+				&& pref -> class != OBERON_TYPE_PROCEDURE)
+			{
+				error = true;
+			}
+		}
+		else if(expr -> result -> class == OBERON_TYPE_STRING)
 		{
 			if(pref -> class == OBERON_TYPE_CHAR)
 			{
@@ -1176,17 +1186,18 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 	else if(pref -> class == OBERON_TYPE_POINTER)
 	{
 		assert(pref -> base);
-		if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
+		if(expr -> result -> class == OBERON_TYPE_NIL)
+		{
+			// do nothing
+		}
+		else 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)
-			{
-				oberon_error(ctx, "incompatible pointer types");
-			}
+			oberon_error(ctx, "incompatible pointer types");
 		}
 	}
 
@@ -1285,7 +1296,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args
 	}
 	else
 	{
-		if(signature -> base -> class == OBERON_TYPE_VOID)
+		if(signature -> base -> class == OBERON_TYPE_NOTYPE)
 		{
 			oberon_error(ctx, "attempt to call procedure in expression");
 		}
@@ -1322,7 +1333,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
 	}
 	else
 	{
-		if(signature -> base -> class != OBERON_TYPE_VOID)
+		if(signature -> base -> class != OBERON_TYPE_NOTYPE)
 		{
 			oberon_error(ctx, "attempt to call function as non-typed procedure");
 		}
@@ -1442,7 +1453,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
 		}
 	}
 
-	int read_only = 0;
+	int read_only = expr -> read_only;
 	if(field -> read_only)
 	{
 		if(field -> module != ctx -> mod)
@@ -1562,11 +1573,53 @@ oberon_qualident_expr(oberon_context_t * ctx)
 	return expr;
 }
 
+static void
+oberon_check_type_guard(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * type)
+{
+	/* Охрана типа применима, если */
+	/*   1. v - параметр-переменная типа запись, или v - указатель, и если */
+	/*   2. T - расширение статического типа v */
+
+	if(expr -> is_item
+		&& expr -> item.mode == MODE_VAR
+		&& expr -> item.var -> class == OBERON_CLASS_VAR_PARAM)
+	{
+		// accept
+	}
+	else if(expr -> result -> class == OBERON_TYPE_POINTER
+		|| expr -> result -> class == OBERON_TYPE_RECORD)
+	{
+		// accept
+	}
+	else
+	{
+		oberon_error(ctx, "guard type used only with var-param or pointers");
+	}
+
+	oberon_check_record_compatibility(ctx, type, expr -> result);
+}
+
+static oberon_expr_t *
+oberon_make_type_guard(oberon_context_t * ctx, oberon_expr_t * expr, oberon_object_t * objtype)
+{
+	oberon_type_t * type;
+
+	if(objtype -> class != OBERON_CLASS_TYPE)
+	{
+		oberon_error(ctx, "must be type");
+	}
+	type = objtype -> type;
+
+	oberon_check_type_guard(ctx, expr, type);
+	return oberno_make_record_cast(ctx, expr, objtype -> type);
+}
+
 static oberon_expr_t *
 oberon_designator(oberon_context_t * ctx)
 {
 	char * name;
 	oberon_expr_t * expr;
+	oberon_object_t * objtype;
 
 	expr = oberon_qualident_expr(ctx);
 
@@ -1598,13 +1651,9 @@ oberon_designator(oberon_context_t * ctx)
 				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");
-				}
+				objtype = oberon_qualident(ctx, NULL, true);
 				oberon_assert_token(ctx, RPAREN);
-				expr = oberno_make_record_cast(ctx, expr, objtype -> type);
+				expr = oberon_make_type_guard(ctx, expr, objtype);
 				break;
 			default:
 				oberon_error(ctx, "oberon_designator: wat");
@@ -1807,7 +1856,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, true);
+			expr = oberon_new_item(MODE_NIL, ctx -> nil_type, true);
 			break;
 		default:
 			oberon_error(ctx, "invalid expression");
@@ -1816,15 +1865,6 @@ oberon_factor(oberon_context_t * ctx)
 	return expr;
 }
 
-#define ITMAKESBOOLEAN(x) \
-	(((x) >= EQUAL && (x) <= GEQ) || ((x) == OR) || ((x) == AND))
-
-#define ITUSEONLYINTEGER(x) \
-	((x) >= LESS && (x) <= GEQ)
-
-#define ITUSEONLYBOOLEAN(x) \
-	(((x) == OR) || ((x) == AND))
-
 static void
 oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
 {
@@ -1846,6 +1886,49 @@ oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
 	}
 }
 
+static bool
+oberon_is_numeric_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_INTEGER) || (t -> class == OBERON_TYPE_REAL);
+}
+
+static bool
+oberon_is_char_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_CHAR);
+}
+
+static bool
+oberon_is_string_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_STRING)
+		|| (t -> class == OBERON_TYPE_ARRAY && t -> base -> class == OBERON_TYPE_CHAR);
+}
+
+static bool
+oberon_is_boolean_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_BOOLEAN);
+}
+
+static bool
+oberon_is_set_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_SET);
+}
+
+static bool
+oberon_is_pointer_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_POINTER) || (t -> class == OBERON_TYPE_NIL);
+}
+
+static bool
+oberon_is_procedure_type(oberon_type_t * t)
+{
+	return (t -> class == OBERON_TYPE_POINTER) || (t -> class == OBERON_TYPE_NIL);
+}
+
 static oberon_expr_t *
 oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
 {
@@ -1870,65 +1953,81 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	}
 	else if(token == IS)
 	{
-		oberon_type_t * v = a -> result;
-		if(v -> class == OBERON_TYPE_POINTER)
-		{
-			v = v -> base;
-			if(v -> class != OBERON_TYPE_RECORD)
-			{
-				oberon_error(ctx, "must be record");
-			}
-		}
-		else if(v -> class != OBERON_TYPE_RECORD)
-		{
-			oberon_error(ctx, "must be record");
-		}		
-
 		if(b -> is_item == false || b -> item.mode != MODE_TYPE)
 		{
 			oberon_error(ctx, "requires type");
 		}
 
-		oberon_type_t * t = b -> result;
-		if(t -> class == OBERON_TYPE_POINTER)
-		{
-			t = t -> base;
-			if(t -> class != OBERON_TYPE_RECORD)
-			{
-				oberon_error(ctx, "must be record");
-			}
-		}
-		else if(t -> class != OBERON_TYPE_RECORD)
-		{
-			oberon_error(ctx, "must be record");
-		}
-
 		result = ctx -> bool_type;
+		oberon_check_type_guard(ctx, a, b -> result);
 		expr = oberon_new_operator(OP_IS, result, a, b);
 	}
-	else if(ITMAKESBOOLEAN(token))
+	else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
 	{
-		if(ITUSEONLYINTEGER(token))
+		if(token >= LESS && token <= GEQ)
 		{
-			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)
+			if(oberon_is_numeric_type(a -> result) && oberon_is_numeric_type(b -> result))
+			{
+				// accept
+			}
+			else if(oberon_is_char_type(a -> result) && oberon_is_char_type(b -> result))
+			{
+				// accept
+			}
+			else if(oberon_is_string_type(a -> result) && oberon_is_string_type(b -> result))
 			{
 				// accept
 			}
 			else
 			{
-				oberon_error(ctx, "used only with numeric types");
+				oberon_error(ctx, "invalid comparation");
 			}
 		}
-		else if(ITUSEONLYBOOLEAN(token))
+		else if(token == EQUAL || token == NEQ)
 		{
-			if(a -> result -> class != OBERON_TYPE_BOOLEAN
-				|| b -> result -> class != OBERON_TYPE_BOOLEAN)
+			if(oberon_is_numeric_type(a -> result) && oberon_is_numeric_type(b -> result))
 			{
-				oberon_error(ctx, "used only with boolean type");
+				// accept
+			}
+			else if(oberon_is_char_type(a -> result) && oberon_is_char_type(b -> result))
+			{
+				// accept
+			}
+			else if(oberon_is_string_type(a -> result) && oberon_is_string_type(b -> result))
+			{
+				// accept
 			}
+			else if(oberon_is_boolean_type(a -> result) && oberon_is_boolean_type(b -> result))
+			{
+				// accept
+			}
+			else if(oberon_is_set_type(a -> result) && oberon_is_set_type(b -> result))
+			{
+				// accept
+			}
+			else if(oberon_is_pointer_type(a -> result) && oberon_is_pointer_type(b -> result))
+			{
+				// accept
+			}
+			else if(oberon_is_procedure_type(a -> result) && oberon_is_procedure_type(b -> result))
+			{
+				// accept
+			}
+			else
+			{
+				oberon_error(ctx, "invalid comparation");
+			}
+		}
+		else if(token == AND || token == OR)
+		{
+			if(!oberon_is_boolean_type(a -> result) || !oberon_is_boolean_type(b -> result))
+			{
+				oberon_error(ctx, "invalid comparation");
+			}
+		}
+		else
+		{
+			oberon_error(ctx, "wat");
 		}
 
 		oberon_autocast_binary_op(ctx, &a, &b);
@@ -2262,7 +2361,7 @@ oberon_var_decl(oberon_context_t * ctx)
 	int num;
 	oberon_object_t * list;
 	oberon_type_t * type;
-	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 
 	oberon_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
 	oberon_assert_token(ctx, COLON);
@@ -2293,7 +2392,7 @@ oberon_fp_section(oberon_context_t * ctx, int * num_decl)
 	oberon_assert_token(ctx, COLON);
 
 	oberon_type_t * type;
-	type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 	oberon_type(ctx, &type);
 
 	oberon_object_t * param = list;
@@ -2348,7 +2447,7 @@ oberon_opt_formal_pars(oberon_context_t * ctx, oberon_type_t ** type)
 	signature = *type;
 	signature -> class = OBERON_TYPE_PROCEDURE;
 	signature -> num_decl = 0;
-	signature -> base = ctx -> void_type;
+	signature -> base = ctx -> notype_type;
 	signature -> decl = NULL;
 
 	if(ctx -> token == LPAREN)
@@ -2391,7 +2490,7 @@ oberon_make_return(oberon_context_t * ctx, oberon_expr_t * expr)
 	oberon_object_t * proc = ctx -> decl -> parent;
 	oberon_type_t * result_type = proc -> type -> base;
 
-	if(result_type -> class == OBERON_TYPE_VOID)
+	if(result_type -> class == OBERON_TYPE_NOTYPE)
 	{
 		if(expr != NULL)
 		{
@@ -2437,7 +2536,7 @@ oberon_proc_decl_body(oberon_context_t * ctx, oberon_object_t * proc)
 		oberon_error(ctx, "procedure name not matched");
 	}
 
-	if(proc -> type -> base -> class == OBERON_TYPE_VOID
+	if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE
 		&& proc -> has_return == 0)
 	{
 		oberon_make_return(ctx, NULL);
@@ -2475,7 +2574,7 @@ oberon_proc_decl(oberon_context_t * ctx)
 	ctx -> decl -> local = 1;
 
 	oberon_type_t * signature;
-	signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	signature = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 	oberon_opt_formal_pars(ctx, &signature);	
 
 	//oberon_initialize_decl(ctx);
@@ -2582,7 +2681,7 @@ oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type)
 	else
 	{
 		to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
-		to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		to -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 	}
 
 	*type = to -> type;
@@ -2604,7 +2703,7 @@ oberon_make_multiarray(oberon_context_t * ctx, oberon_expr_t * sizes, oberon_typ
 	}
 
 	oberon_type_t * dim;
-	dim = oberon_new_type_ptr(OBERON_TYPE_VOID);
+	dim = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 
 	oberon_make_multiarray(ctx, sizes -> next, base, &dim);
 
@@ -2627,7 +2726,7 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t *
 		int num;
 		oberon_object_t * list;
 		oberon_type_t * type;
-		type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 
 		oberon_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
 		oberon_assert_token(ctx, COLON);
@@ -2728,7 +2827,7 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		oberon_assert_token(ctx, OF);
 
 		oberon_type_t * base;
-		base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 		oberon_type(ctx, &base);
 
 		if(num_sizes == 0)
@@ -2759,7 +2858,7 @@ oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
 		oberon_assert_token(ctx, TO);
 
 		oberon_type_t * base;
-		base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 		oberon_type(ctx, &base);
 
 		oberon_type_t * ptr;
@@ -2796,7 +2895,7 @@ oberon_type_decl(oberon_context_t * ctx)
 	if(newtype == NULL)
 	{
 		newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only, false);
-		newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+		newtype -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
 		assert(newtype -> type);
 	}
 	else
@@ -2820,7 +2919,7 @@ oberon_type_decl(oberon_context_t * ctx)
 	type = newtype -> type;
 	oberon_type(ctx, &type);
 
-	if(type -> class == OBERON_TYPE_VOID)
+	if(type -> class == OBERON_TYPE_NOTYPE)
 	{
 		oberon_error(ctx, "recursive alias declaration");
 	}
@@ -3020,7 +3119,7 @@ oberon_initialize_record_fields(oberon_context_t * ctx, oberon_type_t * type)
 static void
 oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
 {
-	if(type -> class == OBERON_TYPE_VOID)
+	if(type -> class == OBERON_TYPE_NOTYPE)
 	{
 		oberon_error(ctx, "undeclarated type");
 	}
@@ -3738,12 +3837,11 @@ oberon_parse_module(oberon_context_t * ctx)
 static void
 register_default_types(oberon_context_t * ctx)
 {
-	ctx -> void_type = oberon_new_type_ptr(OBERON_TYPE_VOID);
-	oberon_generator_init_type(ctx, ctx -> void_type);
+	ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
+	oberon_generator_init_type(ctx, ctx -> notype_type);
 
-	ctx -> void_ptr_type = oberon_new_type_ptr(OBERON_TYPE_POINTER);
-	ctx -> void_ptr_type -> base = ctx -> void_type;
-	oberon_generator_init_type(ctx, ctx -> void_ptr_type);
+	ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
+	oberon_generator_init_type(ctx, ctx -> nil_type);
 
 	ctx -> string_type = oberon_new_type_string(1);
 	oberon_generator_init_type(ctx, ctx -> string_type);
@@ -3751,17 +3849,20 @@ register_default_types(oberon_context_t * ctx)
 	ctx -> bool_type = oberon_new_type_boolean();
 	oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
 
+	ctx -> char_type = oberon_new_type_char(1);
+	oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+
 	ctx -> byte_type = oberon_new_type_integer(1);
-	oberon_define_type(ctx -> world_scope, "BYTE", ctx -> byte_type, 1);
+	oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
 
 	ctx -> shortint_type = oberon_new_type_integer(2);
-	oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> shortint_type, 1);
+	oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
 
 	ctx -> int_type = oberon_new_type_integer(4);
-	oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
+	oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
 
 	ctx -> longint_type = oberon_new_type_integer(8);
-	oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> longint_type, 1);
+	oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
 
 	ctx -> real_type = oberon_new_type_real(4);
 	oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
@@ -3769,9 +3870,6 @@ 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);
-
 	ctx -> set_type = oberon_new_type_set(4);
 	oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
 }