Changeset 4511 for trunk/compiler

Timestamp:

10/17/08 08:30:34 (3 months ago)

Author:

pmoura

Message:

Implemented a more flexible internal representation of entity properties. Added entity property file/1 for entities compiled and loaded from source files (for back-end Prolog compilers where the stream_property/2 built-in predicate supports the file_name/1 property).

Files:

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

trunk/compiler/logtalk.pl

@@ -65 +65 @@
 
 
-% tables of loaded entities and respective relationships
+% tables of loaded entities, entity properties, and entity relations
 
 :- 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).
-
-                                                
+:- multifile('$lgt_current_category_'/6).       % '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Type)
+:- dynamic('$lgt_current_category_'/6).
+
+:- multifile('$lgt_current_object_'/11).        % '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Type)
+:- dynamic('$lgt_current_object_'/11).
+
+:- multifile('$lgt_entity_property_'/2).        % '$lgt_entity_property_'(Entity, Property)
+:- dynamic('$lgt_entity_property_'/2).
+    
 :- multifile('$lgt_implements_protocol_'/3).    % '$lgt_implements_protocol_'(ObjOrCtg, Ptc, Scope)
 :- dynamic('$lgt_implements_protocol_'/3).
@@ -348 +350 @@
     ;   '$lgt_extends_object_'(_, Obj, _)
     ),
-    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _),
+    \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _),
     throw(error(existence_error(object, Obj), _, _)).
 
@@ -357 +359 @@
     ;   '$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), _, _))
     ).
@@ -432 +434 @@
 
 current_object(Obj) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _).
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _).
 
 
@@ -456 +458 @@
 
 current_category(Ctg) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _, _, _).
+    '$lgt_current_category_'(Ctg, _, _, _, _, _).
 
 
@@ -477 +479 @@
 
 object_property(Obj, Prop) :-               % static/dynamic property
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, Prop, _, _).
-
-object_property(Obj, synchronized) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, yes, _).
-
-object_property(Obj, threaded) :-
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, yes).
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, Prop).
+
+object_property(Obj, Prop) :-
+    '$lgt_entity_property_'(Obj, Prop).
 
 
@@ -500 +499 @@
 
 category_property(Ctg, Prop) :-             % static/dynamic property
-    '$lgt_current_category_'(Ctg, _, _, _, _, Prop, _).
-
-category_property(Ctg, synchronized) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _, _, yes).
+    '$lgt_current_category_'(Ctg, _, _, _, _, Prop).
+
+category_property(Ctg, Prop) :-
+    '$lgt_entity_property_'(Ctg, Prop).
 
 
@@ -522 +521 @@
     '$lgt_current_protocol_'(Ptc, _, _, _, Prop).
 
+protocol_property(Ptc, Prop) :-
+    '$lgt_entity_property_'(Ptc, Prop).
+
 
 
@@ -537 +539 @@
 create_object(Obj, Rels, Dirs, Clauses) :-
     nonvar(Obj),
-    '$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) :-
     nonvar(Obj),
-    '$lgt_current_category_'(Obj, _, _, _, _, _, _),
+    '$lgt_current_category_'(Obj, _, _, _, _, _),
     throw(error(permission_error(modify, category, Obj), create_object(Obj, Rels, Dirs, Clauses))).
 
@@ -595 +597 @@
 create_category(Ctg, Rels, Dirs, Clauses) :-
     nonvar(Ctg),
-    '$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) :-
     nonvar(Ctg),
