Changeset 4296

Timestamp:

05/31/08 06:13:11 (6 months ago)

Author:

pmoura

Message:

Updated the Logtalk compiler and runtime to use multifile predicates for the runtime tables of loaded entities and entities relations. This is necessary to generate sensible intermediate Prolog code for large files with tens of thousands of objects. The workaround of using the directive initialization/1 is still available (for now) for Prolog compilers that fail to support the thirteen years old ISO Prolog standard.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (12 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -64 +64 @@
 % tables of loaded entities and respective relationships
 
-:- dynamic('$lgt_current_protocol_'/3).         % '$lgt_current_protocol_'(Ptc, Prefix, Type)
-:- dynamic('$lgt_current_category_'/6).         % '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Type, Synchronized)
-:- dynamic('$lgt_current_object_'/8).           % '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, Type, Synchronized, Threaded)
+:- 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).
+
                                                 
-:- dynamic('$lgt_implements_protocol_'/3).      % '$lgt_implements_protocol_'(ObjOrCtg, Ptc, Scope)
-:- dynamic('$lgt_imports_category_'/3).         % '$lgt_imports_category_'(Obj, Ctg, Scope)
-:- dynamic('$lgt_instantiates_class_'/3).       % '$lgt_instantiates_class_'(Instance, Class, Scope)
-:- dynamic('$lgt_specializes_class_'/3).        % '$lgt_specializes_class_'(Class, Superclass, Scope)
-:- dynamic('$lgt_extends_category_'/3).         % '$lgt_extends_category_'(Ctg1, Ctg2, Scope)
-:- dynamic('$lgt_extends_object_'/3).           % '$lgt_extends_object_'(Prototype, Parent, Scope)
-:- dynamic('$lgt_extends_protocol_'/3).         % '$lgt_extends_protocol_'(Ptc1, Ptc2, Scope)
+:- multifile('$lgt_implements_protocol_'/3).    % '$lgt_implements_protocol_'(ObjOrCtg, Ptc, Scope)
+:- dynamic('$lgt_implements_protocol_'/3).
+
+:- multifile('$lgt_imports_category_'/3).       % '$lgt_imports_category_'(Obj, Ctg, Scope)
+:- dynamic('$lgt_imports_category_'/3).
+
+:- multifile('$lgt_instantiates_class_'/3).     % '$lgt_instantiates_class_'(Instance, Class, Scope)
+:- dynamic('$lgt_instantiates_class_'/3).
+
+:- multifile('$lgt_specializes_class_'/3).      % '$lgt_specializes_class_'(Class, Superclass, Scope)
+:- dynamic('$lgt_specializes_class_'/3).
+
+:- multifile('$lgt_extends_category_'/3).       % '$lgt_extends_category_'(Ctg1, Ctg2, Scope)
+:- dynamic('$lgt_extends_category_'/3).
+
+:- multifile('$lgt_extends_object_'/3).         % '$lgt_extends_object_'(Prototype, Parent, Scope)
+:- dynamic('$lgt_extends_object_'/3).
+
+:- multifile('$lgt_extends_protocol_'/3).       % '$lgt_extends_protocol_'(Ptc1, Ptc2, Scope)
+:- dynamic('$lgt_extends_protocol_'/3).
                                                 
-:- dynamic('$lgt_complemented_object_'/4).      % '$lgt_complemented_object_'(Obj, Ctg, Dcl, Def)
+:- multifile('$lgt_complemented_object_'/4).    % '$lgt_complemented_object_'(Obj, Ctg, Dcl, Def)
+:- dynamic('$lgt_complemented_object_'/4).
 
 
@@ -86 +106 @@
 % debugger status and tables
 
+:- multifile('$lgt_debugging_'/1).              % '$lgt_debugging_'(Entity)
 :- dynamic('$lgt_debugging_'/1).                % '$lgt_debugging_'(Entity)
                                                 
@@ -231 +252 @@
 :- dynamic('$lgt_pp_file_encoding_'/2).         % '$lgt_pp_file_encoding_'(LogtalkEncoding, PrologEncoding)))
 :- dynamic('$lgt_pp_file_bom_'/1).              % '$lgt_pp_file_bom_'(BOM)))
