From ccd8f49862a9459061e5937ba0863e1672dd7767 Mon Sep 17 00:00:00 2001 From: Julien Fischer Date: Fri, 10 Oct 2025 11:50:24 +1100 Subject: [PATCH] Use $pred in place of handwritten predicate names. browser/*.m: As above. --- browser/collect_lib.m | 4 ++-- browser/declarative_debugger.m | 4 ++-- browser/declarative_execution.m | 8 ++++---- browser/dl.m | 14 +++++++------- browser/interactive_query.m | 8 ++++---- browser/io_action.m | 2 +- browser/name_mangle.m | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/browser/collect_lib.m b/browser/collect_lib.m index e102f65e1..bbc3924e2 100644 --- a/browser/collect_lib.m +++ b/browser/collect_lib.m @@ -2,7 +2,7 @@ % vim: ft=mercury ts=4 sw=4 et %---------------------------------------------------------------------------% % Copyright (C) 1999-2002, 2005-2006 The University of Melbourne. -% Copyright (C) 2015-2018, 2021-2022 The Mercury team. +% Copyright (C) 2015-2018, 2021-2022, 2024-2025 The Mercury team. % This file is distributed under the terms specified in COPYING.LIB. %---------------------------------------------------------------------------% % @@ -164,7 +164,7 @@ link_collect(ObjectFile, Filter, Initialize, PostProcess, SendResult, "). set_to_null_pointer(_) :- - private_builtin.sorry("collect_lib.set_to_null_pointer"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% diff --git a/browser/declarative_debugger.m b/browser/declarative_debugger.m index 24bd6b977..bf41b74c0 100644 --- a/browser/declarative_debugger.m +++ b/browser/declarative_debugger.m @@ -2,7 +2,7 @@ % vim: ft=mercury ts=4 sw=4 et %---------------------------------------------------------------------------% % Copyright (C) 1999-2007, 2011 The University of Melbourne. -% Copyright (C) 2014-2015, 2017-2023 The Mercury team. +% Copyright (C) 2014-2015, 2017-2025 The Mercury team. % This file is distributed under the terms specified in COPYING.LIB. %---------------------------------------------------------------------------% % @@ -1039,7 +1039,7 @@ extern int MR_DD_debug_origin; Flag = MR_DD_debug_origin; "). debug_origin(_, _, _) :- - private_builtin.sorry("declarative_debugger.debug_origin"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% :- end_module mdb.declarative_debugger. diff --git a/browser/declarative_execution.m b/browser/declarative_execution.m index 2b667adde..82d511381 100644 --- a/browser/declarative_execution.m +++ b/browser/declarative_execution.m @@ -874,7 +874,7 @@ disj_node_from_id(Store, NodeId, Node) :- ). search_trace_node_store(_, _, _) :- - private_builtin.sorry("search_trace_node_store"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% @@ -1290,7 +1290,7 @@ construct_neg_fail_node(Preceding, Neg, Label) = "). null_trace_node_id(_) :- - private_builtin.sorry("null_trace_node_id"). + private_builtin.sorry($pred). %---------------------% @@ -1424,7 +1424,7 @@ node_map(Store, NodeId, map(Map0), Map) :- "). node_id_to_key(_, _) :- - private_builtin.sorry("node_id_to_key"). + private_builtin.sorry($pred). %---------------------% @@ -1440,7 +1440,7 @@ node_id_to_key(_, _) :- "). convert_node(_, _) :- - private_builtin.sorry("convert_node"). + private_builtin.sorry($pred). %---------------------% diff --git a/browser/dl.m b/browser/dl.m index 5bcaf09d0..f4869751f 100644 --- a/browser/dl.m +++ b/browser/dl.m @@ -130,7 +130,7 @@ "). is_null(_) :- - private_builtin.sorry("is_null"). + private_builtin.sorry($pred). %---------------------% @@ -170,7 +170,7 @@ open(FileName, Mode, Scope, Result, !IO) :- }"). dlopen(_, _, _, _, _, _) :- - private_builtin.sorry("dlopen"). + private_builtin.sorry($pred). %---------------------% @@ -196,7 +196,7 @@ dlopen(_, _, _, _, _, _) :- }"). make_closure(_) = _ :- - private_builtin.sorry("make_closure"). + private_builtin.sorry($pred). %---------------------% @@ -339,7 +339,7 @@ mercury_sym(Handle, MercuryProc0, Result, !IO) :- }"). dlsym(_, _, _, _, _) :- - private_builtin.sorry("dlsym"). + private_builtin.sorry($pred). %---------------------% @@ -364,7 +364,7 @@ dlsym(_, _, _, _, _) :- }"). dlerror(_, _, _) :- - private_builtin.sorry("dlerror"). + private_builtin.sorry($pred). %---------------------% @@ -391,7 +391,7 @@ close(handle(Handle), Result, !IO) :- "). dlclose(_, _, _) :- - private_builtin.sorry("dlclose"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% @@ -410,7 +410,7 @@ dlclose(_, _, _) :- "). high_level_code :- - private_builtin.sorry("high_level_code"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% :- end_module mdb.dl. diff --git a/browser/interactive_query.m b/browser/interactive_query.m index bc7a099af..c5800399b 100644 --- a/browser/interactive_query.m +++ b/browser/interactive_query.m @@ -711,7 +711,7 @@ cleanup_file(Prefix, Suffix, !IO) :- "). grade_option = _ :- - private_builtin.sorry("grade_option"). + private_builtin.sorry($pred). %---------------------% @@ -979,7 +979,7 @@ report_exception(OutputStream, Excp, !IO) :- "). inst_cast_normal(_) = _ :- - private_builtin.sorry("inst_cast_normal"). + private_builtin.sorry($pred). %---------------------% @@ -995,7 +995,7 @@ inst_cast_normal(_) = _ :- "). inst_cast_cc(_) = _ :- - private_builtin.sorry("inst_cast_cc"). + private_builtin.sorry($pred). %---------------------% @@ -1011,7 +1011,7 @@ inst_cast_cc(_) = _ :- "). inst_cast_io(_) = _ :- - private_builtin.sorry("inst_cast_io"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% diff --git a/browser/io_action.m b/browser/io_action.m index d2776f945..f02ca5548 100644 --- a/browser/io_action.m +++ b/browser/io_action.m @@ -117,7 +117,7 @@ io_action_to_browser_term(IoAction) = Term :- }"). pickup_io_action(_, _, _, _) :- - private_builtin.sorry("pickup_io_action"). + private_builtin.sorry($pred). %---------------------% diff --git a/browser/name_mangle.m b/browser/name_mangle.m index df50dee96..e399d2cde 100644 --- a/browser/name_mangle.m +++ b/browser/name_mangle.m @@ -286,7 +286,7 @@ convert_to_valid_c_identifier_2(String, Name) :- "). use_asm_labels :- - private_builtin.sorry("use_asm_labels"). + private_builtin.sorry($pred). %---------------------% @@ -324,7 +324,7 @@ system_is_osx :- "). high_level_code :- - private_builtin.sorry("high_level_code"). + private_builtin.sorry($pred). %---------------------------------------------------------------------------% :- end_module mdb.name_mangle.