DEADSOFTWARE

Процедуры можно вызывать со скобками :)
[dsw-obn.git] / oberon.c
index ec4cab05b3804d3c204407e28dcbb2eff1ccea22..98928fbe7c4e1629b2519b0f505e54fb921ef63b 100644 (file)
--- a/oberon.c
+++ b/oberon.c
@@ -37,7 +37,8 @@ enum {
        DIV,
        MOD,
        AND,
-       NOT
+       NOT,
+       PROCEDURE
 };
 
 // =======================================================================
@@ -59,95 +60,141 @@ oberon_error(oberon_context_t * ctx, const char * fmt, ...)
        exit(1);
 }
 
-/*
-static int
-oberon_item_to_type_class(oberon_context_t * ctx, oberon_item_t * item)
+// =======================================================================
+//   TABLE
+// ======================================================================= 
+
+static oberon_scope_t *
+oberon_open_scope(oberon_context_t * ctx)
 {
-       int class;
+       oberon_scope_t * scope = malloc(sizeof *scope);
+       memset(scope, 0, sizeof *scope);
 
-       switch(item -> mode)
-       {
-               case MODE_INTEGER:
-                       class = OBERON_TYPE_INTEGER;
-                       break;
-               case MODE_BOOLEAN:
-                       class = OBERON_TYPE_BOOLEAN;
-                       break;
-               case MODE_VAR:
-                       class = item -> var -> type -> class;
-                       break;
-               default:
-                       oberon_error(ctx, "oberon_item_to_type_class: wat");
-                       break;
-       }
+       oberon_object_t * list = malloc(sizeof *list);
+       memset(list, 0, sizeof *list);
+
+       scope -> ctx = ctx;
+       scope -> list = list;
+       scope -> up = ctx -> decl;
 
-       return class;
+       ctx -> decl = scope;
+       return scope;
 }
-*/
 
-/*
 static void
-oberon_autocast_to(oberon_context_t * ctx, oberon_item_t * from, oberon_item_t * to)
+oberon_close_scope(oberon_scope_t * scope)
 {
-       int from_class = oberon_item_to_type_class(ctx, from);
-       int to_class = oberon_item_to_type_class(ctx, to);
+       oberon_context_t * ctx = scope -> ctx;
+       ctx -> decl = scope -> up;
+}
 
-       if(from_class != to_class)
+static oberon_object_t *
+oberon_define_object(oberon_scope_t * scope, char * name, int class)
+{
+       oberon_object_t * x = scope -> list;
+       while(x -> next && strcmp(x -> next -> name, name) != 0)
        {
-               oberon_error(ctx, "oberon_autocast_to: types not matched %i -> %i", from_class, to_class);
+               x = x -> next;
        }
-}
-*/
 
-// =======================================================================
-//   TABLE
-// ======================================================================= 
+       if(x -> next)
+       {
+               oberon_error(scope -> ctx, "already defined");
+       }
 
-static oberon_type_t *
-oberon_find_type(oberon_context_t * ctx, char * name)
+       oberon_object_t * newvar = malloc(sizeof *newvar);
+       memset(newvar, 0, sizeof *newvar);
+       newvar -> name = name;
+       newvar -> class = class;
+
+       x -> next = newvar;
+
+       return newvar;
+}
+
+static oberon_object_t *
+oberon_find_object_in_list(oberon_object_t * list, char * name)
 {
-       oberon_type_t * x = ctx -> types;
+       oberon_object_t * x = list;
        while(x -> next && strcmp(x -> next -> name, name) != 0)
        {
                x = x -> next;
        }
-
        return x -> next;
 }
 
-static oberon_var_t *
-oberon_find_var(oberon_context_t * ctx, char * name)
+static oberon_object_t *
+oberon_find_object(oberon_scope_t * scope, char * name)
 {
-       oberon_var_t * x = ctx -> mod -> vars;
-       while(x -> next && strcmp(x -> next -> name, name) != 0)
+       oberon_object_t * result = NULL;
+
+       oberon_scope_t * s = scope;
+       while(result == NULL && s != NULL)
        {
-               x = x -> next;
+               result = oberon_find_object_in_list(s -> list, name);
+               s = s -> up;
        }
 
-       return x -> next;
+       if(result == NULL)
+       {
+               oberon_error(scope -> ctx, "undefined ident %s", name);
+       }
+
+       return result;
 }
 
 static void
