X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-internals.h;h=3963146d4ee87f2d1cb65c0ecb807ffbde9f4e8d;hb=55d9ee92b95dd306ac80fb643ed21d3b733395d7;hp=0b453494942f4ddc431035a8d99e4c511538d0bc;hpb=86c0ca1aafd465a3e0d4a9d6b1af661eba483ae1;p=dsw-obn.git

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 0b45349..3963146 100644
--- 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,6 +30,8 @@ struct oberon_scope_t
 	int local;
 	oberon_object_t * parent;
 	oberon_type_t * parent_type;
+
+	gen_label_t * exit_label;
 };
 
 enum oberon_type_kind
@@ -43,7 +45,8 @@ enum oberon_type_kind
 	OBERON_TYPE_POINTER,
 	OBERON_TYPE_REAL,
 	OBERON_TYPE_CHAR,
-	OBERON_TYPE_STRING
+	OBERON_TYPE_STRING,
+	OBERON_TYPE_SET
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -153,6 +156,7 @@ struct oberon_context_t
 	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;
@@ -173,13 +177,14 @@ enum oberon_mode_kind
 	MODE_NEW,
 	MODE_REAL,
 	MODE_CHAR,
-	MODE_STRING
+	MODE_STRING,
+	MODE_TYPE,
+	MODE_SET
 };
 
 enum oberon_operator_kind
 {
 	OP_UNARY_MINUS,
-	OP_BITWISE_NOT,
 	OP_LOGIC_NOT,
 	OP_ABS,
 
@@ -188,9 +193,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,
 
@@ -201,7 +203,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