Changeset 4440 for trunk/compiler

Timestamp:

08/21/08 04:06:57 (5 months ago)

Author:

pmoura

Message:

Corrected a bug in the compilation of source file op/3 directives whose third argument is a list of operator specifiers instead of a single operator specifier.

Applied several optimizations to the Logtalk compiler, mostly related to non-detected deterministic predicates due to calls to dynamic predicates or due to limitations in clause indexing by most Prolog compilers.

Files:

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

trunk/compiler/logtalk.pl

@@ -335 +335 @@
 
 '$lgt_runtime_error_handler'(error(existence_error(procedure, TFunctor/8), _)) :-
-    once((atom_concat(ObjArity, '__idcl', TFunctor); atom_concat(ObjArity, '__dcl', TFunctor))),
+    once((  atom_concat(ObjArity, '__idcl', TFunctor)
+        ;   atom_concat(ObjArity, '__dcl', TFunctor)
+    )),
     atom_chars(ObjArity, ObjArityChars),
     '$lgt_append'(FunctorChars, ['_', ArityChar| ArityChars], ObjArityChars),
@@ -361 +363 @@
 
 '$lgt_runtime_error_handler'(error(existence_error(procedure, TFunctor1/TArity1), context(':'(_, TFunctor2/TArity2), _))) :-
+    !,
     '$lgt_runtime_error_handler'(error(existence_error(procedure, TFunctor1/TArity1), context(TFunctor2/TArity2, _))).
 
@@ -402 +405 @@
 
 '$lgt_runtime_error_handler'(logtalk_debugger_aborted) :-
+    !,
     write('Debugging session aborted by user. Debugger still on.'), nl,
     abort.
@@ -1415 +1419 @@
 
 threaded_wait(Message) :-
-    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _) ->
     '$lgt_thread_get_notifications'(Message, Prefix).
 
@@ -1431 +1435 @@
 
 threaded_notify(Message) :-
-    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _),
+    '$lgt_current_object_'(user, Prefix, _, _, _, _, _, _, _, _, _, _, _) ->
     '$lgt_thread_send_notifications'(Message, Prefix).
 
@@ -1519 +1523 @@
 
 '$lgt_inc_compile_warnings_counter' :-
-    retract('$lgt_pp_comp_warnings_counter_'(Old)),
+    retract('$lgt_pp_comp_warnings_counter_'(Old)) ->
     New is Old + 1,
     asserta('$lgt_pp_comp_warnings_counter_'(New)),
@@ -1529 +1533 @@
 
 '$lgt_inc_load_warnings_counter' :-
-    retract('$lgt_pp_load_warnings_counter_'(Old)),
+    retract('$lgt_pp_load_warnings_counter_'(Old)) ->
     New is Old + 1,
     asserta('$lgt_pp_load_warnings_counter_'(New)).
@@ -1535 +1539 @@
 
 '$lgt_report_warning_numbers'(Term) :-