-oberon_define_var(oberon_context_t * ctx, char * name, oberon_type_t * type)
+oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type)
 {
-       oberon_var_t * x = ctx -> mod -> vars;
-       while(x -> next && strcmp(x -> next -> name, name) != 0)
+       oberon_object_t * id;
+       id = oberon_define_object(scope, name, OBERON_CLASS_TYPE);
+       id -> type = type;
+       oberon_generator_init_type(scope -> ctx, type);
+}
+
+static oberon_type_t *
+oberon_find_type(oberon_scope_t * scope, char * name)
+{
+       oberon_object_t * x = oberon_find_object(scope, name);
+       if(x -> class != OBERON_CLASS_TYPE)
        {
-               x = x -> next;
+               oberon_error(scope -> ctx, "%s not a type", name);
        }
 
-       if(x -> next)
+       return x -> type;
+}
+
+static void
+oberon_define_var(oberon_scope_t * scope, char * name, oberon_type_t * type)
+{
+       oberon_object_t * var;
+       var = oberon_define_object(scope, name, OBERON_CLASS_VAR);
+       var -> type = type;
+       oberon_generator_init_var(scope -> ctx, var);
+}
+
+/*
+static oberon_object_t *
+oberon_find_var(oberon_scope_t * scope, char * name)
+{
+       oberon_object_t * x = oberon_find_object(scope, name);
+
+       if(x -> class != OBERON_CLASS_VAR)
        {
-               oberon_error(ctx, "already defined");
+               oberon_error(scope -> ctx, "%s not a var", name);
        }
 
-       oberon_var_t * newvar = malloc(sizeof *newvar);
-       memset(newvar, 0, sizeof *newvar);
-       newvar -> name = name;
-       newvar -> type = type;
-       oberon_generator_init_var(ctx, newvar);
+       return x;
+}
+*/
 
-       x -> next = newvar;
+static oberon_object_t *
+oberon_define_proc(oberon_scope_t * scope, char * name)
+{
+       oberon_object_t * proc;
+       proc = oberon_define_object(scope, name, OBERON_CLASS_PROC);
+       oberon_generator_init_proc(scope -> ctx, proc);
+       return proc;
 }
 
 // =======================================================================
@@ -228,6 +275,10 @@ oberon_read_ident(oberon_context_t * ctx)
        {
                ctx -> token = MOD;
        }
+       else if(strcmp(ident, "PROCEDURE") == 0)
+       {
+               ctx -> token = PROCEDURE;
+       }
 }
 
 static void
@@ -414,29 +465,71 @@ oberon_new_item(int mode, oberon_type_t * result)
 }
 
 static oberon_expr_t *
