mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-20 11:54:02 +00:00
2725b1a331
Estimated hours taken: 220
Aditi update syntax, type and mode checking.
Change the hlds_goal for constructions in preparation for
structure reuse to avoid making multiple conflicting changes.
compiler/hlds_goal.m:
Merge `higher_order_call' and `class_method_call' into a single
`generic_call' goal type. This also has alternatives for the
various Aditi builtins for which type declarations can't
be written.
Remove the argument types field from higher-order/class method calls.
It wasn't used often, and wasn't updated by optimizations
such as inlining. The types can be obtained from the vartypes
field of the proc_info.
Add a `lambda_eval_method' field to lambda_goals.
Add a field to constructions to identify which RL code fragment should
be used for an top-down Aditi closure.
Add fields to constructions to hold structure reuse information.
This is currently ignored -- the changes to implement structure
reuse will be committed to the alias branch.
This is included here to avoid lots of CVS conflicts caused by
changing the definition of `hlds_goal' twice.
Add a field to `some' goals to specify whether the quantification
can be removed. This is used to make it easier to ensure that
indexes are used for updates.
Add a field to lambda_goals to describe whether the modes were
guessed by the compiler and may need fixing up after typechecking
works out the argument types.
Add predicate `hlds_goal__generic_call_id' to work out a call_id
for a generic call for use in error messages.
compiler/purity.m:
compiler/post_typecheck.m:
Fill in the modes of Aditi builtin calls and closure constructions.
This needs to know which are the `aditi__state' arguments, so
it must be done after typechecking.
compiler/prog_data.m:
Added `:- type sym_name_and_arity ---> sym_name/arity'.
Add a type `lambda_eval_method', which describes how a closure
is to be executed. The alternatives are normal Mercury execution,
bottom-up execution by Aditi and top-down execution by Aditi.
compiler/prog_out.m:
Add predicate `prog_out__write_sym_name_and_arity', which
replaces duplicated inline code in a few places.
compiler/hlds_data.m:
Add a `lambda_eval_method' field to `pred_const' cons_ids and
`pred_closure_tag' cons_tags.
compiler/hlds_pred.m:
Remove type `pred_call_id', replace it with type `simple_call_id',
which combines a `pred_or_func' and a `sym_name_and_arity'.
Add a type `call_id' which describes all the different types of call,
including normal calls, higher-order and class-method calls
and Aditi builtins.
Add `aditi_top_down' to the type `marker'.
Remove `aditi_interface' from type `marker'. Interfacing to
Aditi predicates is now handled by `generic_call' hlds_goals.
Add a type `rl_exprn_id' which identifies a predicate to
be executed top-down by Aditi.
Add a `maybe(rl_exprn_id)' field to type `proc_info'.
Add predicate `adjust_func_arity' to convert between the arity
of a function to its arity as a predicate.
Add predicates `get_state_args' and `get_state_args_det' to
extract the DCG state arguments from an argument list.
Add predicate `pred_info_get_call_id' to get a `simple_call_id'
for a predicate for use in error messages.
compiler/hlds_out.m:
Write the new representation for call_ids.
Add a predicate `hlds_out__write_call_arg_id' which
replaces similar code in mode_errors.m and typecheck.m.
compiler/prog_io_goal.m:
Add support for `aditi_bottom_up' and `aditi_top_down' annotations
on pred expressions.
compiler/prog_io_util.m:
compiler/prog_io_pragma.m:
Add predicates
- `prog_io_util:parse_name_and_arity' to parse `SymName/Arity'
(moved from prog_io_pragma.m).
- `prog_io_util:parse_pred_or_func_name_and_arity to parse
`pred SymName/Arity' or `func SymName/Arity'.
- `prog_io_util:parse_pred_or_func_and_args' to parse terms resembling
a clause head (moved from prog_io_pragma.m).
compiler/type_util.m:
Add support for `aditi_bottom_up' and `aditi_top_down' annotations
on higher-order types.
Add predicates `construct_higher_order_type',
`construct_higher_order_pred_type' and
`construct_higher_order_func_type' to avoid some code duplication.
compiler/mode_util.m:
Add predicate `unused_mode/1', which returns `builtin:unused'.
Add functions `aditi_di_mode/0', `aditi_ui_mode/0' and
`aditi_uo_mode/0' which return `in', `in', and `out', but will
be changed to return `di', `ui' and `uo' when alias tracking
is implemented.
compiler/goal_util.m:
Add predicate `goal_util__generic_call_vars' which returns
any arguments to a generic_call which are not in the argument list,
for example the closure passed to a higher-order call or
the typeclass_info for a class method call.
compiler/llds.m:
compiler/exprn_aux.m:
compiler/dupelim.m:
compiler/llds_out.m:
compiler/opt_debug.m:
Add builtin labels for the Aditi update operations.
compiler/hlds_module.m:
Add predicate predicate_table_search_pf_sym, used for finding
possible matches for a call with the wrong number of arguments.
compiler/intermod.m:
Don't write predicates which build `aditi_top_down' goals,
because there is currently no way to tell importing modules
which RL code fragment to use.
compiler/simplify.m:
Obey the `cannot_remove' field of explicit quantification goals.
compiler/make_hlds.m:
Parse Aditi updates.
Don't typecheck clauses for which syntax errors in Aditi updates
are found - this avoids spurious "undefined predicate `aditi_insert/3'"
errors.
Factor out some common code to handle terms of the form `Head :- Body'.
Factor out common code in the handling of pred and func expressions.
compiler/typecheck.m:
Typecheck Aditi builtins.
Allow the argument types of matching predicates to be adjusted
when typechecking the higher-order arguments of Aditi builtins.
Change `typecheck__resolve_pred_overloading' to take a list of
argument types rather than a `map(var, type)' and a list of
arguments to allow a transformation to be performed on the
argument types before passing them.
compiler/error_util.m:
Move the part of `report_error_num_args' which writes
"wrong number of arguments (<x>; expected <y>)" from
typecheck.m for use by make_hlds.m when reporting errors
for Aditi builtins.
compiler/modes.m:
compiler/unique_modes.m:
compiler/modecheck_call.m:
Modecheck Aditi builtins.
compiler/lambda.m:
Handle the markers for predicates introduced for
`aditi_top_down' and `aditi_bottom_up' lambda expressions.
compiler/polymorphism.m:
Add extra type_infos to `aditi_insert' calls
describing the tuple to insert.
compiler/call_gen.m:
Generate code for Aditi builtins.
compiler/unify_gen.m:
compiler/bytecode_gen.m:
Abort on `aditi_top_down' and `aditi_bottom_up' lambda
expressions - code generation for them is not yet implemented.
compiler/magic.m:
Use the `aditi_call' generic_call rather than create
a new procedure for each Aditi predicate called from C.
compiler/rl_out.pp:
compiler/rl_gen.m:
compiler/rl.m:
Move some utility code used by magic.m and call_gen.m into rl.m.
Remove an XXX comment about reference counting being not yet
implemented - Evan has fixed that.
library/ops.m:
compiler/mercury_to_mercury.m:
doc/transition_guide.texi:
Add unary prefix operators `aditi_bottom_up' and `aditi_top_down',
used as qualifiers on lambda expressions.
Add infix operator `==>' to separate the tuples in an
`aditi_modify' call.
compiler/follow_vars.m:
Thread a `map(prog_var, type)' through, needed because
type information is no longer held in higher-order call goals.
compiler/table_gen.m:
Use the `make_*_construction' predicates in hlds_goal.m
to construct constants.
compiler/*.m:
Trivial changes to add extra fields to hlds_goal structures.
doc/reference_manual.texi:
Document Aditi updates.
Use @samp{pragma base_relation} instead of
@samp{:- pragma base_relation} throughout the Aditi documentation
to be consistent with other parts of the reference manual.
tests/valid/Mmakefile:
tests/valid/aditi_update.m:
tests/valid/aditi.m:
Test case.
tests/valid/Mmakefile:
Remove some hard-coded --intermodule-optimization rules which are
no longer needed because `mmake depend' is now run in this directory.
tests/invalid/*.err_exp:
Fix expected output for changes in reporting of call_ids
in typecheck.m.
tests/invalid/Mmakefile
tests/invalid/aditi_update_errors.{m,err_exp}:
tests/invalid/aditi_update_mode_errors.{m,err_exp}:
Test error messages for Aditi updates.
tests/valid/aditi.m:
tests/invalid/aditi.m:
Cut down version of extras/aditi/aditi.m to provide basic declarations
for Aditi compilation such as `aditi__state' and the modes
`aditi_di', `aditi_uo' and `aditi_ui'. Installing extras/aditi/aditi.m
somewhere would remove the need for these.
177 lines
4.0 KiB
Mathematica
177 lines
4.0 KiB
Mathematica
:- module aditi_update_errors.
|
|
|
|
:- interface.
|
|
|
|
:- import_module aditi.
|
|
|
|
:- pred aditi_update_syntax(aditi__state::aditi_di,
|
|
aditi__state::aditi_uo) is det.
|
|
|
|
:- pred aditi_update_derived_relation(aditi__state::aditi_di,
|
|
aditi__state::aditi_uo) is det.
|
|
|
|
:- pred aditi_update_types(aditi__state::aditi_di,
|
|
aditi__state::aditi_uo) is det.
|
|
|
|
:- implementation.
|
|
|
|
:- import_module int.
|
|
|
|
:- pred p(aditi__state::aditi_ui, int::out, int::out) is nondet.
|
|
:- pragma base_relation(p/3).
|
|
|
|
:- func q(aditi__state::aditi_ui, int::out) = (int::out) is nondet.
|
|
:- pragma base_relation(q/2).
|
|
|
|
:- pred anc(aditi__state::aditi_ui, int::out, int::out) is nondet.
|
|
:- pragma aditi(anc/3).
|
|
|
|
aditi_update_syntax -->
|
|
X = p(_, 1, 2),
|
|
aditi_insert(X),
|
|
|
|
aditi_insert(p(_, 1, 2), foo),
|
|
aditi_insert(q(_, 1) = 2, foo),
|
|
|
|
aditi_delete(p(_, X, _Y) :- X < 2, foo),
|
|
aditi_delete(q(_, X) = _Y :- X < 2, foo),
|
|
|
|
{ DeleteP =
|
|
(aditi_top_down pred(_::unused, 1::in, 2::in) is semidet :-
|
|
true
|
|
) },
|
|
aditi_delete(p/3, DeleteP),
|
|
|
|
{ DeleteQ =
|
|
(aditi_top_down func(_::unused, 1::in) = (2::in) is semidet)
|
|
},
|
|
aditi_delete(q/2, DeleteQ),
|
|
|
|
{ InsertP =
|
|
(aditi_bottom_up pred(_::aditi_ui, A1::out, A2::out) is nondet :-
|
|
( A1 = 1, A2 = 2
|
|
; A1 = 2, A2 = 3
|
|
)
|
|
) },
|
|
aditi_bulk_insert(p/3, InsertP),
|
|
aditi_bulk_delete(pred p/3, InsertP, foo),
|
|
|
|
{ InsertQ =
|
|
(aditi_bottom_up func(_::aditi_ui, A1::out)
|
|
= (A2::out) is nondet :-
|
|
( A1 = 1, A2 = 2
|
|
; A1 = 2, A2 = 3
|
|
)
|
|
) },
|
|
aditi_bulk_delete(q/2, InsertQ),
|
|
aditi_bulk_delete(func q/2, InsertQ, foo),
|
|
|
|
aditi_modify(p(_, X0, Y0) ==> p(_, X0 + 1, Y0 + 1)),
|
|
aditi_modify((q(_, X0) = Y0) ==> (q(_, X0 + 1) = (Y0 + 1))),
|
|
aditi_modify(q(_, _X0) ==> _Y0),
|
|
|
|
{ ModifyP =
|
|
(aditi_top_down pred(_::unused, X0::in, Y0::in,
|
|
_::unused, X::out, Y::out) is semidet :-
|
|
X0 = 1,
|
|
X = X0 + Y0,
|
|
Y = X0 - Y0
|
|
) },
|
|
aditi_modify(p/3, ModifyP),
|
|
aditi_modify(pred p/3, ModifyP, foo),
|
|
|
|
{ ModifyQ =
|
|
(aditi_top_down pred(_::unused, X0::in, Y0::in,
|
|
_::unused, X::out, Y::out) is semidet :-
|
|
X0 = 1,
|
|
X = X0 + Y0,
|
|
Y = X0 - Y0
|
|
) },
|
|
aditi_modify(q/2, ModifyQ),
|
|
aditi_modify(func q/2, ModifyQ, foo).
|
|
|
|
aditi_update_derived_relation -->
|
|
aditi_insert(anc(_, 1, 2)).
|
|
|
|
aditi_update_types -->
|
|
aditi_insert(p(_, 1)),
|
|
aditi_insert(q(_, 1)),
|
|
aditi_insert(q(_) = 2),
|
|
{ aditi_insert(p(_, 1, 2), 1, _) },
|
|
|
|
aditi_delete(p(_, X, _Y) :- X < 2.0),
|
|
aditi_delete(q(_, X) = _Y :- X < 2.0),
|
|
|
|
aditi_delete(p(_, X) :- X < 2.0),
|
|
aditi_delete(q(_) = Y :- Y < 2),
|
|
|
|
{ DeleteP =
|
|
(aditi_top_down pred(_::unused, 2::in) is semidet :-
|
|
true
|
|
) },
|
|
aditi_delete(pred p/3, DeleteP),
|
|
aditi_delete(pred q/2, DeleteP),
|
|
|
|
{ DeleteQ =
|
|
(aditi_top_down func(_::unused) = (2::in) is semidet)
|
|
},
|
|
aditi_delete(func q/2, DeleteQ),
|
|
aditi_delete(func p/3, DeleteQ),
|
|
|
|
{ DeleteQ2 =
|
|
(func(_::unused) = (2::in) is semidet)
|
|
},
|
|
aditi_delete(func q/2, DeleteQ2),
|
|
|
|
{ InsertP =
|
|
(aditi_bottom_up pred(_::aditi_ui, A1::out, A2::out) is nondet :-
|
|
( A1 = 1, A2 = 2.0
|
|
; A1 = 2, A2 = 3.0
|
|
)
|
|
) },
|
|
aditi_bulk_insert(pred p/4, InsertP),
|
|
aditi_bulk_insert(pred p/3, InsertP),
|
|
aditi_bulk_delete(pred q/2, InsertP),
|
|
|
|
{ InsertP2 =
|
|
(pred(_::aditi_ui, A1::out, A2::out) is nondet :-
|
|
( A1 = 1, A2 = 2.0
|
|
; A1 = 2, A2 = 3.0
|
|
)
|
|
) },
|
|
aditi_bulk_insert(pred p/3, InsertP2),
|
|
|
|
{ InsertQ =
|
|
(aditi_bottom_up func(_::aditi_ui, A1::out)
|
|
= (A2::out) is nondet :-
|
|
( A1 = 1, A2 = 2
|
|
; A1 = 2, A2 = 3
|
|
)
|
|
) },
|
|
aditi_bulk_insert(func q/2, InsertQ),
|
|
aditi_bulk_insert(pred q/2, InsertQ),
|
|
aditi_bulk_delete(func q/2, InsertQ),
|
|
|
|
aditi_modify(p(X0, Y0, _) ==> p(X0 + 1, Y0 + 1, _)),
|
|
aditi_modify((q(_) = Y0) ==> (q(_) = (Y0 + 1))),
|
|
aditi_modify(q(_, X0, Y0) ==> q(_, X0 + 1, Y0 + 1)),
|
|
|
|
{ ModifyP =
|
|
(aditi_top_down pred(_::unused, X0::in, Y0::in,
|
|
_::unused, X::out, Y::out) is semidet :-
|
|
X0 = 1.0,
|
|
X = X0 + Y0,
|
|
Y = X0 - Y0
|
|
) },
|
|
aditi_modify(pred p/3, ModifyP),
|
|
|
|
{ ModifyQ =
|
|
(aditi_top_down func(_::unused, X0::in, Y0::in,
|
|
_::unused, X::out) = (Y::out) is semidet :-
|
|
X0 = 1,
|
|
X = X0 + Y0,
|
|
Y = X0 - Y0
|
|
) },
|
|
aditi_modify(func q/2, ModifyQ).
|
|
|