X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=oberon.h;h=9d17afdb16e76ff0bbfa3e8d2ce30d4b80e46a7b;hb=2d029d2c2b27639e3a2b6c43e63788b00110818e;hp=69ee927fede72bb5a643c55608c23db621e78c44;hpb=42da6ba15843521d2b18994d863f2ec3d2672a97;p=dsw-obn.git

diff --git a/oberon.h b/oberon.h
index 69ee927..9d17afd 100644
--- a/oberon.h
+++ b/oberon.h
@@ -3,34 +3,42 @@
 
 #include <libgccjit.h>
 
-/*
- * Стуктуры данных генератора
- */
+typedef struct gen_proc_s gen_proc_t;
+typedef struct gen_type_s gen_type_t;
+typedef struct gen_var_s gen_var_t;
+typedef struct gen_block_s gen_block_t;
+typedef struct gen_context_s gen_context_t;
 
-typedef struct
+struct gen_proc_s
 {
-	gcc_jit_function * gcc_func;
-} gen_proc_t;
+        gcc_jit_function * gcc_func;
+};
 
-typedef struct
+struct gen_type_s
 {
-	gcc_jit_type * gcc_type;
-	gcc_jit_struct * gcc_struct;
-} gen_type_t;
+        gcc_jit_type * gcc_type;
+        gcc_jit_struct * gcc_struct;
+};
 
-typedef struct
+struct gen_var_s
 {
-	gcc_jit_lvalue * gcc_lvalue;
-	gcc_jit_param * gcc_param;
-	gcc_jit_field * gcc_field;
-} gen_var_t;
+        gcc_jit_lvalue * gcc_lvalue;
+        gcc_jit_param * gcc_param;
+        gcc_jit_field * gcc_field;
+};
 
-typedef struct
+struct gen_block_s
 {
-	gcc_jit_context * gcc_context;
-	gcc_jit_block * gcc_block;
-	gcc_jit_result * gcc_result;
-} gen_context_t;
+        gcc_jit_block * gcc_block;
+	gen_block_t * up;
+};
+
+struct gen_context_s
+{
+        gcc_jit_context * gcc_context;
+        gcc_jit_result * gcc_result;
+	gen_block_t * block;
+};
 
 typedef struct oberon_type_s oberon_type_t;
 typedef struct oberon_object_s oberon_object_t;
@@ -57,6 +65,9 @@ struct oberon_scope_s
 	oberon_context_t * ctx;
 	oberon_object_t * list;
 	oberon_scope_t * up;
+
+	oberon_object_t * parent;
+	int local;
 };
 
 /*
@@ -72,6 +83,7 @@ enum
 	OBERON_TYPE_PROCEDURE,
 	OBERON_TYPE_ARRAY,
 	OBERON_TYPE_RECORD,
+	OBERON_TYPE_POINTER
 };
 
 /*
@@ -97,12 +109,12 @@ struct oberon_type_s
 	int class;
 	int size;
 
-	int dim;
-
 	int num_decl;
 	oberon_type_t * base;
 	oberon_object_t * decl;
 
+	int recursive;
+	int initialized;
 	gen_type_t * gen_type;
 };
 
@@ -141,6 +153,14 @@ struct oberon_object_s
 	char * name;
 	int class;
 
+	int local;
+	int linked;
+	int initialized;
+
+	oberon_object_t * parent;
+	int has_return; // for proc
+
+
 	oberon_type_t * type;
 	oberon_item_t * value;
 	oberon_object_t * next;
@@ -193,15 +213,13 @@ struct oberon_context_s
 	char * string;
 	int integer;
 
-	int has_return;
-	oberon_type_t * result_type;
-
 	oberon_scope_t * decl;
 	oberon_module_t * mod;
 
 	oberon_type_t * int_type;
 	oberon_type_t * bool_type;
 	oberon_type_t * void_type;
+	oberon_type_t * void_ptr_type;
 	oberon_scope_t * world_scope;
 
 	gen_context_t * gen_context;
@@ -214,7 +232,9 @@ enum
 	MODE_BOOLEAN,
 	MODE_CALL,
 	MODE_INDEX,
-	MODE_FIELD
+	MODE_FIELD,
+	MODE_DEREF,
+	MODE_NIL
 };
 
 enum