-oberon_make_not(oberon_context_t * ctx, oberon_expr_t * expr)
+oberon_make_unary_op(oberon_context_t * ctx, int token, oberon_expr_t * a)
 {
-       return oberon_new_operator(OP_LOGIC_NOT, expr -> result, expr, NULL);
+       oberon_expr_t * expr;
+       oberon_type_t * result;
+
+       result = a -> result;
+
+       if(token == MINUS)
+       {
+               if(result -> class != OBERON_TYPE_INTEGER)
+               {
+                       oberon_error(ctx, "incompatible operator type");
+               }
+
+               expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+       }
+       else if(token == NOT)
+       {
+               if(result -> class != OBERON_TYPE_BOOLEAN)
+               {
+                       oberon_error(ctx, "incompatible operator type");
+               }
+
+               expr = oberon_new_operator(OP_LOGIC_NOT, result, a, NULL);
+       }
+       else
+       {
+               oberon_error(ctx, "oberon_make_unary_op: wat");
+       }
+
+       return expr;
 }
 
 static oberon_expr_t *
 oberon_factor(oberon_context_t * ctx)
 {
        char * name;
-       oberon_var_t * var;
+       oberon_object_t * var;
        oberon_expr_t * expr;
 
        switch(ctx -> token)
        {
                case IDENT:
                        name = oberon_assert_ident(ctx);
-                       var = oberon_find_var(ctx, name);
-                       if(var == NULL)
+                       var = oberon_find_object(ctx -> decl, name);
+                       if(var -> class == OBERON_CLASS_VAR)
+                       {
+                               expr = oberon_new_item(MODE_VAR, var -> type);
+                       }
+                       else if(var -> class == OBERON_CLASS_PROC)
                        {
-                               oberon_error(ctx, "undefined variable %s", name);
+                               expr = oberon_new_item(MODE_CALL, var -> type);
                        }
-                       expr = oberon_new_item(MODE_VAR, var -> type);
+                       else
+                       {
+                               oberon_error(ctx, "invalid designator");
+                       }
+
                        expr -> item.var = var;
+                       if(ctx -> token == LPAREN)
+                       {
+                               oberon_assert_token(ctx, LPAREN);
+                               expr -> item.mode = MODE_CALL;
+                               oberon_assert_token(ctx, RPAREN);
+                       }
                        break;
                case INTEGER:
                        expr = oberon_new_item(MODE_INTEGER, ctx -> int_type);
@@ -461,7 +554,7 @@ oberon_factor(oberon_context_t * ctx)
                case NOT:
                        oberon_assert_token(ctx, NOT);
                        expr = oberon_factor(ctx);
-                       expr = oberon_make_not(ctx, expr);
+                       expr = oberon_make_unary_op(ctx, NOT, expr);
                        break;
                default:
                        oberon_error(ctx, "invalid expression");
@@ -470,37 +563,144 @@ oberon_factor(oberon_context_t * ctx)
        return expr;
 }
 
-static oberon_expr_t *
-oberon_make_mul_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
-{
-       oberon_expr_t * expr;
-       oberon_type_t * result;
-
-       result = a -> result;
+/*
+ * oberon_autocast_binary_op автоматически переобразовывеат тип по след. правилам:
+ *   1. Классы обоих типов должны быть одинаковы
+ *   2. В качестве результата должен быть выбран больший тип.
+ *   3. Если размер результат не должен быть меньше чем базовый int
+ */
 
-       if(token == STAR)
+static void
+oberon_autocast_binary_op(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t * b, oberon_type_t ** result)
+{
+       if((a -> class) != (b -> class))
        {
-               expr = oberon_new_operator(OP_MUL, result, a, b);
+               oberon_error(ctx, "incompatible types");
        }
-       else if(token == SLASH)
+
+       if((a -> size) > (b -> size))
        {
-               expr = oberon_new_operator(OP_DIV, result, a, b);
+               *result = a;
        }
-       else if(token == DIV)
+       else
        {
-               expr = oberon_new_operator(OP_DIV, result, a, b);
+               *result = b;
        }
-       else if(token == MOD)
+
+       if(((*result) -> class) == OBERON_TYPE_INTEGER)
        {
-               expr = oberon_new_operator(OP_MOD, result, a, b);
+               if(((*result) -> size) < (ctx -> int_type -> size))
+               {
+                       *result = ctx -> int_type;
+               }
        }
-       else if(token == AND)
+
+       /* TODO: cast types */
+}
+
+#define ITMAKESBOOLEAN(x) \
+       (((x) >= EQUAL && (x) <= GEQ) || ((x) == OR) || ((x) == AND))
+
+#define ITUSEONLYINTEGER(x) \
+       ((x) >= LESS && (x) <= GEQ)
+
+#define ITUSEONLYBOOLEAN(x) \
+       (((x) == OR) || ((x) == AND))
+
+static oberon_expr_t *
+oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
+{
+       oberon_expr_t * expr;
+       oberon_type_t * result;
+
+       oberon_autocast_binary_op(ctx, a -> result, b -> result, &result);
+
+       if(ITMAKESBOOLEAN(token))
        {
-               expr = oberon_new_operator(OP_LOGIC_AND, result, a, b);
+               if(ITUSEONLYINTEGER(token))
+               {
+                       if(a -> result -> class != OBERON_TYPE_INTEGER
+                               && b -> result -> class != OBERON_TYPE_INTEGER)
+                       {
+                               oberon_error(ctx, "used only with integer types");
+                       }
+               }
+               else if(ITUSEONLYBOOLEAN(token))
+               {
+                       if(a -> result -> class != OBERON_TYPE_BOOLEAN
+                               && b -> result -> class != OBERON_TYPE_BOOLEAN)
+                       {
+                               oberon_error(ctx, "used only with boolean type");
+                       }
+               }
+
+               if(token == EQUAL)
+               {
+                       expr = oberon_new_operator(OP_EQ, result, a, b);
+               }
+               else if(token == NEQ)
+               {
+                       expr = oberon_new_operator(OP_NEQ, result, a, b);
+               }
+               else if(token == LESS)
+               {
+                       expr = oberon_new_operator(OP_LSS, result, a, b);
+               }
+               else if(token == LEQ)
+               {
+                       expr = oberon_new_operator(OP_LEQ, result, a, b);
+               }
+               else if(token == GREAT)
+               {
+                       expr = oberon_new_operator(OP_GRT, result, a, b);
+               }
+               else if(token == GEQ)
+               {
+                       expr = oberon_new_operator(OP_GEQ, result, a, b);
+               }
+               else if(token == OR)
+               {
+                       expr = oberon_new_operator(OP_LOGIC_OR, result, a, b);
+               }
+               else if(token == AND)
+               {
+                       expr = oberon_new_operator(OP_LOGIC_AND, result, a, b);
+               }
+               else
+               {
+                       oberon_error(ctx, "oberon_make_bin_op: bool wat");
+               }
        }
        else
        {
-               oberon_error(ctx, "oberon_make_mul_op: wat");
+               if(token == PLUS)
+               {
+                       expr = oberon_new_operator(OP_ADD, result, a, b);
+               }
+               else if(token == MINUS)
+               {
+                       expr = oberon_new_operator(OP_SUB, result, a, b);
+               }
+               else if(token == STAR)
+               {
+                       expr = oberon_new_operator(OP_MUL, result, a, b);
+               }
+               else if(token == SLASH)
+               {
+                       expr = oberon_new_operator(OP_DIV, result, a, b);
+               }
+               else if(token == DIV)
+               {
+                       expr = oberon_new_operator(OP_DIV, result, a, b);
+               }
+               else if(token == MOD)
+               {
+                       expr = oberon_new_operator(OP_MOD, result, a, b);
+               }
+               else
+               {
+                       oberon_error(ctx, "oberon_make_bin_op: bin wat");
+               }
        }
 
        return expr;
@@ -521,46 +721,12 @@ oberon_term_expr(oberon_context_t * ctx)
                oberon_read_token(ctx);
 
                oberon_expr_t * inter = oberon_factor(ctx);
-               expr = oberon_make_mul_op(ctx, token, expr, inter);
+               expr = oberon_make_bin_op(ctx, token, expr, inter);
        }
 
        return expr;
 }
 
-static oberon_expr_t *
-oberon_make_add_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
-{
-       oberon_expr_t * expr;
-       oberon_type_t * result;
-
-       result = a -> result;
-
-       if(token == PLUS)
-       {
-               expr = oberon_new_operator(OP_ADD, result, a, b);
-       }
-       else if(token == MINUS)
-       {
-               expr = oberon_new_operator(OP_SUB, result, a, b);
-       }
-       else if(token == OR)
-       {
-               expr = oberon_new_operator(OP_LOGIC_OR, result, a, b);
-       }
-       else
-       {
-               oberon_error(ctx, "oberon_make_add_op: wat");
-       }
-
-       return expr;
-}
-
-static oberon_expr_t *
-oberon_make_unary_minus(oberon_context_t * ctx, oberon_expr_t * expr)
-{
-       return oberon_new_operator(OP_UNARY_MINUS, expr -> result, expr, NULL);
-}
-
 #define ISADDOP(x) \
        ((x) >= PLUS && (x) <= OR)
 
@@ -588,57 +754,17 @@ oberon_simple_expr(oberon_context_t * ctx)
                oberon_read_token(ctx);
 
                oberon_expr_t * inter = oberon_term_expr(ctx);
-               expr = oberon_make_add_op(ctx, token, expr, inter);
+               expr = oberon_make_bin_op(ctx, token, expr, inter);
        }
 
        if(minus)
        {
-               expr = oberon_make_unary_minus(ctx, expr);
+               expr = oberon_make_unary_op(ctx, MINUS, expr);
        }
 
        return expr;
 }
 
