Changeset 1528 for trunk/compiler

Timestamp:

09/25/04 04:38:21 (4 years ago)

Author:

pmoura

Message:

Minor code cleanup.

Files:

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

trunk/compiler/logtalk.pl

@@ -1748 +1748 @@
 
 '$lgt_phrase'(Obj, Ruleset, Input, Rest, Sender, Scope) :-
-    Ruleset =.. [Functor| Args],
-    '$lgt_append'(Args, [Input, Rest], Args2),
-    Pred =.. [Functor| Args2],
-    ('$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _) ->
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _) ->
+        Ruleset =.. [Functor| Args],
+        '$lgt_append'(Args, [Input, Rest], Args2),
+        Pred =.. [Functor| Args2],
         ('$lgt_call'(Dcl, Pred, PScope, _, _, SCtn, _) ->
             ((\+ \+ PScope = Scope; Sender = SCtn) ->
@@ -1770 +1770 @@
                 throw(error(existence_error(predicate_declaration, Pred), Obj::phrase(Ruleset, Input, Rest), Sender))))
         ;
-        throw(error(existence_error(object, Obj), Obj::phrase(Ruleset, Input, Rest), Sender))).
+        throw(error(existence_error(object, Obj), Obj::phrase(Ruleset, Input, Rest), Sender)).
 
 
@@ -4052 +4052 @@
     '$lgt_this'(Ctx, This).
 
-'$lgt_tr_body'(phrase(Ruleset, List), '$lgt_phrase'(This, Ruleset, List, This, _), '$lgt_dbg_goal'(phrase(Ruleset, List), '$lgt_phrase'(This, Ruleset, List, This, _), Ctx), Ctx) :-
+'$lgt_tr_body'(phrase(Ruleset, Input), '$lgt_phrase'(This, Ruleset, Input, This, _), '$lgt_dbg_goal'(phrase(Ruleset, Input), '$lgt_phrase'(This, Ruleset, Input, This, _), Ctx), Ctx) :-
     !,
     '$lgt_this'(Ctx, This).
 
-'$lgt_tr_body'(phrase(Ruleset, List, Rest), '$lgt_phrase'(This, Ruleset, List, Rest, This, _), '$lgt_dbg_goal'(phrase(Ruleset, List, Rest), '$lgt_phrase'(This, Ruleset, List, Rest, This, _), Ctx), Ctx) :-
+'$lgt_tr_body'(phrase(Ruleset, Input, Rest), '$lgt_phrase'(This, Ruleset, Input, Rest, This, _), '$lgt_dbg_goal'(phrase(Ruleset, Input, Rest), '$lgt_phrase'(This, Ruleset, Input, Rest, This, _), Ctx), Ctx) :-
     !,
     '$lgt_this'(Ctx, This).