+
+:- dynamic('$lgt_pp_file_rclause_'/1).          % '$lgt_pp_file_rclause_'(Clause)
 
 
@@ -4406 +4429 @@
         ('$lgt_write_directives'(Output),                       % write out any Prolog code that may occur
          '$lgt_write_prolog_clauses'(Output),                   % after the last entity on the source file;
+         '$lgt_write_runtime_clauses'(Output),                  % write entity runtime directives and clauses;
          '$lgt_write_init_call'(Output)),                       % write initialization/1 directive at the
         OutputError,                                            % end of the file to improve compatibility 
@@ -4688 +4712 @@
     '$lgt_write_entity_doc'(Entity),
     '$lgt_restore_file_op_table',
+    '$lgt_save_entity_rclauses',
     '$lgt_clean_pp_entity_clauses'.
+
+
+
+% save entity runtime clauses for Prolog compilers supporting the multifile/1 predicate 
+% directive; these clauses are written at the end of the generated Prolog file, just 
+% before the source file initialization goal
+
+'$lgt_save_entity_rclauses' :-
+    (   '$lgt_compiler_flag'(multifile_directive, supported) ->
+        (   '$lgt_pp_rclause'(Clause),
+            assertz('$lgt_pp_file_rclause_'(Clause)),
+            fail
+        ;   true
+        )
+    ;   true
+    ).
 
 
@@ -4702 +4743 @@
     retractall('$lgt_pp_entity_init_'(_, _, _)),
     retractall('$lgt_pp_file_encoding_'(_, _)),
-    retractall('$lgt_pp_file_bom_'(_)).
+    retractall('$lgt_pp_file_bom_'(_)),
+    retractall('$lgt_pp_file_rclause_'(_)).
 
 
@@ -8725 +8767 @@
     '$lgt_pp_referenced_object_'(Obj),
     \+ '$lgt_current_object_'(Obj, _, _, _, _, _, _, _),        % not a currently loaded object
-    \+ '$lgt_pp_object_'(Obj, _, _, _, _, _, _, _, _, _, _),    % not the object being compiled (self references)
+    \+ '$lgt_pp_object_'(Obj, _, _, _, _, _, _, _, _, _, _),    % not the object being compiled (self reference)
     \+ '$lgt_pp_entity_init_'(object, Obj, _),                  % not an object defined in the source file being compiled
+    \+ '$lgt_pp_file_rclause_'('$lgt_current_object_'(Obj, _, _, _, _, _, _, _)),
     \+ catch(current_module(Obj), _, fail).                     % not a currently loaded module; use catch/3 to avoid 
                                                                 % errors with Prolog compilers with no module support
@@ -8751 +8794 @@
     '$lgt_pp_referenced_protocol_'(Ptc),
     \+ '$lgt_current_protocol_'(Ptc, _, _),         % not a currently loaded protocol
-    \+ '$lgt_pp_protocol_'(Ptc, _, _, _, _),        % not the protocol being compiled (self references)
-    \+ '$lgt_pp_entity_init_'(protocol, Ptc, _).    % not a protocol defined in the source file being compiled
+    \+ '$lgt_pp_protocol_'(Ptc, _, _, _, _),        % not the protocol being compiled (self reference)
+    \+ '$lgt_pp_entity_init_'(protocol, Ptc, _),    % not a protocol defined in the source file being compiled
+    \+ '$lgt_pp_file_rclause_'('$lgt_current_protocol_'(Ptc, _, _)).
 
 
@@ -8776 +8820 @@
     '$lgt_pp_referenced_category_'(Ctg),
     \+ '$lgt_current_category_'(Ctg, _, _, _, _, _),    % not a currently loaded category
