diff --git a/src/oberon.c b/src/oberon.c
index e4b9157d151cafa6075c86bbc1a07ebf2e845bef..bf5dad872cbdc3c420dec670d8c5de40c463f5d3 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
BEGIN,
ASSIGN,
INTEGER,
BEGIN,
ASSIGN,
INTEGER,
- TRUE,
- FALSE,
LPAREN,
RPAREN,
EQUAL,
LPAREN,
RPAREN,
EQUAL,
{
ctx -> token = BEGIN;
}
{
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;
else if(strcmp(ident, "OR") == 0)
{
ctx -> token = OR;
}
}
}
}
+#define ISHEXDIGIT(x) \
+ (((x) >= '0' && (x) <= '9') || ((x) >= 'A' && (x) <= 'F'))
+
static void
oberon_read_number(oberon_context_t * ctx)
{
static void
oberon_read_number(oberon_context_t * ctx)
{
end_i = ctx -> code_index;
end_i = ctx -> code_index;
- if(isxdigit(ctx -> c))
+ if(ISHEXDIGIT(ctx -> c))
{
mode = 1;
{
mode = 1;
- while(isxdigit(ctx -> c))
+ while(ISHEXDIGIT(ctx -> c))
{
oberon_get_char(ctx);
}
{
oberon_get_char(ctx);
}
ctx -> token = STRING;
ctx -> string = string;
ctx -> token = STRING;
ctx -> string = string;
-
- printf("oberon_read_string: string ((%s))\n", string);
}
static void oberon_read_token(oberon_context_t * ctx);
}
static void oberon_read_token(oberon_context_t * ctx);
@@ -993,11 +984,8 @@ oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_typ
oberon_type_t * from = expr -> result;
oberon_type_t * to = rec;
oberon_type_t * from = expr -> result;
oberon_type_t * to = rec;
- printf("oberno_make_record_cast: from class %i to class %i\n", from -> class, to -> class);
-
if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
{
if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
{
- printf("oberno_make_record_cast: pointers\n");
from = from -> base;
to = to -> base;
}
from = from -> base;
to = to -> base;
}
@@ -1106,6 +1094,7 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
// Допускается:
// Если классы типов равны
// Если INTEGER переводится в REAL
// Допускается:
// Если классы типов равны
// Если INTEGER переводится в REAL
+ // Есди STRING переводится в CHAR
// Есди STRING переводится в ARRAY OF CHAR
oberon_check_src(ctx, expr);
// Есди STRING переводится в ARRAY OF CHAR
oberon_check_src(ctx, expr);
@@ -1113,12 +1102,23 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
bool error = false;
if(pref -> class != expr -> result -> class)
{
bool error = false;
if(pref -> class != expr -> result -> class)
{
- printf("expr class %i\n", expr -> result -> class);
- printf("pref class %i\n", pref -> class);
-
if(expr -> result -> class == OBERON_TYPE_STRING)
{
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)
{
{
if(pref -> base -> class != OBERON_TYPE_CHAR)
{
@@ -1148,7 +1148,16 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
oberon_error(ctx, "oberon_autocast_to: incompatible types");
}
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)
{
{
if(expr -> result -> size > pref -> size)
{
{
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
{
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
+ if(arg -> result != param -> type)
+ {
+ oberon_error(ctx, "incompatible type");
+ }
if(arg -> read_only)
{
oberon_error(ctx, "assign to read-only var");
}
if(arg -> read_only)
{
oberon_error(ctx, "assign to read-only var");
}
+ casted[i] = arg;
+ }
+ else
+ {
+ casted[i] = oberon_autocast_to(ctx, arg, param -> type);
}
}
- casted[i] = oberon_autocast_to(ctx, arg, param -> type);
arg = arg -> next;
param = param -> next;
}
arg = arg -> next;
param = param -> next;
}
@@ -1329,14 +1346,11 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
|| ((x) == STRING) \
|| ((x) == NIL) \
|| ((x) == LPAREN) \
|| ((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)
{
static oberon_expr_t *
oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
{
- printf("oberno_make_dereferencing\n");
if(expr -> result -> class != OBERON_TYPE_POINTER)
{
oberon_error(ctx, "not a pointer");
if(expr -> result -> class != OBERON_TYPE_POINTER)
{
oberon_error(ctx, "not a pointer");
return set;
}
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)
{
static oberon_expr_t *
oberon_factor(oberon_context_t * ctx)
{
expr -> item.real = ctx -> real;
oberon_assert_token(ctx, REAL);
break;
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;
case LBRACE:
expr = oberon_set(ctx);
break;
return expr;
}
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");
if(expr -> is_item == 0)
{
oberon_error(ctx, "const expression are required");
oberon_error(ctx, "const expression are required");
break;
}
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;
}
return (oberon_item_t *) expr;
}
signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
oberon_opt_formal_pars(ctx, &signature);
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);
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)
{
{
if(proc -> class != OBERON_CLASS_PROC)
{
oberon_compare_signatures(ctx, proc -> type, signature);
}
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;
if(forward == 0)
{
proc -> linked = 1;
@@ -2851,6 +2874,11 @@ oberon_prevent_recursive_record(oberon_context_t * ctx, oberon_type_t * type)
type -> recursive = 1;
type -> recursive = 1;
+ if(type -> base)
+ {
+ oberon_prevent_recursive_record(ctx, type -> base);
+ }
+
int num_fields = type -> num_decl;
oberon_object_t * field = type -> decl;
for(int i = 0; i < num_fields; i++)
int num_fields = type -> num_decl;
oberon_object_t * field = type -> decl;
for(int i = 0; i < num_fields; i++)
oberon_assert_token(ctx, END);
name2 = oberon_assert_ident(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)
{
if(strcmp(name1, name2) != 0)
{
ctx -> bool_type = oberon_new_type_boolean();
oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
ctx -> bool_type = oberon_new_type_boolean();
oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
+ ctx -> char_type = oberon_new_type_char(1);
+ oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+
ctx -> byte_type = oberon_new_type_integer(1);
ctx -> byte_type = oberon_new_type_integer(1);
- oberon_define_type(ctx -> world_scope, "BYTE", ctx -> byte_type, 1);
+ oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
ctx -> shortint_type = oberon_new_type_integer(2);
ctx -> shortint_type = oberon_new_type_integer(2);
- oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> shortint_type, 1);
+ oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
ctx -> int_type = oberon_new_type_integer(4);
ctx -> int_type = oberon_new_type_integer(4);
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
+ oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
ctx -> longint_type = oberon_new_type_integer(8);
ctx -> longint_type = oberon_new_type_integer(8);
- oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> longint_type, 1);
+ oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
ctx -> real_type = oberon_new_type_real(4);
oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
ctx -> real_type = oberon_new_type_real(4);
oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
ctx -> longreal_type = oberon_new_type_real(8);
oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
ctx -> longreal_type = oberon_new_type_real(8);
oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
- ctx -> char_type = oberon_new_type_char(1);
- oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
-
ctx -> set_type = oberon_new_type_set(4);
oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
}
ctx -> set_type = oberon_new_type_set(4);
oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
}
@@ -3993,6 +4021,15 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_assign(ctx, src, dst);
}
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)
{
oberon_context_t *
oberon_create_context(ModuleImportCallback import_module)
{
register_default_types(ctx);
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);
/* Functions */
oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);