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

Use map__lookup_error for the other map predicates

Browse Source 
Estimated hours taken: 0.1

library/map.m:
	Use map__lookup_error for the other map predicates
	which abort on missing or duplicate keys.

library/map.nu.nl:
	Fix the message for map__det_insert_error.
This commit is contained in:
Simon Taylor
1998-08-26 05:45:28 +00:00
parent 0d304892cd
commit d1c145c139
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/map.m
View File

@@ -225,12 +225,12 @@ map__lookup(Map, K, V) :-
( tree234__search(Map, K, V1) -> ( tree234__search(Map, K, V1) ->
V = V1 V = V1
; ;
map__lookup_error(K, V) map__lookup_error("map__lookup: key_not_found", K, V)
). ).
:- pred map__lookup_error(K, V). :- pred map__lookup_error(string, K, V).
:- mode map__lookup_error(in, unused) is erroneous. :- mode map__lookup_error(in, in, unused) is erroneous.
map__lookup_error(K, V) :- map__lookup_error(Msg, K, V) :-
KeyType = type_name(type_of(K)), KeyType = type_name(type_of(K)),
ValueType = type_name(type_of(V)), ValueType = type_name(type_of(V)),
functor(K, Functor, Arity), functor(K, Functor, Arity),
@@ -242,8 +242,8 @@ map__lookup_error(K, V) :-
FunctorStr) FunctorStr)
), ),
string__append_list( string__append_list(
["map__lookup: key not found\n", [Msg,
"\tKey Type: ", "\n\tKey Type: ",
KeyType, KeyType,
"\n\tKey Functor: ", "\n\tKey Functor: ",
FunctorStr, FunctorStr,
@@ -260,7 +260,7 @@ map__det_insert(Map0, K, V, Map) :-
( tree234__insert(Map0, K, V, Map1) -> ( tree234__insert(Map0, K, V, Map1) ->
Map = Map1 Map = Map1
; ;
error("map__det_insert: key already present") map__lookup_error("map__det_insert: key already present", K, V)
). ).
map__det_insert_from_corresponding_lists(Map0, Ks, Vs, Map) :- map__det_insert_from_corresponding_lists(Map0, Ks, Vs, Map) :-
@@ -283,7 +283,7 @@ map__det_update(Map0, K, V, Map) :-
( tree234__update(Map0, K, V, Map1) -> ( tree234__update(Map0, K, V, Map1) ->
Map = Map1 Map = Map1
; ;
error("map__det_update: key not found") map__lookup_error("map__det_update: key not found", K, V)
). ).
map__set(Map0, K, V, Map) :- map__set(Map0, K, V, Map) :-
@@ -320,7 +320,7 @@ map__det_remove(Map0, Key, Value, Map) :-
Value = Value1, Value = Value1,
Map = Map1 Map = Map1
; ;
error("map__det_remove: key not found") map__lookup_error("map__det_remove: key not found", Key, Value)
). ).
map__count(Map, Count) :- map__count(Map, Count) :-

4
library/map.nu.nl
View File

@@ -1,5 +1,5 @@
%---------------------------------------------------------------------------% %---------------------------------------------------------------------------%
% Copyright (C) 1997 The University of Melbourne. % Copyright (C) 1997-1998 The University of Melbourne.
% This file may only be copied under the terms of the GNU Library General % This file may only be copied under the terms of the GNU Library General
% Public License - see the file COPYING.LIB in the Mercury distribution. % Public License - see the file COPYING.LIB in the Mercury distribution.
%---------------------------------------------------------------------------% %---------------------------------------------------------------------------%
@@ -37,7 +37,7 @@ map__det_insert(Map0, K, V, Map) :-
% map__det_insert_error is a separate predicate because it is handy % map__det_insert_error is a separate predicate because it is handy
% to be able to set a spy point on it... % to be able to set a spy point on it...
map__det_insert_error(_Map, _K, _V) :- map__det_insert_error(_Map, _K, _V) :-
error("map__det_insert: key not found"). error("map__det_insert: key already present").
%-----------------------------------------------------------------------------% %-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------% %-----------------------------------------------------------------------------%