-static oberon_expr_t *
-oberon_make_relation(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
-{
-       oberon_expr_t * expr;
-       oberon_type_t * result;
-
-       result = a -> result;
-
-       if(token == EQUAL)
-       {
-               expr = oberon_new_operator(OP_EQ, result, a, b);
-       }
-       else if(token == NEQ)
-       {
-               expr = oberon_new_operator(OP_NEQ, result, a, b);
-       }
-       else if(token == LESS)
-       {
-               expr = oberon_new_operator(OP_LSS, result, a, b);
-       }
-       else if(token == LEQ)
-       {
-               expr = oberon_new_operator(OP_LEQ, result, a, b);
-       }
-       else if(token == GREAT)
-       {
-               expr = oberon_new_operator(OP_GRT, result, a, b);
-       }
-       else if(token == GEQ)
-       {
-               expr = oberon_new_operator(OP_GEQ, result, a, b);
-       }
-       else
-       {
-               oberon_error(ctx, "oberon_make_relation: wat");
-       }       
-
-       return expr;
-}
-
 #define ISRELATION(x) \
        ((x) >= EQUAL && (x) <= GEQ)
 
@@ -654,7 +780,7 @@ oberon_expr(oberon_context_t * ctx)
                oberon_read_token(ctx);
 
                oberon_expr_t * inter = oberon_simple_expr(ctx);
-               expr = oberon_make_relation(ctx, token, expr, inter);
+               expr = oberon_make_bin_op(ctx, token, expr, inter);
        }
 
        return expr;
