X-Git-Url: https://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon-internals.h;h=3c6fb853f1a824330eb773fa55a95b7ac0ffd16d;hp=e265a79cc1b39aff1e2a6afa7d3b51913853c756;hb=a0ff807fe0e69c50469e506836467da32f23f754;hpb=9e6d0f74f74926a9c73d15418c2e9668689061f2

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index e265a79..3c6fb85 100644
--- a/src/oberon-internals.h
+++ b/src/oberon-internals.h
@@ -1,10 +1,14 @@
 #ifndef OBERON_INTERNALS_H
 #define OBERON_INTERNALS_H
 
+#include <stdint.h>
+#include <stdbool.h>
+
+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;
@@ -23,30 +27,45 @@ struct oberon_scope_t
 	oberon_object_t * list;
 	oberon_scope_t * up;
 
-	oberon_object_t * parent;
 	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 *);
+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;
 
@@ -55,7 +74,7 @@ struct oberon_type_t
 	gen_type_t * gen_type;
 };
 
-enum
+enum oberon_object_kind
 {
 	OBERON_CLASS_VAR,
 	OBERON_CLASS_TYPE,
@@ -67,13 +86,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;
 
@@ -82,12 +98,10 @@ struct oberon_object_t
 	int initialized;
 
 	oberon_object_t * parent;
+	oberon_type_t * parent_type;
 
 	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;
@@ -107,6 +121,8 @@ struct oberon_module_t
 	oberon_scope_t * decl;
 
 	oberon_module_t * next;
+
+	gen_module_t * gen_mod;
 };
 
 typedef const char * (*ModuleImportCallback)(const char * name);
@@ -120,8 +136,9 @@ struct oberon_context_t
 	char c;
 	int token;
 	char * string;
-	long integer;
+	int64_t integer;
 	double real;
+	bool longmode;
 	/*** END SCANER DATA ***/
 
 	/*** PARSER DATA ***/
@@ -129,18 +146,26 @@ struct oberon_context_t
 	oberon_module_t * mod;
 	/*** END PARSER DATA ***/
 
-	oberon_type_t * int_type;
+	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;
+	oberon_type_t * int_type;
+	oberon_type_t * longint_type;
 	oberon_type_t * real_type;
-	oberon_type_t * void_type;
-	oberon_type_t * void_ptr_type;
+	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;
 	ModuleImportCallback import_module;
 	gen_context_t * gen_context;
 };
 
-enum
+enum oberon_mode_kind
 {
 	MODE_VAR,
 	MODE_INTEGER,
@@ -151,13 +176,16 @@ enum
 	MODE_DEREF,
 	MODE_NIL,
 	MODE_NEW,
-	MODE_REAL
+	MODE_REAL,
+	MODE_CHAR,
+	MODE_STRING,
+	MODE_TYPE,
+	MODE_SET
 };
 
-enum
+enum oberon_operator_kind
 {
 	OP_UNARY_MINUS,
-	OP_BITWISE_NOT,
 	OP_LOGIC_NOT,
 	OP_ABS,
 
@@ -166,9 +194,6 @@ enum
 	OP_MUL,
 	OP_DIV,
 	OP_MOD,
-	OP_BITWISE_AND,
-	OP_BITWISE_XOR,
-	OP_BITWISE_OP,
 	OP_LOGIC_AND,
 	OP_LOGIC_OR,
 
@@ -177,20 +202,31 @@ enum
 	OP_LSS,
 	OP_LEQ,
 	OP_GRT,
-	OP_GEQ
+	OP_GEQ,
+
+	OP_CAST,
+	OP_IS,
+
+	OP_RANGE,
+	OP_UNION,
+	OP_INTERSECTION,
+	OP_DIFFERENCE,
+	OP_SYM_DIFFERENCE,
+	OP_COMPLEMENTATION,
+	OP_IN
 };
 
 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;
@@ -201,12 +237,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;
 };
@@ -214,17 +250,14 @@ 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;
 	oberon_oper_t oper;
 };
 
-extern void
-oberon_error(oberon_context_t * ctx, const char * fmt, ...);
-
 #endif // OBERON_INTERNALS_H