X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=oberon.c;h=847e9c77e65a4352cadb204f4948076f8b19ba82;hb=3376c57aa304940b405940c6463df71c7c1c7f01;hp=65803c0d7eaf5924fdc96b42858b0eb3834c016d;hpb=063ba732ee8778c34a3781270b18d52481dbf0cd;p=dsw-obn.git diff --git a/oberon.c b/oberon.c index 65803c0..847e9c7 100644 --- a/oberon.c +++ b/oberon.c @@ -48,6 +48,9 @@ enum { OF, LBRACE, RBRACE, + RECORD, + POINTER, + TO }; // ======================================================================= @@ -148,6 +151,30 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class) return newvar; } +static void +oberon_define_field(oberon_context_t * ctx, oberon_type_t * rec, char * name, oberon_type_t * type) +{ + 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; + + rec -> num_decl += 1; + x -> next = field; +} + static oberon_object_t * oberon_find_object_in_list(oberon_object_t * list, char * name) { @@ -160,7 +187,7 @@ oberon_find_object_in_list(oberon_object_t * list, char * name) } static oberon_object_t * -oberon_find_object(oberon_scope_t * scope, char * name) +oberon_find_object(oberon_scope_t * scope, char * name, int check_it) { oberon_object_t * result = NULL; @@ -171,7 +198,7 @@ oberon_find_object(oberon_scope_t * scope, char * name) s = s -> up; } - if(result == NULL) + if(check_it && result == NULL) { oberon_error(scope -> ctx, "undefined ident %s", name); } @@ -179,6 +206,24 @@ oberon_find_object(oberon_scope_t * scope, char * name) return result; } +static oberon_object_t * +oberon_find_field(oberon_context_t * ctx, oberon_type_t * rec, char * name) +{ + oberon_object_t * x = rec -> decl; + for(int i = 0; i < rec -> num_decl; i++) + { + if(strcmp(x -> name, name) == 0) + { + return x; + } + x = x -> next; + } + + oberon_error(ctx, "field not defined"); + + return NULL; +} + static oberon_object_t * oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type) { @@ -189,6 +234,7 @@ oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type) return id; } +/* static oberon_type_t * oberon_find_type(oberon_scope_t * scope, char * name) { @@ -200,6 +246,7 @@ oberon_find_type(oberon_scope_t * scope, char * name) return x -> type; } +*/ static oberon_object_t * oberon_define_var(oberon_scope_t * scope, int class, char * name, oberon_type_t * type) @@ -207,7 +254,6 @@ oberon_define_var(oberon_scope_t * scope, int class, char * name, oberon_type_t oberon_object_t * var; var = oberon_define_object(scope, name, class); var -> type = type; - oberon_generator_init_var(scope -> ctx, var); return var; } @@ -232,7 +278,6 @@ oberon_define_proc(oberon_scope_t * scope, char * name, oberon_type_t * signatur oberon_object_t * proc; proc = oberon_define_object(scope, name, OBERON_CLASS_PROC); proc -> type = signature; - oberon_generator_init_proc(scope -> ctx, proc); return proc; } @@ -338,6 +383,18 @@ oberon_read_ident(oberon_context_t * ctx) { ctx -> token = OF; } + else if(strcmp(ident, "RECORD") == 0) + { + ctx -> token = RECORD; + } + else if(strcmp(ident, "POINTER") == 0) + { + ctx -> token = POINTER; + } + else if(strcmp(ident, "TO") == 0) + { + ctx -> token = TO; + } } static void @@ -504,7 +561,7 @@ static void oberon_expect_token(oberon_context_t * ctx, int token); static oberon_expr_t * oberon_expr(oberon_context_t * ctx); static void oberon_assert_token(oberon_context_t * ctx, int token); static char * oberon_assert_ident(oberon_context_t * ctx); -static oberon_type_t * oberon_type(oberon_context_t * ctx); +static void oberon_type(oberon_context_t * ctx, oberon_type_t ** type); static oberon_expr_t * oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right) @@ -591,11 +648,12 @@ oberon_expr_list(oberon_context_t * ctx, int * num_expr, oberon_expr_t ** first) static oberon_expr_t * oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref) { - if(expr -> result -> class != pref -> class) + if(pref -> class != expr -> result -> class) { oberon_error(ctx, "incompatible types"); } + if(pref -> class == OBERON_TYPE_INTEGER) { if(expr -> result -> class > pref -> class) @@ -603,6 +661,14 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * oberon_error(ctx, "incompatible size"); } } + else if(pref -> class == OBERON_TYPE_RECORD) + { + if(expr -> result != pref) + { + printf("oberon_autocast_to: rec %p != %p\n", expr -> result, pref); + oberon_error(ctx, "incompatible record types"); + } + } // TODO cast @@ -660,6 +726,79 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig) || ((x) == TRUE) \ || ((x) == FALSE)) +#define ISSELECTOR(x) \ + (((x) == LBRACE) \ + || ((x) == DOT)) + +static oberon_expr_t * +oberon_make_array_selector(oberon_context_t * ctx, oberon_expr_t * desig, int num_indexes, oberon_expr_t * indexes) +{ + assert(desig -> is_item == 1); + + if(desig -> item.mode != MODE_VAR) + { + oberon_error(ctx, "not MODE_VAR"); + } + + int class = desig -> item.var -> class; + switch(class) + { + case OBERON_CLASS_VAR: + case OBERON_CLASS_VAR_PARAM: + case OBERON_CLASS_PARAM: + break; + default: + oberon_error(ctx, "not variable"); + break; + } + + oberon_type_t * type = desig -> item.var -> type; + if(type -> class != OBERON_TYPE_ARRAY) + { + oberon_error(ctx, "not array"); + } + + int dim = desig -> item.var -> type -> dim; + if(num_indexes != dim) + { + oberon_error(ctx, "dimesions not matched"); + } + + oberon_type_t * base = desig -> item.var -> type -> base; + + oberon_expr_t * selector; + selector = oberon_new_item(MODE_INDEX, base); + selector -> item.parent = (oberon_item_t *) desig; + selector -> item.num_args = num_indexes; + selector -> item.args = indexes; + + return selector; +} + +static oberon_expr_t * +oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char * name) +{ + assert(expr -> is_item == 1); + + int class = expr -> result -> class; + if(class != OBERON_TYPE_RECORD) + { + oberon_error(ctx, "not record"); + } + + oberon_type_t * rec = expr -> result; + + oberon_object_t * field; + field = oberon_find_field(ctx, rec, name); + + oberon_expr_t * selector; + selector = oberon_new_item(MODE_FIELD, field -> type); + selector -> item.var = field; + selector -> item.parent = (oberon_item_t *) expr; + + return selector; +} + static oberon_expr_t * oberon_designator(oberon_context_t * ctx) { @@ -668,7 +807,7 @@ oberon_designator(oberon_context_t * ctx) oberon_expr_t * expr; name = oberon_assert_ident(ctx); - var = oberon_find_object(ctx -> decl, name); + var = oberon_find_object(ctx -> decl, name, 1); switch(var -> class) { @@ -688,8 +827,30 @@ oberon_designator(oberon_context_t * ctx) oberon_error(ctx, "invalid designator"); break; } - expr -> item.var = var; + + while(ISSELECTOR(ctx -> token)) + { + switch(ctx -> token) + { + case DOT: + oberon_assert_token(ctx, DOT); + name = oberon_assert_ident(ctx); + expr = oberon_make_record_selector(ctx, expr, name); + break; + case LBRACE: + oberon_assert_token(ctx, LBRACE); + int num_indexes = 0; + oberon_expr_t * indexes = NULL; + oberon_expr_list(ctx, &num_indexes, &indexes); + oberon_assert_token(ctx, RBRACE); + expr = oberon_make_array_selector(ctx, expr, num_indexes, indexes); + break; + default: + oberon_error(ctx, "oberon_designator: wat"); + break; + } + } return expr; } @@ -697,8 +858,14 @@ static oberon_expr_t * oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr) { assert(expr -> is_item == 1); + if(ctx -> token == LPAREN) { + if(expr -> result -> class != OBERON_TYPE_PROCEDURE) + { + oberon_error(ctx, "not a procedure"); + } + oberon_assert_token(ctx, LPAREN); int num_args = 0; @@ -1034,58 +1201,16 @@ oberon_assert_ident(oberon_context_t * ctx) return ident; } -static oberon_type_t * -oberon_make_array_type(oberon_context_t * ctx, int dim, oberon_item_t * size, oberon_type_t * base) -{ - assert(dim == 1); - oberon_type_t * newtype; - - if(size -> mode != MODE_INTEGER) - { - oberon_error(ctx, "requires integer constant"); - } - - newtype = oberon_new_type_ptr(OBERON_TYPE_ARRAY); - newtype -> dim = dim; - newtype -> size = size -> integer; - newtype -> base = base; - oberon_generator_init_type(ctx, newtype); - - return newtype; -} - -static oberon_type_t * -oberon_type(oberon_context_t * ctx) -{ - oberon_type_t * type; - - if(ctx -> token == IDENT) - { - char * name = oberon_assert_ident(ctx); - type = oberon_find_type(ctx -> decl, name); - } - else if(ctx -> token == ARRAY) - { - oberon_assert_token(ctx, ARRAY); - oberon_item_t * size = oberon_const_expr(ctx); - oberon_assert_token(ctx, OF); - oberon_type_t * base = oberon_type(ctx); - type = oberon_make_array_type(ctx, 1, size, base); - } - else - { - oberon_error(ctx, "invalid type declaration"); - } - - return type; -} - static void oberon_var_decl(oberon_context_t * ctx) { - char * name = oberon_assert_ident(ctx); + char * name; + oberon_type_t * type; + type = oberon_new_type_ptr(OBERON_TYPE_VOID); + + name = oberon_assert_ident(ctx); oberon_assert_token(ctx, COLON); - oberon_type_t * type = oberon_type(ctx); + oberon_type(ctx, &type); oberon_define_var(ctx -> decl, OBERON_CLASS_VAR, name, type); } @@ -1125,7 +1250,8 @@ oberon_fp_section(oberon_context_t * ctx, int * num_decl) oberon_assert_token(ctx, COLON); oberon_type_t * type; - type = oberon_type(ctx); + 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); @@ -1137,24 +1263,18 @@ oberon_fp_section(oberon_context_t * ctx, int * num_decl) #define ISFPSECTION \ ((ctx -> token == VAR) || (ctx -> token == IDENT)) -static oberon_type_t * -oberon_formal_pars(oberon_context_t * ctx) +static void +oberon_formal_pars(oberon_context_t * ctx, oberon_type_t * signature) { - oberon_type_t * tp; - tp = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE); - tp -> num_decl = 0; - tp -> base = ctx -> void_type; - tp -> decl = NULL; - oberon_assert_token(ctx, LPAREN); if(ISFPSECTION) { - tp -> decl = oberon_fp_section(ctx, &tp -> num_decl); + signature -> decl = oberon_fp_section(ctx, &signature -> num_decl); while(ctx -> token == SEMICOLON) { oberon_assert_token(ctx, SEMICOLON); - oberon_fp_section(ctx, &tp -> num_decl); + oberon_fp_section(ctx, &signature -> num_decl); } } @@ -1163,11 +1283,24 @@ oberon_formal_pars(oberon_context_t * ctx) if(ctx -> token == COLON) { oberon_assert_token(ctx, COLON); - tp -> base = oberon_type(ctx); + oberon_type(ctx, &signature -> base); } +} + +static void +oberon_opt_formal_pars(oberon_context_t * ctx, oberon_type_t ** type) +{ + oberon_type_t * signature; + signature = *type; + signature -> class = OBERON_TYPE_PROCEDURE; + signature -> num_decl = 0; + signature -> base = ctx -> void_type; + signature -> decl = NULL; - oberon_generator_init_type(ctx, tp); - return tp; + if(ctx -> token == LPAREN) + { + oberon_formal_pars(ctx, signature); + } } static void @@ -1207,18 +1340,8 @@ oberon_proc_decl(oberon_context_t * ctx) oberon_open_scope(ctx); oberon_type_t * signature; - if(ctx -> token == LPAREN) - { - signature = oberon_formal_pars(ctx); - } - else - { - signature = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE); - signature -> num_decl = 0; - signature -> base = ctx -> void_type; - signature -> decl = NULL; - oberon_generator_init_type(ctx, signature); - } + signature = oberon_new_type_ptr(OBERON_TYPE_VOID); + oberon_opt_formal_pars(ctx, &signature); oberon_object_t * proc; proc = oberon_define_proc(this_proc_def_scope, name, signature); @@ -1275,6 +1398,140 @@ oberon_const_decl(oberon_context_t * ctx) constant -> value = value; } +static void +oberon_make_array_type(oberon_context_t * ctx, int dim, oberon_item_t * size, oberon_type_t * base, oberon_type_t ** type) +{ + assert(dim == 1); + if(size -> mode != MODE_INTEGER) + { + oberon_error(ctx, "requires integer constant"); + } + + oberon_type_t * arr; + arr = *type; + arr -> class = OBERON_TYPE_ARRAY; + arr -> dim = dim; + arr -> size = size -> integer; + arr -> base = base; +} + +static void +oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec) +{ + if(ctx -> token == IDENT) + { + char * name; + oberon_type_t * type; + type = oberon_new_type_ptr(OBERON_TYPE_VOID); + + name = oberon_assert_ident(ctx); + oberon_assert_token(ctx, COLON); + oberon_type(ctx, &type); + oberon_define_field(ctx, rec, name, type); + } +} + +static void +oberon_qualident_type(oberon_context_t * ctx, oberon_type_t ** type) +{ + char * name; + oberon_object_t * to; + + name = oberon_assert_ident(ctx); + to = oberon_find_object(ctx -> decl, name, 0); + + if(to != NULL) + { + if(to -> class != OBERON_CLASS_TYPE) + { + oberon_error(ctx, "not a type"); + } + } + else + { + to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE); + to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID); + } + + *type = to -> type; +} + +static void oberon_opt_formal_pars(oberon_context_t * ctx, oberon_type_t ** type); + +/* + * Правило граматики "type". Указатель type должен указывать на существующий объект! + */ + +static void +oberon_type(oberon_context_t * ctx, oberon_type_t ** type) +{ + if(ctx -> token == IDENT) + { + oberon_qualident_type(ctx, type); + } + else if(ctx -> token == ARRAY) + { + oberon_assert_token(ctx, ARRAY); + + oberon_item_t * size; + size = oberon_const_expr(ctx); + + oberon_assert_token(ctx, OF); + + oberon_type_t * base; + base = oberon_new_type_ptr(OBERON_TYPE_VOID); + oberon_type(ctx, &base); + + oberon_make_array_type(ctx, 1, size, base, type); + } + else if(ctx -> token == RECORD) + { + 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_assert_token(ctx, RECORD); + oberon_field_list(ctx, rec); + while(ctx -> token == SEMICOLON) + { + oberon_assert_token(ctx, SEMICOLON); + oberon_field_list(ctx, rec); + } + oberon_assert_token(ctx, END); + + rec -> decl = rec -> decl -> next; + *type = rec; + } + else if(ctx -> token == POINTER) + { + oberon_assert_token(ctx, POINTER); + oberon_assert_token(ctx, TO); + + oberon_type_t * base; + base = oberon_new_type_ptr(OBERON_TYPE_VOID); + oberon_type(ctx, &base); + + oberon_type_t * ptr; + ptr = *type; + ptr -> class = OBERON_TYPE_POINTER; + ptr -> base = base; + } + else if(ctx -> token == PROCEDURE) + { + oberon_assert_token(ctx, PROCEDURE); + oberon_opt_formal_pars(ctx, type); + } + else + { + oberon_error(ctx, "invalid type declaration"); + } +} + static void oberon_type_decl(oberon_context_t * ctx) { @@ -1283,11 +1540,313 @@ oberon_type_decl(oberon_context_t * ctx) oberon_type_t * type; name = oberon_assert_ident(ctx); + + newtype = oberon_find_object(ctx -> decl, name, 0); + if(newtype == NULL) + { + newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE); + newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID); + assert(newtype -> type); + } + else + { + if(newtype -> class != OBERON_CLASS_TYPE) + { + oberon_error(ctx, "mult definition"); + } + + if(newtype -> linked) + { + oberon_error(ctx, "mult definition - already linked"); + } + } + oberon_assert_token(ctx, EQUAL); - type = oberon_type(ctx); - newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE); + type = newtype -> type; + oberon_type(ctx, &type); + + if(type -> class == OBERON_TYPE_VOID) + { + oberon_error(ctx, "recursive alias declaration"); + } + newtype -> type = type; + newtype -> linked = 1; +} + +static void oberon_prevent_recursive_object(oberon_context_t * ctx, oberon_object_t * x); +static void oberon_prevent_recursive_type(oberon_context_t * ctx, oberon_type_t * type); + +static void +oberon_prevent_recursive_pointer(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class != OBERON_TYPE_POINTER + && type -> class != OBERON_TYPE_ARRAY) + { + return; + } + + if(type -> recursive) + { + oberon_error(ctx, "recursive pointer declaration"); + } + + if(type -> base -> class == OBERON_TYPE_POINTER) + { + oberon_error(ctx, "attempt to make pointer to pointer"); + } + + type -> recursive = 1; + + oberon_prevent_recursive_pointer(ctx, type -> base); + + type -> recursive = 0; +} + +static void +oberon_prevent_recursive_record(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class != OBERON_TYPE_RECORD) + { + return; + } + + if(type -> recursive) + { + oberon_error(ctx, "recursive record declaration"); + } + + type -> recursive = 1; + + int num_fields = type -> num_decl; + oberon_object_t * field = type -> decl; + for(int i = 0; i < num_fields; i++) + { + oberon_prevent_recursive_object(ctx, field); + field = field -> next; + } + + type -> recursive = 0; +} +static void +oberon_prevent_recursive_procedure(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class != OBERON_TYPE_PROCEDURE) + { + return; + } + + if(type -> recursive) + { + oberon_error(ctx, "recursive procedure declaration"); + } + + type -> recursive = 1; + + int num_fields = type -> num_decl; + oberon_object_t * field = type -> decl; + for(int i = 0; i < num_fields; i++) + { + oberon_prevent_recursive_object(ctx, field); + field = field -> next; + } + + type -> recursive = 0; +} + +static void +oberon_prevent_recursive_array(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class != OBERON_TYPE_ARRAY) + { + return; + } + + if(type -> recursive) + { + oberon_error(ctx, "recursive array declaration"); + } + + type -> recursive = 1; + + oberon_prevent_recursive_type(ctx, type -> base); + + type -> recursive = 0; +} + +static void +oberon_prevent_recursive_type(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class == OBERON_TYPE_POINTER) + { + oberon_prevent_recursive_pointer(ctx, type); + } + else if(type -> class == OBERON_TYPE_RECORD) + { + oberon_prevent_recursive_record(ctx, type); + } + else if(type -> class == OBERON_TYPE_ARRAY) + { + oberon_prevent_recursive_array(ctx, type); + } + else if(type -> class == OBERON_TYPE_PROCEDURE) + { + oberon_prevent_recursive_procedure(ctx, type); + } +} + +static void +oberon_prevent_recursive_object(oberon_context_t * ctx, oberon_object_t * x) +{ + switch(x -> class) + { + case OBERON_CLASS_VAR: + case OBERON_CLASS_TYPE: + case OBERON_CLASS_PARAM: + case OBERON_CLASS_VAR_PARAM: + case OBERON_CLASS_FIELD: + oberon_prevent_recursive_type(ctx, x -> type); + break; + case OBERON_CLASS_CONST: + case OBERON_CLASS_PROC: + break; + default: + oberon_error(ctx, "oberon_prevent_recursive_object: wat"); + break; + } +} + +static void +oberon_prevent_recursive_decl(oberon_context_t * ctx) +{ + oberon_object_t * x = ctx -> decl -> list -> next; + + while(x) + { + oberon_prevent_recursive_object(ctx, x); + x = x -> next; + } +} + +static void oberon_initialize_object(oberon_context_t * ctx, oberon_object_t * x); +static void oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type); + +static void +oberon_initialize_record_fields(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class != OBERON_TYPE_RECORD) + { + return; + } + + int num_fields = type -> num_decl; + oberon_object_t * field = type -> decl; + for(int i = 0; i < num_fields; i++) + { + if(field -> type -> class == OBERON_TYPE_POINTER) + { + oberon_initialize_type(ctx, field -> type); + } + + oberon_initialize_object(ctx, field); + field = field -> next; + } + + oberon_generator_init_record(ctx, type); +} + +static void +oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type) +{ + if(type -> class == OBERON_TYPE_VOID) + { + oberon_error(ctx, "undeclarated type"); + } + + if(type -> initialized) + { + return; + } + + type -> initialized = 1; + + if(type -> class == OBERON_TYPE_POINTER) + { + if(type -> base -> class == OBERON_TYPE_RECORD) + { + oberon_generator_init_type(ctx, type -> base); + oberon_generator_init_type(ctx, type); + } + else + { + oberon_initialize_type(ctx, type -> base); + oberon_generator_init_type(ctx, type); + } + } + else if(type -> class == OBERON_TYPE_ARRAY) + { + oberon_generator_init_type(ctx, type); + oberon_initialize_type(ctx, type -> base); + } + else if(type -> class == OBERON_TYPE_RECORD) + { + oberon_generator_init_type(ctx, type); + oberon_initialize_record_fields(ctx, type); + } + else if(type -> class == OBERON_TYPE_PROCEDURE) + { + int num_fields = type -> num_decl; + oberon_object_t * field = type -> decl; + for(int i = 0; i < num_fields; i++) + { + oberon_initialize_object(ctx, field); + field = field -> next; + } + + oberon_generator_init_type(ctx, type); + } + else + { + oberon_generator_init_type(ctx, type); + } +} + +static void +oberon_initialize_object(oberon_context_t * ctx, oberon_object_t * x) +{ + printf("oberon_initialize_object: name %s class %i\n", x -> name, x -> class); + switch(x -> class) + { + case OBERON_CLASS_TYPE: + oberon_initialize_type(ctx, x -> type); + break; + case OBERON_CLASS_VAR: + case OBERON_CLASS_PARAM: + case OBERON_CLASS_VAR_PARAM: + case OBERON_CLASS_FIELD: + oberon_initialize_type(ctx, x -> type); + oberon_generator_init_var(ctx, x); + break; + case OBERON_CLASS_CONST: + case OBERON_CLASS_PROC: + break; + default: + oberon_error(ctx, "oberon_prevent_recursive_object: wat"); + break; + } +} + +static void +oberon_initialize_decl(oberon_context_t * ctx) +{ + oberon_object_t * x = ctx -> decl -> list; + + while(x -> next) + { + oberon_initialize_object(ctx, x -> next); + x = x -> next; + } } static void @@ -1323,6 +1882,9 @@ oberon_decl_seq(oberon_context_t * ctx) } } + oberon_prevent_recursive_decl(ctx); + oberon_initialize_decl(ctx); + while(ctx -> token == PROCEDURE) { oberon_proc_decl(ctx);