Changeset 4324

Timestamp:

06/26/08 03:57:05 (2 months ago)

Author:

pmoura

Message:

Restored the redefined entity warnings for back-end Prolog compilers that support multifile predicates. Simplified updating of the runtime tables when compiling and loading with back-end Prolog compilers that don't support multifile predicates.

When loading a redefined object, also clean all entries in the event handlers table where the object plays the role of a monitor.

Modified the Logtalk runtime to clean all lookup caches when compiling and loading source files (instead of doing it only when the files redefine existing entities).

Location:

trunk

Files:

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

trunk/compiler/logtalk.pl

@@ -4084 +4084 @@
 '$lgt_load_compiled_file'(Source) :-
     '$lgt_file_name'(prolog, Source, PrologFile),
+    '$lgt_clean_lookup_caches',
+    '$lgt_check_redefined_entities',
     (   '$lgt_pp_file_encoding_'(_, Encoding) ->
         '$lgt_load_prolog_code'(PrologFile, Source, [encoding(Encoding)])
@@ -4091 +4093 @@
 
 
+% '$lgt_check_redefined_entities'
+%
+% check and print a warning for all entities that are about to be redefined;
+% also retract old runtime clauses for the entity being redefined for safety
+
+'$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_redefined_entity'(Entity, Type),
+    '$lgt_report_redefined_entity'(Type, Entity),
+    '$lgt_retract_old_runtime_clauses'(Entity),
+    fail.
+
+'$lgt_check_redefined_entities'.
+
+
+
 % '$lgt_redefined_entity'(@entity_identifier, -atom)
 %
 % true if an entity of the same name is already loaded; returns entity type
 
-'$lgt_redefined_entity'(Entity, object) :-
-    '$lgt_current_object_'(Entity, _, _, _, _, _, _, _),
-    !.
-
-'$lgt_redefined_entity'(Entity, protocol) :-
-    '$lgt_current_protocol_'(Entity, _, _),
-    !.
-
-'$lgt_redefined_entity'(Entity, category) :-
-    '$lgt_current_category_'(Entity, _, _, _, _, _).
+'$lgt_redefined_entity'(Entity, Type) :-
+    (   '$lgt_current_object_'(Entity, _, _, _, _, _, _, _) ->
+        Type = object
+    ;   '$lgt_current_protocol_'(Entity, _, _) ->
+        Type = protocol
+    ;   '$lgt_current_category_'(Entity, _, _, _, _, _) ->
+        Type = category
+    ).
 
 
@@ -4119 +4138 @@
     ;   true
     ).
+
+
+
+% '$lgt_retract_old_runtime_clauses'(@entity_identifier)
+%
+% clean all references to an entity that is about to be redefined from the 
+% runtime tables
+
+'$lgt_retract_old_runtime_clauses'(Entity) :-
+    retractall('$lgt_before_'(_, _, _, Entity, _)),
+    retractall('$lgt_after_'(_, _, _, Entity, _)),
+    retractall('$lgt_current_object_'(Entity, _, _, _, _, _, _, _)),
+    retractall('$lgt_current_protocol_'(Entity, _, _)),
+    retractall('$lgt_current_category_'(Entity, _, _, _, _, _)),
+    retractall('$lgt_implements_protocol_'(Entity, _, _)),
+    retractall('$lgt_imports_category_'(Entity, _, _)),
+    retractall('$lgt_instantiates_class_'(Entity, _, _)),
+    retractall('$lgt_specializes_class_'(Entity, _, _)),
+    retractall('$lgt_extends_protocol_'(Entity, _, _)),
+    retractall('$lgt_extends_object_'(Entity, _, _)),
+    retractall('$lgt_extends_category_'(Entity, _, _)),
+    retractall('$lgt_complemented_object_'(_, Entity, _, _)),
+    retractall('$lgt_debugging_'(Entity)).
 
 
@@ -4733 +4775 @@
 
 
-% 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
+% save entity runtime clauses in order to be able to check for redefined 
+% entities when loading the intermediate Prolog files generated by the 
+% Logtalk compiler
 
 '$lgt_save_entity_rclauses' :-
