Changeset 4513 for trunk/compiler

Timestamp:

10/18/08 08:58:16 (3 months ago)

Author:

pmoura

Message:

Modified the implementation of the file/1 entity property to not depend on the stream_property/2 built-in predicate support for the file_name/1 property.

Files:

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

trunk/compiler/logtalk.pl

@@ -258 +258 @@
 :- dynamic('$lgt_pp_synchronized_'/0).          % '$lgt_pp_synchronized_'
 
-:- 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_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_rclause_'/1).          % '$lgt_pp_file_rclause_'(Clause)
@@ -4560 +4561 @@
     '$lgt_save_global_op_table',
     '$lgt_file_name'(logtalk, File, Source),
+    asserta('$lgt_pp_file_name_'(Source)),
     catch(
         open(Source, read, Input),
@@ -4587 +4589 @@
         '$lgt_compiler_error_handler'(Output, OutputError)),    % with non-ISO compliant Prolog compilers
     close(Output),
+    retractall('$lgt_pp_file_name_'(_)),
     '$lgt_restore_global_op_table'.
 
@@ -4657 +4660 @@
 % adds entity properties related to the entity source file
 
-'$lgt_add_entity_file_properties'(Entity, Input) :-
+'$lgt_add_entity_file_properties'(Entity, _Input) :-
 %   (   catch('$lgt_stream_current_line_number'(Input, Line), _, fail) ->
 %       assertz('$lgt_pp_file_rclause_'('$lgt_entity_property_'(Entity, line_count(Line))))
 %   ;   true
 %   ),
-    (   catch(stream_property(Input, file_name(File)), _, fail) ->
-        assertz('$lgt_pp_rclause_'('$lgt_entity_property_'(Entity, file(File))))
-    ;   true
-    ).
+    '$lgt_pp_file_name_'(File) ->
+    assertz('$lgt_pp_rclause_'('$lgt_entity_property_'(Entity, file(File)))).
 
 
@@ -4911 +4912 @@
     retractall('$lgt_pp_file_encoding_'(_, _)),
     retractall('$lgt_pp_file_bom_'(_)),
+    retractall('$lgt_pp_file_name_'(_)),
     retractall('$lgt_pp_file_rclause_'(_)).