X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=f1fe4518a135c6e9369e877ac2c08d13575fb12a;hb=844ae6c007ac4606ad4ac3938876b67c014bb5eb;hp=58eb67c3eb72562294074f972fde2e15f68b5fec;hpb=55d9ee92b95dd306ac80fb643ed21d3b733395d7;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 58eb67c..f1fe451 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -24,8 +24,6 @@ enum {
 	BEGIN,
 	ASSIGN,
 	INTEGER,
-	TRUE,
-	FALSE,
 	LPAREN,
 	RPAREN,
 	EQUAL,
@@ -344,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;
@@ -474,6 +464,9 @@ oberon_read_ident(oberon_context_t * ctx)
 	}
 }
 
+#define ISHEXDIGIT(x) \
+	(((x) >= '0' && (x) <= '9') || ((x) >= 'A' && (x) <= 'F'))
+
 static void
 oberon_read_number(oberon_context_t * ctx)
 {
@@ -501,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);
 		}
@@ -1106,6 +1099,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);
@@ -1118,7 +1112,21 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
 
 		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)
 				{
@@ -1148,7 +1156,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)
 		{
@@ -1337,9 +1354,7 @@ 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)
@@ -1743,6 +1758,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)
 {
@@ -1777,16 +1801,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;
@@ -2134,12 +2148,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");
@@ -2160,7 +2171,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;
 }
 
@@ -2469,13 +2487,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)
 		{
@@ -2497,16 +2522,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;
@@ -3701,7 +3725,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)
 	{
@@ -4001,6 +4025,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)
 {
@@ -4016,6 +4049,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);