X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon-internals.h;h=d9f311911b94022a2ca7a7a7d6fdb08c869c33f2;hp=c154d0127093d265ed6c970614f21549f9a0f557;hb=HEAD;hpb=36c1947b3e98abab25f16a0f1c2679125651fe95

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index c154d01..d9f3119 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;
@@ -17,6 +17,8 @@ typedef struct oberon_module_t oberon_module_t;
 typedef struct oberon_context_t oberon_context_t;
 typedef struct oberon_scope_t oberon_scope_t;
 
+typedef struct oberon_location_t oberon_location_t;
+typedef struct oberon_scanner_t oberon_scanner_t;
 typedef struct oberon_item_t oberon_item_t;
 typedef struct oberon_oper_t oberon_oper_t;
 typedef union oberon_expr_t oberon_expr_t;
@@ -30,11 +32,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,
@@ -42,7 +46,12 @@ enum oberon_type_kind
 	OBERON_TYPE_RECORD,
 	OBERON_TYPE_POINTER,
 	OBERON_TYPE_REAL,
-	OBERON_TYPE_CHAR
+	OBERON_TYPE_CHAR,
+	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 *);
@@ -52,6 +61,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;
@@ -111,7 +122,8 @@ struct oberon_object_t
 struct oberon_module_t
 {
 	char * name;
-	int ready;
+	bool ready;
+	bool intrinsic;
 
 	oberon_scope_t * decl;
 
@@ -120,13 +132,28 @@ struct oberon_module_t
 	gen_module_t * gen_mod;
 };
 
-typedef const char * (*ModuleImportCallback)(const char * name);
+struct oberon_location_t
+{
+	const char * source;
+	int line;
+	int col;
+};
+
+struct oberon_scanner_t
+{
+	char * source;
+	char * code;
+};
+
+typedef oberon_scanner_t * (*ModuleImportCallback)(const char * name);
 
 struct oberon_context_t
 {
 	/*** SCANER DATA ***/
 	const char * code;
 	int code_index;
+	oberon_location_t loc;
+	oberon_location_t xloc;
 
 	char c;
 	int token;
@@ -141,8 +168,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;
@@ -151,8 +179,13 @@ struct oberon_context_t
 	oberon_type_t * real_type;
 	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;
@@ -170,24 +203,28 @@ enum oberon_mode_kind
 	MODE_NIL,
 	MODE_NEW,
 	MODE_REAL,
-	MODE_CHAR
+	MODE_CHAR,
+	MODE_STRING,
+	MODE_TYPE,
+	MODE_SET,
+	MODE_LEN,
+	MODE_SYSBYTE,
+	MODE_AS
 };
 
 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,
 
@@ -198,7 +235,21 @@ enum oberon_operator_kind
 	OP_GRT,
 	OP_GEQ,
 
-	OP_CAST
+	OP_CAST,
+	OP_HARDCAST,
+	OP_IS,
+
+	OP_RANGE,
+	OP_UNION,
+	OP_INTERSECTION,
+	OP_DIFFERENCE,
+	OP_SYM_DIFFERENCE,
+	OP_COMPLEMENTATION,
+	OP_IN,
+
+	OP_ASH,
+	OP_LSH,
+	OP_ROT
 };
 
 struct oberon_item_t
@@ -211,7 +262,7 @@ struct oberon_item_t
 	enum oberon_mode_kind mode;
 	long integer;
 	double real;
-	int boolean;
+	char * string;
 	oberon_object_t * var;
 
 	oberon_item_t * parent;
@@ -245,4 +296,13 @@ union oberon_expr_t
 	oberon_oper_t oper;
 };
 
+extern oberon_context_t *
+oberon_create_context(ModuleImportCallback import_module);
+
+extern void
+oberon_destroy_context(oberon_context_t * ctx);
+
+extern oberon_module_t *
+oberon_compile_module(oberon_context_t * ctx, oberon_scanner_t * s);
+
 #endif // OBERON_INTERNALS_H