diff --git a/oberon.c b/oberon.c
index 817da1ae02b4f417f9c005f902bd2d26b0f5f3a1..b56a458a6c1e979a743c9d4139b5df3044f1cdc3 100644 (file)
--- a/oberon.c
+++ b/oberon.c
@@ -155,40 +155,13 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, int export,
newvar -> read_only = read_only;
newvar -> local = scope -> local;
newvar -> parent = scope -> parent;
+ newvar -> module = scope -> ctx -> mod;
x -> next = newvar;
return newvar;
}
-static void
-oberon_define_field(oberon_context_t * ctx, oberon_type_t * rec, char * name, oberon_type_t * type)
-{
- // TODO check base fields
-
- oberon_object_t * x = rec -> decl;
- while(x -> next && strcmp(x -> next -> name, name) != 0)
- {
- x = x -> next;
- }
-
- if(x -> next)
- {
- oberon_error(ctx, "multiple definition");
- }
-
- oberon_object_t * field = malloc(sizeof *field);
- memset(field, 0, sizeof *field);
- field -> name = name;
- field -> class = OBERON_CLASS_FIELD;
- field -> type = type;
- field -> local = 1;
- field -> parent = NULL;
-
- rec -> num_decl += 1;
- x -> next = field;
-}
-
static oberon_object_t *
oberon_find_object_in_list(oberon_object_t * list, char * name)
{
}
static oberon_object_t *
-oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type, int export, int read_only)
+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, read_only);
+ id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, 0);
id -> type = type;
oberon_generator_init_type(scope -> ctx, type);
return id;
}
-static oberon_object_t *
-oberon_define_var(oberon_scope_t * scope, int class, char * name, oberon_type_t * type, int export, int read_only)
-{
- oberon_object_t * var;
- var = oberon_define_object(scope, name, class, export, read_only);
- var -> type = type;
- return var;
-}
-
// =======================================================================
// SCANER
// =======================================================================
@@ -561,6 +525,7 @@ oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon
operator -> is_item = 0;
operator -> result = result;
+ operator -> read_only = 1;
operator -> op = op;
operator -> left = left;
operator -> right = right;
@@ -569,7 +534,7 @@ oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon
}
static oberon_expr_t *
-oberon_new_item(int mode, oberon_type_t * result)
+oberon_new_item(int mode, oberon_type_t * result, int read_only)
{
oberon_item_t * item;
item = malloc(sizeof *item);
item -> is_item = 1;
item -> result = result;
+ item -> read_only = read_only;
item -> mode = mode;
return (oberon_expr_t *)item;
@@ -783,7 +749,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
oberon_error(ctx, "attempt to call procedure in expression");
}
- call = oberon_new_item(MODE_CALL, proc -> type -> base);
+ call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
call -> item.var = proc;
call -> item.num_args = num_args;
call -> item.args = list_args;
@@ -834,7 +800,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
}
oberon_expr_t * call;
- call = oberon_new_item(MODE_CALL, proc -> type -> base);
+ call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
call -> item.var = proc;
call -> item.num_args = num_args;
call -> item.args = list_args;
assert(expr -> is_item);
oberon_expr_t * selector;
- selector = oberon_new_item(MODE_DEREF, expr -> result -> base);
+ selector = oberon_new_item(MODE_DEREF, expr -> result -> base, expr -> read_only);
selector -> item.parent = (oberon_item_t *) expr;
return selector;
@@ -908,7 +874,7 @@ oberon_make_array_selector(oberon_context_t * ctx, oberon_expr_t * desig, oberon
}
oberon_expr_t * selector;
- selector = oberon_new_item(MODE_INDEX, base);
+ selector = oberon_new_item(MODE_INDEX, base, desig -> read_only);
selector -> item.parent = (oberon_item_t *) desig;
selector -> item.num_args = 1;
selector -> item.args = index;
@@ -936,8 +902,25 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
oberon_object_t * field;
field = oberon_find_field(ctx, rec, name);
+ if(field -> export == 0)
+ {
+ if(field -> module != ctx -> mod)
+ {
+ oberon_error(ctx, "field not exported");
+ }
+ }
+
+ int read_only = 0;
+ if(field -> read_only)
+ {
+ if(field -> module != ctx -> mod)
+ {
+ read_only = 1;
+ }
+ }
+
oberon_expr_t * selector;
- selector = oberon_new_item(MODE_FIELD, field -> type);
+ selector = oberon_new_item(MODE_FIELD, field -> type, read_only);
selector -> item.var = field;
selector -> item.parent = (oberon_item_t *) expr;
var = oberon_qualident(ctx, NULL, 1);
+ int read_only = 0;
+ if(var -> read_only)
+ {
+ if(var -> module != ctx -> mod)
+ {
+ read_only = 1;
+ }
+ }
+
switch(var -> class)
{
case OBERON_CLASS_CONST:
case OBERON_CLASS_VAR:
case OBERON_CLASS_VAR_PARAM:
case OBERON_CLASS_PARAM:
+ expr = oberon_new_item(MODE_VAR, var -> type, read_only);
+ break;
case OBERON_CLASS_PROC:
- expr = oberon_new_item(MODE_VAR, var -> type);
+ expr = oberon_new_item(MODE_VAR, var -> type, 1);
break;
default:
oberon_error(ctx, "invalid designator");
expr = oberon_opt_func_parens(ctx, expr);
break;
case INTEGER:
- expr = oberon_new_item(MODE_INTEGER, ctx -> int_type);
+ expr = oberon_new_item(MODE_INTEGER, ctx -> int_type, 1);
expr -> item.integer = ctx -> integer;
oberon_assert_token(ctx, INTEGER);
break;
case TRUE:
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type);
+ expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
expr -> item.boolean = 1;
oberon_assert_token(ctx, TRUE);
break;
case FALSE:
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type);
+ expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
expr -> item.boolean = 0;
oberon_assert_token(ctx, FALSE);
break;
break;
case NIL:
oberon_assert_token(ctx, NIL);
- expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type);
+ expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, 1);
break;
default:
oberon_error(ctx, "invalid expression");
return x;
}
+static void
+oberon_ident_list(oberon_context_t * ctx, int class, int * num, oberon_object_t ** list)
+{
+ *num = 1;
+ *list = oberon_ident_def(ctx, class);
+ while(ctx -> token == COMMA)
+ {
+ oberon_assert_token(ctx, COMMA);
+ oberon_ident_def(ctx, class);
+ *num += 1;
+ }
+}
+
static void
oberon_var_decl(oberon_context_t * ctx)
{
- oberon_object_t * var;
+ int num;
+ oberon_object_t * list;
oberon_type_t * type;
type = oberon_new_type_ptr(OBERON_TYPE_VOID);
- var = oberon_ident_def(ctx, OBERON_CLASS_VAR);
+ oberon_ident_list(ctx, OBERON_CLASS_VAR, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_type(ctx, &type);
- var -> type = type;
-}
-static oberon_object_t *
-oberon_make_param(oberon_context_t * ctx, int token, char * name, oberon_type_t * type)
-{
- oberon_object_t * param;
-
- if(token == VAR)
- {
- param = oberon_define_var(ctx -> decl, OBERON_CLASS_VAR_PARAM, name, type, 0, 0);
- }
- else if(token == IDENT)
+ oberon_object_t * var = list;
+ for(int i = 0; i < num; i++)
{
- param = oberon_define_var(ctx -> decl, OBERON_CLASS_PARAM, name, type, 0, 0);
+ var -> type = type;
+ var = var -> next;
}
- else
- {
- oberon_error(ctx, "oberon_make_param: wat");
- }
-
- return param;
}
static oberon_object_t *
oberon_fp_section(oberon_context_t * ctx, int * num_decl)
{
- int modifer_token = ctx -> token;
+ int class = OBERON_CLASS_PARAM;
if(ctx -> token == VAR)
{
oberon_read_token(ctx);
+ class = OBERON_CLASS_VAR_PARAM;
}
- char * name;
- name = oberon_assert_ident(ctx);
+ int num;
+ oberon_object_t * list;
+ oberon_ident_list(ctx, class, &num, &list);
oberon_assert_token(ctx, COLON);
type = oberon_new_type_ptr(OBERON_TYPE_VOID);
oberon_type(ctx, &type);
- oberon_object_t * first;
- first = oberon_make_param(ctx, modifer_token, name, type);
+ oberon_object_t * param = list;
+ for(int i = 0; i < num; i++)
+ {
+ param -> type = type;
+ param = param -> next;
+ }
- *num_decl += 1;
- return first;
+ *num_decl += num;
+ return list;
}
#define ISFPSECTION \
{
if(ctx -> token == IDENT)
{
- char * name;
+ int num;
+ oberon_object_t * list;
oberon_type_t * type;
type = oberon_new_type_ptr(OBERON_TYPE_VOID);
- name = oberon_assert_ident(ctx);
+ oberon_ident_list(ctx, OBERON_CLASS_FIELD, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_type(ctx, &type);
- oberon_define_field(ctx, rec, name, type);
+
+ oberon_object_t * field = list;
+ for(int i = 0; i < num; i++)
+ {
+ field -> type = type;
+ field = field -> next;
+ }
+
+ rec -> num_decl += num;
}
}
oberon_type_t * rec;
rec = *type;
rec -> class = OBERON_TYPE_RECORD;
- oberon_object_t * list = malloc(sizeof *list);
- memset(list, 0, sizeof *list);
- rec -> num_decl = 0;
- rec -> base = NULL;
- rec -> decl = list;
+
+ oberon_scope_t * record_scope;
+ record_scope = oberon_open_scope(ctx);
+ // TODO parent object
+ //record_scope -> parent = NULL;
+ record_scope -> local = 1;
oberon_assert_token(ctx, RECORD);
oberon_field_list(ctx, rec);
}
oberon_assert_token(ctx, END);
- rec -> decl = rec -> decl -> next;
+ rec -> decl = record_scope -> list -> next;
+ oberon_close_scope(record_scope);
+
*type = rec;
}
else if(ctx -> token == POINTER)
static void
oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{
+ if(dst -> read_only)
+ {
+ oberon_error(ctx, "read-only destination");
+ }
+
oberon_autocast_to(ctx, src, dst -> result);
oberon_generate_assign(ctx, src, dst);
}
oberon_assert_token(ctx, SEMICOLON);
ctx -> mod -> name = name1;
- oberon_object_t * this_module;
- this_module = oberon_define_object(ctx -> decl, name1, OBERON_CLASS_MODULE, 0, 0);
- this_module -> module = ctx -> mod;
-
if(ctx -> token == IMPORT)
{
oberon_import_list(ctx);
}
- ctx -> decl -> parent = this_module;
-
oberon_decl_seq(ctx);
oberon_generate_begin_module(ctx);
oberon_generator_init_type(ctx, ctx -> void_ptr_type);
ctx -> int_type = oberon_new_type_integer(sizeof(int));
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1, 0);
+ oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
ctx -> bool_type = oberon_new_type_boolean(sizeof(int));
- oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1, 0);
+ oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
}
static void