-    '$lgt_current_object_'(Ctg, _, _, _, _, _, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(Ctg, _, _, _, _, _, _, _, _, _, _),
     throw(error(permission_error(modify, object, Ctg), create_category(Ctg, Rels, Dirs, Clauses))).
 
@@ -657 +659 @@
 create_protocol(Ptc, Rels, Dirs) :-
     nonvar(Ptc),
-    '$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) :-
     nonvar(Ptc),
-    '$lgt_current_category_'(Ptc, _, _, _, _, _, _),
+    '$lgt_current_category_'(Ptc, _, _, _, _, _),
     throw(error(permission_error(modify, category, Ptc), create_protocol(Ptc, Rels, Dirs))).
 
@@ -697 +699 @@
         atom_codes(Id, [Base| Codes]),
     \+ '$lgt_current_protocol_'(Id, _, _, _, _),
-    \+ '$lgt_current_object_'(Id, _, _, _, _, _, _, _, _, _, _, _, _),
-    \+ '$lgt_current_category_'(Id, _, _, _, _, _, _),
+    \+ '$lgt_current_object_'(Id, _, _, _, _, _, _, _, _, _, _),
+    \+ '$lgt_current_category_'(Id, _, _, _, _, _),
     !.
 
@@ -720 +722 @@
 
 abolish_object(Obj) :-
-    (   '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Type, _, _) ->
+    (   '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Type) ->
         (   Type == (dynamic) ->
             '$lgt_abolish_entity_predicates'(Def),
@@ -735 +737 @@
             abolish(Rnm/3),
             abolish(Prefix/8),
-            retractall('$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _)),
+            retractall('$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _)),
+            retractall('$lgt_entity_property_'(Obj, _)),
             retractall('$lgt_extends_object_'(Obj, _, _)),
             retractall('$lgt_instantiates_class_'(Obj, _, _)),
@@ -761 +764 @@
 
 abolish_category(Ctg) :-
-    (   '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Type, _) ->
+    (   '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Type) ->
         (   Type == (dynamic) ->
             '$lgt_abolish_entity_predicates'(Def),
@@ -769 +772 @@
             abolish(Rnm/3),
             abolish(Prefix/3),
-            retractall('$lgt_current_category_'(Ctg, _, _, _, _, _, _)),
+            retractall('$lgt_current_category_'(Ctg, _, _, _, _, _)),
+            retractall('$lgt_entity_property_'(Ctg, _)),
             retractall('$lgt_extends_category_'(Ctg, _, _)),
             retractall('$lgt_implements_protocol_'(Ctg, _, _)),
@@ -798 +802 @@
             abolish(Prefix/2),
             retractall('$lgt_current_protocol_'(Ptc, _, _, _, _)),
+            retractall('$lgt_entity_property_'(Ptc, _)),
             retractall('$lgt_extends_protocol_'(Ptc, _, _)),
             '$lgt_clean_lookup_caches'
@@ -1145 +1150 @@
 
 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))).
 
@@ -1151 +1156 @@
     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, _) ->
@@ -1162 +1167 @@
 
 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, _)),
@@ -1168 +1173 @@
 
 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, _)),
@@ -1464 +1469 @@
 
 threaded_wait(Message) :-
-    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _) ->
+    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _) ->
     '$lgt_thread_get_notifications'(Message, Prefix).
 
@@ -1480 +1485 @@
 
 threaded_notify(Message) :-
-    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _) ->
+    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _) ->
     '$lgt_thread_send_notifications'(Message, Prefix).
 
@@ -1891 +1896 @@
 
 '$lgt_obj_exists'(Obj, Pred, Sender) :-
