X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-internals.h;h=c1454d433ff77e38c97ad35569bec8e8a4dd2a15;hb=1233fb1d5d8f67a8f5e970386c1c4cbb6691ec04;hp=07d8d032a85b8460ffa9a6f1617fb19863306cab;hpb=d31e6130ac411ef95be71674b2666a1a79a83602;p=dsw-obn.git

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 07d8d03..c1454d4 100644
--- 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,
@@ -45,7 +45,10 @@ 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
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -55,6 +58,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;
@@ -114,7 +119,8 @@ struct oberon_object_t
 struct oberon_module_t
 {
 	char * name;
-	int ready;
+	bool ready;
+	bool intrinsic;
 
 	oberon_scope_t * decl;
 
@@ -144,8 +150,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;
@@ -155,8 +162,11 @@ 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_scope_t * world_scope;
 	oberon_module_t * module_list;
 	ModuleImportCallback import_module;
 	gen_context_t * gen_context;
@@ -176,24 +186,24 @@ enum oberon_mode_kind
 	MODE_REAL,
 	MODE_CHAR,
 	MODE_STRING,
-	MODE_TYPE
+	MODE_TYPE,
+	MODE_SET,
+	MODE_LEN
 };
 
 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,
 
@@ -204,7 +214,18 @@ 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
 };
 
 struct oberon_item_t
@@ -217,7 +238,6 @@ struct oberon_item_t
 	enum oberon_mode_kind mode;
 	long integer;
 	double real;
-	int boolean;
 	char * string;
 	oberon_object_t * var;