X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-internals.h;h=c28cfa5b80761a1d42992a32ffa5d49fa31dce76;hb=c055d16f1d6ca38c5c2171dbafd1a25305fb909c;hp=d6c3881d2d54e2cb67f554371479a2c0386153fe;hpb=351f950548241d4c4bd799acabbcd98a39b096cc;p=dsw-obn.git

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index d6c3881..c28cfa5 100644
--- a/src/oberon-internals.h
+++ b/src/oberon-internals.h
@@ -1,6 +1,9 @@
 #ifndef OBERON_INTERNALS_H
 #define OBERON_INTERNALS_H
 
+#include <stdint.h>
+#include <stdbool.h>
+
 typedef struct gen_module_t gen_module_t;
 typedef struct gen_proc_t gen_proc_t;
 typedef struct gen_type_t gen_type_t;
@@ -41,6 +44,9 @@ enum
 	OBERON_TYPE_REAL
 };
 
+typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
+typedef void (*GenerateProcCallback)(oberon_context_t *, int, oberon_expr_t *);
+
 struct oberon_type_t
 {
 	int class;
@@ -49,6 +55,11 @@ struct oberon_type_t
 	int num_decl;
 	oberon_type_t * base;
 	oberon_object_t * decl;
+	oberon_scope_t * scope;
+
+	bool sysproc;
+	GenerateFuncCallback genfunc;
+	GenerateProcCallback genproc;
 
 	oberon_module_t * module;
 
@@ -69,9 +80,6 @@ enum
 	OBERON_CLASS_MODULE
 };
 
-typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
-typedef void (*GenerateProcCallback)(oberon_context_t *, int, oberon_expr_t *);
-
 struct oberon_object_t
 {
 	char * name;
@@ -88,9 +96,6 @@ struct oberon_object_t
 
 	oberon_scope_t * scope; // for proc
 	int has_return; // for proc
-	int sysproc;
-	GenerateFuncCallback genfunc;
-	GenerateProcCallback genproc;
 
 	oberon_type_t * type;
 	oberon_item_t * value;
@@ -125,8 +130,9 @@ struct oberon_context_t
 	char c;
 	int token;
 	char * string;
-	long integer;
+	int64_t integer;
 	double real;
+	bool longmode;
 	/*** END SCANER DATA ***/
 
 	/*** PARSER DATA ***/
@@ -134,11 +140,16 @@ struct oberon_context_t
 	oberon_module_t * mod;
 	/*** END PARSER DATA ***/
 
-	oberon_type_t * int_type;
 	oberon_type_t * bool_type;
+	oberon_type_t * byte_type;
+	oberon_type_t * shortint_type;
+	oberon_type_t * int_type;
+	oberon_type_t * longint_type;
 	oberon_type_t * real_type;
+	oberon_type_t * longreal_type;
 	oberon_type_t * void_type;
 	oberon_type_t * void_ptr_type;
+
 	oberon_scope_t * world_scope;
 	oberon_module_t * module_list;
 	ModuleImportCallback import_module;
@@ -156,7 +167,7 @@ enum
 	MODE_DEREF,
 	MODE_NIL,
 	MODE_NEW,
-	MODE_REAL
+	MODE_REAL,
 };
 
 enum
@@ -182,7 +193,9 @@ enum
 	OP_LSS,
 	OP_LEQ,
 	OP_GRT,
-	OP_GEQ
+	OP_GEQ,
+
+	OP_CAST
 };
 
 struct oberon_item_t
@@ -229,7 +242,4 @@ union oberon_expr_t
 	oberon_oper_t oper;
 };
 
-extern void
-oberon_error(oberon_context_t * ctx, const char * fmt, ...);
-
 #endif // OBERON_INTERNALS_H