Исправлено присваивание NIL

[dsw-obn.git] / src / oberon-internals.h

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 96fd1662ba6c3e46c429995160342afbca87a2e3..3c6fb853f1a824330eb773fa55a95b7ac0ffd16d 100644 (file)
--- a/src/oberon-internals.h
+++ b/src/oberon-internals.h
@@ -36,7 +36,7 @@ struct oberon_scope_t
 
 enum oberon_type_kind
 {
-       OBERON_TYPE_VOID,
+       OBERON_TYPE_NOTYPE,
        OBERON_TYPE_INTEGER,
        OBERON_TYPE_BOOLEAN,
        OBERON_TYPE_PROCEDURE,
@@ -46,7 +46,8 @@ enum oberon_type_kind
        OBERON_TYPE_REAL,
        OBERON_TYPE_CHAR,
        OBERON_TYPE_STRING,
-       OBERON_TYPE_SET
+       OBERON_TYPE_SET,
+       OBERON_TYPE_NIL
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -145,8 +146,8 @@ struct oberon_context_t
        oberon_module_t * mod;
        /*** END PARSER DATA ***/
 
-       oberon_type_t * void_type;
-       oberon_type_t * void_ptr_type;
+       oberon_type_t * notype_type;
+       oberon_type_t * nil_type;
        oberon_type_t * bool_type;
        oberon_type_t * byte_type;
        oberon_type_t * shortint_type;
@@ -211,7 +212,8 @@ enum oberon_operator_kind
        OP_INTERSECTION,
        OP_DIFFERENCE,
        OP_SYM_DIFFERENCE,
-       OP_COMPLEMENTATION
+       OP_COMPLEMENTATION,
+       OP_IN
 };
 
 struct oberon_item_t
@@ -224,7 +226,6 @@ struct oberon_item_t
        enum oberon_mode_kind mode;
        long integer;
        double real;
-       int boolean;
        char * string;
        oberon_object_t * var;