diff --git a/oberon.c b/oberon.c
index c3a6f86ce77fc9d57002b7263e394f218b2140ce..e12ee36174e9fd9cfd9a870225dea8528d46e8f8 100644 (file)
--- a/oberon.c
+++ b/oberon.c
POINTER,
TO,
UPARROW,
- NIL
+ NIL,
+ IMPORT
};
// =======================================================================
static oberon_scope_t *
oberon_open_scope(oberon_context_t * ctx)
{
- oberon_scope_t * scope = malloc(sizeof *scope);
- memset(scope, 0, sizeof *scope);
-
- oberon_object_t * list = malloc(sizeof *list);
- memset(list, 0, sizeof *list);
+ oberon_scope_t * scope = calloc(1, sizeof *scope);
+ oberon_object_t * list = calloc(1, sizeof *list);
scope -> ctx = ctx;
scope -> list = list;
{
ctx -> token = NIL;
}
+ else if(strcmp(ident, "IMPORT") == 0)
+ {
+ ctx -> token = IMPORT;
+ }
}
static void
oberon_error(ctx, "expected mode CALL");
}
- if(desig -> item.var -> class != OBERON_CLASS_PROC)
+ if(desig -> item.var -> type -> class != OBERON_TYPE_PROCEDURE)
{
oberon_error(ctx, "only procedures can be called");
}
}
}
+static oberon_expr_t *
+oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
+{
+ switch(proc -> class)
+ {
+ case OBERON_CLASS_PROC:
+ if(proc -> class != OBERON_CLASS_PROC)
+ {
+ oberon_error(ctx, "not a procedure");
+ }
+ break;
+ case OBERON_CLASS_VAR:
+ case OBERON_CLASS_VAR_PARAM:
+ case OBERON_CLASS_PARAM:
+ if(proc -> type -> class != OBERON_TYPE_PROCEDURE)
+ {
+ oberon_error(ctx, "not a procedure");
+ }
+ break;
+ default:
+ oberon_error(ctx, "not a procedure");
+ break;
+ }
+
+ oberon_expr_t * call;
+
+ if(proc -> sysproc)
+ {
+ if(proc -> genfunc == NULL)
+ {
+ oberon_error(ctx, "not a function-procedure");
+ }
+
+ call = proc -> genfunc(ctx, num_args, list_args);
+ }
+ else
+ {
+ if(proc -> type -> base -> class == OBERON_TYPE_VOID)
+ {
+ oberon_error(ctx, "attempt to call procedure in expression");
+ }
+
+ call = oberon_new_item(MODE_CALL, proc -> type -> base);
+ call -> item.var = proc;
+ call -> item.num_args = num_args;
+ call -> item.args = list_args;
+ oberon_autocast_call(ctx, call);
+ }
+
+ return call;
+}
+
+static void
+oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
+{
+ switch(proc -> class)
+ {
+ case OBERON_CLASS_PROC:
+ if(proc -> class != OBERON_CLASS_PROC)
+ {
+ oberon_error(ctx, "not a procedure");
+ }
+ break;
+ case OBERON_CLASS_VAR:
+ case OBERON_CLASS_VAR_PARAM:
+ case OBERON_CLASS_PARAM:
+ if(proc -> type -> class != OBERON_TYPE_PROCEDURE)
+ {
+ oberon_error(ctx, "not a procedure");
+ }
+ break;
+ default:
+ oberon_error(ctx, "not a procedure");
+ break;
+ }
+
+ if(proc -> sysproc)
+ {
+ if(proc -> genproc == NULL)
+ {
+ oberon_error(ctx, "requres non-typed procedure");
+ }
+
+ proc -> genproc(ctx, num_args, list_args);
+ }
+ else
+ {
+ if(proc -> type -> base -> class != OBERON_TYPE_VOID)
+ {
+ oberon_error(ctx, "attempt to call function as non-typed procedure");
+ }
+
+ oberon_expr_t * call;
+ call = oberon_new_item(MODE_CALL, proc -> type -> base);
+ call -> item.var = proc;
+ call -> item.num_args = num_args;
+ call -> item.args = list_args;
+ oberon_autocast_call(ctx, call);
+ oberon_generate_call_proc(ctx, call);
+ }
+}
+
#define ISEXPR(x) \
(((x) == PLUS) \
|| ((x) == MINUS) \
@@ -883,6 +987,34 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
|| ((x) == DOT) \
|| ((x) == UPARROW))
+static oberon_object_t *
+oberon_qualident(oberon_context_t * ctx, char ** xname, int check)
+{
+ char * name;
+ oberon_object_t * x;
+
+ name = oberon_assert_ident(ctx);
+ x = oberon_find_object(ctx -> decl, name, check);
+
+ if(x != NULL)
+ {
+ if(x -> class == OBERON_CLASS_MODULE)
+ {
+ oberon_assert_token(ctx, DOT);
+ name = oberon_assert_ident(ctx);
+ /* Наличие объектов в левых модулях всегда проверяется */
+ x = oberon_find_object(x -> module -> decl, name, 1);
+ }
+ }
+
+ if(xname)
+ {
+ *xname = name;
+ }
+
+ return x;
+}
+
static oberon_expr_t *
oberon_designator(oberon_context_t * ctx)
{
oberon_object_t * var;
oberon_expr_t * expr;
- name = oberon_assert_ident(ctx);
- var = oberon_find_object(ctx -> decl, name, 1);
+ var = oberon_qualident(ctx, NULL, 1);
switch(var -> class)
{
case OBERON_CLASS_VAR:
case OBERON_CLASS_VAR_PARAM:
case OBERON_CLASS_PARAM:
- expr = oberon_new_item(MODE_VAR, var -> type);
- break;
case OBERON_CLASS_PROC:
- expr = oberon_new_item(MODE_CALL, var -> type);
+ expr = oberon_new_item(MODE_VAR, var -> type);
break;
default:
oberon_error(ctx, "invalid designator");
}
static oberon_expr_t *
-oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr)
+oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
{
assert(expr -> is_item == 1);
+ /* Если есть скобки - значит вызов. Если нет, то передаём указатель. */
if(ctx -> token == LPAREN)
{
- if(expr -> result -> class != OBERON_TYPE_PROCEDURE)
- {
- oberon_error(ctx, "not a procedure");
- }
-
oberon_assert_token(ctx, LPAREN);
int num_args = 0;
oberon_expr_list(ctx, &num_args, &arguments, 0);
}
- expr -> result = expr -> item.var -> type -> base;
- expr -> item.mode = MODE_CALL;
- expr -> item.num_args = num_args;
- expr -> item.args = arguments;
- oberon_assert_token(ctx, RPAREN);
+ expr = oberon_make_call_func(ctx, expr -> item.var, num_args, arguments);
- oberon_autocast_call(ctx, expr);
+ oberon_assert_token(ctx, RPAREN);
}
return expr;
}
+static void
+oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr)
+{
+ assert(expr -> is_item == 1);
+
+ int num_args = 0;
+ oberon_expr_t * arguments = NULL;
+
+ if(ctx -> token == LPAREN)
+ {
+ oberon_assert_token(ctx, LPAREN);
+
+ if(ISEXPR(ctx -> token))
+ {
+ oberon_expr_list(ctx, &num_args, &arguments, 0);
+ }
+
+ oberon_assert_token(ctx, RPAREN);
+ }
+
+ /* Вызов происходит даже без скобок */
+ oberon_make_call_proc(ctx, expr -> item.var, num_args, arguments);
+}
+
static oberon_expr_t *
oberon_factor(oberon_context_t * ctx)
{
{
case IDENT:
expr = oberon_designator(ctx);
- expr = oberon_opt_proc_parens(ctx, expr);
+ expr = oberon_opt_func_parens(ctx, expr);
break;
case INTEGER:
expr = oberon_new_item(MODE_INTEGER, ctx -> int_type);
if(ctx -> token == COLON)
{
oberon_assert_token(ctx, COLON);
- // TODO get by qualident
- oberon_type(ctx, &signature -> base);
+
+ oberon_object_t * typeobj;
+ typeobj = oberon_qualident(ctx, NULL, 1);
+ if(typeobj -> class != OBERON_CLASS_TYPE)
+ {
+ oberon_error(ctx, "function result is not type");
+ }
+ signature -> base = typeobj -> type;
}
}
char * name;
oberon_object_t * to;
- name = oberon_assert_ident(ctx);
- to = oberon_find_object(ctx -> decl, name, 0);
+ to = oberon_qualident(ctx, &name, 0);
+
+ //name = oberon_assert_ident(ctx);
+ //to = oberon_find_object(ctx -> decl, name, 0);
if(to != NULL)
{
break;
case OBERON_CLASS_CONST:
case OBERON_CLASS_PROC:
+ case OBERON_CLASS_MODULE:
break;
default:
oberon_error(ctx, "oberon_prevent_recursive_object: wat");
break;
case OBERON_CLASS_CONST:
case OBERON_CLASS_PROC:
+ case OBERON_CLASS_MODULE:
break;
default:
- oberon_error(ctx, "oberon_prevent_recursive_object: wat");
+ oberon_error(ctx, "oberon_initialize_object: wat");
break;
}
}
@@ -2118,21 +2273,6 @@ oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
oberon_generate_assign(ctx, src, dst);
}
-static void
-oberon_make_call(oberon_context_t * ctx, oberon_expr_t * desig)
-{
- if(desig -> result -> class != OBERON_TYPE_VOID)
- {
- if(desig -> result -> class != OBERON_TYPE_PROCEDURE)
- {
- oberon_error(ctx, "procedure with result");
- }
- }
-
- oberon_autocast_call(ctx, desig);
- oberon_generate_call_proc(ctx, desig);
-}
-
static void
oberon_statement(oberon_context_t * ctx)
{
}
else
{
- item1 = oberon_opt_proc_parens(ctx, item1);
- oberon_make_call(ctx, item1);
+ oberon_opt_proc_parens(ctx, item1);
}
}
else if(ctx -> token == RETURN)
}
}
+static void
+oberon_import_module(oberon_context_t * ctx, char * alias, char * name)
+{
+ oberon_module_t * m = ctx -> module_list;
+ while(m && strcmp(m -> name, name) != 0)
+ {
+ m = m -> next;
+ }
+
+ if(m == NULL)
+ {
+ const char * code;
+ code = ctx -> import_module(name);
+ if(code == NULL)
+ {
+ oberon_error(ctx, "no such module");
+ }
+
+ m = oberon_compile_module(ctx, code);
+ assert(m);
+ }
+
+ if(m -> ready == 0)
+ {
+ oberon_error(ctx, "cyclic module import");
+ }
+
+ oberon_object_t * ident;
+ ident = oberon_define_object(ctx -> decl, alias, OBERON_CLASS_MODULE);
+ ident -> module = m;
+}
+
+static void
+oberon_import_decl(oberon_context_t * ctx)
+{
+ char * alias;
+ char * name;
+
+ alias = name = oberon_assert_ident(ctx);
+ if(ctx -> token == ASSIGN)
+ {
+ oberon_assert_token(ctx, ASSIGN);
+ name = oberon_assert_ident(ctx);
+ }
+
+ oberon_import_module(ctx, alias, name);
+}
+
+static void
+oberon_import_list(oberon_context_t * ctx)
+{
+ oberon_assert_token(ctx, IMPORT);
+
+ oberon_import_decl(ctx);
+ while(ctx -> token == COMMA)
+ {
+ oberon_assert_token(ctx, COMMA);
+ oberon_import_decl(ctx);
+ }
+
+ oberon_assert_token(ctx, SEMICOLON);
+}
+
static void
oberon_parse_module(oberon_context_t * ctx)
{
- char *name1, *name2;
+ char * name1;
+ char * name2;
oberon_read_token(ctx);
oberon_assert_token(ctx, MODULE);
oberon_assert_token(ctx, SEMICOLON);
ctx -> mod -> name = name1;
+ oberon_object_t * this_module;
+ this_module = oberon_define_object(ctx -> decl, name1, OBERON_CLASS_MODULE);
+ this_module -> module = ctx -> mod;
+
+ if(ctx -> token == IMPORT)
+ {
+ oberon_import_list(ctx);
+ }
+
+ ctx -> decl -> parent = this_module;
+
oberon_decl_seq(ctx);
+ oberon_generate_begin_module(ctx);
+
if(ctx -> token == BEGIN)
{
oberon_assert_token(ctx, BEGIN);
- oberon_generate_begin_module(ctx);
oberon_statement_seq(ctx);
oberon_generate_end_module(ctx);
}
oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type);
}
+static void
+oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f, GenerateProcCallback p)
+{
+ oberon_object_t * proc;
+ proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC);
+ proc -> sysproc = 1;
+ proc -> genfunc = f;
+ proc -> genproc = p;
+ proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
+}
+
+static oberon_expr_t *
+oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 1)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * arg;
+ arg = list_args;
+
+ oberon_type_t * result_type;
+ result_type = arg -> result;
+
+ if(result_type -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "ABS accepts only integers");
+ }
+
+
+ oberon_expr_t * expr;
+ expr = oberon_new_operator(OP_ABS, result_type, arg, NULL);
+ return expr;
+}
+
oberon_context_t *
-oberon_create_context()
+oberon_create_context(ModuleImportCallback import_module)
{
- oberon_context_t * ctx = malloc(sizeof *ctx);
- memset(ctx, 0, sizeof *ctx);
+ oberon_context_t * ctx = calloc(1, sizeof *ctx);
oberon_scope_t * world_scope;
world_scope = oberon_open_scope(ctx);
ctx -> world_scope = world_scope;
+ ctx -> import_module = import_module;
+
oberon_generator_init_context(ctx);
- register_default_types(ctx);
+ register_default_types(ctx);
+ oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
return ctx;
}
}
oberon_module_t *
-oberon_compile_module(oberon_context_t * ctx, const char * code)
+oberon_compile_module(oberon_context_t * ctx, const char * newcode)
{
- oberon_module_t * mod = malloc(sizeof *mod);
- memset(mod, 0, sizeof *mod);
- ctx -> mod = mod;
+ const char * code = ctx -> code;
+ int code_index = ctx -> code_index;
+ char c = ctx -> c;
+ int token = ctx -> token;
+ char * string = ctx -> string;
+ int integer = ctx -> integer;
+ oberon_scope_t * decl = ctx -> decl;
+ oberon_module_t * mod = ctx -> mod;
oberon_scope_t * module_scope;
module_scope = oberon_open_scope(ctx);
- mod -> decl = module_scope;
- oberon_init_scaner(ctx, code);
+ oberon_module_t * module;
+ module = calloc(1, sizeof *module);
+ module -> decl = module_scope;
+ module -> next = ctx -> module_list;
+
+ ctx -> mod = module;
+ ctx -> module_list = module;
+
+ oberon_init_scaner(ctx, newcode);
oberon_parse_module(ctx);
- oberon_generate_code(ctx);
+ module -> ready = 1;
+
+ ctx -> code = code;
+ ctx -> code_index = code_index;
+ ctx -> c = c;
+ ctx -> token = token;
+ ctx -> string = string;
+ ctx -> integer = integer;
+ ctx -> decl = decl;
+ ctx -> mod = mod;
- ctx -> mod = NULL;
- return mod;
+ return module;
}