X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon.c;h=931a30724697a03476cff779779b3385bad5f2b4;hp=83f39cd2cebea39ac30fd54f1125ba11151bb045;hb=HEAD;hpb=0b724e12457f2507d398c51dc35200d833ce9362

diff --git a/src/oberon.c b/src/oberon.c
index 83f39cd..931a307 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -305,6 +305,21 @@ oberon_find_object(oberon_scope_t * scope, char * name, bool check_it)
 	return result;
 }
 
+static oberon_object_t *
+oberon_find_object_in_scope(oberon_scope_t * scope, char * name, bool check_it)
+{
+	oberon_object_t * result = NULL;
+
+	result = oberon_find_object_in_list(scope -> list, name);
+
+	if(check_it && result == NULL)
+	{
+		oberon_error(scope -> ctx, "undefined ident %s", name);
+	}
+
+	return result;
+}
+
 static oberon_object_t *
 oberon_create_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only)
 {
@@ -375,6 +390,7 @@ oberon_init_scaner(oberon_context_t * ctx, oberon_scanner_t * s)
 	ctx -> xloc.col = 1;
 	ctx -> loc = ctx -> xloc;
 	ctx -> c = ctx -> code[ctx -> code_index];
+	oberon_set_line(ctx, 1);
 }
 
 static void
@@ -706,12 +722,14 @@ oberon_get_lined_char(oberon_context_t * ctx)
 			}
 			ctx -> xloc.line += 1;
 			ctx -> xloc.col = 1;
+			oberon_set_line(ctx, ctx -> xloc.line);
 		}
 		else if(ctx -> c == 0xA)
 		{
 			oberon_get_char(ctx);
 			ctx -> xloc.line += 1;
 			ctx -> xloc.col = 1;
+			oberon_set_line(ctx, ctx -> xloc.line);
 		}
 		else
 		{
@@ -1088,6 +1106,12 @@ oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * p
 		cast = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
 		cast -> item.integer = expr -> item.string[0];
 	}