-    (   '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _, _, _) ->
+    (   '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, _) ->
         true
     ;   throw(error(existence_error(object, Obj), Obj::Pred, Sender))
@@ -1916 +1921 @@
 
 '$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)).
 
@@ -1940 +1945 @@
 
 '$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)).
@@ -1962 +1967 @@
 
 '$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, _, Dcl, Def, _, _, _, _, _, Rnm, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, _, Rnm, _),
     call_with_args(Dcl, Pred, PScope, Type, Meta, NonTerminal, Synchronized, SCtn, TCtn),
     !,
@@ -1981 +1986 @@
     ;   Synchronized \== no,
         Prop = synchronized
-    ;   once((  '$lgt_current_object_'(TCtn, _, TCtnDcl, _, _, _, _, _, _, _, _, _, _)
-            ;   '$lgt_current_category_'(TCtn, _, TCtnDcl, _, _, _, _)
+    ;   once((  '$lgt_current_object_'(TCtn, _, TCtnDcl, _, _, _, _, _, _, _, _)
+            ;   '$lgt_current_category_'(TCtn, _, TCtnDcl, _, _, _)
             ;   '$lgt_current_protocol_'(TCtn, _, TCtnDcl, _, _)
         )),
@@ -2079 +2084 @@
 '$lgt_alias_pred'(Ctg1, _, Alias, Pred, _) :-
     '$lgt_extends_category_'(Ctg1, Ctg2, _),
-    '$lgt_current_category_'(Ctg2, _, _, _, Rnm, _, _),
+    '$lgt_current_category_'(Ctg2, _, _, _, Rnm, _),
     '$lgt_alias_pred'(Ctg2, Rnm, Alias, Pred, _).
 
 '$lgt_alias_pred'(Obj, _, Alias, Pred, _) :-
     '$lgt_imports_category_'(Obj, Ctg, _),
-    '$lgt_current_category_'(Ctg, _, _, _, Rnm, _, _),
+    '$lgt_current_category_'(Ctg, _, _, _, Rnm, _),
     '$lgt_alias_pred'(Ctg, Rnm, Alias, Pred, _).
 
 '$lgt_alias_pred'(Obj, _, Alias, Pred, prototype) :-
     '$lgt_extends_object_'(Obj, Parent, _),
-    '$lgt_current_object_'(Parent, _, _, _, _, _, _, _, _, Rnm, _, _, _),
+    '$lgt_current_object_'(Parent, _, _, _, _, _, _, _, _, Rnm, _),
     '$lgt_alias_pred'(Parent, Rnm, Alias, Pred, prototype).
 
 '$lgt_alias_pred'(Instance, _, Alias, Pred, instance) :-
     '$lgt_instantiates_class_'(Instance, Class, _),
-    '$lgt_current_object_'(Class, _, _, _, _, _, _, _, _, Rnm, _, _, _),
+    '$lgt_current_object_'(Class, _, _, _, _, _, _, _, _, Rnm, _),
     '$lgt_alias_pred'(Class, Rnm, Alias, Pred, superclass).
 
 '$lgt_alias_pred'(Class, _, Alias, Pred, superclass) :-
     '$lgt_specializes_class_'(Class, Superclass, _),
-    '$lgt_current_object_'(Superclass, _, _, _, _, _, _, _, _, Rnm, _, _, _),
+    '$lgt_current_object_'(Superclass, _, _, _, _, _, _, _, _, Rnm, _),
     '$lgt_alias_pred'(Superclass, Rnm, Alias, Pred, superclass).
 
@@ -2136 +2141 @@
 
 '$lgt_abolish_chk'(Obj, Functor/Arity, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, _, _, _, _, DDcl, DDef, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, _, _, _, _, DDcl, DDef, _, _),
     !,
     functor(Pred, Functor, Arity),
@@ -2217 +2222 @@
 
 '$lgt_asserta_rule_chk'(Obj, (Head:-Body), Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType),
     !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, PredType, Meta, SCtn, DclScope),
@@ -2251 +2256 @@
 
 '$lgt_asserta_fact_chk'(Obj, Head, Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType),
     !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, PredType, _, SCtn, DclScope),
@@ -2319 +2324 @@
 
 '$lgt_assertz_rule_chk'(Obj, (Head:-Body), Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType),
     !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, PredType, Meta, SCtn, DclScope),
@@ -2353 +2358 @@
 
 '$lgt_assertz_fact_chk'(Obj, Head, Sender, TestScope, DclScope) :-
-    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, Prefix, Dcl, Def, _, _, _, DDcl, DDef, _, ObjType),
     !,
     '$lgt_assert_pred_dcl'(Dcl, DDcl, Head, Scope, PredType, _, SCtn, DclScope),
