X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-internals.h;h=703ba6c5e4b4b6eb88fa9bb3f98d94973fd9e56e;hb=7b989fe6cfb3cf6e529b888bb6827714c45c62c6;hp=c28cfa5b80761a1d42992a32ffa5d49fa31dce76;hpb=c055d16f1d6ca38c5c2171dbafd1a25305fb909c;p=dsw-obn.git

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index c28cfa5..703ba6c 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,18 +30,24 @@ struct oberon_scope_t
 	int local;
 	oberon_object_t * parent;
 	oberon_type_t * parent_type;
+
+	gen_label_t * exit_label;
 };
 
-enum
+enum oberon_type_kind
 {
-	OBERON_TYPE_VOID,
+	OBERON_TYPE_NOTYPE,
 	OBERON_TYPE_INTEGER,
 	OBERON_TYPE_BOOLEAN,
 	OBERON_TYPE_PROCEDURE,
 	OBERON_TYPE_ARRAY,
 	OBERON_TYPE_RECORD,
 	OBERON_TYPE_POINTER,
-	OBERON_TYPE_REAL
+	OBERON_TYPE_REAL,
+	OBERON_TYPE_CHAR,
+	OBERON_TYPE_STRING,
+	OBERON_TYPE_SET,
+	OBERON_TYPE_NIL
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -49,8 +55,10 @@ typedef void (*GenerateProcCallback)(oberon_context_t *, int, oberon_expr_t *);
 
 struct oberon_type_t
 {
-	int class;
+	enum oberon_type_kind class;
 	int size;
+	oberon_type_t * shorter;
+	oberon_type_t * longer;
 
 	int num_decl;
 	oberon_type_t * base;
@@ -68,7 +76,7 @@ struct oberon_type_t
 	gen_type_t * gen_type;
 };
 
-enum
+enum oberon_object_kind
 {
 	OBERON_CLASS_VAR,
 	OBERON_CLASS_TYPE,
@@ -83,7 +91,7 @@ enum
 struct oberon_object_t
 {
 	char * name;
-	int class;
+	enum oberon_object_kind class;
 	int export;
 	int read_only;
 
@@ -140,6 +148,8 @@ struct oberon_context_t
 	oberon_module_t * mod;
 	/*** END PARSER DATA ***/
 
+	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;
@@ -147,8 +157,9 @@ struct oberon_context_t
 	oberon_type_t * longint_type;
 	oberon_type_t * real_type;
 	oberon_type_t * longreal_type;
-	oberon_type_t * void_type;
-	oberon_type_t * void_ptr_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;
@@ -156,7 +167,7 @@ struct oberon_context_t
 	gen_context_t * gen_context;
 };
 
-enum
+enum oberon_mode_kind
 {
 	MODE_VAR,
 	MODE_INTEGER,
@@ -168,23 +179,26 @@ enum
 	MODE_NIL,
 	MODE_NEW,
 	MODE_REAL,
+	MODE_CHAR,
+	MODE_STRING,
+	MODE_TYPE,
+	MODE_SET,
+	MODE_LEN
 };
 
-enum
+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,
 
@@ -195,20 +209,31 @@ enum
 	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
 {
-	int is_item; // == 1
+	bool is_item; // == 1
 	oberon_type_t * result;
 	oberon_expr_t * next;
-	int read_only;
+	bool read_only;
 
-	int mode;
+	enum oberon_mode_kind mode;
 	long integer;
 	double real;
-	int boolean;
+	char * string;
 	oberon_object_t * var;
 
 	oberon_item_t * parent;
@@ -219,12 +244,12 @@ struct oberon_item_t
 
 struct oberon_oper_t
 {
-	int is_item; // == 0
+	bool is_item; // == 0
 	oberon_type_t * result;
 	oberon_expr_t * next;
-	int read_only;
+	bool read_only;
 
-	int op;
+	enum oberon_operator_kind op;
 	oberon_expr_t * left;
 	oberon_expr_t * right;
 };
@@ -232,10 +257,10 @@ struct oberon_oper_t
 union oberon_expr_t
 {
 	struct {
-		int is_item;
+		bool is_item;
 		oberon_type_t * result;
 		oberon_expr_t * next;
-		int read_only;
+		bool read_only;
 	};
 
 	oberon_item_t item;