X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=2b114eee9cfd9aa01cf08e2e1d05691c2aa036dd;hb=2e868cbd80ac5144b08154aaf2cf7bf7be455b61;hp=365f47d6a107ac047dbe13e5f3293a5ea138123d;hpb=7b989fe6cfb3cf6e529b888bb6827714c45c62c6;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 365f47d..2b114ee 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)
 {
@@ -261,7 +271,6 @@ oberon_find_object_in_list(oberon_object_t * list, char * name)
 	oberon_object_t * x = list;
 	while(x -> next && strcmp(x -> next -> name, name) != 0)
 	{
-		printf("inlist: '%s' != '%s'\n", x -> next -> name, name);
 		x = x -> next;
 	}
 	return x -> next;
@@ -290,7 +299,6 @@ oberon_find_object(oberon_scope_t * scope, char * name, bool check_it)
 static oberon_object_t *
 oberon_create_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only)
 {
-	printf("oberon_create_object: '%s'\n", name);
 	oberon_object_t * newvar = GC_MALLOC(sizeof *newvar);
 	memset(newvar, 0, sizeof *newvar);
 	newvar -> name = name;
@@ -318,7 +326,6 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export
 	oberon_object_t * x = scope -> list;
 	while(x -> next && strcmp(x -> next -> name, name) != 0)
 	{
-		printf("inlist: '%s' != '%s'\n", x -> next -> name, name);
 		x = x -> next;
 	}
 
@@ -334,16 +341,6 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export
 	return newvar;
 }
 
-static oberon_object_t *
-oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type, int export)
-{
-	oberon_object_t * id;
-	id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, false, false);
-	id -> type = type;
-	oberon_generator_init_type(scope -> ctx, type);
-	return id;
-}
-
 // =======================================================================
 //   SCANER
 // ======================================================================= 
@@ -369,23 +366,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;
 
@@ -751,7 +745,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;
@@ -906,7 +900,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);
 	}
@@ -1137,7 +1131,8 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 			{
 				oberon_check_compatible_var_param(ctx, param -> type, arg -> result);
 			}
-			casted[i] = oberon_cast_expr(ctx, arg, param -> type);
+			casted[i] = arg;
+			//casted[i] = oberon_cast_expr(ctx, arg, param -> type);
 		}
 		else
 		{
@@ -2027,6 +2022,7 @@ oberon_is_const(oberon_expr_t * expr)
 		case MODE_STRING:
 		case MODE_SET:
 		case MODE_TYPE:
+		case MODE_SYSBYTE:
 			return true;
 			break;
 		default:
@@ -4165,7 +4161,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 = x * powl(2, y);
+		expr = oberon_make_integer(ctx, v);
 	}
 	else
 	{
@@ -4175,6 +4172,67 @@ 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_cap_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
 {
@@ -4476,34 +4534,39 @@ register_default_types(oberon_context_t * ctx)
 	oberon_generator_init_type(ctx, ctx -> string_type);
 
 	ctx -> bool_type = oberon_new_type_boolean();
-	oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
+	oberon_generator_init_type(ctx, ctx -> bool_type);
 
 	ctx -> char_type = oberon_new_type_char(1);
-	oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+	oberon_generator_init_type(ctx, ctx -> char_type);
 
 	ctx -> byte_type = oberon_new_type_integer(1);
-	oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
+	oberon_generator_init_type(ctx, ctx -> byte_type);
 
 	ctx -> shortint_type = oberon_new_type_integer(2);
-	oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
+	oberon_generator_init_type(ctx, ctx -> shortint_type);
 
 	ctx -> int_type = oberon_new_type_integer(4);
-	oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
+	oberon_generator_init_type(ctx, ctx -> int_type);
 
 	ctx -> longint_type = oberon_new_type_integer(8);
-	oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
+	oberon_generator_init_type(ctx, ctx -> longint_type);
 
 	ctx -> real_type = oberon_new_type_real(4);
-	oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
+	oberon_generator_init_type(ctx, ctx -> real_type);
 
 	ctx -> longreal_type = oberon_new_type_real(8);
-	oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
+	oberon_generator_init_type(ctx, ctx -> longreal_type);
 
 	ctx -> set_type = oberon_new_type_set(4);
-	oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
+	oberon_generator_init_type(ctx, ctx -> set_type);
 
+	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;
 
@@ -4534,6 +4597,41 @@ oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f
 	proc -> type -> genproc = p;
 }
 
+static void oberon_new_intrinsic_type(oberon_context_t * ctx, char * name, oberon_type_t * type)
+{
+	oberon_object_t * id;
+	id = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, true, false, false);
+	id -> type = type;
+}
+
+static void
+oberon_begin_intrinsic_module(oberon_context_t * ctx, char * name, oberon_module_t ** m)
+{
+	oberon_scope_t * module_scope;
+	module_scope = oberon_open_scope(ctx);
+
+	oberon_module_t * module;
+	module = GC_MALLOC(sizeof *module);
+	memset(module, 0, sizeof *module);
+	module -> name = name;
+	module -> intrinsic = true;
+	module -> decl = module_scope;
+	module -> next = ctx -> module_list;
+
+	ctx -> mod = module;
+	ctx -> module_list = module;
+
+	*m = module;
+}
+
+static void
+oberon_end_intrinsic_module(oberon_context_t * ctx, oberon_module_t * m)
+{
+	oberon_close_scope(m -> decl);
+	m -> ready = true;
+	ctx -> mod = NULL;
+}
+
 oberon_context_t *
 oberon_create_context(ModuleImportCallback import_module)
 {
@@ -4548,12 +4646,24 @@ oberon_create_context(ModuleImportCallback import_module)
 
 	oberon_generator_init_context(ctx);
 
+	/* Types */
 	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));
 
+	/* Types */
+	oberon_new_intrinsic_type(ctx, "BOOLEAN", ctx -> bool_type);
+	oberon_new_intrinsic_type(ctx, "CHAR", ctx -> char_type);
+	oberon_new_intrinsic_type(ctx, "SHORTINT", ctx -> byte_type);
+	oberon_new_intrinsic_type(ctx, "INTEGER", ctx -> shortint_type);
+	oberon_new_intrinsic_type(ctx, "LONGINT", ctx -> int_type);
+	oberon_new_intrinsic_type(ctx, "HUGEINT", ctx -> longint_type);
+	oberon_new_intrinsic_type(ctx, "REAL", ctx -> real_type);
+	oberon_new_intrinsic_type(ctx, "LONGREAL", ctx -> longreal_type);
+	oberon_new_intrinsic_type(ctx, "SET", ctx -> set_type);
+
 	/* Functions */
 	oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
 	oberon_new_intrinsic(ctx, "ASH", oberon_make_ash_call, NULL);
@@ -4579,6 +4689,18 @@ oberon_create_context(ModuleImportCallback import_module)
 	oberon_new_intrinsic(ctx, "INCL", NULL, oberon_make_incl_call);
 	oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
 
+	/* MODULE SYSTEM */
+	oberon_begin_intrinsic_module(ctx, "SYSTEM", &ctx -> system_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, "LSH", oberon_make_lsh_call, NULL);
+
+	oberon_end_intrinsic_module(ctx, ctx -> system_module);
+
 	return ctx;
 }