Changeset 4598 for trunk/compiler

Timestamp:

11/20/08 17:49:29 (7 weeks ago)

Author:

pmoura

Message:

Updated the compilation of the if/1 and elif/1 directives in order to apply any existing goal expansion hook to their arguments.

Corrected a bug that prevented goal expansion of source file initialization goals (expressed using the initialization/1 directive).

Files:

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

trunk/compiler/logtalk.pl

@@ -5264 +5264 @@
 
 
+% '$lgt_tr_expand_goal'(+callable, -callable)
+%
+% expands a goal; fails if no goal expansion hook is defined
+
+'$lgt_tr_expand_goal'(Goal, EGoal) :-   % source-file specific compiler hook
+    '$lgt_pp_hook_goal_expansion_'(Goal, EGoal),
+    !.
+
+'$lgt_tr_expand_goal'(Goal, EGoal) :-   % default compiler hook
+    '$lgt_hook_goal_expansion_'(Goal, EGoal),
+    !.
+
+
+
 % '$lgt_tr_term'(+term, +integer, @stream, @stream)
 %
@@ -5345 +5359 @@
     \+ callable(Goal),
     throw(error(type_error(callable, Goal), directive(if(Goal)))).
+
+'$lgt_tr_directive'(if(Goal), Line, Input, Output) :-
+    '$lgt_tr_expand_goal'(Goal, EGoal),
+    !,
+    '$lgt_tr_directive'(if(EGoal), Line, Input, Output).
 
 '$lgt_tr_directive'(if(Goal), _, Input, _) :-
@@ -5382 +5401 @@
     \+ '$lgt_pp_cc_if_found_'(_),
     throw(error(unmatched_directive, directive(elif(Goal)))).
+
+'$lgt_tr_directive'(elif(Goal), Line, Input, Output) :-
+    '$lgt_tr_expand_goal'(Goal, EGoal),
+    !,
+    '$lgt_tr_directive'(elif(EGoal), Line, Input, Output).
 
 '$lgt_tr_directive'(elif(Goal), _, Input, _) :-
@@ -5523 +5547 @@
     ensure_loaded(File),                                % assume that ensure_loaded/1 is also a built-in predicate
     assertz('$lgt_pp_directive_'(ensure_loaded(File))).
+
+'$lgt_tr_file_directive'(initialization(Goal), Line, Input, Output) :-
+    '$lgt_tr_expand_goal'(Goal, EGoal),
+    !,
+    '$lgt_tr_file_directive'(initialization(EGoal), Line, Input, Output).
 
 '$lgt_tr_file_directive'(initialization(Goal), _, _, _) :-