Changeset 4325

Timestamp:

06/27/08 11:32:50 (2 months ago)

Author:

pmoura

Message:

Changed the representation of the runtime tables for loaded entities in order to drop the need of a "functors clause" per entity. This avoids redundancy on the representation of entity functors and helps reducing the size of the generated Prolog files.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (89 diffs)
• configs/yap.config (modified) (2 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)
• UPGRADING.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -64 +64 @@
 % tables of loaded entities and respective relationships
 
-:- multifile('$lgt_current_protocol_'/3).       % '$lgt_current_protocol_'(Ptc, Prefix, Type)
-:- dynamic('$lgt_current_protocol_'/3).
-
-:- multifile('$lgt_current_category_'/6).       % '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Type, Synchronized)
-:- dynamic('$lgt_current_category_'/6).
-
-:- multifile('$lgt_current_object_'/8).         % '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, Type, Synchronized, Threaded)
-:- dynamic('$lgt_current_object_'/8).
+:- multifile('$lgt_current_protocol_'/5).       % '$lgt_current_protocol_'(Ptc, Prefix, Dcl, Rnm, Type)
+:- dynamic('$lgt_current_protocol_'/5).
+
+:- multifile('$lgt_current_category_'/7).       % '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Type, Synchronized)
+:- dynamic('$lgt_current_category_'/7).
+
+:- multifile('$lgt_current_object_'/13).        % '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Type, Synchronized, Threaded)
+:- dynamic('$lgt_current_object_'/13).
 
                                                 
@@ -107 +107 @@
 
 :- multifile('$lgt_debugging_'/1).              % '$lgt_debugging_'(Entity)
-:- dynamic('$lgt_debugging_'/1).                % '$lgt_debugging_'(Entity)
+:- dynamic('$lgt_debugging_'/1).
                                                 
 :- dynamic('$lgt_dbg_debugging_'/0).            % '$lgt_dbg_debugging_'
@@ -189 +189 @@
 :- dynamic('$lgt_pp_non_terminal_'/3).          % '$lgt_pp_non_terminal_'(Functor, Args, Arity)
 
-:- dynamic('$lgt_pp_object_'/11).               % '$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Mode)
-:- dynamic('$lgt_pp_category_'/6).              % '$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, Mode)
-:- dynamic('$lgt_pp_protocol_'/5).              % '$lgt_pp_protocol_'(Ptc, Prefix, Dcl, Rnm, Mode)
+:- dynamic('$lgt_pp_object_'/11).               % '$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Type)
+:- dynamic('$lgt_pp_category_'/6).              % '$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, Type)
+:- dynamic('$lgt_pp_protocol_'/5).              % '$lgt_pp_protocol_'(Ptc, Prefix, Dcl, Rnm, Type)
 
 :- dynamic('$lgt_pp_module_'/1).                % '$lgt_pp_module_'(Module)
@@ -340 +340 @@
     ;   '$lgt_extends_object_'(_, Obj, _)
     ),
-    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _),
+    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(existence_error(object, Obj), _, _)).
 
 '$lgt_runtime_error_handler'(error(existence_error(procedure, TFunctor/7), _)) :-
     atom_concat(CtgOrPtc, '_0__dcl', TFunctor),
