Реализован вызов процедуры-переменной

[dsw-obn.git] / generator.c

diff --git a/generator.c b/generator.c
index 709e5a65cbfb513cd502e2bf7d70383b89468449..244296228ae3335b5de1b12047c3d90a8c7777b3 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -363,6 +363,11 @@ lvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
 
        if(item -> mode == MODE_VAR)
        {
+               if(item -> var -> class == OBERON_CLASS_PROC)
+               {
+                       oberon_error(ctx, "casting static procedure to pointer not supported by generator");
+               }
+
                gen_var_t * gen_var = item -> var -> gen_var;
                left = gen_var -> gcc_lvalue;
                if(item -> var -> class == OBERON_CLASS_VAR_PARAM)
@@ -450,8 +455,6 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
        }
        else if(item -> mode == MODE_CALL)
        {
-               assert(item -> var -> class == OBERON_CLASS_PROC);
-
                oberon_type_t * signature = item -> var -> type;
                gen_proc_t * gen_proc = item -> var -> gen_proc;
 
@@ -475,10 +478,28 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
                        arg_param = arg_param -> next;
                }
 
-               gcc_jit_function * func = gen_proc -> gcc_func;
-               right = gcc_jit_context_new_call(
-                       gcc_context, NULL, func, num_args, args
-               );
+               gcc_jit_rvalue * fnptr;
+               gcc_jit_function * func;
+               switch(item -> var -> class)
+               {
+                       case OBERON_CLASS_PROC:
+                               func = gen_proc -> gcc_func;
+                               right = gcc_jit_context_new_call(
+                                       gcc_context, NULL, func, num_args, args
+                               );
+                               break;
+                       case OBERON_CLASS_VAR:
+                       case OBERON_CLASS_VAR_PARAM:
+                       case OBERON_CLASS_PARAM:
+                               fnptr = gcc_jit_lvalue_as_rvalue(item -> var -> gen_var -> gcc_lvalue);
+                               right = gcc_jit_context_new_call_through_ptr(
+                                       gcc_context, NULL, fnptr, num_args, args
+                               );
+                               break;
+                       default:
+                               assert(0);
+                               break;
+               }
        }
        else if(item -> mode == MODE_INDEX)
        {
@@ -622,6 +643,8 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
                }
        }
 
+       printf("oberon_generate_assign: class %i := class %i\n", dst -> result -> class, src -> result -> class);
+
        gen_context_t * gen_context = ctx -> gen_context;
        gen_block_t * gen_block = gen_context -> block;
        gcc_jit_block * gcc_block = gen_block -> gcc_block;