Changeset 4473 for trunk/compiler

Timestamp:

09/25/08 08:58:37 (4 months ago)

Author:

pmoura

Message:

Added a syntax construct for easy access to parametric object proxies represented as Prolog facts when sending a message ({Proxy}::Message). Updated the "proxies" example to illustrate this new functionality.

Files:

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

trunk/compiler/logtalk.pl

@@ -2942 +2942 @@
     var(Obj),
     throw(error(instantiation_error, Obj::Pred, Sender)).
-    
+
 '$lgt_send_to_object'(Obj, Pred, Sender) :-
     var(Pred),
     throw(error(instantiation_error, Obj::Pred, Sender)).
-
-'$lgt_send_to_object'({Proxy}, Pred, Sender) :-
-    !,
-    call(Proxy),
-    '$lgt_send_to_object_nv'(Proxy, Pred, Sender).
 
 '$lgt_send_to_object'(Obj, Pred, Sender) :-
@@ -3012 +3007 @@
     var(Pred),
     throw(error(instantiation_error, Obj::Pred, Sender)).
-
-'$lgt_send_to_object_ne'({Proxy}, Pred, Sender) :-
-    !,
-    call(Proxy),
-    '$lgt_send_to_object_ne_nv'(Proxy, Pred, Sender).
 
 '$lgt_send_to_object_ne'(Obj, Pred, Sender) :-
@@ -7895 +7885 @@
 % convenient access to parametric object proxies
 
-'$lgt_tr_msg'(Pred, Obj, (call(Proxy), TPred), This) :-
+'$lgt_tr_msg'(Pred, Obj, (catch(Proxy, error(Error, _), throw(error(Error, Obj::Pred, This))), TPred), This) :-
     nonvar(Obj),
     Obj = {Proxy},
     !,
-    '$lgt_tr_msg'(Pred, Proxy, TPred, This).
+    (   var(Proxy) ->
+       '$lgt_tr_msg'(Pred, Proxy, TPred, This)
+    ;   callable(Proxy) ->
+        '$lgt_tr_msg'(Pred, Proxy, TPred, This)
+    ;   throw(type_error(object_identifier, Proxy))
+    ).
+