X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=04d4c6d75a736a8e1d1f57e909ba6d509775fcf4;hb=ba1a55241f3841d1254317d76d45322c85fb687b;hp=0bbeec188b3d5b4e7fafe506285a9d096cb809b7;hpb=1233fb1d5d8f67a8f5e970386c1c4cbb6691ec04;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 0bbeec1..04d4c6d 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -151,6 +151,16 @@ oberon_make_integer(oberon_context_t * ctx, int64_t i)
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_system_byte(oberon_context_t * ctx, int64_t i)
+{
+	oberon_expr_t * expr;
+	expr = oberon_new_item(MODE_SYSBYTE, ctx -> system_byte_type, true);
+	expr -> item.integer = i;
+	expr -> item.real = i;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_char(oberon_context_t * ctx, int64_t i)
 {
@@ -161,6 +171,17 @@ oberon_make_char(oberon_context_t * ctx, int64_t i)
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_string(oberon_context_t * ctx, char * str)
+{
+	oberon_expr_t * expr;
+	expr = oberon_new_item(MODE_STRING, ctx -> string_type, true);
+	expr -> item.integer = str[0];
+	expr -> item.real = str[0];
+	expr -> item.string = str;
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_real_typed(oberon_context_t * ctx, double r, oberon_type_t * result)
 {
@@ -356,23 +377,20 @@ oberon_init_scaner(oberon_context_t * ctx, const char * code)
 static void
 oberon_read_ident(oberon_context_t * ctx)
 {
-	int len = 0;
-	int i = ctx -> code_index;
+	int start = ctx -> code_index;
 
-	int c = ctx -> code[i];
-	while(isalnum(c))
+	oberon_get_char(ctx);
+	while(isalnum(ctx -> c) || ctx -> c == '_')
 	{
-		i += 1;
-		len += 1;
-		c = ctx -> code[i];
+		oberon_get_char(ctx);
 	}
 
-	char * ident = GC_MALLOC(len + 1);
-	memcpy(ident, &ctx->code[ctx->code_index], len);
-	ident[len] = 0;
+	int end = ctx -> code_index;
+
+	char * ident = GC_MALLOC(end - start + 1);
+	memcpy(ident, &ctx -> code[start], end - start);
+	ident[end - start] = 0;
 
-	ctx -> code_index = i;
-	ctx -> c = ctx -> code[i];
 	ctx -> string = ident;
 	ctx -> token = IDENT;
 
@@ -738,7 +756,7 @@ static void oberon_read_string(oberon_context_t * ctx)
 
 	char * string = GC_MALLOC(end - start + 1);
 	strncpy(string, &ctx -> code[start], end - start);
-	string[end] = 0;
+	string[end - start] = 0;
 
 	ctx -> token = STRING;
 	ctx -> string = string;
@@ -893,7 +911,7 @@ oberon_read_token(oberon_context_t * ctx)
 	oberon_skip_space(ctx);
 
 	int c = ctx -> c;
-	if(isalpha(c))
+	if(isalpha(c) || c == '_')
 	{
 		oberon_read_ident(ctx);
 	}
@@ -1049,6 +1067,12 @@ oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * p
 	return cast;
 }
 
+static oberon_expr_t *
+oberon_hard_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
+{
+	return oberon_new_operator(OP_HARDCAST, pref, expr, NULL);
+}
+
 static void
 oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
 {
@@ -1653,9 +1677,7 @@ oberon_factor(oberon_context_t * ctx)
 			oberon_assert_token(ctx, CHAR);
 			break;
 		case STRING:
-			result = ctx -> string_type;
-			expr = oberon_new_item(MODE_STRING, result, true);
-			expr -> item.string = ctx -> string;
+			expr = oberon_make_string(ctx, ctx -> string);
 			oberon_assert_token(ctx, STRING);
 			break;
 		case REAL:
@@ -1692,7 +1714,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	oberon_expr_t * expr;
 	oberon_type_t * result;
 
-	oberon_check_compatible_bin_expr_types(ctx, token, a -> result, b -> result);
+	oberon_check_compatible_bin_expr(ctx, token, a, b);
 	oberon_check_src(ctx, a);
 	if(token != IS)
 	{
@@ -1717,7 +1739,22 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
 	}
 	else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
 	{
-		result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		if(oberon_is_string_of_one(a) && oberon_is_char_type(b -> result))
+		{
+			result = b -> result;
+		}
+		else if(oberon_is_string_of_one(b) && oberon_is_char_type(a -> result))
+		{
+			result = a -> result;
+		}
+		else if(oberon_is_string_of_one(a) && oberon_is_string_of_one(b))
+		{
+			result = ctx -> char_type;
+		}
+		else
+		{
+			result = oberon_get_longer_type(ctx, a -> result, b -> result);
+		}
 
 		if(oberon_is_const(a) && oberon_is_const(b)
 			&& (oberon_is_real_type(result) || oberon_is_integer_type(result)))
@@ -2015,6 +2052,7 @@ oberon_is_const(oberon_expr_t * expr)
 		case MODE_STRING:
 		case MODE_SET:
 		case MODE_TYPE:
+		case MODE_SYSBYTE:
 			return true;
 			break;
 		default:
@@ -4153,7 +4191,8 @@ oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	{
 		int64_t x = arg1 -> item.integer;
 		int64_t y = arg2 -> item.integer;
-		expr = oberon_make_integer(ctx, x * powl(2, y));
+		int64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+		expr = oberon_make_integer(ctx, v);
 	}
 	else
 	{
@@ -4163,6 +4202,140 @@ oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_lsh_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+	if(num_args < 2)
+	{
+		oberon_error(ctx, "too few arguments");
+	}
+
+	if(num_args > 2)
+	{
+		oberon_error(ctx, "too mach arguments");
+	}
+
+	oberon_expr_t * arg1;
+	arg1 = list_args;
+	oberon_check_src(ctx, arg1);
+
+	oberon_type_t * t = arg1 -> result;
+	if(!oberon_is_integer_type(t)
+		&& !oberon_is_char_type(t) 
+		&& !oberon_is_system_byte_type(t))
+	{
+		oberon_error(ctx, "expected integer, char, or SYSTEM.BYTE");
+	}
+
+	oberon_expr_t * arg2;
+	arg2 = list_args -> next;
+	oberon_check_src(ctx, arg2);
+	if(arg2 -> result -> class != OBERON_TYPE_INTEGER)
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg1) && oberon_is_const(arg2))
+	{
+		uint64_t x = arg1 -> item.integer;
+		int64_t y = arg2 -> item.integer;
+		uint64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+
+		if(oberon_is_integer_type(t))
+		{
+			expr = oberon_make_integer(ctx, v);
+		}
+		else if(oberon_is_char_type(t))
+		{
+			expr = oberon_make_char(ctx, v);
+		}
+		else
+		{
+			expr = oberon_make_system_byte(ctx, v);
+		}
+	}
+	else
+	{
+		expr = oberon_new_operator(OP_LSH, arg1 -> result, arg1, arg2);
+		expr = oberon_cast_expr(ctx, expr, t);
+	}
+
+	return expr;
+}
+
+static oberon_expr_t *
+oberon_make_rot_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+	if(num_args < 2)
+	{
+		oberon_error(ctx, "too few arguments");
+	}
+
+	if(num_args > 2)
+	{
+		oberon_error(ctx, "too mach arguments");
+	}
+
+	oberon_expr_t * arg1;
+	arg1 = list_args;
+	oberon_check_src(ctx, arg1);
+
+	oberon_type_t * t = arg1 -> result;
+	if(!oberon_is_integer_type(t)
+		&& !oberon_is_char_type(t) 
+		&& !oberon_is_system_byte_type(t))
+	{
+		oberon_error(ctx, "expected integer, char, or SYSTEM.BYTE");
+	}
+
+	oberon_expr_t * arg2;
+	arg2 = list_args -> next;
+	oberon_check_src(ctx, arg2);
+	if(arg2 -> result -> class != OBERON_TYPE_INTEGER)
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	oberon_expr_t * expr;
+	if(oberon_is_const(arg1) && oberon_is_const(arg2))
+	{
+		uint64_t x = arg1 -> item.integer;
+		int64_t y = arg2 -> item.integer;
+
+		uint64_t v = 0;
+		if(y > 0)
+		{
+			v = (x << y) | (x >> (64 - y));
+		}
+		else
+		{
+			y = labs(y);
+			v = (x >> y) | (x << (64 - y));
+		}
+
+		if(oberon_is_integer_type(t))
+		{
+			expr = oberon_make_integer(ctx, v);
+		}
+		else if(oberon_is_char_type(t))
+		{
+			expr = oberon_make_char(ctx, v);
+		}
+		else
+		{
+			expr = oberon_make_system_byte(ctx, v);
+		}
+	}
+	else
+	{
+		expr = oberon_new_operator(OP_ROT, arg1 -> result, arg1, arg2);
+		expr = oberon_cast_expr(ctx, expr, t);
+	}
+
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_cap_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4249,7 +4422,7 @@ oberon_make_ord_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	arg = list_args;
 	oberon_check_src(ctx, arg);
 
-	if(!oberon_is_char_type(arg -> result))
+	if(!oberon_is_char_type(arg -> result) && !oberon_is_string_of_one(arg))
 	{
 		oberon_error(ctx, "expected char");
 	}
@@ -4328,6 +4501,38 @@ oberon_make_odd_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_cc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+	if(num_args < 1)
+	{
+		oberon_error(ctx, "too few arguments");
+	}
+
+	if(num_args > 1)
+	{
+		oberon_error(ctx, "too mach arguments");
+	}
+
+	oberon_expr_t * arg;
+	arg = list_args;
+	oberon_check_src(ctx, arg);
+	oberon_check_const(ctx, arg);
+
+	if(!oberon_is_integer_type(arg -> result))
+	{
+		oberon_error(ctx, "expected integer");
+	}
+
+	/* n >= 0 && n <= 15 */
+
+	oberon_expr_t * cond1;
+	oberon_expr_t * cond2;
+	cond1 = oberon_make_bin_op(ctx, GEQ, arg, oberon_make_integer(ctx, 0));
+	cond2 = oberon_make_bin_op(ctx, LEQ, arg, oberon_make_integer(ctx, 15));
+	return oberon_make_bin_op(ctx, AND, cond1, cond2);
+}
+
 static oberon_expr_t *
 oberon_make_short_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4382,6 +4587,35 @@ oberon_make_long_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
 	return expr;
 }
 
+static oberon_expr_t *
+oberon_make_val_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+	if(num_args < 2)
+	{
+		oberon_error(ctx, "too few arguments");
+	}
+
+	if(num_args > 2)
+	{
+		oberon_error(ctx, "too mach arguments");
+	}
+
+	oberon_expr_t * typ;
+	typ = list_args;
+	if(!oberon_is_type_expr(typ))
+	{
+		oberon_error(ctx, "requires type");
+	}
+
+	oberon_expr_t * arg;
+	arg = list_args -> next;
+	oberon_check_src(ctx, arg);
+
+	oberon_expr_t * expr;
+	expr = oberon_hard_cast_expr(ctx, arg, typ -> result);
+	return expr;
+}
+
 static oberon_expr_t *
 oberon_make_len_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4493,6 +4727,9 @@ register_default_types(oberon_context_t * ctx)
 	ctx -> system_byte_type = oberon_new_type_ptr(OBERON_TYPE_SYSTEM_BYTE);
 	oberon_generator_init_type(ctx, ctx -> system_byte_type);
 
+	ctx -> system_ptr_type = oberon_new_type_ptr(OBERON_TYPE_SYSTEM_PTR);
+	oberon_generator_init_type(ctx, ctx -> system_ptr_type);
+
 	/* LONG / SHORT support */
 	ctx -> byte_type -> shorter = NULL;
 	ctx -> byte_type -> longer = ctx -> shortint_type;
@@ -4621,6 +4858,13 @@ 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);
+
+		/* Functions */
+		oberon_new_intrinsic(ctx, "CC", oberon_make_cc_call, NULL);
+		oberon_new_intrinsic(ctx, "LSH", oberon_make_lsh_call, NULL);
+		oberon_new_intrinsic(ctx, "ROT", oberon_make_rot_call, NULL);
+		oberon_new_intrinsic(ctx, "VAL", oberon_make_val_call, NULL);
 
 	oberon_end_intrinsic_module(ctx, ctx -> system_module);