mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-17 06:47:17 +00:00
This is a cleanup diff; there are no changes in algorithms.
Estimated hours taken: 8 Branches: main This is a cleanup diff; there are no changes in algorithms. compiler/delay_info.m: compiler/instmap.m: compiler/inst_match.m: compiler/inst_util.m: compiler/make.module_target.m: compiler/mode_errors.m: compiler/modes.m: compiler/mode_util.m: compiler/process_util.m: compiler/prog_io_goal.m: compiler/prog_io.m: compiler/prog_io_pragma.m: compiler/prog_io_typeclass.m: compiler/recompilation.check.m: compiler/recompilation.m: compiler/recompilation.usage.m: compiler/recompilation.version.m: compiler/unique_modes.m: Bring these modules up to date with our current style guidelines. Switch to predmode syntax and state variable notation where appropriate. Switch argument orders where this makes it possible to use state variable notation. Use the svmap and svset modules where appropriate. Fix inconsistent indentation; in some places, fix inconsistent placement of comments. compiler/passes_aux.m: compiler/modecheck_unify.m: compiler/mercury_compile.m: compiler/post_typecheck.m: compiler/prog_io_dcg.m: compiler/mode_ordering.m: compiler/inst_graph.m: compiler/polymorphism.m: compiler/prog_io_util.m: compiler/mode_debug.m: compiler/mode_robdd.check.m: compiler/transform.m: Minor changes to conform to the changed argument orders of some predicates in the cleaned up modules. Also, some minor cleanups.
This commit is contained in:
@@ -300,7 +300,7 @@ convert_mode(AllowConstrainedInstVar, Term, Mode) :-
|
||||
|
||||
Term = term__functor(term__atom("is"), [EqTerm, DetTerm], _),
|
||||
EqTerm = term__functor(term__atom("="),
|
||||
[FuncTerm, RetModeTerm], _),
|
||||
[FuncTerm, RetModeTerm], _),
|
||||
FuncTerm = term__functor(term__atom("func"), ArgModesTerms, _)
|
||||
->
|
||||
DetTerm = term__functor(term__atom(DetString), [], _),
|
||||
@@ -360,7 +360,7 @@ convert_inst(AllowConstrainedInstVar, Term, Result) :-
|
||||
|
||||
Name = "is", Args0 = [EqTerm, DetTerm],
|
||||
EqTerm = term__functor(term__atom("="),
|
||||
[FuncTerm, RetModeTerm], _),
|
||||
[FuncTerm, RetModeTerm], _),
|
||||
FuncTerm = term__functor(term__atom("func"), ArgModesTerm, _)
|
||||
->
|
||||
DetTerm = term__functor(term__atom(DetString), [], _),
|
||||
@@ -393,7 +393,7 @@ convert_inst(AllowConstrainedInstVar, Term, Result) :-
|
||||
% Do not allow nested constrained_inst_vars.
|
||||
convert_inst(no_allow_constrained_inst_var, InstTerm, Inst),
|
||||
Result = constrained_inst_vars(set__make_singleton_set(
|
||||
term__coerce_var(Var)), Inst)
|
||||
term__coerce_var(Var)), Inst)
|
||||
% anything else must be a user-defined inst
|
||||
;
|
||||
parse_qualified_term(Term, Term, "inst",
|
||||
|
||||
Reference in New Issue
Block a user