-    (   '$lgt_compiler_flag'(multifile_directive, supported) ->
-        (   '$lgt_pp_rclause'(Clause),
-            assertz('$lgt_pp_file_rclause_'(Clause)),
-            fail
-        ;   true
-        )
-    ;   true
-    ).
+    '$lgt_pp_rclause'(Clause),
+    assertz('$lgt_pp_file_rclause_'(Clause)),
+    fail.
+
+'$lgt_save_entity_rclauses'.
 
 
 
 % clean up all dynamic predicates used during source file compilation
-% (except any user-defined compiler options specified on the compiling and loading predicates)
+% (except any user-defined compiler options specified on the compiling 
+% and loading predicates)
 
 '$lgt_clean_pp_clauses' :-
@@ -10553 +10593 @@
         Goal1 = true
     ;   findall(Clause, '$lgt_pp_rclause'(Clause), Clauses),
-        Goal1 = '$lgt_assert_runtime_clauses'(Entity, Clauses)
+        Goal1 = '$lgt_assert_runtime_clauses'(Clauses)
     ),
     (   setof(Mutex, Head^'$lgt_pp_synchronized_'(Head, Mutex), Mutexes) ->
@@ -10689 +10729 @@
 
 
-% '$lgt_assert_runtime_clauses'(+callable, +list)
+% '$lgt_assert_runtime_clauses'(+list)
 %
 % called when loading a compiled Logtalk entity in order to update
-% Logtalk internal runtime tables
-%
-% we may be reloading the entity so we must first retract any old
-% runtime clauses before asserting the new ones
-%
-% this is mostly a workaround for the lack of support of multifile
-% predicates in some Prolog compilers
-
-'$lgt_assert_runtime_clauses'(Entity, Clauses) :-
-    (   '$lgt_redefined_entity'(Entity, Type) ->
-        '$lgt_clean_lookup_caches',
-        '$lgt_report_redefined_entity'(Type, Entity)
-    ;   true
-    ),
-    '$lgt_retract_old_runtime_clauses'(Entity),
-    '$lgt_assert_new_runtime_clauses'(Clauses).
-
-
-'$lgt_retract_old_runtime_clauses'(Entity) :-
-    retractall('$lgt_current_object_'(Entity, _, _, _, _, _, _, _)),
-    retractall('$lgt_current_protocol_'(Entity, _, _)),
-    retractall('$lgt_current_category_'(Entity, _, _, _, _, _)),
-    retractall('$lgt_implements_protocol_'(Entity, _, _)),
-    retractall('$lgt_imports_category_'(Entity, _, _)),
-    retractall('$lgt_instantiates_class_'(Entity, _, _)),
-    retractall('$lgt_specializes_class_'(Entity, _, _)),
-    retractall('$lgt_extends_protocol_'(Entity, _, _)),
-    retractall('$lgt_extends_object_'(Entity, _, _)),
-    retractall('$lgt_extends_category_'(Entity, _, _)),
-    retractall('$lgt_complemented_object_'(_, Entity, _, _)),
-    retractall('$lgt_debugging_'(Entity)).
-
-
-'$lgt_assert_new_runtime_clauses'([]).
-
-'$lgt_assert_new_runtime_clauses'([Clause| Clauses]) :-
+% Logtalk internal runtime tables; this is mostly a workaround for 
+% the lack of support of multifile predicates in some Prolog compilers
+
+'$lgt_assert_runtime_clauses'([]).
+
+'$lgt_assert_runtime_clauses'([Clause| Clauses]) :-
     assertz(Clause),
-    '$lgt_assert_new_runtime_clauses'(Clauses).
+    '$lgt_assert_runtime_clauses'(Clauses).
 
 

trunk/RELEASE_NOTES.txt

@@ -12 +12 @@
 
 2.32.1 - July ??, 2008
+
+    Restored the redefined entity warnings for back-end Prolog compilers 
+    that support multifile predicates. Simplified updating of the runtime 
+    tables when compiling and loading with back-end Prolog compilers that 
+    don't support multifile predicates.
+
+    When loading a redefined object, also clean all entries in the event 
+    handlers table where the object plays the role of a monitor.
+
+    Modified the Logtalk runtime to clean all lookup caches when compiling 
+    and loading source files (instead of doing it only when the files 
+    redefine existing entities).
 
     Updated the SWI-Prolog config file notes about possible compatibility