-    (   '$lgt_implements_protocol_'(_, CtgOrPtc, _), \+ '$lgt_current_protocol_'(CtgOrPtc, _, _) ->
+    (   '$lgt_implements_protocol_'(_, CtgOrPtc, _), \+ '$lgt_current_protocol_'(CtgOrPtc, _, _, _, _) ->
         throw(error(existence_error(protocol, CtgOrPtc), _, _))
-    ;   '$lgt_extends_protocol_'(_, CtgOrPtc, _), \+ '$lgt_current_protocol_'(CtgOrPtc, _, _) ->
+    ;   '$lgt_extends_protocol_'(_, CtgOrPtc, _), \+ '$lgt_current_protocol_'(CtgOrPtc, _, _, _, _) ->
         throw(error(existence_error(protocol, CtgOrPtc), _, _))
-    ;   '$lgt_imports_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _, _) ->
+    ;   '$lgt_imports_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _, _, _) ->
         throw(error(existence_error(category, CtgOrPtc), _, _))
-    ;   '$lgt_extends_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _, _) ->
+    ;   '$lgt_extends_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _, _, _) ->
         throw(error(existence_error(category, CtgOrPtc), _, _))
     ).
@@ -423 +423 @@
 
 current_object(Obj) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _).
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _).
 
 
@@ -435 +435 @@
 
 current_protocol(Ptc) :-
-    '$lgt_current_protocol_'(Ptc, _, _).
+    '$lgt_current_protocol_'(Ptc, _, _, _, _).
 
 
@@ -447 +447 @@
 
 current_category(Ctg) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _, _).
+    '$lgt_current_category_'(Ctg, _, _, _, _, _, _).
 
 
@@ -468 +468 @@
 
 object_property(Obj, Prop) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, Prop, _, _).        % static/dynamic property
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, Prop, _, _).     % static/dynamic property
 
 object_property(Obj, synchronized) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, yes, _).
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, yes, _).
 
 object_property(Obj, threaded) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, yes).
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, yes).
 
 
@@ -491 +491 @@
 
 category_property(Ctg, Prop) :-             % static/dynamic property
-    '$lgt_current_category_'(Ctg, _, _, _, Prop, _).
+    '$lgt_current_category_'(Ctg, _, _, _, _, Prop, _).
 
 category_property(Ctg, synchronized) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _, yes).
+    '$lgt_current_category_'(Ctg, _, _, _, _, _, yes).
 
 
@@ -511 +511 @@
 
 protocol_property(Ptc, Prop) :-     % static/dynamic property
-    '$lgt_current_protocol_'(Ptc, _, Prop).
+    '$lgt_current_protocol_'(Ptc, _, _, _, Prop).
 
 
@@ -526 +526 @@
 
 create_object(Obj, Rels, Dirs, Clauses) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(permission_error(modify, object, Obj), create_object(Obj, Rels, Dirs, Clauses))).
 
 create_object(Obj, Rels, Dirs, Clauses) :-
-    '$lgt_current_category_'(Obj, _, _, _, _, _),
+    '$lgt_current_category_'(Obj, _, _, _, _, _, _),
     throw(error(permission_error(modify, category, Obj), create_object(Obj, Rels, Dirs, Clauses))).
 
 create_object(Obj, Rels, Dirs, Clauses) :-
-    '$lgt_current_protocol_'(Obj, _, _),
+    '$lgt_current_protocol_'(Obj, _, _, _, _),
     throw(error(permission_error(modify, protocol, Obj), create_object(Obj, Rels, Dirs, Clauses))).
 
@@ -576 +576 @@
 
 create_category(Ctg, Rels, Dirs, Clauses) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _, _),
+    '$lgt_current_category_'(Ctg, _, _, _, _, _, _),
     throw(error(permission_error(modify, category, Ctg), create_category(Ctg, Rels, Dirs, Clauses))).
 
 create_category(Ctg, Rels, Dirs, Clauses) :-
