mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-16 09:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Convert (C->T;E) to (if C then T else E).

Browse Source
This commit is contained in:
Zoltan Somogyi
2015-10-15 23:17:00 +11:00
parent 08d84a144d
commit 3bb487e734
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/delay_construct.m
View File

@@ -94,7 +94,7 @@ delay_construct_in_goal(Goal0, InstMap0, DelayInfo, Goal) :-
ConjType = plain_conj,
Detism = goal_info_get_determinism(GoalInfo0),
determinism_components(Detism, CanFail, MaxSoln),
(
( if
% If the conjunction cannot fail, then its conjuncts cannot
% fail either, so we have no hope of pushing a construction
% past a failing goal.
@@ -111,10 +111,10 @@ delay_construct_in_goal(Goal0, InstMap0, DelayInfo, Goal) :-
CanFail = can_fail,
MaxSoln \= at_most_zero
->
then
delay_construct_in_conj(Goals0, InstMap0, DelayInfo, set.init,
[], Goals1)
;
else
Goals1 = Goals0
)
;
@@ -146,14 +146,14 @@ delay_construct_in_goal(Goal0, InstMap0, DelayInfo, Goal) :-
Goal = hlds_goal(if_then_else(Vars, Cond, Then, Else), GoalInfo0)
;
GoalExpr0 = scope(Reason, SubGoal0),
(
( if
Reason = from_ground_term(_, FGT),
( FGT = from_ground_term_construct
; FGT = from_ground_term_deconstruct
)
->
then
Goal = Goal0
;
else
delay_construct_in_goal(SubGoal0, InstMap0, DelayInfo, SubGoal),
Goal = hlds_goal(scope(Reason, SubGoal), GoalInfo0)
)
@@ -208,7 +208,7 @@ delay_construct_in_conj([Goal0 | Goals0], InstMap0, DelayInfo,
Goal0 = hlds_goal(GoalExpr0, GoalInfo0),
InstMapDelta0 = goal_info_get_instmap_delta(GoalInfo0),
instmap.apply_instmap_delta(InstMap0, InstMapDelta0, InstMap1),
(
( if
GoalExpr0 = unify(_, _, _, Unif, _),
Unif = construct(Var, _, Args, _, _, _, _),
Args = [_ | _], % We are constructing a cell, not a constant
@@ -216,12 +216,12 @@ delay_construct_in_conj([Goal0 | Goals0], InstMap0, DelayInfo,
inst_is_free(DelayInfo ^ dci_module_info, Inst0),
instmap_lookup_var(InstMap1, Var, Inst1),
inst_is_ground(DelayInfo ^ dci_module_info, Inst1)
->
then
set.insert(Var, ConstructedVars0, ConstructedVars1),
RevDelayedGoals1 = [Goal0 | RevDelayedGoals0],
delay_construct_in_conj(Goals0, InstMap1, DelayInfo,
ConstructedVars1, RevDelayedGoals1, Goals)
;
else if
Goal0 = hlds_goal(GoalExpr0, GoalInfo0),
delay_construct_skippable(GoalExpr0, GoalInfo0),
NonLocals = goal_info_get_nonlocals(GoalInfo0),
@@ -233,11 +233,11 @@ delay_construct_in_conj([Goal0 | Goals0], InstMap0, DelayInfo,
set_to_bitset(ConstructedVars0), Intersection),
set_of_var.is_empty(Intersection),
goal_info_get_purity(GoalInfo0) = purity_pure
->
then
delay_construct_in_conj(Goals0, InstMap1, DelayInfo,
ConstructedVars0, RevDelayedGoals0, Goals1),
Goals = [Goal0 | Goals1]
;
else
list.reverse(RevDelayedGoals0, DelayedGoals),
delay_construct_in_conj(Goals0, InstMap1, DelayInfo,
set.init, [], Goals1),

10
compiler/delay_partial_inst.m
View File

@@ -307,14 +307,14 @@ delay_partial_inst_in_goal(InstMap0, Goal0, Goal, !ConstructMap, !DelayInfo) :-
Goal = hlds_goal(if_then_else(Vars, Cond, Then, Else), GoalInfo0)
;
GoalExpr0 = scope(Reason, SubGoal0),
(
( if
Reason = from_ground_term(_, FGT),
( FGT = from_ground_term_construct
; FGT = from_ground_term_deconstruct
)
->
then
Goal = Goal0
;
else
delay_partial_inst_in_goal(InstMap0, SubGoal0, SubGoal,
!.ConstructMap, _, !DelayInfo),
Goal = hlds_goal(scope(Reason, SubGoal), GoalInfo0)
@@ -529,9 +529,9 @@ create_canonical_variables(OrigVars, CanonVars, !DelayInfo) :-
construct_map::in, construct_map::out) is det.
add_to_construct_map(Var, ConsId, CanonVars, !ConstructMap) :-
( map.search(!.ConstructMap, Var, ConsIdMap0) ->
( if map.search(!.ConstructMap, Var, ConsIdMap0) then
ConsIdMap1 = ConsIdMap0
;
else
ConsIdMap1 = map.init
),
map.det_insert(ConsId, CanonVars, ConsIdMap1, ConsIdMap),