-    (   retract('$lgt_pp_warnings_top_argument_'(Term)) ->              % if top compilation/loading goal then
-        retract('$lgt_pp_comp_warnings_counter_'(CCounter)),            % report compilation and loading warnings
-        retract('$lgt_pp_load_warnings_counter_'(LCounter)),
+    (   retract('$lgt_pp_warnings_top_argument_'(Term)),                % if top compilation/loading goal then
+        retract('$lgt_pp_comp_warnings_counter_'(CCounter)),            % report compilation and loading warnings
+        retract('$lgt_pp_load_warnings_counter_'(LCounter)) ->
         (   '$lgt_compiler_flag'(report, on) ->
             (   CCounter + LCounter =:= 0 ->                            % no warnings
@@ -1891 +1895 @@
 
 '$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)).
@@ -2785 +2789 @@
 '$lgt_phrase'(Obj, (GREither; GROr), Input, Rest, Sender, Scope) :-
     !,
-    ('$lgt_phrase'(Obj, GREither, Input, Rest, Sender, Scope)
-     ;
-     '$lgt_phrase'(Obj, GROr, Input, Rest, Sender, Scope)).
+    (   '$lgt_phrase'(Obj, GREither, Input, Rest, Sender, Scope)
+    ;   '$lgt_phrase'(Obj, GROr, Input, Rest, Sender, Scope)
+    ).
 
 '$lgt_phrase'(Obj, (GRIf -> GRThen), Input, Rest, Sender, Scope) :-
@@ -2890 +2894 @@
 
 
-% '$lgt_send_to_self'(+object, ?term, +object)
+% '$lgt_send_to_self'(+object_identifier, ?term, +object_identifier)
 
 '$lgt_send_to_self'(Obj, Pred, Sender) :-
@@ -2901 +2905 @@
 
 
-% '$lgt_send_to_self_nv'(+object, +term, +object)
+% '$lgt_send_to_self_nv'(+object_identifier, +term, +object_identifier)
 
 '$lgt_send_to_self_nv'(Obj, Pred, Sender) :-
@@ -2910 +2914 @@
 '$lgt_send_to_self_nv'(Obj, Pred, Sender) :-
     '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, _, _, _, _, _),
+    !,
     (   call_with_args(Dcl, Pred, Scope, _, _, _, _, SCtn, _) ->                    % lookup declaration
         (   (Scope = p(_); Sender = SCtn) ->                                        % check scope
@@ -2931 +2936 @@
 
 
-% '$lgt_send_to_object'(@object, ?term, +object)
+% '$lgt_send_to_object'(@object_identifier, ?term, +object_identifier)
 
 '$lgt_send_to_object'(Obj, Pred, Sender) :-
@@ -2946 +2951 @@
 
 
-% '$lgt_send_to_object_nv'(+object, +term, +object)
+% '$lgt_send_to_object_nv'(+object_identifier, +term, +object_identifier)
 
 '$lgt_send_to_object_nv'(Obj, Pred, Sender) :-
@@ -2992 +2997 @@
 
 
-% '$lgt_send_to_object_ne'(@object, ?term, +object)
+% '$lgt_send_to_object_ne'(@object_identifier, ?term, +object_identifier)
 
 '$lgt_send_to_object_ne'(Obj, Pred, Sender) :-
@@ -3007 +3012 @@
 
 
-% '$lgt_send_to_object_ne_nv'(+object, +term, +object)
+% '$lgt_send_to_object_ne_nv'(+object_identifier, +term, +object_identifier)
 
 '$lgt_send_to_object_ne_nv'(Obj, Pred, Sender) :-
@@ -3093 +3098 @@
 
 
-% '$lgt_metacall_in_object'(?term, ?term, ?term, +object, +object, +object)
+% '$lgt_metacall_in_object'(?term, ?term, ?term, +object_identifier, +object_identifier, +object_identifier)
 %
 % performs a meta-call constructed from a closure and a list of addtional arguments
@@ -3151 +3156 @@
 
 
-% '$lgt_metacall_in_object'(?term, ?term, +object, +object, +object)
+% '$lgt_metacall_in_object'(?term, ?term, +object_identifier, +object_identifier, +object_identifier)
 %
 % performs a meta-call at runtime
@@ -3171 +3176 @@
     '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, Prefix, [], _),
     '$lgt_tr_body'(Pred, Call, DCall, Ctx),
+    !,
     (   '$lgt_dbg_debugging_', '$lgt_debugging_'(Sender) ->
         call(DCall)
@@ -3184 +3190 @@
     ),
     '$lgt_tr_body'(Pred, Call, DCall, Ctx),
+    !,
     (   '$lgt_dbg_debugging_', '$lgt_debugging_'(Sender) ->
         call(DCall)
@@ -3197 +3204 @@
 '$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)
@@ -3745 +3752 @@
 
 '$lgt_dbg_leashing'(Port, Goal, DbgCtx, Code) :-
-    '$lgt_dbg_leashing_'(Port),
+    '$lgt_dbg_leashing_'(Port) ->
     (   '$lgt_dbg_tracing_' ->
         Code = ' '
@@ -3822 +3829 @@
             write(Code), '$lgt_dbg_write_port_name'(Port), writeq(Goal), write(' ? '),
             catch('$lgt_read_single_char'(Option), _, fail),
-        once('$lgt_dbg_valid_port_option'(Option, Port, Code)),
+        '$lgt_dbg_valid_port_option'(Option, Port, Code),
         '$lgt_dbg_do_port_option'(Option, Port, Goal, Error, DbgCtx, Action),
         !
@@ -3851 +3858 @@
 
 
-'$lgt_dbg_valid_port_option'(' ', _, _).
-'$lgt_dbg_valid_port_option'(c, _, _).
-'$lgt_dbg_valid_port_option'(l, _, _).
-'$lgt_dbg_valid_port_option'(s, _, _).
-'$lgt_dbg_valid_port_option'(i, call, _).
-'$lgt_dbg_valid_port_option'(i, redo, _).
-'$lgt_dbg_valid_port_option'(f, call, _).
-'$lgt_dbg_valid_port_option'(f, fact, _).
-'$lgt_dbg_valid_port_option'(f, rule, _).
-'$lgt_dbg_valid_port_option'(f, redo, _).
-'$lgt_dbg_valid_port_option'(n, _, _).
-'$lgt_dbg_valid_port_option'(!, _, _).
-'$lgt_dbg_valid_port_option'(@, _, _).
-'$lgt_dbg_valid_port_option'(b, _, _).
-'$lgt_dbg_valid_port_option'(a, _, _).
-'$lgt_dbg_valid_port_option'(q, _, _).
-'$lgt_dbg_valid_port_option'(d, _, _).
-'$lgt_dbg_valid_port_option'(x, _, _).
-'$lgt_dbg_valid_port_option'(h, _, _).
-'$lgt_dbg_valid_port_option'(?, _, _).
-'$lgt_dbg_valid_port_option'(=, _, _).
-'$lgt_dbg_valid_port_option'(*, _, ' ').
-'$lgt_dbg_valid_port_option'(+, _, ' ').
-'$lgt_dbg_valid_port_option'(-, _, +).
-'$lgt_dbg_valid_port_option'(e, exception, _).
+'$lgt_dbg_valid_port_option'(' ', _, _) :- !.
+'$lgt_dbg_valid_port_option'(c, _, _) :- !.
+'$lgt_dbg_valid_port_option'(l, _, _) :- !.
+'$lgt_dbg_valid_port_option'(s, _, _) :- !.
+'$lgt_dbg_valid_port_option'(i, call, _) :- !.
+'$lgt_dbg_valid_port_option'(i, redo, _) :- !.
+'$lgt_dbg_valid_port_option'(f, call, _) :- !.
+'$lgt_dbg_valid_port_option'(f, fact, _) :- !.
+'$lgt_dbg_valid_port_option'(f, rule, _) :- !.
+'$lgt_dbg_valid_port_option'(f, redo, _) :- !.
+'$lgt_dbg_valid_port_option'(n, _, _) :- !.
+'$lgt_dbg_valid_port_option'(!, _, _) :- !.
+'$lgt_dbg_valid_port_option'(@, _, _) :- !.
+'$lgt_dbg_valid_port_option'(b, _, _) :- !.
+'$lgt_dbg_valid_port_option'(a, _, _) :- !.
+'$lgt_dbg_valid_port_option'(q, _, _) :- !.
+'$lgt_dbg_valid_port_option'(d, _, _) :- !.
+'$lgt_dbg_valid_port_option'(x, _, _) :- !.
+'$lgt_dbg_valid_port_option'(h, _, _) :- !.
+'$lgt_dbg_valid_port_option'(?, _, _) :- !.
+'$lgt_dbg_valid_port_option'(=, _, _) :- !.
+'$lgt_dbg_valid_port_option'(*, _, ' ') :- !.
+'$lgt_dbg_valid_port_option'(+, _, ' ') :- !.
+'$lgt_dbg_valid_port_option'(-, _, +) :- !.
+'$lgt_dbg_valid_port_option'(e, exception, _) :- !.
 
 
@@ -3894 +3901 @@
 '$lgt_dbg_do_port_option'(s, _, _, _, _, true).
 
-'$lgt_dbg_do_port_option'(i, call, _, _, _, ignore).
-'$lgt_dbg_do_port_option'(i, redo, _, _, _, ignore).
+'$lgt_dbg_do_port_option'(i, _, _, _, _, ignore).
 
 '$lgt_dbg_do_port_option'(f, _, _, _, _, fail).
@@ -5020 +5026 @@
 
 '$lgt_pp_entity'(protocol, Entity, Prefix, Dcl, Mode) :-
-    '$lgt_pp_protocol_'(Entity, Prefix, Dcl, _, Mode).
+    '$lgt_pp_protocol_'(Entity, Prefix, Dcl, _, Mode),
+    !.
 
 
@@ -5037 +5044 @@
 '$lgt_pp_rclause'('$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Mode, Synchronized, Threaded)) :-
     '$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, Mode),
+    !,
     (   '$lgt_pp_synchronized_' ->
         Synchronized = yes
@@ -5044 +5052 @@
         Threaded = yes
     ;   Threaded = no
-    ),
-    !.
+    ).
 
 '$lgt_pp_rclause'('$lgt_current_protocol_'(Ptc, Prefix, Dcl, Rnm, Mode)) :-
@@ -5053 +5060 @@
 '$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Rnm, Mode, Synchronized)) :-
     '$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, Mode),
+    !,
     (   '$lgt_pp_synchronized_' ->
         Synchronized = yes
@@ -5207 +5215 @@
 %
 % translates file-level directives, i.e. directives that are not encapsulated in a Logtalk entity
-% error-checking is delegated to the back-end Prolog compiler
+% error-checking is delegated in most cases to the back-end Prolog compiler
 
 '$lgt_tr_file_directive'(encoding(_)) :-        % the encoding/1 directive is already processed 
@@ -5228 +5236 @@
     op(Pr, Spec, Ops),
     assertz('$lgt_pp_directive_'(op(Pr, Spec, Ops))),
-    assertz('$lgt_pp_file_op_'(op(Pr, Spec, Ops))).
+    (   atom(Ops) ->
+        assertz('$lgt_pp_file_op_'(Pr, Spec, Ops))
+    ;   '$lgt_is_proper_list'(Ops) ->
+        forall('$lgt_member'(Op, Ops), assertz('$lgt_pp_file_op_'(Pr, Spec, Op)))
+    ).
 
 '$lgt_tr_file_directive'(set_prolog_flag(Flag, Value)) :-
@@ -5298 +5310 @@
 
 '$lgt_tr_directive'(end_protocol, [], _, Output) :-
-    '$lgt_pp_protocol_'(Ptc, _, _, _, _) ->
+    (   '$lgt_pp_protocol_'(Ptc, _, _, _, _) ->
         '$lgt_tr_entity'(protocol, Ptc, Output),
         '$lgt_report_compiled_entity'(protocol, Ptc)
-        ;
-        throw(closing_directive_mismatch).
+    ;   throw(closing_directive_mismatch)
+    ).
 
 
@@ -5470 +5482 @@
     throw(instantiation_error).
 
-'$lgt_tr_directive'(uses, [Module, _], _, _) :-
+'$lgt_tr_directive'(use_module, [Module, _], _, _) :-
     \+ callable(Module),
     throw(type_error(module_identifier, Module)).
@@ -5632 +5644 @@
 
 '$lgt_tr_alias_directive'(Entity, Functor1//Arity, Functor2//Arity) :-
+    !,
     Arity2 is Arity + 2,
     '$lgt_tr_alias_directive'(Entity, Functor1/Arity2, Functor2/Arity2).
@@ -5667 +5680 @@
 '$lgt_gen_pred_mutex'(Mutex) :-
     '$lgt_pp_entity'(_, _, Prefix, _, _),
-    retract('$lgt_pp_pred_mutex_count_'(Old)),
+    retract('$lgt_pp_pred_mutex_count_'(Old)) ->
     New is Old + 1,
     asserta('$lgt_pp_pred_mutex_count_'(New)),
@@ -7125 +7138 @@
 
 '$lgt_tr_body'(':'(Alias), TPred, '$lgt_dbg_goal'(':'(Alias), TPred, DbgCtx), Ctx) :-
+    !,
     '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, _, _, _),
     '$lgt_ctx_dbg_ctx'(Ctx, DbgCtx),
@@ -7134 +7148 @@
         '$lgt_ctg_static_binding_cache'(Ctg, Pred, Sender, This, Self, TPred) ->
         true
-    ;   Pred = Alias,
-        '$lgt_pp_object_'(_, _, Dcl, _, _, IDcl, _, _, _, Rnm, _),
+    ;   % must resort to dynamic binding
+        Pred = Alias,
+        '$lgt_pp_object_'(_, _, Dcl, _, _, IDcl, _, _, _, Rnm, _) ->
         (   \+ '$lgt_pp_instantiated_class_'(_, _, _, _, _, _, _, _, _, _),
             \+ '$lgt_pp_specialized_class_'(_, _, _, _, _, _, _, _, _, _) ->
@@ -7708 +7723 @@
 
 '$lgt_optimizable_local_db_call'(Pred, TPred) :-
-    '$lgt_pp_object_'(_, Prefix, _, _, _, _, _, _, _, _, _),    % exclude categories
+    '$lgt_pp_object_'(_, Prefix, _, _, _, _, _, _, _, _, _) ->  % exclude categories
     '$lgt_compiler_flag'(debug, off),                           % not debugging
     (   Pred = (Head :- Body) ->                                % only facts allowed
@@ -7716 +7731 @@
     callable(Head),
     functor(Head, Functor, Arity),
-    '$lgt_pp_dynamic_'(Functor, Arity),             % a dynamic directive must be present
+    once('$lgt_pp_dynamic_'(Functor, Arity)),       % a dynamic directive must be present
     once((  '$lgt_pp_public_'(Functor, Arity)       % a scope directive must be present
         ;   '$lgt_pp_protected_'(Functor, Arity)
@@ -8314 +8329 @@
 
 '$lgt_tr_super_call'(Pred, TPred, Ctx) :-   % translation performed at runtime
-    '$lgt_pp_object_'(_, _, _, _, Super, _, _, _, _, _, _),
-    !,
     '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, _, _, _),
-    TPred = '$lgt_obj_super_call'(Super, Pred, Sender, This, Self).
-
-'$lgt_tr_super_call'(Pred, TPred, Ctx) :-   % translation performed at runtime
-    '$lgt_pp_category_'(Ctg, _, _, Def, _, _),
-    '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, _, _, _),
-    TPred = '$lgt_ctg_super_call'(Ctg, Def, Pred, Sender, This, Self).
+    (   '$lgt_pp_object_'(_, _, _, _, Super, _, _, _, _, _, _) ->
+        TPred = '$lgt_obj_super_call'(Super, Pred, Sender, This, Self)
+    ;   '$lgt_pp_category_'(Ctg, _, _, Def, _, _) ->
+        TPred = '$lgt_ctg_super_call'(Ctg, Def, Pred, Sender, This, Self)
+    ).
 
 
@@ -8698 +8710 @@
 
 '$lgt_update_entity_comp_mode' :-
-    retract('$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, _)),
-    assertz('$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, (dynamic))),
-    !.
-
-'$lgt_update_entity_comp_mode' :-
-    retract('$lgt_pp_protocol_'(Ptc, Prefix, Dcl, Rnm, _)),
-    assertz('$lgt_pp_protocol_'(Ptc, Prefix, Dcl, Rnm, (dynamic))),
-    !.
-
-'$lgt_update_entity_comp_mode' :-
-    retract('$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, _)),
-    assertz('$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, (dynamic))).
+    (   retract('$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, _)) ->
+        assertz('$lgt_pp_object_'(Obj, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, (dynamic)))
+    ;   retract('$lgt_pp_protocol_'(Ptc, Prefix, Dcl, Rnm, _)) ->
+        assertz('$lgt_pp_protocol_'(Ptc, Prefix, Dcl, Rnm, (dynamic)))
+    ;   retract('$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, _)) ->
+        assertz('$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, Rnm, (dynamic)))
+    ).
 
 
@@ -8922 +8929 @@
 
 '$lgt_tr_complements_category'(Objs, Ctg) :-
-    '$lgt_pp_category_'(Ctg, _, Dcl, Def, _, _),
+    '$lgt_pp_category_'(Ctg, _, Dcl, Def, _, _) ->
     '$lgt_tr_complements_category'(Objs, Ctg, Dcl, Def).
 
@@ -9107 +9114 @@
     HeadTemplateDef =.. [TFunctor| HeadTemplateArgsDef],
     HeadDef =.. [TFunctor| HeadArgsDef],
-    (   '$lgt_pp_object_'(_, _, _, Def, _, _, _, _, _, _, _) ->
-        true
-    ;   '$lgt_pp_category_'(_, _, _, Def, _, _)
-    ),
+    once((  '$lgt_pp_object_'(_, _, _, Def, _, _, _, _, _, _, _)
+        ;   '$lgt_pp_category_'(_, _, _, Def, _, _)
+    )),
     Clause =.. [Def, HeadTemplate, Sender2, This2, Self2, HeadTemplateDef],
     (   '$lgt_pp_def_'(Clause) ->
@@ -9151 +9157 @@
     HeadTemplateDef =.. [TFunctor| HeadTemplateArgsDef],
     HeadDef =.. [TFunctor| HeadArgsDef],
-    '$lgt_pp_object_'(_, _, _, _, _, _, _, _, DDef, _, _),
+    once('$lgt_pp_object_'(_, _, _, _, _, _, _, _, DDef, _, _)),
     Clause =.. [DDef, HeadTemplate, Sender2, This2, Self2, HeadTemplateDef],
     (   '$lgt_pp_ddef_'(Clause) ->
@@ -9279 +9285 @@
 
 '$lgt_gen_dynamic_object_dynamic_directives' :-
-    '$lgt_pp_object_'(_, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, _),
+    '$lgt_pp_object_'(_, Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef, Rnm, _) ->
     assertz('$lgt_pp_directive_'(dynamic(Prefix/8))),
     assertz('$lgt_pp_directive_'(dynamic(Dcl/6))),
@@ -9437 +9443 @@
 
 '$lgt_gen_protocol_linking_clauses'(true) :-
-    '$lgt_pp_protocol_'(Ptc, _, PDcl, _, _),
+    '$lgt_pp_protocol_'(Ptc, _, PDcl, _, _) ->
     Head =.. [PDcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Ptc],
     Body =.. [PDcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized],
@@ -9479 +9485 @@
         true
     ;   % empty, standalone protocol 
-        '$lgt_pp_protocol_'(_, _, Dcl, _, _),
+        '$lgt_pp_protocol_'(_, _, Dcl, _, _) ->
         Head =.. [Dcl, _, _, _, _, _, _, _],
         assertz('$lgt_pp_dcl_'((Head:-fail)))
@@ -9502 +9508 @@
 
 '$lgt_gen_category_linking_dcl_clauses'(true) :-
-    '$lgt_pp_category_'(Ctg, _, CDcl, _, _, _),
+    '$lgt_pp_category_'(Ctg, _, CDcl, _, _, _) ->
     Head =.. [CDcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Ctg],
     Body =.. [CDcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized],
@@ -9568 +9574 @@
         true
     ;   % standalone category with no local predicate declarations
-        '$lgt_pp_category_'(_, _, Dcl, _, _, _),
+        '$lgt_pp_category_'(_, _, Dcl, _, _, _) ->
         Head =.. [Dcl, _, _, _, _, _, _, _],
         assertz('$lgt_pp_dcl_'((Head:-fail)))
@@ -9582 +9588 @@
 
 '$lgt_gen_category_linking_def_clauses' :-
-    '$lgt_pp_category_'(Ctg, _, _, Def, _, _),
+    '$lgt_pp_category_'(Ctg, _, _, Def, _, _) ->
     Head =.. [Def, Pred, Sender, This, Self, Call, Ctg],
     (   '$lgt_pp_fdef_'(_) ->
@@ -9618 +9624 @@
 
 '$lgt_gen_object_catchall_dcl_clauses'(false) :-
-    '$lgt_pp_object_'(_, _, Dcl, _, _, _, _, _, _, _, _),   % generate a catchall clause for
+    '$lgt_pp_object_'(_, _, Dcl, _, _, _, _, _, _, _, _) -> % generate a catchall clause for
     Head =.. [Dcl, _, _, _, _, _, _],                       % objects that do not contain
     assertz('$lgt_pp_dcl_'((Head:-fail))).                  % predicate declarations
@@ -9626 +9632 @@
 
 '$lgt_gen_object_catchall_def_clauses'(false) :-
-    '$lgt_pp_object_'(_, _, _, Def, _, _, _, _, _, _, _),   % generate a catchall clause
+    '$lgt_pp_object_'(_, _, _, Def, _, _, _, _, _, _, _) -> % generate a catchall clause
     Head =.. [Def, _, _, _, _, _],                          % for objects that do not 
     assertz('$lgt_pp_fdef_'((Head:-fail))).                 % contain predicate definitions
@@ -9650 +9656 @@
 
 '$lgt_gen_prototype_linking_dcl_clauses'(true) :-
-    '$lgt_pp_object_'(Obj, _, Dcl, _, _, _, _, DDcl, _, _, _),
+    '$lgt_pp_object_'(Obj, _, Dcl, _, _, _, _, DDcl, _, _, _) ->
     HeadDcl =.. [Dcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Obj, Obj],
     BodyDcl =.. [Dcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized],
@@ -9659 +9665 @@
 
 '$lgt_gen_prototype_linking_dcl_clauses'(false) :-
-    '$lgt_pp_object_'(Obj, _, Dcl, _, _, _, _, DDcl, _, _, _),
+    '$lgt_pp_object_'(Obj, _, Dcl, _, _, _, _, DDcl, _, _, _) ->
     HeadDDcl =.. [Dcl, Pred, Scope, (dynamic), no, no, no, Obj, Obj],
     BodyDDcl =.. [DDcl, Pred, Scope],
@@ -9711 +9717 @@
 
 '$lgt_gen_prototype_imports_dcl_clauses' :-
-    '$lgt_pp_object_'(Obj, _, ODcl, _, _, _, _, _, _, _, _),
+    '$lgt_pp_object_'(Obj, _, ODcl, _, _, _, _, _, _, _, _) ->
     Head =.. [ODcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Obj, Ctn],
     Lookup = '$lgt_complemented_object'(Obj, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Ctn),
@@ -9756 +9762 @@
 
 '$lgt_gen_prototype_linking_def_clauses'(true) :-
-    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _),
+    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _) ->
     Head =.. [Def, Pred, Sender, This, Self, Call, Obj],
     BodyDef =.. [Def, Pred, Sender, This, Self, Call],
@@ -9764 +9770 @@
 
 '$lgt_gen_prototype_linking_def_clauses'(false) :-
-    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _),
+    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _) ->
     Head =.. [Def, Pred, Sender, This, Self, Call, Obj],
     BodyDDef =.. [DDef, Pred, Sender, This, Self, Call],
@@ -9786 +9792 @@
 
 '$lgt_gen_prototype_imports_def_clauses' :-
-    '$lgt_pp_object_'(Obj, _, _, ODef, _, _, _, _, _, _, _),
+    '$lgt_pp_object_'(Obj, _, _, ODef, _, _, _, _, _, _, _) ->
     Head =.. [ODef, Pred, Sender, Obj, Self, Call, Ctn],
     Lookup = '$lgt_complemented_object'(Pred, Sender, Obj, Self, Call, Ctn),
@@ -9856 +9862 @@
 
 '$lgt_gen_ic_hierarchy_dcl_clauses' :-
+    '$lgt_pp_object_'(_, _, ODcl, _, _, _, _, _, _, _, _),
     \+ '$lgt_pp_instantiated_class_'(_, _, _, _, _, _, _, _, _, _),
     !,
-    '$lgt_pp_object_'(_, _, ODcl, _, _, _, _, _, _, _, _),
     Head =.. [ODcl, _, _, _, _, _, _, _, _],
     assertz('$lgt_pp_dcl_'((Head:-fail))).
@@ -9898 +9904 @@
 
 '$lgt_gen_ic_linking_idcl_clauses'(true) :-
-    '$lgt_pp_object_'(Obj, _, Dcl, _, _, IDcl, _, DDcl, _, _, _),
+    '$lgt_pp_object_'(Obj, _, Dcl, _, _, IDcl, _, DDcl, _, _, _) ->
     HeadDcl =.. [IDcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Obj, Obj],
     BodyDcl =.. [Dcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized],
@@ -9907 +9913 @@
 
 '$lgt_gen_ic_linking_idcl_clauses'(false) :-
-    '$lgt_pp_object_'(Obj, _, _, _, _, IDcl, _, DDcl, _, _, _),
+    '$lgt_pp_object_'(Obj, _, _, _, _, IDcl, _, DDcl, _, _, _) ->
     HeadDDcl =.. [IDcl, Pred, Scope, (dynamic), no, no, no, Obj, Obj],
     BodyDDcl =.. [DDcl, Pred, Scope],
@@ -9959 +9965 @@
 
 '$lgt_gen_ic_category_idcl_clauses' :-
-    '$lgt_pp_object_'(Obj, _, _, _, _, OIDcl, _, _, _, _, _),
+    '$lgt_pp_object_'(Obj, _, _, _, _, OIDcl, _, _, _, _, _) ->
     Head =.. [OIDcl, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Obj, Ctn],
     Lookup = '$lgt_complemented_object'(Obj, Pred, Scope, Compilation, Meta, NonTerminal, Synchronized, Ctn),
@@ -10005 +10011 @@
 
 '$lgt_gen_ic_linking_def_clauses'(true) :-
-    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _),
+    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _) ->
     Head =.. [Def, Pred, Sender, This, Self, Call, Obj],
     BodyDef =.. [Def, Pred, Sender, This, Self, Call],
@@ -10013 +10019 @@
 
 '$lgt_gen_ic_linking_def_clauses'(false) :-
-    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _),
+    '$lgt_pp_object_'(Obj, _, _, Def, _, _, _, _, DDef, _, _) ->
     Head =.. [Def, Pred, Sender, This, Self, Call, Obj],
     BodyDDef =.. [DDef, Pred, Sender, This, Self, Call],
@@ -10035 +10041 @@
 
 '$lgt_gen_ic_imports_def_clauses' :-
-    '$lgt_pp_object_'(Obj, _, _, ODef, _, _, _, _, _, _, _),
+    '$lgt_pp_object_'(Obj, _, _, ODef, _, _, _, _, _, _, _) ->
     Head =.. [ODef, Pred, Sender, Obj, Self, Call, Ctn],
     Lookup = '$lgt_complemented_object'(Pred, Sender, Obj, Self, Call, Ctn),