X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-internals.h;h=b81eb95fea111b6b1d9231ca92f176ba90069f7a;hb=2e868cbd80ac5144b08154aaf2cf7bf7be455b61;hp=7536540a6574ebc901d79e8870ad935ac6f2170b;hpb=95acec6c3ae8d3c324c84b001a680aa49320790b;p=dsw-obn.git

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 7536540..b81eb95 100644
--- a/src/oberon-internals.h
+++ b/src/oberon-internals.h
@@ -47,7 +47,9 @@ enum oberon_type_kind
 	OBERON_TYPE_CHAR,
 	OBERON_TYPE_STRING,
 	OBERON_TYPE_SET,
-	OBERON_TYPE_NIL
+	OBERON_TYPE_NIL,
+	OBERON_TYPE_SYSTEM_BYTE,
+	OBERON_TYPE_SYSTEM_PTR
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -57,6 +59,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;
@@ -116,7 +120,8 @@ struct oberon_object_t
 struct oberon_module_t
 {
 	char * name;
-	int ready;
+	bool ready;
+	bool intrinsic;
 
 	oberon_scope_t * decl;
 
@@ -146,6 +151,7 @@ struct oberon_context_t
 	oberon_module_t * mod;
 	/*** END PARSER DATA ***/
 
+	oberon_scope_t * world_scope;
 	oberon_type_t * notype_type;
 	oberon_type_t * nil_type;
 	oberon_type_t * bool_type;
@@ -159,7 +165,10 @@ struct oberon_context_t
 	oberon_type_t * string_type;
 	oberon_type_t * set_type;
 
-	oberon_scope_t * world_scope;
+	oberon_module_t * system_module;
+	oberon_type_t * system_byte_type;
+	oberon_type_t * system_ptr_type;
+
 	oberon_module_t * module_list;
 	ModuleImportCallback import_module;
 	gen_context_t * gen_context;
@@ -180,7 +189,9 @@ enum oberon_mode_kind
 	MODE_CHAR,
 	MODE_STRING,
 	MODE_TYPE,
-	MODE_SET
+	MODE_SET,
+	MODE_LEN,
+	MODE_SYSBYTE
 };
 
 enum oberon_operator_kind
@@ -189,6 +200,7 @@ enum oberon_operator_kind
 	OP_LOGIC_NOT,
 	OP_ABS,
 	OP_CAP,
+	OP_ENTIER,
 
 	OP_ADD,
 	OP_SUB,
@@ -216,7 +228,8 @@ enum oberon_operator_kind
 	OP_COMPLEMENTATION,
 	OP_IN,
 
-	OP_ASH
+	OP_ASH,
+	OP_LSH
 };
 
 struct oberon_item_t