@@ -664,6 +790,8 @@ oberon_expr(oberon_context_t * ctx)
 //   PARSER
 // =======================================================================
 
+static void oberon_statement_seq(oberon_context_t * ctx);
+
 static void
 oberon_expect_token(oberon_context_t * ctx, int token)
 {
@@ -693,13 +821,7 @@ static oberon_type_t *
 oberon_type(oberon_context_t * ctx)
 {
        char * name = oberon_assert_ident(ctx);
-       oberon_type_t * type = oberon_find_type(ctx, name);
-
-       if(type == NULL)
-       {
-               oberon_error(ctx, "undefined type");
-       }
-
+       oberon_type_t * type = oberon_find_type(ctx -> decl, name);
        return type;
 }
 
@@ -709,7 +831,53 @@ oberon_var_decl(oberon_context_t * ctx)
        char * name = oberon_assert_ident(ctx);
        oberon_assert_token(ctx, COLON);
        oberon_type_t * type = oberon_type(ctx);
-       oberon_define_var(ctx, name, type);
+       oberon_define_var(ctx -> decl, name, type);
+}
+
+static void
+oberon_make_procedure_begin(oberon_context_t * ctx, char * name)
+{
+       oberon_object_t * proc;
+       proc = oberon_define_proc(ctx -> decl, name);
+
+       oberon_open_scope(ctx);
+
+       oberon_generate_begin_proc(ctx, proc);
+}
+
+static void
+oberon_make_procedure_end(oberon_context_t * ctx)
+{
+       oberon_generate_end_proc(ctx);
+
+       oberon_close_scope(ctx -> decl);
+}
+
+static void
+oberon_proc_decl(oberon_context_t * ctx)
+{
+       oberon_assert_token(ctx, PROCEDURE);
+
+       char * name;
+       name = oberon_assert_ident(ctx);
+
+       oberon_assert_token(ctx, SEMICOLON);
+
+       oberon_make_procedure_begin(ctx, name);
+       if(ctx -> token == BEGIN)
+       {
+               oberon_assert_token(ctx, BEGIN);
+               oberon_statement_seq(ctx);
+       }
+       oberon_make_procedure_end(ctx);
+
+       oberon_assert_token(ctx, END);
+       char * name2 = oberon_assert_ident(ctx);
+
+       if(strcmp(name2, name) != 0)
+       {
+               oberon_error(ctx, "procedure name not matched");
+       }
 }
 
 static void
@@ -724,21 +892,56 @@ oberon_decl_seq(oberon_context_t * ctx)
                        oberon_assert_token(ctx, SEMICOLON);
                }
        }
+
+       if(ctx -> token == PROCEDURE)
+       {
+               oberon_proc_decl(ctx);
+               oberon_assert_token(ctx, SEMICOLON);
+       }
 }
 
 static void
 oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 {
-//     if(dst -> mode == MODE_INTEGER)
-//     {
-//             oberon_error(ctx, "invalid assignment");
-//     }
-//
-//     oberon_autocast_to(ctx, src, dst);
+       if(src -> result -> class != dst -> result -> class)
+       {
+               oberon_error(ctx, "incompatible assignment types");
+       }
+
+       if(dst -> result -> class == OBERON_TYPE_INTEGER)
+       {
+               if((dst -> result -> size) < (src -> result -> size))
+               {
+                       oberon_error(ctx, "incompatible assignment type size");
+               }
+       }
 
        oberon_generate_assign(ctx, src, dst);
 }
 
