Changeset 5048 for trunk/compiler/logtalk.pl

Timestamp:

06/26/09 18:43:49 (14 months ago)

Author:

pmoura

Message:

Corrected a bug when compiling an object or category normal predicate that redefines a built-in Prolog meta-predicate.

Files:

• trunk/compiler/logtalk.pl (modified) (7 diffs)

trunk/compiler/logtalk.pl

@@ -3629 +3629 @@
 
 
-% '$lgt_call_built_in'(+callable, +execution_context)
+% '$lgt_call_built_in'(+callable, +callable, +execution_context)
 %
 % needed for runtime translation of dynamic clauses, for dealing
 % with meta-calls that turn out to be calls to built-in predicates,
 % and for dealing with <</2 calls to redefined built-in predicates
-
-'$lgt_call_built_in'(Pred, ExCtx) :-
+%
+% the first argument, Pred, is the original predicate call, while the second
+% argument, MetaExPred, is equal to the first argument for normal predicates
+% but is meta-argument expanded for non-redefined built-in meta-predicates
+
+'$lgt_call_built_in'(Pred, MetaExPred, ExCtx) :-
     (   '$lgt_exec_ctx'(ExCtx, This, _),
         '$lgt_current_object_'(This, _, _, Def, _, _, _, _, DDef, _, _),
@@ -3645 +3649 @@
         )
     ;   % call the built-in predicate:
-        call(Pred)
+        call(MetaExPred)
     ).
 
@@ -9154 +9158 @@
 % Prolog proprietary, built-in meta-predicates
 
-'$lgt_tr_body'(Pred, '$lgt_call_built_in'(TPred, ExCtx), DPred, Ctx) :-
+'$lgt_tr_body'(Pred, '$lgt_call_built_in'(Pred, TPred, ExCtx), DPred, Ctx) :-
     '$lgt_pl_built_in'(Pred),
     functor(Pred, Functor, Arity),
@@ -9182 +9186 @@
     (   Type == control_construct ->
         DGoal =.. [Functor| DArgs],
-        DPred = '$lgt_call_built_in'(DGoal, Ctx)
-    ;   DPred = '$lgt_dbg_goal'(Pred, '$lgt_call_built_in'(TPred, ExCtx), ExCtx)
+        DPred = '$lgt_call_built_in'(Pred, DGoal, Ctx)
+    ;   DPred = '$lgt_dbg_goal'(Pred, '$lgt_call_built_in'(Pred, TPred, ExCtx), ExCtx)
     ).
 
@@ -9189 +9193 @@
 % Logtalk and Prolog built-in predicates
 
-'$lgt_tr_body'(Pred, '$lgt_call_built_in'(Pred, ExCtx), '$lgt_dbg_goal'(Pred, '$lgt_call_built_in'(Pred, ExCtx), ExCtx), Ctx) :-
+'$lgt_tr_body'(Pred, '$lgt_call_built_in'(Pred, Pred, ExCtx), '$lgt_dbg_goal'(Pred, '$lgt_call_built_in'(Pred, Pred, ExCtx), ExCtx), Ctx) :-
     '$lgt_built_in'(Pred),
     functor(Pred, Functor, Arity),
@@ -12127 +12131 @@
     TPred =.. [Functor| TArgs].
 
-'$lgt_fix_pred_calls'('$lgt_call_built_in'(Pred, ExCtx), TPred) :-
-    !,                                  % calls to Logtalk and Prolog built-in predicates
+'$lgt_fix_pred_calls'('$lgt_call_built_in'(Pred, MetaExPred, ExCtx), TPred) :-
+    !,                                  % calls to Logtalk and Prolog built-in (meta-)predicates
     (   '$lgt_pp_redefined_built_in_'(Pred, ExCtx, TPred) ->
         true
-    ;   '$lgt_fix_pred_calls'(Pred, TPred)
+    ;   '$lgt_fix_pred_calls'(MetaExPred, TPred)
     ).
 
@@ -12204 +12208 @@
     \+ '$lgt_pp_defs_nt_'(Functor, Arity),                  % non-terminal not defined in object/category and
     ExtArity is Arity + 2,
-    \+ '$lgt_pp_defs_pred_'(Functor, ExtArity),     % no corresponding predicate is defined
-    \+ '$lgt_pp_dynamic_'(Functor, ExtArity),           % no dynamic directive for the corresponding predicate 
-    once((  '$lgt_pp_public_'(Functor, ExtArity)        % but there is a scope directive for the non-terminal 
-        ;   '$lgt_pp_protected_'(Functor, ExtArity) % or the corresponding predicate 
+    \+ '$lgt_pp_defs_pred_'(Functor, ExtArity),             % no corresponding predicate is defined
+    \+ '$lgt_pp_dynamic_'(Functor, ExtArity),               % no dynamic directive for the corresponding predicate 
+    once((  '$lgt_pp_public_'(Functor, ExtArity)            % but there is a scope directive for the non-terminal 
+        ;   '$lgt_pp_protected_'(Functor, ExtArity)         % or the corresponding predicate 
         ;   '$lgt_pp_private_'(Functor, ExtArity)
     )).