Changeset 4538 for trunk/compiler

Timestamp:

10/25/08 12:02:58 (3 months ago)

Author:

pmoura

Message:

Corrected a bug where portability warnings would be reported when the "report" compiler option is turned off. Corrected a bug where portability warnings would not increment the warnings counter.

Files:

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

trunk/compiler/logtalk.pl

@@ -5302 +5302 @@
     '$lgt_ignore_pl_directive'(Dir),                    % defined in the Prolog config files
     !,
-    (   '$lgt_compiler_flag'(portability, warning) ->
+    (   '$lgt_compiler_flag'(portability, warning),
+        '$lgt_compiler_flag'(report, on) ->
+        '$lgt_inc_compile_warnings_counter',
         nl, write('%          WARNING!  Ignoring Prolog directive: '), writeq(Dir),
         nl, '$lgt_report_compiler_error_line_number'(Line, Input)
@@ -5309 +5311 @@
 
 '$lgt_tr_directive'(Dir, Line, Input, _) :-
-    '$lgt_rewrite_and_copy_pl_directive'(Dir, RWDir),   % defined in the Prolog config files
+    '$lgt_rewrite_and_copy_pl_directive'(Dir, RWDir),       % defined in the Prolog config files
     assertz('$lgt_pp_directive_'(RWDir)),
     !,
-    (   '$lgt_compiler_flag'(portability, warning) ->
-        nl, write('%          WARNING!  Rewriting Prolog directive:         '), writeq(Dir),
-        nl, write('%                    Copying resulting Prolog directive: '), writeq(RWDir),
+    (   '$lgt_compiler_flag'(portability, warning),
+        '$lgt_compiler_flag'(report, on) ->
+        '$lgt_inc_compile_warnings_counter',
+        nl, write('%          WARNING!  Rewriting and copying Prolog directive: '), writeq(Dir),
         nl, '$lgt_report_compiler_error_line_number'(Line, Input)
     ;   true
@@ -5322 +5325 @@
     '$lgt_rewrite_and_recompile_pl_directive'(Dir, RWDir),  % defined in the Prolog config files
     !,
-    (   '$lgt_compiler_flag'(portability, warning) ->
-        nl, write('%          WARNING!  Rewriting Prolog directive:             '), writeq(Dir),
-        nl, write('%                    Recompiling resulting Prolog directive: '), writeq(RWDir),
+    (   '$lgt_compiler_flag'(portability, warning),
+        '$lgt_compiler_flag'(report, on) ->
+        '$lgt_inc_compile_warnings_counter',
+        nl, write('%          WARNING!  Rewriting and recompiling Prolog directive: '), writeq(Dir),
         nl, '$lgt_report_compiler_error_line_number'(Line, Input)
     ;   true
     ),
-    '$lgt_tr_directive'(RWDir, Line, Input, Output).    % try to translate the rewritten directive
+    '$lgt_tr_directive'(RWDir, Line, Input, Output).        % try to translate the rewritten directive
 
 '$lgt_tr_directive'(Dir, _, _, _) :-
@@ -10677 +10681 @@
 '$lgt_report_non_portable_calls' :-
     '$lgt_compiler_flag'(portability, warning),
+    '$lgt_compiler_flag'(report, on),
     setof(Pred, '$lgt_non_portable_call'(Pred), Preds),
     '$lgt_inc_compile_warnings_counter',
@@ -10706 +10711 @@
 '$lgt_report_non_portable_functions' :-
     '$lgt_compiler_flag'(portability, warning),
+    '$lgt_compiler_flag'(report, on),
     setof(Functor/Arity, '$lgt_non_portable_function_'(Functor, Arity), Functions),
     '$lgt_inc_compile_warnings_counter',