Changeset 4532 for trunk/compiler

Timestamp:

10/22/08 17:38:04 (3 months ago)

Author:

pmoura

Message:

Updated the Logtalk compiler to provide file information when printing redefined entity warnings if the files of the new and the old definitions are different (requires support for the file/2 entity property).

Files:

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

trunk/compiler/logtalk.pl

@@ -4233 +4233 @@
 
 
-% '$lgt_check_redefined_entities'
+% '$lgt_check_redefined_entities'(+atom)
 %
 % check and print a warning for all entities that are about to be redefined;
@@ -4243 +4243 @@
     ;   '$lgt_pp_file_rclause_'('$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _))
     ),
-    '$lgt_redefined_entity'(Entity, Type),
-    '$lgt_report_redefined_entity'(Type, Entity),
+    '$lgt_redefined_entity'(Entity, Type, File),
+    '$lgt_report_redefined_entity'(Type, Entity, File),
     '$lgt_retract_old_runtime_clauses'(Entity),
     fail.
@@ -4252 +4252 @@
 
 
-% '$lgt_redefined_entity'(@entity_identifier, -atom)
+% '$lgt_redefined_entity'(+atom, @entity_identifier, -atom, -atom)
 %
 % true if an entity of the same name is already loaded; returns entity type
 
-'$lgt_redefined_entity'(Entity, Type) :-
+'$lgt_redefined_entity'(Entity, Type, File) :-
     (   '$lgt_current_object_'(Entity, _, _, _, _, _, _, _, _, _, _) ->
         Type = object
@@ -4263 +4263 @@
     ;   '$lgt_current_category_'(Entity, _, _, _, _, _) ->
         Type = category
+    ),
+    (   '$lgt_entity_property_'(Entity, file(OldBase, OldPath)),
+        '$lgt_pp_file_rclause_'('$lgt_entity_property_'(Entity, file(NewBase, NewPath))),
+        (OldPath \== NewPath; OldBase \== NewBase) ->
+        atom_concat(OldPath, OldBase, File)
+    ;   File = nil
     ).
 
@@ -4271 +4277 @@
 % prints a warning for redefined entities
 
-'$lgt_report_redefined_entity'(Type, Entity) :-
+'$lgt_report_redefined_entity'(Type, Entity, File) :-
     (   '$lgt_compiler_flag'(report, on) ->
         '$lgt_inc_load_warnings_counter',
         write('    WARNING!  Redefining '), write(Type), write(' '), 
-        current_output(Output), '$lgt_pretty_print_vars_quoted'(Output, Entity), nl
+        current_output(Output), '$lgt_pretty_print_vars_quoted'(Output, Entity), nl,
+        (   File == nil ->
+            true
+        ;   write('              loaded from file '), write(File), nl
+        )
     ;   true
     ).