Changeset 4534 for trunk/compiler

Timestamp:

10/23/08 04:53:05 (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) (4 diffs)

trunk/compiler/logtalk.pl

@@ -4233 +4233 @@
 
 
-% '$lgt_check_redefined_entities'(+atom)
+% '$lgt_check_redefined_entities'
 %
 % check and print a warning for all entities that are about to be redefined;
@@ -4252 +4252 @@
 
 
-% '$lgt_redefined_entity'(+atom, @entity_identifier, -atom, -atom)
+% '$lgt_redefined_entity'(@entity_identifier, -atom, -atom)
 %
 % true if an entity of the same name is already loaded; returns entity type
@@ -4264 +4264 @@
         Type = category
     ),
-    (   '$lgt_entity_property_'(Entity, file(OldBase, OldPath)),
+    (   % check file information using the file/2 entity property, if available:
+        '$lgt_entity_property_'(Entity, file(OldBase, OldPath)),
         '$lgt_pp_file_rclause_'('$lgt_entity_property_'(Entity, file(NewBase, NewPath))),
         (OldPath \== NewPath; OldBase \== NewBase) ->
         File = OldBase-OldPath
-    ;   File = nil
-    ).
-
-
-
-% '$lgt_report_redefined_entity'(+atom, @entity_identifier)
+    ;   % either no file/2 entity property or we're reloading the same file 
+        File = nil
+    ).
+
+
+
+% '$lgt_report_redefined_entity'(+atom, @entity_identifier, +atom)
 %
 % prints a warning for redefined entities
@@ -4284 +4286 @@
         (   File == nil ->
             true
-        ;   File = Base-Path,
+        ;   % we've conflicting entities coming from different source files:
+            File = Base-Path,
             write('              loaded from file '), write(Base), write(' ('), write(Path), write(')'), nl
         )