+static void
+oberon_make_call(oberon_context_t * ctx, oberon_expr_t * desig)
+{
+       if(desig -> is_item == 0)
+       {
+               oberon_error(ctx, "expected item");
+       }
+
+       if(desig -> item.mode != MODE_CALL)
+       {
+               oberon_error(ctx, "expected mode CALL");
+       }
+
+       if(desig -> item.var -> class != OBERON_CLASS_PROC)
+       {
+               oberon_error(ctx, "only procedures can be called");
+       }
+
+       // TODO check arguments
+
+       oberon_generate_call_proc(ctx, desig);
+}
+
 static void
 oberon_statement(oberon_context_t * ctx)
 {
@@ -748,9 +951,16 @@ oberon_statement(oberon_context_t * ctx)
        if(ctx -> token == IDENT)
        {
                item1 = oberon_expr(ctx);
-               oberon_assert_token(ctx, ASSIGN);
-               item2 = oberon_expr(ctx);
-               oberon_assign(ctx, item2, item1);
+               if(ctx -> token == ASSIGN)
+               {
+                       oberon_assert_token(ctx, ASSIGN);
+                       item2 = oberon_expr(ctx);
+                       oberon_assign(ctx, item2, item1);
+               }
+               else
+               {
+                       oberon_make_call(ctx, item1);
+               }
        }
 }
 
@@ -801,43 +1011,40 @@ oberon_parse_module(oberon_context_t * ctx)
 // =======================================================================
 
 static oberon_type_t *
-oberon_register_global_type_ret(oberon_context_t * ctx, oberon_type_t * type)
+oberon_new_type_ptr(int class)
 {
-       oberon_type_t * x = ctx -> types;
-       while(x -> next && strcmp(x -> next -> name, type -> name) != 0)
-       {
-               x = x -> next;
-       }
-
-       if(x -> next)
-       {
-               oberon_error(ctx, "already defined");
-       }
+       oberon_type_t * x = malloc(sizeof *x);
+       memset(x, 0, sizeof *x);
+       x -> class = class;
+       return x;
+}
 
-       // TODO: copy type name (not a pointer)
-       oberon_type_t * newtype = malloc(sizeof *newtype);
-       memcpy(newtype, type, sizeof *newtype);
-       newtype -> next = NULL;
-       oberon_generator_init_type(ctx, newtype);
+static oberon_type_t *
+oberon_new_type_integer(int size)
+{
+       oberon_type_t * x;
+       x = oberon_new_type_ptr(OBERON_TYPE_INTEGER);
+       x -> size = size;
+       return x;
+}
 
-       x -> next = newtype;
-       return newtype; 
+static oberon_type_t *
+oberon_new_type_boolean(int size)
+{
+       oberon_type_t * x;
+       x = oberon_new_type_ptr(OBERON_TYPE_BOOLEAN);
+       x -> size = size;
+       return x;
 }
 
 static void
 register_default_types(oberon_context_t * ctx)
 {
-       static oberon_type_t integer = { "INTEGER", OBERON_TYPE_INTEGER, sizeof(int) };
-       static oberon_type_t boolean = { "BOOLEAN", OBERON_TYPE_BOOLEAN, sizeof(int) };
+       ctx -> int_type = oberon_new_type_integer(sizeof(int));
+       ctx -> bool_type = oberon_new_type_boolean(sizeof(int));
 
-       ctx -> int_type = oberon_register_global_type_ret(ctx, &integer);
-       ctx -> bool_type = oberon_register_global_type_ret(ctx, &boolean);
-}
-
-void
-oberon_register_global_type(oberon_context_t * ctx, oberon_type_t * type)
-{
-       oberon_register_global_type_ret(ctx, type);
+       oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type);
+       oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type);
 }
 
 oberon_context_t *
@@ -846,9 +1053,9 @@ oberon_create_context()
        oberon_context_t * ctx = malloc(sizeof *ctx);
        memset(ctx, 0, sizeof *ctx);
 
-       oberon_type_t * types = malloc(sizeof *types);
-       memset(types, 0, sizeof *types);
-       ctx -> types = types;
+       oberon_scope_t * world_scope;
+       world_scope = oberon_open_scope(ctx);
+       ctx -> world_scope = world_scope;
 
        oberon_generator_init_context(ctx);
 
@@ -869,15 +1076,17 @@ oberon_compile_module(oberon_context_t * ctx, const char * code)
 {
        oberon_module_t * mod = malloc(sizeof *mod);
        memset(mod, 0, sizeof *mod);
-       oberon_var_t * vars = malloc(sizeof *vars);
-       memset(vars, 0, sizeof *vars);
        ctx -> mod = mod;
-       ctx -> mod -> vars = vars;
+
+       oberon_scope_t * module_scope;
+       module_scope = oberon_open_scope(ctx);
+       mod -> decl = module_scope;
 
        oberon_init_scaner(ctx, code);
        oberon_parse_module(ctx);
 
        oberon_generate_code(ctx);
+
+       ctx -> mod = NULL;
        return mod;
 }
-