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

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 3c6fb85..528842b 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
@@ -188,6 +199,8 @@ enum oberon_operator_kind
 	OP_UNARY_MINUS,
 	OP_LOGIC_NOT,
 	OP_ABS,
+	OP_CAP,
+	OP_ENTIER,
 
 	OP_ADD,
 	OP_SUB,
@@ -213,7 +226,11 @@ enum oberon_operator_kind
 	OP_DIFFERENCE,
 	OP_SYM_DIFFERENCE,
 	OP_COMPLEMENTATION,
-	OP_IN
+	OP_IN,
+
+	OP_ASH,
+	OP_LSH,
+	OP_ROT
 };
 
 struct oberon_item_t