mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-16 18:03:36 +00:00
compiler/mode_errors.m:
Generate a significantly more detailed error message, including an example,
when a higher order value is used in a call without having higher order
inst information.
compiler/write_error_spec.m:
Fix a bug I encountered with a draft of the diff to mode_errors.m:
don't let the indent of a paragraph become negative.
compiler/indent.m:
Fix an effective infinite loop when the indent function is asked
to convert a negative indent to a string.
tests/invalid/no_ho_inst.{m,err_exp}:
A test case derived from the code on mercury-users.
tests/invalid/Mmakefile:
Enable the new test case.
107 lines
3.8 KiB
Mathematica
107 lines
3.8 KiB
Mathematica
%---------------------------------------------------------------------------%
|
|
% vim: ft=mercury ts=4 sw=4 et
|
|
%---------------------------------------------------------------------------%
|
|
% Copyright (C) 2023 The Mercury team.
|
|
% This file may only be copied under the terms of the GNU General
|
|
% Public License - see the file COPYING in the Mercury distribution.
|
|
%---------------------------------------------------------------------------%
|
|
%
|
|
% File: indent.m.
|
|
%
|
|
% This module provides utility functions and predicates dealing with
|
|
% indentation.
|
|
%
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- module libs.indent.
|
|
:- interface.
|
|
|
|
:- import_module io.
|
|
|
|
% A value of type `indent' records the number of levels of indentation
|
|
% to indent a piece of text (usually code). The number of spaces
|
|
% per indent level depends on the particular output destination.
|
|
% When the MLDS backend generates C, Java or C# code, each indent level
|
|
% is two spaces, so the appropriate way to translate an indent level
|
|
% to an indent string is the indent2 family of operations below.
|
|
:- type indent == int.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
%
|
|
% Write out indentation.
|
|
%
|
|
|
|
% Return the number of spaces per indent level.
|
|
% This will be the number in the name of the function.
|
|
% For now, we support only two-spaces-per-indent-level, which is
|
|
% used by most of the compiler, including error_util.m and mlds_to_*.m.
|
|
% Later, we will also support four-spaces-per-indent-level, which is
|
|
% used by parse_tree_out_*.m.
|
|
%
|
|
:- func indent2_increment = int.
|
|
|
|
% Write out the given indent level (indent2_increment spaces per level).
|
|
%
|
|
:- pred write_indent2(io.text_output_stream::in, int::in,
|
|
io::di, io::uo) is det.
|
|
|
|
% Return the indent for the given level as a string.
|
|
%
|
|
:- func indent2_string(int) = string.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- implementation.
|
|
|
|
:- import_module int.
|
|
:- import_module string.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
indent2_increment = 2.
|
|
|
|
write_indent2(Stream, Indent, !IO) :-
|
|
Str = indent2_string(Indent),
|
|
io.write_string(Stream, Str, !IO).
|
|
|
|
indent2_string(Indent) = Str :-
|
|
% The code here is modelled after output_std_indent_levels in
|
|
% library/pretty_printer.m, except we can, and do, assume that
|
|
% Indent is never negative, and in our use case, deep indentation
|
|
% is much rarer.
|
|
( if indent2_str_lo(Indent, StrPrime) then
|
|
Str = StrPrime
|
|
else if Indent > 0 then
|
|
indent2_str_16(SixteenIndentStr),
|
|
Str = SixteenIndentStr ++ indent2_string(Indent - 16)
|
|
else
|
|
% A negative indent is a bug.
|
|
Str = ""
|
|
).
|
|
|
|
:- pred indent2_str_lo(int::in, string::out) is semidet.
|
|
:- pred indent2_str_16(string::out) is det.
|
|
|
|
indent2_str_lo( 0, "").
|
|
indent2_str_lo( 1, " ").
|
|
indent2_str_lo( 2, " ").
|
|
indent2_str_lo( 3, " ").
|
|
indent2_str_lo( 4, " ").
|
|
indent2_str_lo( 5, " ").
|
|
indent2_str_lo( 6, " ").
|
|
indent2_str_lo( 7, " ").
|
|
indent2_str_lo( 8, " ").
|
|
indent2_str_lo( 9, " ").
|
|
indent2_str_lo(10, " ").
|
|
indent2_str_lo(11, " ").
|
|
indent2_str_lo(12, " ").
|
|
indent2_str_lo(13, " ").
|
|
indent2_str_lo(14, " ").
|
|
indent2_str_lo(15, " ").
|
|
indent2_str_16( " ").
|
|
|
|
%---------------------------------------------------------------------------%
|
|
:- end_module libs.indent.
|
|
%---------------------------------------------------------------------------%
|