Changeset 4425 for trunk/compiler

Timestamp:

08/14/08 13:36:34 (5 months ago)

Author:

pmoura

Message:

Corrected a set of singleton variable bugs in the Logtalk compiler and runtime. Thanks to Joachim Schimpf and Kish Shen work on the improved singleton variable checking code found on the new ECLiPSe 6.0 compiler.

Files:

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

trunk/compiler/logtalk.pl

@@ -2090 +2090 @@
     '$lgt_current_object_'(Obj, _, Dcl, _, _, _, _, DDcl, DDef, _, _, _, _),
     !,
-    (   functor(Pred, Functor, Arity),
-        call_with_args(Dcl, Pred, PScope, Compilation, _, _, _, SCtn, _) ->
+    functor(Pred, Functor, Arity),
+    (   call_with_args(Dcl, Pred, PScope, Compilation, _, _, _, SCtn, _) ->
         (   (\+ \+ PScope = Scope; Sender = SCtn) ->
             (   Compilation == (dynamic) ->
@@ -2809 +2809 @@
 
 '$lgt_phrase'(Obj, NonTerminal, Input, Rest, Sender, Scope) :-
+    NonTerminal =.. [Functor| Args],
+    '$lgt_append'(Args, [Input, Rest], Args2),
+    Pred =.. [Functor| Args2],
     (   '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _) ->
-        NonTerminal =.. [Functor| Args],
-        '$lgt_append'(Args, [Input, Rest], Args2),
-        Pred =.. [Functor| Args2],
         (   call_with_args(Dcl, Pred, PScope, _, _, _, _, SCtn, _) ->
             (   (\+ \+ PScope = Scope; Sender = SCtn) ->
@@ -8737 +8737 @@
             assertz('$lgt_pp_implemented_protocol_'(Ptc, Prefix, Dcl, Scope)),
             '$lgt_tr_implements_protocol'(Refs, ObjOrCtg)
-        ;   throw(type_error(protocol_identifier, Ptc))
+        ;   throw(type_error(protocol_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))
@@ -8766 +8766 @@
             assertz('$lgt_pp_imported_category_'(Ctg, Prefix, Dcl, Def, Scope)),
             '$lgt_tr_imports_category'(Refs, Obj)
-        ;   throw(type_error(category_identifier, Ctg))
+        ;   throw(type_error(category_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))
@@ -8795 +8795 @@
             assertz('$lgt_pp_instantiated_class_'(Class, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Scope)),
             '$lgt_tr_instantiates_class'(Refs, Obj)
-        ;   throw(type_error(object_identifier, Class))
+        ;   throw(type_error(object_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))
@@ -8824 +8824 @@
             assertz('$lgt_pp_specialized_class_'(Superclass, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Scope)),
             '$lgt_tr_specializes_class'(Refs, Class)
-        ;   throw(type_error(object_identifier, Superclass))
+        ;   throw(type_error(object_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))
@@ -8853 +8853 @@
             assertz('$lgt_pp_extended_object_'(Parent, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Scope)),
             '$lgt_tr_extends_object'(Refs, Obj)
-        ;   throw(type_error(object_identifier, Parent))
+        ;   throw(type_error(object_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))
@@ -8882 +8882 @@
             assertz('$lgt_pp_extended_protocol_'(Ptc2, Prefix, Dcl, Scope)),
             '$lgt_tr_extends_protocol'(Refs, Ptc1)
-        ;   throw(type_error(protocol_identifier, Ptc2))
+        ;   throw(type_error(protocol_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))
@@ -8911 +8911 @@
             assertz('$lgt_pp_extended_category_'(Ctg2, Prefix, Dcl, Def, Scope)),
             '$lgt_tr_extends_category'(Refs, Ctg1)
-        ;   throw(type_error(category_identifier, Ctg2))
+        ;   throw(type_error(category_identifier, Ref))
         )
     ;   throw(type_error(scope, Ref))