Changeset 4514 for trunk/compiler

Timestamp:

10/18/08 10:17:22 (3 months ago)

Author:

pmoura

Message:

Replaced the file/1 entity property by a file/2 property that also includes the source file path.

Files:

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

trunk/compiler/logtalk.pl

@@ -260 +260 @@
 :- 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_name_'/1).             % '$lgt_pp_file_name_'(File)
+:- dynamic('$lgt_pp_file_path_'/2).             % '$lgt_pp_file_path_'(File, Path)
 
 :- dynamic('$lgt_pp_file_rclause_'/1).          % '$lgt_pp_file_rclause_'(Clause)
@@ -4561 +4561 @@
     '$lgt_save_global_op_table',
     '$lgt_file_name'(logtalk, File, Source),
-    asserta('$lgt_pp_file_name_'(Source)),
+    '$lgt_current_directory'(Directory),
+    asserta('$lgt_pp_file_path_'(Source, Directory)),
     catch(
         open(Source, read, Input),
@@ -4589 +4590 @@
         '$lgt_compiler_error_handler'(Output, OutputError)),    % with non-ISO compliant Prolog compilers
     close(Output),
-    retractall('$lgt_pp_file_name_'(_)),
+    retractall('$lgt_pp_file_path_'(_, _)),
     '$lgt_restore_global_op_table'.
 
@@ -4665 +4666 @@
 %   ;   true
 %   ),
-    '$lgt_pp_file_name_'(File) ->
-    assertz('$lgt_pp_rclause_'('$lgt_entity_property_'(Entity, file(File)))).
+    '$lgt_pp_file_path_'(File, Path) ->
+    assertz('$lgt_pp_rclause_'('$lgt_entity_property_'(Entity, file(File, Path)))).
 
 
@@ -4912 +4913 @@
     retractall('$lgt_pp_file_encoding_'(_, _)),
     retractall('$lgt_pp_file_bom_'(_)),
-    retractall('$lgt_pp_file_name_'(_)),
+    retractall('$lgt_pp_file_path_'(_, _)),
     retractall('$lgt_pp_file_rclause_'(_)).