X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=1d9e670e82fcc1c2e197b7bcbeea9b91cc935782;hb=8212ec191c6700e5f0ceb7600b6d30441ca2bc88;hp=ebcaa990f9640d227f34c139844e63b26e5defee;hpb=5185ccf4b3caa619f466fdb2890e955b42264a88;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index ebcaa99..1d9e670 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -693,9 +693,9 @@ oberon_read_number(oberon_context_t * ctx)
 }
 
 static void
-oberon_skip_space(oberon_context_t * ctx)
+oberon_get_lined_char(oberon_context_t * ctx)
 {
-	while(isspace(ctx -> c))
+	do
 	{
 		if(ctx -> c == 0xD)
 		{
@@ -717,6 +717,15 @@ oberon_skip_space(oberon_context_t * ctx)
 		{
 			oberon_get_char(ctx);
 		}
+	} while(ctx -> c == 0xD || ctx -> c == 0xA);
+}
+
+static void
+oberon_skip_space(oberon_context_t * ctx)
+{
+	while(isspace(ctx -> c))
+	{
+		oberon_get_lined_char(ctx);
 	}
 }
 
@@ -728,19 +737,19 @@ oberon_read_comment(oberon_context_t * ctx)
 	{
 		if(ctx -> c == '(')
 		{
-			oberon_get_char(ctx);
+			oberon_get_lined_char(ctx);
 			if(ctx -> c == '*')
 			{
-				oberon_get_char(ctx);
+				oberon_get_lined_char(ctx);
 				nesting += 1;
 			}
 		}
 		else if(ctx -> c == '*')
 		{
-			oberon_get_char(ctx);
+			oberon_get_lined_char(ctx);
 			if(ctx -> c == ')')
 			{
-				oberon_get_char(ctx);
+				oberon_get_lined_char(ctx);
 				nesting -= 1;
 			}
 		}
@@ -750,7 +759,7 @@ oberon_read_comment(oberon_context_t * ctx)
 		}
 		else
 		{
-			oberon_get_char(ctx);
+			oberon_get_lined_char(ctx);
 		}
 	}
 }
@@ -1079,6 +1088,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);
@@ -1150,8 +1165,6 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 	int num_args = desig -> num_args;
 	int num_decl = fn -> num_decl;
 
-	printf("oberon_autocast_call: num_args %i num_decl %i\n", num_args, num_decl);
-
 	if(num_args < num_decl)
 	{
 		oberon_error(ctx, "too few arguments");
@@ -1952,7 +1965,26 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 						break;
 				}
 			}
-			else if(oberon_is_number_type(result))
+			else if(oberon_is_real_type(result))
+			{
+				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;
+					default:
+						printf("token %i line %i\n", token, ctx -> loc.line);
+						assert(0);
+						break;
+				}
+			}
+			else if(oberon_is_integer_type(result))
 			{
 				switch(token)
 				{
@@ -1965,7 +1997,14 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 					case STAR:
 						expr = oberon_new_operator(OP_MUL, result, a, b);
 						break;
+					case DIV:
+						expr = oberon_new_operator(OP_DIV, result, a, b);
+						break;
+					case MOD:
+						expr = oberon_new_operator(OP_MOD, result, a, b);
+						break;
 					default:
+						printf("token %i line %i\n", token, ctx -> loc.line);
 						assert(0);
 						break;
 				}
@@ -2379,8 +2418,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_NOTYPE
-		&& proc -> has_return == 0)
+	if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
 	{
 		oberon_make_return(ctx, NULL);
 	}
@@ -2593,9 +2631,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)
 	{
@@ -2636,11 +2673,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;
@@ -3104,33 +3141,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);
+			}
 		}
 	}
 
@@ -3284,44 +3322,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
@@ -3463,7 +3495,7 @@ oberon_statement(oberon_context_t * ctx)
 			oberon_error(ctx, "condition must be boolean");
 		}
 
-		oberon_generate_branch(ctx, cond, true, begin);
+		oberon_generate_branch(ctx, cond, false, begin);
 	}
 	else if(ctx -> token == FOR)
 	{
@@ -3855,7 +3887,7 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	arg = list_args;
 	oberon_check_src(ctx, arg);
 
-	if(oberon_is_number_type(arg -> result))
+	if(!oberon_is_number_type(arg -> result))
 	{
 		oberon_error(ctx, "ABS accepts only numbers");
 	}
@@ -3889,7 +3921,7 @@ oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		oberon_error(ctx, "too few arguments");
 	}
 
-	if(num_args > 1)
+	if(num_args > 2)
 	{
 		oberon_error(ctx, "too mach arguments");
 	}
@@ -3903,8 +3935,23 @@ oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		oberon_error(ctx, "expect integer");
 	}
 
+	oberon_expr_t * step;
+	if(num_args == 2)
+	{
+		step = list_args -> next;
+		oberon_check_src(ctx, step);
+		if(!oberon_is_integer_type(step -> result))
+		{
+			oberon_error(ctx, "expect integer");
+		}
+	}
+	else
+	{
+		step = oberon_make_integer(ctx, 1);
+	}
+
 	oberon_expr_t * expr;
-	expr = oberon_make_bin_op(ctx, PLUS, dst, oberon_make_integer(ctx, 1));
+	expr = oberon_make_bin_op(ctx, PLUS, dst, step);
 	oberon_assign(ctx, expr, dst);
 }
 
@@ -3988,7 +4035,7 @@ oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		oberon_error(ctx, "too few arguments");
 	}
 
-	if(num_args > 1)
+	if(num_args > 2)
 	{
 		oberon_error(ctx, "too mach arguments");
 	}
@@ -4002,8 +4049,23 @@ oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 		oberon_error(ctx, "expect integer");
 	}
 
+	oberon_expr_t * step;
+	if(num_args == 2)
+	{
+		step = list_args -> next;
+		oberon_check_src(ctx, step);
+		if(!oberon_is_integer_type(step -> result))
+		{
+			oberon_error(ctx, "expect integer");
+		}
+	}
+	else
+	{
+		step = oberon_make_integer(ctx, 1);
+	}
+
 	oberon_expr_t * expr;
-	expr = oberon_make_bin_op(ctx, MINUS, dst, oberon_make_integer(ctx, 1));
+	expr = oberon_make_bin_op(ctx, MINUS, dst, step);
 	oberon_assign(ctx, expr, dst);
 }
 
@@ -4471,7 +4533,7 @@ oberon_make_ord_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	}
 	else
 	{
-		expr = oberon_cast_expr(ctx, arg, ctx -> int_type);
+		expr = oberon_cast_expr(ctx, arg, ctx -> shortint_type);
 	}
 	return expr;
 }
@@ -4896,6 +4958,11 @@ 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 */
 		oberon_new_intrinsic(ctx, "CC", oberon_make_cc_call, NULL);