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

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index c154d01..5dd3582 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;
@@ -30,6 +30,8 @@ struct oberon_scope_t
 	int local;
 	oberon_object_t * parent;
 	oberon_type_t * parent_type;
+
+	gen_label_t * exit_label;
 };
 
 enum oberon_type_kind
@@ -42,7 +44,8 @@ enum oberon_type_kind
 	OBERON_TYPE_RECORD,
 	OBERON_TYPE_POINTER,
 	OBERON_TYPE_REAL,
-	OBERON_TYPE_CHAR
+	OBERON_TYPE_CHAR,
+	OBERON_TYPE_STRING
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -151,6 +154,7 @@ 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_scope_t * world_scope;
 	oberon_module_t * module_list;
@@ -170,7 +174,9 @@ enum oberon_mode_kind
 	MODE_NIL,
 	MODE_NEW,
 	MODE_REAL,
-	MODE_CHAR
+	MODE_CHAR,
+	MODE_STRING,
+	MODE_TYPE
 };
 
 enum oberon_operator_kind
@@ -198,7 +204,8 @@ enum oberon_operator_kind
 	OP_GRT,
 	OP_GEQ,
 
-	OP_CAST
+	OP_CAST,
+	OP_IS
 };
 
 struct oberon_item_t
@@ -212,6 +219,7 @@ struct oberon_item_t
 	long integer;
 	double real;
 	int boolean;
+	char * string;
 	oberon_object_t * var;
 
 	oberon_item_t * parent;