diff --git a/oberon.c b/oberon.c
index c3a6f86ce77fc9d57002b7263e394f218b2140ce..6dd84f16b6b9c3108973c087636865c661735bc3 100644 (file)
--- a/oberon.c
+++ b/oberon.c
}
}
+static oberon_expr_t *
+oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
+{
+ if(proc -> class != OBERON_CLASS_PROC)
+ {
+ oberon_error(ctx, "not a procedure");
+ }
+
+ 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)
+{
+ if(proc -> class != OBERON_CLASS_PROC)
+ {
+ oberon_error(ctx, "not a procedure");
+ }
+
+ 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) \
expr = oberon_new_item(MODE_VAR, var -> type);
break;
case OBERON_CLASS_PROC:
+ //expr = oberon_make_call_expr(var, 0, NULL);
expr = oberon_new_item(MODE_CALL, var -> type);
break;
default:
}
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_assert_token(ctx, LPAREN);
+
+ int num_args = 0;
+ oberon_expr_t * arguments = NULL;
+
+ if(ISEXPR(ctx -> token))
{
- oberon_error(ctx, "not a procedure");
+ oberon_expr_list(ctx, &num_args, &arguments, 0);
}
+ expr = oberon_make_call_func(ctx, expr -> item.var, num_args, arguments);
+
+ 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);
+
+ if(ctx -> token == LPAREN)
+ {
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);
+ oberon_make_call_proc(ctx, expr -> item.var, num_args, arguments);
- oberon_autocast_call(ctx, expr);
+ oberon_assert_token(ctx, RPAREN);
}
-
- return expr;
}
static oberon_expr_t *
{
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);
@@ -2118,21 +2203,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)
oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type);
}
+static void
+oberon_new_intrinsic_function(oberon_context_t * ctx, char * name, GenerateFuncCallback generate)
+{
+ oberon_object_t * proc;
+ proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC);
+ proc -> sysproc = 1;
+ proc -> genfunc = generate;
+ proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
+}
+
+/*
+static void
+oberon_new_intrinsic_procedure(oberon_context_t * ctx, char * name, GenerateProcCallback generate)
+{
+ oberon_object_t * proc;
+ proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC);
+ proc -> sysproc = 1;
+ proc -> genproc = generate;
+ 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_generator_init_context(ctx);
- register_default_types(ctx);
+ register_default_types(ctx);
+ oberon_new_intrinsic_function(ctx, "ABS", oberon_make_abs_call);
return ctx;
}