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

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 0b45349..b81eb95 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,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,
@@ -43,7 +45,11 @@ enum oberon_type_kind
 	OBERON_TYPE_POINTER,
 	OBERON_TYPE_REAL,
 	OBERON_TYPE_CHAR,
-	OBERON_TYPE_STRING
+	OBERON_TYPE_STRING,
+	OBERON_TYPE_SET,
+	OBERON_TYPE_NIL,
+	OBERON_TYPE_SYSTEM_BYTE,
+	OBERON_TYPE_SYSTEM_PTR
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -53,6 +59,8 @@ struct oberon_type_t
 {
 	enum oberon_type_kind class;
 	int size;
+	oberon_type_t * shorter;
+	oberon_type_t * longer;
 
 	int num_decl;
 	oberon_type_t * base;
@@ -112,7 +120,8 @@ struct oberon_object_t
 struct oberon_module_t
 {
 	char * name;
-	int ready;
+	bool ready;
+	bool intrinsic;
 
 	oberon_scope_t * decl;
 
@@ -142,8 +151,9 @@ struct oberon_context_t
 	oberon_module_t * mod;
 	/*** END PARSER DATA ***/
 
-	oberon_type_t * void_type;
-	oberon_type_t * void_ptr_type;
+	oberon_scope_t * world_scope;
+	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;
@@ -153,8 +163,12 @@ 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_module_t * system_module;
+	oberon_type_t * system_byte_type;
+	oberon_type_t * system_ptr_type;
 
-	oberon_scope_t * world_scope;
 	oberon_module_t * module_list;
 	ModuleImportCallback import_module;
 	gen_context_t * gen_context;
@@ -173,24 +187,26 @@ enum oberon_mode_kind
 	MODE_NEW,
 	MODE_REAL,
 	MODE_CHAR,
-	MODE_STRING
+	MODE_STRING,
+	MODE_TYPE,
+	MODE_SET,
+	MODE_LEN,
+	MODE_SYSBYTE
 };
 
 enum oberon_operator_kind
 {
 	OP_UNARY_MINUS,
-	OP_BITWISE_NOT,
 	OP_LOGIC_NOT,
 	OP_ABS,
+	OP_CAP,
+	OP_ENTIER,
 
 	OP_ADD,
 	OP_SUB,
 	OP_MUL,
 	OP_DIV,
 	OP_MOD,
-	OP_BITWISE_AND,
-	OP_BITWISE_XOR,
-	OP_BITWISE_OR,
 	OP_LOGIC_AND,
 	OP_LOGIC_OR,
 
@@ -201,7 +217,19 @@ 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,
+
+	OP_ASH,
+	OP_LSH
 };
 
 struct oberon_item_t
@@ -214,7 +242,6 @@ struct oberon_item_t
 	enum oberon_mode_kind mode;
 	long integer;
 	double real;
-	int boolean;
 	char * string;
 	oberon_object_t * var;