Changeset 4578 for trunk/compiler

Timestamp:

11/07/08 13:23:12 (2 months ago)

Author:

pmoura

Message:

Added conditional compilation support, as found in some Prolog compilers, using the new directives if/1, elif/1, else/0, and endif/0.

Files:

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

trunk/compiler/logtalk.pl

@@ -266 +266 @@
 :- dynamic('$lgt_pp_file_rclause_'/1).          % '$lgt_pp_file_rclause_'(Clause)
 
-:- dynamic('$lgt_pp_cc_if_found_'/0).           % '$lgt_pp_cc_if_found_'
+:- dynamic('$lgt_pp_cc_if_found_'/1).           % '$lgt_pp_cc_if_found_'(Goal)
 :- dynamic('$lgt_pp_cc_skipping_'/0).           % '$lgt_pp_cc_skipping_'
 :- dynamic('$lgt_pp_cc_mode_'/1).               % '$lgt_pp_cc_mode_'(Action)
@@ -4740 +4740 @@
 '$lgt_tr_file'(end_of_file, _, _, _, _) :-
     '$lgt_pp_object_'(Obj, _, _, _, _, _, _, _, _, _, _),
-    throw(entity_ending_directive_missing(object, Obj)).
+    throw(directive_missing(end_object, object(Obj))).
 
 '$lgt_tr_file'(end_of_file, _, _, _, _) :-
     '$lgt_pp_protocol_'(Ptc, _, _, _, _),
-    throw(entity_ending_directive_missing(protocol, Ptc)).
+    throw(directive_missing(end_protocol, protocol(Ptc))).
 
 '$lgt_tr_file'(end_of_file, _, _, _, _) :-
     '$lgt_pp_category_'(Ctg, _, _, _, _, _),
-    throw(entity_ending_directive_missing(category, Ctg)).
+    throw(directive_missing(end_category, category(Ctg))).
+
+'$lgt_tr_file'(end_of_file, _, _, _, _) :-
+    '$lgt_pp_cc_if_found_'(Goal),
+    throw(directive_missing(endif, if(Goal))).
 
 '$lgt_tr_file'(end_of_file, _, _, _, _) :-
@@ -5034 +5038 @@
     retractall('$lgt_pp_file_path_'(_, _)),
     retractall('$lgt_pp_file_rclause_'(_)),
-    retractall('$lgt_pp_cc_if_found_'),
+    retractall('$lgt_pp_cc_if_found_'(_)),
     retractall('$lgt_pp_cc_skipping_'),
     retractall('$lgt_pp_cc_mode_'(_)).
@@ -5342 +5346 @@
     '$lgt_pp_cc_mode_'(Value),                  % not top-level if
     !,
-    assertz('$lgt_pp_cc_if_found_'),
+    asserta('$lgt_pp_cc_if_found_'(Goal)),
     (   Value == seek ->                        % we're looking for an else
         asserta('$lgt_pp_cc_mode_'(ignore))     % so ignore this if ... endif 
@@ -5356 +5360 @@
 '$lgt_tr_directive'(if(Goal), _, _, _) :-
     !,
-    assertz('$lgt_pp_cc_if_found_'),
+    asserta('$lgt_pp_cc_if_found_'(Goal)),
     (   call(Goal) ->
         asserta('$lgt_pp_cc_mode_'(skip))
@@ -5373 +5377 @@
 
 '$lgt_tr_directive'(elif(Goal), _, _, _) :-
-    \+ '$lgt_pp_cc_if_found_',
+    \+ '$lgt_pp_cc_if_found_'(_),
     throw(error(unmatched_directive, directive(elif(Goal)))).
 
@@ -5394 +5398 @@
 
 '$lgt_tr_directive'(else, _, _, _) :-
-    \+ '$lgt_pp_cc_if_found_',
+    \+ '$lgt_pp_cc_if_found_'(_),
     throw(error(unmatched_directive, directive(else))).
 
@@ -5412 +5416 @@
 
 '$lgt_tr_directive'(endif, _, _, _) :-
-    \+ '$lgt_pp_cc_if_found_',
+    \+ '$lgt_pp_cc_if_found_'(_),
     throw(error(unmatched_directive, directive(endif))).
 
 '$lgt_tr_directive'(endif, _, _, _) :-
-    retract('$lgt_pp_cc_if_found_'),
+    retract('$lgt_pp_cc_if_found_'(_)),
     retract('$lgt_pp_cc_mode_'(Value)),
     (   Value == ignore ->