-    '$lgt_current_object_'(Ctg, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(Ctg, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(permission_error(modify, object, Ctg), create_category(Ctg, Rels, Dirs, Clauses))).
 
 create_category(Ctg, Rels, Dirs, Clauses) :-
-    '$lgt_current_protocol_'(Ctg, _, _),
+    '$lgt_current_protocol_'(Ctg, _, _, _, _),
     throw(error(permission_error(modify, protocol, Ctg), create_category(Ctg, Rels, Dirs, Clauses))).
 
@@ -625 +625 @@
 
 create_protocol(Ptc, Rels, Dirs) :-
-    '$lgt_current_protocol_'(Ptc, _, _),
+    '$lgt_current_protocol_'(Ptc, _, _, _, _),
     throw(error(permission_error(modify, protocol, Ptc), create_protocol(Ptc, Rels, Dirs))).
 
 create_protocol(Ptc, Rels, Dirs) :-
-    '$lgt_current_object_'(Ptc, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(Ptc, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(permission_error(modify, object, Ptc), create_protocol(Ptc, Rels, Dirs))).
 
 create_protocol(Ptc, Rels, Dirs) :-
-    '$lgt_current_category_'(Ptc, _, _, _, _, _),
+    '$lgt_current_category_'(Ptc, _, _, _, _, _, _),
     throw(error(permission_error(modify, category, Ptc), create_protocol(Ptc, Rels, Dirs))).
 
@@ -667 +667 @@
 
 abolish_object(Obj) :-
-    (   '$lgt_current_object_'(Obj, Prefix, _, _, _, Type, _, _) ->
+    (   '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Type, _, _) ->
         (   Type == (dynamic) ->
-            call_with_args(Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm),
             '$lgt_abolish_entity_predicates'(Def),
             '$lgt_abolish_entity_predicates'(DDef),
@@ -683 +682 @@
             abolish(Rnm/3),
             abolish(Prefix/8),
-            retractall('$lgt_current_object_'(Obj, _, _, _, _, _, _, _)),
+            retractall('$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _)),
             retractall('$lgt_extends_object_'(Obj, _, _)),
             retractall('$lgt_instantiates_class_'(Obj, _, _)),
@@ -709 +708 @@
 
 abolish_category(Ctg) :-
-    (   '$lgt_current_category_'(Ctg, Prefix, _, _, Type, _) ->
+    (   '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Type, _) ->
         (   Type == (dynamic) ->
-            call_with_args(Prefix, Dcl, Def, Rnm),
             '$lgt_abolish_entity_predicates'(Def),
             abolish(Dcl/6),
@@ -718 +716 @@
             abolish(Rnm/3),
             abolish(Prefix/3),
-            retractall('$lgt_current_category_'(Ctg, _, _, _, _, _)),
+            retractall('$lgt_current_category_'(Ctg, _, _, _, _, _, _)),
             retractall('$lgt_extends_category_'(Ctg, _, _)),
             retractall('$lgt_implements_protocol_'(Ctg, _, _)),
@@ -740 +738 @@
 
 abolish_protocol(Ptc) :-
-    (   '$lgt_current_protocol_'(Ptc, Prefix, Type) ->
+    (   '$lgt_current_protocol_'(Ptc, Prefix, Dcl, Rnm, Type) ->
         (   Type == (dynamic) ->
-            call_with_args(Prefix, Dcl, Rnm),
             abolish(Dcl/6),
             abolish(Dcl/7),
             abolish(Rnm/3),
             abolish(Prefix/2),
-            retractall('$lgt_current_protocol_'(Ptc, _, _)),
+            retractall('$lgt_current_protocol_'(Ptc, _, _, _, _)),
             retractall('$lgt_extends_protocol_'(Ptc, _, _)),
             '$lgt_clean_lookup_caches'
@@ -1095 +1092 @@
 
 define_events(Event, Obj, Msg, Sender, Monitor) :-
-    \+ '$lgt_current_object_'(Monitor, _, _, _, _, _, _, _),
+    \+ '$lgt_current_object_'(Monitor, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(existence_error(object, Monitor), define_events(Event, Obj, Msg, Sender, Monitor))).
 
@@ -1101 +1098 @@
     var(Event),
     !,
-    '$lgt_current_object_'(Monitor, _, _, Def, _, _, _, _),
+    '$lgt_current_object_'(Monitor, _, _, Def, _, _, _, _, _, _, _, _, _),
     (   call_with_args(Def, before(Obj, Msg, Sender), Monitor, Monitor, Monitor, BCall, _) ->
         (   call_with_args(Def, after(Obj, Msg, Sender), Monitor, Monitor, Monitor, ACall, _) ->
@@ -1112 +1109 @@
 
 define_events(before, Obj, Msg, Sender, Monitor) :-
-    '$lgt_current_object_'(Monitor, _, _, Def, _, _, _, _),
+    '$lgt_current_object_'(Monitor, _, _, Def, _, _, _, _, _, _, _, _, _),
     call_with_args(Def, before(Obj, Msg, Sender), Monitor, Monitor, Monitor, Call, _) ->
     retractall('$lgt_before_'(Obj, Msg, Sender, Monitor, _)),
@@ -1118 +1115 @@
 
 define_events(after, Obj, Msg, Sender, Monitor) :-
-    '$lgt_current_object_'(Monitor, _, _, Def, _, _, _, _),
+    '$lgt_current_object_'(Monitor, _, _, Def, _, _, _, _, _, _, _, _, _),
     call_with_args(Def, after(Obj, Msg, Sender), Monitor, Monitor, Monitor, Call, _) ->
     retractall('$lgt_after_'(Obj, Msg, Sender, Monitor, _)),
@@ -1414 +1411 @@
 
 threaded_wait(Message) :-
-    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _),
+    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _),
     '$lgt_thread_get_notifications'(Message, Prefix).
 
@@ -1430 +1427 @@
 
 threaded_notify(Message) :-
-    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _),
+    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _),
     '$lgt_thread_send_notifications'(Message, Prefix).
 
@@ -1841 +1838 @@
 
 '$lgt_obj_exists'(Obj, Pred, Sender) :-
-    (   '$lgt_current_object_'(Obj, _, _, _, _, _, _, _) ->
+    (   '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _) ->
         true
     ;   throw(error(existence_error(object, Obj), Obj::Pred, Sender))
@@ -1866 +1863 @@
 
 '$lgt_current_predicate'(Obj, Functor/Arity, Sender, _) :-
-    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _),
+    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(existence_error(object, Obj), Obj::current_predicate(Functor/Arity), Sender)).
 
@@ -1890 +1887 @@
 
 '$lgt_visible_predicate'(Obj, Pred, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, _, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, _, _, _, _, _, _, _, _, _, _),
     call_with_args(Dcl, Pred, PScope, _, _, _, _, SCtn, _),
     once((\+ \+ PScope = Scope; Sender = SCtn)).
@@ -1912 +1909 @@
 
 '$lgt_predicate_property'(Obj, Pred, Prop, Sender, _) :-
-    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _),
+    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _),
     throw(error(existence_error(object, Obj), Obj::predicate_property(Pred, Prop), Sender)).
 
 '$lgt_predicate_property'(Obj, Pred, Prop, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, _, _, _, _, _, _),
     call_with_args(Dcl, Pred, PScope, Type, Meta, NonTerminal, Synchronized, SCtn, TCtn),
     !,
@@ -1931 +1928 @@
     ;   Synchronized \== no,
         Prop = synchronized
-    ;   '$lgt_current_object_'(TCtn, _, TCtnDcl, _, _, _, _, _),
+    ;   '$lgt_current_object_'(TCtn, _, TCtnDcl, _, _, _, _, _, _, _, _, _, _),
         \+ call_with_args(TCtnDcl, Pred, _, _, _, _, _),
         '$lgt_alias_pred'(Obj, Prefix, Pred, Pred2),
@@ -1992 +1989 @@
 '$lgt_alias_pred'(Obj, _, Alias, Pred, _) :-
     '$lgt_implements_protocol_'(Obj, Ptc, _),
-    '$lgt_current_protocol_'(Ptc, Prefix, _),
+    '$lgt_current_protocol_'(Ptc, Prefix, _, _, _),
     '$lgt_alias_pred'(Ptc, Prefix, Alias, Pred, _).
 
 '$lgt_alias_pred'(Ptc1, _, Alias, Pred, _) :-
     '$lgt_extends_protocol_'(Ptc1, Ptc2, _),
-    '$lgt_current_protocol_'(Ptc2, Prefix, _),
+    '$lgt_current_protocol_'(Ptc2, Prefix, _, _, _),
     '$lgt_alias_pred'(Ptc2, Prefix, Alias, Pred, _).
 
 '$lgt_alias_pred'(Ctg1, _, Alias, Pred, _) :-
     '$lgt_extends_category_'(Ctg1, Ctg2, _),
-    '$lgt_current_category_'(Ctg2, Prefix, _, _, _, _),
+    '$lgt_current_category_'(Ctg2, Prefix, _, _, _, _, _),
     '$lgt_alias_pred'(Ctg2, Prefix, Alias, Pred, _).
 
 '$lgt_alias_pred'(Obj, _, Alias, Pred, _) :-
     '$lgt_imports_category_'(Obj, Ctg, _),
-    '$lgt_current_category_'(Ctg, Prefix, _, _, _, _),
+    '$lgt_current_category_'(Ctg, Prefix, _, _, _, _, _),
     '$lgt_alias_pred'(Ctg, Prefix, Alias, Pred, _).
 
 '$lgt_alias_pred'(Obj, _, Alias, Pred, prototype) :-
     '$lgt_extends_object_'(Obj, Parent, _),
-    '$lgt_current_object_'(Parent, Prefix, _, _, _, _, _, _),
+    '$lgt_current_object_'(Parent, Prefix, _, _, _, _, _, _, _, _, _, _, _),
     '$lgt_alias_pred'(Parent, Prefix, Alias, Pred, prototype).
 
 '$lgt_alias_pred'(Instance, _, Alias, Pred, instance) :-
     '$lgt_instantiates_class_'(Instance, Class, _),
-    '$lgt_current_object_'(Class, Prefix, _, _, _, _, _, _),
+    '$lgt_current_object_'(Class, Prefix, _, _, _, _, _, _, _, _, _, _, _),
     '$lgt_alias_pred'(Class, Prefix, Alias, Pred, superclass).
 
 '$lgt_alias_pred'(Class, _, Alias, Pred, superclass) :-
     '$lgt_specializes_class_'(Class, Superclass, _),
-    '$lgt_current_object_'(Superclass, Prefix, _, _, _, _, _, _),
+    '$lgt_current_object_'(Superclass, Prefix, _, _, _, _, _, _, _, _, _, _, _),
     '$lgt_alias_pred'(Superclass, Prefix, Alias, Pred, superclass).
 
@@ -2059 +2056 @@
 
 '$lgt_abolish_chk'(Obj, Functor/Arity, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, _, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, _, _, _, _, DDcl, DDef, _, _, _, _),
     !,
     (   functor(Pred, Functor, Arity),
@@ -2065 +2062 @@
         (   (\+ \+ PScope = Scope; Sender = SCtn) ->
             (   Compilation == (dynamic) ->
-                call_with_args(Prefix, _, _, _, _, _, DDcl, DDef, _),
                 (   call_with_args(DDcl, Pred, _) ->
                     Clause =.. [DDcl, Pred, _],
@@ -2141 +2137 @@
 
 '$lgt_asserta_rule_chk'(Obj, (Head:-Body), Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, DDcl, DDef, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, _, _, _),
+    !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, Type, Meta, SCtn, DclScope),
     (   Type == (dynamic) ->
@@ -2176 +2171 @@
 
 '$lgt_asserta_fact_chk'(Obj, Head, Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, DDcl, DDef, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, _, _, _),
+    !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, Type, _, SCtn, DclScope),
     (   Type == (dynamic) ->
@@ -2245 +2239 @@
 
 '$lgt_assertz_rule_chk'(Obj, (Head:-Body), Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, DDcl, DDef, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, _, _, _),
+    !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, Type, Meta, SCtn, DclScope),
     (   Type == (dynamic) ->
@@ -2280 +2273 @@
 
 '$lgt_assertz_fact_chk'(Obj, Head, Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, DDcl, DDef, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, _, _, _),
+    !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, Type, _, SCtn, DclScope),
     (   Type == (dynamic) ->
@@ -2379 +2371 @@
 
 '$lgt_clause_chk'(Obj, Head, Body, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, _, DDef, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
+    !,
     (   call_with_args(Dcl, Head, PScope, Type, _, _, _, SCtn, _) ->
         (   Type == (dynamic) ->
@@ -2453 +2444 @@
 
 '$lgt_retract_var_body_chk'(Obj, (Head:-Body), Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, _, DDef, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
+    !,
     (   call_with_args(Dcl, Head, PScope, Type, _, _, _, SCtn, _) ->
         (   Type == (dynamic) ->
@@ -2505 +2495 @@
 
 '$lgt_retract_rule_chk'(Obj, (Head:-Body), Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, _, DDef, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
+    !,
     (   call_with_args(Dcl, Head, PScope, Type, _, _, _, SCtn, _) ->
         (   Type == (dynamic) ->
@@ -2545 +2534 @@
 
 '$lgt_retract_fact_chk'(Obj, Head, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, _, DDef, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
+    !,
     (   call_with_args(Dcl, Head, PScope, Type, _, _, _, SCtn, _) ->
         (   Type == (dynamic) ->
@@ -2611 +2599 @@
 
 '$lgt_retractall_chk'(Obj, Head, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _),
-    !,
-    call_with_args(Prefix, Dcl, Def, _, _, _, _, DDef, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
+    !,
     (   call_with_args(Dcl, Head, PScope, Type, _, _, _, SCtn, _) ->
         (   Type == (dynamic) ->
@@ -2784 +2771 @@
 
 '$lgt_phrase'(Obj, NonTerminal, Input, Rest, Sender, Scope) :-
-    (   '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, _) ->
+    (   '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _) ->
         NonTerminal =.. [Functor| Args],
         '$lgt_append'(Args, [Input, Rest], Args2),
@@ -2801 +2788 @@
             Obj = Sender,
             (   call_with_args(Def, Pred, Obj, Obj, Obj, Call)
-            ;   call_with_args(Prefix, _, _, _, _, _, _, DDef, _), call_with_args(DDef, Pred, Obj, Obj, Obj, Call)
+            ;   call_with_args(DDef, Pred, Obj, Obj, Obj, Call)
             )   ->
                 call(Call)
@@ -2840 +2827 @@
 
 '$lgt_term_expansion'(Obj, Term, Expansion, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
     (   (   call_with_args(Dcl, term_expansion(_, _), PScope, _, _, _, _, SCtn, _) ->
             (   (\+ \+ PScope = Scope; Sender = SCtn) ->
@@ -2849 +2836 @@
         (   call_with_args(Def, term_expansion(Term, Expansion), Obj, Obj, Obj, Call) ->
             true
-        ;   call_with_args(Prefix, _, _, _, _, _, _, DDef, _),
-            call_with_args(DDef, term_expansion(Term, Expansion), Obj, Obj, Obj, Call)
+        ;   call_with_args(DDef, term_expansion(Term, Expansion), Obj, Obj, Obj, Call)
         )
     ),
@@ -2886 +2872 @@
 
 '$lgt_send_to_self_nv'(Obj, Pred, Sender) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, _, _, _, _, _),
     (   call_with_args(Dcl, Pred, Scope, _, _, _, _, SCtn, _) ->                    % lookup declaration
         (   (Scope = p(_); Sender = SCtn) ->                                        % check scope
@@ -2933 +2919 @@
 
 '$lgt_send_to_object_nv'(Obj, Pred, Sender) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, _, _, _, _, _),
     !,
     (   call_with_args(Dcl, Pred, Scope, _, _, _, _, _, _) ->                       % lookup declaration
@@ -2992 +2978 @@
 
 '$lgt_send_to_object_ne_nv'(Obj, Pred, Sender) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, _, _, _, _, _),
     !,
     (   call_with_args(Dcl, Pred, Scope, _, _, _, _, _, _) ->                   % lookup declaration
@@ -3044 +3030 @@
 
 '$lgt_send_to_super_nv'(Self, Pred, This, Sender) :-
-    '$lgt_current_object_'(Self, _, Dcl, _, _, _, _, _),
+    '$lgt_current_object_'(Self, _, Dcl, _, _, _, _, _, _, _, _, _, _),
     call_with_args(Dcl, Pred, Scope, _, _, _, _, SCtn, _),
     !,
     (   (Scope = p(_); This = SCtn) ->                                                      % check scope
-        '$lgt_current_object_'(This, _, _, _, Super, _, _, _),
+        '$lgt_current_object_'(This, _, _, _, Super, _, _, _, _, _, _, _, _),
         functor(Pred, PFunctor, PArity), functor(GPred, PFunctor, PArity),                  % construct predicate template
         functor(This, TFunctor, TArity), functor(GThis, TFunctor, TArity),                  % construct "this" template
@@ -3136 +3122 @@
 '$lgt_metacall_in_object'(Pred, local, Sender, This, Self) :-
     !,
-    '$lgt_current_object_'(This, Prefix, _, _, _, _, _, _),
+    '$lgt_current_object_'(This, Prefix, _, _, _, _, _, _, _, _, _, _, _),
     '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, Prefix, [], _),
     '$lgt_tr_body'(Pred, Call, DCall, Ctx),
@@ -3146 +3132 @@
 '$lgt_metacall_in_object'(Pred, MetaVars, Sender, This, Self) :-
     (   \+ '$lgt_member'(Pred, MetaVars) ->
-        '$lgt_current_object_'(This, Prefix, _, _, _, _, _, _),
+        '$lgt_current_object_'(This, Prefix, _, _, _, _, _, _, _, _, _, _, _),
         '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, Prefix, [], _)
-    ;   '$lgt_current_object_'(Sender, Prefix, _, _, _, _, _, _),
+    ;   '$lgt_current_object_'(Sender, Prefix, _, _, _, _, _, _, _, _, _, _, _),
         '$lgt_ctx_ctx'(Ctx, _, Sender, Sender, Self, Prefix, [], _) 
     ),
@@ -3165 +3151 @@
 '$lgt_call_built_in'(Pred, Ctx) :-
     '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, _, _, _),
-    '$lgt_current_object_'(This, _, _, Def, _, _, _, _),
+    '$lgt_current_object_'(This, _, _, Def, _, _, _, _, _, _, _, _, _),
     (   call_with_args(Def, Pred, Sender, This, Self, Call) ->
         call(Call)
@@ -3179 +3165 @@
 '$lgt_call_within_context'(Obj, Goal, This) :-
     (   '$lgt_compiler_flag'(context_switching_calls, allow) ->
-        (   '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _) ->
+        (   '$lgt_current_object_'(Obj, Prefix, _, _, _, _, _, _, _, _, _, _, _) ->
             '$lgt_ctx_ctx'(Ctx, _, Obj, Obj, Obj, Prefix, [], _),
             '$lgt_tr_body'(Goal, TGoal, DGoal, Ctx),
@@ -3200 +3186 @@
     (   call_with_args(Dcl, Pred, _, _, _, _, _, _, _) ->
         (   '$lgt_imports_category_'(This, Ctg, _),
-            '$lgt_current_category_'(Ctg, _, _, Def, _, _),
+            '$lgt_current_category_'(Ctg, _, _, Def, _, _, _),
             call_with_args(Def, Pred, Sender, This, Self, Call, _) ->
             call(Call)