mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-19 07:45:09 +00:00
Code Issues Projects Releases Wiki Activity

Implement higher-order functions.

Browse Source 
Estimated hours taken: 12

Implement higher-order functions.

Add higher-order function terms
(function lambda expressions, e.g. `Func = (func(X) = Y :- Y is 2 * X)'
and higher-order function calls (apply/N, e.g. `Z = apply(Func, 42)').
Add higher-order function insts and modes.

hlds_goal.m:
	Add a new field pred_or_func to lambda_goal.

prog_data.m:
	Add a new field pred_or_func to pred_inst_info.

prog_io.m:
	Add support for parsing higher-order function terms and
	higher-order function insts and modes.

make_hlds.m:
	Add support for parsing higher-order function terms.

typecheck.m:
	Add support for type-checking higher-order function calls
	and higher-order function terms.

modes.m, mode_errors.m:
	Add support for mode-checking higher-order function calls
	and higher-order function terms.

higher_order.m:
	Handle higher-order function types and insts.

hlds_pred.m:
	Add new predicate pred_args_to_func_args, for extracting the
	function arguments and function return from the arguments
	of a predicate that is really a function.

*.m:
	Minor changes to handle new pred_or_func field in lambda_goals
	and pred_inst_infos.
This commit is contained in:
Fergus Henderson
1996-05-14 10:07:46 +00:00
parent 6c13acd6a7
commit 60b9fa83b6
22 changed files with 542 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/lambda.m
View File

@@ -41,11 +41,11 @@
:- pred lambda__process_pred(pred_id, module_info, module_info).
:- mode lambda__process_pred(in, in, out) is det.
:- pred lambda__transform_lambda(list(var), list(mode), determinism,
set(var), hlds__goal, unification,
:- pred lambda__transform_lambda(pred_or_func, list(var), list(mode),
determinism, set(var), hlds__goal, unification,
varset, map(var, type), tvarset, module_info,
unify_rhs, unification, module_info).
:- mode lambda__transform_lambda(in, in, in, in, in, in, in, in, in, in,
:- mode lambda__transform_lambda(in, in, in, in, in, in, in, in, in, in, in,
out, out, out) is det.
%-----------------------------------------------------------------------------%
@@ -138,12 +138,12 @@ lambda__process_goal(Goal0 - GoalInfo0, Goal) -->
lambda__process_goal_2(unify(XVar, Y, Mode, Unification, Context), GoalInfo,
Unify - GoalInfo) -->
( { Y = lambda_goal(Vars, Modes, Det, LambdaGoal0) } ->
( { Y = lambda_goal(PredOrFunc, Vars, Modes, Det, LambdaGoal0) } ->
% for lambda expressions, we must convert the lambda expression
% into a new predicate
{ LambdaGoal0 = _ - GoalInfo0 },
{ goal_info_get_nonlocals(GoalInfo0, NonLocals0) },
lambda__process_lambda(Vars, Modes, Det, NonLocals0,
lambda__process_lambda(PredOrFunc, Vars, Modes, Det, NonLocals0,
LambdaGoal0, Unification, Y1, Unification1),
{ Unify = unify(XVar, Y1, Mode, Unification1, Context) }
;
@@ -200,23 +200,23 @@ lambda__process_cases([case(ConsId, Goal0) | Cases0],
lambda__process_goal(Goal0, Goal),
lambda__process_cases(Cases0, Cases).
:- pred lambda__process_lambda(list(var), list(mode), determinism,
:- pred lambda__process_lambda(pred_or_func, list(var), list(mode), determinism,
set(var), hlds__goal, unification, unify_rhs, unification,
lambda_info, lambda_info).
:- mode lambda__process_lambda(in, in, in, in, in, in, out, out,
:- mode lambda__process_lambda(in, in, in, in, in, in, in, out, out,
in, out) is det.
lambda__process_lambda(Vars, Modes, Det, OrigNonLocals0, LambdaGoal,
lambda__process_lambda(PredOrFunc, Vars, Modes, Det, OrigNonLocals0, LambdaGoal,
Unification0, Functor, Unification, LambdaInfo0, LambdaInfo) :-
LambdaInfo0 = lambda_info(VarSet, VarTypes, TVarSet, ModuleInfo0),
lambda__transform_lambda(Vars, Modes, Det, OrigNonLocals0, LambdaGoal,
Unification0, VarSet, VarTypes, TVarSet, ModuleInfo0,
Functor, Unification, ModuleInfo),
lambda__transform_lambda(PredOrFunc, Vars, Modes, Det, OrigNonLocals0,
LambdaGoal, Unification0, VarSet, VarTypes, TVarSet,
ModuleInfo0, Functor, Unification, ModuleInfo),
LambdaInfo = lambda_info(VarSet, VarTypes, TVarSet, ModuleInfo).
lambda__transform_lambda(Vars, Modes, Detism, OrigNonLocals0, LambdaGoal,
Unification0, VarSet, VarTypes, TVarSet, ModuleInfo0,
Functor, Unification, ModuleInfo) :-
lambda__transform_lambda(PredOrFunc, Vars, Modes, Detism, OrigNonLocals0,
LambdaGoal, Unification0, VarSet, VarTypes, TVarSet,
ModuleInfo0, Functor, Unification, ModuleInfo) :-
(
Unification0 = construct(Var0, _, _, UniModes0)
->
@@ -334,7 +334,7 @@ lambda__transform_lambda(Vars, Modes, Detism, OrigNonLocals0, LambdaGoal,
PermutedArgModes, Detism, LambdaGoal, LambdaContext,
ProcInfo),
pred_info_create(ModuleName, PredName, TVarSet, ArgTypes,
true, LambdaContext, local, [], predicate, ProcInfo,
true, LambdaContext, local, [], PredOrFunc, ProcInfo,
ProcId, PredInfo),
% save the new predicate in the predicate table