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

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

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index c154d0127093d265ed6c970614f21549f9a0f557..3c6fb853f1a824330eb773fa55a95b7ac0ffd16d 100644 (file)
--- a/src/oberon-internals.h
+++ b/src/oberon-internals.h
@@ -8,7 +8,7 @@ typedef struct gen_module_t gen_module_t;
 typedef struct gen_proc_t gen_proc_t;
 typedef struct gen_type_t gen_type_t;
 typedef struct gen_var_t gen_var_t;
-typedef struct gen_block_t gen_block_t;
+typedef struct gen_label_t gen_label_t;
 typedef struct gen_context_t gen_context_t;
 
 typedef struct oberon_type_t oberon_type_t;
@@ -30,11 +30,13 @@ struct oberon_scope_t
        int local;
        oberon_object_t * parent;
        oberon_type_t * parent_type;
+
+       gen_label_t * exit_label;
 };
 
 enum oberon_type_kind
 {
-       OBERON_TYPE_VOID,
+       OBERON_TYPE_NOTYPE,
        OBERON_TYPE_INTEGER,
        OBERON_TYPE_BOOLEAN,
        OBERON_TYPE_PROCEDURE,
@@ -42,7 +44,10 @@ enum oberon_type_kind
        OBERON_TYPE_RECORD,
        OBERON_TYPE_POINTER,
        OBERON_TYPE_REAL,
-       OBERON_TYPE_CHAR
+       OBERON_TYPE_CHAR,
+       OBERON_TYPE_STRING,
+       OBERON_TYPE_SET,
+       OBERON_TYPE_NIL
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -141,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;
@@ -151,6 +156,8 @@ struct oberon_context_t
        oberon_type_t * real_type;
        oberon_type_t * longreal_type;
        oberon_type_t * char_type;
+       oberon_type_t * string_type;
+       oberon_type_t * set_type;
 
        oberon_scope_t * world_scope;
        oberon_module_t * module_list;
@@ -170,13 +177,15 @@ enum oberon_mode_kind
        MODE_NIL,
        MODE_NEW,
        MODE_REAL,
-       MODE_CHAR
+       MODE_CHAR,
+       MODE_STRING,
+       MODE_TYPE,
+       MODE_SET
 };
 
 enum oberon_operator_kind
 {
        OP_UNARY_MINUS,
-       OP_BITWISE_NOT,
        OP_LOGIC_NOT,
        OP_ABS,
 
@@ -185,9 +194,6 @@ enum oberon_operator_kind
        OP_MUL,
        OP_DIV,
        OP_MOD,
-       OP_BITWISE_AND,
-       OP_BITWISE_XOR,
-       OP_BITWISE_OR,
        OP_LOGIC_AND,
        OP_LOGIC_OR,
 
@@ -198,7 +204,16 @@ enum oberon_operator_kind
        OP_GRT,
        OP_GEQ,
 
-       OP_CAST
+       OP_CAST,
+       OP_IS,
+
+       OP_RANGE,
+       OP_UNION,
+       OP_INTERSECTION,
+       OP_DIFFERENCE,
+       OP_SYM_DIFFERENCE,
+       OP_COMPLEMENTATION,
+       OP_IN
 };
 
 struct oberon_item_t
@@ -211,7 +226,7 @@ struct oberon_item_t
        enum oberon_mode_kind mode;
        long integer;
        double real;
-       int boolean;
+       char * string;
        oberon_object_t * var;
 
        oberon_item_t * parent;