X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-internals.h;h=f0a6bed23e96fa8ec6b70d9cafc3a133713485ba;hb=a4fb30372d14e8415e2f9b8e647c20daeab59d7d;hp=b01a1d71958aa8e43cd9a4b10190291b8357802f;hpb=25b73915e7fe0ae7dc51cf6f4a012f021257a35d;p=dsw-obn.git

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index b01a1d7..f0a6bed 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;
@@ -32,7 +32,7 @@ struct oberon_scope_t
 	oberon_type_t * parent_type;
 };
 
-enum
+enum oberon_type_kind
 {
 	OBERON_TYPE_VOID,
 	OBERON_TYPE_INTEGER,
@@ -41,17 +41,27 @@ enum
 	OBERON_TYPE_ARRAY,
 	OBERON_TYPE_RECORD,
 	OBERON_TYPE_POINTER,
-	OBERON_TYPE_REAL
+	OBERON_TYPE_REAL,
+	OBERON_TYPE_CHAR,
+	OBERON_TYPE_STRING
 };
 
+typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
+typedef void (*GenerateProcCallback)(oberon_context_t *, int, oberon_expr_t *);
+
 struct oberon_type_t
 {
-	int class;
+	enum oberon_type_kind class;
 	int size;
 
 	int num_decl;
 	oberon_type_t * base;
 	oberon_object_t * decl;
+	oberon_scope_t * scope;
+
+	bool sysproc;
+	GenerateFuncCallback genfunc;
+	GenerateProcCallback genproc;
 
 	oberon_module_t * module;
 
@@ -60,7 +70,7 @@ struct oberon_type_t
 	gen_type_t * gen_type;
 };
 
-enum
+enum oberon_object_kind
 {
 	OBERON_CLASS_VAR,
 	OBERON_CLASS_TYPE,
@@ -72,13 +82,10 @@ enum
 	OBERON_CLASS_MODULE
 };
 
-typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
-typedef void (*GenerateProcCallback)(oberon_context_t *, int, oberon_expr_t *);
-
 struct oberon_object_t
 {
 	char * name;
-	int class;
+	enum oberon_object_kind class;
 	int export;
 	int read_only;
 
@@ -91,9 +98,6 @@ struct oberon_object_t
 
 	oberon_scope_t * scope; // for proc
 	int has_return; // for proc
-	int sysproc;
-	GenerateFuncCallback genfunc;
-	GenerateProcCallback genproc;
 
 	oberon_type_t * type;
 	oberon_item_t * value;
@@ -138,6 +142,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 * bool_type;
 	oberon_type_t * byte_type;
 	oberon_type_t * shortint_type;
@@ -145,8 +151,8 @@ 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_scope_t * world_scope;
 	oberon_module_t * module_list;
@@ -154,7 +160,7 @@ struct oberon_context_t
 	gen_context_t * gen_context;
 };
 
-enum
+enum oberon_mode_kind
 {
 	MODE_VAR,
 	MODE_INTEGER,
@@ -166,10 +172,11 @@ enum
 	MODE_NIL,
 	MODE_NEW,
 	MODE_REAL,
-	MODE_CAST
+	MODE_CHAR,
+	MODE_STRING
 };
 
-enum
+enum oberon_operator_kind
 {
 	OP_UNARY_MINUS,
 	OP_BITWISE_NOT,
@@ -192,20 +199,23 @@ enum
 	OP_LSS,
 	OP_LEQ,
 	OP_GRT,
-	OP_GEQ
+	OP_GEQ,
+
+	OP_CAST
 };
 
 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;
@@ -216,12 +226,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;
 };
@@ -229,10 +239,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;