Добавлены строки в отладочную информацию класса (быстрохак)

[dsw-obn.git] / src / oberon-internals.h

diff --git a/src/oberon-internals.h b/src/oberon-internals.h
index 07d8d032a85b8460ffa9a6f1617fb19863306cab..d9f311911b94022a2ca7a7a7d6fdb08c869c33f2 100644 (file)
--- a/src/oberon-internals.h
+++ b/src/oberon-internals.h
@@ -17,6 +17,8 @@ typedef struct oberon_module_t oberon_module_t;
 typedef struct oberon_context_t oberon_context_t;
 typedef struct oberon_scope_t oberon_scope_t;
 
+typedef struct oberon_location_t oberon_location_t;
+typedef struct oberon_scanner_t oberon_scanner_t;
 typedef struct oberon_item_t oberon_item_t;
 typedef struct oberon_oper_t oberon_oper_t;
 typedef union oberon_expr_t oberon_expr_t;
@@ -36,7 +38,7 @@ struct oberon_scope_t
 
 enum oberon_type_kind
 {
-       OBERON_TYPE_VOID,
+       OBERON_TYPE_NOTYPE,
        OBERON_TYPE_INTEGER,
        OBERON_TYPE_BOOLEAN,
        OBERON_TYPE_PROCEDURE,
@@ -45,7 +47,11 @@ enum oberon_type_kind
        OBERON_TYPE_POINTER,
        OBERON_TYPE_REAL,
        OBERON_TYPE_CHAR,
-       OBERON_TYPE_STRING
+       OBERON_TYPE_STRING,
+       OBERON_TYPE_SET,
+       OBERON_TYPE_NIL,
+       OBERON_TYPE_SYSTEM_BYTE,
+       OBERON_TYPE_SYSTEM_PTR
 };
 
 typedef oberon_expr_t * (*GenerateFuncCallback)(oberon_context_t *, int, oberon_expr_t *);
@@ -55,6 +61,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;
@@ -114,7 +122,8 @@ struct oberon_object_t
 struct oberon_module_t
 {
        char * name;
-       int ready;
+       bool ready;
+       bool intrinsic;
 
        oberon_scope_t * decl;
 
@@ -123,13 +132,28 @@ struct oberon_module_t
        gen_module_t * gen_mod;
 };
 
-typedef const char * (*ModuleImportCallback)(const char * name);
+struct oberon_location_t
+{
+       const char * source;
+       int line;
+       int col;
+};
+
+struct oberon_scanner_t
+{
+       char * source;
+       char * code;
+};
+
+typedef oberon_scanner_t * (*ModuleImportCallback)(const char * name);
 
 struct oberon_context_t
 {
        /*** SCANER DATA ***/
        const char * code;
        int code_index;
+       oberon_location_t loc;
+       oberon_location_t xloc;
 
        char c;
        int token;
@@ -144,8 +168,9 @@ struct oberon_context_t
        oberon_module_t * mod;
        /*** END PARSER DATA ***/
 
-       oberon_type_t * void_type;
-       oberon_type_t * void_ptr_type;
+       oberon_scope_t * world_scope;
+       oberon_type_t * notype_type;
+       oberon_type_t * nil_type;
        oberon_type_t * bool_type;
        oberon_type_t * byte_type;
        oberon_type_t * shortint_type;
@@ -155,8 +180,12 @@ struct oberon_context_t
        oberon_type_t * longreal_type;
        oberon_type_t * char_type;
        oberon_type_t * string_type;
+       oberon_type_t * set_type;
+
+       oberon_module_t * system_module;
+       oberon_type_t * system_byte_type;
+       oberon_type_t * system_ptr_type;
 
-       oberon_scope_t * world_scope;
        oberon_module_t * module_list;
        ModuleImportCallback import_module;
        gen_context_t * gen_context;
@@ -176,24 +205,26 @@ enum oberon_mode_kind
        MODE_REAL,
        MODE_CHAR,
        MODE_STRING,
-       MODE_TYPE
+       MODE_TYPE,
+       MODE_SET,
+       MODE_LEN,
+       MODE_SYSBYTE,
+       MODE_AS
 };
 
 enum oberon_operator_kind
 {
        OP_UNARY_MINUS,
-       OP_BITWISE_NOT,
        OP_LOGIC_NOT,
        OP_ABS,
+       OP_CAP,
+       OP_ENTIER,
 
        OP_ADD,
        OP_SUB,
        OP_MUL,
        OP_DIV,
        OP_MOD,
-       OP_BITWISE_AND,
-       OP_BITWISE_XOR,
-       OP_BITWISE_OR,
        OP_LOGIC_AND,
        OP_LOGIC_OR,
 
@@ -204,7 +235,21 @@ enum oberon_operator_kind
        OP_GRT,
        OP_GEQ,
 
-       OP_CAST
+       OP_CAST,
+       OP_HARDCAST,
+       OP_IS,
+
+       OP_RANGE,
+       OP_UNION,
+       OP_INTERSECTION,
+       OP_DIFFERENCE,
+       OP_SYM_DIFFERENCE,
+       OP_COMPLEMENTATION,
+       OP_IN,
+
+       OP_ASH,
+       OP_LSH,
+       OP_ROT
 };
 
 struct oberon_item_t
@@ -217,7 +262,6 @@ struct oberon_item_t
        enum oberon_mode_kind mode;
        long integer;
        double real;
-       int boolean;
        char * string;
        oberon_object_t * var;
 
@@ -252,4 +296,13 @@ union oberon_expr_t
        oberon_oper_t oper;
 };
 
+extern oberon_context_t *
+oberon_create_context(ModuleImportCallback import_module);
+
+extern void
+oberon_destroy_context(oberon_context_t * ctx);
+
+extern oberon_module_t *
+oberon_compile_module(oberon_context_t * ctx, oberon_scanner_t * s);
+
 #endif // OBERON_INTERNALS_H