@@ -2451 +2456 @@
 
 '$lgt_clause_chk'(Obj, Head, Body, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType),
     !,
     (   call_with_args(Dcl, Head, PScope, PredType, _, _, _, SCtn, _) ->
@@ -2524 +2529 @@
 
 '$lgt_retract_var_body_chk'(Obj, (Head:-Body), Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType),
     !,
     (   call_with_args(Dcl, Head, PScope, PredType, _, _, _, SCtn, _) ->
@@ -2575 +2580 @@
 
 '$lgt_retract_rule_chk'(Obj, (Head:-Body), Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType),
     !,
     (   call_with_args(Dcl, Head, PScope, PredType, _, _, _, SCtn, _) ->
@@ -2614 +2619 @@
 
 '$lgt_retract_fact_chk'(Obj, Head, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType),
     !,
     (   call_with_args(Dcl, Head, PScope, PredType, _, _, _, SCtn, _) ->
@@ -2679 +2684 @@
 
 '$lgt_retractall_chk'(Obj, Head, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, ObjType),
     !,
     (   call_with_args(Dcl, Head, PScope, PredType, _, _, _, SCtn, _) ->
@@ -2860 +2865 @@
     '$lgt_append'(Args, [Input, Rest], Args2),
     Pred =.. [Functor| Args2],
-    (   '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _) ->
+    (   '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _) ->
         (   call_with_args(Dcl, Pred, PScope, _, _, _, _, SCtn, _) ->
             (   (\+ \+ PScope = Scope; Sender = SCtn) ->
@@ -2913 +2918 @@
 
 '$lgt_term_expansion'(Obj, Term, Expansion, Sender, Scope) :-
-    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _, _, _),
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _),
     (   (   call_with_args(Dcl, term_expansion(_, _), PScope, _, _, _, _, SCtn, _) ->
             (   (\+ \+ PScope = Scope; Sender = SCtn) ->
@@ -2958 +2963 @@
 
 '$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
@@ -3006 +3011 @@
 
 '$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, _, _, _, _, SCtn, _) ->                    % lookup declaration
@@ -3065 +3070 @@
 
 '$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, _, _, _, _, SCtn, _) ->                % lookup declaration
@@ -3218 +3223 @@
 '$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),
@@ -3229 +3234 @@
 '$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, [], _) 
     ),
@@ -3249 +3254 @@
 '$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)
@@ -3263 +3268 @@
 '$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),
@@ -3285 +3290 @@
         call_with_args(Rnm, Ctg, Pred, Alias),
         (   '$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)
@@ -3351 +3356 @@
 
 
-'$lgt_current_object_'(logtalk, '$lgt_bio_logtalk_0_', '$lgt_bio_logtalk_0__dcl', '$lgt_bio_logtalk_0__def', '$lgt_bio_logtalk_0__super', '$lgt_bio_logtalk_0__idcl', '$lgt_bio_logtalk_0__idef', '$lgt_bio_logtalk_0__ddcl', '$lgt_bio_logtalk_0__ddef', '$lgt_bio_logtalk_0__alias', static, no, no).
-'$lgt_current_object_'(user, '$lgt_bio_user_0_', '$lgt_bio_user_0__dcl', '$lgt_bio_user_0__def', '$lgt_bio_user_0__super', '$lgt_bio_user_0__idcl', '$lgt_bio_user_0__idef', '$lgt_bio_user_0__ddcl', '$lgt_bio_user_0__ddef', '$lgt_bio_user_0__alias', static, no, yes).
-'$lgt_current_object_'(debugger, '$lgt_bio_debugger_0_', '$lgt_bio_debugger_0__dcl', '$lgt_bio_debugger_0__def', '$lgt_bio_debugger_0__super', '$lgt_bio_debugger_0__idcl', '$lgt_bio_debugger_0__idef', '$lgt_bio_debugger_0__ddcl', '$lgt_bio_debugger_0__ddef', '$lgt_bio_debugger_0__alias', static, no, no).
+'$lgt_current_object_'(logtalk, '$lgt_bio_logtalk_0_', '$lgt_bio_logtalk_0__dcl', '$lgt_bio_logtalk_0__def', '$lgt_bio_logtalk_0__super', '$lgt_bio_logtalk_0__idcl', '$lgt_bio_logtalk_0__idef', '$lgt_bio_logtalk_0__ddcl', '$lgt_bio_logtalk_0__ddef', '$lgt_bio_logtalk_0__alias', static).
+'$lgt_current_object_'(user, '$lgt_bio_user_0_', '$lgt_bio_user_0__dcl', '$lgt_bio_user_0__def', '$lgt_bio_user_0__super', '$lgt_bio_user_0__idcl', '$lgt_bio_user_0__idef', '$lgt_bio_user_0__ddcl', '$lgt_bio_user_0__ddef', '$lgt_bio_user_0__alias', static).
+'$lgt_current_object_'(debugger, '$lgt_bio_debugger_0_', '$lgt_bio_debugger_0__dcl', '$lgt_bio_debugger_0__def', '$lgt_bio_debugger_0__super', '$lgt_bio_debugger_0__idcl', '$lgt_bio_debugger_0__idef', '$lgt_bio_debugger_0__ddcl', '$lgt_bio_debugger_0__ddef', '$lgt_bio_debugger_0__alias', static).
 
 
 '$lgt_current_protocol_'(expanding, '$lgt_bip_expanding_0_', '$lgt_bip_expanding_0__dcl', '$lgt_bip_expanding_0__alias', static).
 '$lgt_current_protocol_'(monitoring, '$lgt_bip_monitoring_0_', '$lgt_bip_monitoring_0__dcl', '$lgt_bip_monitoring_0__alias', static).
+
+
+'$lgt_entity_property_'(user, threaded).
 
 
@@ -3466 +3474 @@
 
 '$lgt_hidden_functor'(Functor) :-
-    '$lgt_current_category_'(_, Prefix, _, _, _, _, _),
+    '$lgt_current_category_'(_, Prefix, _, _, _, _),
     atom_concat(Prefix, _, Functor),
     !.
 
 '$lgt_hidden_functor'(Functor) :-
-    '$lgt_current_object_'(_, Prefix, _, _, _, _, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(_, Prefix, _, _, _, _, _, _, _, _, _),
     atom_concat(Prefix, _, Functor),
     !.
@@ -4196 +4204 @@
 '$lgt_check_redefined_entities' :-
     (   '$lgt_pp_file_rclause_'('$lgt_current_protocol_'(Entity, _, _, _, _))
-    ;   '$lgt_pp_file_rclause_'('$lgt_current_category_'(Entity, _, _, _, _, _, _))
-    ;   '$lgt_pp_file_rclause_'('$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _, _, _))
+    ;   '$lgt_pp_file_rclause_'('$lgt_current_category_'(Entity, _, _, _, _, _))
+    ;   '$lgt_pp_file_rclause_'('$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _))
     ),
     '$lgt_redefined_entity'(Entity, Type),
@@ -4213 +4221 @@
 
 '$lgt_redefined_entity'(Entity, Type) :-
-    (   '$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _, _, _) ->
+    (   '$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _) ->
         Type = object
     ;   '$lgt_current_protocol_'(Entity, _, _, _, _) ->
         Type = protocol
-    ;   '$lgt_current_category_'(Entity, _, _, _, _, _, _) ->
+    ;   '$lgt_current_category_'(Entity, _, _, _, _, _) ->
         Type = category
     ).
@@ -4245 +4253 @@
     retractall('$lgt_before_'(_, _, _, Entity, _)),
     retractall('$lgt_after_'(_, _, _, Entity, _)),
-    retractall('$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _, _, _)),
+    retractall('$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _)),
     retractall('$lgt_current_protocol_'(Entity, _, _, _, _)),
-    retractall('$lgt_current_category_'(Entity, _, _, _, _, _, _)),
+    retractall('$lgt_current_category_'(Entity, _, _, _, _, _)),
     retractall('$lgt_implements_protocol_'(Entity, _, _)),
     retractall('$lgt_imports_category_'(Entity, _, _)),
@@ -4644 +4652 @@
 
 
+% '$lgt_add_entity_file_properties'(@entity_identifier, @stream)
+%
+% adds entity properties related to the entity source file
+
+'$lgt_add_entity_file_properties'(Entity, Input) :-
+%   (   catch('$lgt_stream_current_line_number'(Input, Line), _, fail) ->
+%       assertz('$lgt_pp_file_rclause_'('$lgt_entity_property_'(Entity, line_count(Line))))
+%   ;   true
+%   ),
+    (   catch(stream_property(Input, file_name(File)), _, fail) ->
+        assertz('$lgt_pp_rclause_'('$lgt_entity_property_'(Entity, file(File))))
+    ;   true
+    ).
+
+
+
 % '$lgt_report_singletons'(+list, +term, @stream)
 %
-% report the singleton variables found while compiling an entity term
+% reports the singleton variables found while compiling an entity term
 
 '$lgt_report_singletons'(TSingletons, Term, Input) :-
@@ -5092 +5116 @@
     '$lgt_pp_rclause_'(Clause).
 
-'$lgt_pp_rclause'('$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Mode, Synchronized, Threaded)) :-
+'$lgt_pp_rclause'('$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Mode)) :-
     '$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Mode),
-    !,
-    (   '$lgt_pp_synchronized_' ->
-        Synchronized = yes
-    ;   Synchronized = no
-    ),
-    (   '$lgt_pp_threaded_' ->
-        Threaded = yes
-    ;   Threaded = no
-    ).
+    !.
 
 '$lgt_pp_rclause'('$lgt_current_protocol_'(Ptc, Prefix, Dcl, Rnm, Mode)) :-
@@ -5108 +5124 @@
     !.
 
-'$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Mode, Synchronized)) :-
+'$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Mode)) :-
     '$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, Mode),
-    !,
-    (   '$lgt_pp_synchronized_' ->
-        Synchronized = yes
-    ;   Synchronized = no
-    ).
+    !.