-    \+ '$lgt_pp_category_'(Ctg, _, _, _, _, _),         % not the category being compiled (self references)
-    \+ '$lgt_pp_entity_init_'(category, Ctg, _).        % not a category defined in the source file being compiled
+    \+ '$lgt_pp_category_'(Ctg, _, _, _, _, _),         % not the category being compiled (self reference)
+    \+ '$lgt_pp_entity_init_'(category, Ctg, _),        % not a category defined in the source file being compiled
+    \+ '$lgt_pp_file_rclause_'('$lgt_current_category_'(Ctg, _, _, _, _, _)).
 
 
@@ -10400 +10445 @@
 
 
+% '$lgt_write_runtime_clauses'(@stream)
+%
+% writes the entity runtime multifile and dynamic directives and the entity 
+% runtime clauses for all defined entities for Prolog compilers supporting
+% the multifile/1 predicate directive
+
+'$lgt_write_runtime_clauses'(Stream) :-
+    (   '$lgt_compiler_flag'(multifile_directive, supported) ->
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_current_protocol_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_current_category_'/6),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_current_object_'/8),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_implements_protocol_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_imports_category_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_instantiates_class_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_specializes_class_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_extends_category_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_extends_object_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_extends_protocol_'/3),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_complemented_object_'/4),
+        '$lgt_write_runtime_clauses'(Stream, '$lgt_debugging_'/1)
+    ;   true
+    ).
+
+
+'$lgt_write_runtime_clauses'(Stream, Functor/Arity) :-
+    functor(Clause, Functor, Arity),
+    (   \+ \+ '$lgt_pp_file_rclause_'(Clause) ->
+        write_canonical(Stream, (:- multifile(Functor/Arity))), write(Stream, '.'), nl(Stream),
+        write_canonical(Stream, (:- dynamic(Functor/Arity))), write(Stream, '.'), nl(Stream),
+        (   '$lgt_pp_file_rclause_'(Clause),
+            write_canonical(Stream, Clause), write(Stream, '.'), nl(Stream),
+            fail
+        ;   true
+        )
+    ;   true
+    ).
+
+
+
 % '$lgt_write_init_call'(@stream)
 %
-% writes the initialization call for the compiled source file that will assert 
-% the relation clauses for all defined entities and call any declared entity 
-% initialization goals when the source file is loaded
+% writes the initialization goal for the compiled source file, a conjunction
+% of the initialization goals of the defined entities; for Prolog compilers
+% that don't support the multifile/1 predicate directive, the initialization
+% goal also asserts the relation clauses for all defined entities
 
 '$lgt_write_init_call'(Stream) :-
@@ -10449 +10534 @@
 '$lgt_gen_entity_init_goal' :-
     '$lgt_pp_entity'(Type, Entity, Prefix, _, Compilation),
-    findall(Clause, '$lgt_pp_rclause'(Clause), Clauses),
-    Goal1 = '$lgt_assert_runtime_clauses'(Entity, Clauses),
+    (   '$lgt_compiler_flag'(multifile_directive, supported) ->
+        Goal1 = true
+    ;   findall(Clause, '$lgt_pp_rclause'(Clause), Clauses),
+        Goal1 = '$lgt_assert_runtime_clauses'(Entity, Clauses)
+    ),
     (   setof(Mutex, Head^'$lgt_pp_synchronized_'(Head, Mutex), Mutexes) ->
         Goal2 = (Goal1, '$lgt_create_mutexes'(Mutexes))
@@ -10467 +10555 @@
     ;   Goal = Goal5  
     ),
-    assertz('$lgt_pp_entity_init_'(Type, Entity, Goal)).
+    (   Goal == true ->
+        true
+    ;   assertz('$lgt_pp_entity_init_'(Type, Entity, Goal))
+    ).
 
 

trunk/RELEASE_NOTES.txt

@@ -12 +12 @@
 
 2.31.7 - June ??, 2008
+
+    Updated the Logtalk compiler and runtime to use multifile predicates for 
+    the runtime tables of loaded entities and entities relations. This is 
+    necessary to generate sensible intermediate Prolog code for large files 
+    with tens of thousands of objects. The workaround of using the directive 
+    initialization/1 is still available (for now) for Prolog compilers that 
+    fail to support the thirteen years old ISO Prolog standard.
 
     Added a new default compiler option, multifile_directive, to all config