+	else if(oberon_is_record_type(pref) || oberon_is_pointer_to_record(pref))
+	{
+		assert(expr -> is_item);
+		cast = oberon_new_item(MODE_AS, pref, expr -> read_only);
+		cast -> item.parent = (oberon_item_t *) expr;
+	}
 	else if(!oberon_is_some_types(expr -> result, pref))
 	{
 		cast = oberon_new_operator(OP_CAST, pref, expr, NULL);
@@ -2441,6 +2465,12 @@ oberon_proc_decl(oberon_context_t * ctx)
 	char * name;
 	int export;
 	int read_only;
+
+	if(ctx -> token == STAR)
+	{
+		oberon_assert_token(ctx, STAR);
+	}
+
 	name = oberon_assert_ident(ctx);
 	oberon_def(ctx, &export, &read_only);
 
@@ -2457,7 +2487,7 @@ oberon_proc_decl(oberon_context_t * ctx)
 	oberon_close_scope(ctx -> decl);
 
 	oberon_object_t * proc;
-	proc = oberon_find_object(ctx -> decl, name, 0);
+	proc = oberon_find_object_in_scope(ctx -> decl, name, 0);
 	if(proc == NULL)
 	{
 		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
@@ -2625,9 +2655,8 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t *
 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;
+	ctx -> decl = oldscope;
 
 	if(ctx -> token == LPAREN)
 	{
@@ -2668,11 +2697,11 @@ oberon_type_record_body(oberon_context_t * ctx, oberon_type_t * rec)
 	this_scope -> parent = NULL;
 	this_scope -> parent_type = rec;
 
-	oberon_field_list(ctx, rec, modscope);
+	oberon_field_list(ctx, rec, oldscope);
 	while(ctx -> token == SEMICOLON)
 	{
 		oberon_assert_token(ctx, SEMICOLON);
-		oberon_field_list(ctx, rec, modscope);
+		oberon_field_list(ctx, rec, oldscope);
 	}
 
 	rec -> scope = this_scope;
@@ -3136,33 +3165,34 @@ oberon_prevent_undeclarated_procedures(oberon_context_t * ctx)
 static void
 oberon_decl_seq(oberon_context_t * ctx)
 {
-	if(ctx -> token == CONST)
+	while(ctx -> token >= CONST && ctx -> token <= VAR)
 	{
-		oberon_assert_token(ctx, CONST);
-		while(ctx -> token == IDENT)
+		if(ctx -> token == CONST)
 		{
-			oberon_const_decl(ctx);
-			oberon_assert_token(ctx, SEMICOLON);
+			oberon_assert_token(ctx, CONST);
+			while(ctx -> token == IDENT)
+			{
+				oberon_const_decl(ctx);
+				oberon_assert_token(ctx, SEMICOLON);
+			}
 		}
-	}
-
-	if(ctx -> token == TYPE)
-	{
-		oberon_assert_token(ctx, TYPE);
-		while(ctx -> token == IDENT)
+		else if(ctx -> token == TYPE)
 		{
-			oberon_type_decl(ctx);
-			oberon_assert_token(ctx, SEMICOLON);
+			oberon_assert_token(ctx, TYPE);
+			while(ctx -> token == IDENT)
+			{
+				oberon_type_decl(ctx);
+				oberon_assert_token(ctx, SEMICOLON);
+			}
 		}
-	}
-
-	if(ctx -> token == VAR)
-	{
-		oberon_assert_token(ctx, VAR);
-		while(ctx -> token == IDENT)
+		else if(ctx -> token == VAR)
 		{
-			oberon_var_decl(ctx);
-			oberon_assert_token(ctx, SEMICOLON);
+			oberon_assert_token(ctx, VAR);
+			while(ctx -> token == IDENT)
+			{
+				oberon_var_decl(ctx);
+				oberon_assert_token(ctx, SEMICOLON);
+			}
 		}
 	}
 
@@ -3316,44 +3346,38 @@ oberon_case_statement(oberon_context_t * ctx)
 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_object_t * var;
+	oberon_expr_t * var_expr;
+	oberon_expr_t * type_expr;
 	oberon_expr_t * cond;
-	oberon_expr_t * cast;
+	oberon_type_t * type;
 	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);
+	var_expr = oberon_qualident_expr(ctx);
 	oberon_assert_token(ctx, COLON);
-	type = oberon_qualident_expr(ctx);
-	cond = oberon_make_bin_op(ctx, IS, var, type);
+	type_expr = oberon_qualident_expr(ctx);
+	cond = oberon_make_bin_op(ctx, IS, var_expr, type_expr);
+
+	var = var_expr -> item.var;
+	type = type_expr -> result;
+	old_type = 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);
-	cast = oberon_cast_expr(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;
+	var -> type = type;
+	oberon_set_typecheck(var, true);
 
 	oberon_statement_seq(ctx);
+
+	var -> type = old_type;
+	oberon_set_typecheck(var, false);
+
 	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
@@ -3940,7 +3964,6 @@ oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	{
 		step = list_args -> next;
 		oberon_check_src(ctx, step);
-		oberon_check_const(ctx, step);
 		if(!oberon_is_integer_type(step -> result))
 		{
 			oberon_error(ctx, "expect integer");
@@ -4055,7 +4078,6 @@ oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	{
 		step = list_args -> next;
 		oberon_check_src(ctx, step);
-		oberon_check_const(ctx, step);
 		if(!oberon_is_integer_type(step -> result))
 		{
 			oberon_error(ctx, "expect integer");
@@ -4960,7 +4982,10 @@ oberon_create_context(ModuleImportCallback import_module)
 		/* Types */
 		oberon_new_intrinsic_type(ctx, "BYTE", ctx -> system_byte_type);
 		oberon_new_intrinsic_type(ctx, "PTR", ctx -> system_ptr_type);
+		oberon_new_intrinsic_type(ctx, "INT8", ctx -> byte_type);
+		oberon_new_intrinsic_type(ctx, "INT16", ctx -> shortint_type);
 		oberon_new_intrinsic_type(ctx, "INT32", ctx -> int_type);
+		oberon_new_intrinsic_type(ctx, "INT64", ctx -> longint_type);
 		oberon_new_intrinsic_type(ctx, "SET32", ctx -> set_type);
 
 		/* Functions */